commit 9a432e947e1922504f67cafd087eb52ad0fd976c
Author: mohammed-alkhazrji <M.Alkhazrji@exp-sa.com>
Date:   Mon Jan 5 01:17:42 2026 +0300

    frist moduls odex30 account

diff --git a/dev_odex30_accounting/account_chart_of_accounts/CHANGELOG.md b/dev_odex30_accounting/account_chart_of_accounts/CHANGELOG.md
new file mode 100644
index 0000000..58a83a0
--- /dev/null
+++ b/dev_odex30_accounting/account_chart_of_accounts/CHANGELOG.md
@@ -0,0 +1,33 @@
+# Changelog
+
+## [18.0.1.0.0] - 2026-01-02
+
+### Migration from Odoo 14
+- Replaced `internal_type` with `is_view_account` boolean field
+- Replaced `user_type_id` with native `account_type` selection
+- Updated all domain filters for compatibility
+- Migrated report from old AbstractModel structure to new account.report framework
+
+### Added
+- Full Odoo 18 `account.report` integration
+- Support for comparison periods in reports
+- Journal filtering in reports
+- Hierarchical account display in reports
+- Automatic account code generation based on parent
+- Level-based account hierarchy
+
+### Changed
+- Report now inherits from `account.report` instead of standalone AbstractModel
+- View XML updated to Odoo 18 syntax (removed `attrs`, using `invisible`)
+- Dependencies updated (now requires `account_reports`)
+
+### Fixed
+- Domain filters compatibility with Odoo 18
+- Account creation with parent relationships
+- Journal account creation with proper account types
+
+### Technical
+- Added `_parent_store` functionality for efficient hierarchy queries
+- Implemented `format_value()` method for currency display
+- Added balance calculation methods for reports
+- Full support for multi-company environments
diff --git a/dev_odex30_accounting/account_chart_of_accounts/README.md b/dev_odex30_accounting/account_chart_of_accounts/README.md
new file mode 100644
index 0000000..976277e
--- /dev/null
+++ b/dev_odex30_accounting/account_chart_of_accounts/README.md
@@ -0,0 +1,105 @@
+# Chart of Accounts Hierarchy - Odoo 18
+
+## Description
+This module provides hierarchical chart of accounts with parent-child relationships for Odoo 18, 
+including a complete Chart of Accounts report compatible with the new Odoo 18 reporting framework.
+
+## Features
+- ✅ Hierarchical chart of accounts with parent-child relationships
+- ✅ Automatic account code generation
+- ✅ View accounts support (parent accounts only)
+- ✅ Fixed tree length support
+- ✅ Customizable account code padding
+- ✅ Integration with journal creation
+- ✅ **Chart of Accounts Report** with Odoo 18 compatibility
+
+## Migration from Odoo 14
+This module has been fully migrated from Odoo 14 with the following major changes:
+
+### Account Models:
+- ❌ Removed `internal_type` field
+- ✅ Added `is_view_account` boolean field
+- ❌ Removed `user_type_id` (Many2one)
+- ✅ Now using `account_type` (Selection field)
+- ✅ Updated all domain filters
+
+### Report Framework:
+- ❌ Old: `AbstractModel` with `_name = 'account.coa.report'`
+- ✅ New: `AbstractModel` inheriting from `account.report`
+- ❌ Old: Simple `_get_lines()` method
+- ✅ New: Advanced reporting with options, filters, and hierarchies
+- ✅ Compatible with Odoo 18 `account_reports` module
+
+## Installation
+1. Make sure `account_reports` module is installed (Odoo Enterprise)
+2. Copy this module to your Odoo addons directory
+3. Update the apps list: `Settings → Apps → Update Apps List`
+4. Install from Apps menu: Search "Chart of Accounts Hierarchy"
+
+## Configuration
+Navigate to: **Accounting → Configuration → Settings → Chart of Accounts Hierarchy Settings**
+
+Available options:
+- **Automatically Generate Account Codes**: Enable auto-generation based on parent
+- **Use Fixed Length**: Enforce a specific tree depth
+- **Account Code Padding**: Number of digits for padding
+- **Bank/Cash Prefixes**: Define account code prefixes
+
+## Usage
+
+### Creating Hierarchical Accounts
+1. Go to: **Accounting → Configuration → Chart of Accounts**
+2. Create a parent account:
+   - Check "Is View Account"
+   - Set the account code (e.g., `1000`)
+3. Create child accounts:
+   - Select the parent account in "Parent Account" field
+   - Code will be generated automatically (e.g., `10001`, `10002`)
+
+### Viewing Reports
+1. Go to: **Accounting → Reporting → Chart of Accounts**
+2. Use filters to customize the view:
+   - Date range
+   - Journals
+   - Comparison periods
+   - Hierarchy view
+
+## Technical Details
+
+### New Fields in account.account:
+- `parent_id`: Many2one to parent account
+- `is_view_account`: Boolean for view accounts
+- `level`: Integer showing hierarchy depth
+- `auto_code`: Computed account code
+- `child_ids`: One2many to child accounts
+- `parent_path`: Hierarchical path (using `_parent_store`)
+
+### Dependencies:
+- `account` (Odoo Community)
+- `account_reports` (Odoo Enterprise - required for reports)
+
+## Troubleshooting
+
+### Issue: Report not showing
+**Solution**: Make sure `account_reports` module is installed
+
+### Issue: Account codes not generating
+**Solution**: Enable "Automatically Generate Account Codes" in settings
+
+### Issue: Cannot create view accounts
+**Solution**: Check "Is View Account" when creating parent accounts
+
+## Support
+For issues or questions, please contact your Odoo partner or open an issue on GitHub.
+
+## Author
+Your Company
+
+## License
+LGPL-3
+
+## Version History
+- **18.0.1.0.0**: Initial migration from Odoo 14 to Odoo 18
+  - Complete rewrite of account models
+  - New reporting framework implementation
+  - Full compatibility with Odoo 18 accounting
diff --git a/dev_odex30_accounting/account_chart_of_accounts/__init__.py b/dev_odex30_accounting/account_chart_of_accounts/__init__.py
new file mode 100644
index 0000000..7db6694
--- /dev/null
+++ b/dev_odex30_accounting/account_chart_of_accounts/__init__.py
@@ -0,0 +1,3 @@
+# -*- coding: utf-8 -*-
+from . import models
+from . import report
diff --git a/dev_odex30_accounting/account_chart_of_accounts/__manifest__.py b/dev_odex30_accounting/account_chart_of_accounts/__manifest__.py
new file mode 100644
index 0000000..2d53a00
--- /dev/null
+++ b/dev_odex30_accounting/account_chart_of_accounts/__manifest__.py
@@ -0,0 +1,55 @@
+{
+    'name': 'Chart of Accounts Hierarchy - Odoo 18',
+    'version': '18.0.1.0.0',
+    'category': 'Accounting',
+    'summary': 'Hierarchical Chart of Accounts with Parent-Child Relationships',
+    'description': """
+        Chart of Accounts Hierarchy for Odoo 18
+        ========================================
+
+        Features:
+        ---------
+        * Hierarchical chart of accounts with parent-child relationships
+        * Automatic account code generation
+        * View accounts support (parent accounts only)
+        * Fixed tree length support
+        * Customizable account code padding
+        * Integration with journal creation
+        * Chart of Accounts report with hierarchy support
+
+        Migration from Odoo 14:
+        ----------------------
+        * Replaced internal_type with account_type
+        * Replaced user_type_id with account_type field
+        * Added is_view_account boolean field
+        * Updated all domain filters
+        * Migrated account.report from AbstractModel to standard Model structure
+        * Compatible with Odoo 18 accounting framework
+    """,
+    'author': 'Your Company',
+    'website': 'https://www.yourcompany.com',
+    'depends': ['account', 'odex30_account_reports'],
+    'data': [
+        'security/account_security.xml',
+        'security/ir.model.access.csv',
+        'views/account_account_view.xml',
+        'views/res_config_settings_views.xml',
+        'data/account_report_data.xml',
+    ],
+    'assets': {
+        'web.assets_backend': [
+            'account_chart_of_accounts/static/src/js/account_type_selection_extend.js',
+            'account_chart_of_accounts/static/src/js/filters_patch.js',
+            'account_chart_of_accounts/static/src/js/account_report.js',
+            'account_chart_of_accounts/static/src/xml/filter_full_hierarchy.xml',
+        ],
+        'web.assets_frontend': [
+            'account_chart_of_accounts/static/src/scss/account_hierarchy.scss',
+        ],
+    },
+
+    'installable': True,
+    'application': False,
+    'auto_install': False,
+    'license': 'LGPL-3',
+}
diff --git a/dev_odex30_accounting/account_chart_of_accounts/__pycache__/__init__.cpython-311.pyc b/dev_odex30_accounting/account_chart_of_accounts/__pycache__/__init__.cpython-311.pyc
new file mode 100644
index 0000000..6cd4f41
Binary files /dev/null and b/dev_odex30_accounting/account_chart_of_accounts/__pycache__/__init__.cpython-311.pyc differ
diff --git a/dev_odex30_accounting/account_chart_of_accounts/data/account_report_data.xml b/dev_odex30_accounting/account_chart_of_accounts/data/account_report_data.xml
new file mode 100644
index 0000000..64f6d8c
--- /dev/null
+++ b/dev_odex30_accounting/account_chart_of_accounts/data/account_report_data.xml
@@ -0,0 +1,7 @@
+<odoo>
+<record id="odex30_account_reports.trial_balance_report" model="account.report">
+    <field name="filter_show_full_hierarchy" eval="True"/>
+</record>
+
+
+</odoo>
\ No newline at end of file
diff --git a/dev_odex30_accounting/account_chart_of_accounts/models/__init__.py b/dev_odex30_accounting/account_chart_of_accounts/models/__init__.py
new file mode 100644
index 0000000..994789e
--- /dev/null
+++ b/dev_odex30_accounting/account_chart_of_accounts/models/__init__.py
@@ -0,0 +1,4 @@
+# -*- coding: utf-8 -*-
+from . import account_account
+from . import account_journal
+from . import res_config_settings
diff --git a/dev_odex30_accounting/account_chart_of_accounts/models/__pycache__/__init__.cpython-311.pyc b/dev_odex30_accounting/account_chart_of_accounts/models/__pycache__/__init__.cpython-311.pyc
new file mode 100644
index 0000000..4a97c9e
Binary files /dev/null and b/dev_odex30_accounting/account_chart_of_accounts/models/__pycache__/__init__.cpython-311.pyc differ
diff --git a/dev_odex30_accounting/account_chart_of_accounts/models/__pycache__/account_account.cpython-311.pyc b/dev_odex30_accounting/account_chart_of_accounts/models/__pycache__/account_account.cpython-311.pyc
new file mode 100644
index 0000000..9787f84
Binary files /dev/null and b/dev_odex30_accounting/account_chart_of_accounts/models/__pycache__/account_account.cpython-311.pyc differ
diff --git a/dev_odex30_accounting/account_chart_of_accounts/models/__pycache__/account_journal.cpython-311.pyc b/dev_odex30_accounting/account_chart_of_accounts/models/__pycache__/account_journal.cpython-311.pyc
new file mode 100644
index 0000000..b472f76
Binary files /dev/null and b/dev_odex30_accounting/account_chart_of_accounts/models/__pycache__/account_journal.cpython-311.pyc differ
diff --git a/dev_odex30_accounting/account_chart_of_accounts/models/__pycache__/res_config_settings.cpython-311.pyc b/dev_odex30_accounting/account_chart_of_accounts/models/__pycache__/res_config_settings.cpython-311.pyc
new file mode 100644
index 0000000..5880bb4
Binary files /dev/null and b/dev_odex30_accounting/account_chart_of_accounts/models/__pycache__/res_config_settings.cpython-311.pyc differ
diff --git a/dev_odex30_accounting/account_chart_of_accounts/models/account_account.py b/dev_odex30_accounting/account_chart_of_accounts/models/account_account.py
new file mode 100644
index 0000000..0b1a7ed
--- /dev/null
+++ b/dev_odex30_accounting/account_chart_of_accounts/models/account_account.py
@@ -0,0 +1,187 @@
+from odoo import fields, models, api, _
+from odoo.exceptions import UserError
+from odoo.osv import expression
+
+
+class AccountAccount(models.Model):
+    _inherit = "account.account"
+    _parent_name = "parent_id"
+    _parent_store = True
+    company_id = fields.Many2one('res.company', string='Company', required=True, readonly=True,
+        default=lambda self: self.env.company)
+    account_type = fields.Selection(
+        selection_add=[('view', 'View')],
+        ondelete={'view': 'cascade'}
+    )
+    automticAccountsCodes = fields.Boolean(
+        related='company_id.automticAccountsCodes',
+    )
+    internal_group = fields.Selection(
+        selection_add=[('view', 'View')],
+        ondelete={'view': lambda recs: recs.write({'internal_group': 'off'})}
+    )
+
+    parent_id = fields.Many2one(
+        comodel_name='account.account',
+        string='Parent Account',
+        domain="[('account_type', '=', 'view')]"
+    )
+
+    parent_path = fields.Char(index=True)
+
+    child_ids = fields.One2many(
+        'account.account', 'parent_id', 'Child Accounts'
+    )
+
+    auto_code = fields.Char(
+        compute='_get_code', default='0',
+        store=True, size=64, index=True
+    )
+
+    level = fields.Integer(
+        compute="_get_level", store=True, string='Level'
+    )
+
+
+    @api.depends('code', 'account_type')
+    def _compute_account_type(self):
+
+        view_accounts = self.filtered(lambda acc: acc.account_type == 'view')
+
+        other_accounts = self - view_accounts
+        if other_accounts:
+            super(AccountAccount, other_accounts)._compute_account_type()
+
+    @api.depends('account_type')
+    def _compute_internal_group(self):
+        """Override to handle view type"""
+        for record in self:
+            if record.account_type == 'view':
+                record.internal_group = 'view'
+            else:
+                super(AccountAccount, record)._compute_internal_group()
+
+    @api.model
+    def _name_search(self, name, domain=None, operator='ilike', limit=100, order=None):
+        if domain is None:
+            domain = []
+
+        # استبدال internal_type بـ account_type في Odoo 18
+        domain = self._replace_internal_type_domain(domain)
+
+        if not self.env.context.get('show_view') and not self.env.context.get('import_file'):
+            domain += [('account_type', '!=', 'view')]
+
+        return super()._name_search(name, domain, operator, limit, order)
+
+    def _replace_internal_type_domain(self, domain):
+        """استبدال internal_type بـ account_type"""
+        new_domain = []
+        for condition in domain:
+            if isinstance(condition, (list, tuple)) and len(condition) >= 3:
+                if condition[0] in ('internal_type', 'type') and condition[2] == 'view':
+                    new_domain.append(('account_type', condition[1], 'view'))
+                elif condition[0] in ('internal_type', 'type') and condition[1] == '!=':
+                    new_domain.append(('account_type', '!=', 'view'))
+                else:
+                    new_domain.append(condition)
+            else:
+                new_domain.append(condition)
+        return new_domain
+
+    @api.depends('parent_id')
+    def _get_level(self):
+        for rec in self:
+            level = 0
+            if rec.parent_id:
+                level = rec.parent_id.level + 1
+                if rec.company_id.useFiexedTree and rec.company_id.chart_account_length:
+                    if level > rec.company_id.chart_account_length:
+                        raise UserError(
+                            _('This account level is greater than the chart of account length.'))
+            rec.level = level
+
+    @api.depends('parent_id', 'code', 'parent_id.code')
+    def _get_code(self):
+        for rec in self:
+            if not rec.company_id.automticAccountsCodes and rec.code:
+                rec.auto_code = rec.code
+                continue
+
+            code = str(0)
+            if rec.parent_id:
+                default_padding = self.env.company.chart_account_padding
+                if rec.account_type == 'view':
+                    default_padding = False
+
+                parent_code = rec.parent_id.code or ''
+                parent_code = int(parent_code) != 0 and str(parent_code) or ''
+
+                siblings = self.search([
+                    ('parent_id', '=', rec.parent_id.id),
+                    ('id', '!=', rec.id)
+                ])
+
+                max_siblings_code = False
+                if siblings:
+                    sibling_codes = [int(s.code) for s in siblings if s.code and s.code.isdigit()]
+                    if sibling_codes:
+                        max_siblings_code = max(sibling_codes)
+
+                if not max_siblings_code:
+                    code = parent_code + str(1).zfill(default_padding or 0)
+                else:
+                    code = str(max_siblings_code + 1)
+
+                rec.auto_code = code
+            else:
+                rec.auto_code = rec.code or '0'
+
+    @api.model
+    def search_panel_select_range(self, field_name, **kwargs):
+
+        if field_name != 'parent_id':
+            return super().search_panel_select_range(field_name, **kwargs)
+
+
+        enable_counters = kwargs.get('enable_counters', False)
+        search_domain = kwargs.get('search_domain', [])
+
+
+        all_view_accounts = self.search([('account_type', '=', 'view')], order='code')
+
+        count_by_parent = {}
+        if enable_counters:
+            all_accounts = self.search(search_domain)
+
+            for account in all_accounts:
+                if account.parent_id:
+                    parent_id = account.parent_id.id
+                    count_by_parent[parent_id] = count_by_parent.get(parent_id, 0) + 1
+
+                    ancestor = account.parent_id.parent_id
+                    while ancestor:
+                        count_by_parent[ancestor.id] = count_by_parent.get(ancestor.id, 0) + 1
+                        ancestor = ancestor.parent_id
+
+
+        values = []
+        for parent in all_view_accounts:
+            value = {
+                'id': parent.id,
+                'display_name': f"{parent.code} {parent.name}" if parent.code else parent.name,
+                'parent_id': parent.parent_id.id if parent.parent_id else False,
+            }
+
+            if enable_counters:
+                value['__count'] = count_by_parent.get(parent.id, 0)
+
+            values.append(value)
+
+
+        result = {
+            'parent_field': 'parent_id',
+            'values': values,
+        }
+
+        return result
diff --git a/dev_odex30_accounting/account_chart_of_accounts/models/account_journal.py b/dev_odex30_accounting/account_chart_of_accounts/models/account_journal.py
new file mode 100644
index 0000000..ffc99bc
--- /dev/null
+++ b/dev_odex30_accounting/account_chart_of_accounts/models/account_journal.py
@@ -0,0 +1,74 @@
+# -*- coding: utf-8 -*-
+from odoo import api, fields, models, _
+from odoo.exceptions import UserError
+
+class AccountJournal(models.Model):
+    _inherit = "account.journal"
+
+    @api.model
+    def _fill_missing_values(self, vals):
+        journal_type = vals.get('type')
+        if not journal_type:
+            return
+
+        company = self.env['res.company'].browse(vals['company_id']) if vals.get('company_id') else self.env.company
+        vals['company_id'] = company.id
+
+        random_account = self.env['account.account'].search([('company_id', '=', company.id)], limit=1)
+        digits = len(random_account.code) if random_account else 6
+
+        if journal_type in ('bank', 'cash'):
+            has_liquidity_accounts = vals.get('default_account_id')
+            has_payment_accounts = vals.get('payment_debit_account_id') or vals.get('payment_credit_account_id')
+            has_profit_account = vals.get('profit_account_id')
+            has_loss_account = vals.get('loss_account_id')
+
+            if journal_type == 'bank':
+                liquidity_account_prefix = company.bank_account_code_prefix or ''
+            else:
+                liquidity_account_prefix = company.cash_account_code_prefix or company.bank_account_code_prefix or ''
+
+            parent = self.env['account.account'].search([('code', '=', liquidity_account_prefix)], limit=1)
+            if not parent:
+                raise UserError(_("Can not find account with code (%s).") % (liquidity_account_prefix,))
+
+            vals['name'] = vals.get('name') or vals.get('bank_acc_number')
+
+            if 'code' not in vals:
+                vals['code'] = self.get_next_bank_cash_default_code(journal_type, company)
+                if not vals['code']:
+                    raise UserError(_("Cannot generate an unused journal code. Please fill the 'Shortcode' field."))
+
+            if not has_liquidity_accounts:
+                default_account_code = self.env['account.account']._search_new_account_code(company, digits, liquidity_account_prefix)
+                default_account_vals = self._prepare_liquidity_account_vals(company, default_account_code, vals)
+                default_account_vals['parent_id'] = parent.id
+                vals['default_account_id'] = self.env['account.account'].create(default_account_vals).id
+
+            if not has_payment_accounts:
+                vals['payment_debit_account_id'] = self.env['account.account'].create({
+                    'name': _("Outstanding Receipts"),
+                    'code': self.env['account.account']._search_new_account_code(company, digits, liquidity_account_prefix),
+                    'reconcile': True,
+                    'account_type': 'asset_current',
+                    'company_id': company.id,
+                    'parent_id': parent.id,
+                }).id
+
+                vals['payment_credit_account_id'] = self.env['account.account'].create({
+                    'name': _("Outstanding Payments"),
+                    'code': self.env['account.account']._search_new_account_code(company, digits, liquidity_account_prefix),
+                    'reconcile': True,
+                    'account_type': 'asset_current',
+                    'company_id': company.id,
+                    'parent_id': parent.id,
+                }).id
+
+            if journal_type == 'cash' and not has_profit_account:
+                vals['profit_account_id'] = company.default_cash_difference_income_account_id.id
+
+            if journal_type == 'cash' and not has_loss_account:
+                vals['loss_account_id'] = company.default_cash_difference_expense_account_id.id
+
+        if 'refund_sequence' not in vals:
+            vals['refund_sequence'] = vals['type'] in ('sale', 'purchase')
diff --git a/dev_odex30_accounting/account_chart_of_accounts/models/res_config_settings.py b/dev_odex30_accounting/account_chart_of_accounts/models/res_config_settings.py
new file mode 100644
index 0000000..5812ba2
--- /dev/null
+++ b/dev_odex30_accounting/account_chart_of_accounts/models/res_config_settings.py
@@ -0,0 +1,52 @@
+# -*- coding: utf-8 -*-
+from odoo import fields, models, api, _
+
+class ResCompany(models.Model):
+    _inherit = 'res.company'
+
+    chart_account_length = fields.Integer(string='Chart of accounts length')
+    chart_account_padding = fields.Integer(string='Chart of accounts Padding')
+    useFiexedTree = fields.Boolean(string='Use Fixed Length Chart of accounts')
+    automticAccountsCodes = fields.Boolean(string='Automatically Generate Accounts Codes')
+    parent_bank_cash_account_id = fields.Many2one('account.account')
+
+    @api.model
+    def setting_chart_of_accounts_action(self):
+        """Called by the 'Chart of Accounts' button of the setup bar."""
+        company = self.env.company
+        company.sudo().set_onboarding_step_done('account_setup_coa_state')
+
+        if company.opening_move_posted():
+            return 'account.action_account_form'
+
+        company.create_op_move_if_non_existant()
+
+        view_id = self.env.ref('account.init_accounts_tree').id
+
+        domain = [
+            ('account_type', '!=', 'equity_unaffected'),
+            # ('is_view_account', '=', False),
+            ('company_id', '=', company.id)
+        ]
+
+        return {
+            'type': 'ir.actions.act_window',
+            'name': _('Chart of Accounts'),
+            'res_model': 'account.account',
+            'view_mode': 'tree',
+            'limit': 99999999,
+            'search_view_id': self.env.ref('account.view_account_search').id,
+            'views': [[view_id, 'list']],
+            'domain': domain,
+        }
+
+
+class ResConfigSettings(models.TransientModel):
+    _inherit = 'res.config.settings'
+
+    chart_account_length = fields.Integer(related='company_id.chart_account_length', readonly=False)
+    chart_account_padding = fields.Integer(related='company_id.chart_account_padding', readonly=False)
+    useFiexedTree = fields.Boolean(related='company_id.useFiexedTree', readonly=False)
+    automticAccountsCodes = fields.Boolean(related='company_id.automticAccountsCodes', readonly=False)
+    bank_account_code_prefix = fields.Char(string='Bank Prefix', related='company_id.bank_account_code_prefix', readonly=False)
+    cash_account_code_prefix = fields.Char(string='Cash Prefix', related='company_id.cash_account_code_prefix', readonly=False)
diff --git a/dev_odex30_accounting/account_chart_of_accounts/report/__init__.py b/dev_odex30_accounting/account_chart_of_accounts/report/__init__.py
new file mode 100644
index 0000000..a9997a1
--- /dev/null
+++ b/dev_odex30_accounting/account_chart_of_accounts/report/__init__.py
@@ -0,0 +1,2 @@
+# -*- coding: utf-8 -*-
+from . import account_report
diff --git a/dev_odex30_accounting/account_chart_of_accounts/report/__pycache__/__init__.cpython-311.pyc b/dev_odex30_accounting/account_chart_of_accounts/report/__pycache__/__init__.cpython-311.pyc
new file mode 100644
index 0000000..184dd41
Binary files /dev/null and b/dev_odex30_accounting/account_chart_of_accounts/report/__pycache__/__init__.cpython-311.pyc differ
diff --git a/dev_odex30_accounting/account_chart_of_accounts/report/__pycache__/account_report.cpython-311.pyc b/dev_odex30_accounting/account_chart_of_accounts/report/__pycache__/account_report.cpython-311.pyc
new file mode 100644
index 0000000..21f9901
Binary files /dev/null and b/dev_odex30_accounting/account_chart_of_accounts/report/__pycache__/account_report.cpython-311.pyc differ
diff --git a/dev_odex30_accounting/account_chart_of_accounts/report/account_report.py b/dev_odex30_accounting/account_chart_of_accounts/report/account_report.py
new file mode 100644
index 0000000..1a1fc2f
--- /dev/null
+++ b/dev_odex30_accounting/account_chart_of_accounts/report/account_report.py
@@ -0,0 +1,217 @@
+# -*- coding: utf-8 -*-
+from odoo import models, fields, api
+
+
+class AccountReport(models.Model):
+    _inherit = 'account.report'
+
+    filter_show_full_hierarchy = fields.Boolean(
+        string="Show Full Hierarchy Filter",
+        default=False,
+        help="Enable filter to display accounts in full hierarchical structure"
+    )
+
+    def _init_options_show_full_hierarchy(self, options, previous_options):
+
+        if self.filter_show_full_hierarchy:
+            if 'filters' not in options:
+                options['filters'] = {}
+            options['filters']['show_full_hierarchy'] = True
+            options['show_full_hierarchy'] = previous_options.get('show_full_hierarchy', False)
+
+
+    @api.model
+    def _get_options_initializers_forced_sequence_map(self):
+        res = super()._get_options_initializers_forced_sequence_map()
+        res['_init_options_show_full_hierarchy'] = 1035
+        return res
+
+
+class TrialBalanceCustomHandler(models.AbstractModel):
+    _name = 'account.trial.balance.report.handler'
+    _inherit = 'account.report.custom.handler'
+    _description = 'Trial Balance Custom Handler'
+
+    def _dynamic_lines_generator(self, report, options, all_column_groups_expression_totals, warnings=None):
+
+        if not options.get('show_full_hierarchy'):
+            return []
+
+        lines = []
+
+        parent_view_accounts = self.env['account.account'].search([
+            ('parent_id', '=', False),
+            ('account_type', '=', 'view'),
+        ], order='code, name')
+
+        for parent in parent_view_accounts:
+            has_children = len(parent.child_ids) > 0
+
+            parent_line = self._get_account_line(
+                report,
+                options,
+                parent,
+                all_column_groups_expression_totals,
+                is_parent=has_children,
+                level=0
+            )
+
+            if parent_line:
+                lines.append((0, parent_line))
+
+                if parent_line.get('unfolded', False) and has_children:
+                    child_lines = self._get_children_lines_recursive(
+                        report,
+                        options,
+                        parent,
+                        all_column_groups_expression_totals,
+                        level=1
+                    )
+                    for child_line in child_lines:
+                        lines.append((0, child_line))
+
+        orphan_accounts = self.env['account.account'].search([
+            ('parent_id', '=', False),
+            ('account_type', '!=', 'view'),
+        ], order='code, name')
+
+        for orphan in orphan_accounts:
+            orphan_line = self._get_account_line(
+                report,
+                options,
+                orphan,
+                all_column_groups_expression_totals,
+                is_parent=False,
+                level=0
+            )
+
+            if orphan_line:
+                lines.append((0, orphan_line))
+
+        return lines
+
+    def _get_children_lines_recursive(self, report, options, parent_account, all_column_groups_expression_totals, level=1):
+        lines = []
+
+        children = self.env['account.account'].search([
+            ('parent_id', '=', parent_account.id)
+        ], order='code, name')
+
+        for child in children:
+            has_children = len(child.child_ids) > 0
+
+            child_line = self._get_account_line(
+                report,
+                options,
+                child,
+                all_column_groups_expression_totals,
+                is_parent=has_children,
+                level=level
+            )
+
+            if child_line:
+                lines.append(child_line)
+
+                if child_line.get('unfolded', False) and has_children:
+                    grandchildren = self._get_children_lines_recursive(
+                        report,
+                        options,
+                        child,
+                        all_column_groups_expression_totals,
+                        level=level + 1
+                    )
+                    lines.extend(grandchildren)
+
+        return lines
+
+    def _report_expand_unfoldable_line_with_groupby(self, line_dict_id, groupby, options, progress, offset, unfold_all_batch_data=None):
+
+        return {
+            'lines': [],
+            'offset_increment': 0,
+            'has_more': False,
+        }
+
+
+    def _get_account_line(self, report, options, account, all_column_groups_expression_totals, is_parent=False,
+                          level=0):
+
+        columns = []
+        for column in options['columns']:
+            col_group_key = column.get('column_group_key')
+            expression_totals = all_column_groups_expression_totals.get(col_group_key, {})
+            col_value = self._compute_account_balance(account, options, column, expression_totals)
+
+            columns.append(report._build_column_dict(
+                col_value,
+                column,
+                options=options
+            ))
+
+        line_id = report._get_generic_line_id('account.account', account.id)
+        has_children = len(account.child_ids) > 0
+
+        line = {
+            'id': line_id,
+            'name': f"{account.code} {account.name}",
+            'level': level + 2,
+            'columns': columns,
+            'account_id': account.id,
+            'caret_options': 'account.account',
+        }
+
+        if has_children:
+            line['unfoldable'] = True
+            line['unfolded'] = line_id in options.get('unfolded_lines', [])
+            line['expand_function'] = '_report_expand_unfoldable_line_with_groupby'
+        else:
+            line['unfoldable'] = False
+            line['unfolded'] = False
+
+        return line
+
+    def _compute_account_balance(self, account, options, column, expression_totals):
+
+        if account.account_type == 'view':
+            children = self.env['account.account'].search([
+                ('parent_path', '=like', f'{account.parent_path}%'),
+                ('id', '!=', account.id),
+                ('account_type', '!=', 'view')
+            ])
+
+            total = 0
+            for child in children:
+                child_balance = self._get_actual_balance(child, options, column)
+                total += child_balance
+
+            return total
+        else:
+            return self._get_actual_balance(account, options, column)
+
+    def _get_actual_balance(self, account, options, column):
+
+        domain = [
+            ('account_id', '=', account.id),
+            ('parent_state', '=', 'posted'),
+        ]
+
+        if options.get('date'):
+            date_from = options['date'].get('date_from')
+            date_to = options['date'].get('date_to')
+
+            if date_from:
+                domain.append(('date', '>=', date_from))
+            if date_to:
+                domain.append(('date', '<=', date_to))
+
+        aml_results = self.env['account.move.line'].read_group(
+            domain,
+            ['debit:sum', 'credit:sum', 'balance:sum'],
+            []
+        )
+
+        if aml_results:
+            expr_label = column.get('expression_label', 'balance')
+            return aml_results[0].get(expr_label, 0)
+
+        return 0
diff --git a/dev_odex30_accounting/account_chart_of_accounts/security/account_security.xml b/dev_odex30_accounting/account_chart_of_accounts/security/account_security.xml
new file mode 100644
index 0000000..c2073dd
--- /dev/null
+++ b/dev_odex30_accounting/account_chart_of_accounts/security/account_security.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <data noupdate="0">
+
+        <record id="account_account_comp_rule" model="ir.rule">
+            <field name="name">Account multi-company</field>
+            <field name="model_id" ref="account.model_account_account"/>
+            <field name="domain_force">['|', ('company_id', '=', False), ('company_id', 'in', company_ids)]</field>
+        </record>
+
+    </data>
+</odoo>
diff --git a/dev_odex30_accounting/account_chart_of_accounts/security/ir.model.access.csv b/dev_odex30_accounting/account_chart_of_accounts/security/ir.model.access.csv
new file mode 100644
index 0000000..44d20bf
--- /dev/null
+++ b/dev_odex30_accounting/account_chart_of_accounts/security/ir.model.access.csv
@@ -0,0 +1,4 @@
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_account_account_user,account.account.user,account.model_account_account,account.group_account_user,1,1,1,1
+access_account_account_manager,account.account.manager,account.model_account_account,account.group_account_manager,1,1,1,1
+access_account_account_invoice,account.account.invoice,account.model_account_account,account.group_account_invoice,1,0,0,0
diff --git a/dev_odex30_accounting/account_chart_of_accounts/static/src/js/account_report.js b/dev_odex30_accounting/account_chart_of_accounts/static/src/js/account_report.js
new file mode 100644
index 0000000..f87fc18
--- /dev/null
+++ b/dev_odex30_accounting/account_chart_of_accounts/static/src/js/account_report.js
@@ -0,0 +1,62 @@
+/** @odoo-module **/
+
+import { patch } from "@web/core/utils/patch";
+import { AccountReportController } from "@odex30_account_reports/components/account_report/controller";
+
+patch(AccountReportController.prototype, {
+
+    async unfoldLine(lineIndex) {
+        const targetLine = this.lines[lineIndex];
+
+
+        if (this.options.show_full_hierarchy && targetLine.expand_function === '_report_expand_unfoldable_line_with_groupby') {
+
+            const isCurrentlyUnfolded = targetLine.unfolded;
+
+            if (isCurrentlyUnfolded) {
+                this.options.unfolded_lines = this.options.unfolded_lines.filter(
+                    id => id !== targetLine.id
+                );
+            } else {
+                if (!this.options.unfolded_lines.includes(targetLine.id)) {
+                    this.options.unfolded_lines.push(targetLine.id);
+                }
+            }
+
+
+            this.saveSessionOptions(this.options);
+
+            this.incrementCallNumber();
+
+            await this.reload(null, this.options);
+
+            return;
+        }
+
+        return super.unfoldLine(...arguments);
+    },
+
+
+    foldLine(lineIndex) {
+        const targetLine = this.lines[lineIndex];
+
+
+        if (this.options.show_full_hierarchy && targetLine.expand_function === '_report_expand_unfoldable_line_with_groupby') {
+
+            this.options.unfolded_lines = this.options.unfolded_lines.filter(
+                id => id !== targetLine.id
+            );
+
+
+            this.saveSessionOptions(this.options);
+
+            this.incrementCallNumber();
+
+            this.reload(null, this.options);
+
+            return; // إيقاف السلوك الافتراضي
+        }
+
+        return super.foldLine(...arguments);
+    }
+});
diff --git a/dev_odex30_accounting/account_chart_of_accounts/static/src/js/account_type_selection_extend.js b/dev_odex30_accounting/account_chart_of_accounts/static/src/js/account_type_selection_extend.js
new file mode 100644
index 0000000..b9c838d
--- /dev/null
+++ b/dev_odex30_accounting/account_chart_of_accounts/static/src/js/account_type_selection_extend.js
@@ -0,0 +1,25 @@
+/** @odoo-module **/
+
+import { _t } from "@web/core/l10n/translation";
+import { registry } from "@web/core/registry";
+import { AccountTypeSelection } from "@account/components/account_type_selection/account_type_selection";
+import { patch } from "@web/core/utils/patch";
+
+patch(AccountTypeSelection.prototype, {
+    get hierarchyOptions() {
+        const opts = this.options;
+        return [
+            { name: _t('Balance Sheet') },
+            { name: _t('Assets'), children: opts.filter(x => x[0] && x[0].startsWith('asset')) },
+            { name: _t('Liabilities'), children: opts.filter(x => x[0] && x[0].startsWith('liability')) },
+            { name: _t('Equity'), children: opts.filter(x => x[0] && x[0].startsWith('equity')) },
+            { name: _t('Profit & Loss') },
+            { name: _t('Income'), children: opts.filter(x => x[0] && x[0].startsWith('income')) },
+            { name: _t('Expense'), children: opts.filter(x => x[0] && x[0].startsWith('expense')) },
+            {
+                name: _t('Other'),
+                children: opts.filter(x => x[0] && (x[0] === 'off_balance' || x[0] === 'view'))
+            },
+        ];
+    }
+});
diff --git a/dev_odex30_accounting/account_chart_of_accounts/static/src/js/filters_patch.js b/dev_odex30_accounting/account_chart_of_accounts/static/src/js/filters_patch.js
new file mode 100644
index 0000000..fcdc340
--- /dev/null
+++ b/dev_odex30_accounting/account_chart_of_accounts/static/src/js/filters_patch.js
@@ -0,0 +1,15 @@
+/** @odoo-module **/
+
+import { patch } from "@web/core/utils/patch";
+import { AccountReportFilters } from "@odex30_account_reports/components/account_report/filters/filters";
+
+patch(AccountReportFilters.prototype, {
+
+    async toggleFullHierarchy() {
+        const newValue = !this.controller.options.show_full_hierarchy;
+        await this.controller.updateOption('show_full_hierarchy', newValue);
+        this.controller.saveSessionOptions(this.controller.options);
+        await this.applyFilters('show_full_hierarchy');
+    }
+
+});
diff --git a/dev_odex30_accounting/account_chart_of_accounts/static/src/scss/account_hierarchy.scss b/dev_odex30_accounting/account_chart_of_accounts/static/src/scss/account_hierarchy.scss
new file mode 100644
index 0000000..bb42e73
--- /dev/null
+++ b/dev_odex30_accounting/account_chart_of_accounts/static/src/scss/account_hierarchy.scss
@@ -0,0 +1,39 @@
+.o_search_panel.account_account {
+    .o_search_panel_field.parent_id {
+        .o_search_panel_category_value {
+            .o_toggle_fold {
+                margin-right: 15px;
+                cursor: pointer;
+            }
+
+            header {
+                display: flex;
+                align-items: center;
+                padding: 3px 8px;
+
+                &:hover {
+                    color: #f0f0f0;
+                }
+
+                .o_search_panel_label_title {
+                    flex: 1;
+                }
+
+                .badge {
+                    margin-left: auto;
+                    font-size: 0.8em;
+                }
+            }
+
+            // Levels
+            &[data-level="0"] {
+                font-weight: bold;
+            }
+
+            &[data-level="1"] header { padding-left: 20px; }
+            &[data-level="2"] header { padding-left: 35px; }
+            &[data-level="3"] header { padding-left: 50px; }
+            &[data-level="4"] header { padding-left: 65px; }
+        }
+    }
+}
diff --git a/dev_odex30_accounting/account_chart_of_accounts/static/src/xml/filter_full_hierarchy.xml b/dev_odex30_accounting/account_chart_of_accounts/static/src/xml/filter_full_hierarchy.xml
new file mode 100644
index 0000000..a43714c
--- /dev/null
+++ b/dev_odex30_accounting/account_chart_of_accounts/static/src/xml/filter_full_hierarchy.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<templates xml:space="preserve">
+
+    <t t-name="account_chart_of_accounts.AccountReportFiltersExtension"
+       t-inherit="odex30_account_reports.AccountReportFiltersCustomizable"
+       t-inherit-mode="extension">
+
+        <xpath expr="//div[@id='filter_extra_options']" position="after">
+            <t t-if="controller.options and controller.options.filters and controller.options.filters.show_full_hierarchy">
+                <div id="filter_full_hierarchy">
+                    <button
+                        class="btn"
+                        t-att-class="controller.options.show_full_hierarchy ? 'btn-primary' : 'btn-secondary'"
+                        t-on-click="() => this.toggleFullHierarchy()">
+                        <i class="fa fa-sitemap me-1"/>
+                        Full Hierarchy
+                    </button>
+                </div>
+            </t>
+        </xpath>
+
+    </t>
+
+</templates>
diff --git a/dev_odex30_accounting/account_chart_of_accounts/views/account_account_view.xml b/dev_odex30_accounting/account_chart_of_accounts/views/account_account_view.xml
new file mode 100644
index 0000000..2565afb
--- /dev/null
+++ b/dev_odex30_accounting/account_chart_of_accounts/views/account_account_view.xml
@@ -0,0 +1,128 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+
+    <record id="view_account_form_inherit_hierarchy" model="ir.ui.view">
+        <field name="name">account.account.form.inherit.hierarchy</field>
+        <field name="model">account.account</field>
+        <field name="inherit_id" ref="account.view_account_form"/>
+        <field name="arch" type="xml">
+
+                <field name="account_type" position="after">
+                    <field name="parent_id" context="{'show_view':True}"/>
+                    <field name="level" required="1" readonly="0"/>
+                    <field name="automticAccountsCodes" invisible="1"/>
+                    <field name="auto_code" invisible="1"/>
+                </field>
+
+            <xpath expr="//div[contains(@class, 'col-md-auto')][label[@for='code']]" position="replace">
+                <div class="col col-md-auto">
+                    <label for="code" string="Code"/>
+                    <div class="d-flex align-items-center">
+                        <field name="automticAccountsCodes" invisible="1"/>
+                        <field name="code"
+                               placeholder="e.g. 101000"
+                               class="oe_inline"
+                               readonly="automticAccountsCodes"
+                               force_save="1"
+                               style="width: auto;"/>
+                        <span class="badge text-bg-success ms-2"
+                              invisible="not automticAccountsCodes"
+                              title="Code is auto-generated">
+                            Auto
+                        </span>
+                    </div>
+                </div>
+            </xpath>
+
+
+
+
+
+
+
+        </field>
+    </record>
+
+
+<!--        <record id="view_account_form" model="ir.ui.view">-->
+<!--            <field name="name">account.account.form</field>-->
+<!--            <field name="model">account.account</field>-->
+<!--            <field name="inherit_id" ref="account.view_account_form"/>-->
+<!--            <field name="arch" type="xml">-->
+<!--                <field name="account_type" position="after">-->
+<!--                    <field name="parent_id" context="{'show_view':True}"/>-->
+<!--                    <field name="level" required="1" readonly="0"/>-->
+<!--                    <field name="automticAccountsCodes" invisible="1"/>-->
+<!--                    <field name="auto_code" invisible="1"/>-->
+<!--                </field>-->
+
+<!--                <div class="oe_inline oe_edit_only" position="replace">-->
+<!--                    <h1 class="oe_inline oe_edit_only">-->
+<!--                        <field name="code" placeholder="code" force_save="1"-->
+<!--                               attrs="{'readonly':[('automticAccountsCodes','=',True)]}"/> - -->
+<!--                        <field name="name" placeholder="name"/>-->
+<!--                    </h1>-->
+<!--                </div>-->
+<!--            </field>-->
+<!--        </record>-->
+
+    <record id="view_account_tree_inherit" model="ir.ui.view">
+        <field name="name">account.account.tree.inherit</field>
+        <field name="model">account.account</field>
+        <field name="inherit_id" ref="account.view_account_list"/>
+        <field name="arch" type="xml">
+            <field name="code" position="after">
+                <field name="parent_id" optional="hide"/>
+            </field>
+        </field>
+    </record>
+
+    <record id="view_account_search_inherit" model="ir.ui.view">
+        <field name="name">account.account.search.inherit</field>
+        <field name="model">account.account</field>
+        <field name="inherit_id" ref="account.view_account_search"/>
+        <field name="arch" type="xml">
+                <field name="name" position="after">
+                    <field name="account_type"/>
+                    <field name="level"/>
+                     <field name="parent_id"/>
+                </field>
+
+                <xpath expr="//searchpanel/field[@name='root_id']" position="replace">
+                    <field name="parent_id"
+                           string="Hierarchical Chart"
+                           icon="fa-sitemap"
+                           enable_counters="1"
+                           expand="1"
+                           hierarchize="1"/>
+                </xpath>
+        </field>
+    </record>
+
+
+
+<!--    <record id="account_report_form_inherit_hierarchy" model="ir.ui.view">-->
+<!--        <field name="name">account.report.form.inherit.hierarchy</field>-->
+<!--        <field name="model">account.report</field>-->
+<!--        <field name="inherit_id" ref="odex30_account_reports.account_report_form"/>-->
+<!--        <field name="arch" type="xml">-->
+
+<!--            <xpath expr="//field[@name='root_report_id']" position="after">-->
+<!--                <field name="filter_show_full_hierarchy"/>-->
+<!--            </xpath>-->
+
+<!--        </field>-->
+<!--    </record>-->
+
+
+
+
+
+<!--<record id="odex30_account_reports.trial_balance_report" model="account.report">-->
+<!--    <field name="filter_full_hierarchy" eval="True"/>-->
+<!--</record>-->
+
+
+
+</odoo>
diff --git a/dev_odex30_accounting/account_chart_of_accounts/views/res_config_settings_views.xml b/dev_odex30_accounting/account_chart_of_accounts/views/res_config_settings_views.xml
new file mode 100644
index 0000000..12479e8
--- /dev/null
+++ b/dev_odex30_accounting/account_chart_of_accounts/views/res_config_settings_views.xml
@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+    <record id="res_config_settings_view_form_inherit" model="ir.ui.view">
+        <field name="name">res.config.settings.view.form.inherit</field>
+        <field name="model">res.config.settings</field>
+        <field name="inherit_id" ref="account.res_config_settings_view_form"/>
+        <field name="arch" type="xml">
+            <xpath expr="//block[@name='fiscal_localization_setting_container']" position="after">
+                <block title="Chart of Accounts Hierarchy" name="chart_of_accounts_hierarchy_setting_container">
+
+
+
+                <div class="row mt16 o_settings_container">
+                <setting id="use_auto_account_codes"
+                     string="Auto Generate Account Codes">
+
+                    <div class="col-12 col-lg-6 o_setting_box">
+                        <div class="o_setting_left_pane">
+                            <field name="automticAccountsCodes"/>
+                        </div>
+                        <div class="o_setting_right_pane">
+                            <label for="automticAccountsCodes"/>
+                            <div class="text-muted">
+                                Automatically generate account codes based on parent account
+                            </div>
+                        </div>
+                    </div>
+
+
+                    <div class="col-12 col-lg-6 o_setting_box">
+                        <div class="o_setting_left_pane">
+                            <field name="useFiexedTree"/>
+                        </div>
+                        <div class="o_setting_right_pane">
+                            <label for="useFiexedTree"/>
+                            <div class="text-muted">
+                                Use fixed length chart of accounts structure
+                            </div>
+                            <div class="content-group" invisible="not useFiexedTree">
+                                <div class="row mt16">
+                                    <label for="chart_account_length" class="col-lg-3 o_light_label"/>
+                                    <field name="chart_account_length"/>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </setting>
+                    <div class="col-12 col-lg-6 o_setting_box">
+                        <div class="o_setting_left_pane"/>
+                        <div class="o_setting_right_pane">
+                            <label for="chart_account_padding" string="Account Code Padding"/>
+                            <div class="text-muted">
+                                Number of digits for account code padding
+                            </div>
+                            <field name="chart_account_padding" class="mt8"/>
+                        </div>
+                    </div>
+
+                    <div class="col-12 col-lg-6 o_setting_box">
+                        <div class="o_setting_left_pane"/>
+                        <div class="o_setting_right_pane">
+                            <label for="bank_account_code_prefix" string="Bank Account Prefix"/>
+                            <div class="text-muted">
+                                Prefix for bank account codes
+                            </div>
+                            <field name="bank_account_code_prefix" class="mt8"/>
+                        </div>
+                    </div>
+
+                    <div class="col-12 col-lg-6 o_setting_box">
+                        <div class="o_setting_left_pane"/>
+                        <div class="o_setting_right_pane">
+                            <label for="cash_account_code_prefix" string="Cash Account Prefix"/>
+                            <div class="text-muted">
+                                Prefix for cash account codes
+                            </div>
+                            <field name="cash_account_code_prefix" class="mt8"/>
+                        </div>
+                    </div>
+                </div>
+                </block>
+            </xpath>
+        </field>
+    </record>
+
+</odoo>
diff --git a/dev_odex30_accounting/exp_asset_base/.idea/exp_asset_base.iml b/dev_odex30_accounting/exp_asset_base/.idea/exp_asset_base.iml
new file mode 100644
index 0000000..8b8c395
--- /dev/null
+++ b/dev_odex30_accounting/exp_asset_base/.idea/exp_asset_base.iml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="PYTHON_MODULE" version="4">
+  <component name="NewModuleRootManager">
+    <content url="file://$MODULE_DIR$" />
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+  <component name="PyDocumentationSettings">
+    <option name="format" value="PLAIN" />
+    <option name="myDocStringFormat" value="Plain" />
+  </component>
+</module>
\ No newline at end of file
diff --git a/dev_odex30_accounting/exp_asset_base/.idea/inspectionProfiles/profiles_settings.xml b/dev_odex30_accounting/exp_asset_base/.idea/inspectionProfiles/profiles_settings.xml
new file mode 100644
index 0000000..105ce2d
--- /dev/null
+++ b/dev_odex30_accounting/exp_asset_base/.idea/inspectionProfiles/profiles_settings.xml
@@ -0,0 +1,6 @@
+<component name="InspectionProjectProfileManager">
+  <settings>
+    <option name="USE_PROJECT_PROFILE" value="false" />
+    <version value="1.0" />
+  </settings>
+</component>
\ No newline at end of file
diff --git a/dev_odex30_accounting/exp_asset_base/.idea/misc.xml b/dev_odex30_accounting/exp_asset_base/.idea/misc.xml
new file mode 100644
index 0000000..445c93b
--- /dev/null
+++ b/dev_odex30_accounting/exp_asset_base/.idea/misc.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectRootManager" version="2" project-jdk-name="Python 3.8 (odoo_14) (3)" project-jdk-type="Python SDK" />
+</project>
\ No newline at end of file
diff --git a/dev_odex30_accounting/exp_asset_base/.idea/modules.xml b/dev_odex30_accounting/exp_asset_base/.idea/modules.xml
new file mode 100644
index 0000000..33cef9b
--- /dev/null
+++ b/dev_odex30_accounting/exp_asset_base/.idea/modules.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/exp_asset_base.iml" filepath="$PROJECT_DIR$/.idea/exp_asset_base.iml" />
+    </modules>
+  </component>
+</project>
\ No newline at end of file
diff --git a/dev_odex30_accounting/exp_asset_base/.idea/workspace.xml b/dev_odex30_accounting/exp_asset_base/.idea/workspace.xml
new file mode 100644
index 0000000..5caca8c
--- /dev/null
+++ b/dev_odex30_accounting/exp_asset_base/.idea/workspace.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="AutoImportSettings">
+    <option name="autoReloadType" value="SELECTIVE" />
+  </component>
+  <component name="ChangeListManager">
+    <list default="true" id="f60ef796-8864-4ed6-b92d-868b4516241f" name="Changes" comment="" />
+    <option name="SHOW_DIALOG" value="false" />
+    <option name="HIGHLIGHT_CONFLICTS" value="true" />
+    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
+    <option name="LAST_RESOLUTION" value="IGNORE" />
+  </component>
+  <component name="ProjectColorInfo"><![CDATA[{
+  "associatedIndex": 7
+}]]></component>
+  <component name="ProjectId" id="2Wwmia3C9ZbGOYejadkYoVNM2s0" />
+  <component name="ProjectViewState">
+    <option name="hideEmptyMiddlePackages" value="true" />
+    <option name="showLibraryContents" value="true" />
+  </component>
+  <component name="PropertiesComponent"><![CDATA[{
+  "keyToString": {
+    "RunOnceActivity.OpenProjectViewOnStart": "true",
+    "RunOnceActivity.ShowReadmeOnStart": "true"
+  }
+}]]></component>
+  <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
+  <component name="TaskManager">
+    <task active="true" id="Default" summary="Default task">
+      <changelist id="f60ef796-8864-4ed6-b92d-868b4516241f" name="Changes" comment="" />
+      <created>1697652146581</created>
+      <option name="number" value="Default" />
+      <option name="presentableId" value="Default" />
+      <updated>1697652146581</updated>
+    </task>
+    <servers />
+  </component>
+</project>
\ No newline at end of file
diff --git a/dev_odex30_accounting/exp_asset_base/__init__.py b/dev_odex30_accounting/exp_asset_base/__init__.py
new file mode 100644
index 0000000..f97d742
--- /dev/null
+++ b/dev_odex30_accounting/exp_asset_base/__init__.py
@@ -0,0 +1,5 @@
+# -*- coding: utf-8 -*-
+# © Copyright (C) 2021 Expert Co. Ltd(<http:/www.exp-sa.com>)
+
+from . import models
+from . import reports
diff --git a/dev_odex30_accounting/exp_asset_base/__manifest__.py b/dev_odex30_accounting/exp_asset_base/__manifest__.py
new file mode 100644
index 0000000..133b49f
--- /dev/null
+++ b/dev_odex30_accounting/exp_asset_base/__manifest__.py
@@ -0,0 +1,45 @@
+# -*- coding: utf-8 -*-
+# © 2016 ACSONE SA/NV (<http://acsone.eu>)
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+{
+    'name': 'Asset Extend',
+    'summary': 'Adding new features to asset',
+    'description': '''
+Adding the following Features:
+==============================
+
+Alter asset Form
+
+Alter Asset category Form
+
+Alter Product Form
+
+Add asset operations (Transfer, Sell/Dispose, Maitenenace, Assesment)
+    ''',
+    'version': '1.0.0',
+    'category': 'Odex30-Accounting/Odex30-Accounting',
+    'author': 'Expert Co. Ltd.',
+    'website': 'http://www.exp-sa.com',
+    'license': 'AGPL-3',
+    'application': False,
+    'installable': True,
+    'depends': [
+        'odex30_account_asset',
+        'hr', 'barcodes', 'report_xlsx'
+    ],
+    'data': [
+        'security/groups.xml',
+        'security/ir.model.access.csv',
+        'data/asset_data.xml',
+        'data/asset_cron.xml',
+        'reports/reports.xml',
+        'reports/asset_barcode_pdf_report.xml',
+        'reports/asset_barcode_zpl_report.xml',
+        'views/account_asset_view.xml',
+        'views/account_asset_adjustment_view.xml',
+        'views/menus.xml',
+        # 'views/asset_modify_views.xml',
+        # 'views/asset_pause_views.xml',
+        # 'views/asset_sell_views.xml',
+    ],
+}
diff --git a/dev_odex30_accounting/exp_asset_base/__pycache__/__init__.cpython-311.pyc b/dev_odex30_accounting/exp_asset_base/__pycache__/__init__.cpython-311.pyc
new file mode 100644
index 0000000..9a547cf
Binary files /dev/null and b/dev_odex30_accounting/exp_asset_base/__pycache__/__init__.cpython-311.pyc differ
diff --git a/dev_odex30_accounting/exp_asset_base/data/asset_cron.xml b/dev_odex30_accounting/exp_asset_base/data/asset_cron.xml
new file mode 100644
index 0000000..6602fe3
--- /dev/null
+++ b/dev_odex30_accounting/exp_asset_base/data/asset_cron.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding='UTF-8'?>
+<odoo>
+	<record model="ir.cron" id="asset_cron">
+        <field name="name">Asset Reminder</field>
+        <field name="model_id" ref="model_account_asset"/>
+        <field name="state">code</field>
+        <field name="code">model._asset_cron()</field>
+        <field name="interval_number">1</field>
+        <field name="interval_type">days</field>
+    </record>
+</odoo>
\ No newline at end of file
diff --git a/dev_odex30_accounting/exp_asset_base/data/asset_data.xml b/dev_odex30_accounting/exp_asset_base/data/asset_data.xml
new file mode 100644
index 0000000..f4b7831
--- /dev/null
+++ b/dev_odex30_accounting/exp_asset_base/data/asset_data.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <data noupdate="0">
+        <record id="asset_sequence" model="ir.sequence">
+            <field name="name">Asset Sequence</field>
+            <field name="code">asset.seq</field>
+            <field name="prefix">ASS/%(range_year)s/</field>
+            <field eval="1" name="number_next"/>
+            <field eval="1" name="number_increment"/>
+            <field eval="True" name="use_date_range"/>
+            <field eval="False" name="company_id"/>
+            <field name="padding">6</field>
+        </record>
+        <!--record id="asset_operation_sequence" model="ir.sequence">
+            <field name="name">Asset Operation Sequence</field>
+            <field name="code">asset.operation.seq</field>
+            <field name="prefix">ASS OP/%(range_year)s/</field>
+            <field eval="1" name="number_next"/>
+            <field eval="1" name="number_increment"/>
+            <field eval="True" name="use_date_range"/>
+            <field eval="False" name="company_id"/>
+            <field name="padding">6</field>
+        </record>
+        <record id="asset_multi_operation_sequence" model="ir.sequence">
+            <field name="name">Asset Multi Operation Sequence</field>
+            <field name="code">asset.multi.operation.seq</field>
+            <field name="prefix">ASS MOP/%(range_year)s/</field>
+            <field eval="1" name="number_next"/>
+            <field eval="1" name="number_increment"/>
+            <field eval="True" name="use_date_range"/>
+            <field eval="False" name="company_id"/>
+            <field name="padding">6</field>
+        </record-->
+        <record id="asset_state" model="asset.state2">
+            <field name="name">Good</field>
+        </record>
+        <record id="asset_state2" model="asset.state2">
+            <field name="name">Scarp</field>
+        </record>
+    </data>
+</odoo>
\ No newline at end of file
diff --git a/dev_odex30_accounting/exp_asset_base/i18n/ar.po b/dev_odex30_accounting/exp_asset_base/i18n/ar.po
new file mode 100644
index 0000000..ae988a1
--- /dev/null
+++ b/dev_odex30_accounting/exp_asset_base/i18n/ar.po
@@ -0,0 +1,1410 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# 	* exp_asset_base
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 14.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2023-09-03 08:16+0000\n"
+"PO-Revision-Date: 2023-09-03 08:16+0000\n"
+"Last-Translator: \n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: exp_asset_base
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset__asset_adjustment_count
+msgid "# of Adjustments"
+msgstr "الجرد"
+
+#. module: exp_asset_base
+#: code:addons/exp_asset_base/models/asset_modify.py:0
+#, python-format
+msgid "A gross increase has been created"
+msgstr ""
+
+#. module: exp_asset_base
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_modify__account_asset_counterpart_id
+msgid "Account Asset Counterpart"
+msgstr ""
+
+#. module: exp_asset_base
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_modify__account_depreciation_id
+msgid "Account Depreciation"
+msgstr ""
+
+#. module: exp_asset_base
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_modify__account_depreciation_expense_id
+msgid "Account Depreciation Expense"
+msgstr ""
+
+#. module: exp_asset_base
+#: model:ir.model.fields,help:exp_asset_base.field_asset_sell__gain_account_id
+msgid "Account used to write the journal item in case of gain"
+msgstr "الحساب المستخدم لكتابة بند دفتر اليومية في حالة الربح"
+
+#. module: exp_asset_base
+#: model:ir.model.fields,help:exp_asset_base.field_asset_sell__loss_account_id
+msgid "Account used to write the journal item in case of loss"
+msgstr "الحساب المستخدم لكتابة بند دفتر اليومية في حالة الخسارة"
+
+#. module: exp_asset_base
+#: model:ir.model.fields,field_description:exp_asset_base.field_asset_sell__action
+msgid "Action"
+msgstr "إجراء"
+
+#. module: exp_asset_base
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset__message_needaction
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_adjustment__message_needaction
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_location__message_needaction
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_manufacturer__message_needaction
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_modify__message_needaction
+#: model:ir.model.fields,field_description:exp_asset_base.field_asset_pause__message_needaction
+#: model:ir.model.fields,field_description:exp_asset_base.field_asset_sell__message_needaction
+msgid "Action Needed"
+msgstr "إجراء مطلوب"
+
+#. module: exp_asset_base
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset__activity_ids
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_adjustment__activity_ids
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_location__activity_ids
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_manufacturer__activity_ids
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_modify__activity_ids
+#: model:ir.model.fields,field_description:exp_asset_base.field_asset_pause__activity_ids
+#: model:ir.model.fields,field_description:exp_asset_base.field_asset_sell__activity_ids
+msgid "Activities"
+msgstr "الأنشطة"
+
+#. module: exp_asset_base
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset__activity_exception_decoration
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_adjustment__activity_exception_decoration
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_location__activity_exception_decoration
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_manufacturer__activity_exception_decoration
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_modify__activity_exception_decoration
+#: model:ir.model.fields,field_description:exp_asset_base.field_asset_pause__activity_exception_decoration
+#: model:ir.model.fields,field_description:exp_asset_base.field_asset_sell__activity_exception_decoration
+msgid "Activity Exception Decoration"
+msgstr "زخرفة استثناء النشاط"
+
+#. module: exp_asset_base
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset__activity_state
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_adjustment__activity_state
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_location__activity_state
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_manufacturer__activity_state
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_modify__activity_state
+#: model:ir.model.fields,field_description:exp_asset_base.field_asset_pause__activity_state
+#: model:ir.model.fields,field_description:exp_asset_base.field_asset_sell__activity_state
+msgid "Activity State"
+msgstr "حالة النشاط"
+
+#. module: exp_asset_base
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset__activity_type_icon
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_adjustment__activity_type_icon
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_location__activity_type_icon
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_manufacturer__activity_type_icon
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_modify__activity_type_icon
+#: model:ir.model.fields,field_description:exp_asset_base.field_asset_pause__activity_type_icon
+#: model:ir.model.fields,field_description:exp_asset_base.field_asset_sell__activity_type_icon
+msgid "Activity Type Icon"
+msgstr "أيقونة نوع النشاط"
+
+#. module: exp_asset_base
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_adjustment_line__adjustment_id
+msgid "Adjustment"
+msgstr "جرد الأصول"
+
+#. module: exp_asset_base
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_adjustment__adjustment_line_ids
+msgid "Adjustment Line"
+msgstr "تفاصيل الجرد"
+
+#. module: exp_asset_base
+#: model_terms:ir.ui.view,arch_db:exp_asset_base.view_account_asset_form
+msgid "Adjustments"
+msgstr "الجرد"
+
+#. module: exp_asset_base
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_location__account_analytic_id
+msgid "Analytic Account"
+msgstr "الحساب التحليلي"
+
+#. module: exp_asset_base
+#: model_terms:ir.ui.view,arch_db:exp_asset_base.asset_modify_form
+#: model_terms:ir.ui.view,arch_db:exp_asset_base.asset_pause_form
+#: model_terms:ir.ui.view,arch_db:exp_asset_base.asset_sell_form
+msgid "Approve"
+msgstr "إعتماد"
+
+#. module: exp_asset_base
+#: model:ir.model.fields.selection,name:exp_asset_base.selection__account_asset_modify__state__approve
+#: model:ir.model.fields.selection,name:exp_asset_base.selection__asset_pause__state__approve
+#: model:ir.model.fields.selection,name:exp_asset_base.selection__asset_sell__state__approve
+msgid "Approved"
+msgstr "إعتماد"
+
+#. module: exp_asset_base
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_adjustment_line__asset_id
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_modify__asset_id
+#: model:ir.model.fields,field_description:exp_asset_base.field_asset_pause__asset_id
+#: model:ir.model.fields,field_description:exp_asset_base.field_asset_sell__asset_id
+msgid "Asset"
+msgstr "الأصل"
+
+#. module: exp_asset_base
+#: code:addons/exp_asset_base/models/account_asset.py:0
+#: model:ir.actions.act_window,name:exp_asset_base.action_asset_adjustment
+#: model:ir.model,name:exp_asset_base.model_account_asset_adjustment
+#: model_terms:ir.ui.view,arch_db:exp_asset_base.asset_adjustment_form
+#: model_terms:ir.ui.view,arch_db:exp_asset_base.asset_adjustment_line_tree
+#: model_terms:ir.ui.view,arch_db:exp_asset_base.asset_adjustment_tree
+#, python-format
+msgid "Asset Adjustment"
+msgstr "جرد الأصول"
+
+#. module: exp_asset_base
+#: model:ir.model,name:exp_asset_base.model_account_asset_adjustment_line
+msgid "Asset Adjustment Line"
+msgstr "تفاصيل جرد الأصول"
+
+#. module: exp_asset_base
+#: model:res.groups,name:exp_asset_base.group_asset_assessment
+msgid "Asset Assessment"
+msgstr "إعادة التقييم"
+
+#. module: exp_asset_base
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_modify__account_asset_id
+msgid "Asset Gross Increase Account"
+msgstr "حساب زيادة قيمة الأصل"
+
+#. module: exp_asset_base
+#: model:ir.model,name:exp_asset_base.model_account_asset_location
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_location__complete_name
+#: model_terms:ir.ui.view,arch_db:exp_asset_base.asset_location_form
+#: model_terms:ir.ui.view,arch_db:exp_asset_base.asset_manufacturer_form
+msgid "Asset Location"
+msgstr "مواقع الأصول"
+
+#. module: exp_asset_base
+#: model:ir.model,name:exp_asset_base.model_account_asset_manufacturer
+msgid "Asset Manufacturer"
+msgstr "تصنيع الأصل"
+
+#. module: exp_asset_base
+#: model:ir.actions.act_window,name:exp_asset_base.action_asset_modify
+msgid "Asset Modification"
+msgstr "تعديل الأصل"
+
+#. module: exp_asset_base
+#: model:ir.actions.act_window,name:exp_asset_base.action_asset_pause
+msgid "Asset Pause"
+msgstr "إيقاف الأصل"
+
+#. module: exp_asset_base
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset__asset_picture
+msgid "Asset Picture"
+msgstr "صورة الأصل"
+
+#. module: exp_asset_base
+#: code:addons/exp_asset_base/reports/asset_register_report_xlsx.py:0
+#, python-format
+msgid "Asset Register"
+msgstr "سجل الأصول"
+
+#. module: exp_asset_base
+#: model:ir.actions.server,name:exp_asset_base.asset_cron_ir_actions_server
+#: model:ir.cron,cron_name:exp_asset_base.asset_cron
+#: model:ir.cron,name:exp_asset_base.asset_cron
+msgid "Asset Reminder"
+msgstr ""
+
+#. module: exp_asset_base
+#: model:ir.actions.act_window,name:exp_asset_base.action_asset_sell
+msgid "Asset Sell"
+msgstr "بيع الأصل"
+
+#. module: exp_asset_base
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_adjustment_line__asset_status
+msgid "Asset Status"
+msgstr "حالة العهد"
+
+#. module: exp_asset_base
+#: model:ir.model.constraint,message:exp_asset_base.constraint_account_asset_asset_barcode_uniq
+msgid "Asset barcode must be unique."
+msgstr "يجب أن يكون باكود الأصل فريدً."
+
+#. module: exp_asset_base
+#: model:ir.actions.report,name:exp_asset_base.action_report_asset_register_xlsx
+msgid "Asset register XLSX"
+msgstr "سجل الاصول (اكسل)"
+
+#. module: exp_asset_base
+#: code:addons/exp_asset_base/models/asset_modify.py:0
+#, python-format
+msgid "Asset unpaused"
+msgstr ""
+
+#. module: exp_asset_base
+#: model:ir.model,name:exp_asset_base.model_account_asset
+msgid "Asset/Revenue Recognition"
+msgstr "أصل/ إيرادات مقدمة"
+
+#. module: exp_asset_base
+#: model:ir.ui.menu,name:exp_asset_base.menu_account_asset_adjustment
+msgid "Assets Adjustment"
+msgstr "جرد الاصول"
+
+#. module: exp_asset_base
+#: model:ir.actions.act_window,name:exp_asset_base.action_account_asset_graph
+#: model:ir.ui.menu,name:exp_asset_base.menu_account_asset_graph
+#: model_terms:ir.ui.view,arch_db:exp_asset_base.view_account_asset_graph
+#: model_terms:ir.ui.view,arch_db:exp_asset_base.view_account_asset_pivot
+msgid "Assets Analysis"
+msgstr "تحليل الأصول"
+
+#. module: exp_asset_base
+#: model:ir.actions.act_window,name:exp_asset_base.action_account_asset_location
+#: model:ir.ui.menu,name:exp_asset_base.menu_account_asset_location
+msgid "Assets Locations"
+msgstr "المواقع"
+
+#. module: exp_asset_base
+#: model:ir.ui.menu,name:exp_asset_base.menu_account_asset_management_main
+msgid "Assets Management"
+msgstr "إدارة الأصول"
+
+#. module: exp_asset_base
+#: model:ir.actions.act_window,name:exp_asset_base.action_account_asset_manufacturer
+msgid "Assets Manufacturer"
+msgstr "الشركات المُصنعة"
+
+#. module: exp_asset_base
+#: model:ir.ui.menu,name:exp_asset_base.asset_modify_menu
+msgid "Assets Modification"
+msgstr "تعديل الأصول"
+
+#. module: exp_asset_base
+#: model:ir.ui.menu,name:exp_asset_base.menu_account_asset_operation
+#: model:ir.ui.menu,name:exp_asset_base.menu_account_asset_operation_main
+msgid "Assets Operations"
+msgstr "عمليات الأصول"
+
+#. module: exp_asset_base
+#: model:ir.ui.menu,name:exp_asset_base.asset_pause_menu
+msgid "Assets Pause"
+msgstr "إيقاف الأصول"
+
+#. module: exp_asset_base
+#: model:ir.ui.menu,name:exp_asset_base.asset_sell_menu
+msgid "Assets Sell"
+msgstr "بيع الأصول"
+
+#. module: exp_asset_base
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset__message_attachment_count
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_adjustment__message_attachment_count
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_location__message_attachment_count
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_manufacturer__message_attachment_count
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_modify__message_attachment_count
+#: model:ir.model.fields,field_description:exp_asset_base.field_asset_pause__message_attachment_count
+#: model:ir.model.fields,field_description:exp_asset_base.field_asset_sell__message_attachment_count
+msgid "Attachment Count"
+msgstr "عدد المرفقات"
+
+#. module: exp_asset_base
+#: model:ir.model.fields.selection,name:exp_asset_base.selection__account_asset__status__available
+msgid "Available"
+msgstr "متوفر"
+
+#. module: exp_asset_base
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset__barcode
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_adjustment__barcode
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_adjustment_line__barcode
+#: model_terms:ir.ui.view,arch_db:exp_asset_base.view_account_asset_form
+msgid "Barcode"
+msgstr "الباركود"
+
+#. module: exp_asset_base
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_adjustment___barcode_scanned
+msgid "Barcode Scanned"
+msgstr "الباركود"
+
+#. module: exp_asset_base
+#: model_terms:ir.ui.view,arch_db:exp_asset_base.asset_adjustment_form
+msgid "Barcode..."
+msgstr "باركود..."
+
+#. module: exp_asset_base
+#: model_terms:ir.ui.view,arch_db:exp_asset_base.view_account_asset_form
+msgid "Basic Info"
+msgstr "المعلومات الأساسية"
+
+#. module: exp_asset_base
+#: model:ir.model.fields.selection,name:exp_asset_base.selection__account_asset_adjustment__type__model
+msgid "By Model"
+msgstr "النموذج"
+
+#. module: exp_asset_base
+#: model:ir.model.fields.selection,name:exp_asset_base.selection__account_asset_adjustment__type__product
+msgid "By Product"
+msgstr "المنتج"
+
+#. module: exp_asset_base
+#: model:ir.model.fields.selection,name:exp_asset_base.selection__account_asset_adjustment__state__cancel
+msgid "Cancel"
+msgstr "إلغاء"
+
+#. module: exp_asset_base
+#: code:addons/exp_asset_base/reports/asset_depreciation_report_xlsx.py:0
+#, python-format
+msgid "Categories"
+msgstr "فئات"
+
+#. module: exp_asset_base
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_location__child_id
+#: model_terms:ir.ui.view,arch_db:exp_asset_base.asset_location_form
+msgid "Child Locations"
+msgstr "المواقع الفرعية"
+
+#. module: exp_asset_base
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_location__code
+msgid "Code"
+msgstr "الكود"
+
+#. module: exp_asset_base
+#: model:ir.model.fields,field_description:exp_asset_base.field_asset_sell__company_id
+msgid "Company"
+msgstr "الشركة"
+
+#. module: exp_asset_base
+#: model:ir.ui.menu,name:exp_asset_base.menu_account_asset_configuration_main
+msgid "Configurations"
+msgstr "الإعدادات"
+
+#. module: exp_asset_base
+#: model_terms:ir.ui.view,arch_db:exp_asset_base.asset_adjustment_form
+#: model_terms:ir.ui.view,arch_db:exp_asset_base.asset_modify_form
+#: model_terms:ir.ui.view,arch_db:exp_asset_base.asset_pause_form
+#: model_terms:ir.ui.view,arch_db:exp_asset_base.asset_sell_form
+msgid "Confirm"
+msgstr "تأكيد"
+
+#. module: exp_asset_base
+#: model:ir.model.fields.selection,name:exp_asset_base.selection__account_asset_modify__state__confirm
+#: model:ir.model.fields.selection,name:exp_asset_base.selection__asset_pause__state__confirm
+#: model:ir.model.fields.selection,name:exp_asset_base.selection__asset_sell__state__confirm
+msgid "Confirmed"
+msgstr "تم الإعتماد"
+
+#. module: exp_asset_base
+#: model_terms:ir.ui.view,arch_db:exp_asset_base.view_account_asset_search
+msgid "Cost Center"
+msgstr "مركز التكلفة"
+
+#. module: exp_asset_base
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_adjustment__create_uid
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_adjustment_line__create_uid
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_location__create_uid
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_manufacturer__create_uid
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_modify__create_uid
+#: model:ir.model.fields,field_description:exp_asset_base.field_asset_pause__create_uid
+#: model:ir.model.fields,field_description:exp_asset_base.field_asset_sell__create_uid
+msgid "Created by"
+msgstr "أنشئ بواسطة"
+
+#. module: exp_asset_base
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_adjustment__create_date
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_adjustment_line__create_date
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_location__create_date
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_manufacturer__create_date
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_modify__create_date
+#: model:ir.model.fields,field_description:exp_asset_base.field_asset_pause__create_date
+#: model:ir.model.fields,field_description:exp_asset_base.field_asset_sell__create_date
+msgid "Created on"
+msgstr "أنشئ في"
+
+#. module: exp_asset_base
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_modify__currency_id
+msgid "Currency"
+msgstr "العملة"
+
+#. module: exp_asset_base
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset__location_id
+msgid "Current Location"
+msgstr "الموقع الحالي"
+
+#. module: exp_asset_base
+#: model_terms:ir.ui.view,arch_db:exp_asset_base.view_account_asset_asset_purchase_tree
+msgid "Custody Status"
+msgstr "حالة العهدة"
+
+#. module: exp_asset_base
+#: model:ir.model.fields,field_description:exp_asset_base.field_asset_sell__invoice_id
+msgid "Customer Invoice"
+msgstr "فاتورة العميل"
+
+#. module: exp_asset_base
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_adjustment__date
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_modify__date
+msgid "Date"
+msgstr "التاريخ"
+
+#. module: exp_asset_base
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_modify__value_residual
+msgid "Depreciable Amount"
+msgstr "القيمة القابلة للإستهلاك"
+
+#. module: exp_asset_base
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset__value_residual
+msgid "Depreciable Value"
+msgstr "القيمة القابلة للإستهلاك"
+
+#. module: exp_asset_base
+#: model_terms:ir.ui.view,arch_db:exp_asset_base.view_account_asset_depreciation_graph
+#: model_terms:ir.ui.view,arch_db:exp_asset_base.view_account_asset_depreciation_pivot
+msgid "Depreciation"
+msgstr "إستهلاك"
+
+#. module: exp_asset_base
+#: model:ir.actions.act_window,name:exp_asset_base.action_account_asset_depreciation_analysis
+#: model:ir.ui.menu,name:exp_asset_base.menu_account_Depreciation_graph
+#: model_terms:ir.ui.view,arch_db:exp_asset_base.view_account_asset_depreciation_graph
+#: model_terms:ir.ui.view,arch_db:exp_asset_base.view_account_asset_depreciation_pivot
+msgid "Depreciation Analysis"
+msgstr "تحليل الإستهلاكات"
+
+#. module: exp_asset_base
+#: model_terms:ir.ui.view,arch_db:exp_asset_base.view_account_asset_depreciation_graph
+#: model_terms:ir.ui.view,arch_db:exp_asset_base.view_account_asset_depreciation_pivot
+msgid "Depreciation Date"
+msgstr "تاريخ الإستهلاك"
+
+#. module: exp_asset_base
+#: code:addons/exp_asset_base/models/asset_modify.py:0
+#, python-format
+msgid "Depreciation board modified"
+msgstr ""
+
+#. module: exp_asset_base
+#: model_terms:ir.ui.view,arch_db:exp_asset_base.asset_adjustment_form
+msgid "Details"
+msgstr "التفاصيل"
+
+#. module: exp_asset_base
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset__display_name
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_adjustment__display_name
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_adjustment_line__display_name
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_location__display_name
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_manufacturer__display_name
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_modify__display_name
+#: model:ir.model.fields,field_description:exp_asset_base.field_asset_pause__display_name
+#: model:ir.model.fields,field_description:exp_asset_base.field_asset_sell__display_name
+#: model:ir.model.fields,field_description:exp_asset_base.field_report_asset_abstract_report_xlsx__display_name
+#: model:ir.model.fields,field_description:exp_asset_base.field_report_report_asset_register_xlsx__display_name
+msgid "Display Name"
+msgstr "الاسم المعروض"
+
+#. module: exp_asset_base
+#: model:ir.model.fields.selection,name:exp_asset_base.selection__asset_sell__action__dispose
+msgid "Dispose"
+msgstr "إهلاك"
+
+#. module: exp_asset_base
+#: model:ir.model.fields.selection,name:exp_asset_base.selection__account_asset_adjustment__state__done
+#: model:ir.model.fields.selection,name:exp_asset_base.selection__account_asset_modify__state__done
+#: model:ir.model.fields.selection,name:exp_asset_base.selection__asset_pause__state__done
+#: model:ir.model.fields.selection,name:exp_asset_base.selection__asset_sell__state__done
+#: model_terms:ir.ui.view,arch_db:exp_asset_base.asset_modify_form
+#: model_terms:ir.ui.view,arch_db:exp_asset_base.asset_pause_form
+#: model_terms:ir.ui.view,arch_db:exp_asset_base.asset_sell_form
+msgid "Done"
+msgstr "تم"
+
+#. module: exp_asset_base
+#: model:ir.model.fields.selection,name:exp_asset_base.selection__account_asset_adjustment__state__draft
+#: model:ir.model.fields.selection,name:exp_asset_base.selection__account_asset_modify__state__draft
+#: model:ir.model.fields.selection,name:exp_asset_base.selection__asset_pause__state__draft
+#: model:ir.model.fields.selection,name:exp_asset_base.selection__asset_sell__state__draft
+msgid "Draft"
+msgstr "مسودة"
+
+#. module: exp_asset_base
+#: code:addons/exp_asset_base/reports/asset_depreciation_report_xlsx.py:0
+#, python-format
+msgid "Duration"
+msgstr "الفترة"
+
+#. module: exp_asset_base
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_adjustment_line__exist
+msgid "Exist?"
+msgstr "موجود?"
+
+#. module: exp_asset_base
+#: code:addons/exp_asset_base/reports/asset_depreciation_report_xlsx.py:0
+#, python-format
+msgid "Fixed Asset Register"
+msgstr "سجل الأصول"
+
+#. module: exp_asset_base
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset__message_follower_ids
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_adjustment__message_follower_ids
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_location__message_follower_ids
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_manufacturer__message_follower_ids
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_modify__message_follower_ids
+#: model:ir.model.fields,field_description:exp_asset_base.field_asset_pause__message_follower_ids
+#: model:ir.model.fields,field_description:exp_asset_base.field_asset_sell__message_follower_ids
+msgid "Followers"
+msgstr "المتابعون"
+
+#. module: exp_asset_base
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset__message_channel_ids
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_adjustment__message_channel_ids
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_location__message_channel_ids
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_manufacturer__message_channel_ids
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_modify__message_channel_ids
+#: model:ir.model.fields,field_description:exp_asset_base.field_asset_pause__message_channel_ids
+#: model:ir.model.fields,field_description:exp_asset_base.field_asset_sell__message_channel_ids
+msgid "Followers (Channels)"
+msgstr "المتابعون (القنوات)"
+
+#. module: exp_asset_base
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset__message_partner_ids
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_adjustment__message_partner_ids
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_location__message_partner_ids
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_manufacturer__message_partner_ids
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_modify__message_partner_ids
+#: model:ir.model.fields,field_description:exp_asset_base.field_asset_pause__message_partner_ids
+#: model:ir.model.fields,field_description:exp_asset_base.field_asset_sell__message_partner_ids
+msgid "Followers (Partners)"
+msgstr "المتابعون (الشركاء)"
+
+#. module: exp_asset_base
+#: model:ir.model.fields,help:exp_asset_base.field_account_asset__activity_type_icon
+#: model:ir.model.fields,help:exp_asset_base.field_account_asset_adjustment__activity_type_icon
+#: model:ir.model.fields,help:exp_asset_base.field_account_asset_location__activity_type_icon
+#: model:ir.model.fields,help:exp_asset_base.field_account_asset_manufacturer__activity_type_icon
+#: model:ir.model.fields,help:exp_asset_base.field_account_asset_modify__activity_type_icon
+#: model:ir.model.fields,help:exp_asset_base.field_asset_pause__activity_type_icon
+#: model:ir.model.fields,help:exp_asset_base.field_asset_sell__activity_type_icon
+msgid "Font awesome icon e.g. fa-tasks"
+msgstr ""
+
+#. module: exp_asset_base
+#: code:addons/exp_asset_base/reports/asset_depreciation_report_xlsx.py:0
+#, python-format
+msgid "From: "
+msgstr "من: "
+
+#. module: exp_asset_base
+#: model:ir.model.fields.selection,name:exp_asset_base.selection__asset_sell__gain_or_loss__gain
+msgid "Gain"
+msgstr "ربح"
+
+#. module: exp_asset_base
+#: model:ir.model.fields,field_description:exp_asset_base.field_asset_sell__gain_account_id
+msgid "Gain Account"
+msgstr "حساب الأرباح"
+
+#. module: exp_asset_base
+#: model:ir.model.fields,field_description:exp_asset_base.field_asset_sell__gain_or_loss
+msgid "Gain Or Loss"
+msgstr "الربح أو الخسارة"
+
+#. module: exp_asset_base
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_modify__gain_value
+msgid "Gain Value"
+msgstr "قيمة الربح"
+
+#. module: exp_asset_base
+#: model:ir.model.fields.selection,name:exp_asset_base.selection__account_asset_adjustment_line__asset_status__good
+msgid "Good"
+msgstr "جيد"
+
+#. module: exp_asset_base
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset__id
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_adjustment__id
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_adjustment_line__id
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_location__id
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_manufacturer__id
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_modify__id
+#: model:ir.model.fields,field_description:exp_asset_base.field_asset_pause__id
+#: model:ir.model.fields,field_description:exp_asset_base.field_asset_sell__id
+#: model:ir.model.fields,field_description:exp_asset_base.field_report_asset_abstract_report_xlsx__id
+#: model:ir.model.fields,field_description:exp_asset_base.field_report_report_asset_register_xlsx__id
+msgid "ID"
+msgstr "المُعرف"
+
+#. module: exp_asset_base
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset__activity_exception_icon
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_adjustment__activity_exception_icon
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_location__activity_exception_icon
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_manufacturer__activity_exception_icon
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_modify__activity_exception_icon
+#: model:ir.model.fields,field_description:exp_asset_base.field_asset_pause__activity_exception_icon
+#: model:ir.model.fields,field_description:exp_asset_base.field_asset_sell__activity_exception_icon
+msgid "Icon"
+msgstr "الأيقونة"
+
+#. module: exp_asset_base
+#: model:ir.model.fields,help:exp_asset_base.field_account_asset__activity_exception_icon
+#: model:ir.model.fields,help:exp_asset_base.field_account_asset_adjustment__activity_exception_icon
+#: model:ir.model.fields,help:exp_asset_base.field_account_asset_location__activity_exception_icon
+#: model:ir.model.fields,help:exp_asset_base.field_account_asset_manufacturer__activity_exception_icon
+#: model:ir.model.fields,help:exp_asset_base.field_account_asset_modify__activity_exception_icon
+#: model:ir.model.fields,help:exp_asset_base.field_asset_pause__activity_exception_icon
+#: model:ir.model.fields,help:exp_asset_base.field_asset_sell__activity_exception_icon
+msgid "Icon to indicate an exception activity."
+msgstr "الأيقونة للإشارة إلى استثناء النشاط"
+
+#. module: exp_asset_base
+#: model:ir.model.fields,help:exp_asset_base.field_account_asset__message_needaction
+#: model:ir.model.fields,help:exp_asset_base.field_account_asset__message_unread
+#: model:ir.model.fields,help:exp_asset_base.field_account_asset_adjustment__message_needaction
+#: model:ir.model.fields,help:exp_asset_base.field_account_asset_adjustment__message_unread
+#: model:ir.model.fields,help:exp_asset_base.field_account_asset_location__message_needaction
+#: model:ir.model.fields,help:exp_asset_base.field_account_asset_location__message_unread
+#: model:ir.model.fields,help:exp_asset_base.field_account_asset_manufacturer__message_needaction
+#: model:ir.model.fields,help:exp_asset_base.field_account_asset_manufacturer__message_unread
+#: model:ir.model.fields,help:exp_asset_base.field_account_asset_modify__message_needaction
+#: model:ir.model.fields,help:exp_asset_base.field_account_asset_modify__message_unread
+#: model:ir.model.fields,help:exp_asset_base.field_asset_pause__message_needaction
+#: model:ir.model.fields,help:exp_asset_base.field_asset_pause__message_unread
+#: model:ir.model.fields,help:exp_asset_base.field_asset_sell__message_needaction
+#: model:ir.model.fields,help:exp_asset_base.field_asset_sell__message_unread
+msgid "If checked, new messages require your attention."
+msgstr "إذا كان محددًا، فهناك رسائل جديدة تحتاج لرؤيتها."
+
+#. module: exp_asset_base
+#: model:ir.model.fields,help:exp_asset_base.field_account_asset__message_has_error
+#: model:ir.model.fields,help:exp_asset_base.field_account_asset__message_has_sms_error
+#: model:ir.model.fields,help:exp_asset_base.field_account_asset_adjustment__message_has_error
+#: model:ir.model.fields,help:exp_asset_base.field_account_asset_adjustment__message_has_sms_error
+#: model:ir.model.fields,help:exp_asset_base.field_account_asset_location__message_has_error
+#: model:ir.model.fields,help:exp_asset_base.field_account_asset_location__message_has_sms_error
+#: model:ir.model.fields,help:exp_asset_base.field_account_asset_manufacturer__message_has_error
+#: model:ir.model.fields,help:exp_asset_base.field_account_asset_manufacturer__message_has_sms_error
+#: model:ir.model.fields,help:exp_asset_base.field_account_asset_modify__message_has_error
+#: model:ir.model.fields,help:exp_asset_base.field_account_asset_modify__message_has_sms_error
+#: model:ir.model.fields,help:exp_asset_base.field_asset_pause__message_has_error
+#: model:ir.model.fields,help:exp_asset_base.field_asset_pause__message_has_sms_error
+#: model:ir.model.fields,help:exp_asset_base.field_asset_sell__message_has_error
+#: model:ir.model.fields,help:exp_asset_base.field_asset_sell__message_has_sms_error
+msgid "If checked, some messages have a delivery error."
+msgstr "إذا كان محددًا، فقد حدث خطأ في تسليم بعض الرسائل."
+
+#. module: exp_asset_base
+#: model:ir.model.fields.selection,name:exp_asset_base.selection__account_asset_adjustment__state__in_progress
+msgid "In Progress"
+msgstr "جاري"
+
+#. module: exp_asset_base
+#: model_terms:ir.ui.view,arch_db:exp_asset_base.asset_modify_form
+msgid "Increase Accounts"
+msgstr "حسابات الزيادة"
+
+#. module: exp_asset_base
+#: model:ir.model.fields,field_description:exp_asset_base.field_asset_sell__invoice_line_id
+msgid "Invoice Line"
+msgstr "بند الفاتورة"
+
+#. module: exp_asset_base
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset__message_is_follower
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_adjustment__message_is_follower
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_location__message_is_follower
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_manufacturer__message_is_follower
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_modify__message_is_follower
+#: model:ir.model.fields,field_description:exp_asset_base.field_asset_pause__message_is_follower
+#: model:ir.model.fields,field_description:exp_asset_base.field_asset_sell__message_is_follower
+msgid "Is Follower"
+msgstr "متابع"
+
+#. module: exp_asset_base
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset____last_update
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_adjustment____last_update
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_adjustment_line____last_update
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_location____last_update
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_manufacturer____last_update
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_modify____last_update
+#: model:ir.model.fields,field_description:exp_asset_base.field_asset_pause____last_update
+#: model:ir.model.fields,field_description:exp_asset_base.field_asset_sell____last_update
+#: model:ir.model.fields,field_description:exp_asset_base.field_report_asset_abstract_report_xlsx____last_update
+#: model:ir.model.fields,field_description:exp_asset_base.field_report_report_asset_register_xlsx____last_update
+msgid "Last Modified on"
+msgstr "آخر تعديل في"
+
+#. module: exp_asset_base
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_adjustment__write_uid
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_adjustment_line__write_uid
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_location__write_uid
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_manufacturer__write_uid
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_modify__write_uid
+#: model:ir.model.fields,field_description:exp_asset_base.field_asset_pause__write_uid
+#: model:ir.model.fields,field_description:exp_asset_base.field_asset_sell__write_uid
+msgid "Last Updated by"
+msgstr "آخر تحديث بواسطة"
+
+#. module: exp_asset_base
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_adjustment__write_date
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_adjustment_line__write_date
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_location__write_date
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_manufacturer__write_date
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_modify__write_date
+#: model:ir.model.fields,field_description:exp_asset_base.field_asset_pause__write_date
+#: model:ir.model.fields,field_description:exp_asset_base.field_asset_sell__write_date
+msgid "Last Updated on"
+msgstr "آخر تحديث في"
+
+#. module: exp_asset_base
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset__limit
+msgid "Limit"
+msgstr "حد"
+
+#. module: exp_asset_base
+#: model_terms:ir.ui.view,arch_db:exp_asset_base.asset_location_form
+msgid "Location Name..."
+msgstr "إسم الموقع..."
+
+#. module: exp_asset_base
+#: model_terms:ir.ui.view,arch_db:exp_asset_base.view_account_asset_form
+msgid "Lock"
+msgstr "إغلاق"
+
+#. module: exp_asset_base
+#: model:ir.model.fields.selection,name:exp_asset_base.selection__asset_sell__gain_or_loss__loss
+msgid "Loss"
+msgstr "خسارة"
+
+#. module: exp_asset_base
+#: model:ir.model.fields,field_description:exp_asset_base.field_asset_sell__loss_account_id
+msgid "Loss Account"
+msgstr "حساب الخسارة"
+
+#. module: exp_asset_base
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset__message_main_attachment_id
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_adjustment__message_main_attachment_id
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_location__message_main_attachment_id
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_manufacturer__message_main_attachment_id
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_modify__message_main_attachment_id
+#: model:ir.model.fields,field_description:exp_asset_base.field_asset_pause__message_main_attachment_id
+#: model:ir.model.fields,field_description:exp_asset_base.field_asset_sell__message_main_attachment_id
+msgid "Main Attachment"
+msgstr "المرفق الرئيسي"
+
+#. module: exp_asset_base
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset__manufacturer_id
+#: model:ir.ui.menu,name:exp_asset_base.menu_account_manufacturer
+msgid "Manufacturer"
+msgstr "المُصنع"
+
+#. module: exp_asset_base
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset__message_has_error
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_adjustment__message_has_error
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_location__message_has_error
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_manufacturer__message_has_error
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_modify__message_has_error
+#: model:ir.model.fields,field_description:exp_asset_base.field_asset_pause__message_has_error
+#: model:ir.model.fields,field_description:exp_asset_base.field_asset_sell__message_has_error
+msgid "Message Delivery error"
+msgstr "خطأ في تسليم الرسائل"
+
+#. module: exp_asset_base
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset__message_ids
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_adjustment__message_ids
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_location__message_ids
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_manufacturer__message_ids
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_modify__message_ids
+#: model:ir.model.fields,field_description:exp_asset_base.field_asset_pause__message_ids
+#: model:ir.model.fields,field_description:exp_asset_base.field_asset_sell__message_ids
+msgid "Messages"
+msgstr "الرسائل"
+
+#. module: exp_asset_base
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset__model
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_adjustment__model_id
+msgid "Model"
+msgstr "النموذج"
+
+#. module: exp_asset_base
+#: model_terms:ir.ui.view,arch_db:exp_asset_base.asset_modify_form
+msgid "Modification"
+msgstr "التعديل"
+
+#. module: exp_asset_base
+#: model_terms:ir.ui.view,arch_db:exp_asset_base.asset_modify_form
+msgid "Modification reason"
+msgstr "سبب التعديل"
+
+#. module: exp_asset_base
+#: model_terms:ir.ui.view,arch_db:exp_asset_base.asset_modify_form
+msgid "Modification..."
+msgstr "التعديل ...."
+
+#. module: exp_asset_base
+#: model:ir.model,name:exp_asset_base.model_account_asset_modify
+#: model_terms:ir.ui.view,arch_db:exp_asset_base.asset_modify_form
+#: model_terms:ir.ui.view,arch_db:exp_asset_base.asset_modify_tree
+#: model_terms:ir.ui.view,arch_db:exp_asset_base.asset_pause_tree
+msgid "Modify Asset"
+msgstr "تعديل الأصل"
+
+#. module: exp_asset_base
+#: model:ir.model.fields.selection,name:exp_asset_base.selection__account_asset_modify__method_period__1
+msgid "Months"
+msgstr "عدد الشهور"
+
+#. module: exp_asset_base
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset__my_activity_date_deadline
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_adjustment__my_activity_date_deadline
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_location__my_activity_date_deadline
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_manufacturer__my_activity_date_deadline
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_modify__my_activity_date_deadline
+#: model:ir.model.fields,field_description:exp_asset_base.field_asset_pause__my_activity_date_deadline
+#: model:ir.model.fields,field_description:exp_asset_base.field_asset_sell__my_activity_date_deadline
+msgid "My Activity Deadline"
+msgstr ""
+
+#. module: exp_asset_base
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_adjustment__name
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_location__name
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_manufacturer__name
+msgid "Name"
+msgstr "الإسم"
+
+#. module: exp_asset_base
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_modify__need_date
+msgid "Need Date"
+msgstr "تحتاج لتاريخ"
+
+#. module: exp_asset_base
+#: model:ir.model.fields.selection,name:exp_asset_base.selection__account_asset__status__new
+msgid "New"
+msgstr "جديد"
+
+#. module: exp_asset_base
+#: model_terms:ir.ui.view,arch_db:exp_asset_base.asset_modify_form
+msgid "New Values"
+msgstr "القيمة الجديدة"
+
+#. module: exp_asset_base
+#: model:ir.model.fields,help:exp_asset_base.field_account_asset_modify__value_residual
+msgid "New residual amount for the asset"
+msgstr "المبلغ المتبقي الجديد للأصل"
+
+#. module: exp_asset_base
+#: model:ir.model.fields,help:exp_asset_base.field_account_asset_modify__salvage_value
+msgid "New salvage amount for the asset"
+msgstr "مبلغ الخردة الجديد للأصل"
+
+#. module: exp_asset_base
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset__activity_date_deadline
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_adjustment__activity_date_deadline
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_location__activity_date_deadline
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_manufacturer__activity_date_deadline
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_modify__activity_date_deadline
+#: model:ir.model.fields,field_description:exp_asset_base.field_asset_pause__activity_date_deadline
+#: model:ir.model.fields,field_description:exp_asset_base.field_asset_sell__activity_date_deadline
+msgid "Next Activity Deadline"
+msgstr "الموعد النهائي للنشاط التالي"
+
+#. module: exp_asset_base
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset__activity_summary
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_adjustment__activity_summary
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_location__activity_summary
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_manufacturer__activity_summary
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_modify__activity_summary
+#: model:ir.model.fields,field_description:exp_asset_base.field_asset_pause__activity_summary
+#: model:ir.model.fields,field_description:exp_asset_base.field_asset_sell__activity_summary
+msgid "Next Activity Summary"
+msgstr "ملخص النشاط التالي"
+
+#. module: exp_asset_base
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset__activity_type_id
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_adjustment__activity_type_id
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_location__activity_type_id
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_manufacturer__activity_type_id
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_modify__activity_type_id
+#: model:ir.model.fields,field_description:exp_asset_base.field_asset_pause__activity_type_id
+#: model:ir.model.fields,field_description:exp_asset_base.field_asset_sell__activity_type_id
+msgid "Next Activity Type"
+msgstr "نوع النشاط التالي"
+
+#. module: exp_asset_base
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset__next_maintenance_date
+msgid "Next Maintenance Date"
+msgstr "تاريخ الصيانة القادم"
+
+#. module: exp_asset_base
+#: model:ir.model.fields.selection,name:exp_asset_base.selection__asset_sell__gain_or_loss__no
+msgid "No"
+msgstr "لأ"
+
+#. module: exp_asset_base
+#: code:addons/exp_asset_base/models/account_asset_adjustment.py:0
+#, python-format
+msgid "No asset found with the selected barcode"
+msgstr "لم يتم العثور على أصل بالباركود المدخل"
+
+#. module: exp_asset_base
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_modify__salvage_value
+msgid "Not Depreciable Amount"
+msgstr "قيمة التخريد"
+
+#. module: exp_asset_base
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset__note
+msgid "Note"
+msgstr "ملاحظة"
+
+#. module: exp_asset_base
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset__message_needaction_counter
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_adjustment__message_needaction_counter
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_location__message_needaction_counter
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_manufacturer__message_needaction_counter
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_modify__message_needaction_counter
+#: model:ir.model.fields,field_description:exp_asset_base.field_asset_pause__message_needaction_counter
+#: model:ir.model.fields,field_description:exp_asset_base.field_asset_sell__message_needaction_counter
+msgid "Number of Actions"
+msgstr "عدد الإجراءات"
+
+#. module: exp_asset_base
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_modify__method_number
+msgid "Number of Depreciations"
+msgstr "عدد الإهلاكات"
+
+#. module: exp_asset_base
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_modify__method_period
+msgid "Number of Months in a Period"
+msgstr "عدد الشهور في الفترة"
+
+#. module: exp_asset_base
+#: model:ir.model.fields,help:exp_asset_base.field_account_asset__asset_adjustment_count
+msgid "Number of adjustments"
+msgstr "عدد عمليات الجرد"
+
+#. module: exp_asset_base
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset__message_has_error_counter
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_adjustment__message_has_error_counter
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_location__message_has_error_counter
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_manufacturer__message_has_error_counter
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_modify__message_has_error_counter
+#: model:ir.model.fields,field_description:exp_asset_base.field_asset_pause__message_has_error_counter
+#: model:ir.model.fields,field_description:exp_asset_base.field_asset_sell__message_has_error_counter
+msgid "Number of errors"
+msgstr "عدد الاخطاء"
+
+#. module: exp_asset_base
+#: model:ir.model.fields,help:exp_asset_base.field_account_asset__message_needaction_counter
+#: model:ir.model.fields,help:exp_asset_base.field_account_asset_adjustment__message_needaction_counter
+#: model:ir.model.fields,help:exp_asset_base.field_account_asset_location__message_needaction_counter
+#: model:ir.model.fields,help:exp_asset_base.field_account_asset_manufacturer__message_needaction_counter
+#: model:ir.model.fields,help:exp_asset_base.field_account_asset_modify__message_needaction_counter
+#: model:ir.model.fields,help:exp_asset_base.field_asset_pause__message_needaction_counter
+#: model:ir.model.fields,help:exp_asset_base.field_asset_sell__message_needaction_counter
+msgid "Number of messages which requires an action"
+msgstr "عدد الرسائل التي تتطلب إجراء"
+
+#. module: exp_asset_base
+#: model:ir.model.fields,help:exp_asset_base.field_account_asset__message_has_error_counter
+#: model:ir.model.fields,help:exp_asset_base.field_account_asset_adjustment__message_has_error_counter
+#: model:ir.model.fields,help:exp_asset_base.field_account_asset_location__message_has_error_counter
+#: model:ir.model.fields,help:exp_asset_base.field_account_asset_manufacturer__message_has_error_counter
+#: model:ir.model.fields,help:exp_asset_base.field_account_asset_modify__message_has_error_counter
+#: model:ir.model.fields,help:exp_asset_base.field_asset_pause__message_has_error_counter
+#: model:ir.model.fields,help:exp_asset_base.field_asset_sell__message_has_error_counter
+msgid "Number of messages with delivery error"
+msgstr "عدد الرسائل الحادث بها خطأ في التسليم"
+
+#. module: exp_asset_base
+#: model:ir.model.fields,help:exp_asset_base.field_account_asset__message_unread_counter
+#: model:ir.model.fields,help:exp_asset_base.field_account_asset_adjustment__message_unread_counter
+#: model:ir.model.fields,help:exp_asset_base.field_account_asset_location__message_unread_counter
+#: model:ir.model.fields,help:exp_asset_base.field_account_asset_manufacturer__message_unread_counter
+#: model:ir.model.fields,help:exp_asset_base.field_account_asset_modify__message_unread_counter
+#: model:ir.model.fields,help:exp_asset_base.field_asset_pause__message_unread_counter
+#: model:ir.model.fields,help:exp_asset_base.field_asset_sell__message_unread_counter
+msgid "Number of unread messages"
+msgstr "عدد الرسائل الجديدة"
+
+#. module: exp_asset_base
+#: model:ir.model.fields.selection,name:exp_asset_base.selection__account_asset_location__type__ordinary
+msgid "Ordinary"
+msgstr "عادي"
+
+#. module: exp_asset_base
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_location__parent_id
+msgid "Parent"
+msgstr "بارينت"
+
+#. module: exp_asset_base
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_location__parent_path
+msgid "Parent Path"
+msgstr "المسار الأصلي"
+
+#. module: exp_asset_base
+#: code:addons/exp_asset_base/models/account_asset.py:0
+#: model:ir.model,name:exp_asset_base.model_asset_pause
+#: model_terms:ir.ui.view,arch_db:exp_asset_base.asset_pause_form
+#, python-format
+msgid "Pause Asset"
+msgstr "إيقاف الأصل"
+
+#. module: exp_asset_base
+#: model:ir.model.fields,field_description:exp_asset_base.field_asset_pause__date
+msgid "Pause date"
+msgstr "تاريخ الإيقاف"
+
+#. module: exp_asset_base
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset__product_id
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_adjustment__product_id
+msgid "Product"
+msgstr "المنتج"
+
+#. module: exp_asset_base
+#: model:ir.ui.menu,name:exp_asset_base.menu_account_asset_products
+msgid "Products"
+msgstr "المنتجات"
+
+#. module: exp_asset_base
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_modify__name
+msgid "Reason"
+msgstr "السبب"
+
+#. module: exp_asset_base
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset__receive_date
+msgid "Receive Date"
+msgstr "تاريخ الإستلام"
+
+#. module: exp_asset_base
+#: model_terms:ir.ui.view,arch_db:exp_asset_base.asset_adjustment_form
+msgid "Reject"
+msgstr "رفض"
+
+#. module: exp_asset_base
+#: model:ir.ui.menu,name:exp_asset_base.menu_account_asset_reporting_main
+msgid "Reporting"
+msgstr "التقارير"
+
+#. module: exp_asset_base
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset__responsible_dept_id
+#: model_terms:ir.ui.view,arch_db:exp_asset_base.view_account_asset_search
+msgid "Responsible Department"
+msgstr "الإدارة المسئولة"
+
+#. module: exp_asset_base
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset__activity_user_id
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset__responsible_user_id
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_adjustment__activity_user_id
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_location__activity_user_id
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_manufacturer__activity_user_id
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_modify__activity_user_id
+#: model:ir.model.fields,field_description:exp_asset_base.field_asset_pause__activity_user_id
+#: model:ir.model.fields,field_description:exp_asset_base.field_asset_sell__activity_user_id
+msgid "Responsible User"
+msgstr "المستخدم المسؤول"
+
+#. module: exp_asset_base
+#: code:addons/exp_asset_base/models/asset_modify.py:0
+#, python-format
+msgid ""
+"Reverse the depreciation entries posted in the future in order to modify the"
+" depreciation"
+msgstr ""
+
+#. module: exp_asset_base
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset__message_has_sms_error
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_adjustment__message_has_sms_error
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_location__message_has_sms_error
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_manufacturer__message_has_sms_error
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_modify__message_has_sms_error
+#: model:ir.model.fields,field_description:exp_asset_base.field_asset_pause__message_has_sms_error
+#: model:ir.model.fields,field_description:exp_asset_base.field_asset_sell__message_has_sms_error
+msgid "SMS Delivery error"
+msgstr "خطأ في تسليم الرسائل القصيرة"
+
+#. module: exp_asset_base
+#: model:ir.model.fields.selection,name:exp_asset_base.selection__account_asset_adjustment_line__asset_status__scrap
+msgid "Scrap"
+msgstr "تالف"
+
+#. module: exp_asset_base
+#: model:ir.model.fields,field_description:exp_asset_base.field_asset_sell__select_invoice_line_id
+msgid "Select Invoice Line"
+msgstr "إختار بند الفاتورة"
+
+#. module: exp_asset_base
+#: model:ir.model.fields.selection,name:exp_asset_base.selection__asset_sell__action__sell
+msgid "Sell"
+msgstr "بيع"
+
+#. module: exp_asset_base
+#: code:addons/exp_asset_base/models/account_asset.py:0
+#: model:ir.model,name:exp_asset_base.model_asset_sell
+#: model_terms:ir.ui.view,arch_db:exp_asset_base.asset_sell_form
+#: model_terms:ir.ui.view,arch_db:exp_asset_base.asset_sell_tree
+#, python-format
+msgid "Sell Asset"
+msgstr "بيع الإصل"
+
+#. module: exp_asset_base
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset__serial_no
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_adjustment_line__serial_no
+msgid "Serial No"
+msgstr "الرقم التسلسلي"
+
+#. module: exp_asset_base
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset__service_provider_id
+msgid "Service Provider"
+msgstr "مزود الخدمة"
+
+#. module: exp_asset_base
+#: model_terms:ir.ui.view,arch_db:exp_asset_base.asset_adjustment_form
+#: model_terms:ir.ui.view,arch_db:exp_asset_base.asset_modify_form
+#: model_terms:ir.ui.view,arch_db:exp_asset_base.asset_pause_form
+#: model_terms:ir.ui.view,arch_db:exp_asset_base.asset_sell_form
+msgid "Set to Draft"
+msgstr "تعيين كمسودة"
+
+#. module: exp_asset_base
+#: model_terms:ir.ui.view,arch_db:exp_asset_base.asset_adjustment_form
+msgid "Start"
+msgstr "بدأ"
+
+#. module: exp_asset_base
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_adjustment__state
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_modify__state
+#: model:ir.model.fields,field_description:exp_asset_base.field_asset_pause__state
+#: model:ir.model.fields,field_description:exp_asset_base.field_asset_sell__state
+msgid "State"
+msgstr "الحالة"
+
+#. module: exp_asset_base
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset__state
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset__status
+msgid "Status"
+msgstr "الحالة"
+
+#. module: exp_asset_base
+#: model:ir.model.fields,help:exp_asset_base.field_account_asset__activity_state
+#: model:ir.model.fields,help:exp_asset_base.field_account_asset_adjustment__activity_state
+#: model:ir.model.fields,help:exp_asset_base.field_account_asset_location__activity_state
+#: model:ir.model.fields,help:exp_asset_base.field_account_asset_manufacturer__activity_state
+#: model:ir.model.fields,help:exp_asset_base.field_account_asset_modify__activity_state
+#: model:ir.model.fields,help:exp_asset_base.field_asset_pause__activity_state
+#: model:ir.model.fields,help:exp_asset_base.field_asset_sell__activity_state
+msgid ""
+"Status based on activities\n"
+"Overdue: Due date is already passed\n"
+"Today: Activity date is today\n"
+"Planned: Future activities."
+msgstr ""
+"الحالة على أساس الأنشطة\n"
+"المتأخرة: تاريخ الاستحقاق مر\n"
+"اليوم: تاريخ النشاط هو اليوم\n"
+"المخطط: الأنشطة المستقبلية."
+
+#. module: exp_asset_base
+#: model:ir.model.fields,help:exp_asset_base.field_account_asset_modify__gain_value
+msgid ""
+"Technical field to know if we should display the fields for the creation of "
+"gross increase asset"
+msgstr ""
+
+#. module: exp_asset_base
+#: model:ir.model.fields,help:exp_asset_base.field_asset_sell__gain_or_loss
+msgid ""
+"Technical field to know is there was a gain or a loss in the selling of the "
+"asset"
+msgstr ""
+
+#. module: exp_asset_base
+#: code:addons/exp_asset_base/models/account_asset.py:0
+#, python-format
+msgid "The %s with barcode %s has schedule maintenance today ,please follow."
+msgstr "%s بالكود %s لديه صيانة مجدولة اليوم,الرجاء المتابعة."
+
+#. module: exp_asset_base
+#: model:ir.model.fields,help:exp_asset_base.field_account_asset_modify__method_period
+msgid "The amount of time between two depreciations"
+msgstr "مقدار الوقت بين انخفاضين"
+
+#. module: exp_asset_base
+#: model:ir.model.fields,help:exp_asset_base.field_account_asset_modify__asset_id
+msgid "The asset to be modified by this wizard"
+msgstr "الأصل الذي سيتم تعديله بواسطة هذا المعالج"
+
+#. module: exp_asset_base
+#: model:ir.model.fields,help:exp_asset_base.field_asset_sell__invoice_id
+msgid ""
+"The disposal invoice is needed in order to generate the closing journal "
+"entry."
+msgstr ""
+
+#. module: exp_asset_base
+#: code:addons/exp_asset_base/models/account_asset.py:0
+#, python-format
+msgid "The warrant period of %s with barcode %s has end!"
+msgstr "فترة الضمان للأصل %s بالباركود %s قد إنتهت!"
+
+#. module: exp_asset_base
+#: model:ir.model.fields,help:exp_asset_base.field_asset_sell__invoice_line_id
+msgid "There are multiple lines that could be the related to this asset"
+msgstr "هناك بنود متعددة يمكن أن تكون مرتبطة بهذا الأصل"
+
+#. module: exp_asset_base
+#: code:addons/exp_asset_base/reports/asset_depreciation_report_xlsx.py:0
+#, python-format
+msgid "To: "
+msgstr "الى: "
+
+#. module: exp_asset_base
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_adjustment__type
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_location__type
+msgid "Type"
+msgstr "النوع"
+
+#. module: exp_asset_base
+#: model:ir.model.fields,help:exp_asset_base.field_account_asset__activity_exception_decoration
+#: model:ir.model.fields,help:exp_asset_base.field_account_asset_adjustment__activity_exception_decoration
+#: model:ir.model.fields,help:exp_asset_base.field_account_asset_location__activity_exception_decoration
+#: model:ir.model.fields,help:exp_asset_base.field_account_asset_manufacturer__activity_exception_decoration
+#: model:ir.model.fields,help:exp_asset_base.field_account_asset_modify__activity_exception_decoration
+#: model:ir.model.fields,help:exp_asset_base.field_asset_pause__activity_exception_decoration
+#: model:ir.model.fields,help:exp_asset_base.field_asset_sell__activity_exception_decoration
+msgid "Type of the exception activity on record."
+msgstr "نوع النشاط الاستثنائي المسجل."
+
+#. module: exp_asset_base
+#: model:ir.model.fields.selection,name:exp_asset_base.selection__account_asset__state__unlock
+#: model_terms:ir.ui.view,arch_db:exp_asset_base.view_account_asset_form
+msgid "Unlock"
+msgstr "إعادة الفتح"
+
+#. module: exp_asset_base
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset__message_unread
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_adjustment__message_unread
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_location__message_unread
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_manufacturer__message_unread
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_modify__message_unread
+#: model:ir.model.fields,field_description:exp_asset_base.field_asset_pause__message_unread
+#: model:ir.model.fields,field_description:exp_asset_base.field_asset_sell__message_unread
+msgid "Unread Messages"
+msgstr "الرسائل الجديدة"
+
+#. module: exp_asset_base
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset__message_unread_counter
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_adjustment__message_unread_counter
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_location__message_unread_counter
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_manufacturer__message_unread_counter
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_modify__message_unread_counter
+#: model:ir.model.fields,field_description:exp_asset_base.field_asset_pause__message_unread_counter
+#: model:ir.model.fields,field_description:exp_asset_base.field_asset_sell__message_unread_counter
+msgid "Unread Messages Counter"
+msgstr "عدد الرسائل الجديدة"
+
+#. module: exp_asset_base
+#: code:addons/exp_asset_base/models/asset_modify.py:0
+#, python-format
+msgid "Value decrease for: %(asset)s"
+msgstr ""
+
+#. module: exp_asset_base
+#: code:addons/exp_asset_base/models/asset_modify.py:0
+#: code:addons/exp_asset_base/models/asset_modify.py:0
+#, python-format
+msgid "Value increase for: %(asset)s"
+msgstr ""
+
+#. module: exp_asset_base
+#: model:ir.model.fields,help:exp_asset_base.field_account_asset_adjustment___barcode_scanned
+msgid "Value of the last barcode scanned."
+msgstr "قيمة آخر باركود ممسوح ضوئيًا."
+
+#. module: exp_asset_base
+#: model:ir.ui.menu,name:exp_asset_base.menu_account_asset_vendors
+msgid "Vendors"
+msgstr "المورد"
+
+#. module: exp_asset_base
+#: model:ir.model.fields.selection,name:exp_asset_base.selection__account_asset_location__type__view
+msgid "View"
+msgstr "عرض"
+
+#. module: exp_asset_base
+#: model_terms:ir.ui.view,arch_db:exp_asset_base.view_account_asset_form
+msgid "Warranty"
+msgstr "ضمان"
+
+#. module: exp_asset_base
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset__warranty_contract
+msgid "Warranty Contract"
+msgstr "عقد الضمان"
+
+#. module: exp_asset_base
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset__warranty_end_date
+msgid "Warranty End Date"
+msgstr "تاريخ نهاية الضمان"
+
+#. module: exp_asset_base
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset__warranty_period
+msgid "Warranty Period(Months)"
+msgstr "فترة الضمان (شهور)"
+
+#. module: exp_asset_base
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset__website_message_ids
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_adjustment__website_message_ids
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_location__website_message_ids
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_manufacturer__website_message_ids
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_modify__website_message_ids
+#: model:ir.model.fields,field_description:exp_asset_base.field_asset_pause__website_message_ids
+#: model:ir.model.fields,field_description:exp_asset_base.field_asset_sell__website_message_ids
+msgid "Website Messages"
+msgstr "رسائل الموقع"
+
+#. module: exp_asset_base
+#: model:ir.model.fields,help:exp_asset_base.field_account_asset__website_message_ids
+#: model:ir.model.fields,help:exp_asset_base.field_account_asset_adjustment__website_message_ids
+#: model:ir.model.fields,help:exp_asset_base.field_account_asset_location__website_message_ids
+#: model:ir.model.fields,help:exp_asset_base.field_account_asset_manufacturer__website_message_ids
+#: model:ir.model.fields,help:exp_asset_base.field_account_asset_modify__website_message_ids
+#: model:ir.model.fields,help:exp_asset_base.field_asset_pause__website_message_ids
+#: model:ir.model.fields,help:exp_asset_base.field_asset_sell__website_message_ids
+msgid "Website communication history"
+msgstr "سجل تواصل الموقع"
+
+#. module: exp_asset_base
+#: model:ir.model.fields,help:exp_asset_base.field_account_asset__state
+msgid ""
+"When an asset is created, the status is 'Draft'.\n"
+"If the asset is confirmed, the status goes in 'Running' and the depreciation lines can be posted in the accounting.\n"
+"The 'On Hold' status can be set manually when you want to pause the depreciation of an asset for some time.\n"
+"You can manually close an asset when the depreciation is over. If the last line of depreciation is posted, the asset automatically goes in that status."
+msgstr ""
+
+#. module: exp_asset_base
+#: model:ir.model.fields.selection,name:exp_asset_base.selection__account_asset_modify__method_period__12
+msgid "Years"
+msgstr "سنوات"
+
+#. module: exp_asset_base
+#: code:addons/exp_asset_base/models/asset_sell.py:0
+#, python-format
+msgid ""
+"You cannot automate the journal entry for an asset that has a running gross "
+"increase. Please use 'Dispose' on the increase(s)."
+msgstr ""
+
+#. module: exp_asset_base
+#: code:addons/exp_asset_base/models/account_asset_adjustment.py:0
+#, python-format
+msgid "You should enter the asset status for all assets that marked as exist."
+msgstr "يجب تحديد حالة الأصل لجميع الأصول الموجودة."
+
+#. module: exp_asset_base
+#: model:ir.model,name:exp_asset_base.model_report_asset_abstract_report_xlsx
+msgid "asset_abstract_report_xlsx"
+msgstr ""
+
+#. module: exp_asset_base
+#: model:ir.model,name:exp_asset_base.model_report_report_asset_register_xlsx
+msgid "report_asset_register_xlsx"
+msgstr ""
\ No newline at end of file
diff --git a/dev_odex30_accounting/exp_asset_base/i18n/ar_001.po b/dev_odex30_accounting/exp_asset_base/i18n/ar_001.po
new file mode 100644
index 0000000..66304d1
--- /dev/null
+++ b/dev_odex30_accounting/exp_asset_base/i18n/ar_001.po
@@ -0,0 +1,912 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# 	* exp_asset_custody
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 14.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2023-10-15 06:13+0000\n"
+"PO-Revision-Date: 2023-10-15 06:13+0000\n"
+"Last-Translator: \n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: exp_asset_custody
+#: model:ir.model.fields,field_description:exp_asset_custody.field_account_asset__asset_operation_count
+msgid "# Done Operations"
+msgstr "العمليات المعتمدة"
+
+#. module: exp_asset_custody
+#: model:ir.model.fields,field_description:exp_asset_custody.field_account_asset_multi_operation__message_needaction
+#: model:ir.model.fields,field_description:exp_asset_custody.field_account_asset_operation__message_needaction
+msgid "Action Needed"
+msgstr "إجراء مطلوب"
+
+#. module: exp_asset_custody
+#: model:ir.model.fields,field_description:exp_asset_custody.field_account_asset_multi_operation__activity_ids
+#: model:ir.model.fields,field_description:exp_asset_custody.field_account_asset_operation__activity_ids
+msgid "Activities"
+msgstr "الأنشطة"
+
+#. module: exp_asset_custody
+#: model:ir.model.fields,field_description:exp_asset_custody.field_account_asset_multi_operation__activity_exception_decoration
+#: model:ir.model.fields,field_description:exp_asset_custody.field_account_asset_operation__activity_exception_decoration
+msgid "Activity Exception Decoration"
+msgstr "زخرفة استثناء النشاط"
+
+#. module: exp_asset_custody
+#: model:ir.model.fields,field_description:exp_asset_custody.field_account_asset_multi_operation__activity_state
+#: model:ir.model.fields,field_description:exp_asset_custody.field_account_asset_operation__activity_state
+msgid "Activity State"
+msgstr "حالة النشاط"
+
+#. module: exp_asset_custody
+#: model:ir.model.fields,field_description:exp_asset_custody.field_account_asset_multi_operation__activity_type_icon
+#: model:ir.model.fields,field_description:exp_asset_custody.field_account_asset_operation__activity_type_icon
+msgid "Activity Type Icon"
+msgstr "أيقونة نوع النشاط"
+
+#. module: exp_asset_custody
+#: model:ir.model.fields,field_description:exp_asset_custody.field_account_asset_operation__amount
+msgid "Amount"
+msgstr "المبلغ"
+
+#. module: exp_asset_custody
+#: model:ir.model.fields,field_description:exp_asset_custody.field_account_asset_operation__asset_id
+#: model_terms:ir.ui.view,arch_db:exp_asset_custody.asset_adjustment_report
+#: model_terms:ir.ui.view,arch_db:exp_asset_custody.view_account_asset_operation_search
+msgid "Asset"
+msgstr "الأصل"
+
+#. module: exp_asset_custody
+#: model_terms:ir.ui.view,arch_db:exp_asset_custody.view_account_asset_operation_search
+msgid "Asset Account"
+msgstr "حساب الأصل"
+
+#. module: exp_asset_custody
+#: model:ir.actions.report,name:exp_asset_custody.action_asset_adjustment_report
+#: model:ir.model,name:exp_asset_custody.model_account_asset_adjustment
+msgid "Asset Adjustment"
+msgstr "جرد الأصول"
+
+#. module: exp_asset_custody
+#: model:ir.model,name:exp_asset_custody.model_account_asset_multi_operation
+msgid "Asset Multi Operation"
+msgstr "العمليات المتعددة"
+
+#. module: exp_asset_custody
+#: model:ir.model,name:exp_asset_custody.model_account_asset_operation
+msgid "Asset Operation"
+msgstr ""
+
+#. module: exp_asset_custody
+#: code:addons/exp_asset_custody/models/account_asset.py:0
+#, python-format
+msgid "Asset Operations"
+msgstr "عمليات الأصول"
+
+#. module: exp_asset_custody
+#: model_terms:ir.ui.view,arch_db:exp_asset_custody.view_account_asset_operation_search
+msgid "Asset Operations in done state"
+msgstr "العمليات المعتمدة"
+
+#. module: exp_asset_custody
+#: model:ir.model.fields,field_description:exp_asset_custody.field_account_asset_operation__asset_status
+msgid "Asset Status"
+msgstr "حالة العهد"
+
+#. module: exp_asset_custody
+#: code:addons/exp_asset_custody/models/account_asset_operation.py:0
+#, python-format
+msgid "Asset is required to confirm this operation."
+msgstr ""
+
+#. module: exp_asset_custody
+#: model:ir.model,name:exp_asset_custody.model_account_asset
+msgid "Asset/Revenue Recognition"
+msgstr "إثبات الأصل/الربح"
+
+#. module: exp_asset_custody
+#: model_terms:ir.ui.view,arch_db:exp_asset_custody.asset_adjustment_report
+msgid "Assets Adjustment Report"
+msgstr "تقرير جرد الأصول"
+
+#. module: exp_asset_custody
+#: model:ir.actions.act_window,name:exp_asset_custody.action_account_asset_assignment
+#: model_terms:ir.ui.view,arch_db:exp_asset_custody.view_account_asset_multi_assignment_form
+msgid "Assets Assignment"
+msgstr "إسناد عهدة"
+
+#. module: exp_asset_custody
+#: model:ir.actions.act_window,name:exp_asset_custody.action_account_asset_release
+#: model_terms:ir.ui.view,arch_db:exp_asset_custody.view_account_asset_multi_release_form
+msgid "Assets Release"
+msgstr "إرجاع عهدة"
+
+#. module: exp_asset_custody
+#: model:ir.actions.act_window,name:exp_asset_custody.action_account_asset_transfer
+#: model_terms:ir.ui.view,arch_db:exp_asset_custody.view_account_asset_multi_transfer_form
+msgid "Assets Transfer"
+msgstr "نقل العهدة"
+
+#. module: exp_asset_custody
+#: model:ir.model.fields.selection,name:exp_asset_custody.selection__account_asset__status__assigned
+msgid "Assigned"
+msgstr "مسند"
+
+#. module: exp_asset_custody
+#: model:ir.model.fields.selection,name:exp_asset_custody.selection__account_asset_multi_operation__type__assignment
+#: model:ir.model.fields.selection,name:exp_asset_custody.selection__account_asset_operation__type__assignment
+#: model:ir.ui.menu,name:exp_asset_custody.menu_account_asset_assignment
+#: model:ir.ui.menu,name:exp_asset_custody.menu_account_multi_asset_assignment
+msgid "Assignment"
+msgstr "أسناد"
+
+#. module: exp_asset_custody
+#: model_terms:ir.ui.view,arch_db:exp_asset_custody.view_account_asset_multi_assignment_form
+#: model_terms:ir.ui.view,arch_db:exp_asset_custody.view_account_asset_operation_form
+msgid "Assignment Info"
+msgstr "معلومات الإسناد"
+
+#. module: exp_asset_custody
+#: model_terms:ir.ui.view,arch_db:exp_asset_custody.hr_Employee_form_inherit0
+msgid "Assignments"
+msgstr "العهد العينية"
+
+#. module: exp_asset_custody
+#: model:ir.model.fields,field_description:exp_asset_custody.field_account_asset_multi_operation__message_attachment_count
+#: model:ir.model.fields,field_description:exp_asset_custody.field_account_asset_operation__message_attachment_count
+msgid "Attachment Count"
+msgstr "عدد المرفقات"
+
+#. module: exp_asset_custody
+#: model:ir.model.fields,field_description:exp_asset_custody.field_account_asset_multi_operation__barcode
+#: model:ir.model.fields,field_description:exp_asset_custody.field_account_asset_operation__barcode
+#: model_terms:ir.ui.view,arch_db:exp_asset_custody.asset_adjustment_report
+#: model_terms:ir.ui.view,arch_db:exp_asset_custody.view_account_asset_operation_search
+msgid "Barcode"
+msgstr "باركود"
+
+#. module: exp_asset_custody
+#: model:ir.model.fields,field_description:exp_asset_custody.field_account_asset_multi_operation___barcode_scanned
+msgid "Barcode Scanned"
+msgstr "باركود"
+
+#. module: exp_asset_custody
+#: model_terms:ir.ui.view,arch_db:exp_asset_custody.view_account_asset_multi_assignment_form
+#: model_terms:ir.ui.view,arch_db:exp_asset_custody.view_account_asset_multi_release_form
+#: model_terms:ir.ui.view,arch_db:exp_asset_custody.view_account_asset_multi_transfer_form
+msgid "Barcode..."
+msgstr "الباركود..."
+
+#. module: exp_asset_custody
+#: model:ir.model.fields.selection,name:exp_asset_custody.selection__account_asset_adjustment__type__department
+msgid "By Department"
+msgstr "الإدارة"
+
+#. module: exp_asset_custody
+#: model:ir.model.fields.selection,name:exp_asset_custody.selection__account_asset_adjustment__type__employee
+msgid "By Employee"
+msgstr "الموظف"
+
+#. module: exp_asset_custody
+#: model:ir.model.fields.selection,name:exp_asset_custody.selection__account_asset_adjustment__type__location
+msgid "By Location"
+msgstr "الموقع"
+
+#. module: exp_asset_custody
+#: model:ir.model.fields.selection,name:exp_asset_custody.selection__account_asset_multi_operation__state__cancel
+#: model:ir.model.fields.selection,name:exp_asset_custody.selection__account_asset_operation__state__cancel
+msgid "Cancel"
+msgstr "إلغاء"
+
+#. module: exp_asset_custody
+#: model_terms:ir.ui.view,arch_db:exp_asset_custody.view_account_asset_multi_assignment_form
+#: model_terms:ir.ui.view,arch_db:exp_asset_custody.view_account_asset_multi_release_form
+#: model_terms:ir.ui.view,arch_db:exp_asset_custody.view_account_asset_multi_transfer_form
+#: model_terms:ir.ui.view,arch_db:exp_asset_custody.view_account_asset_operation_form
+msgid "Confirm"
+msgstr "تأكيد"
+
+#. module: exp_asset_custody
+#: model:ir.model.fields,field_description:exp_asset_custody.field_account_asset_multi_operation__create_uid
+#: model:ir.model.fields,field_description:exp_asset_custody.field_account_asset_operation__create_uid
+msgid "Created by"
+msgstr "أنشئ بواسطة"
+
+#. module: exp_asset_custody
+#: model:ir.model.fields,field_description:exp_asset_custody.field_account_asset_multi_operation__create_date
+#: model:ir.model.fields,field_description:exp_asset_custody.field_account_asset_operation__create_date
+msgid "Created on"
+msgstr "أنشئ في"
+
+#. module: exp_asset_custody
+#: model_terms:ir.ui.view,arch_db:exp_asset_custody.view_account_asset_operation_form
+msgid "Current"
+msgstr "الحالي"
+
+#. module: exp_asset_custody
+#: model:ir.model.fields,field_description:exp_asset_custody.field_account_asset__department_id
+msgid "Current Department"
+msgstr "الإدارة الحالية"
+
+#. module: exp_asset_custody
+#: model:ir.model.fields,field_description:exp_asset_custody.field_account_asset__employee_id
+msgid "Current Employee"
+msgstr "الموظف الحالي"
+
+#. module: exp_asset_custody
+#: model_terms:ir.ui.view,arch_db:exp_asset_custody.view_account_asset_operation_form
+msgid "Current Info"
+msgstr "المعلومات الحالية"
+
+#. module: exp_asset_custody
+#: model_terms:ir.ui.view,arch_db:exp_asset_custody.view_account_asset_form
+msgid "Custody Info"
+msgstr "معلومات العهدة"
+
+#. module: exp_asset_custody
+#: model:ir.ui.menu,name:exp_asset_custody.menu_account_asset_operation_main
+msgid "Custody Operations"
+msgstr "عمليات الأصول"
+
+#. module: exp_asset_custody
+#: model:ir.model.fields,field_description:exp_asset_custody.field_account_asset__custody_period
+#: model:ir.model.fields,field_description:exp_asset_custody.field_account_asset_operation__custody_period
+msgid "Custody Period"
+msgstr "فترة العهدة"
+
+#. module: exp_asset_custody
+#: model:ir.model.fields,field_description:exp_asset_custody.field_account_asset__custody_type
+#: model:ir.model.fields,field_description:exp_asset_custody.field_account_asset_operation__custody_type
+#: model_terms:ir.ui.view,arch_db:exp_asset_custody.view_account_asset_search
+msgid "Custody Type"
+msgstr "نوع العهدة"
+
+#. module: exp_asset_custody
+#: model:ir.ui.menu,name:exp_asset_custody.menu_account_asset_custody_operation
+msgid "Custody operations"
+msgstr "عمليات العهد"
+
+#. module: exp_asset_custody
+#: model:ir.model.fields,field_description:exp_asset_custody.field_account_asset_multi_operation__date
+#: model:ir.model.fields,field_description:exp_asset_custody.field_account_asset_operation__date
+#: model_terms:ir.ui.view,arch_db:exp_asset_custody.view_account_asset_operation_search
+msgid "Date"
+msgstr "التاريخ"
+
+#. module: exp_asset_custody
+#: model_terms:ir.ui.view,arch_db:exp_asset_custody.asset_adjustment_report
+msgid "Date:"
+msgstr "التاريخ:"
+
+#. module: exp_asset_custody
+#: model:ir.model.fields,field_description:exp_asset_custody.field_account_asset_adjustment__department_id
+#: model:ir.model.fields,field_description:exp_asset_custody.field_account_asset_multi_operation__new_department_id
+#: model:ir.model.fields,field_description:exp_asset_custody.field_account_asset_operation__current_department_id
+#: model:ir.model.fields,field_description:exp_asset_custody.field_account_asset_operation__new_department_id
+#: model_terms:ir.ui.view,arch_db:exp_asset_custody.asset_adjustment_report
+#: model_terms:ir.ui.view,arch_db:exp_asset_custody.view_account_asset_operation_search
+#: model_terms:ir.ui.view,arch_db:exp_asset_custody.view_account_asset_search
+msgid "Department"
+msgstr "الإدارة"
+
+#. module: exp_asset_custody
+#: model_terms:ir.ui.view,arch_db:exp_asset_custody.asset_adjustment_report
+msgid "Description:"
+msgstr "الوصف:"
+
+#. module: exp_asset_custody
+#: model:ir.model.fields,field_description:exp_asset_custody.field_account_asset__display_name
+#: model:ir.model.fields,field_description:exp_asset_custody.field_account_asset_adjustment__display_name
+#: model:ir.model.fields,field_description:exp_asset_custody.field_account_asset_multi_operation__display_name
+#: model:ir.model.fields,field_description:exp_asset_custody.field_account_asset_operation__display_name
+#: model:ir.model.fields,field_description:exp_asset_custody.field_hr_employee__display_name
+msgid "Display Name"
+msgstr "الاسم المعروض"
+
+#. module: exp_asset_custody
+#: model:ir.model.fields.selection,name:exp_asset_custody.selection__account_asset_multi_operation__state__done
+#: model:ir.model.fields.selection,name:exp_asset_custody.selection__account_asset_operation__state__done
+#: model_terms:ir.ui.view,arch_db:exp_asset_custody.view_account_asset_operation_search
+msgid "Done"
+msgstr "المنتهية"
+
+#. module: exp_asset_custody
+#: model:ir.model.fields.selection,name:exp_asset_custody.selection__account_asset_multi_operation__state__draft
+#: model:ir.model.fields.selection,name:exp_asset_custody.selection__account_asset_operation__state__draft
+msgid "Draft"
+msgstr "مسودة"
+
+#. module: exp_asset_custody
+#: model:ir.model,name:exp_asset_custody.model_hr_employee
+#: model:ir.model.fields,field_description:exp_asset_custody.field_account_asset_adjustment__employee_id
+#: model:ir.model.fields,field_description:exp_asset_custody.field_account_asset_multi_operation__new_employee_id
+#: model:ir.model.fields,field_description:exp_asset_custody.field_account_asset_operation__current_employee_id
+#: model:ir.model.fields,field_description:exp_asset_custody.field_account_asset_operation__new_employee_id
+#: model_terms:ir.ui.view,arch_db:exp_asset_custody.asset_adjustment_report
+#: model_terms:ir.ui.view,arch_db:exp_asset_custody.view_account_asset_operation_search
+#: model_terms:ir.ui.view,arch_db:exp_asset_custody.view_account_asset_search
+msgid "Employee"
+msgstr "الموظف"
+
+#. module: exp_asset_custody
+#: model:ir.model.fields,field_description:exp_asset_custody.field_account_asset_multi_operation__message_follower_ids
+#: model:ir.model.fields,field_description:exp_asset_custody.field_account_asset_operation__message_follower_ids
+msgid "Followers"
+msgstr "المتابعون"
+
+#. module: exp_asset_custody
+#: model:ir.model.fields,field_description:exp_asset_custody.field_account_asset_multi_operation__message_channel_ids
+#: model:ir.model.fields,field_description:exp_asset_custody.field_account_asset_operation__message_channel_ids
+msgid "Followers (Channels)"
+msgstr "المتابعون (القنوات)"
+
+#. module: exp_asset_custody
+#: model:ir.model.fields,field_description:exp_asset_custody.field_account_asset_multi_operation__message_partner_ids
+#: model:ir.model.fields,field_description:exp_asset_custody.field_account_asset_operation__message_partner_ids
+msgid "Followers (Partners)"
+msgstr "المتابعون (الشركاء)"
+
+#. module: exp_asset_custody
+#: model:ir.model.fields,help:exp_asset_custody.field_account_asset_multi_operation__activity_type_icon
+#: model:ir.model.fields,help:exp_asset_custody.field_account_asset_operation__activity_type_icon
+msgid "Font awesome icon e.g. fa-tasks"
+msgstr ""
+
+#. module: exp_asset_custody
+#: model:ir.model.fields.selection,name:exp_asset_custody.selection__account_asset__custody_type__general
+#: model:ir.model.fields.selection,name:exp_asset_custody.selection__account_asset_operation__custody_type__general
+msgid "General"
+msgstr "عام"
+
+#. module: exp_asset_custody
+#: model:ir.model.fields.selection,name:exp_asset_custody.selection__account_asset_operation__asset_status__good
+msgid "Good"
+msgstr "جيد"
+
+#. module: exp_asset_custody
+#: model_terms:ir.ui.view,arch_db:exp_asset_custody.view_account_asset_operation_search
+msgid "Group By..."
+msgstr "تجميع بـ..."
+
+#. module: exp_asset_custody
+#: model:ir.model.fields,field_description:exp_asset_custody.field_account_asset__id
+#: model:ir.model.fields,field_description:exp_asset_custody.field_account_asset_adjustment__id
+#: model:ir.model.fields,field_description:exp_asset_custody.field_account_asset_multi_operation__id
+#: model:ir.model.fields,field_description:exp_asset_custody.field_account_asset_operation__id
+#: model:ir.model.fields,field_description:exp_asset_custody.field_hr_employee__id
+msgid "ID"
+msgstr "المُعرف"
+
+#. module: exp_asset_custody
+#: model:ir.model.fields,field_description:exp_asset_custody.field_account_asset_multi_operation__activity_exception_icon
+#: model:ir.model.fields,field_description:exp_asset_custody.field_account_asset_operation__activity_exception_icon
+msgid "Icon"
+msgstr "الأيقونة"
+
+#. module: exp_asset_custody
+#: model:ir.model.fields,help:exp_asset_custody.field_account_asset_multi_operation__activity_exception_icon
+#: model:ir.model.fields,help:exp_asset_custody.field_account_asset_operation__activity_exception_icon
+msgid "Icon to indicate an exception activity."
+msgstr "الأيقونة للإشارة إلى استثناء النشاط"
+
+#. module: exp_asset_custody
+#: model:ir.model.fields,help:exp_asset_custody.field_account_asset_multi_operation__message_needaction
+#: model:ir.model.fields,help:exp_asset_custody.field_account_asset_multi_operation__message_unread
+#: model:ir.model.fields,help:exp_asset_custody.field_account_asset_operation__message_needaction
+#: model:ir.model.fields,help:exp_asset_custody.field_account_asset_operation__message_unread
+msgid "If checked, new messages require your attention."
+msgstr "إذا كان محددًا، فهناك رسائل جديدة تحتاج لرؤيتها."
+
+#. module: exp_asset_custody
+#: model:ir.model.fields,help:exp_asset_custody.field_account_asset_multi_operation__message_has_error
+#: model:ir.model.fields,help:exp_asset_custody.field_account_asset_multi_operation__message_has_sms_error
+#: model:ir.model.fields,help:exp_asset_custody.field_account_asset_operation__message_has_error
+#: model:ir.model.fields,help:exp_asset_custody.field_account_asset_operation__message_has_sms_error
+msgid "If checked, some messages have a delivery error."
+msgstr "إذا كان محددًا، فقد حدث خطأ في تسليم بعض الرسائل."
+
+#. module: exp_asset_custody
+#: model:ir.model.fields.selection,name:exp_asset_custody.selection__account_asset_multi_operation__state__in_progress
+msgid "In Progress"
+msgstr "جاري"
+
+#. module: exp_asset_custody
+#: model:ir.model.fields,field_description:exp_asset_custody.field_account_asset_multi_operation__message_is_follower
+#: model:ir.model.fields,field_description:exp_asset_custody.field_account_asset_operation__message_is_follower
+msgid "Is Follower"
+msgstr "متابع"
+
+#. module: exp_asset_custody
+#: model:ir.model.fields,field_description:exp_asset_custody.field_account_asset____last_update
+#: model:ir.model.fields,field_description:exp_asset_custody.field_account_asset_adjustment____last_update
+#: model:ir.model.fields,field_description:exp_asset_custody.field_account_asset_multi_operation____last_update
+#: model:ir.model.fields,field_description:exp_asset_custody.field_account_asset_operation____last_update
+#: model:ir.model.fields,field_description:exp_asset_custody.field_hr_employee____last_update
+msgid "Last Modified on"
+msgstr "آخر تعديل في"
+
+#. module: exp_asset_custody
+#: model:ir.model.fields,field_description:exp_asset_custody.field_account_asset_multi_operation__write_uid
+#: model:ir.model.fields,field_description:exp_asset_custody.field_account_asset_operation__write_uid
+msgid "Last Updated by"
+msgstr "آخر تحديث بواسطة"
+
+#. module: exp_asset_custody
+#: model:ir.model.fields,field_description:exp_asset_custody.field_account_asset_multi_operation__write_date
+#: model:ir.model.fields,field_description:exp_asset_custody.field_account_asset_operation__write_date
+msgid "Last Updated on"
+msgstr "آخر تحديث في"
+
+#. module: exp_asset_custody
+#: model:ir.model.fields,field_description:exp_asset_custody.field_account_asset_adjustment__location_id
+#: model:ir.model.fields,field_description:exp_asset_custody.field_account_asset_multi_operation__new_location_id
+#: model:ir.model.fields,field_description:exp_asset_custody.field_account_asset_operation__current_location_id
+#: model:ir.model.fields,field_description:exp_asset_custody.field_account_asset_operation__new_location_id
+#: model_terms:ir.ui.view,arch_db:exp_asset_custody.asset_adjustment_report
+#: model_terms:ir.ui.view,arch_db:exp_asset_custody.view_account_asset_operation_search
+#: model_terms:ir.ui.view,arch_db:exp_asset_custody.view_account_asset_search
+msgid "Location"
+msgstr "الموقع"
+
+#. module: exp_asset_custody
+#: model:ir.model.fields,field_description:exp_asset_custody.field_account_asset_multi_operation__message_main_attachment_id
+#: model:ir.model.fields,field_description:exp_asset_custody.field_account_asset_operation__message_main_attachment_id
+msgid "Main Attachment"
+msgstr "المرفقات"
+
+#. module: exp_asset_custody
+#: code:addons/exp_asset_custody/models/account_asset_multi_operation.py:0
+#, python-format
+msgid "Make sure you choose an asset in all operation line."
+msgstr ""
+
+#. module: exp_asset_custody
+#: code:addons/exp_asset_custody/models/account_asset_multi_operation.py:0
+#, python-format
+msgid "Make sure you choose custody period for all operation lines."
+msgstr "الرجاء التاكد من إدخال فترة العهدة في جميع العمليات."
+
+#. module: exp_asset_custody
+#: code:addons/exp_asset_custody/models/account_asset_multi_operation.py:0
+#, python-format
+msgid "Make sure you choose custody type for all operation lines."
+msgstr "الرجاء التاكد من إدخال نوع العهدة في جميع العمليات."
+
+#. module: exp_asset_custody
+#: code:addons/exp_asset_custody/models/account_asset_multi_operation.py:0
+#, python-format
+msgid "Make sure you enter the return date for all temporary custodies."
+msgstr "الرجاء التاكد من إدخال تاريخ الإرجاع للعهد المؤقتة."
+
+#. module: exp_asset_custody
+#: model:ir.model.fields,field_description:exp_asset_custody.field_account_asset_multi_operation__manual
+msgid "Manual"
+msgstr "يدوي"
+
+#. module: exp_asset_custody
+#: model:ir.model.fields,field_description:exp_asset_custody.field_account_asset_multi_operation__message_has_error
+#: model:ir.model.fields,field_description:exp_asset_custody.field_account_asset_operation__message_has_error
+msgid "Message Delivery error"
+msgstr "خطأ في تسليم الرسائل"
+
+#. module: exp_asset_custody
+#: model:ir.model.fields,field_description:exp_asset_custody.field_account_asset_multi_operation__message_ids
+#: model:ir.model.fields,field_description:exp_asset_custody.field_account_asset_operation__message_ids
+msgid "Messages"
+msgstr "الرسائل"
+
+#. module: exp_asset_custody
+#: model_terms:ir.ui.view,arch_db:exp_asset_custody.asset_adjustment_report
+msgid "Missing Assets:"
+msgstr "الأصول المفقودة:"
+
+#. module: exp_asset_custody
+#: model:ir.model.fields,field_description:exp_asset_custody.field_account_asset_operation__model_id
+#: model_terms:ir.ui.view,arch_db:exp_asset_custody.view_account_asset_operation_search
+msgid "Model"
+msgstr "النموذج"
+
+#. module: exp_asset_custody
+#: model:ir.model.fields,field_description:exp_asset_custody.field_account_asset_operation__multi_operation_id
+msgid "Multi Operation"
+msgstr "العمليات المتعددة"
+
+#. module: exp_asset_custody
+#: model:ir.actions.act_window,name:exp_asset_custody.action_multi_asset_assignment
+msgid "Multiple Assignment"
+msgstr "إسناد العهد"
+
+#. module: exp_asset_custody
+#: model:ir.actions.act_window,name:exp_asset_custody.action_multi_asset_release
+msgid "Multiple Release"
+msgstr "إرجاع العهد"
+
+#. module: exp_asset_custody
+#: model:ir.actions.act_window,name:exp_asset_custody.action_multi_asset_transfer
+msgid "Multiple Transfer"
+msgstr "نقل العهد"
+
+#. module: exp_asset_custody
+#: model:ir.ui.menu,name:exp_asset_custody.menu_account_asset_multi_operation
+msgid "Multiple operations"
+msgstr "العمليات المتعددة"
+
+#. module: exp_asset_custody
+#: model:ir.model.fields,field_description:exp_asset_custody.field_account_asset_multi_operation__my_activity_date_deadline
+#: model:ir.model.fields,field_description:exp_asset_custody.field_account_asset_operation__my_activity_date_deadline
+msgid "My Activity Deadline"
+msgstr ""
+
+#. module: exp_asset_custody
+#: model:ir.model.fields,field_description:exp_asset_custody.field_account_asset_multi_operation__name
+#: model:ir.model.fields,field_description:exp_asset_custody.field_account_asset_operation__name
+msgid "Name"
+msgstr "الإسم"
+
+#. module: exp_asset_custody
+#: model_terms:ir.ui.view,arch_db:exp_asset_custody.view_account_asset_multi_transfer_form
+#: model_terms:ir.ui.view,arch_db:exp_asset_custody.view_account_asset_operation_form
+msgid "New"
+msgstr "جديد"
+
+#. module: exp_asset_custody
+#: model_terms:ir.ui.view,arch_db:exp_asset_custody.view_account_asset_transfer_tree
+msgid "New Department"
+msgstr "الإدارة الجديدة"
+
+#. module: exp_asset_custody
+#: model_terms:ir.ui.view,arch_db:exp_asset_custody.view_account_asset_transfer_tree
+msgid "New Employee"
+msgstr "الموظف الجديد"
+
+#. module: exp_asset_custody
+#: model_terms:ir.ui.view,arch_db:exp_asset_custody.view_account_asset_transfer_tree
+msgid "New Location"
+msgstr "الموقع الجديد"
+
+#. module: exp_asset_custody
+#: model:ir.model.fields,field_description:exp_asset_custody.field_account_asset_multi_operation__activity_date_deadline
+#: model:ir.model.fields,field_description:exp_asset_custody.field_account_asset_operation__activity_date_deadline
+msgid "Next Activity Deadline"
+msgstr "الموعد النهائي للنشاط التالي"
+
+#. module: exp_asset_custody
+#: model:ir.model.fields,field_description:exp_asset_custody.field_account_asset_multi_operation__activity_summary
+#: model:ir.model.fields,field_description:exp_asset_custody.field_account_asset_operation__activity_summary
+msgid "Next Activity Summary"
+msgstr "ملخص النشاط التالي"
+
+#. module: exp_asset_custody
+#: model:ir.model.fields,field_description:exp_asset_custody.field_account_asset_multi_operation__activity_type_id
+#: model:ir.model.fields,field_description:exp_asset_custody.field_account_asset_operation__activity_type_id
+msgid "Next Activity Type"
+msgstr "نوع النشاط التالي"
+
+#. module: exp_asset_custody
+#: code:addons/exp_asset_custody/models/account_asset_multi_operation.py:0
+#, python-format
+msgid "No asset found with the selected barcode"
+msgstr "لم يتم العثور على أصل لهذا الباركود"
+
+#. module: exp_asset_custody
+#: model:ir.model.fields,field_description:exp_asset_custody.field_account_asset_multi_operation__note
+#: model:ir.model.fields,field_description:exp_asset_custody.field_account_asset_operation__note
+#: model_terms:ir.ui.view,arch_db:exp_asset_custody.view_account_asset_operation_form
+msgid "Note"
+msgstr "ملاحظة"
+
+#. module: exp_asset_custody
+#: model:ir.model.fields,field_description:exp_asset_custody.field_account_asset_multi_operation__message_needaction_counter
+#: model:ir.model.fields,field_description:exp_asset_custody.field_account_asset_operation__message_needaction_counter
+msgid "Number of Actions"
+msgstr "عدد الإجراءات"
+
+#. module: exp_asset_custody
+#: model:ir.model.fields,help:exp_asset_custody.field_account_asset__asset_operation_count
+msgid "Number of done asset operations"
+msgstr ""
+
+#. module: exp_asset_custody
+#: model:ir.model.fields,field_description:exp_asset_custody.field_account_asset_multi_operation__message_has_error_counter
+#: model:ir.model.fields,field_description:exp_asset_custody.field_account_asset_operation__message_has_error_counter
+msgid "Number of errors"
+msgstr "عدد الاخطاء"
+
+#. module: exp_asset_custody
+#: model:ir.model.fields,help:exp_asset_custody.field_account_asset_multi_operation__message_needaction_counter
+#: model:ir.model.fields,help:exp_asset_custody.field_account_asset_operation__message_needaction_counter
+msgid "Number of messages which requires an action"
+msgstr "عدد الرسائل التي تتطلب إجراء"
+
+#. module: exp_asset_custody
+#: model:ir.model.fields,help:exp_asset_custody.field_account_asset_multi_operation__message_has_error_counter
+#: model:ir.model.fields,help:exp_asset_custody.field_account_asset_operation__message_has_error_counter
+msgid "Number of messages with delivery error"
+msgstr "عدد الرسائل الحادث بها خطأ في التسليم"
+
+#. module: exp_asset_custody
+#: model:ir.model.fields,help:exp_asset_custody.field_account_asset_multi_operation__message_unread_counter
+#: model:ir.model.fields,help:exp_asset_custody.field_account_asset_operation__message_unread_counter
+msgid "Number of unread messages"
+msgstr "عدد الرسائل الجديدة"
+
+#. module: exp_asset_custody
+#: code:addons/exp_asset_custody/models/account_asset_operation.py:0
+#, python-format
+msgid "Only draft operations can be deleted."
+msgstr "لا يمكن حذف العملية الا في الحالة مبدئية"
+
+#. module: exp_asset_custody
+#: model:ir.model.fields,field_description:exp_asset_custody.field_account_asset_multi_operation__operation_ids
+msgid "Operation"
+msgstr "عملية"
+
+#. module: exp_asset_custody
+#: model:ir.actions.act_window,name:exp_asset_custody.action_account_asset_operation_analysis
+#: model:ir.ui.menu,name:exp_asset_custody.menu_account_operation_graph
+msgid "Operation Analysis"
+msgstr "تحليل العمليات"
+
+#. module: exp_asset_custody
+#: model_terms:ir.ui.view,arch_db:exp_asset_custody.view_account_asset_form
+msgid "Operations"
+msgstr "العمليات"
+
+#. module: exp_asset_custody
+#: model:ir.model.fields.selection,name:exp_asset_custody.selection__account_asset_operation__state__pending
+msgid "Pending"
+msgstr "معلق"
+
+#. module: exp_asset_custody
+#: model:ir.model.fields.selection,name:exp_asset_custody.selection__account_asset__custody_period__permanent
+#: model:ir.model.fields.selection,name:exp_asset_custody.selection__account_asset_operation__custody_period__permanent
+msgid "Permanent"
+msgstr "دائمة"
+
+#. module: exp_asset_custody
+#: model:ir.model.fields.selection,name:exp_asset_custody.selection__account_asset__custody_type__personal
+#: model:ir.model.fields.selection,name:exp_asset_custody.selection__account_asset_operation__custody_type__personal
+msgid "Personal"
+msgstr "شخصية"
+
+#. module: exp_asset_custody
+#: model:ir.model.fields,field_description:exp_asset_custody.field_hr_employee__petty_cash_counts
+msgid "Petty Cash Counts"
+msgstr ""
+
+#. module: exp_asset_custody
+#: model:ir.model.fields,field_description:exp_asset_custody.field_account_asset_operation__product_id
+msgid "Product"
+msgstr "المنتج"
+
+#. module: exp_asset_custody
+#: model:ir.model.fields,field_description:exp_asset_custody.field_account_asset__purpose
+msgid "Purpose"
+msgstr "الغرض"
+
+#. module: exp_asset_custody
+#: model_terms:ir.ui.view,arch_db:exp_asset_custody.view_account_asset_multi_assignment_form
+#: model_terms:ir.ui.view,arch_db:exp_asset_custody.view_account_asset_multi_release_form
+#: model_terms:ir.ui.view,arch_db:exp_asset_custody.view_account_asset_multi_transfer_form
+#: model_terms:ir.ui.view,arch_db:exp_asset_custody.view_account_asset_operation_form
+msgid "Reject"
+msgstr "رفض"
+
+#. module: exp_asset_custody
+#: model:ir.model.fields.selection,name:exp_asset_custody.selection__account_asset_multi_operation__type__release
+#: model:ir.model.fields.selection,name:exp_asset_custody.selection__account_asset_operation__type__release
+#: model:ir.ui.menu,name:exp_asset_custody.menu_account_asset_release
+#: model:ir.ui.menu,name:exp_asset_custody.menu_account_multi_asset_release
+msgid "Release"
+msgstr "إرجاع"
+
+#. module: exp_asset_custody
+#: model_terms:ir.ui.view,arch_db:exp_asset_custody.view_account_asset_multi_release_form
+#: model_terms:ir.ui.view,arch_db:exp_asset_custody.view_account_asset_operation_form
+msgid "Release Info"
+msgstr "معلومات الإرجاع"
+
+#. module: exp_asset_custody
+#: model_terms:ir.ui.view,arch_db:exp_asset_custody.view_account_asset_multi_release_form
+#: model_terms:ir.ui.view,arch_db:exp_asset_custody.view_account_asset_operation_form
+#: model_terms:ir.ui.view,arch_db:exp_asset_custody.view_account_asset_release_tree
+msgid "Release Location"
+msgstr "موقع الإرجاع"
+
+#. module: exp_asset_custody
+#: model:ir.model.fields,field_description:exp_asset_custody.field_account_asset_operation__user_id
+msgid "Responsible"
+msgstr "المسئول"
+
+#. module: exp_asset_custody
+#: model:ir.model.fields,field_description:exp_asset_custody.field_account_asset_multi_operation__responsible_department_id
+#: model:ir.model.fields,field_description:exp_asset_custody.field_account_asset_operation__department_id
+#: model_terms:ir.ui.view,arch_db:exp_asset_custody.view_account_asset_operation_search
+msgid "Responsible Department"
+msgstr "الإدارة المسئولة"
+
+#. module: exp_asset_custody
+#: model:ir.model.fields,field_description:exp_asset_custody.field_account_asset_multi_operation__activity_user_id
+#: model:ir.model.fields,field_description:exp_asset_custody.field_account_asset_multi_operation__responsible_user_id
+#: model:ir.model.fields,field_description:exp_asset_custody.field_account_asset_operation__activity_user_id
+#: model_terms:ir.ui.view,arch_db:exp_asset_custody.view_account_asset_operation_search
+msgid "Responsible User"
+msgstr "الموظف المسئول"
+
+#. module: exp_asset_custody
+#: model:ir.model.fields,field_description:exp_asset_custody.field_account_asset__return_date
+#: model:ir.model.fields,field_description:exp_asset_custody.field_account_asset_operation__return_date
+msgid "Return Date"
+msgstr "تاريخ الإرجاع"
+
+#. module: exp_asset_custody
+#: model:ir.model.fields,field_description:exp_asset_custody.field_account_asset_multi_operation__message_has_sms_error
+#: model:ir.model.fields,field_description:exp_asset_custody.field_account_asset_operation__message_has_sms_error
+msgid "SMS Delivery error"
+msgstr "خطأ في تسليم الرسائل القصيرة"
+
+#. module: exp_asset_custody
+#: model:ir.model.fields.selection,name:exp_asset_custody.selection__account_asset__status__scrap
+#: model:ir.model.fields.selection,name:exp_asset_custody.selection__account_asset_operation__asset_status__scrap
+msgid "Scrap"
+msgstr "تالف"
+
+#. module: exp_asset_custody
+#: model_terms:ir.ui.view,arch_db:exp_asset_custody.asset_adjustment_report
+msgid "Serial No"
+msgstr "المتسلسل"
+
+#. module: exp_asset_custody
+#: model_terms:ir.ui.view,arch_db:exp_asset_custody.view_account_asset_multi_assignment_form
+#: model_terms:ir.ui.view,arch_db:exp_asset_custody.view_account_asset_multi_release_form
+#: model_terms:ir.ui.view,arch_db:exp_asset_custody.view_account_asset_multi_transfer_form
+#: model_terms:ir.ui.view,arch_db:exp_asset_custody.view_account_asset_operation_form
+msgid "Set to Draft"
+msgstr "تعيين كمسودة"
+
+#. module: exp_asset_custody
+#: model_terms:ir.ui.view,arch_db:exp_asset_custody.asset_adjustment_report
+msgid "Signatures:"
+msgstr ""
+
+#. module: exp_asset_custody
+#: model_terms:ir.ui.view,arch_db:exp_asset_custody.view_account_asset_multi_assignment_form
+#: model_terms:ir.ui.view,arch_db:exp_asset_custody.view_account_asset_multi_release_form
+#: model_terms:ir.ui.view,arch_db:exp_asset_custody.view_account_asset_multi_transfer_form
+msgid "Start"
+msgstr "بدأ"
+
+#. module: exp_asset_custody
+#: model:ir.model.fields,field_description:exp_asset_custody.field_account_asset_multi_operation__state
+#: model:ir.model.fields,field_description:exp_asset_custody.field_account_asset_operation__state
+#: model_terms:ir.ui.view,arch_db:exp_asset_custody.view_account_asset_operation_search
+msgid "State"
+msgstr "الحالة"
+
+#. module: exp_asset_custody
+#: model:ir.model.fields,field_description:exp_asset_custody.field_account_asset__status
+#: model:ir.model.fields,field_description:exp_asset_custody.field_account_asset_operation__asset_statuso
+#: model_terms:ir.ui.view,arch_db:exp_asset_custody.asset_adjustment_report
+msgid "Status"
+msgstr "الحالة"
+
+#. module: exp_asset_custody
+#: model:ir.model.fields,help:exp_asset_custody.field_account_asset_multi_operation__activity_state
+#: model:ir.model.fields,help:exp_asset_custody.field_account_asset_operation__activity_state
+msgid ""
+"Status based on activities\n"
+"Overdue: Due date is already passed\n"
+"Today: Activity date is today\n"
+"Planned: Future activities."
+msgstr "الأنشطة المستقبيلة"
+
+#. module: exp_asset_custody
+#: model:ir.model.fields.selection,name:exp_asset_custody.selection__account_asset_operation__state__submit
+#: model_terms:ir.ui.view,arch_db:exp_asset_custody.view_account_asset_operation_form
+msgid "Submit"
+msgstr "إرسال"
+
+#. module: exp_asset_custody
+#: model:ir.model.fields.selection,name:exp_asset_custody.selection__account_asset__custody_period__temporary
+#: model:ir.model.fields.selection,name:exp_asset_custody.selection__account_asset_operation__custody_period__temporary
+msgid "Temporary"
+msgstr "مؤقتة"
+
+#. module: exp_asset_custody
+#: code:addons/exp_asset_custody/models/account_asset.py:0
+#, python-format
+msgid "The period of %s is finished %s."
+msgstr "فترة %s قد إنتهت %s."
+
+#. module: exp_asset_custody
+#: model:ir.model.fields.selection,name:exp_asset_custody.selection__account_asset_multi_operation__type__transfer
+#: model:ir.model.fields.selection,name:exp_asset_custody.selection__account_asset_operation__type__transfer
+#: model:ir.ui.menu,name:exp_asset_custody.menu_account_asset_transfer
+#: model:ir.ui.menu,name:exp_asset_custody.menu_account_multi_asset_transfer
+msgid "Transfer"
+msgstr "نقل"
+
+#. module: exp_asset_custody
+#: model:ir.model.fields,field_description:exp_asset_custody.field_account_asset_adjustment__type
+#: model:ir.model.fields,field_description:exp_asset_custody.field_account_asset_multi_operation__type
+#: model:ir.model.fields,field_description:exp_asset_custody.field_account_asset_operation__type
+#: model_terms:ir.ui.view,arch_db:exp_asset_custody.view_account_asset_operation_search
+msgid "Type"
+msgstr "النوع"
+
+#. module: exp_asset_custody
+#: model:ir.model.fields,help:exp_asset_custody.field_account_asset_multi_operation__activity_exception_decoration
+#: model:ir.model.fields,help:exp_asset_custody.field_account_asset_operation__activity_exception_decoration
+msgid "Type of the exception activity on record."
+msgstr "نوع النشاط الاستثنائي المسجل."
+
+#. module: exp_asset_custody
+#: model_terms:ir.ui.view,arch_db:exp_asset_custody.asset_adjustment_report
+msgid "Type:"
+msgstr "النوع:"
+
+#. module: exp_asset_custody
+#: model:ir.model.fields,field_description:exp_asset_custody.field_account_asset_multi_operation__message_unread
+#: model:ir.model.fields,field_description:exp_asset_custody.field_account_asset_operation__message_unread
+msgid "Unread Messages"
+msgstr "الرسائل الجديدة"
+
+#. module: exp_asset_custody
+#: model:ir.model.fields,field_description:exp_asset_custody.field_account_asset_multi_operation__message_unread_counter
+#: model:ir.model.fields,field_description:exp_asset_custody.field_account_asset_operation__message_unread_counter
+msgid "Unread Messages Counter"
+msgstr "عدد الرسائل الجديدة"
+
+#. module: exp_asset_custody
+#: model:ir.model.fields,help:exp_asset_custody.field_account_asset_multi_operation___barcode_scanned
+msgid "Value of the last barcode scanned."
+msgstr "قيمة آخر باركود ممسوح ضوئيًا."
+
+#. module: exp_asset_custody
+#: model:ir.model.fields.selection,name:exp_asset_custody.selection__account_asset_operation__asset_status__good_v
+msgid "Very Good"
+msgstr ""
+
+#. module: exp_asset_custody
+#: model:ir.model.fields,field_description:exp_asset_custody.field_account_asset_multi_operation__website_message_ids
+#: model:ir.model.fields,field_description:exp_asset_custody.field_account_asset_operation__website_message_ids
+msgid "Website Messages"
+msgstr "رسائل الموقع"
+
+#. module: exp_asset_custody
+#: model:ir.model.fields,help:exp_asset_custody.field_account_asset_multi_operation__website_message_ids
+#: model:ir.model.fields,help:exp_asset_custody.field_account_asset_operation__website_message_ids
+msgid "Website communication history"
+msgstr "سجل تواصل الموقع"
+
+#. module: exp_asset_custody
+#: code:addons/exp_asset_custody/models/account_asset_multi_operation.py:0
+#, python-format
+msgid "You can not confirm operation without lines."
+msgstr "لا يمكن تأكيد العملية دون إدخال التفاصيل"
+
+#. module: exp_asset_base
+#: model:ir.actions.report,name:exp_asset_base.label_barcode_account_asset
+msgid "Asset Barcode (ZPL)"
+msgstr "باركود الأصل (ZPL)"
+
+#. module: exp_asset_base
+#: model:ir.actions.report,print_report_name:exp_asset_base.report_account_asset_barcode
+msgid "'Assets barcode - %s' % (object.name)"
+msgstr "'باركود الأصول - %s' % (object.name)"
+
+#. module: exp_asset_base
+#: model:ir.actions.report,name:exp_asset_base.report_account_asset_barcode
+msgid "Asset Barcode (PDF)"
+msgstr "باركود الأصل (PDF)"
+
+#. module: exp_asset_base
+#: model_terms:ir.ui.view,arch_db:exp_asset_base.report_asset_barcode
+msgid "<span class=\"text-muted\">No barcode available</span>"
+msgstr "لا يوجد باركود متاح"
\ No newline at end of file
diff --git a/dev_odex30_accounting/exp_asset_base/i18n/ar_SY.po b/dev_odex30_accounting/exp_asset_base/i18n/ar_SY.po
new file mode 100644
index 0000000..89cf5bc
--- /dev/null
+++ b/dev_odex30_accounting/exp_asset_base/i18n/ar_SY.po
@@ -0,0 +1,1481 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+#	* exp_asset_base
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 11.0-20190819\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2021-03-15 04:52+0000\n"
+"PO-Revision-Date: 2021-03-15 04:52+0000\n"
+"Last-Translator: <>\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: exp_asset_base
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_asset_asset_operation_count
+msgid "# Done Operations"
+msgstr "العمليات المعتمدة"
+
+#. module: exp_asset_base
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_asset_gross_increase_count
+msgid "# Gross Increases"
+msgstr "الزيادات الإجمالية"
+
+#. module: exp_asset_base
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_asset_asset_adjustment_count
+msgid "# of Adjustments"
+msgstr "الجرد"
+
+#. module: exp_asset_base
+#: code:addons/exp_asset_base/models/account_asset_operation.py:620
+#, python-format
+msgid "A gross increase has been created"
+msgstr "تم زيادة اجمالي قيمة الاصل"
+
+#. module: exp_asset_base
+#: model:ir.model.fields,help:exp_asset_base.field_account_asset_operation_gain_account_id
+msgid "Account used to write the journal item in case of gain"
+msgstr "الحساب المستخدم عند إنشاء القيود في حالة الربح"
+
+#. module: exp_asset_base
+#: model:ir.model.fields,help:exp_asset_base.field_account_asset_operation_loss_account_id
+msgid "Account used to write the journal item in case of loss"
+msgstr "الحساب المستخدم عند توليد القيود في حالة الخسارة"
+
+#. module: exp_asset_base
+#: model:ir.ui.view,arch_db:exp_asset_base.view_account_asset_asset_form
+msgid "Accounting"
+msgstr "الحسابات"
+
+#. module: exp_asset_base
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_adjustment_line_adjustment_id
+msgid "Adjustment"
+msgstr "جرد الأصول"
+
+#. module: exp_asset_base
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_adjustment_adjustment_line_ids
+msgid "Adjustment Line"
+msgstr "تفاصيل الجرد"
+
+#. module: exp_asset_base
+#: model:ir.ui.view,arch_db:exp_asset_base.view_account_asset_asset_form
+msgid "Adjustments"
+msgstr "الجرد"
+
+#. module: exp_asset_base
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_asset_already_depreciated_amount_import
+msgid "Already Depreciated Amount Import"
+msgstr "القيمة المهلكة مسبقاً"
+
+#. module: exp_asset_base
+#: model:ir.model.fields,field_description:exp_asset_base.field_report_asset_register_depreciation_amount
+msgid "Amount"
+msgstr "الزمن"
+
+#. module: exp_asset_base
+#: model:ir.model.fields,help:exp_asset_base.field_account_asset_asset_parent_id
+msgid "An asset has a parent when it is the result of gaining value"
+msgstr "الأصل يكون له أب عندما يكون نتيجة لاكتساب القيمة"
+
+#. module: exp_asset_base
+#: selection:account.asset.multi.operation,modify_action:0
+#: selection:account.asset.operation,modify_action:0
+msgid "Assessment"
+msgstr "إعادة تقييم"
+
+#. module: exp_asset_base
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_category_assessment_gain_account_id
+msgid "Assessment Gain Account"
+msgstr "حساب أرباح إعادة التقييم"
+
+#. module: exp_asset_base
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_category_assessment_loss_account_id
+msgid "Assessment Loss Account"
+msgstr "حساب خسارة إعادة التقييم"
+
+#. module: exp_asset_base
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_adjustment_line_asset_id
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_operation_asset_id
+#: model:ir.model.fields,field_description:exp_asset_base.field_report_asset_register_depreciation_asset_id
+#: model:ir.ui.view,arch_db:exp_asset_base.view_account_asset_asset_form
+#: model:ir.ui.view,arch_db:exp_asset_base.view_account_asset_operation_search
+msgid "Asset"
+msgstr "الأصل"
+
+#. module: exp_asset_base
+#: code:addons/exp_asset_base/models/account_asset_operation.py:656
+#, python-format
+msgid "Asset %s"
+msgstr "الأصل %s"
+
+#. module: exp_asset_base
+#: model:ir.ui.view,arch_db:exp_asset_base.view_account_asset_operation_search
+msgid "Asset Account"
+msgstr "حساب الأصل"
+
+#. module: exp_asset_base
+#: code:addons/exp_asset_base/models/account_asset.py:272
+#: model:ir.actions.act_window,name:exp_asset_base.action_asset_adjustment
+#: model:ir.model,name:exp_asset_base.model_account_asset_adjustment
+#: model:ir.ui.view,arch_db:exp_asset_base.asset_adjustment_form
+#: model:ir.ui.view,arch_db:exp_asset_base.asset_adjustment_line_tree
+#: model:ir.ui.view,arch_db:exp_asset_base.asset_adjustment_tree
+#, python-format
+msgid "Asset Adjustment"
+msgstr "جرد الأصول"
+
+#. module: exp_asset_base
+#: model:ir.model,name:exp_asset_base.model_account_asset_adjustment_line
+msgid "Asset Adjustment Line"
+msgstr "تفاصيل جرد الأصول"
+
+#. module: exp_asset_base
+#: model:res.groups,name:exp_asset_base.group_asset_assessment
+msgid "Asset Assessment"
+msgstr "إعادة تقييم الأصول"
+
+#. module: exp_asset_base
+#: model:ir.actions.report,name:exp_asset_base.action_report_asset_depr_register_xlsx
+msgid "Asset Depreciation register XLSX"
+msgstr "Asset Depreciation register XLSX"
+
+#. module: exp_asset_base
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_operation_account_asset_counterpart_id
+msgid "Asset Gain Account"
+msgstr "حساب الأرباح"
+
+#. module: exp_asset_base
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_operation_account_asset_id
+msgid "Asset Gross Increase Account"
+msgstr "حساب زيادة قيمة الأصل"
+
+#. module: exp_asset_base
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_operation_asset_method_time
+msgid "Asset Method Time"
+msgstr "طريقة إحتساب مدة الإستهلاك"
+
+#. module: exp_asset_base
+#: model:ir.ui.view,arch_db:exp_asset_base.view_account_asset_multi_operation_form
+#: model:ir.ui.view,arch_db:exp_asset_base.view_account_asset_operation_form
+msgid "Asset Modify"
+msgstr "تعديل بيانات الأصل"
+
+#. module: exp_asset_base
+#: model:ir.model,name:exp_asset_base.model_account_asset_multi_operation
+msgid "Asset Multi Operation"
+msgstr "العمليات المتعددة"
+
+#. module: exp_asset_base
+#: code:addons/exp_asset_base/models/account_asset.py:253
+#, python-format
+msgid "Asset Operations"
+msgstr "عمليات الأصول"
+
+#. module: exp_asset_base
+#: model:ir.ui.view,arch_db:exp_asset_base.view_account_asset_operation_search
+msgid "Asset Operations in done state"
+msgstr "العمليات في الحالة تم"
+
+#. module: exp_asset_base
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_asset_asset_picture
+msgid "Asset Picture"
+msgstr "صورة الأصل"
+
+#. module: exp_asset_base
+#: code:addons/exp_asset_base/reports/asset_register_report_xlsx.py:14
+#: model:ir.actions.act_window,name:exp_asset_base.act_report_asset_register
+#: model:ir.ui.menu,name:exp_asset_base.menu_report_asset_register
+#, python-format
+msgid "Asset Register"
+msgstr "سجل الأصول"
+
+#. module: exp_asset_base
+#: model:ir.actions.server,name:exp_asset_base.asset_cron_ir_actions_server
+#: model:ir.cron,cron_name:exp_asset_base.asset_cron
+#: model:ir.cron,name:exp_asset_base.asset_cron
+msgid "Asset Reminder"
+msgstr "Asset Reminder"
+
+#. module: exp_asset_base
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_adjustment_line_asset_status
+msgid "Asset Status"
+msgstr "حالة العهد"
+
+#. module: exp_asset_base
+#: sql_constraint:account.asset.asset:0
+msgid "Asset barcode must be unique."
+msgstr "يجب أن يكون باكود الأصل فريدً."
+
+#. module: exp_asset_base
+#: model:ir.model,name:exp_asset_base.model_account_asset_category
+msgid "Asset category"
+msgstr "فئة الأصل"
+
+#. module: exp_asset_base
+#: model:ir.model,name:exp_asset_base.model_account_asset_depreciation_line
+msgid "Asset depreciation line"
+msgstr "بند إستهلاك الأصل"
+
+#. module: exp_asset_base
+#: model:ir.actions.report,name:exp_asset_base.action_report_asset_register_xlsx
+msgid "Asset register XLSX"
+msgstr "Asset register XLSX"
+
+#. module: exp_asset_base
+#: code:addons/exp_asset_base/models/account_asset_operation.py:546
+#, python-format
+msgid "Asset sold or disposed. Accounting entry awaiting for validation."
+msgstr "بيع/إتلاف الاصل. القيد المحاسبي في إنتظار الإعتماد."
+
+#. module: exp_asset_base
+#: model:ir.model,name:exp_asset_base.model_account_asset_asset
+msgid "Asset/Revenue Recognition"
+msgstr "أصل/ إيرادات مقدمة"
+
+#. module: exp_asset_base
+#: model:ir.ui.menu,name:exp_asset_base.menu_account_asset_adjustment
+msgid "Assets Adjustment"
+msgstr "جرد الاصول"
+
+#. module: exp_asset_base
+#: model:ir.actions.act_window,name:exp_asset_base.action_account_asset_graph
+#: model:ir.ui.menu,name:exp_asset_base.menu_account_asset_graph
+#: model:ir.ui.view,arch_db:exp_asset_base.view_account_asset_graph
+#: model:ir.ui.view,arch_db:exp_asset_base.view_account_asset_pivot
+msgid "Assets Analysis"
+msgstr "تحليل الأصول"
+
+#. module: exp_asset_base
+#: model:ir.actions.act_window,name:exp_asset_base.action_account_asset_location
+#: model:ir.ui.menu,name:exp_asset_base.menu_account_asset_location
+msgid "Assets Locations"
+msgstr "المواقع"
+
+#. module: exp_asset_base
+#: model:ir.ui.menu,name:exp_asset_base.menu_account_asset_management_main
+msgid "Assets Management"
+msgstr "إدارة الأصول"
+
+#. module: exp_asset_base
+#: model:ir.actions.act_window,name:exp_asset_base.action_account_asset_manufacturer
+msgid "Assets Manufacturer"
+msgstr "الشركات المُصنعة"
+
+#. module: exp_asset_base
+#: model:ir.ui.view,arch_db:exp_asset_base.view_account_asset_multi_operation_form
+msgid "Assets Operation"
+msgstr "عمليات الأصول"
+
+#. module: exp_asset_base
+#: model:ir.ui.menu,name:exp_asset_base.menu_account_asset_operation_main
+msgid "Assets Operations"
+msgstr "عمليات الأصول"
+
+#. module: exp_asset_base
+#: model:ir.actions.act_window,name:exp_asset_base.action_account_asset_receive
+msgid "Assets Receive"
+msgstr "إستلام الأصل"
+
+#. module: exp_asset_base
+#: model:ir.ui.menu,name:exp_asset_base.menu_account_asset_asset
+msgid "Assets Register"
+msgstr "سجل الأصل"
+
+#. module: exp_asset_base
+#: model:ir.ui.menu,name:exp_asset_base.menu_account_assent_category
+msgid "Assets Types"
+msgstr "نوع الأصل"
+
+#. module: exp_asset_base
+#: selection:account.asset.multi.operation,type:0
+#: selection:account.asset.operation,type:0
+msgid "Assignment"
+msgstr "إسناد"
+
+#. module: exp_asset_base
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_adjustment_barcode
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_adjustment_line_barcode
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_asset_barcode
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_multi_operation_barcode
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_operation_barcode
+#: model:ir.ui.view,arch_db:exp_asset_base.view_account_asset_asset_form
+#: model:ir.ui.view,arch_db:exp_asset_base.view_account_asset_operation_search
+msgid "Barcode"
+msgstr "باركود"
+
+#. module: exp_asset_base
+#: model:ir.ui.view,arch_db:exp_asset_base.asset_adjustment_form
+#: model:ir.ui.view,arch_db:exp_asset_base.view_account_asset_multi_operation_form
+msgid "Barcode..."
+msgstr "بارمود..."
+
+#. module: exp_asset_base
+#: model:ir.ui.view,arch_db:exp_asset_base.view_account_asset_asset_form
+msgid "Basic Info"
+msgstr "Basic Info"
+
+#. module: exp_asset_base
+#: model:ir.ui.menu,name:exp_asset_base.menu_account_asset_basic_operation
+msgid "Basic operations"
+msgstr "العمليات الأساسية"
+
+#. module: exp_asset_base
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_asset_book_value
+msgid "Book Value"
+msgstr "القيمة الدفترية"
+
+#. module: exp_asset_base
+#: selection:account.asset.adjustment,type:0
+msgid "By Category"
+msgstr "التصنيف"
+
+#. module: exp_asset_base
+#: selection:account.asset.adjustment,type:0
+msgid "By Department"
+msgstr "الإدارة"
+
+#. module: exp_asset_base
+#: selection:account.asset.adjustment,type:0
+msgid "By Employee"
+msgstr "الموظف"
+
+#. module: exp_asset_base
+#: selection:account.asset.adjustment,type:0
+msgid "By Location"
+msgstr "الموقع"
+
+#. module: exp_asset_base
+#: selection:account.asset.adjustment,type:0
+msgid "By Product"
+msgstr "المنتج"
+
+#. module: exp_asset_base
+#: selection:account.asset.adjustment,state:0
+#: selection:account.asset.multi.operation,state:0
+#: selection:account.asset.operation,state:0
+#: model:ir.ui.view,arch_db:exp_asset_base.view_account_asset_modify_tree
+#: model:ir.ui.view,arch_db:exp_asset_base.view_account_asset_operation_form
+#: model:ir.ui.view,arch_db:exp_asset_base.view_account_asset_receive_tree
+msgid "Cancel"
+msgstr "إلغاء"
+
+#. module: exp_asset_base
+#: code:addons/exp_asset_base/reports/asset_depreciation_report_xlsx.py:46
+#, python-format
+msgid "Categories"
+msgstr "فئات"
+
+#. module: exp_asset_base
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_adjustment_category_id
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_operation_category_id
+#: model:ir.model.fields,field_description:exp_asset_base.field_report_asset_register_category_ids
+#: model:ir.ui.view,arch_db:exp_asset_base.view_account_asset_operation_search
+msgid "Category"
+msgstr "الفئة"
+
+#. module: exp_asset_base
+#: model:ir.ui.view,arch_db:exp_asset_base.view_account_asset_asset_form
+msgid "Category of asset"
+msgstr "فئة الأصل"
+
+#. module: exp_asset_base
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_asset_children_ids
+msgid "Children"
+msgstr "الفروع"
+
+#. module: exp_asset_base
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_location_code
+msgid "Code"
+msgstr "الكود"
+
+#. module: exp_asset_base
+#: model:ir.ui.view,arch_db:exp_asset_base.view_report_asset_register_form
+msgid "Compute"
+msgstr "حساب"
+
+#. module: exp_asset_base
+#: model:ir.ui.view,arch_db:exp_asset_base.view_account_asset_asset_form
+msgid "Compute Depreciation"
+msgstr "حساب الإهلاك"
+
+#. module: exp_asset_base
+#: model:ir.ui.menu,name:exp_asset_base.menu_account_asset_configuration_main
+msgid "Configurations"
+msgstr "الإعدادات"
+
+#. module: exp_asset_base
+#: model:ir.ui.view,arch_db:exp_asset_base.asset_adjustment_form
+#: model:ir.ui.view,arch_db:exp_asset_base.view_account_asset_asset_form
+#: model:ir.ui.view,arch_db:exp_asset_base.view_account_asset_modify_tree
+#: model:ir.ui.view,arch_db:exp_asset_base.view_account_asset_multi_operation_form
+#: model:ir.ui.view,arch_db:exp_asset_base.view_account_asset_operation_form
+#: model:ir.ui.view,arch_db:exp_asset_base.view_account_asset_receive_tree
+#: model:ir.ui.view,arch_db:exp_asset_base.view_account_asset_sell_dispose_tree
+msgid "Confirm"
+msgstr "تأكيد"
+
+#. module: exp_asset_base
+#: model:ir.ui.view,arch_db:exp_asset_base.view_account_asset_search
+msgid "Cost Center"
+msgstr "مركز التكلفة"
+
+#. module: exp_asset_base
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_asset_account_analytic_id
+msgid "Cost Centers"
+msgstr " مراكز التكلفة"
+
+#. module: exp_asset_base
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_adjustment_create_uid
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_adjustment_line_create_uid
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_location_create_uid
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_manufacturer_create_uid
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_multi_operation_create_uid
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_operation_create_uid
+#: model:ir.model.fields,field_description:exp_asset_base.field_report_asset_register_create_uid
+#: model:ir.model.fields,field_description:exp_asset_base.field_report_asset_register_depreciation_create_uid
+msgid "Created by"
+msgstr "أنشئ بواسطة"
+
+#. module: exp_asset_base
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_adjustment_create_date
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_adjustment_line_create_date
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_location_create_date
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_manufacturer_create_date
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_multi_operation_create_date
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_operation_create_date
+#: model:ir.model.fields,field_description:exp_asset_base.field_report_asset_register_create_date
+#: model:ir.model.fields,field_description:exp_asset_base.field_report_asset_register_depreciation_create_date
+msgid "Created on"
+msgstr "أنشئ في"
+
+#. module: exp_asset_base
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_operation_currency_id
+msgid "Currency"
+msgstr "العملة"
+
+#. module: exp_asset_base
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_asset_location_id
+msgid "Current Location"
+msgstr "الموقع الحالي"
+
+#. module: exp_asset_base
+#: model:ir.ui.view,arch_db:exp_asset_base.view_account_asset_asset_purchase_tree
+msgid "Custody Status"
+msgstr "حالة العهدة"
+
+#. module: exp_asset_base
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_operation_invoice_id
+msgid "Customer Invoice"
+msgstr "الفاتورة"
+
+#. module: exp_asset_base
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_adjustment_date
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_multi_operation_date
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_operation_date
+#: model:ir.model.fields,field_description:exp_asset_base.field_report_asset_register_depreciation_date
+#: model:ir.ui.view,arch_db:exp_asset_base.view_account_asset_operation_search
+msgid "Date"
+msgstr "التاريخ"
+
+#. module: exp_asset_base
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_operation_value_residual
+msgid "Depreciable Amount"
+msgstr "القيمة القابلة للإستهلاك"
+
+#. module: exp_asset_base
+#: model:ir.ui.view,arch_db:exp_asset_base.view_account_asset_asset_form
+msgid "Depreciated Amount"
+msgstr "قيمة الإستهلاك"
+
+#. module: exp_asset_base
+#: model:ir.model.fields,field_description:exp_asset_base.field_report_asset_register_depreciation_ids
+#: model:ir.ui.view,arch_db:exp_asset_base.view_account_asset_asset_form
+msgid "Depreciation"
+msgstr "إستهلاك"
+
+#. module: exp_asset_base
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_operation_account_depreciation_id
+msgid "Depreciation Account"
+msgstr "حساب الإستهلاك"
+
+#. module: exp_asset_base
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_asset_depreciation_amount
+msgid "Depreciation Amount"
+msgstr "قيمة الإستهلاك"
+
+#. module: exp_asset_base
+#: model:ir.actions.act_window,name:exp_asset_base.action_account_asset_depreciation_analysis
+#: model:ir.ui.menu,name:exp_asset_base.menu_account_Depreciation_graph
+#: model:ir.ui.view,arch_db:exp_asset_base.view_account_asset_depreciation_graph
+#: model:ir.ui.view,arch_db:exp_asset_base.view_account_asset_depreciation_pivot
+msgid "Depreciation Analysis"
+msgstr "تحليل الإستهلاكات"
+
+#. module: exp_asset_base
+#: model:ir.ui.view,arch_db:exp_asset_base.view_account_asset_asset_form
+msgid "Depreciation Board"
+msgstr "لوحة الإستهلاكات"
+
+#. module: exp_asset_base
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_operation_account_depreciation_expense_id
+msgid "Depreciation Expense Account"
+msgstr "حساب مصروفات الإستهلاك"
+
+#. module: exp_asset_base
+#: model:ir.ui.view,arch_db:exp_asset_base.view_account_asset_asset_form
+msgid "Depreciation Information"
+msgstr "معلومات الإستهلاك"
+
+#. module: exp_asset_base
+#: model:ir.ui.view,arch_db:exp_asset_base.view_account_asset_asset_form
+msgid "Depreciation Lines"
+msgstr "بنود الإستهلاك"
+
+#. module: exp_asset_base
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_asset_depreciation_number_import
+msgid "Depreciation Number Import"
+msgstr "عدد الإستهلاكات السابقة"
+
+#. module: exp_asset_base
+#: model:ir.ui.view,arch_db:exp_asset_base.view_report_asset_register_form
+msgid "Depreciations"
+msgstr "الإستهلاكات"
+
+#. module: exp_asset_base
+#: model:ir.ui.view,arch_db:exp_asset_base.asset_adjustment_form
+msgid "Details"
+msgstr "التفاصيل"
+
+#. module: exp_asset_base
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_adjustment_display_name
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_adjustment_line_display_name
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_location_display_name
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_manufacturer_display_name
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_multi_operation_display_name
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_operation_display_name
+#: model:ir.model.fields,field_description:exp_asset_base.field_report_asset_abstract_report_xlsx_display_name
+#: model:ir.model.fields,field_description:exp_asset_base.field_report_asset_depreciation_report_xlsx_display_name
+#: model:ir.model.fields,field_description:exp_asset_base.field_report_asset_register_depreciation_display_name
+#: model:ir.model.fields,field_description:exp_asset_base.field_report_asset_register_display_name
+#: model:ir.model.fields,field_description:exp_asset_base.field_report_report_asset_register_xlsx_display_name
+msgid "Display Name"
+msgstr "الاسم المعروض"
+
+#. module: exp_asset_base
+#: code:addons/exp_asset_base/models/account_asset_operation.py:531
+#, python-format
+msgid "Disposal"
+msgstr "إتلاف"
+
+#. module: exp_asset_base
+#: selection:account.asset.multi.operation,sell_dispose_action:0
+#: selection:account.asset.operation,sell_dispose_action:0
+msgid "Dispose"
+msgstr "إتلاف"
+
+#. module: exp_asset_base
+#: selection:account.asset.adjustment,state:0
+#: selection:account.asset.multi.operation,state:0
+#: selection:account.asset.operation,state:0
+#: model:ir.ui.view,arch_db:exp_asset_base.view_account_asset_operation_search
+msgid "Done"
+msgstr "منتهي"
+
+#. module: exp_asset_base
+#: selection:account.asset.adjustment,state:0
+#: selection:account.asset.multi.operation,state:0
+#: selection:account.asset.operation,state:0
+msgid "Draft"
+msgstr "مسودة"
+
+#. module: exp_asset_base
+#: code:addons/exp_asset_base/reports/asset_depreciation_report_xlsx.py:43
+#, python-format
+msgid "Duration"
+msgstr "الفترة"
+
+#. module: exp_asset_base
+#: model:ir.model.fields,field_description:exp_asset_base.field_report_asset_register_end_date
+msgid "End Date"
+msgstr "تاريخ الإنتهاء"
+
+#. module: exp_asset_base
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_operation_method_end
+msgid "Ending date"
+msgstr "تاريخ الإنتهاء"
+
+#. module: exp_asset_base
+#: selection:account.asset.multi.operation,modify_action:0
+#: selection:account.asset.operation,modify_action:0
+msgid "Enhancement"
+msgstr "تحسين"
+
+#. module: exp_asset_base
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_adjustment_line_exist
+msgid "Exist?"
+msgstr "موجود?"
+
+#. module: exp_asset_base
+#: model:ir.ui.view,arch_db:exp_asset_base.view_account_asset_asset_form
+msgid "Existing Depreciation Schedule"
+msgstr "الإستهلاكات التي تمت مسبقاً"
+
+#. module: exp_asset_base
+#: model:ir.ui.view,arch_db:exp_asset_base.view_account_asset_asset_form
+msgid "Existing Depreciations"
+msgstr "الإستهلاكات السابقة"
+
+#. module: exp_asset_base
+#: model:ir.ui.view,arch_db:exp_asset_base.view_account_asset_asset_form
+msgid "First Depreciation Date"
+msgstr "تاريخ أول إستهلاك"
+
+#. module: exp_asset_base
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_asset_first_depreciation_date_import
+msgid "First Depreciation Date Import"
+msgstr "Fتاريخ أول إستهلاك"
+
+#. module: exp_asset_base
+#: code:addons/exp_asset_base/reports/asset_depreciation_report_xlsx.py:14
+#, python-format
+msgid "Fixed Asset Register"
+msgstr "سجل الأصول"
+
+#. module: exp_asset_base
+#: code:addons/exp_asset_base/reports/asset_depreciation_report_xlsx.py:43
+#, python-format
+msgid "From: "
+msgstr "من: "
+
+#. module: exp_asset_base
+#: selection:account.asset.operation,gain_or_loss:0
+msgid "Gain"
+msgstr "ربح"
+
+#. module: exp_asset_base
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_category_gain_account_id
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_operation_gain_account_id
+msgid "Gain Account"
+msgstr "حساب الأرباح"
+
+#. module: exp_asset_base
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_operation_gain_or_loss
+msgid "Gain Or Loss"
+msgstr "ربح/خسارة"
+
+#. module: exp_asset_base
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_operation_gain_value
+msgid "Gain Value"
+msgstr "قيمة الربح"
+
+#. module: exp_asset_base
+#: selection:account.asset.adjustment.line,asset_status:0
+msgid "Good"
+msgstr "جيد"
+
+#. module: exp_asset_base
+#: code:addons/exp_asset_base/models/account_asset.py:294
+#: model:ir.ui.view,arch_db:exp_asset_base.view_account_asset_asset_form
+#, python-format
+msgid "Gross Increase"
+msgstr "زيادة القيمة"
+
+#. module: exp_asset_base
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_asset_gross_increase_value
+msgid "Gross Increase Value"
+msgstr "قيمة الزيادة الإجمالية"
+
+#. module: exp_asset_base
+#: model:ir.ui.view,arch_db:exp_asset_base.view_account_asset_operation_search
+msgid "Group By..."
+msgstr "تجميع حسب.."
+
+#. module: exp_asset_base
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_adjustment_id
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_adjustment_line_id
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_location_id
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_manufacturer_id
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_multi_operation_id
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_operation_id
+#: model:ir.model.fields,field_description:exp_asset_base.field_report_asset_abstract_report_xlsx_id
+#: model:ir.model.fields,field_description:exp_asset_base.field_report_asset_depreciation_report_xlsx_id
+#: model:ir.model.fields,field_description:exp_asset_base.field_report_asset_register_depreciation_id
+#: model:ir.model.fields,field_description:exp_asset_base.field_report_asset_register_id
+#: model:ir.model.fields,field_description:exp_asset_base.field_report_report_asset_register_xlsx_id
+msgid "ID"
+msgstr "المعرف"
+
+#. module: exp_asset_base
+#: selection:account.asset.adjustment,state:0
+#: selection:account.asset.multi.operation,state:0
+msgid "In Progress"
+msgstr "جاري"
+
+#. module: exp_asset_base
+#: model:ir.model.fields,help:exp_asset_base.field_account_asset_asset_depreciation_number_import
+msgid "In case of an import from another software, \n"
+"                provide the number of depreciations already done before starting with Odoo."
+msgstr "في حالة الإستيراد من برنامج آخر, \n"
+"               قم بإدخال عدد الإستهلاكات التي تم تنفيذها قبل البدأ ب أودو."
+
+#. module: exp_asset_base
+#: model:ir.model.fields,help:exp_asset_base.field_account_asset_asset_already_depreciated_amount_import
+msgid "In case of an import from another software, \n"
+"                you might need to use this field to have the right depreciation table report. \n"
+"                This is the value that was already depreciated with entries not computed from this model"
+msgstr "في حالة الإستيراد من برنامج آخر, \n"
+"                قد تحتاج لإدخال هذه الحقول للحصول على تقرير إستهلاكات صحيح. \n"
+"                هذه القيمة تتم معالجتها بإستخدام القيود المحاسبية"
+
+#. module: exp_asset_base
+#: model:ir.model.fields,help:exp_asset_base.field_account_asset_asset_first_depreciation_date_import
+msgid "In case of an import from another software, provide the first depreciation date in it."
+msgstr "في حالة الإستيراد من برنامج آخر, قم يتحديد تاريخ أول إستهلاك تم مسبقاً."
+
+#. module: exp_asset_base
+#: model:ir.ui.view,arch_db:exp_asset_base.view_account_asset_operation_form
+msgid "Increase Accounts"
+msgstr "حساب الزيادة"
+
+#. module: exp_asset_base
+#: model:ir.ui.view,arch_db:exp_asset_base.view_account_asset_asset_form
+msgid "Invoice"
+msgstr "الفاتورة"
+
+#. module: exp_asset_base
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_operation_invoice_line_id
+msgid "Invoice Line"
+msgstr "عنصر الفاتور"
+
+#. module: exp_asset_base
+#: model:ir.ui.view,arch_db:exp_asset_base.view_account_asset_operation_form
+msgid "Invoicing"
+msgstr "تحرير الفواتير"
+
+#. module: exp_asset_base
+#: model:ir.model.fields,field_description:exp_asset_base.field_product_product_is_asset
+#: model:ir.model.fields,field_description:exp_asset_base.field_product_template_is_asset
+msgid "Is Asset"
+msgstr "عبارة عن أصل"
+
+#. module: exp_asset_base
+#: model:ir.ui.view,arch_db:exp_asset_base.view_account_asset_asset_form
+msgid "Items"
+msgstr "العناصر"
+
+#. module: exp_asset_base
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_adjustment___last_update
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_adjustment_line___last_update
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_location___last_update
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_manufacturer___last_update
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_multi_operation___last_update
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_operation___last_update
+#: model:ir.model.fields,field_description:exp_asset_base.field_report_asset_abstract_report_xlsx___last_update
+#: model:ir.model.fields,field_description:exp_asset_base.field_report_asset_depreciation_report_xlsx___last_update
+#: model:ir.model.fields,field_description:exp_asset_base.field_report_asset_register___last_update
+#: model:ir.model.fields,field_description:exp_asset_base.field_report_asset_register_depreciation___last_update
+#: model:ir.model.fields,field_description:exp_asset_base.field_report_report_asset_register_xlsx___last_update
+msgid "Last Modified on"
+msgstr "آخر تعديل في"
+
+#. module: exp_asset_base
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_adjustment_line_write_uid
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_adjustment_write_uid
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_location_write_uid
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_manufacturer_write_uid
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_multi_operation_write_uid
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_operation_write_uid
+#: model:ir.model.fields,field_description:exp_asset_base.field_report_asset_register_depreciation_write_uid
+#: model:ir.model.fields,field_description:exp_asset_base.field_report_asset_register_write_uid
+msgid "Last Updated by"
+msgstr "آخر تحديث بواسطة"
+
+#. module: exp_asset_base
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_adjustment_line_write_date
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_adjustment_write_date
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_location_write_date
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_manufacturer_write_date
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_multi_operation_write_date
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_operation_write_date
+#: model:ir.model.fields,field_description:exp_asset_base.field_report_asset_register_depreciation_write_date
+#: model:ir.model.fields,field_description:exp_asset_base.field_report_asset_register_write_date
+msgid "Last Updated on"
+msgstr "آخر تحديث في"
+
+#. module: exp_asset_base
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_category_limit
+msgid "Limit"
+msgstr "حد"
+
+#. module: exp_asset_base
+#: model:ir.ui.view,arch_db:exp_asset_base.view_account_asset_asset_form
+msgid "Lock"
+msgstr "اغلاق"
+
+#. module: exp_asset_base
+#: selection:account.asset.operation,gain_or_loss:0
+msgid "Loss"
+msgstr "خسارة"
+
+#. module: exp_asset_base
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_category_loss_account_id
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_operation_loss_account_id
+msgid "Loss Account"
+msgstr "حساب الخسارة"
+
+#. module: exp_asset_base
+#: code:addons/exp_asset_base/models/account_asset_operation.py:102
+#, python-format
+msgid "Make sure you choose an asset in all operation line."
+msgstr "تأكد من إختيار الأصل في جميع عناصر العملية."
+
+#. module: exp_asset_base
+#: code:addons/exp_asset_base/models/account_asset_operation.py:108
+#, python-format
+msgid "Make sure you have a depreciable amount when you modify asset."
+msgstr "تأكد من غدخال القيمة القابلة للإستهلاك في عملية تعديل بيانات الأصل."
+
+#. module: exp_asset_base
+#: code:addons/exp_asset_base/models/account_asset_operation.py:110
+#, python-format
+msgid "Make sure you have not depreciable amount when you modify asset."
+msgstr "تأكد من إدخال قيمة التخريد في عملية تعديل بيانات الأصل."
+
+#. module: exp_asset_base
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_multi_operation_manual
+msgid "Manual"
+msgstr "يدوى"
+
+#. module: exp_asset_base
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_asset_manufacturer_id
+#: model:ir.ui.menu,name:exp_asset_base.menu_account_manufacturer
+msgid "Manufacturer"
+msgstr "المُصنع"
+
+#. module: exp_asset_base
+#: code:addons/exp_asset_base/models/account_asset_operation.py:106
+#, python-format
+msgid "Method end is required when you modify asset with end method time."
+msgstr "يجب إدخال تاريخ إيقاف الإستهلاك إذا كانت طريق ."
+
+#. module: exp_asset_base
+#: code:addons/exp_asset_base/models/account_asset_operation.py:104
+#, python-format
+msgid "Method number is required when you modify asset with number method time."
+msgstr "يجب إدخال عدد الغستهلاكات في حال كانت طريقة الإستهلاك بإستخدام عدد القيود ."
+
+#. module: exp_asset_base
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_asset_model
+msgid "Model"
+msgstr "النموذج"
+
+#. module: exp_asset_base
+#: selection:account.asset.multi.operation,type:0
+#: selection:account.asset.operation,type:0
+#: model:ir.ui.menu,name:exp_asset_base.menu_account_modification
+msgid "Modification"
+msgstr "التعديلات"
+
+#. module: exp_asset_base
+#: selection:account.asset.multi.operation,modify_action:0
+#: selection:account.asset.operation,modify_action:0
+#: model:ir.ui.view,arch_db:exp_asset_base.view_account_asset_asset_form
+msgid "Modify"
+msgstr "تحرير"
+
+#. module: exp_asset_base
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_multi_operation_modify_action
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_operation_modify_action
+msgid "Modify Action"
+msgstr "نوع التعديل"
+
+#. module: exp_asset_base
+#: model:ir.actions.act_window,name:exp_asset_base.action_asset_modify
+#: model:ir.actions.act_window,name:exp_asset_base.action_asset_modify_wiz
+#: model:ir.model,name:exp_asset_base.model_account_asset_modify
+msgid "Modify Asset"
+msgstr "تعديل الأصل"
+
+#. module: exp_asset_base
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_operation_multi_operation_id
+msgid "Multi Operation"
+msgstr "عمليات متعددة"
+
+#. module: exp_asset_base
+#: model:ir.actions.act_window,name:exp_asset_base.action_asset_multi_operation
+msgid "Multiple Operations"
+msgstr "عمليات متعددة"
+
+#. module: exp_asset_base
+#: model:ir.ui.menu,name:exp_asset_base.menu_account_asset_multi_operation
+msgid "Multiple operations"
+msgstr "عمليات متعددة"
+
+#. module: exp_asset_base
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_adjustment_name
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_location_name
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_manufacturer_name
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_multi_operation_name
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_operation_name
+msgid "Name"
+msgstr "الاسم"
+
+#. module: exp_asset_base
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_operation_need_date
+msgid "Need Date"
+msgstr "تحتاج لتاريخ"
+
+#. module: exp_asset_base
+#: model:ir.ui.view,arch_db:exp_asset_base.view_account_asset_operation_form
+msgid "New Values"
+msgstr "القيمة الجديدة"
+
+#. module: exp_asset_base
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_asset_next_maintenance_date
+msgid "Next Maintenance Date"
+msgstr "تاريخ الصيانة القادم"
+
+#. module: exp_asset_base
+#: selection:account.asset.operation,gain_or_loss:0
+msgid "No"
+msgstr "لأ"
+
+#. module: exp_asset_base
+#: code:addons/exp_asset_base/models/account_asset_adjustment.py:87
+#: code:addons/exp_asset_base/models/account_asset_operation.py:124
+#, python-format
+msgid "No asset found with the selected barcode"
+msgstr "لم يتم العثور على أصل بالباركود المدخل"
+
+#. module: exp_asset_base
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_operation_salvage_value
+msgid "Not Depreciable Amount"
+msgstr "قيمة التخريد"
+
+#. module: exp_asset_base
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_multi_operation_note
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_operation_note
+#: model:ir.ui.view,arch_db:exp_asset_base.view_account_asset_operation_form
+msgid "Note"
+msgstr "ملاحظة"
+
+#. module: exp_asset_base
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_operation_method_number
+msgid "Number of Depreciations"
+msgstr "عدد الإستهلاكات"
+
+#. module: exp_asset_base
+#: model:ir.model.fields,help:exp_asset_base.field_account_asset_asset_asset_adjustment_count
+msgid "Number of adjustments"
+msgstr "عدد عمليات الجرد"
+
+#. module: exp_asset_base
+#: model:ir.model.fields,help:exp_asset_base.field_account_asset_asset_gross_increase_count
+msgid "Number of assets made to increase the value of the asset"
+msgstr "عدد عمليات الزيادة في  القيمة الغجمالية للأصل"
+
+#. module: exp_asset_base
+#: model:ir.model.fields,help:exp_asset_base.field_account_asset_asset_asset_operation_count
+msgid "Number of done asset operations"
+msgstr "عدد العمليات"
+
+#. module: exp_asset_base
+#: code:addons/exp_asset_base/models/account_asset_operation.py:367
+#, python-format
+msgid "Only draft operations can be deleted."
+msgstr "يمكن حذف العمليات المبدئية فقط."
+
+#. module: exp_asset_base
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_depreciation_line_operation
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_multi_operation_operation_ids
+msgid "Operation"
+msgstr "عملية"
+
+#. module: exp_asset_base
+#: model:ir.actions.act_window,name:exp_asset_base.action_account_asset_operation_analysis
+#: model:ir.ui.menu,name:exp_asset_base.menu_account_operation_graph
+msgid "Operation Analysis"
+msgstr "تحليل العمليات"
+
+#. module: exp_asset_base
+#: model:ir.ui.view,arch_db:exp_asset_base.view_account_asset_asset_form
+msgid "Operations"
+msgstr "العمليات"
+
+#. module: exp_asset_base
+#: selection:account.asset.location,type:0
+msgid "Ordinary"
+msgstr "عادي"
+
+#. module: exp_asset_base
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_asset_parent_id
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_location_parent_id
+msgid "Parent"
+msgstr "الأصل"
+
+#. module: exp_asset_base
+#: selection:account.asset.operation,state:0
+msgid "Pending"
+msgstr "في الإنتظار"
+
+#. module: exp_asset_base
+#: model:ir.model.fields,field_description:exp_asset_base.field_report_asset_register_depreciation_period
+msgid "Period"
+msgstr "الفترة"
+
+#. module: exp_asset_base
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_operation_method_period
+msgid "Period Length"
+msgstr "طول الفترة"
+
+#. module: exp_asset_base
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_adjustment_product_id
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_asset_product_id
+msgid "Product"
+msgstr "المنتج"
+
+#. module: exp_asset_base
+#: model:ir.model,name:exp_asset_base.model_product_template
+msgid "Product Template"
+msgstr "قالب المنتج"
+
+#. module: exp_asset_base
+#: model:ir.ui.menu,name:exp_asset_base.menu_account_asset_products
+msgid "Products"
+msgstr "المنتجات"
+
+#. module: exp_asset_base
+#: model:ir.ui.view,arch_db:exp_asset_base.view_account_asset_asset_form
+msgid "Purchase Info"
+msgstr "معلومات الشراء"
+
+#. module: exp_asset_base
+#: model:ir.ui.view,arch_db:exp_asset_base.view_account_asset_graph
+#: model:ir.ui.view,arch_db:exp_asset_base.view_account_asset_pivot
+msgid "Purchase Value"
+msgstr "قيمة الشراء"
+
+#. module: exp_asset_base
+#: model:ir.ui.view,arch_db:exp_asset_base.view_account_asset_asset_form
+msgid "Purchase value"
+msgstr "قيمة الشراء"
+
+#. module: exp_asset_base
+#: selection:account.asset.operation,type:0
+msgid "Receive"
+msgstr "إستلام"
+
+#. module: exp_asset_base
+#: model:ir.ui.menu,name:exp_asset_base.menu_account_assent_receive
+msgid "Receive Assets"
+msgstr "إستلام الأصل"
+
+#. module: exp_asset_base
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_asset_receive_date
+msgid "Receive Date"
+msgstr "تاريخ الإستلام"
+
+#. module: exp_asset_base
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_category_location_id
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_operation_location_id
+msgid "Receive location"
+msgstr "موقع إستلام الأصل"
+
+#. module: exp_asset_base
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_operation_ref
+msgid "Reference"
+msgstr "المرجع"
+
+#. module: exp_asset_base
+#: model:ir.ui.view,arch_db:exp_asset_base.asset_adjustment_form
+#: model:ir.ui.view,arch_db:exp_asset_base.view_account_asset_multi_operation_form
+#: model:ir.ui.view,arch_db:exp_asset_base.view_account_asset_operation_form
+#: model:ir.ui.view,arch_db:exp_asset_base.view_account_asset_receive_tree
+msgid "Reject"
+msgstr "رفض"
+
+#. module: exp_asset_base
+#: selection:account.asset.multi.operation,type:0
+#: selection:account.asset.operation,type:0
+msgid "Release"
+msgstr "إعادة"
+
+#. module: exp_asset_base
+#: model:ir.model.fields,field_description:exp_asset_base.field_report_asset_register_depreciation_report_id
+msgid "Report"
+msgstr "التقرير"
+
+#. module: exp_asset_base
+#: model:ir.ui.menu,name:exp_asset_base.menu_account_asset_reporting_main
+msgid "Reporting"
+msgstr "اعداد التقرير "
+
+#. module: exp_asset_base
+#: model:ir.ui.view,arch_db:exp_asset_base.view_account_asset_asset_form
+msgid "Residual"
+msgstr "صافي المتبقي"
+
+#. module: exp_asset_base
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_operation_user_id
+msgid "Responsible"
+msgstr "مسئول"
+
+#. module: exp_asset_base
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_category_department_id
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_multi_operation_responsible_department_id
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_operation_department_id
+#: model:ir.ui.view,arch_db:exp_asset_base.view_account_asset_operation_search
+#: model:ir.ui.view,arch_db:exp_asset_base.view_account_asset_search
+msgid "Responsible Department"
+msgstr "الإدارة المسئولة"
+
+#. module: exp_asset_base
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_asset_responsible_user_id
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_category_responsible_user_id
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_multi_operation_responsible_user_id
+#: model:ir.ui.view,arch_db:exp_asset_base.view_account_asset_operation_search
+msgid "Responsible User"
+msgstr "الموظف المسئول"
+
+#. module: exp_asset_base
+#: code:addons/exp_asset_base/models/account_asset_operation.py:531
+#, python-format
+msgid "Sale"
+msgstr "بيع"
+
+#. module: exp_asset_base
+#: model:ir.ui.view,arch_db:exp_asset_base.view_account_asset_operation_form
+msgid "Save"
+msgstr "حفظ"
+
+#. module: exp_asset_base
+#: selection:account.asset.adjustment.line,asset_status:0
+msgid "Scrap"
+msgstr "تالف"
+
+#. module: exp_asset_base
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_operation_select_invoice_line_id
+msgid "Select Invoice Line"
+msgstr "إختيار عنصر الفاتورة"
+
+#. module: exp_asset_base
+#: selection:account.asset.multi.operation,sell_dispose_action:0
+#: selection:account.asset.operation,sell_dispose_action:0
+msgid "Sell"
+msgstr "بيع"
+
+#. module: exp_asset_base
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_multi_operation_sell_dispose_action
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_operation_sell_dispose_action
+msgid "Sell Dispose Action"
+msgstr "نو العملية"
+
+#. module: exp_asset_base
+#: model:ir.ui.view,arch_db:exp_asset_base.view_account_asset_asset_form
+msgid "Sell or Dispose"
+msgstr "بيع أو تخريد"
+
+#. module: exp_asset_base
+#: selection:account.asset.multi.operation,type:0
+#: selection:account.asset.operation,type:0
+msgid "Sell/Disposal"
+msgstr "بيع/إتلاف"
+
+#. module: exp_asset_base
+#: model:ir.ui.menu,name:exp_asset_base.menu_account_asset_sell_dispose
+msgid "Sell/Dispose"
+msgstr "بيع/إتلاف"
+
+#. module: exp_asset_base
+#: model:ir.actions.act_window,name:exp_asset_base.action_asset_sell_dispose
+#: model:ir.actions.act_window,name:exp_asset_base.action_asset_sell_dispose_wiz
+#: model:ir.model,name:exp_asset_base.model_account_asset_sell_dispose
+msgid "Sell/Dispose Asset"
+msgstr "بيع/إتلاف الأصل"
+
+#. module: exp_asset_base
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_adjustment_line_serial_no
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_asset_serial_no
+msgid "Serial No"
+msgstr "الرقم التسلسلي"
+
+#. module: exp_asset_base
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_asset_service_provider_id
+msgid "Service Provider"
+msgstr "مزود الخدمة"
+
+#. module: exp_asset_base
+#: model:ir.ui.view,arch_db:exp_asset_base.asset_adjustment_form
+#: model:ir.ui.view,arch_db:exp_asset_base.view_account_asset_asset_form
+#: model:ir.ui.view,arch_db:exp_asset_base.view_account_asset_modify_tree
+#: model:ir.ui.view,arch_db:exp_asset_base.view_account_asset_multi_operation_form
+#: model:ir.ui.view,arch_db:exp_asset_base.view_account_asset_operation_form
+#: model:ir.ui.view,arch_db:exp_asset_base.view_account_asset_receive_tree
+msgid "Set to Draft"
+msgstr "تعيين كمسودة"
+
+#. module: exp_asset_base
+#: model:ir.ui.view,arch_db:exp_asset_base.view_account_asset_modify_tree
+#: model:ir.ui.view,arch_db:exp_asset_base.view_account_asset_receive_tree
+#: model:ir.ui.view,arch_db:exp_asset_base.view_account_asset_sell_dispose_tree
+msgid "Setup"
+msgstr "الإعداد"
+
+#. module: exp_asset_base
+#: model:ir.ui.view,arch_db:exp_asset_base.asset_adjustment_form
+#: model:ir.ui.view,arch_db:exp_asset_base.view_account_asset_multi_operation_form
+msgid "Start"
+msgstr "بدأ"
+
+#. module: exp_asset_base
+#: model:ir.model.fields,field_description:exp_asset_base.field_report_asset_register_start_date
+msgid "Start Date"
+msgstr "تاريخ البدء"
+
+#. module: exp_asset_base
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_adjustment_state
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_multi_operation_state
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_operation_state
+#: model:ir.ui.view,arch_db:exp_asset_base.view_account_asset_operation_search
+msgid "State"
+msgstr "المحافظة"
+
+#. module: exp_asset_base
+#: selection:account.asset.operation,state:0
+msgid "Submit"
+msgstr "إرسال"
+
+#. module: exp_asset_base
+#: model:ir.model.fields,help:exp_asset_base.field_account_asset_asset_book_value
+msgid "Sum of the depreciable value, the salvage value and the book value of all value increase items"
+msgstr "مجموع قيم الإستهلاك, قيمة التخريد و القية الدفترية لجميع عناصر زيادة القيمة"
+
+#. module: exp_asset_base
+#: model:ir.ui.menu,name:exp_asset_base.menu_account_asset_suspend_depreciation
+msgid "Suspend Depreciation"
+msgstr "إيقاف الإستهلاك"
+
+#. module: exp_asset_base
+#: model:ir.model.fields,help:exp_asset_base.field_account_asset_operation_gain_value
+msgid "Technical field to know if we should display the fields for the creation of gross increase asset"
+msgstr "Technical field to know if we should display the fields for the creation of gross increase asset"
+
+#. module: exp_asset_base
+#: model:ir.model.fields,help:exp_asset_base.field_account_asset_operation_gain_or_loss
+msgid "Technical field to know is there was a gain or a loss in the selling of the asset"
+msgstr "Technical field to know is there was a gain or a loss in the selling of the asset"
+
+#. module: exp_asset_base
+#: code:addons/exp_asset_base/models/account_asset.py:348
+#, python-format
+msgid "The %s with barcode %s has schedule maintenance today ,please follow."
+msgstr "%s بالكود %s لديه صيانة مجدولة اليوم,الرجاء المتابعة."
+
+#. module: exp_asset_base
+#: model:ir.model.fields,help:exp_asset_base.field_account_asset_asset_children_ids
+msgid "The children are the gains in value of this asset"
+msgstr "The children are the gains in value of this asset"
+
+#. module: exp_asset_base
+#: model:ir.model.fields,help:exp_asset_base.field_account_asset_operation_invoice_id
+msgid "The disposal invoice is needed in order to generate the closing journal entry."
+msgstr "فاتورة الإتلاف مطلوبة بإنشاء قيد الإغلاق."
+
+#. module: exp_asset_base
+#: code:addons/exp_asset_base/models/account_asset.py:358
+#, python-format
+msgid "The warrant period of %s with barcode %s has end!"
+msgstr "فترة الضمان للأصل %s بالباركود %s قد إنتهت!"
+
+#. module: exp_asset_base
+#: model:ir.model.fields,help:exp_asset_base.field_account_asset_operation_invoice_line_id
+msgid "There are multiple lines that could be the related to this asset"
+msgstr "There are multiple lines that could be the related to this asset"
+
+#. module: exp_asset_base
+#: model:ir.ui.view,arch_db:exp_asset_base.view_account_asset_asset_form
+msgid "Time Method Based On"
+msgstr "طريقة الوقت مبنية على"
+
+#. module: exp_asset_base
+#: code:addons/exp_asset_base/reports/asset_depreciation_report_xlsx.py:43
+#, python-format
+msgid "To: "
+msgstr "الى: "
+
+#. module: exp_asset_base
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_operation_invoice_amount
+msgid "Total"
+msgstr "الإجمالي "
+
+#. module: exp_asset_base
+#: selection:account.asset.multi.operation,type:0
+#: selection:account.asset.operation,type:0
+msgid "Transfer"
+msgstr "نقل العهدة"
+
+#. module: exp_asset_base
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_adjustment_type
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_location_type
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_multi_operation_type
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_operation_type
+#: model:ir.ui.view,arch_db:exp_asset_base.view_account_asset_operation_search
+msgid "Type"
+msgstr "النوع"
+
+#. module: exp_asset_base
+#: model:ir.ui.view,arch_db:exp_asset_base.view_account_asset_asset_form
+msgid "Unlock"
+msgstr "إعادة الفتح"
+
+#. module: exp_asset_base
+#: code:addons/exp_asset_base/models/account_asset_operation.py:640
+#, python-format
+msgid "Value decrease for: %s"
+msgstr "تقليل قيمة: %s"
+
+#. module: exp_asset_base
+#: code:addons/exp_asset_base/models/account_asset_operation.py:591
+#: code:addons/exp_asset_base/models/account_asset_operation.py:597
+#, python-format
+msgid "Value increase for: %s"
+msgstr "زيادة قيمة: %s"
+
+#. module: exp_asset_base
+#: model:ir.ui.view,arch_db:exp_asset_base.view_account_asset_asset_form
+msgid "Vendor"
+msgstr "المورد"
+
+#. module: exp_asset_base
+#: model:ir.ui.menu,name:exp_asset_base.menu_account_asset_vendors
+msgid "Vendors"
+msgstr "الموردين"
+
+#. module: exp_asset_base
+#: selection:account.asset.location,type:0
+msgid "View"
+msgstr "عرض"
+
+#. module: exp_asset_base
+#: model:ir.ui.view,arch_db:exp_asset_base.view_account_asset_asset_form
+msgid "Warranty"
+msgstr "ضمان"
+
+#. module: exp_asset_base
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_asset_warranty_contract
+msgid "Warranty Contract"
+msgstr "عقد الضمان"
+
+#. module: exp_asset_base
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_asset_warranty_end_date
+msgid "Warranty End Date"
+msgstr "تاريخ نهاية الضمان"
+
+#. module: exp_asset_base
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_asset_warranty_period
+msgid "Warranty Period(Months)"
+msgstr "فترة الضمان (شهور)"
+
+#. module: exp_asset_base
+#: code:addons/exp_asset_base/models/account_asset_operation.py:457
+#, python-format
+msgid "You can't automate the journal entry for an asset that has a running gross increase. Please use 'Dispose' on the increase(s)."
+msgstr "لا يمكنك إنشاء قيود محاسبية تلقائيا لاصل لديه قيم زيادة تحت التنفيذ. الرجاء إتلاف جميع الزيادات أولاً."
+
+#. module: exp_asset_base
+#: code:addons/exp_asset_base/models/account_asset_operation.py:114
+#, python-format
+msgid "You have to choose invoice line when selling invoice has more than one line."
+msgstr "يجب إختيار عنصر الفاتورة في حال كانت فاتورة البيع تحتوي على أكثر من عنصر."
+
+#. module: exp_asset_base
+#: code:addons/exp_asset_base/models/account_asset_adjustment.py:66
+#, python-format
+msgid "You should enter the asset status for all assets that marked as exist."
+msgstr "يجب تحديد حالة الأصل لجميع الأصول الموجودة."
+
+#. module: exp_asset_base
+#: model:ir.model,name:exp_asset_base.model_account_asset_location
+msgid "account.asset.location"
+msgstr "account.asset.location"
+
+#. module: exp_asset_base
+#: model:ir.model,name:exp_asset_base.model_account_asset_manufacturer
+msgid "account.asset.manufacturer"
+msgstr "account.asset.manufacturer"
+
+#. module: exp_asset_base
+#: model:ir.model,name:exp_asset_base.model_account_asset_operation
+msgid "account.asset.operation"
+msgstr "account.asset.operation"
+
+#. module: exp_asset_base
+#: model:ir.model,name:exp_asset_base.model_account_asset_receive
+msgid "account.asset.receive"
+msgstr "account.asset.receive"
+
+#. module: exp_asset_base
+#: model:ir.ui.view,arch_db:exp_asset_base.view_account_asset_asset_form
+msgid "e.g. Laptop iBook"
+msgstr "مثال: كمبيوتر محمول"
+
+#. module: exp_asset_base
+#: code:addons/exp_asset_base/models/account_asset_operation.py:112
+#, python-format
+msgid "invoice is required when you selling the asset."
+msgstr "يجب إختيار فاتورة البيع."
+
+#. module: exp_asset_base
+#: model:ir.ui.view,arch_db:exp_asset_base.view_account_asset_operation_form
+msgid "months"
+msgstr "أشهر"
+
+#. module: exp_asset_base
+#: model:ir.model,name:exp_asset_base.model_report_asset_abstract_report_xlsx
+msgid "report.asset_abstract_report_xlsx"
+msgstr "report.asset_abstract_report_xlsx"
+
+#. module: exp_asset_base
+#: model:ir.model,name:exp_asset_base.model_report_asset_depreciation_report_xlsx
+msgid "report.asset_depreciation_report_xlsx"
+msgstr "report.asset_depreciation_report_xlsx"
+
+#. module: exp_asset_base
+#: model:ir.model,name:exp_asset_base.model_report_report_asset_register_xlsx
+msgid "report.report_asset_register_xlsx"
+msgstr "report.report_asset_register_xlsx"
+
+#. module: exp_asset_base
+#: model:ir.model,name:exp_asset_base.model_report_asset_register
+msgid "report_asset_register"
+msgstr "report_asset_register"
+
+#. module: exp_asset_base
+#: model:ir.model,name:exp_asset_base.model_report_asset_register_depreciation
+msgid "report_asset_register_depreciation"
+msgstr "report_asset_register_depreciation"
+
+#. module: exp_asset_base
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_location_account_analytic_id
+msgid "Cost Center"
+msgstr "مركز التكلفة"
+
+#. module: exp_asset_base
+#: model:ir.model.fields,field_description:exp_asset_base.field_account_asset_operation_move_id
+msgid "move"
+msgstr "القيد"
+
+#. module: exp_asset_base
+#: code:addons/exp_asset_base/models/account_asset_operation.py:178
+#, python-format
+msgid "Asset should be one on lines."
+msgstr "يجب ان يظهر الﻷصل مرة واحدو فقط في العملية"
+
+#. module: exp_asset_base
+#: model:ir.ui.view,arch_db:exp_asset_base.view_account_asset_asset_form
+msgid "Receive"
+msgstr "إستلام"
diff --git a/dev_odex30_accounting/exp_asset_base/models/__init__.py b/dev_odex30_accounting/exp_asset_base/models/__init__.py
new file mode 100644
index 0000000..f360068
--- /dev/null
+++ b/dev_odex30_accounting/exp_asset_base/models/__init__.py
@@ -0,0 +1,8 @@
+# -*- coding: utf-8 -*-
+# © Copyright (C) 2021 Expert Co. Ltd(<http:/www.exp-sa.com>)
+
+from . import account_asset
+from . import account_asset_adjustment
+from . import asset_modify
+from . import asset_pause
+from . import asset_sell
diff --git a/dev_odex30_accounting/exp_asset_base/models/__pycache__/__init__.cpython-311.pyc b/dev_odex30_accounting/exp_asset_base/models/__pycache__/__init__.cpython-311.pyc
new file mode 100644
index 0000000..dd4271c
Binary files /dev/null and b/dev_odex30_accounting/exp_asset_base/models/__pycache__/__init__.cpython-311.pyc differ
diff --git a/dev_odex30_accounting/exp_asset_base/models/__pycache__/account_asset.cpython-311.pyc b/dev_odex30_accounting/exp_asset_base/models/__pycache__/account_asset.cpython-311.pyc
new file mode 100644
index 0000000..355bc9a
Binary files /dev/null and b/dev_odex30_accounting/exp_asset_base/models/__pycache__/account_asset.cpython-311.pyc differ
diff --git a/dev_odex30_accounting/exp_asset_base/models/__pycache__/account_asset_adjustment.cpython-311.pyc b/dev_odex30_accounting/exp_asset_base/models/__pycache__/account_asset_adjustment.cpython-311.pyc
new file mode 100644
index 0000000..57b6a2c
Binary files /dev/null and b/dev_odex30_accounting/exp_asset_base/models/__pycache__/account_asset_adjustment.cpython-311.pyc differ
diff --git a/dev_odex30_accounting/exp_asset_base/models/__pycache__/asset_modify.cpython-311.pyc b/dev_odex30_accounting/exp_asset_base/models/__pycache__/asset_modify.cpython-311.pyc
new file mode 100644
index 0000000..2f36c07
Binary files /dev/null and b/dev_odex30_accounting/exp_asset_base/models/__pycache__/asset_modify.cpython-311.pyc differ
diff --git a/dev_odex30_accounting/exp_asset_base/models/__pycache__/asset_pause.cpython-311.pyc b/dev_odex30_accounting/exp_asset_base/models/__pycache__/asset_pause.cpython-311.pyc
new file mode 100644
index 0000000..a614719
Binary files /dev/null and b/dev_odex30_accounting/exp_asset_base/models/__pycache__/asset_pause.cpython-311.pyc differ
diff --git a/dev_odex30_accounting/exp_asset_base/models/__pycache__/asset_sell.cpython-311.pyc b/dev_odex30_accounting/exp_asset_base/models/__pycache__/asset_sell.cpython-311.pyc
new file mode 100644
index 0000000..9ab37cb
Binary files /dev/null and b/dev_odex30_accounting/exp_asset_base/models/__pycache__/asset_sell.cpython-311.pyc differ
diff --git a/dev_odex30_accounting/exp_asset_base/models/account_asset.py b/dev_odex30_accounting/exp_asset_base/models/account_asset.py
new file mode 100644
index 0000000..86509f8
--- /dev/null
+++ b/dev_odex30_accounting/exp_asset_base/models/account_asset.py
@@ -0,0 +1,294 @@
+# -*- coding: utf-8 -*-
+# © Copyright (C) 2021 Expert Co. Ltd(<http:/www.exp-sa.com>)
+
+from odoo import models, fields, api, _
+from datetime import datetime
+from odoo.osv import expression
+from dateutil.relativedelta import relativedelta
+from odoo.tools import DEFAULT_SERVER_DATE_FORMAT
+
+
+class AccountAssetManufacturer(models.Model):
+    _name = 'account.asset.manufacturer'
+    _inherit = ["mail.thread", "mail.activity.mixin"]
+    _description = 'Asset Manufacturer'
+
+    name = fields.Char(required=True, tracking=True)
+
+
+class AccountAssetLocation(models.Model):
+    _name = 'account.asset.location'
+    _inherit = ["mail.thread", "mail.activity.mixin"]
+    _description = 'Asset Location'
+    _parent_name = "parent_id"
+    _parent_store = True
+    _rec_name = 'complete_name'
+    _order = 'complete_name'
+
+    name = fields.Char(required=True, tracking=True)
+    complete_name = fields.Char('Asset Location', compute='_compute_complete_name', tracking=True, store=True , recursive=True)
+    code = fields.Char(required=True, tracking=True)
+    type = fields.Selection(selection=[('ordinary', 'Ordinary'), ('view', 'View')], default='ordinary', required=True,
+                            tracking=True)
+    parent_id = fields.Many2one(string='Parent', comodel_name='account.asset.location', domain=[('type', '=', 'view')],
+                                tracking=True)
+    parent_path = fields.Char(index=True, tracking=True)
+    child_id = fields.One2many('account.asset.location', 'parent_id', 'Child Locations', tracking=True)
+
+    @api.depends('name', 'parent_id.complete_name')
+    def _compute_complete_name(self):
+        for location in self:
+            if location.parent_id:
+                location.complete_name = '%s / %s' % (location.parent_id.complete_name, location.name)
+            else:
+                location.complete_name = location.name
+
+
+class AccountAssetAsset(models.Model):
+    _name = 'account.asset'
+    _inherit = ['account.asset', "mail.thread", "mail.activity.mixin"]
+
+    asset_picture = fields.Binary(
+        states={'draft': [('readonly', False)], 'unlock': [('readonly', False)]},
+        readonly=True,
+    )
+    serial_no = fields.Char(
+        states={'draft': [('readonly', False)], 'unlock': [('readonly', False)]},
+        readonly=True,
+    )
+    model = fields.Char(
+        states={'draft': [('readonly', False)], 'unlock': [('readonly', False)]},
+        readonly=True,
+    )
+    manufacturer_id = fields.Many2one(
+        comodel_name='account.asset.manufacturer',
+        states={'draft': [('readonly', False)], 'unlock': [('readonly', False)]},
+        readonly=True,
+    )
+    barcode = fields.Char(
+        states={'draft': [('readonly', False)], 'unlock': [('readonly', False)]},
+        readonly=True, index=True, copy=False,
+    )
+    note = fields.Text(
+        states={'draft': [('readonly', False)], 'unlock': [('readonly', False)]},
+        readonly=True,
+    )
+    receive_date = fields.Date(
+        states={'draft': [('readonly', False)]},
+        readonly=True,
+    )
+    service_provider_id = fields.Many2one(
+        comodel_name='res.partner',
+        states={'draft': [('readonly', False)], 'unlock': [('readonly', False)]},
+        readonly=True,
+    )
+    next_maintenance_date = fields.Date(
+        states={'draft': [('readonly', False)], 'unlock': [('readonly', False)]},
+        readonly=True,
+    )
+    warranty_period = fields.Integer(
+        states={'draft': [('readonly', False)], 'unlock': [('readonly', False)]},
+        readonly=True, string="Warranty Period(Months)"
+    )
+    warranty_end_date = fields.Date(
+        compute='_compute_warranty_end_date',
+        readonly=True, store=True,
+    )
+    warranty_contract = fields.Binary(
+        states={'draft': [('readonly', False)], 'unlock': [('readonly', False)]},
+        readonly=True, )
+    value_residual = fields.Monetary(
+        string='Depreciable Value',
+        compute='_compute_value_residual',
+        store=True)
+    product_id = fields.Many2one(comodel_name='product.product',
+                                 domain=[('property_account_expense_id.can_create_asset', '=', True),
+                                         ('property_account_expense_id.account_type', '=', 'asset_fixed')],
+                                 states={'draft': [('readonly', False)], 'unlock': [('readonly', False)]},
+                                 readonly=True, tracking=True)
+    responsible_dept_id = fields.Many2one(comodel_name='hr.department', string='Responsible Department',
+                                          states={'draft': [('readonly', False)], 'model': [('readonly', False)],
+                                                  'unlock': [('readonly', False)]},
+                                          readonly=True,
+                                          default=lambda self: self.env.user.employee_id.department_id.id,
+                                          tracking=True)
+    responsible_user_id = fields.Many2one(
+        comodel_name='res.users',
+        states={'draft': [('readonly', False)], 'model': [('readonly', False)], 'unlock': [('readonly', False)]},
+        readonly=True, default=lambda self: self.env.user, tracking=True)
+    asset_adjustment_count = fields.Integer(
+        compute='_asset_adjustment_count',
+        string='# of Adjustments',
+        help="Number of adjustments")
+
+    status = fields.Selection(
+        selection=[('new', 'New'), ('available', 'Available')],
+        default='new', tracking=True)
+    location_id = fields.Many2one(comodel_name='account.asset.location', string='Current Location', tracking=True)
+    state = fields.Selection(selection_add=[('unlock', 'Unlock')])
+    limit = fields.Float(tracking=True)
+
+    _sql_constraints = [
+        ('asset_barcode_uniq', 'unique (barcode)', 'Asset barcode must be unique.')
+    ]
+
+    def validate(self):
+        """Validate asset and set it to running state"""
+        self.ensure_one()  # تأكد أن العملية على record واحد فقط
+
+        # تحقق من الشروط
+
+        # غيّر الحالة (tracking سيعمل تلقائياً)
+        self.write({'state': 'open'})
+
+        # رسالة
+        asset_type_labels = {
+            'purchase': _('Asset'),
+            'sale': _('Deferred revenue'),
+            'expense': _('Deferred expense'),
+        }
+
+        label = asset_type_labels.get(self.asset_type, _('Asset'))
+        message = _('%s has been validated and is now running.') % label
+
+        self.message_post(body=message)
+
+        return True
+
+    # يجب تحويله إلى analytic_distribution
+    @api.onchange('location_id')
+    def onchange_location_id(self):
+        if self.location_id and self.location_id.analytic_distribution:
+            self.analytic_distribution = self.location_id.analytic_distribution
+
+    # @api.onchange('location_id')
+    # def onchange_location_id(self):
+    #     if self.analytic_distribution and self.location_id.account_analytic_id:
+    #         self.analytic_distribution = self.location_id.account_analytic_id.id
+
+    # def action_asset_modify(self):
+    #     """ Returns an action opening the asset modification wizard.
+    #     """
+    #     self.ensure_one()
+    #     return {
+    #         'name': _('Modify Asset'),
+    #         'view_mode': 'form',
+    #         'res_model': 'account.asset.modify',
+    #         'type': 'ir.actions.act_window',
+    #         'target': 'current',
+    #         'context': {
+    #             'default_asset_id': self.id,
+    #         },
+    #     }
+
+    def action_asset_pause(self):
+        """ Returns an action opening the asset pause wizard."""
+        self.ensure_one()
+        return {
+            'name': _('Pause Asset'),
+            'view_mode': 'form',
+            'res_model': 'asset.pause',
+            'type': 'ir.actions.act_window',
+            'target': 'current',
+            'context': {
+                'default_asset_id': self.id,
+            },
+        }
+
+    def action_set_to_close(self):
+        """ Returns an action opening the asset pause wizard."""
+        self.ensure_one()
+
+        return {
+            'name': _('Sell Asset'),
+            'view_mode': 'form',
+            'res_model': 'asset.sell',
+            'type': 'ir.actions.act_window',
+            'target': 'current',
+            'context': {
+                'default_asset_id': self.id,
+            },
+        }
+
+    def act_unlock(self):
+        self.state = 'unlock'
+
+    def act_lock(self):
+        self.state = 'open'
+
+    def _asset_adjustment_count(self):
+        for asset in self:
+            asset.asset_adjustment_count = len(
+                self.env['account.asset.adjustment.line'].search([('asset_id', '=', asset.id)]))
+
+    def open_asset_adjustment(self):
+        return {
+            'name': _('Asset Adjustment'),
+            'view_mode': 'tree',
+            'res_model': 'account.asset.adjustment.line',
+            'type': 'ir.actions.act_window',
+            'domain': [('asset_id', '=', self.id)],
+            'flags': {'search_view': True, 'action_buttons': False},
+        }
+
+    @api.depends('acquisition_date', 'warranty_period')
+    def _compute_warranty_end_date(self):
+        for asset in self:
+            if asset.acquisition_date:
+                asset.warranty_end_date = asset.acquisition_date + relativedelta(months=asset.warranty_period)
+
+    @api.depends('name', 'barcode')
+    def name_get(self):
+        return [(r.id, r.name + (r.barcode and '-' + r.barcode or '')) for r in self]
+
+    @api.model
+    def name_search(self, name, args=None, operator='ilike', limit=100):
+        args = args or []
+        domain = []
+        if name:
+            domain = ['|', ('barcode', operator, name), ('name', operator, name)]
+            if operator in expression.NEGATIVE_TERM_OPERATORS:
+                domain = ['&', '!'] + domain[1:]
+        assets = self.search(domain + args, limit=limit)
+        return assets.name_get()
+
+    @api.model
+    def create(self, values):
+        if values.get('state', False) != 'model':
+            values['serial_no'] = self.env['ir.sequence'].with_context(
+                ir_sequence_date=values.get('acquisition_date', fields.Date.today())).next_by_code('asset.seq')
+        return super(AccountAssetAsset, self).create(values)
+
+    def action_save_model(self):
+        action = super(AccountAssetAsset, self).action_save_model()
+        action['context']['default_asset_type'] = self.asset_type
+        return action
+
+    @api.model
+    def _asset_cron(self):
+        today = fields.Date.today()
+        for asset in self.search([('next_maintenance_date', '=', today)]):
+            self.env['mail.activity'].sudo().create({
+                'res_model_id': self.env.ref('account_asset.model_account_asset_asset').id,
+                'res_id': asset.id,
+                'user_id': asset.responsible_user_id.id,
+                'activity_type_id': self.env.ref('mail.mail_activity_data_todo').id,
+                'summary': _('The %s with barcode %s has schedule maintenance today ,please follow.') % (
+                    asset.name, asset.barcode),
+                'date_deadline': asset.next_maintenance_date,
+            })
+        for asset in self.search([('warranty_end_date', '=', today)]):
+            self.env['mail.activity'].sudo().create({
+                'res_model_id': self.env.ref('account_asset.model_account_asset_asset').id,
+                'res_id': asset.id,
+                'user_id': asset.responsible_user_id.id,
+                'activity_type_id': self.env.ref('mail.mail_activity_data_todo').id,
+                'summary': _('The warrant period of %s with barcode %s has end!') % (asset.name, asset.barcode),
+                'date_deadline': asset.warranty_end_date,
+            })
+
+    @api.onchange('model_id', 'original_value')
+    def _onchange_model_id(self):
+        super(AccountAssetAsset, self)._onchange_model_id()
+        if self.model_id and self.original_value <= self.model_id.limit:
+            self.method_number = 0
diff --git a/dev_odex30_accounting/exp_asset_base/models/account_asset_adjustment.py b/dev_odex30_accounting/exp_asset_base/models/account_asset_adjustment.py
new file mode 100644
index 0000000..93dc1c1
--- /dev/null
+++ b/dev_odex30_accounting/exp_asset_base/models/account_asset_adjustment.py
@@ -0,0 +1,116 @@
+# -*- coding: utf-8 -*-
+# © Copyright (C) 2021 Expert Co. Ltd(<http:/www.exp-sa.com>)
+
+from odoo import api, fields, models, exceptions,  _
+from odoo.exceptions import UserError
+
+
+class AccountAssetAdjustment(models.Model):
+    _name = 'account.asset.adjustment'
+    _inherit = ['barcodes.barcode_events_mixin',"mail.thread", "mail.activity.mixin"]
+    _description = 'Asset Adjustment'
+
+    name = fields.Char(
+        states={'draft': [('readonly', False)]},
+        readonly=True, required=True,tracking=True
+    )
+    date = fields.Date(
+        default=fields.Date.context_today,
+        index=True, copy=False, readonly=True, required=True,tracking=True,
+        states={'draft': [('readonly', False)]}
+    )
+    type = fields.Selection(
+        selection=[('product', 'By Product'),
+                   ('model', 'By Model')],
+        states={'draft': [('readonly', False)]},
+        readonly=True,tracking=True
+    )
+    product_id = fields.Many2one(
+        comodel_name='product.product',
+        domain=[('property_account_expense_id.can_create_asset', '=', True),
+                ('property_account_expense_id.account_type', '=', 'asset_fixed')],
+        states={'draft': [('readonly', False)]},
+        readonly=True,tracking=True
+    )
+    model_id = fields.Many2one(
+        comodel_name='account.asset',
+        domain=[('asset_type', '=', 'purchase'), ('state', '=', 'model')],
+        states={'draft': [('readonly', False)]},
+        readonly=True,tracking=True
+    )
+    barcode = fields.Char(
+        states={'in_progress': [('readonly', False)]},
+        readonly=True,tracking=True
+    )
+    adjustment_line_ids = fields.One2many(
+        'account.asset.adjustment.line', 'adjustment_id',
+        states={'in_progress': [('readonly', False)]},
+        readonly=True,tracking=True
+    )
+    state = fields.Selection(
+        selection=[('draft', 'Draft'),
+                   ('in_progress', 'In Progress'),
+                   ('done', 'Done'),
+                   ('cancel', 'Cancel')],
+        required=True, default='draft',tracking=True
+    )
+
+    def build_domain(self):
+        return (self.type == 'product' and [('product_id', '=', self.product_id.id)]) or \
+               (self.type == 'model' and [('model_id', '=', self.model_id.id)]) or []
+
+    def act_progress(self):
+        domain = self.build_domain()
+        assets = self.env['account.asset'].search(domain+[('asset_type', '=', 'purchase'),
+                                                          ('state', '!=', 'model'), ('parent_id', '=', False)])
+        self.adjustment_line_ids = [(0, 0, {'asset_id': s.id}) for s in assets]
+        self.state = 'in_progress'
+
+    def act_done(self):
+        if self.adjustment_line_ids.search([('adjustment_id', '=', self.id), ('exist', '=', True), ('asset_status2', '=', False)]):
+            raise UserError(_('You should enter the asset status for all assets that marked as exist.'))
+        self.barcode = False
+        self.state = 'done'
+
+    def act_cancel(self):
+        self.state = 'cancel'
+
+    def act_draft(self):
+        self.state = 'draft'
+        self.adjustment_line_ids.unlink()
+
+    @api.onchange('type')
+    def onchange_type(self):
+        self.product_id = False
+        self.model_id = False
+
+    def on_barcode_scanned(self, barcode):
+        if barcode:
+            line = self.adjustment_line_ids.filtered(lambda x: x.barcode == barcode)
+            if not line:
+                raise UserError(_('No asset found with the selected barcode'))
+            for l in line:
+                l.exist = True
+
+    @api.onchange('barcode')
+    def onchange_barcode(self):
+        self.on_barcode_scanned(self.barcode)
+
+
+class AccountAssetAdjustmentLine(models.Model):
+    _name = 'account.asset.adjustment.line'
+    _description = 'Asset Adjustment Line'
+
+    adjustment_id = fields.Many2one(comodel_name='account.asset.adjustment',tracking=True)
+    asset_id = fields.Many2one(comodel_name='account.asset',tracking=True)
+    barcode = fields.Char(related='asset_id.barcode',tracking=True)
+    serial_no = fields.Char(related='asset_id.serial_no',tracking=True)
+    asset_status = fields.Selection(selection=[('good', 'Good'), ('scrap', 'Scrap')],tracking=True)
+    asset_status2  = fields.Many2one(
+        comodel_name='asset.state2',
+        string='Asset Status',tracking=True)
+    exist = fields.Boolean(string="Exist?",tracking=True)
+class AccountAssestatus(models.Model):
+    _name = 'asset.state2'
+    name = fields.Char(string='Name')
+#
diff --git a/dev_odex30_accounting/exp_asset_base/models/asset_modify.py b/dev_odex30_accounting/exp_asset_base/models/asset_modify.py
new file mode 100644
index 0000000..57c11ad
--- /dev/null
+++ b/dev_odex30_accounting/exp_asset_base/models/asset_modify.py
@@ -0,0 +1,179 @@
+# -*- coding: utf-8 -*-
+
+
+from odoo import api, fields, models, _
+from odoo.exceptions import UserError
+
+
+class AssetModify(models.Model):
+    _name = 'account.asset.modify'
+    _description = 'Modify Asset'
+    _inherit = ['mail.thread', 'mail.activity.mixin']
+
+    name = fields.Text(string='Reason',tracking=True)
+    asset_id = fields.Many2one(string="Asset", comodel_name='account.asset', domain="[('asset_type', '=', 'purchase'), ('state', '!=', 'model'), ('parent_id', '=', False)]",required=True, help="The asset to be modified by this wizard", ondelete="cascade",tracking=True)
+    method_number = fields.Integer(string='Number of Depreciations', required=True,tracking=True)
+    method_period = fields.Selection([('1', 'Months'), ('12', 'Years')], string='Number of Months in a Period', help="The amount of time between two depreciations",tracking=True)
+    value_residual = fields.Monetary(string="Depreciable Amount", help="New residual amount for the asset",tracking=True)
+    salvage_value = fields.Monetary(string="Not Depreciable Amount", help="New salvage amount for the asset",tracking=True)
+    currency_id = fields.Many2one(related='asset_id.currency_id')
+    date = fields.Date(default=fields.Date.today(), string='Date',tracking=True)
+    need_date = fields.Boolean(compute="_compute_need_date")
+    gain_value = fields.Boolean(compute="_compute_gain_value", help="Technical field to know if we should display the fields for the creation of gross increase asset")
+    account_asset_id = fields.Many2one('account.account', string="Asset Gross Increase Account",tracking=True)
+    account_asset_counterpart_id = fields.Many2one('account.account',tracking=True)
+    account_depreciation_id = fields.Many2one('account.account',tracking=True)
+    account_depreciation_expense_id = fields.Many2one('account.account',tracking=True)
+    state = fields.Selection(selection=[('draft', 'Draft'),('confirm', 'Confirmed'),('approve', 'Approved'),('done', 'Done')],default='draft',readonly=True,tracking=True)
+
+    @api.model
+    def create(self, vals):
+        if 'asset_id' in vals:
+            asset = self.env['account.asset'].browse(vals['asset_id'])
+            if asset.depreciation_move_ids.filtered(lambda m: m.state == 'posted' and not m.reversal_move_id and m.date > fields.Date.today()):
+                raise UserError(_('Reverse the depreciation entries posted in the future in order to modify the depreciation'))
+            if 'method_number' not in vals:
+                vals.update({'method_number': len(asset.depreciation_move_ids.filtered(lambda move: move.state != 'posted')) or 1})
+            if 'method_period' not in vals:
+                vals.update({'method_period': asset.method_period})
+            if 'salvage_value' not in vals:
+                vals.update({'salvage_value': asset.salvage_value})
+            if 'value_residual' not in vals:
+                vals.update({'value_residual': asset.value_residual})
+            if 'account_asset_id' not in vals:
+                vals.update({'account_asset_id': asset.account_asset_id.id})
+            if 'account_depreciation_id' not in vals:
+                vals.update({'account_depreciation_id': asset.account_depreciation_id.id})
+            if 'account_depreciation_expense_id' not in vals:
+                vals.update({'account_depreciation_expense_id': asset.account_depreciation_expense_id.id})
+        return super(AssetModify, self).create(vals)
+
+    def act_confirm(self):
+        self.state = 'confirm'
+
+    def act_approve(self):
+        self.state = 'approve'
+
+    def act_draft(self):
+        self.state = 'draft'
+
+    def modify(self):
+        """ Modifies the duration of asset for calculating depreciation
+        and maintains the history of old values, in the chatter.
+        """
+        old_values = {
+            'method_number': self.asset_id.method_number,
+            'method_period': self.asset_id.method_period,
+            'value_residual': self.asset_id.value_residual,
+            'salvage_value': self.asset_id.salvage_value,
+        }
+
+        asset_vals = {
+            'method_number': self.method_number,
+            'method_period': self.method_period,
+            'value_residual': self.value_residual,
+            'salvage_value': self.salvage_value,
+        }
+        if self.need_date:
+            asset_vals.update({
+                'prorata_date': self.date,
+            })
+        if self.env.context.get('resume_after_pause'):
+            asset_vals.update({'state': 'open'})
+            self.asset_id.message_post(body=_("Asset unpaused"))
+        else:
+            self = self.with_context(ignore_prorata=True)
+
+        current_asset_book = self.asset_id.value_residual + self.asset_id.salvage_value
+        after_asset_book = self.value_residual + self.salvage_value
+        increase = after_asset_book - current_asset_book
+
+        new_residual = min(current_asset_book - min(self.salvage_value, self.asset_id.salvage_value), self.value_residual)
+        new_salvage = min(current_asset_book - new_residual, self.salvage_value)
+        residual_increase = max(0, self.value_residual - new_residual)
+        salvage_increase = max(0, self.salvage_value - new_salvage)
+
+        if residual_increase or salvage_increase:
+            move = self.env['account.move'].create({
+                'journal_id': self.asset_id.journal_id.id,
+                'date': fields.Date.today(),
+                'line_ids': [
+                    (0, 0, {
+                        'account_id': self.account_asset_id.id,
+                        'debit': residual_increase + salvage_increase,
+                        'credit': 0,
+                        'name': _('Value increase for: %(asset)s', asset=self.asset_id.name),
+                    }),
+                    (0, 0, {
+                        'account_id': self.account_asset_counterpart_id.id,
+                        'debit': 0,
+                        'credit': residual_increase + salvage_increase,
+                        'name': _('Value increase for: %(asset)s', asset=self.asset_id.name),
+                    }),
+                ],
+            })
+            move.action_post()
+            asset_increase = self.env['account.asset'].create({
+                'name': self.asset_id.name + ': ' + self.name,
+                'currency_id': self.asset_id.currency_id.id,
+                'company_id': self.asset_id.company_id.id,
+                'asset_type': self.asset_id.asset_type,
+                'method': self.asset_id.method,
+                'method_number': self.method_number,
+                'method_period': self.method_period,
+                'acquisition_date': self.date,
+                'value_residual': residual_increase,
+                'salvage_value': salvage_increase,
+                'original_value': residual_increase + salvage_increase,
+                'account_asset_id': self.account_asset_id.id,
+                'account_depreciation_id': self.account_depreciation_id.id,
+                'account_depreciation_expense_id': self.account_depreciation_expense_id.id,
+                'journal_id': self.asset_id.journal_id.id,
+                'parent_id': self.asset_id.id,
+                'original_move_line_ids': [(6, 0, move.line_ids.filtered(lambda r: r.account_id == self.account_asset_id).ids)],
+            })
+            asset_increase.validate()
+
+            subject = _('A gross increase has been created') + ': <a href=# data-oe-model=account.asset data-oe-id=%d>%s</a>' % (asset_increase.id, asset_increase.name)
+            self.asset_id.message_post(body=subject)
+        if increase < 0:
+            if self.env['account.move'].search([('asset_id', '=', self.asset_id.id), ('state', '=', 'draft'), ('date', '<=', self.date)]):
+                raise UserError('There are unposted depreciations prior to the selected operation date, please deal with them first.')
+            move = self.env['account.move'].create(self.env['account.move']._prepare_move_for_asset_depreciation({
+                'amount': -increase,
+                'asset_id': self.asset_id,
+                'move_ref': _('Value decrease for: %(asset)s', asset=self.asset_id.name),
+                'date': self.date,
+                'asset_remaining_value': 0,
+                'asset_depreciated_value': 0,
+                'asset_value_change': True,
+            })).action_post()
+
+        asset_vals.update({
+            'value_residual': new_residual,
+            'salvage_value': new_salvage,
+        })
+        self.asset_id.write(asset_vals)
+        self.asset_id.compute_depreciation_board()
+        self.asset_id.children_ids.write({
+            'method_number': asset_vals['method_number'],
+            'method_period': asset_vals['method_period'],
+        })
+        for child in self.asset_id.children_ids:
+            child.compute_depreciation_board()
+        tracked_fields = self.env['account.asset'].fields_get(old_values.keys())
+        changes, tracking_value_ids = self.asset_id._message_track(tracked_fields, old_values)
+        if changes:
+            self.asset_id.message_post(body=_('Depreciation board modified') + '<br>' + self.name, tracking_value_ids=tracking_value_ids)
+        return self.write({'state':'done'})
+
+    @api.depends('asset_id', 'value_residual', 'salvage_value')
+    def _compute_need_date(self):
+        for record in self:
+            value_changed = record.value_residual + record.salvage_value != record.asset_id.value_residual + record.asset_id.salvage_value
+            record.need_date = (self.env.context.get('resume_after_pause') and record.asset_id.prorata) or value_changed
+
+    @api.depends('asset_id', 'value_residual', 'salvage_value')
+    def _compute_gain_value(self):
+        for record in self:
+            record.gain_value = record.value_residual + record.salvage_value > record.asset_id.value_residual + record.asset_id.salvage_value
diff --git a/dev_odex30_accounting/exp_asset_base/models/asset_pause.py b/dev_odex30_accounting/exp_asset_base/models/asset_pause.py
new file mode 100644
index 0000000..9a0598b
--- /dev/null
+++ b/dev_odex30_accounting/exp_asset_base/models/asset_pause.py
@@ -0,0 +1,29 @@
+# -*- coding: utf-8 -*-
+
+
+from odoo import api, fields, models, _
+
+
+class AssetPause(models.Model):
+    _name = 'asset.pause'
+    _description = 'Pause Asset'
+    _inherit = ['mail.thread', 'mail.activity.mixin']
+    _rec_name = 'asset_id'
+
+    date = fields.Date(string='Pause date', required=True, default=fields.Date.today(),tracking=True)
+    asset_id = fields.Many2one('account.asset', domain="[('asset_type', '=', 'purchase'), ('state', '!=', 'model'), ('parent_id', '=', False)]",required=True,tracking=True)
+    state = fields.Selection(selection=[('draft', 'Draft'),('confirm', 'Confirmed'),('approve', 'Approved'),('done', 'Done')],default='draft',readonly=True,tracking=True)
+
+    def act_confirm(self):
+        self.state = 'confirm'
+
+    def act_approve(self):
+        self.state = 'approve'
+
+    def act_draft(self):
+        self.state = 'draft'
+
+    def do_action(self):
+        for record in self:
+            record.asset_id.pause(pause_date=record.date)
+        return self.write({'state':'done'})
diff --git a/dev_odex30_accounting/exp_asset_base/models/asset_sell.py b/dev_odex30_accounting/exp_asset_base/models/asset_sell.py
new file mode 100644
index 0000000..1f234b3
--- /dev/null
+++ b/dev_odex30_accounting/exp_asset_base/models/asset_sell.py
@@ -0,0 +1,60 @@
+# -*- coding: utf-8 -*-
+
+
+from odoo import api, fields, models, _
+from odoo.exceptions import UserError
+
+
+class AssetSell(models.Model):
+    _name = 'asset.sell'
+    _description = 'Sell Asset'
+    _inherit = ['mail.thread', 'mail.activity.mixin']
+    _rec_name = 'asset_id'
+
+    asset_id = fields.Many2one('account.asset', domain="[('asset_type', '=', 'purchase'), ('state', '!=', 'model'), ('parent_id', '=', False)]",required=True,tracking=True)
+    company_id = fields.Many2one('res.company', default=lambda self: self.env.company)
+
+    action = fields.Selection([('sell', 'Sell'), ('dispose', 'Dispose')], required=True, default='sell',tracking=True)
+    invoice_id = fields.Many2one('account.move', string="Customer Invoice", help="The disposal invoice is needed in order to generate the closing journal entry.", domain="[('move_type', '=', 'out_invoice'), ('state', '=', 'posted')]",tracking=True)
+    invoice_line_id = fields.Many2one('account.move.line', help="There are multiple lines that could be the related to this asset", domain="[('move_id', '=', invoice_id), ('exclude_from_invoice_tab', '=', False)]",tracking=True)
+    select_invoice_line_id = fields.Boolean(compute="_compute_select_invoice_line_id")
+    gain_account_id = fields.Many2one('account.account', domain="[('deprecated', '=', False), ('company_id', '=', company_id),('type','!=','view')]", related='company_id.gain_account_id', help="Account used to write the journal item in case of gain", readonly=False,tracking=True)
+    loss_account_id = fields.Many2one('account.account', domain="[('deprecated', '=', False), ('company_id', '=', company_id)]", related='company_id.loss_account_id', help="Account used to write the journal item in case of loss", readonly=False,tracking=True)
+
+    gain_or_loss = fields.Selection([('gain', 'Gain'), ('loss', 'Loss'), ('no', 'No')], compute='_compute_gain_or_loss', help="Technical field to know is there was a gain or a loss in the selling of the asset",tracking=True)
+    state = fields.Selection(selection=[('draft', 'Draft'),('confirm', 'Confirmed'),('approve', 'Approved'),('done', 'Done')],default='draft',readonly=True,tracking=True)
+
+    def act_confirm(self):
+        self.state = 'confirm'
+
+    def act_approve(self):
+        self.state = 'approve'
+
+    def act_draft(self):
+        self.state = 'draft'
+
+    @api.depends('invoice_id', 'action')
+    def _compute_select_invoice_line_id(self):
+        for record in self:
+            record.select_invoice_line_id = record.action == 'sell' and len(record.invoice_id.invoice_line_ids) > 1
+
+    @api.onchange('action')
+    def _onchange_action(self):
+        if self.action == 'sell' and self.asset_id.children_ids.filtered(lambda a: a.state in ('draft', 'open') or a.value_residual > 0):
+            raise UserError(_("You cannot automate the journal entry for an asset that has a running gross increase. Please use 'Dispose' on the increase(s)."))
+
+    @api.depends('asset_id', 'invoice_id', 'invoice_line_id')
+    def _compute_gain_or_loss(self):
+        for record in self:
+            line = record.invoice_line_id or len(record.invoice_id.invoice_line_ids) == 1 and record.invoice_id.invoice_line_ids or self.env['account.move.line']
+            if record.asset_id.value_residual < abs(line.balance):
+                record.gain_or_loss = 'gain'
+            elif record.asset_id.value_residual > abs(line.balance):
+                record.gain_or_loss = 'loss'
+            else:
+                record.gain_or_loss = 'no'
+
+    def do_action(self):
+        self.ensure_one()
+        invoice_line = self.env['account.move.line'] if self.action == 'dispose' else self.invoice_line_id or self.invoice_id.invoice_line_ids
+        return self.asset_id.set_to_close(invoice_line_id=invoice_line, date=invoice_line.move_id.invoice_date)
diff --git a/dev_odex30_accounting/exp_asset_base/reports/__init__.py b/dev_odex30_accounting/exp_asset_base/reports/__init__.py
new file mode 100644
index 0000000..954b437
--- /dev/null
+++ b/dev_odex30_accounting/exp_asset_base/reports/__init__.py
@@ -0,0 +1,4 @@
+from . import abstract_report_xlsx
+from . import asset_register_report_xlsx
+#from . import asset_depreciation_report_xlsx
+#from . import  asset_register_report
\ No newline at end of file
diff --git a/dev_odex30_accounting/exp_asset_base/reports/__pycache__/__init__.cpython-311.pyc b/dev_odex30_accounting/exp_asset_base/reports/__pycache__/__init__.cpython-311.pyc
new file mode 100644
index 0000000..fdf3267
Binary files /dev/null and b/dev_odex30_accounting/exp_asset_base/reports/__pycache__/__init__.cpython-311.pyc differ
diff --git a/dev_odex30_accounting/exp_asset_base/reports/__pycache__/abstract_report_xlsx.cpython-311.pyc b/dev_odex30_accounting/exp_asset_base/reports/__pycache__/abstract_report_xlsx.cpython-311.pyc
new file mode 100644
index 0000000..a03e20a
Binary files /dev/null and b/dev_odex30_accounting/exp_asset_base/reports/__pycache__/abstract_report_xlsx.cpython-311.pyc differ
diff --git a/dev_odex30_accounting/exp_asset_base/reports/__pycache__/asset_register_report_xlsx.cpython-311.pyc b/dev_odex30_accounting/exp_asset_base/reports/__pycache__/asset_register_report_xlsx.cpython-311.pyc
new file mode 100644
index 0000000..f9abb33
Binary files /dev/null and b/dev_odex30_accounting/exp_asset_base/reports/__pycache__/asset_register_report_xlsx.cpython-311.pyc differ
diff --git a/dev_odex30_accounting/exp_asset_base/reports/abstract_report_xlsx.py b/dev_odex30_accounting/exp_asset_base/reports/abstract_report_xlsx.py
new file mode 100644
index 0000000..1738e11
--- /dev/null
+++ b/dev_odex30_accounting/exp_asset_base/reports/abstract_report_xlsx.py
@@ -0,0 +1,688 @@
+
+# Author: Julien Coux
+# Copyright 2016 Camptocamp SA
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
+from odoo import models
+
+
+class AbstractReportXslx(models.AbstractModel):
+    _name = 'report.asset_abstract_report_xlsx'
+    _inherit = 'report.report_xlsx.abstract'
+    _description = 'asset_abstract_report_xlsx'
+
+    def get_workbook_options(self):
+        vals = super(AbstractReportXslx, self).get_workbook_options()
+        vals.update({"constant_memory": True})
+        return vals
+
+    def generate_xlsx_report(self, workbook, data, objects):
+        # Initialize report variables
+        report_data = {
+            "workbook": None,
+            "sheet": None,  # main sheet which will contains report
+            "columns": None,  # columns of the report
+            "row_pos": None,  # row_pos must be incremented at each writing lines
+            "formats": None,
+        }
+        self._define_formats(workbook, report_data)
+        # Get report data
+        report_name = self._get_report_name(objects, data=data)
+        report_footer = self._get_report_footer()
+        filters = self._get_report_filters(objects)
+        report_data["columns"] = self._get_report_columns(objects)
+        report_data["workbook"] = workbook
+        report_data["sheet"] = workbook.add_worksheet(report_name[:31])
+        self._set_column_width(report_data)
+        # Fill report
+        report_data["row_pos"] = 0
+        self._write_report_title(report_name, report_data)
+        self._write_filters(filters, report_data)
+        self._generate_report_content(workbook, objects, data, report_data)
+        self._write_report_footer(report_footer, report_data)
+
+    def _define_formats(self, workbook, report_data):
+        """Add cell formats to current workbook.
+        Those formats can be used on all cell.
+        Available formats are :
+         * format_bold
+         * format_right
+         * format_right_bold_italic
+         * format_header_left
+         * format_header_center
+         * format_header_right
+         * format_header_amount
+         * format_amount
+         * format_percent_bold_italic
+        """
+        currency_id = self.env["res.company"]._default_currency_id()
+        report_data["formats"] = {
+            "format_bold": workbook.add_format({"bold": True}),
+            "format_right": workbook.add_format({"align": "right"}),
+            "format_left": workbook.add_format({"align": "left"}),
+            "format_center": workbook.add_format({'align': 'center'}),
+            "format_right_bold_italic": workbook.add_format(
+                {"align": "right", "bold": True, "italic": True}
+            ),
+            "format_header_left": workbook.add_format(
+                {"bold": True, "border": True, "bg_color": "#FFFFCC"}
+            ),
+            "format_header_center": workbook.add_format(
+                {"bold": True, "align": "center", "border": True, "bg_color": "#FFFFCC"}
+            ),
+            "format_header_right": workbook.add_format(
+                {"bold": True, "align": "right", "border": True, "bg_color": "#FFFFCC"}
+            ),
+            "format_header_amount": workbook.add_format(
+                {"bold": True, "border": True, "bg_color": "#FFFFCC"}
+            ).set_num_format("#,##0." + "0" * currency_id.decimal_places),
+            "format_amount": workbook.add_format().set_num_format(
+                "#,##0." + "0" * currency_id.decimal_places
+            ),
+            "format_amount_bold": workbook.add_format({"bold": True}).set_num_format(
+                "#,##0." + "0" * currency_id.decimal_places
+            ),
+            "format_percent_bold_italic": workbook.add_format(
+                {"bold": True, "italic": True}
+            ).set_num_format("#,##0.00%"),
+        }
+
+    def _set_column_width(self, report_data):
+        """Set width for all defined columns.
+        Columns are defined with `_get_report_columns` method.
+        """
+        for position, column in report_data["columns"].items():
+            report_data["sheet"].set_column(position, position, column["width"])
+
+    def _write_report_title(self, title, report_data):
+        """Write report title on current line using all defined columns width.
+        Columns are defined with `_get_report_columns` method.
+        """
+        report_data["sheet"].merge_range(
+            report_data["row_pos"],
+            0,
+            report_data["row_pos"],
+            len(report_data["columns"]) - 1,
+            title,
+            report_data["formats"]["format_bold"],
+        )
+        report_data["row_pos"] += 3
+
+    def _write_report_footer(self, footer, report_data):
+        """Write report footer .
+        Columns are defined with `_get_report_columns` method.
+        """
+        if footer:
+            report_data["row_pos"] += 1
+            report_data["sheet"].merge_range(
+                report_data["row_pos"],
+                0,
+                report_data["row_pos"],
+                len(report_data["columns"]) - 1,
+                footer,
+                report_data["formats"]["format_left"],
+            )
+            report_data["row_pos"] += 1
+
+    def _write_filters(self, filters, report_data):
+        """Write one line per filters on starting on current line.
+        Columns number for filter name is defined
+        with `_get_col_count_filter_name` method.
+        Columns number for filter value is define
+        with `_get_col_count_filter_value` method.
+        """
+        col_name = 1
+        col_count_filter_name = self._get_col_count_filter_name()
+        col_count_filter_value = self._get_col_count_filter_value()
+        col_value = col_name + col_count_filter_name + 1
+        for title, value in filters:
+            report_data["sheet"].merge_range(
+                report_data["row_pos"],
+                col_name,
+                report_data["row_pos"],
+                col_name + col_count_filter_name - 1,
+                title,
+                report_data["formats"]["format_header_left"],
+            )
+            report_data["sheet"].merge_range(
+                report_data["row_pos"],
+                col_value,
+                report_data["row_pos"],
+                col_value + col_count_filter_value - 1,
+                value,
+            )
+            report_data["row_pos"] += 1
+        report_data["row_pos"] += 2
+
+    def write_array_title(self, title, report_data):
+        """Write array title on current line using all defined columns width.
+        Columns are defined with `_get_report_columns` method.
+        """
+        report_data["sheet"].merge_range(
+            report_data["row_pos"],
+            0,
+            report_data["row_pos"],
+            len(report_data["columns"]) - 1,
+            title,
+            report_data["formats"]["format_bold"],
+        )
+        report_data["row_pos"] += 1
+
+    def write_array_header(self, report_data):
+        """Write array header on current line using all defined columns name.
+        Columns are defined with `_get_report_columns` method.
+        """
+        for col_pos, column in report_data["columns"].items():
+            report_data["sheet"].write(
+                report_data["row_pos"],
+                col_pos,
+                column["header"],
+                report_data["formats"]["format_header_center"],
+            )
+        report_data["row_pos"] += 1
+
+    def write_line(self, line_object, report_data):
+        """Write a line on current line using all defined columns field name.
+        Columns are defined with `_get_report_columns` method.
+        """
+        for col_pos, column in report_data["columns"].items():
+            value = getattr(line_object, column["field"])
+            cell_type = column.get("type", "string")
+            if cell_type == "many2one":
+                report_data["sheet"].write_string(
+                    report_data["row_pos"],
+                    col_pos,
+                    value.name or "",
+                    report_data["formats"]["format_right"],
+                )
+            elif cell_type == "string":
+                if (
+                        hasattr(line_object, "account_group_id")
+                        and line_object.account_group_id
+                ):
+                    report_data["sheet"].write_string(
+                        report_data["row_pos"],
+                        col_pos,
+                        value or "",
+                        report_data["formats"]["format_bold"],
+                    )
+                else:
+                    report_data["sheet"].write_string(
+                        report_data["row_pos"], col_pos, value or ""
+                    )
+            elif cell_type == "amount":
+                if (
+                        hasattr(line_object, "account_group_id")
+                        and line_object.account_group_id
+                ):
+                    cell_format = report_data["formats"]["format_amount_bold"]
+                else:
+                    cell_format = report_data["formats"]["format_amount"]
+                report_data["sheet"].write_number(
+                    report_data["row_pos"], col_pos, float(value), cell_format
+                )
+            elif cell_type == "amount_currency":
+                if line_object.currency_id:
+                    format_amt = self._get_currency_amt_format(line_object, report_data)
+                    report_data["sheet"].write_number(
+                        report_data["row_pos"], col_pos, float(value), format_amt
+                    )
+        report_data["row_pos"] += 1
+
+    def write_line_from_dict(self, line_dict, report_data):
+        """Write a line on current line"""
+        for col_pos, column in report_data["columns"].items():
+            value = line_dict.get(column["field"], False)
+            cell_type = column.get("type", "string")
+            if cell_type == "string":
+                if (
+                        line_dict.get("account_group_id", False)
+                        and line_dict["account_group_id"]
+                ):
+                    report_data["sheet"].write_string(
+                        report_data["row_pos"],
+                        col_pos,
+                        value or "",
+                        report_data["formats"]["format_bold"],
+                    )
+                else:
+                    if (
+                            not isinstance(value, str)
+                            and not isinstance(value, bool)
+                            and not isinstance(value, int)
+                    ):
+                        value = value and value.strftime("%d/%m/%Y")
+                    report_data["sheet"].write_string(
+                        report_data["row_pos"], col_pos, value or ""
+                    )
+            elif cell_type == "amount":
+                if (
+                        line_dict.get("account_group_id", False)
+                        and line_dict["account_group_id"]
+                ):
+                    cell_format = report_data["formats"]["format_amount_bold"]
+                else:
+                    cell_format = report_data["formats"]["format_amount"]
+                report_data["sheet"].write_number(
+                    report_data["row_pos"], col_pos, float(value), cell_format
+                )
+            elif cell_type == "amount_currency":
+                if line_dict.get("currency_name", False):
+                    format_amt = self._get_currency_amt_format_dict(
+                        line_dict, report_data
+                    )
+                    report_data["sheet"].write_number(
+                        report_data["row_pos"], col_pos, float(value), format_amt
+                    )
+            elif cell_type == "currency_name":
+                report_data["sheet"].write_string(
+                    report_data["row_pos"],
+                    col_pos,
+                    value or "",
+                    report_data["formats"]["format_right"],
+                )
+        report_data["row_pos"] += 1
+
+    def write_initial_balance(self, my_object, label, report_data):
+        """Write a specific initial balance line on current line
+        using defined columns field_initial_balance name.
+        Columns are defined with `_get_report_columns` method.
+        """
+        col_pos_label = self._get_col_pos_initial_balance_label()
+        report_data["sheet"].write(
+            report_data["row_pos"],
+            col_pos_label,
+            label,
+            report_data["formats"]["format_right"],
+        )
+        for col_pos, column in report_data["columns"].items():
+            if column.get("field_initial_balance"):
+                value = getattr(my_object, column["field_initial_balance"])
+                cell_type = column.get("type", "string")
+                if cell_type == "string":
+                    report_data["sheet"].write_string(
+                        report_data["row_pos"], col_pos, value or ""
+                    )
+                elif cell_type == "amount":
+                    report_data["sheet"].write_number(
+                        report_data["row_pos"],
+                        col_pos,
+                        float(value),
+                        report_data["formats"]["format_amount"],
+                    )
+                elif cell_type == "amount_currency":
+                    if my_object.currency_id:
+                        format_amt = self._get_currency_amt_format(
+                            my_object, report_data
+                        )
+                        report_data["sheet"].write_number(
+                            report_data["row_pos"], col_pos, float(value), format_amt
+                        )
+            elif column.get("field_currency_balance"):
+                value = getattr(my_object, column["field_currency_balance"])
+                cell_type = column.get("type", "string")
+                if cell_type == "many2one":
+                    if my_object.currency_id:
+                        report_data["sheet"].write_string(
+                            report_data["row_pos"],
+                            col_pos,
+                            value.name or "",
+                            report_data["formats"]["format_right"],
+                        )
+        report_data["row_pos"] += 1
+
+    def write_initial_balance_from_dict(self, my_object, label, report_data):
+        """Write a specific initial balance line on current line
+        using defined columns field_initial_balance name.
+        Columns are defined with `_get_report_columns` method.
+        """
+        col_pos_label = self._get_col_pos_initial_balance_label()
+        report_data["sheet"].write(
+            report_data["row_pos"],
+            col_pos_label,
+            label,
+            report_data["formats"]["format_right"],
+        )
+        for col_pos, column in report_data["columns"].items():
+            if column.get("field_initial_balance"):
+                value = my_object.get(column["field_initial_balance"], False)
+                cell_type = column.get("type", "string")
+                if cell_type == "string":
+                    report_data["sheet"].write_string(
+                        report_data["row_pos"], col_pos, value or ""
+                    )
+                elif cell_type == "amount":
+                    report_data["sheet"].write_number(
+                        report_data["row_pos"],
+                        col_pos,
+                        float(value),
+                        report_data["formats"]["format_amount"],
+                    )
+                elif cell_type == "amount_currency":
+                    if my_object["currency_id"]:
+                        format_amt = self._get_currency_amt_format(
+                            my_object, report_data
+                        )
+                        report_data["sheet"].write_number(
+                            report_data["row_pos"], col_pos, float(value), format_amt
+                        )
+            elif column.get("field_currency_balance"):
+                value = my_object.get(column["field_currency_balance"], False)
+                cell_type = column.get("type", "string")
+                if cell_type == "many2one":
+                    if my_object["currency_id"]:
+                        report_data["sheet"].write_string(
+                            report_data["row_pos"],
+                            col_pos,
+                            value.name or "",
+                            report_data["formats"]["format_right"],
+                        )
+        report_data["row_pos"] += 1
+
+    def write_ending_balance(self, my_object, name, label, report_data):
+        """Write a specific ending balance line on current line
+        using defined columns field_final_balance name.
+        Columns are defined with `_get_report_columns` method.
+        """
+        for i in range(0, len(report_data["columns"])):
+            report_data["sheet"].write(
+                report_data["row_pos"],
+                i,
+                "",
+                report_data["formats"]["format_header_right"],
+            )
+        row_count_name = self._get_col_count_final_balance_name()
+        col_pos_label = self._get_col_pos_final_balance_label()
+        report_data["sheet"].merge_range(
+            report_data["row_pos"],
+            0,
+            report_data["row_pos"],
+            row_count_name - 1,
+            name,
+            report_data["formats"]["format_header_left"],
+        )
+        report_data["sheet"].write(
+            report_data["row_pos"],
+            col_pos_label,
+            label,
+            report_data["formats"]["format_header_right"],
+        )
+        for col_pos, column in report_data["columns"].items():
+            if column.get("field_final_balance"):
+                value = getattr(my_object, column["field_final_balance"])
+                cell_type = column.get("type", "string")
+                if cell_type == "string":
+                    report_data["sheet"].write_string(
+                        report_data["row_pos"],
+                        col_pos,
+                        value or "",
+                        report_data["formats"]["format_header_right"],
+                    )
+                elif cell_type == "amount":
+                    report_data["sheet"].write_number(
+                        report_data["row_pos"],
+                        col_pos,
+                        float(value),
+                        report_data["formats"]["format_header_amount"],
+                    )
+                elif cell_type == "amount_currency":
+                    if my_object.currency_id:
+                        format_amt = self._get_currency_amt_header_format(
+                            my_object, report_data
+                        )
+                        report_data["sheet"].write_number(
+                            report_data["row_pos"], col_pos, float(value), format_amt
+                        )
+            elif column.get("field_currency_balance"):
+                value = getattr(my_object, column["field_currency_balance"])
+                cell_type = column.get("type", "string")
+                if cell_type == "many2one":
+                    if my_object.currency_id:
+                        report_data["sheet"].write_string(
+                            report_data["row_pos"],
+                            col_pos,
+                            value.name or "",
+                            report_data["formats"]["format_header_right"],
+                        )
+        report_data["row_pos"] += 1
+
+    def write_ending_balance_from_dict(self, my_object, name, label, report_data):
+        """Write a specific ending balance line on current line
+        using defined columns field_final_balance name.
+        Columns are defined with `_get_report_columns` method.
+        """
+        for i in range(0, len(report_data["columns"])):
+            report_data["sheet"].write(
+                report_data["row_pos"],
+                i,
+                "",
+                report_data["formats"]["format_header_right"],
+            )
+        row_count_name = self._get_col_count_final_balance_name()
+        col_pos_label = self._get_col_pos_final_balance_label()
+        report_data["sheet"].merge_range(
+            report_data["row_pos"],
+            0,
+            report_data["row_pos"],
+            row_count_name - 1,
+            name,
+            report_data["formats"]["format_header_left"],
+        )
+        report_data["sheet"].write(
+            report_data["row_pos"],
+            col_pos_label,
+            label,
+            report_data["formats"]["format_header_right"],
+        )
+        for col_pos, column in report_data["columns"].items():
+            if column.get("field_final_balance"):
+                value = my_object.get(column["field_final_balance"], False)
+                cell_type = column.get("type", "string")
+                if cell_type == "string":
+                    report_data["sheet"].write_string(
+                        report_data["row_pos"],
+                        col_pos,
+                        value or "",
+                        report_data["formats"]["format_header_right"],
+                    )
+                elif cell_type == "amount":
+                    report_data["sheet"].write_number(
+                        report_data["row_pos"],
+                        col_pos,
+                        float(value),
+                        report_data["formats"]["format_header_amount"],
+                    )
+                elif cell_type == "amount_currency":
+                    if my_object["currency_id"] and value:
+                        format_amt = self._get_currency_amt_format_dict(
+                            my_object, report_data
+                        )
+                        report_data["sheet"].write_number(
+                            report_data["row_pos"], col_pos, float(value), format_amt
+                        )
+            elif column.get("field_currency_balance"):
+                value = my_object.get(column["field_currency_balance"], False)
+                cell_type = column.get("type", "string")
+                if cell_type == "many2one":
+                    if my_object["currency_id"]:
+                        report_data["sheet"].write_string(
+                            report_data["row_pos"],
+                            col_pos,
+                            value or "",
+                            report_data["formats"]["format_header_right"],
+                        )
+                elif cell_type == "currency_name":
+                    report_data["sheet"].write_string(
+                        report_data["row_pos"],
+                        col_pos,
+                        value or "",
+                        report_data["formats"]["format_header_right"],
+                    )
+        report_data["row_pos"] += 1
+
+    def _get_currency_amt_format(self, line_object, report_data):
+        """ Return amount format specific for each currency. """
+        if "account_group_id" in line_object and line_object["account_group_id"]:
+            format_amt = report_data["formats"]["format_amount_bold"]
+            field_prefix = "format_amount_bold"
+        else:
+            format_amt = report_data["formats"]["format_amount"]
+            field_prefix = "format_amount"
+        if "currency_id" in line_object and line_object.get("currency_id", False):
+            field_name = "{}_{}".format(field_prefix, line_object["currency_id"].name)
+            if hasattr(self, field_name):
+                format_amt = getattr(self, field_name)
+            else:
+                format_amt = report_data["workbook"].add_format()
+                report_data["field_name"] = format_amt
+                format_amount = "#,##0." + (
+                        "0" * line_object["currency_id"].decimal_places
+                )
+                format_amt.set_num_format(format_amount)
+        return format_amt
+
+    def _get_currency_amt_format_dict(self, line_dict, report_data):
+        """ Return amount format specific for each currency. """
+        if line_dict.get("account_group_id", False) and line_dict["account_group_id"]:
+            format_amt = report_data["formats"]["format_amount_bold"]
+            field_prefix = "format_amount_bold"
+        else:
+            format_amt = report_data["formats"]["format_amount"]
+            field_prefix = "format_amount"
+        if line_dict.get("currency_id", False) and line_dict["currency_id"]:
+            if isinstance(line_dict["currency_id"], int):
+                currency = self.env["res.currency"].browse(line_dict["currency_id"])
+            else:
+                currency = line_dict["currency_id"]
+            field_name = "{}_{}".format(field_prefix, currency.name)
+            if hasattr(self, field_name):
+                format_amt = getattr(self, field_name)
+            else:
+                format_amt = report_data["workbook"].add_format()
+                report_data["field_name"] = format_amt
+                format_amount = "#,##0." + ("0" * currency.decimal_places)
+                format_amt.set_num_format(format_amount)
+        return format_amt
+
+    def _get_currency_amt_header_format(self, line_object, report_data):
+        """ Return amount header format for each currency. """
+        format_amt = report_data["formats"]["format_header_amount"]
+        if line_object.currency_id:
+            field_name = "format_header_amount_%s" % line_object.currency_id.name
+            if hasattr(self, field_name):
+                format_amt = getattr(self, field_name)
+            else:
+                format_amt = report_data["workbook"].add_format(
+                    {"bold": True, "border": True, "bg_color": "#FFFFCC"}
+                )
+                report_data["field_name"] = format_amt
+                format_amount = "#,##0." + (
+                        "0" * line_object.currency_id.decimal_places
+                )
+                format_amt.set_num_format(format_amount)
+        return format_amt
+
+    def _get_currency_amt_header_format_dict(self, line_object, report_data):
+        """ Return amount header format for each currency. """
+        format_amt = report_data["formats"]["format_header_amount"]
+        if line_object["currency_id"]:
+            field_name = "format_header_amount_%s" % line_object["currency_name"]
+            if hasattr(self, field_name):
+                format_amt = getattr(self, field_name)
+            else:
+                format_amt = report_data["workbook"].add_format(
+                    {"bold": True, "border": True, "bg_color": "#FFFFCC"}
+                )
+                report_data["field_name"] = format_amt
+                format_amount = "#,##0." + (
+                        "0" * line_object["currency_id"].decimal_places
+                )
+                format_amt.set_num_format(format_amount)
+        return format_amt
+
+    def _generate_report_content(self, workbook, report, data, report_data):
+        """
+        Allow to fetch report content to be displayed.
+        """
+        raise NotImplementedError()
+
+    def _get_report_complete_name(self, report, prefix, data=None):
+        if report.company_id:
+            suffix = " - {} - {}".format(
+                report.company_id.name, report.company_id.currency_id.name
+            )
+            return prefix + suffix
+        return prefix
+
+    def _get_report_name(self, report, data=False):
+        """
+        Allow to define the report name.
+        Report name will be used as sheet name and as report title.
+        :return: the report name
+        """
+        raise NotImplementedError()
+
+    def _get_report_footer(self):
+        """
+        Allow to define the report footer.
+        :return: the report footer
+        """
+        return False
+
+    def _get_report_columns(self, report):
+        """
+        Allow to define the report columns
+        which will be used to generate report.
+        :return: the report columns as dict
+        :Example:
+        {
+            0: {'header': 'Simple column',
+                'field': 'field_name_on_my_object',
+                'width': 11},
+            1: {'header': 'Amount column',
+                 'field': 'field_name_on_my_object',
+                 'type': 'amount',
+                 'width': 14},
+        }
+        """
+        raise NotImplementedError()
+
+    def _get_report_filters(self, report):
+        """
+        :return: the report filters as list
+        :Example:
+        [
+            ['first_filter_name', 'first_filter_value'],
+            ['second_filter_name', 'second_filter_value']
+        ]
+        """
+        raise NotImplementedError()
+
+    def _get_col_count_filter_name(self):
+        """
+        :return: the columns number used for filter names.
+        """
+        raise NotImplementedError()
+
+    def _get_col_count_filter_value(self):
+        """
+        :return: the columns number used for filter values.
+        """
+        raise NotImplementedError()
+
+    def _get_col_pos_initial_balance_label(self):
+        """
+        :return: the columns position used for initial balance label.
+        """
+        raise NotImplementedError()
+
+    def _get_col_count_final_balance_name(self):
+        """
+        :return: the columns number used for final balance name.
+        """
+        raise NotImplementedError()
+
+    def _get_col_pos_final_balance_label(self):
+        """
+        :return: the columns position used for final balance label.
+        """
+        raise NotImplementedError()
\ No newline at end of file
diff --git a/dev_odex30_accounting/exp_asset_base/reports/asset_barcode_pdf_report.xml b/dev_odex30_accounting/exp_asset_base/reports/asset_barcode_pdf_report.xml
new file mode 100644
index 0000000..469a1ed
--- /dev/null
+++ b/dev_odex30_accounting/exp_asset_base/reports/asset_barcode_pdf_report.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <data>
+         <template id="report_asset_barcode">
+            <div style="width: 32%; display: inline-table; height: 10rem;">
+                <table class="table table-bordered mb-0" style="border: 2px solid black;">
+                    <tr>
+                        <th class="table-active text-left" style="height: 4rem;">
+                            <strong t-field="asset.display_name"/>
+                        </th>
+                    </tr>
+                    <tr>
+                        <td class="text-center align-middle" style="height: 6rem;">
+                            <t t-if="asset.barcode">
+                                <img alt="Barcode" t-if="len(asset.barcode) == 13" t-att-src="'/report/barcode/?type=%s&amp;value=%s&amp;width=%s&amp;height=%s' % ('EAN13', quote_plus(asset.barcode or ''), 600, 150)" style="width:100%;height:4rem;"/>
+                                <img alt="Barcode" t-elif="len(asset.barcode) == 8" t-att-src="'/report/barcode/?type=%s&amp;value=%s&amp;width=%s&amp;height=%s' % ('EAN8', quote_plus(asset.barcode or ''), 600, 150)" style="width:100%;height:4rem;"/>
+                                <img alt="Barcode" t-else="" t-att-src="'/report/barcode/?type=%s&amp;value=%s&amp;width=%s&amp;height=%s' % ('Code128', quote_plus(asset.barcode or ''), 600, 150)" style="width:100%;height:4rem"/>
+                                <span t-field="asset.barcode"/>
+                            </t>
+                            <t t-else=""><span class="text-muted">No barcode available</span></t>
+                        </td>
+                    </tr>
+                </table>
+            </div>
+        </template>
+
+        <template id="report_assetbarcode">
+            <t t-call="web.basic_layout">
+                <div class="page">
+                    <t t-foreach="docs" t-as="asset">
+                        <t t-call="exp_asset_base.report_asset_barcode">
+                            <t t-set="asset" t-value="asset"/>
+                        </t>
+                    </t>
+                </div>
+            </t>
+        </template>
+
+        <record id="report_account_asset_barcode" model="ir.actions.report">
+            <field name="name">Asset Barcode (PDF)</field>
+            <field name="model">account.asset</field>
+            <field name="report_type">qweb-pdf</field>
+            <field name="report_name">exp_asset_base.report_assetbarcode</field>
+            <field name="report_file">exp_asset_base.report_assetbarcode</field>
+            <field name="print_report_name">'Assets barcode - %s' % (object.name)</field>
+            <field name="binding_model_id" ref="exp_asset_base.model_account_asset"/>
+            <field name="binding_type">report</field>
+        </record>
+    </data>
+</odoo>
diff --git a/dev_odex30_accounting/exp_asset_base/reports/asset_barcode_zpl_report.xml b/dev_odex30_accounting/exp_asset_base/reports/asset_barcode_zpl_report.xml
new file mode 100644
index 0000000..f883b84
--- /dev/null
+++ b/dev_odex30_accounting/exp_asset_base/reports/asset_barcode_zpl_report.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <data>
+        <template id="label_barcode_account_asset_view">
+            <t t-foreach="docs" t-as="asset">
+                <t t-translation="off">
+^XA
+^FO100,50
+^A0N,44,33^FD<t t-esc="asset.display_name"/>^FS
+<t t-if="asset.barcode">
+^FO100,100^BY3
+^BCN,100,Y,N,N
+^FD<t t-esc="asset.barcode"/>^FS
+</t>
+^XZ
+                </t>
+            </t>
+        </template>
+        <record id="label_barcode_account_asset" model="ir.actions.report">
+            <field name="name">Asset Barcode (ZPL)</field>
+            <field name="model">account.asset</field>
+            <field name="report_type">qweb-text</field>
+            <field name="report_name">exp_asset_base.label_barcode_account_asset_view</field>
+            <field name="report_file">exp_asset_base.label_barcode_account_asset_view</field>
+            <field name="binding_model_id" ref="exp_asset_base.model_account_asset"/>
+            <field name="binding_type">report</field>
+        </record>
+    </data>
+</odoo>
diff --git a/dev_odex30_accounting/exp_asset_base/reports/asset_depreciation_report_xlsx.py b/dev_odex30_accounting/exp_asset_base/reports/asset_depreciation_report_xlsx.py
new file mode 100644
index 0000000..639f9c7
--- /dev/null
+++ b/dev_odex30_accounting/exp_asset_base/reports/asset_depreciation_report_xlsx.py
@@ -0,0 +1,126 @@
+# Copyright  2018 Forest and Biomass Romania
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
+
+from odoo import _, models
+from dateutil.rrule import rrule, MONTHLY
+from odoo.tools import DEFAULT_SERVER_DATE_FORMAT as DF
+from datetime import datetime
+
+class AssetDepreciationReportXslx(models.AbstractModel):
+    _name = 'report.asset_depreciation_report_xlsx'
+    _inherit = 'report.asset_abstract_report_xlsx'
+    _description = 'asset_depreciation_report_xlsx'
+
+    def _get_report_name(self, report):
+        return _('Fixed Asset Register')
+
+    def _get_report_columns(self, report):
+        return {
+            0: {'width': 5},
+            1: {'width': 12},
+            2: {'width': 20},
+            3: {'width': 12},
+            4: {'width': 12},
+            5: {'width': 12},
+            6: {'width': 12},
+            7: {'width': 12},
+            8: {'width': 12},
+            9: {'width': 12},
+            10: {'width': 12},
+            11: {'width': 12},
+            12: {'width': 12},
+            13: {'width': 12},
+            14: {'width': 12},
+            15: {'width': 12},
+            16: {'width': 12},
+            17: {'width': 12},
+            18: {'width': 12},
+            19: {'width': 12},
+        }
+
+    def _get_report_filters(self, report):
+        return [
+            [
+                _('Duration'), _('From: ') + report.start_date + '    ' + _('To: ') + report.end_date
+            ],
+            [
+                _('Categories'), ', '.join([c.name for c in report.category_ids]),
+            ],
+        ]
+
+    def _get_col_count_filter_name(self):
+        return 1
+
+    def _get_col_count_filter_value(self):
+        return 3
+
+    def _generate_report_content(self, workbook, report):
+        # For each category
+        depreciation_line = self.env['account.asset.depreciation.line']
+
+        start_date = datetime.strptime(report.start_date, DF)
+        end_date = datetime.strptime(report.end_date, DF)
+        periods = [dt.strftime("%b-%y") for dt in rrule(MONTHLY, dtstart=start_date, until=end_date)]
+
+        seq = 1
+        depreciation_register = self.env['report_asset_register_depreciation']
+        for category in report.category_ids:
+            # Write category info
+            self.sheet.write(self.row_pos, 0, seq, self.format_header1)
+            self.sheet.merge_range(self.row_pos, 1, self.row_pos, 2, category.name, self.format_header1)
+            percentage = 100/(category.method_number*category.method_period/12)
+            self.sheet.write(self.row_pos, 3, str(round(percentage,2))+"%", self.format_header1)
+            self.sheet.write(self.row_pos, 4, "", self.format_header1)
+            self.sheet.merge_range(self.row_pos, 5, self.row_pos, 4+len(periods), "DEPRECIATION BY MONTH", self.format_header1)
+            self.sheet.write(self.row_pos, 5+len(periods), "Depr'n.", self.format_header1)
+            self.sheet.write(self.row_pos, 6+len(periods), "Accu Deprn.", self.format_header1)
+            self.sheet.write(self.row_pos, 7+len(periods), "NBV", self.format_header1)
+            self.row_pos += 1
+
+            #Write Header
+            self.sheet.write(self.row_pos, 0, "", self.format_header2)
+            self.sheet.write(self.row_pos, 1, "Date", self.format_header2)
+            self.sheet.write(self.row_pos, 2, "Description of Asset", self.format_header2)
+            self.sheet.write(self.row_pos, 3, "Ref. Doc.", self.format_header2)
+            self.sheet.write(self.row_pos, 4, "Amount", self.format_header2)
+            column_pos = 4
+            for p in periods:
+                column_pos += 1
+                self.sheet.write(self.row_pos, column_pos, p, self.format_header2)
+            self.sheet.write(self.row_pos, column_pos+1, report.start_date+'-'+report.end_date, self.format_header2)
+            self.sheet.write(self.row_pos, column_pos+2, report.end_date, self.format_header2)
+            self.sheet.write(self.row_pos, column_pos+3, 'After '+report.end_date, self.format_header2)
+            self.row_pos += 1
+
+            #Write Asset
+            asset_ids = self.env['account.asset'].search([('category_id', '=', category.id),
+                                                                ('date', '<=', report.end_date)])
+            for asset in asset_ids:
+
+                self.sheet.write(self.row_pos, 0, "", self.format_center)
+                self.sheet.write(self.row_pos, 1, asset.date, self.format_center)
+                self.sheet.write(self.row_pos, 2, asset.name, self.format_center)
+                self.sheet.write(self.row_pos, 3, asset.invoice_id.name, self.format_center)
+                self.sheet.write(self.row_pos, 4, asset.value, self.format_center)
+
+                column_pos = 4
+                fy_depreciation = 0
+                for p in periods:
+                    column_pos += 1
+                    depreciation = depreciation_register.search([('report_id', '=', report.id),
+                                                                 ('asset_id', '=', asset.id),
+                                                                 ('period', '=', p)])
+                    amount = sum([d.amount for d in depreciation])
+                    fy_depreciation += amount
+                    self.sheet.write(self.row_pos, column_pos, amount, self.format_center)
+                self.sheet.write(self.row_pos, column_pos+1, fy_depreciation, self.format_center)
+                accu = depreciation_line.read_group([('depreciation_date', '<=', report.end_date),
+                                                     ('asset_id','=', asset.id)],
+                                                    ['asset_id', 'amount'], ['asset_id'])
+                accu_depreciation = accu and accu[0].get('amount') or 0
+                self.sheet.write(self.row_pos, column_pos+2, accu_depreciation, self.format_center)
+                self.sheet.write(self.row_pos, column_pos+3, asset.value - accu_depreciation, self.format_center)
+                self.row_pos += 1
+            seq += 1
+            self.row_pos += 1
+
diff --git a/dev_odex30_accounting/exp_asset_base/reports/asset_register_report.py b/dev_odex30_accounting/exp_asset_base/reports/asset_register_report.py
new file mode 100644
index 0000000..469f763
--- /dev/null
+++ b/dev_odex30_accounting/exp_asset_base/reports/asset_register_report.py
@@ -0,0 +1,74 @@
+# © 2016 Julien Coux (Camptocamp)
+# © 2018 Forest and Biomass Romania SA
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
+
+from odoo import models, fields, api
+from dateutil.rrule import rrule, MONTHLY
+from odoo.tools import DEFAULT_SERVER_DATE_FORMAT as DF
+from datetime import datetime, timedelta
+
+class AssetRegisterReport(models.TransientModel):
+    """ Here, we just define class fields.
+    For methods, go more bottom at this file.
+
+    The class hierarchy is :
+    * AssetRegisterReport
+    ** Asset Category
+    ***  Asset
+    **** AssetRegisterReportDepreciation
+    """
+    _name = 'report_asset_register'
+
+    # Filters fields, used for data computation
+    category_ids = fields.Many2many('account.asset.category')
+    start_date = fields.Date()
+    end_date = fields.Date()
+    depreciation_ids = fields.One2many('report_asset_register_depreciation', 'report_id')
+
+    @api.one
+    def compute_data_for_report(self):
+        self.depreciation_ids.unlink()
+        depreciation = self.env['account.asset.depreciation.line']
+        depreciation_register = self.env['report_asset_register_depreciation']
+        asset = self.env['account.asset'].search([('category_id', 'in', self.category_ids.ids),
+                                                        ('date', '<=', self.end_date)])
+        start_date = datetime.strptime(self.start_date, DF).replace(day=1)
+        end_date = datetime.strptime(self.end_date, DF) + timedelta(days=1)
+        dates = [dt for dt in rrule(MONTHLY, dtstart=start_date, until=end_date)]
+        dates[0] = datetime.strptime(self.start_date, DF)
+
+        for p in range(0, len(dates)):
+            start = dates[p]
+            end = p != len(dates)-1 and dates[p+1] or end_date
+            line = depreciation.search([('depreciation_date', '>=', start.strftime(DF)),
+                                        ('depreciation_date', '<', end.strftime(DF)),
+                                        ('asset_id', 'in', asset.ids),
+                                        ('move_id', '!=', False)])
+            for l in line:
+                val = {
+                    'report_id': self.id,
+                    'asset_id': l.asset_id.id,
+                    'period': start.strftime("%b-%y"),
+                    'amount': l.amount,
+                    'date': l.depreciation_date,
+
+                }
+                depreciation_register.create(val)
+
+    @api.multi
+    def print_report(self):
+        self.ensure_one()
+        return self.env['ir.actions.report'].search(
+            [('report_name', '=', 'asset_depreciation_report_xlsx'),
+             ('report_type', '=', 'xlsx')], limit=1).report_action(self)
+
+
+class AssetRegisterReportDepreciation(models.TransientModel):
+    _name = 'report_asset_register_depreciation'
+
+    report_id = fields.Many2one('report_asset_register', ondelete='cascade', index=True)
+    asset_id = fields.Many2one('account.asset')
+    period = fields.Char()
+    amount = fields.Float()
+    date = fields.Date()
+
diff --git a/dev_odex30_accounting/exp_asset_base/reports/asset_register_report.xml b/dev_odex30_accounting/exp_asset_base/reports/asset_register_report.xml
new file mode 100644
index 0000000..e743ab6
--- /dev/null
+++ b/dev_odex30_accounting/exp_asset_base/reports/asset_register_report.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+    <record id="view_report_asset_register_tree" model="ir.ui.view">
+        <field name="name">report_asset_register.tree</field>
+        <field name="model">report_asset_register</field>
+        <field name="arch" type="xml">
+            <tree>
+                <field name="start_date"/>
+                <field name="end_date"/>
+                <field name="category_ids" widget="many2many_tags"/>
+            </tree>
+        </field>
+    </record>
+
+    <record id="view_report_asset_register_form" model="ir.ui.view">
+        <field name="name">report_asset_register.form</field>
+        <field name="model">report_asset_register</field>
+        <field name="arch" type="xml">
+            <form>
+                <header>
+                    <button name="compute_data_for_report" string="Compute" type="object"/>
+                </header>
+                <sheet>
+                    <group>
+                        <group>
+                            <field name="start_date" required="1"/>
+                            <field name="end_date" required="1"/>
+                        </group>
+                        <group>
+                            <field name="category_ids" widget="many2many_tags" required="1"/>
+                        </group>
+                    </group>
+                    <notebook>
+                        <page string="Depreciations">
+                            <field name="depreciation_ids" readonly="1">
+                                <tree>
+                                    <field name="asset_id"/>
+                                    <field name="date"/>
+                                    <field name="amount"/>
+                                </tree>
+                            </field>
+                        </page>
+                    </notebook>
+                </sheet>
+            </form>
+        </field>
+    </record>
+
+    <record id="act_report_asset_register" model="ir.actions.act_window">
+        <field name="name">Asset Register</field>
+        <field name="res_model">report_asset_register</field>
+        <field name="view_type">form</field>
+        <field name="view_mode">tree,form</field>
+        <field name="view_id" ref="view_report_asset_register_tree"/>
+    </record>
+
+
+</odoo>
\ No newline at end of file
diff --git a/dev_odex30_accounting/exp_asset_base/reports/asset_register_report_xlsx.py b/dev_odex30_accounting/exp_asset_base/reports/asset_register_report_xlsx.py
new file mode 100644
index 0000000..8ae70b3
--- /dev/null
+++ b/dev_odex30_accounting/exp_asset_base/reports/asset_register_report_xlsx.py
@@ -0,0 +1,126 @@
+# Copyright  2018 Forest and Biomass Romania
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
+
+from odoo import models, _
+from datetime import datetime
+from odoo.tools import DEFAULT_SERVER_DATE_FORMAT as DF
+
+
+class AssetRegisterReportXslx(models.AbstractModel):
+    _name = 'report.report_asset_register_xlsx'
+    _inherit = 'report.asset_abstract_report_xlsx'
+    _description = 'report_asset_register_xlsx'
+
+    def _get_report_name(self, report, data=False):
+        return _('Asset Register')
+
+    def _get_report_columns(self, report):
+        return {
+            0: {'header': 'RN',  'width': 5},
+            1: {'header': 'Serial Number', 'width': 20},
+            2: {'header': 'Asset Name', 'width': 20},
+            3: {'header': 'Model Number', 'width': 14},
+            4: {'header': 'Asset Location', 'width': 14},
+            5: {'header': 'User', 'width': 14},
+            6: {'header': 'Supplier', 'width': 14},
+            7: {'header': 'Invoice Number', 'width': 20},
+            8: {'header': 'Invoice Date', 'width': 12},
+            9: {'header': 'Value', 'type': 'amount', 'width': 14},
+            10: {'header': 'Received Date', 'width': 16},
+            11: {'header': 'Warranty', 'width': 20},
+            12: {'header': 'Registration Number', 'width': 20},
+            13: {'header': 'Registration Date', 'width': 20},
+            14: {'header': '# Existing Depreciation', 'width': 20},
+            15: {'header': 'Existing Depreciation', 'width': 20},
+            16: {'header': 'First Depreciation', 'width': 20},
+            17: {'header': 'Depreciation %', 'width': 16},
+            18: {'header': 'Up to Date', 'width': 12},
+            19: {'header': 'Expired Days', 'width': 14},
+            20: {'header': 'Depreciation', 'width': 14},
+            21: {'header': 'Accumulated Depreciation', 'width': 20},
+            22: {'header': 'Net Value', 'width': 14},
+        }
+
+    def _get_report_filters(self, report):
+        return []
+
+    def _get_col_count_filter_name(self):
+        return 0
+
+    def _get_col_count_filter_value(self):
+        return 0
+
+    def _generate_report_content(self, workbook, report, data, report_data):
+        # For each asset
+        seq = 1
+        # Header
+        report_data["sheet"].write(report_data["row_pos"], 0, "رقم", report_data["formats"]["format_header_center"])
+        report_data["sheet"].write(report_data["row_pos"], 1, "رقم الأصل", report_data["formats"]["format_header_center"])
+        report_data["sheet"].write(report_data["row_pos"], 2, "الاسم العلمي", report_data["formats"]["format_header_center"])
+        report_data["sheet"].write(report_data["row_pos"], 3, "رقم التصنيع/الهيكل", report_data["formats"]["format_header_center"])
+        report_data["sheet"].write(report_data["row_pos"], 4, "موقع الأصل", report_data["formats"]["format_header_center"])
+        report_data["sheet"].write(report_data["row_pos"], 5, "المستخدم", report_data["formats"]["format_header_center"])
+        report_data["sheet"].write(report_data["row_pos"], 6, "المورد", report_data["formats"]["format_header_center"])
+        report_data["sheet"].write(report_data["row_pos"], 7, "رقم الفاتورة", report_data["formats"]["format_header_center"])
+        report_data["sheet"].write(report_data["row_pos"], 8, "تاريخ الفاتورة", report_data["formats"]["format_header_center"])
+        report_data["sheet"].write(report_data["row_pos"], 9, "القيمة", report_data["formats"]["format_header_center"])
+        report_data["sheet"].write(report_data["row_pos"], 10, "تاريخ الإستلام", report_data["formats"]["format_header_center"])
+        report_data["sheet"].write(report_data["row_pos"], 11, "تفاصيل الضمان", report_data["formats"]["format_header_center"])
+        report_data["sheet"].write(report_data["row_pos"], 12, "رقم القيد", report_data["formats"]["format_header_center"])
+        report_data["sheet"].write(report_data["row_pos"], 13, "تاريخ القيد", report_data["formats"]["format_header_center"])
+        report_data["sheet"].write(report_data["row_pos"], 14, "عدد الاستهلاكات السابقة", report_data["formats"]["format_header_center"])
+        report_data["sheet"].write(report_data["row_pos"], 15, "قيمة الاستهلاك السابق", report_data["formats"]["format_header_center"])
+        report_data["sheet"].write(report_data["row_pos"], 16, "تاريخ اول اسستهلاك", report_data["formats"]["format_header_center"])
+        report_data["sheet"].write(report_data["row_pos"], 17, "نسبة الاستهلاك", report_data["formats"]["format_header_center"])
+        report_data["sheet"].write(report_data["row_pos"], 18, "تاريخ الاحتساب", report_data["formats"]["format_header_center"])
+        report_data["sheet"].write(report_data["row_pos"], 19, "ايام الاستهلاك", report_data["formats"]["format_header_center"])
+        report_data["sheet"].write(report_data["row_pos"], 20, "استهلاك السنة", report_data["formats"]["format_header_center"])
+        report_data["sheet"].write(report_data["row_pos"], 21, "الاستهلاك التراكمي", report_data["formats"]["format_header_center"])
+        report_data["sheet"].write(report_data["row_pos"], 22, "صافي القيمة الدفترية", report_data["formats"]["format_header_center"])
+        report_data["row_pos"] += 1
+
+        self.write_array_header(report_data)
+        for asset in report:
+            # Write asset line
+            report_data["sheet"].write_number(report_data["row_pos"], 0, seq, report_data["formats"]["format_center"])
+            report_data["sheet"].write_string(report_data["row_pos"], 1, asset.serial_no or '', report_data["formats"]["format_center"])
+            report_data["sheet"].write_string(report_data["row_pos"], 2, asset.name or '', report_data["formats"]["format_center"])
+            report_data["sheet"].write_string(report_data["row_pos"], 3, asset.model or '', report_data["formats"]["format_center"])
+            report_data["sheet"].write_string(report_data["row_pos"], 4, asset.location_id.name or '', report_data["formats"]["format_center"])
+            report_data["sheet"].write_string(report_data["row_pos"], 5, asset.responsible_user_id.name or '', report_data["formats"]["format_center"])
+            partner = []
+            invoice = []
+            for orginal_move in asset.original_move_line_ids:
+                partner.append(orginal_move.partner_id.name)
+                invoice.append(orginal_move.move_id.name)
+            report_data["sheet"].write_string(report_data["row_pos"], 6, partner or '', report_data["formats"]["format_center"])
+            report_data["sheet"].write_string(report_data["row_pos"], 7, invoice or '', report_data["formats"]["format_center"])
+            report_data["sheet"].write_string(report_data["row_pos"], 8, asset.acquisition_date and asset.acquisition_date.strftime("%d/%m/%Y") or '', report_data["formats"]["format_center"])
+            report_data["sheet"].write_number(report_data["row_pos"], 9, float(asset.original_value), report_data["formats"]["format_amount"])
+            report_data["sheet"].write_string(report_data["row_pos"], 10, asset.receive_date and asset.receive_date.strftime("%d/%m/%Y") or '', report_data["formats"]["format_center"])
+            report_data["sheet"].write_string(report_data["row_pos"], 11, asset.warranty_contract or '', report_data["formats"]["format_center"])
+            report_data["sheet"].write_string(report_data["row_pos"], 12, '', report_data["formats"]["format_center"])
+            report_data["sheet"].write_string(report_data["row_pos"], 13, '', report_data["formats"]["format_center"])
+
+            report_data["sheet"].write_number(report_data["row_pos"], 14, asset.depreciation_number_import, report_data["formats"]["format_amount"])
+            report_data["sheet"].write_number(report_data["row_pos"], 15, asset.already_depreciated_amount_import, report_data["formats"]["format_amount"])
+            report_data["sheet"].write_string(report_data["row_pos"], 16, asset.first_depreciation_date_import and asset.first_depreciation_date_import.strftime("%d/%m/%Y") or '', report_data["formats"]["format_center"])
+
+            percentage = 100/(asset.method_number*int(asset.method_period)/12)
+            report_data["sheet"].write_number(report_data["row_pos"], 17, float(percentage), report_data["formats"]["format_amount"])
+
+            posted_depreciation_move_ids = asset.depreciation_move_ids.filtered(
+                lambda x: x.state == 'posted' and not x.asset_value_change and not x.reversal_move_id).sorted(
+                key=lambda l: l.date)
+            calc_date = posted_depreciation_move_ids[-1].date
+            report_data["sheet"].write_string(report_data["row_pos"], 18, calc_date and calc_date.strftime("%d/%m/%Y") or '', report_data["formats"]["format_center"])
+            first_dept = asset.first_depreciation_date_import or asset.receive_date or asset.date
+            delta = calc_date and first_dept and calc_date-first_dept
+            days = delta and delta.days or 0
+            report_data["sheet"].write_number(report_data["row_pos"], 19, float(days), report_data["formats"]["format_amount"])
+            report_data["sheet"].write_number(report_data["row_pos"], 20, float((asset.original_value-asset.already_depreciated_amount_import)*percentage/100), report_data["formats"]["format_amount"])
+            report_data["sheet"].write_number(report_data["row_pos"], 21, float(asset.original_value-asset.value_residual), report_data["formats"]["format_amount"])
+            report_data["sheet"].write_number(report_data["row_pos"], 22, float(asset.book_value), report_data["formats"]["format_amount"])
+            seq += 1
+            report_data["row_pos"] += 1
+
diff --git a/dev_odex30_accounting/exp_asset_base/reports/reports.xml b/dev_odex30_accounting/exp_asset_base/reports/reports.xml
new file mode 100644
index 0000000..cb2ae08
--- /dev/null
+++ b/dev_odex30_accounting/exp_asset_base/reports/reports.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+    <report id="action_report_asset_register_xlsx"
+        model="account.asset"
+        name="report_asset_register_xlsx"
+        file="report_asset_register_xlsx"
+        string="Asset register XLSX"
+        report_type="xlsx"
+        menu="True"/>
+
+    <!--report id="action_report_asset_depr_register_xlsx"
+        model="report_asset_register"
+        name="asset_depreciation_report_xlsx"
+        file="asset depreciation report"
+        string="Asset Depreciation register XLSX"
+        report_type="xlsx"
+        menu="True"/-->
+</odoo>
diff --git a/dev_odex30_accounting/exp_asset_base/security/groups.xml b/dev_odex30_accounting/exp_asset_base/security/groups.xml
new file mode 100644
index 0000000..cfa5db2
--- /dev/null
+++ b/dev_odex30_accounting/exp_asset_base/security/groups.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<odoo>
+    <record id="group_asset_assessment" model="res.groups">
+        <field name="name">Asset Assessment</field>
+        <field name="category_id" ref="base.module_category_accounting_accounting"/>
+    </record>
+
+     <record model="ir.module.category" id="asset_category">
+        <field name="name">Assets Managment</field>
+    </record>
+    <record id="group_assets_user" model="res.groups">
+        <field name="name">User</field>
+        <field name="category_id" ref="exp_asset_base.asset_category"/>
+    </record>
+    <record id="group_assets_manager" model="res.groups">
+        <field name="name">Manager</field>
+        <field name="category_id" ref="exp_asset_base.asset_category"/>
+        <field name="implied_ids" eval="[(4, ref('exp_asset_base.group_assets_user'))]"/>
+    </record>
+    <!--    end -->
+
+
+</odoo>
diff --git a/dev_odex30_accounting/exp_asset_base/security/ir.model.access.csv b/dev_odex30_accounting/exp_asset_base/security/ir.model.access.csv
new file mode 100644
index 0000000..a17f139
--- /dev/null
+++ b/dev_odex30_accounting/exp_asset_base/security/ir.model.access.csv
@@ -0,0 +1,13 @@
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_asset_manufacturer,account.asset.manufacturer,model_account_asset_manufacturer,account.group_account_readonly,1,0,0,0
+access_asset_manufacturer_manager,account.asset.manufacturer,model_account_asset_manufacturer,account.group_account_manager,1,1,1,1
+access_asset_location,account.asset.location,model_account_asset_location,account.group_account_readonly,1,0,0,0
+access_asset_location_manager,account.asset.location,model_account_asset_location,account.group_account_manager,1,1,1,1
+access_asset_adjustment,account.asset.adjustment,model_account_asset_adjustment,account.group_account_readonly,1,0,0,0
+access_asset_adjustment_manager,account.asset.adjustment,model_account_asset_adjustment,account.group_account_manager,1,1,1,1
+access_asset_adjustment_line,account.asset.adjustment.line,model_account_asset_adjustment_line,account.group_account_readonly,1,0,0,0
+access_asset_adjustment_line_manager,account.asset.adjustment.line,model_account_asset_adjustment_line,account.group_account_manager,1,1,1,1
+access_account_asset_modify,access.account.asset.modify,model_account_asset_modify,account.group_account_user,1,1,1,1
+access_asset_pause,access.asset.pause,model_asset_pause,account.group_account_user,1,1,1,1
+access_asset_sell,access.asset.sell,model_asset_sell,account.group_account_user,1,1,1,1
+access_asset_state_operation5_manager,account.state.4multi.operation,model_asset_state2,,1,1,1,1
\ No newline at end of file
diff --git a/dev_odex30_accounting/exp_asset_base/static/description/assets.png b/dev_odex30_accounting/exp_asset_base/static/description/assets.png
new file mode 100644
index 0000000..88fbda0
Binary files /dev/null and b/dev_odex30_accounting/exp_asset_base/static/description/assets.png differ
diff --git a/dev_odex30_accounting/exp_asset_base/static/description/icon.png b/dev_odex30_accounting/exp_asset_base/static/description/icon.png
new file mode 100644
index 0000000..4141f52
Binary files /dev/null and b/dev_odex30_accounting/exp_asset_base/static/description/icon.png differ
diff --git a/dev_odex30_accounting/exp_asset_base/views/account_asset_adjustment_view.xml b/dev_odex30_accounting/exp_asset_base/views/account_asset_adjustment_view.xml
new file mode 100644
index 0000000..f1e748a
--- /dev/null
+++ b/dev_odex30_accounting/exp_asset_base/views/account_asset_adjustment_view.xml
@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <record model="ir.ui.view" id="asset_adjustment_line_tree">
+        <field name="name">account.asset.adjustment.line.tree</field>
+        <field name="model">account.asset.adjustment.line</field>
+        <field name="arch" type="xml">
+            <list string="Asset Adjustment">
+                <field name="asset_id"/>
+                <field name="serial_no"/>
+                <field name="barcode"/>
+                <field name="adjustment_id"/>
+                <field name="asset_status"/>
+                <field name="exist"/>
+            </list>
+        </field>
+    </record>
+
+    <record model="ir.ui.view" id="asset_adjustment_tree">
+        <field name="name">account.asset.adjustment.tree</field>
+        <field name="model">account.asset.adjustment</field>
+        <field name="arch" type="xml">
+            <list string="Asset Adjustment">
+                <field name="name"/>
+                <field name="date"/>
+                <field name="type"/>
+                <field name="state"/>
+            </list>
+        </field>
+    </record>
+
+    <record model="ir.ui.view" id="asset_adjustment_form">
+        <field name="name">account.asset.adjustment.form</field>
+        <field name="model">account.asset.adjustment</field>
+        <field name="arch" type="xml">
+            <form string="Asset Adjustment">
+                <header>
+                    <button name="act_progress"  invisible="state != 'draft'" string="Start" type="object" class="oe_highlight"/>
+                    <button name="act_done" invisible="state != 'in_progress'"  groups='exp_asset_base.group_assets_manager' string="Confirm" type="object" class="oe_highlight"/>
+                    <button name="act_cancel" invisible="state != 'in_progress'" groups="exp_asset_base.group_assets_manager" string="Reject" type="object"/>
+                    <button name="act_draft" invisible="state != 'cancel'" groups='exp_asset_base.group_assets_manager' string="Set to Draft" type="object" class="oe_highlight"/>
+                    <field name="state" widget="statusbar" statusbar_visible="draft,in_progress,done"/>
+                </header>
+                <sheet>
+                    <div class="oe_title">
+                        <h1>
+                            <field name="_barcode_scanned" widget="barcode_handler"/>
+                            <field name="barcode" nolabel="1" placeholder="Barcode..."/>
+                        </h1>
+                    </div>
+                    <group>
+                        <group>
+                            <field name="name"/>
+                            <field name="type"/>
+                        </group>
+                        <group>
+                            <field name="date"/>
+                            <field name="product_id"
+                                   invisible="type != 'product'"
+                                   required="type == 'product'"
+/>
+                            <field name="model_id"
+                                   invisible="type != 'model'"
+                                    required="type == 'model'"/>
+                        </group>
+                    </group>
+                    <notebook>
+                        <page string="Details">
+                            <field name="adjustment_line_ids" nolabel="1">
+                                <list editable="top"
+                                      decoration-success="exist==True" create="0" delete="0">
+                                    <field name="asset_id" readonly="1"/>
+                                    <field name="serial_no"/>
+                                    <field name="barcode"/>
+                                    <field name="asset_status2"
+                                            readonly="exist == False"
+                                           required="exist == True"/>
+                                    <field name="exist"/>
+                                </list>
+                            </field>
+                        </page>
+                    </notebook>
+                </sheet>
+                 <chatter/>
+            </form>
+        </field>
+    </record>
+
+    <record id="action_asset_adjustment" model="ir.actions.act_window">
+        <field name="name">Asset Adjustment</field>
+        <field name="res_model">account.asset.adjustment</field>
+        <field name="view_mode">list,form</field>
+    </record>
+
+</odoo>
\ No newline at end of file
diff --git a/dev_odex30_accounting/exp_asset_base/views/account_asset_view.xml b/dev_odex30_accounting/exp_asset_base/views/account_asset_view.xml
new file mode 100644
index 0000000..83e5dc5
--- /dev/null
+++ b/dev_odex30_accounting/exp_asset_base/views/account_asset_view.xml
@@ -0,0 +1,343 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<odoo>
+
+
+    <!-- Asset Manufacturer -->
+    <record id="action_account_asset_manufacturer" model="ir.actions.act_window">
+        <field name="name">Assets Manufacturer</field>
+        <field name="res_model">account.asset.manufacturer</field>
+        <field name="view_mode">list,form</field>
+    </record>
+    <record model="ir.ui.view" id="asset_manufacturer_form">
+        <field name="name">account.asset.manufacturer.form</field>
+        <field name="model">account.asset.manufacturer</field>
+        <field name="arch" type="xml">
+            <form string="Asset Location">
+                <sheet>
+                    <group>
+                        <field name="name"/>
+                    </group>
+                </sheet>
+                <chatter/>
+            </form>
+        </field>
+    </record>
+
+
+    <!-- Asset Location -->
+    <record id="action_account_asset_location" model="ir.actions.act_window">
+        <field name="name">Assets Locations</field>
+        <field name="res_model">account.asset.location</field>
+        <field name="view_mode">list,form</field>
+    </record>
+    <record model="ir.ui.view" id="asset_location_form">
+        <field name="name">account.asset.location.form</field>
+        <field name="model">account.asset.location</field>
+        <field name="arch" type="xml">
+            <form string="Asset Location">
+                <sheet>
+                    <div class="oe_title">
+                        <h1>
+                            <field name="name" nolabel="1" placeholder="Location Name..."/>
+                        </h1>
+                    </div>
+                    <group>
+                        <group>
+                            <field name="code"/>
+                            <field name="parent_id"/>
+                        </group>
+                        <group>
+                            <field name="type"/>
+                        </group>
+                    </group>
+                    <notebook invisible="type != 'view'"  >
+
+
+                        <page string="Child Locations">
+                            <field name="child_id" nolabel="1">
+                                <list editable="top">
+                                    <field name="name"/>
+                                    <field name="code"/>
+                                    <field name="type"/>
+                                </list>
+                            </field>
+                        </page>
+                    </notebook>
+
+                </sheet>
+                <chatter/>
+            </form>
+        </field>
+    </record>
+
+    <!-- Asset Register -->
+    <record id="view_account_asset_search" model="ir.ui.view">
+        <field name="name">account.asset.search</field>
+        <field name="model">account.asset</field>
+        <field name="inherit_id" ref="odex30_account_asset.view_account_asset_search"/>
+        <field name="arch" type="xml">
+            <field name="name" position="attributes">
+                <attribute name="filter_domain">['|', ('name','ilike',self), ('barcode','ilike',self)]</attribute>
+            </field>
+            <field name="model_id" position="after">
+                <field name="responsible_dept_id"/>
+                <field name="model"/>
+                <field name="serial_no"/>
+                <field name="analytic_distribution"/>
+            </field>
+            <filter name="model" position="after">
+                <filter string="Responsible Department" name="responsible_department" domain="[]"
+                        context="{'group_by':'responsible_dept_id'}"/>
+                <filter string="Cost Center" name="cost_center" domain="[]"
+                        context="{'group_by':'analytic_distribution'}"/>
+            </filter>
+        </field>
+    </record>
+    <record model="ir.ui.view" id="view_account_asset_form">
+        <field name="name">account.asset.form</field>
+        <field name="model">account.asset</field>
+        <field name="inherit_id" ref="odex30_account_asset.view_account_asset_form"/>
+        <field name="arch" type="xml">
+            <header position="inside">
+                <button type="object" name="act_unlock"  groups='exp_asset_base.group_assets_manager' string="Unlock"  invisible="state != 'open'"  />
+                <button type="object" name="act_lock"  groups='exp_asset_base.group_assets_manager' string="Lock"   invisible="state != 'unlock'" />
+            </header>
+
+            <div name="button_box" position="inside">
+                <button class="oe_stat_button" name="open_asset_adjustment" type="object" icon="fa-pencil"
+                         invisible="asset_type != 'purchase'">
+                    <field string="Adjustments" name="asset_adjustment_count" widget="statinfo"/>
+                </button>
+            </div>
+            <div class="oe_title" position="before">
+                <field name="asset_picture" widget="image" class="oe_avatar"
+                       invisible="state == 'model' or asset_type != 'purchase'"
+
+                       />
+            </div>
+            <field name="name" position="after">
+                <span invisible="state == 'model' or asset_type != 'purchase'">-</span>
+                <field name="barcode" placeholder="Barcode"
+                       invisible="state == 'model' or asset_type != 'purchase'"/>
+            </field>
+            <div class="oe_title" position="after">
+                <group string="Basic Info" invisible="asset_type == 'purchase'">
+                    <group>
+                        <field name="responsible_user_id"
+                               invisible="asset_type == 'purchase'"/>
+                        <field name="limit"
+                               invisible="state != 'model' or asset_type != 'purchase'"/>
+                        <field name="manufacturer_id"
+                               invisible="state == 'model' or asset_type != 'purchase'"/>
+                        <field name="serial_no" readonly="1"
+                               invisible="state == 'model' or asset_type != 'purchase'"/>
+                        <field name="product_id"
+                               invisible="state == 'model' or asset_type != 'purchase'"/>
+                    </group>
+                    <group>
+                        <field name="responsible_dept_id" invisible="asset_type == 'purchase'"/>
+                        <field name="company_id" invisible="1"/>
+                        <field name="model" invisible="state == 'model' or asset_type != 'purchase'"/>
+                        <field name="receive_date" invisible="state == 'model' or asset_type != 'purchase'"/>
+                        <field name="note" invisible="state == 'model' or asset_type != 'purchase'"/>
+                        <field name="status" invisible="1"/>
+                    </group>
+                </group>
+          </div>
+
+            <xpath expr="//button[@name='validate']" position="attributes">
+                <attribute name="groups">exp_asset_base.group_assets_manager</attribute>
+            </xpath>
+            <xpath expr="//button[@name='set_to_draft']" position="attributes">
+                <attribute name="groups">exp_asset_base.group_assets_manager</attribute>
+            </xpath>
+            <xpath expr="//button[@name='set_to_running']" position="attributes">
+                <attribute name="groups">exp_asset_base.group_assets_manager</attribute>
+            </xpath>
+            <xpath expr="//button[@name='resume_after_pause']" position="attributes">
+                <attribute name="groups">exp_asset_base.group_assets_manager</attribute>
+            </xpath>
+            <notebook position="before">
+                <group string="Warranty"
+                       invisible="state == 'model' or asset_type != 'purchase'">
+                    <group>
+                        <field name="service_provider_id"/>
+                        <field name="next_maintenance_date"/>
+                        <field name="warranty_contract"/>
+                    </group>
+                    <group>
+                        <field name="warranty_period"/>
+                        <field name="warranty_end_date"/>
+                    </group>
+                </group>
+            </notebook>
+            <sheet position="after">
+
+            </sheet>
+        </field>
+    </record>
+
+    <record id="view_account_asset_asset_kanban" model="ir.ui.view">
+        <field name="name">account.asset.asset.inherit.kanban</field>
+        <field name="model">account.asset</field>
+        <field name="priority">1</field>
+        <field name="inherit_id" ref="odex30_account_asset.view_account_asset_kanban"/>
+        <field name="arch" type="xml">
+            <xpath expr='//kanban' position="inside">
+                <field name="id"/>
+                <field name="serial_no"/>
+                <field name="barcode"/>
+                <field name="status"/>
+                <field name="asset_picture"/>
+                <field name="activity_ids"/>
+                <field name="asset_type" invisible="1"/>
+
+            </xpath>
+            <xpath expr='//kanban/templates/t/div/div[1]' position="before">
+                <div class="row mb4"
+                     invisible="state == 'model' or asset_type != 'purchase'">
+                    <div class="col-6">
+                    <div class="o_kanban_image">
+                        <img t-att-src="record.asset_picture.raw_value
+                                        ? 'data:image/png;base64,' + record.asset_picture.raw_value
+                                        : '/web/static/img/placeholder.png'"
+                             class="o_image_64_cover"
+                             alt="Asset"/>
+                    </div>
+
+                    </div>
+                    <div class="col-6 text-right">
+                        <strong>
+                            <span>
+                                <field name="status"/>
+                            </span>
+                        </strong>
+                    </div>
+                </div>
+            </xpath>
+            <xpath expr='//kanban/templates/t/div/div[1]' position="after">
+                <div class="row mb4"
+                     invisible="state == 'model' or asset_type != 'purchase'">
+                    <div class="col-6">
+                        <strong>
+                            <span>
+                                <field name="serial_no"/>
+                            </span>
+                        </strong>
+                    </div>
+                    <div class="col-6 text-right">
+                        <strong>
+                            <field name="barcode"/>
+                        </strong>
+                    </div>
+                </div>
+            </xpath>
+            <xpath expr='//kanban/templates/t/div' position="inside">
+                <div class="oe_kanban_content">
+                    <div class="o_kanban_record_bottom">
+                        <div class="oe_kanban_bottom_left">
+                            <field name="activity_ids" widget="kanban_activity"/>
+                        </div>
+                        <div class="oe_kanban_bottom_right">
+                        </div>
+                    </div>
+                </div>
+            </xpath>
+        </field>
+    </record>
+
+    <record id="view_account_asset_asset_purchase_tree" model="ir.ui.view">
+        <field name="name">account.asset.inherit.tree</field>
+        <field name="model">account.asset</field>
+        <field name="priority">1</field>
+        <field name="inherit_id" ref="odex30_account_asset.view_account_asset_tree"/>
+        <field name="arch" type="xml">
+            <field name="name" position="after">
+                <field name="barcode"/>
+                <field name="serial_no"/>
+            </field>
+            <field name="state" position="before">
+                <field name="status" string="Custody Status"/>
+            </field>
+        </field>
+    </record>
+    <record model="ir.actions.act_window" id="odex30_account_asset.action_account_asset_form">
+        <field name="name">Assets</field>
+        <field name="res_model">account.asset</field>
+        <field name="domain">[('asset_type', '=', 'purchase'), ('state', '!=', 'model'), ('parent_id', '=', False)]
+        </field>
+        <field name="context">{'asset_type': 'purchase', 'default_asset_type': 'purchase'}</field>
+        <field name="view_ids"
+               eval="[(5, 0, 0),
+                          (0, 0, {'view_mode': 'kanban', 'view_id': ref('view_account_asset_asset_kanban')}),
+                          (0, 0, {'view_mode': 'list', 'view_id': ref('view_account_asset_asset_purchase_tree')}),
+                          (0, 0, {'view_mode': 'form', 'view_id': ref('odex30_account_asset.view_account_asset_form')})]"/>
+    </record>
+
+    <!-- Asset Analysis -->
+    <record id="view_account_asset_pivot" model="ir.ui.view">
+        <field name="name">account.asset.pivot</field>
+        <field name="model">account.asset</field>
+        <field name="arch" type="xml">
+            <pivot string="Assets Analysis">
+<!--                -->
+                <field name="name" type="row"/>
+                <field name="original_value" type="measure"/>
+                <field name="book_value" type="measure"/>
+                <field name="value_residual"/>
+            </pivot>
+        </field>
+    </record>
+    <record id="view_account_asset_graph" model="ir.ui.view">
+        <field name="name">account.asset.graph</field>
+        <field name="model">account.asset</field>
+        <field name="arch" type="xml">
+            <graph string="Assets Analysis" type="bar">
+                <field name="name" type="row"/>
+<!--                -->
+                <field name="original_value" type="measure"/>
+                <field name="book_value" type="measure"/>
+                <field name="value_residual" type="measure"/>
+            </graph>
+        </field>
+    </record>
+    <record id="action_account_asset_graph" model="ir.actions.act_window">
+        <field name="name">Assets Analysis</field>
+        <field name="view_mode">graph,pivot</field>
+        <field name="view_id" ref="view_account_asset_graph"/>
+        <field name="res_model">account.asset</field>
+    </record>
+
+    <!--  Depreciation Analysis -->
+    <record id="view_account_asset_depreciation_pivot" model="ir.ui.view">
+        <field name="name">account.asset.depreciation.pivot</field>
+        <field name="model">account.move</field>
+        <field name="arch" type="xml">
+            <pivot string="Depreciation Analysis">
+                <field name="date" string="Depreciation Date" interval="year" type="row"/>
+                <field name="amount_total" string="Depreciation" type="measure"/>
+                <field name="asset_depreciated_value" type="measure"/>
+                <field name="asset_remaining_value" type="measure"/>
+            </pivot>
+        </field>
+    </record>
+    <record id="view_account_asset_depreciation_graph" model="ir.ui.view">
+        <field name="name">account.asset.graph</field>
+        <field name="model">account.move</field>
+        <field name="arch" type="xml">
+            <graph string="Depreciation Analysis" type="bar">
+                <field name="date" string="Depreciation Date" interval="year" type="row"/>
+                <field name="amount_total" string="Depreciation" type="measure"/>
+                <field name="asset_depreciated_value" type="measure"/>
+                <field name="asset_remaining_value" type="measure"/>
+            </graph>
+        </field>
+    </record>
+    <record id="action_account_asset_depreciation_analysis" model="ir.actions.act_window">
+        <field name="name">Depreciation Analysis</field>
+        <field name="view_mode">graph,pivot</field>
+        <field name="view_id" ref="view_account_asset_depreciation_graph"/>
+        <field name="res_model">account.move</field>
+        <field name="domain">[('asset_id', '!=', False)]</field>
+    </record>
+</odoo>
diff --git a/dev_odex30_accounting/exp_asset_base/views/asset_modify_views.xml b/dev_odex30_accounting/exp_asset_base/views/asset_modify_views.xml
new file mode 100644
index 0000000..bd1e6e5
--- /dev/null
+++ b/dev_odex30_accounting/exp_asset_base/views/asset_modify_views.xml
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+    <record model="ir.ui.view" id="asset_modify_tree">
+        <field name="name">account.asset.modify.tree</field>
+        <field name="model">account.asset.modify</field>
+        <field name="arch" type="xml">
+            <tree string="Modify Asset">
+                <field name="asset_id"/>
+                <field name="name"/>
+                <field name="date"/>
+                <field name="state"/>
+            </tree>
+        </field>
+    </record>
+
+
+    <record model="ir.ui.view" id="asset_modify_form">
+        <field name="name">account.asset.modify.form</field>
+        <field name="model">account.asset.modify</field>
+        <field name="arch" type="xml">
+            <form string="Modify Asset">
+                <header>
+                    <button name="act_confirm" groups='exp_asset_base.group_assets_manager'  invisible="state != 'draft'"  string="Confirm" type="object" class="oe_highlight"/>
+                    <button name="act_approve" groups="exp_asset_base.group_assets_manager"   invisible="state != 'confirm'"  string="Approve" type="object" class="oe_highlight"/>
+                    <button name="modify" groups="exp_asset_base.group_assets_manager"  invisible="state != 'approve'"   string="Done" type="object" class="oe_highlight"/>
+                    <button name="act_draft" groups="exp_asset_base.group_assets_manager"   invisible="state not in ['approve','confirm']"  string="Set to Draft" type="object"/>
+                    <field name="state" widget="statusbar" statusbar_visible="draft,confirm,approve,done"/>
+                </header>
+                <sheet>
+                    <div class="oe_title">
+                        <h1>
+                            <field name="name" nolabel="1" placeholder="Modification..."  readonly="state != 'draft'"/>
+                        </h1>
+                    </div>
+                    <group>
+                        <group string="Modification">
+                            <field name="asset_id" readonly="state != 'draft'" context="{'form_view_ref': 'odex30_account_asset.view_account_asset_form'}"/>
+                            <field name="need_date" invisible="1"/>
+                            <field name="gain_value" invisible="1"/>
+                            <field name="name" placeholder="Modification reason" required="1" readonly="state != 'draft'"/>
+                            <field name="date" invisible="need_date = False"  readonly="required = True"/>
+                        </group>
+                        <group string="New Values">
+                            <label for="method_number"/>
+                            <div class="o_row">
+                                <field name="method_number" required="1" readonly="state != 'draft'"/>
+                                <field name="method_period" required="1" nolabel="1" readonly="state != 'draft'"/>
+                            </div>
+                            <field name="value_residual" readonly="state != 'draft'"/>
+                            <field name="salvage_value" readonly="state != 'draft'"/>
+                        </group>
+                        <group string="Increase Accounts" invisible="gain_value = False" readonly="state != 'draft'"   >
+                            <field name="account_asset_id" required="gain_value != False"  readonly="state != 'draft'"/>
+                            <field name="account_asset_counterpart_id" required="gain_value != False"  readonly="state != 'draft'"/>
+                            <field name="account_depreciation_id" required="gain_value != False"  readonly="state != 'draft'"/>
+                            <field name="account_depreciation_expense_id" required="gain_value != False"  readonly="state != 'draft'"/>
+                        </group>
+                    </group>
+                </sheet>
+                <chatter/>
+            </form>
+        </field>
+    </record>
+
+    <record id="action_asset_modify" model="ir.actions.act_window">
+        <field name="name">Asset Modification</field>
+        <field name="res_model">account.asset.modify</field>
+        <field name="view_mode">tree,form</field>
+    </record>
+
+    <menuitem id="asset_modify_menu"
+                  parent="menu_account_asset_operation"
+                  action="action_asset_modify"
+                  name="Assets Modification" sequence="1"/>
+
+</odoo>
diff --git a/dev_odex30_accounting/exp_asset_base/views/asset_pause_views.xml b/dev_odex30_accounting/exp_asset_base/views/asset_pause_views.xml
new file mode 100644
index 0000000..275ea9e
--- /dev/null
+++ b/dev_odex30_accounting/exp_asset_base/views/asset_pause_views.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+    <record model="ir.ui.view" id="asset_pause_tree">
+        <field name="name">asset.pause.tree</field>
+        <field name="model">asset.pause</field>
+        <field name="arch" type="xml">
+            <tree string="Modify Asset">
+                <field name="asset_id"/>
+                <field name="date"/>
+                <field name="state"/>
+            </tree>
+        </field>
+    </record>
+
+    <record model="ir.ui.view" id="asset_pause_form">
+        <field name="name">asset.pause.form</field>
+        <field name="model">asset.pause</field>
+        <field name="arch" type="xml">
+            <form string="Pause Asset">
+                <header>
+                    <button groups='exp_asset_base.group_assets_manager' name="act_confirm"  invisible="state != 'draft'"  string="Confirm" type="object" class="oe_highlight"/>
+                    <button groups="exp_asset_base.group_assets_manager" name="act_approve"  invisible="state != 'confirm'"   string="Approve" type="object" class="oe_highlight"/>
+                    <button groups="exp_asset_base.group_assets_manager" name="do_action"  invisible="state != 'approve'"   string="Done" type="object" class="oe_highlight"/>
+                    <button groups="exp_asset_base.group_assets_manager" name="act_draft"  invisible="state not in ['confirm','approve']"  string="Set to Draft" type="object"/>
+                    <field  name="state" widget="statusbar" statusbar_visible="draft,confirm,approve,done"/>
+                </header>
+                <sheet>
+                    <group>
+                        <group>
+                            <field name="asset_id" required="1"  readonly="state != 'draft'" context="{'form_view_ref': 'odex30_account_asset.view_account_asset_form'}"/>
+                            <field name="date" required="1" readonly="state != 'draft'"/>
+                        </group>
+                    </group>
+                </sheet>
+                <chatter/>
+            </form>
+        </field>
+    </record>
+
+    <record id="action_asset_pause" model="ir.actions.act_window">
+        <field name="name">Asset Pause</field>
+        <field name="res_model">asset.pause</field>
+        <field name="view_mode">tree,form</field>
+    </record>
+
+    <menuitem id="asset_pause_menu"
+                  parent="menu_account_asset_operation"
+                  action="action_asset_pause"
+                  name="Assets Pause" sequence="2"/>
+
+</odoo>
diff --git a/dev_odex30_accounting/exp_asset_base/views/asset_sell_views.xml b/dev_odex30_accounting/exp_asset_base/views/asset_sell_views.xml
new file mode 100644
index 0000000..6a3e1a8
--- /dev/null
+++ b/dev_odex30_accounting/exp_asset_base/views/asset_sell_views.xml
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+    <record model="ir.ui.view" id="asset_sell_tree">
+        <field name="name">asset.sell.tree</field>
+        <field name="model">asset.sell</field>
+        <field name="arch" type="xml">
+            <tree string="Sell Asset">
+                <field name="asset_id"/>
+                <field name="action"/>
+                <field name="state"/>
+            </tree>
+        </field>
+    </record>
+
+    <record model="ir.ui.view" id="asset_sell_form">
+        <field name="name">asset.sell.form</field>
+        <field name="model">asset.sell</field>
+        <field name="arch" type="xml">
+            <form string="Sell Asset">
+                <header>
+                    <button groups='exp_asset_base.group_assets_manager' name="act_confirm"   invisible="state != 'draft'"  string="Confirm" type="object" class="oe_highlight"/>
+                    <button groups='exp_asset_base.group_assets_manager' name="act_approve"  invisible="state != 'confirm'"  string="Approve" type="object" class="oe_highlight"/>
+                    <button groups="exp_asset_base.group_assets_manager" name="do_action"  invisible="state != 'approve'"  string="Done" type="object" class="oe_highlight"/>
+                    <button groups="exp_asset_base.group_assets_manager" name="act_draft"   invisible="state not in ['approve','confirm']"  string="Set to Draft" type="object"/>
+                    <field name="state" widget="statusbar" statusbar_visible="draft,confirm,approve,done"/>
+                </header>
+                <sheet>
+                    <field name="select_invoice_line_id" invisible="1"/>
+                    <field name="gain_or_loss" invisible="1"/>
+                    <field name="company_id" invisible="1"/>
+                    <group>
+                        <group>
+                            <field name="asset_id"  readonly="state != 'draft'" context="{'form_view_ref': 'odex30_account_asset.view_account_asset_form'}"/>
+                            <field name="action" readonly="state != 'draft'"/>
+                            <field name="invoice_id" options="{'no_create': True}" readonly="state != 'draft'" invisible="action != 'sell'" required="action = 'sell'"   />
+                            <field name="invoice_line_id" options="{'no_create': True}" readonly="state != 'draft'" invisible="select_invoice_line_id = False" required="select_invoice_line_id = True"/>
+                        </group>
+                        <group>
+                            <field name="gain_account_id" invisible="gain_or_loss != 'gain'" readonly="state != 'draft'" required="gain_or_loss = 'gain'"  />
+                            <field name="loss_account_id" invisible="gain_or_loss != 'loss'" readonly="state != 'draft'" required="gain_or_loss = 'loss'"/>
+                        </group>
+                    </group>
+                </sheet>
+                <chatter/>
+            </form>
+        </field>
+    </record>
+
+     <record id="action_asset_sell" model="ir.actions.act_window">
+        <field name="name">Asset Sell</field>
+        <field name="res_model">asset.sell</field>
+        <field name="view_mode">tree,form</field>
+    </record>
+
+    <menuitem id="asset_sell_menu"
+                  parent="menu_account_asset_operation"
+                  action="action_asset_sell"
+                  name="Assets Sell" sequence="4"/>
+
+</odoo>
diff --git a/dev_odex30_accounting/exp_asset_base/views/menus.xml b/dev_odex30_accounting/exp_asset_base/views/menus.xml
new file mode 100644
index 0000000..d6189dc
--- /dev/null
+++ b/dev_odex30_accounting/exp_asset_base/views/menus.xml
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<odoo>
+    <data>
+        <menuitem id="menu_account_asset_management_main"
+                  name="Assets Management" groups="exp_asset_base.group_assets_manager,exp_asset_base.group_assets_user"
+                  sequence="11" web_icon="exp_asset_base,static/description/assets.png"/>
+        <!-- Asset Register -->
+        <menuitem id="odex30_account_asset.menu_action_account_asset_form"
+                  parent="menu_account_asset_management_main"
+                  action="odex30_account_asset.action_account_asset_form"
+                  name="Assets Register" sequence="1"
+                  groups="account.group_account_readonly"/>
+        <!-- Asset Adjustment -->
+        <menuitem id="menu_account_asset_adjustment"
+                  parent="menu_account_asset_management_main"
+                  action="action_asset_adjustment"
+                  name="Assets Adjustment"
+                  sequence="4"/>
+        <!-- Asset Operation -->
+        <menuitem id="menu_account_asset_operation_main"
+                  name="Assets Operations"
+                  parent="menu_account_asset_management_main"
+                  sequence="3"/>
+        <menuitem id="menu_account_asset_operation"
+                  name="Assets Operations"
+                  parent="menu_account_asset_operation_main"
+                  sequence="4"/>
+        <!-- Asset Reporting -->
+        <menuitem id="menu_account_asset_reporting_main"
+                  parent="menu_account_asset_management_main"
+                  name="Reporting"
+                  sequence="5"/>
+        <menuitem id="menu_account_asset_graph"
+                  parent="menu_account_asset_reporting_main"
+                  action="action_account_asset_graph"
+                  name="Assets Analysis"
+                  sequence="1"/>
+        <menuitem id="menu_account_Depreciation_graph"
+                  parent="menu_account_asset_reporting_main"
+                  action="action_account_asset_depreciation_analysis"
+                  name="Depreciation Analysis"
+                  sequence="2"/>
+        <menuitem id="odex30_account_asset.menu_action_account_report_assets" name="Depreciation Schedule"
+                  action="odex30_account_asset.action_account_report_assets"
+                  parent="menu_account_asset_reporting_main"
+                  sequence="3"/>
+        <!--
+        <menuitem id="menu_report_asset_register"
+                  parent="menu_account_asset_reporting_main"
+                  action="act_report_asset_register"
+                  sequence="4"/-->
+
+        <!-- Asset Configurations -->
+        <menuitem id="menu_account_asset_configuration_main"
+                  parent="menu_account_asset_management_main"
+                  name="Configurations"
+                  sequence="7"/>
+        <menuitem id="odex30_account_asset.menu_action_account_asset_model_form"
+                  parent="menu_account_asset_configuration_main"
+                  action="odex30_account_asset.action_account_asset_model_form"
+                  groups="account.group_account_manager"
+                  sequence="1" />
+        <menuitem id="menu_account_asset_location"
+                  parent="menu_account_asset_configuration_main"
+                  action="action_account_asset_location"
+                  name="Assets Locations"
+                  sequence="2"/>
+        <menuitem id="menu_account_manufacturer"
+                  parent="menu_account_asset_configuration_main"
+                  action="action_account_asset_manufacturer"
+                  name="Manufacturer"
+                  sequence="3"/>
+        <menuitem id="menu_account_asset_vendors"
+                  parent="menu_account_asset_configuration_main"
+                  action="base.action_partner_supplier_form"
+                  name="Vendors"
+                  sequence="4"/>
+        <menuitem id="menu_account_asset_products"
+                  parent="menu_account_asset_configuration_main"
+                  action="product.product_normal_action"
+                  name="Products"
+                  sequence="5"/>
+    </data>
+</odoo>
diff --git a/dev_odex30_accounting/exp_asset_custody/__init__.py b/dev_odex30_accounting/exp_asset_custody/__init__.py
new file mode 100644
index 0000000..fca4a5f
--- /dev/null
+++ b/dev_odex30_accounting/exp_asset_custody/__init__.py
@@ -0,0 +1,4 @@
+# -*- coding: utf-8 -*-
+# © Copyright (C) 2021 Expert Co. Ltd(<http:/www.exp-sa.com>)
+
+from . import models
\ No newline at end of file
diff --git a/dev_odex30_accounting/exp_asset_custody/__manifest__.py b/dev_odex30_accounting/exp_asset_custody/__manifest__.py
new file mode 100644
index 0000000..76291d8
--- /dev/null
+++ b/dev_odex30_accounting/exp_asset_custody/__manifest__.py
@@ -0,0 +1,30 @@
+# -*- coding: utf-8 -*-
+# © 2016 ACSONE SA/NV (<http://acsone.eu>)
+# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl).
+{
+    'name': 'Asset Custody Management',
+    'summary': 'Custody Operations for Asset',
+    'description': '''
+Manage Assets transfer between locations, departments and employees
+    ''',
+    'version': '1.0.0',
+    'category': 'Odex30-Accounting/Odex30-Accounting',
+    'author': 'Expert Co. Ltd.',
+    'website': 'http://www.exp-sa.com',
+    'license': 'AGPL-3',
+    'application': False,
+    'installable': True,
+    'depends': [
+        'exp_asset_base'
+    ],
+    'data': [
+        'data/asset_data.xml',
+        'security/ir.model.access.csv',
+        'views/account_asset_view.xml',
+        'views/account_asset_adjustment_view.xml',
+        'views/account_asset_custody_multi_operation.xml',
+        'views/account_asset_custody_operation_view.xml',
+        'reports/asset_adjustment_report.xml',
+        'views/menus.xml'
+    ],
+}
diff --git a/dev_odex30_accounting/exp_asset_custody/__pycache__/__init__.cpython-311.pyc b/dev_odex30_accounting/exp_asset_custody/__pycache__/__init__.cpython-311.pyc
new file mode 100644
index 0000000..7c44e9e
Binary files /dev/null and b/dev_odex30_accounting/exp_asset_custody/__pycache__/__init__.cpython-311.pyc differ
diff --git a/dev_odex30_accounting/exp_asset_custody/data/asset_data.xml b/dev_odex30_accounting/exp_asset_custody/data/asset_data.xml
new file mode 100644
index 0000000..efe41aa
--- /dev/null
+++ b/dev_odex30_accounting/exp_asset_custody/data/asset_data.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <data noupdate="0">
+        <record id="asset_operation_sequence" model="ir.sequence">
+            <field name="name">Asset Operation Sequence</field>
+            <field name="code">asset.operation.seq</field>
+            <field name="prefix">ASS OP/%(range_year)s/</field>
+            <field eval="1" name="number_next"/>
+            <field eval="1" name="number_increment"/>
+            <field eval="True" name="use_date_range"/>
+            <field eval="False" name="company_id"/>
+            <field name="padding">6</field>
+        </record>
+        <record id="asset_multi_operation_sequence" model="ir.sequence">
+            <field name="name">Asset Multi Operation Sequence</field>
+            <field name="code">asset.multi.operation.seq</field>
+            <field name="prefix">ASS MOP/%(range_year)s/</field>
+            <field eval="1" name="number_next"/>
+            <field eval="1" name="number_increment"/>
+            <field eval="True" name="use_date_range"/>
+            <field eval="False" name="company_id"/>
+            <field name="padding">6</field>
+        </record>
+        <record id="asset_state" model="asset.states">
+            <field name="name">good</field>
+        </record>
+        <record id="asset_state2" model="asset.states">
+            <field name="name">scarp</field>
+        </record>
+        <record id="asset_state33" model="asset.states">
+            <field name="name">available</field>
+        </record>
+    </data>
+</odoo>
\ No newline at end of file
diff --git a/dev_odex30_accounting/exp_asset_custody/i18n/ar.po b/dev_odex30_accounting/exp_asset_custody/i18n/ar.po
new file mode 100644
index 0000000..9fbb6aa
--- /dev/null
+++ b/dev_odex30_accounting/exp_asset_custody/i18n/ar.po
@@ -0,0 +1,883 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# 	* exp_asset_custody
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 14.0+e-20210105\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2021-05-19 04:38+0000\n"
+"PO-Revision-Date: 2021-05-19 04:38+0000\n"
+"Last-Translator: \n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: exp_asset_custody
+#: model:ir.model.fields,field_description:exp_asset_custody.field_account_asset__asset_operation_count
+msgid "# Done Operations"
+msgstr "العمليات المعتمدة"
+
+#. module: exp_asset_custody
+#: model:ir.model.fields,field_description:exp_asset_custody.field_account_asset_multi_operation__message_needaction
+#: model:ir.model.fields,field_description:exp_asset_custody.field_account_asset_operation__message_needaction
+msgid "Action Needed"
+msgstr "إجراء مطلوب"
+
+#. module: exp_asset_custody
+#: model:ir.model.fields,field_description:exp_asset_custody.field_account_asset_multi_operation__activity_ids
+#: model:ir.model.fields,field_description:exp_asset_custody.field_account_asset_operation__activity_ids
+msgid "Activities"
+msgstr "الأنشطة"
+
+#. module: exp_asset_custody
+#: model:ir.model.fields,field_description:exp_asset_custody.field_account_asset_multi_operation__activity_exception_decoration
+#: model:ir.model.fields,field_description:exp_asset_custody.field_account_asset_operation__activity_exception_decoration
+msgid "Activity Exception Decoration"
+msgstr "زخرفة استثناء النشاط"
+
+#. module: exp_asset_custody
+#: model:ir.model.fields,field_description:exp_asset_custody.field_account_asset_multi_operation__activity_state
+#: model:ir.model.fields,field_description:exp_asset_custody.field_account_asset_operation__activity_state
+msgid "Activity State"
+msgstr "حالة النشاط"
+
+#. module: exp_asset_custody
+#: model:ir.model.fields,field_description:exp_asset_custody.field_account_asset_multi_operation__activity_type_icon
+#: model:ir.model.fields,field_description:exp_asset_custody.field_account_asset_operation__activity_type_icon
+msgid "Activity Type Icon"
+msgstr "أيقونة نوع النشاط"
+
+#. module: exp_asset_custody
+#: model:ir.model.fields,field_description:exp_asset_custody.field_account_asset_operation__amount
+msgid "Amount"
+msgstr "المبلغ"
+
+#. module: exp_asset_custody
+#: model:ir.model.fields,field_description:exp_asset_custody.field_account_asset_operation__asset_id
+#: model_terms:ir.ui.view,arch_db:exp_asset_custody.asset_adjustment_report
+#: model_terms:ir.ui.view,arch_db:exp_asset_custody.view_account_asset_operation_search
+msgid "Asset"
+msgstr "الأصل"
+
+#. module: exp_asset_custody
+#: model_terms:ir.ui.view,arch_db:exp_asset_custody.view_account_asset_operation_search
+msgid "Asset Account"
+msgstr "حساب الأصل"
+
+#. module: exp_asset_custody
+#: model:ir.actions.report,name:exp_asset_custody.action_asset_adjustment_report
+#: model:ir.model,name:exp_asset_custody.model_account_asset_adjustment
+msgid "Asset Adjustment"
+msgstr "جرد الأصول"
+
+#. module: exp_asset_custody
+#: model:ir.model,name:exp_asset_custody.model_account_asset_multi_operation
+msgid "Asset Multi Operation"
+msgstr "العمليات المتعددة"
+
+#. module: exp_asset_custody
+#: code:addons/exp_asset_custody/models/account_asset.py:0
+#, python-format
+msgid "Asset Operations"
+msgstr "عمليات الأصول"
+
+#. module: exp_asset_custody
+#: model_terms:ir.ui.view,arch_db:exp_asset_custody.view_account_asset_operation_search
+msgid "Asset Operations in done state"
+msgstr "العمليات المعتمدة"
+
+#. module: exp_asset_custody
+#: model:ir.model.fields,field_description:exp_asset_custody.field_account_asset_operation__asset_status
+msgid "Asset Status"
+msgstr "حالة العهد"
+
+#. module: exp_asset_custody
+#: model:ir.model,name:exp_asset_custody.model_account_asset
+msgid "Asset/Revenue Recognition"
+msgstr "أصل/ إيرادات مقدمة"
+
+#. module: exp_asset_custody
+#: model_terms:ir.ui.view,arch_db:exp_asset_custody.asset_adjustment_report
+msgid "Assets Adjustment Report"
+msgstr "تقرير جرد الأصول"
+
+#. module: exp_asset_custody
+#: model:ir.actions.act_window,name:exp_asset_custody.action_account_asset_assignment
+#: model_terms:ir.ui.view,arch_db:exp_asset_custody.view_account_asset_multi_assignment_form
+msgid "Assets Assignment"
+msgstr "إسناد عهدة"
+
+#. module: exp_asset_custody
+#: model:ir.ui.menu,name:exp_asset_custody.menu_account_asset_operation_main
+msgid "Assets Operations"
+msgstr "عمليات الأصول"
+
+#. module: exp_asset_custody
+#: model:ir.actions.act_window,name:exp_asset_custody.action_account_asset_release
+#: model_terms:ir.ui.view,arch_db:exp_asset_custody.view_account_asset_multi_release_form
+msgid "Assets Release"
+msgstr "إرجاع عهدة"
+
+#. module: exp_asset_custody
+#: model:ir.actions.act_window,name:exp_asset_custody.action_account_asset_transfer
+#: model_terms:ir.ui.view,arch_db:exp_asset_custody.view_account_asset_multi_transfer_form
+msgid "Assets Transfer"
+msgstr "نقل العهدة"
+
+#. module: exp_asset_custody
+#: model:ir.model.fields.selection,name:exp_asset_custody.selection__account_asset__status__assigned
+msgid "Assigned"
+msgstr "مسند"
+
+#. module: exp_asset_custody
+#: model:ir.model.fields.selection,name:exp_asset_custody.selection__account_asset__status__reserved
+msgid "Reserved"
+msgstr "محجوز"
+
+#. module: exp_asset_custody
+#: model:ir.model.fields.selection,name:exp_asset_custody.selection__account_asset_multi_operation__type__assignment
+#: model:ir.model.fields.selection,name:exp_asset_custody.selection__account_asset_operation__type__assignment
+#: model:ir.ui.menu,name:exp_asset_custody.menu_account_asset_assignment
+#: model:ir.ui.menu,name:exp_asset_custody.menu_account_multi_asset_assignment
+msgid "Assignment"
+msgstr "أسناد"
+
+#. module: exp_asset_custody
+#: model_terms:ir.ui.view,arch_db:exp_asset_custody.view_account_asset_multi_assignment_form
+#: model_terms:ir.ui.view,arch_db:exp_asset_custody.view_account_asset_operation_form
+msgid "Assignment Info"
+msgstr "معلومات الإسناد"
+
+#. module: exp_asset_custody
+#: model:ir.model.fields,field_description:exp_asset_custody.field_account_asset_multi_operation__message_attachment_count
+#: model:ir.model.fields,field_description:exp_asset_custody.field_account_asset_operation__message_attachment_count
+msgid "Attachment Count"
+msgstr "عدد المرفقات"
+
+#. module: exp_asset_custody
+#: model:ir.model.fields,field_description:exp_asset_custody.field_account_asset_multi_operation__barcode
+#: model:ir.model.fields,field_description:exp_asset_custody.field_account_asset_operation__barcode
+#: model_terms:ir.ui.view,arch_db:exp_asset_custody.asset_adjustment_report
+#: model_terms:ir.ui.view,arch_db:exp_asset_custody.view_account_asset_operation_search
+msgid "Barcode"
+msgstr "باركود"
+
+#. module: exp_asset_custody
+#: model:ir.model.fields,field_description:exp_asset_custody.field_account_asset_multi_operation___barcode_scanned
+msgid "Barcode Scanned"
+msgstr "باركود"
+
+#. module: exp_asset_custody
+#: model_terms:ir.ui.view,arch_db:exp_asset_custody.view_account_asset_multi_assignment_form
+#: model_terms:ir.ui.view,arch_db:exp_asset_custody.view_account_asset_multi_release_form
+#: model_terms:ir.ui.view,arch_db:exp_asset_custody.view_account_asset_multi_transfer_form
+msgid "Barcode..."
+msgstr "الباركود..."
+
+#. module: exp_asset_custody
+#: model:ir.model.fields.selection,name:exp_asset_custody.selection__account_asset_adjustment__type__department
+msgid "By Department"
+msgstr "الإدارة"
+
+#. module: exp_asset_custody
+#: model:ir.model.fields.selection,name:exp_asset_custody.selection__account_asset_adjustment__type__employee
+msgid "By Employee"
+msgstr "الموظف"
+
+#. module: exp_asset_custody
+#: model:ir.model.fields.selection,name:exp_asset_custody.selection__account_asset_adjustment__type__location
+msgid "By Location"
+msgstr "الموقع"
+
+#. module: exp_asset_custody
+#: model:ir.model.fields.selection,name:exp_asset_custody.selection__account_asset_multi_operation__state__cancel
+#: model:ir.model.fields.selection,name:exp_asset_custody.selection__account_asset_operation__state__cancel
+#: model_terms:ir.ui.view,arch_db:exp_asset_custody.view_account_asset_assignment_tree
+#: model_terms:ir.ui.view,arch_db:exp_asset_custody.view_account_asset_operation_form
+#: model_terms:ir.ui.view,arch_db:exp_asset_custody.view_account_asset_release_tree
+#: model_terms:ir.ui.view,arch_db:exp_asset_custody.view_account_asset_transfer_tree
+msgid "Cancel"
+msgstr "إلغاء"
+
+#. module: exp_asset_custody
+#: model_terms:ir.ui.view,arch_db:exp_asset_custody.view_account_asset_assignment_tree
+#: model_terms:ir.ui.view,arch_db:exp_asset_custody.view_account_asset_multi_assignment_form
+#: model_terms:ir.ui.view,arch_db:exp_asset_custody.view_account_asset_multi_release_form
+#: model_terms:ir.ui.view,arch_db:exp_asset_custody.view_account_asset_multi_transfer_form
+#: model_terms:ir.ui.view,arch_db:exp_asset_custody.view_account_asset_operation_form
+#: model_terms:ir.ui.view,arch_db:exp_asset_custody.view_account_asset_release_tree
+#: model_terms:ir.ui.view,arch_db:exp_asset_custody.view_account_asset_transfer_tree
+msgid "Confirm"
+msgstr "تأكيد"
+
+#. module: exp_asset_custody
+#: model:ir.model.fields,field_description:exp_asset_custody.field_account_asset_multi_operation__create_uid
+#: model:ir.model.fields,field_description:exp_asset_custody.field_account_asset_operation__create_uid
+msgid "Created by"
+msgstr "أنشئ بواسطة"
+
+#. module: exp_asset_custody
+#: model:ir.model.fields,field_description:exp_asset_custody.field_account_asset_multi_operation__create_date
+#: model:ir.model.fields,field_description:exp_asset_custody.field_account_asset_operation__create_date
+msgid "Created on"
+msgstr "أنشئ في"
+
+#. module: exp_asset_custody
+#: model_terms:ir.ui.view,arch_db:exp_asset_custody.view_account_asset_operation_form
+msgid "Current"
+msgstr "الحالي"
+
+#. module: exp_asset_custody
+#: model:ir.model.fields,field_description:exp_asset_custody.field_account_asset__department_id
+msgid "Current Department"
+msgstr "الإدارة الحالية"
+
+#. module: exp_asset_custody
+#: model:ir.model.fields,field_description:exp_asset_custody.field_account_asset__employee_id
+msgid "Current Employee"
+msgstr "الموظف الحالي"
+
+#. module: exp_asset_custody
+#: model_terms:ir.ui.view,arch_db:exp_asset_custody.view_account_asset_operation_form
+msgid "Current Info"
+msgstr "المعلومات الحالية"
+
+#. module: exp_asset_custody
+#: model_terms:ir.ui.view,arch_db:exp_asset_custody.view_account_asset_form
+msgid "Custody Info"
+msgstr "معلومات العهدة"
+
+#. module: exp_asset_custody
+#: model:ir.model.fields,field_description:exp_asset_custody.field_account_asset__custody_period
+#: model:ir.model.fields,field_description:exp_asset_custody.field_account_asset_operation__custody_period
+msgid "Custody Period"
+msgstr "فترة العهدة"
+
+#. module: exp_asset_custody
+#: model:ir.model.fields,field_description:exp_asset_custody.field_account_asset__custody_type
+#: model:ir.model.fields,field_description:exp_asset_custody.field_account_asset_operation__custody_type
+#: model_terms:ir.ui.view,arch_db:exp_asset_custody.view_account_asset_search
+msgid "Custody Type"
+msgstr "نوع العهدة"
+
+#. module: exp_asset_custody
+#: model:ir.ui.menu,name:exp_asset_custody.menu_account_asset_custody_operation
+msgid "Custody operations"
+msgstr "عمليات العهد"
+
+#. module: exp_asset_custody
+#: model:ir.model.fields,field_description:exp_asset_custody.field_account_asset_multi_operation__date
+#: model:ir.model.fields,field_description:exp_asset_custody.field_account_asset_operation__date
+#: model_terms:ir.ui.view,arch_db:exp_asset_custody.view_account_asset_operation_search
+msgid "Date"
+msgstr "التاريخ"
+
+#. module: exp_asset_custody
+#: model_terms:ir.ui.view,arch_db:exp_asset_custody.asset_adjustment_report
+msgid "Date:"
+msgstr "التاريخ:"
+
+#. module: exp_asset_custody
+#: model:ir.model.fields,field_description:exp_asset_custody.field_account_asset_adjustment__department_id
+#: model:ir.model.fields,field_description:exp_asset_custody.field_account_asset_multi_operation__new_department_id
+#: model:ir.model.fields,field_description:exp_asset_custody.field_account_asset_operation__current_department_id
+#: model:ir.model.fields,field_description:exp_asset_custody.field_account_asset_operation__new_department_id
+#: model_terms:ir.ui.view,arch_db:exp_asset_custody.asset_adjustment_report
+#: model_terms:ir.ui.view,arch_db:exp_asset_custody.view_account_asset_operation_search
+#: model_terms:ir.ui.view,arch_db:exp_asset_custody.view_account_asset_search
+msgid "Department"
+msgstr "الإدارة"
+
+#. module: exp_asset_custody
+#: model_terms:ir.ui.view,arch_db:exp_asset_custody.asset_adjustment_report
+msgid "Description:"
+msgstr "الوصف:"
+
+#. module: exp_asset_custody
+#: model:ir.model.fields,field_description:exp_asset_custody.field_account_asset__display_name
+#: model:ir.model.fields,field_description:exp_asset_custody.field_account_asset_adjustment__display_name
+#: model:ir.model.fields,field_description:exp_asset_custody.field_account_asset_multi_operation__display_name
+#: model:ir.model.fields,field_description:exp_asset_custody.field_account_asset_operation__display_name
+msgid "Display Name"
+msgstr "الاسم المعروض"
+
+#. module: exp_asset_custody
+#: model:ir.model.fields.selection,name:exp_asset_custody.selection__account_asset_multi_operation__state__done
+#: model:ir.model.fields.selection,name:exp_asset_custody.selection__account_asset_operation__state__done
+#: model_terms:ir.ui.view,arch_db:exp_asset_custody.view_account_asset_operation_search
+msgid "Done"
+msgstr "المنتهية"
+
+#. module: exp_asset_custody
+#: model:ir.model.fields.selection,name:exp_asset_custody.selection__account_asset_multi_operation__state__draft
+#: model:ir.model.fields.selection,name:exp_asset_custody.selection__account_asset_operation__state__draft
+msgid "Draft"
+msgstr "مسودة"
+
+#. module: exp_asset_custody
+#: model:ir.model.fields,field_description:exp_asset_custody.field_account_asset_adjustment__employee_id
+#: model:ir.model.fields,field_description:exp_asset_custody.field_account_asset_multi_operation__new_employee_id
+#: model:ir.model.fields,field_description:exp_asset_custody.field_account_asset_operation__current_employee_id
+#: model:ir.model.fields,field_description:exp_asset_custody.field_account_asset_operation__new_employee_id
+#: model_terms:ir.ui.view,arch_db:exp_asset_custody.asset_adjustment_report
+#: model_terms:ir.ui.view,arch_db:exp_asset_custody.view_account_asset_operation_search
+#: model_terms:ir.ui.view,arch_db:exp_asset_custody.view_account_asset_search
+msgid "Employee"
+msgstr "الموظف"
+
+#. module: exp_asset_custody
+#: model:ir.model.fields,field_description:exp_asset_custody.field_account_asset_multi_operation__message_follower_ids
+#: model:ir.model.fields,field_description:exp_asset_custody.field_account_asset_operation__message_follower_ids
+msgid "Followers"
+msgstr "المتابعون"
+
+#. module: exp_asset_custody
+#: model:ir.model.fields,field_description:exp_asset_custody.field_account_asset_multi_operation__message_channel_ids
+#: model:ir.model.fields,field_description:exp_asset_custody.field_account_asset_operation__message_channel_ids
+msgid "Followers (Channels)"
+msgstr "المتابعون (القنوات)"
+
+#. module: exp_asset_custody
+#: model:ir.model.fields,field_description:exp_asset_custody.field_account_asset_multi_operation__message_partner_ids
+#: model:ir.model.fields,field_description:exp_asset_custody.field_account_asset_operation__message_partner_ids
+msgid "Followers (Partners)"
+msgstr "المتابعون (الشركاء)"
+
+#. module: exp_asset_custody
+#: model:ir.model.fields,help:exp_asset_custody.field_account_asset_multi_operation__activity_type_icon
+#: model:ir.model.fields,help:exp_asset_custody.field_account_asset_operation__activity_type_icon
+msgid "Font awesome icon e.g. fa-tasks"
+msgstr ""
+
+#. module: exp_asset_custody
+#: model:ir.model.fields.selection,name:exp_asset_custody.selection__account_asset__custody_type__general
+#: model:ir.model.fields.selection,name:exp_asset_custody.selection__account_asset_operation__custody_type__general
+msgid "General"
+msgstr "عام"
+
+#. module: exp_asset_custody
+#: model:ir.model.fields.selection,name:exp_asset_custody.selection__account_asset_operation__asset_status__good
+msgid "Good"
+msgstr "جيد"
+
+#. module: exp_asset_custody
+#: model_terms:ir.ui.view,arch_db:exp_asset_custody.view_account_asset_operation_search
+msgid "Group By..."
+msgstr "تجميع بـ..."
+
+#. module: exp_asset_custody
+#: model:ir.model.fields,field_description:exp_asset_custody.field_account_asset__id
+#: model:ir.model.fields,field_description:exp_asset_custody.field_account_asset_adjustment__id
+#: model:ir.model.fields,field_description:exp_asset_custody.field_account_asset_multi_operation__id
+#: model:ir.model.fields,field_description:exp_asset_custody.field_account_asset_operation__id
+msgid "ID"
+msgstr "المُعرف"
+
+#. module: exp_asset_custody
+#: model:ir.model.fields,field_description:exp_asset_custody.field_account_asset_multi_operation__activity_exception_icon
+#: model:ir.model.fields,field_description:exp_asset_custody.field_account_asset_operation__activity_exception_icon
+msgid "Icon"
+msgstr "الأيقونة"
+
+#. module: exp_asset_custody
+#: model:ir.model.fields,help:exp_asset_custody.field_account_asset_multi_operation__activity_exception_icon
+#: model:ir.model.fields,help:exp_asset_custody.field_account_asset_operation__activity_exception_icon
+msgid "Icon to indicate an exception activity."
+msgstr "الأيقونة للإشارة إلى استثناء النشاط"
+
+#. module: exp_asset_custody
+#: model:ir.model.fields,help:exp_asset_custody.field_account_asset_multi_operation__message_needaction
+#: model:ir.model.fields,help:exp_asset_custody.field_account_asset_multi_operation__message_unread
+#: model:ir.model.fields,help:exp_asset_custody.field_account_asset_operation__message_needaction
+#: model:ir.model.fields,help:exp_asset_custody.field_account_asset_operation__message_unread
+msgid "If checked, new messages require your attention."
+msgstr "إذا كان محددًا، فهناك رسائل جديدة تحتاج لرؤيتها."
+
+#. module: exp_asset_custody
+#: model:ir.model.fields,help:exp_asset_custody.field_account_asset_multi_operation__message_has_error
+#: model:ir.model.fields,help:exp_asset_custody.field_account_asset_multi_operation__message_has_sms_error
+#: model:ir.model.fields,help:exp_asset_custody.field_account_asset_operation__message_has_error
+#: model:ir.model.fields,help:exp_asset_custody.field_account_asset_operation__message_has_sms_error
+msgid "If checked, some messages have a delivery error."
+msgstr "إذا كان محددًا، فقد حدث خطأ في تسليم بعض الرسائل."
+
+#. module: exp_asset_custody
+#: model:ir.model.fields.selection,name:exp_asset_custody.selection__account_asset_multi_operation__state__in_progress
+msgid "In Progress"
+msgstr "جاري"
+
+#. module: exp_asset_custody
+#: model:ir.model.fields,field_description:exp_asset_custody.field_account_asset_multi_operation__message_is_follower
+#: model:ir.model.fields,field_description:exp_asset_custody.field_account_asset_operation__message_is_follower
+msgid "Is Follower"
+msgstr "متابع"
+
+#. module: exp_asset_custody
+#: model:ir.model.fields,field_description:exp_asset_custody.field_account_asset____last_update
+#: model:ir.model.fields,field_description:exp_asset_custody.field_account_asset_adjustment____last_update
+#: model:ir.model.fields,field_description:exp_asset_custody.field_account_asset_multi_operation____last_update
+#: model:ir.model.fields,field_description:exp_asset_custody.field_account_asset_operation____last_update
+msgid "Last Modified on"
+msgstr "آخر تعديل في"
+
+#. module: exp_asset_custody
+#: model:ir.model.fields,field_description:exp_asset_custody.field_account_asset_multi_operation__write_uid
+#: model:ir.model.fields,field_description:exp_asset_custody.field_account_asset_operation__write_uid
+msgid "Last Updated by"
+msgstr "آخر تحديث بواسطة"
+
+#. module: exp_asset_custody
+#: model:ir.model.fields,field_description:exp_asset_custody.field_account_asset_multi_operation__write_date
+#: model:ir.model.fields,field_description:exp_asset_custody.field_account_asset_operation__write_date
+msgid "Last Updated on"
+msgstr "آخر تحديث في"
+
+#. module: exp_asset_custody
+#: model:ir.model.fields,field_description:exp_asset_custody.field_account_asset_adjustment__location_id
+#: model:ir.model.fields,field_description:exp_asset_custody.field_account_asset_multi_operation__new_location_id
+#: model:ir.model.fields,field_description:exp_asset_custody.field_account_asset_operation__current_location_id
+#: model:ir.model.fields,field_description:exp_asset_custody.field_account_asset_operation__new_location_id
+#: model_terms:ir.ui.view,arch_db:exp_asset_custody.asset_adjustment_report
+#: model_terms:ir.ui.view,arch_db:exp_asset_custody.view_account_asset_operation_search
+#: model_terms:ir.ui.view,arch_db:exp_asset_custody.view_account_asset_search
+msgid "Location"
+msgstr "الموقع"
+
+#. module: exp_asset_custody
+#: model:ir.model.fields,field_description:exp_asset_custody.field_account_asset_multi_operation__message_main_attachment_id
+#: model:ir.model.fields,field_description:exp_asset_custody.field_account_asset_operation__message_main_attachment_id
+msgid "Main Attachment"
+msgstr "المرفقات"
+
+#. module: exp_asset_custody
+#: code:addons/exp_asset_custody/models/account_asset_multi_operation.py:0
+#, python-format
+msgid "Make sure you choose an asset in all operation line."
+msgstr ""
+
+#. module: exp_asset_custody
+#: code:addons/exp_asset_custody/models/account_asset_multi_operation.py:0
+#, python-format
+msgid "Make sure you choose custody period for all operation lines."
+msgstr "الرجاء التاكد من إدخال فترة العهدة في جميع العمليات."
+
+#. module: exp_asset_custody
+#: code:addons/exp_asset_custody/models/account_asset_multi_operation.py:0
+#, python-format
+msgid "Make sure you choose custody type for all operation lines."
+msgstr "الرجاء التاكد من إدخال نوع العهدة في جميع العمليات."
+
+#. module: exp_asset_custody
+#: code:addons/exp_asset_custody/models/account_asset_multi_operation.py:0
+#, python-format
+msgid "Make sure you enter the return date for all temporary custodies."
+msgstr "الرجاء التاكد من إدخال تاريخ الإرجاع للعهد المؤقتة."
+
+#. module: exp_asset_custody
+#: model:ir.model.fields,field_description:exp_asset_custody.field_account_asset_multi_operation__manual
+msgid "Manual"
+msgstr "يدوي"
+
+#. module: exp_asset_custody
+#: model:ir.model.fields,field_description:exp_asset_custody.field_account_asset_multi_operation__message_has_error
+#: model:ir.model.fields,field_description:exp_asset_custody.field_account_asset_operation__message_has_error
+msgid "Message Delivery error"
+msgstr "خطأ في تسليم الرسائل"
+
+#. module: exp_asset_custody
+#: model:ir.model.fields,field_description:exp_asset_custody.field_account_asset_multi_operation__message_ids
+#: model:ir.model.fields,field_description:exp_asset_custody.field_account_asset_operation__message_ids
+msgid "Messages"
+msgstr "الرسائل"
+
+#. module: exp_asset_custody
+#: model_terms:ir.ui.view,arch_db:exp_asset_custody.asset_adjustment_report
+msgid "Missing Assets:"
+msgstr "الأصول المفقودة:"
+
+#. module: exp_asset_custody
+#: model:ir.model.fields,field_description:exp_asset_custody.field_account_asset_operation__model_id
+#: model_terms:ir.ui.view,arch_db:exp_asset_custody.view_account_asset_operation_search
+msgid "Model"
+msgstr "النموذج"
+
+#. module: exp_asset_custody
+#: model:ir.model.fields,field_description:exp_asset_custody.field_account_asset_operation__multi_operation_id
+msgid "Multi Operation"
+msgstr "العمليات المتعددة"
+
+#. module: exp_asset_custody
+#: model:ir.actions.act_window,name:exp_asset_custody.action_multi_asset_assignment
+msgid "Multiple Assignment"
+msgstr "إسناد العهد"
+
+#. module: exp_asset_custody
+#: model:ir.actions.act_window,name:exp_asset_custody.action_multi_asset_release
+msgid "Multiple Release"
+msgstr "إرجاع العهد"
+
+#. module: exp_asset_custody
+#: model:ir.actions.act_window,name:exp_asset_custody.action_multi_asset_transfer
+msgid "Multiple Transfer"
+msgstr "نقل العهد"
+
+#. module: exp_asset_custody
+#: model:ir.ui.menu,name:exp_asset_custody.menu_account_asset_multi_operation
+msgid "Multiple operations"
+msgstr "العمليات المتعددة"
+
+#. module: exp_asset_custody
+#: model:ir.model.fields,field_description:exp_asset_custody.field_account_asset_multi_operation__name
+#: model:ir.model.fields,field_description:exp_asset_custody.field_account_asset_operation__name
+msgid "Name"
+msgstr "الإسم"
+
+#. module: exp_asset_custody
+#: model_terms:ir.ui.view,arch_db:exp_asset_custody.view_account_asset_multi_transfer_form
+#: model_terms:ir.ui.view,arch_db:exp_asset_custody.view_account_asset_operation_form
+msgid "New"
+msgstr "جديد"
+
+#. module: exp_asset_custody
+#: model_terms:ir.ui.view,arch_db:exp_asset_custody.view_account_asset_transfer_tree
+msgid "New Department"
+msgstr "الإدارة الجديدة"
+
+#. module: exp_asset_custody
+#: model_terms:ir.ui.view,arch_db:exp_asset_custody.view_account_asset_transfer_tree
+msgid "New Employee"
+msgstr "الموظف الجديد"
+
+#. module: exp_asset_custody
+#: model_terms:ir.ui.view,arch_db:exp_asset_custody.view_account_asset_transfer_tree
+msgid "New Location"
+msgstr "الموقع الجديد"
+
+#. module: exp_asset_custody
+#: model:ir.model.fields,field_description:exp_asset_custody.field_account_asset_multi_operation__activity_date_deadline
+#: model:ir.model.fields,field_description:exp_asset_custody.field_account_asset_operation__activity_date_deadline
+msgid "Next Activity Deadline"
+msgstr "الموعد النهائي للنشاط التالي"
+
+#. module: exp_asset_custody
+#: model:ir.model.fields,field_description:exp_asset_custody.field_account_asset_multi_operation__activity_summary
+#: model:ir.model.fields,field_description:exp_asset_custody.field_account_asset_operation__activity_summary
+msgid "Next Activity Summary"
+msgstr "ملخص النشاط التالي"
+
+#. module: exp_asset_custody
+#: model:ir.model.fields,field_description:exp_asset_custody.field_account_asset_multi_operation__activity_type_id
+#: model:ir.model.fields,field_description:exp_asset_custody.field_account_asset_operation__activity_type_id
+msgid "Next Activity Type"
+msgstr "نوع النشاط التالي"
+
+#. module: exp_asset_custody
+#: code:addons/exp_asset_custody/models/account_asset_multi_operation.py:0
+#, python-format
+msgid "No asset found with the selected barcode"
+msgstr "لم يتم العثور على أصل لهذا الباركود"
+
+#. module: exp_asset_custody
+#: model:ir.model.fields,field_description:exp_asset_custody.field_account_asset_multi_operation__note
+#: model:ir.model.fields,field_description:exp_asset_custody.field_account_asset_operation__note
+#: model_terms:ir.ui.view,arch_db:exp_asset_custody.view_account_asset_operation_form
+msgid "Note"
+msgstr "ملاحظة"
+
+#. module: exp_asset_custody
+#: model:ir.model.fields,field_description:exp_asset_custody.field_account_asset_multi_operation__message_needaction_counter
+#: model:ir.model.fields,field_description:exp_asset_custody.field_account_asset_operation__message_needaction_counter
+msgid "Number of Actions"
+msgstr "عدد الإجراءات"
+
+#. module: exp_asset_custody
+#: model:ir.model.fields,help:exp_asset_custody.field_account_asset__asset_operation_count
+msgid "Number of done asset operations"
+msgstr ""
+
+#. module: exp_asset_custody
+#: model:ir.model.fields,field_description:exp_asset_custody.field_account_asset_multi_operation__message_has_error_counter
+#: model:ir.model.fields,field_description:exp_asset_custody.field_account_asset_operation__message_has_error_counter
+msgid "Number of errors"
+msgstr "عدد الاخطاء"
+
+#. module: exp_asset_custody
+#: model:ir.model.fields,help:exp_asset_custody.field_account_asset_multi_operation__message_needaction_counter
+#: model:ir.model.fields,help:exp_asset_custody.field_account_asset_operation__message_needaction_counter
+msgid "Number of messages which requires an action"
+msgstr "عدد الرسائل التي تتطلب إجراء"
+
+#. module: exp_asset_custody
+#: model:ir.model.fields,help:exp_asset_custody.field_account_asset_multi_operation__message_has_error_counter
+#: model:ir.model.fields,help:exp_asset_custody.field_account_asset_operation__message_has_error_counter
+msgid "Number of messages with delivery error"
+msgstr "عدد الرسائل الحادث بها خطأ في التسليم"
+
+#. module: exp_asset_custody
+#: model:ir.model.fields,help:exp_asset_custody.field_account_asset_multi_operation__message_unread_counter
+#: model:ir.model.fields,help:exp_asset_custody.field_account_asset_operation__message_unread_counter
+msgid "Number of unread messages"
+msgstr "عدد الرسائل الجديدة"
+
+#. module: exp_asset_custody
+#: code:addons/exp_asset_custody/models/account_asset_operation.py:0
+#, python-format
+msgid "Only draft operations can be deleted."
+msgstr "لا يمكن حذف العملية الا في الحالة مبدئية"
+
+#. module: exp_asset_custody
+#: model:ir.model.fields,field_description:exp_asset_custody.field_account_asset_multi_operation__operation_ids
+msgid "Operation"
+msgstr "عملية"
+
+#. module: exp_asset_custody
+#: model:ir.actions.act_window,name:exp_asset_custody.action_account_asset_operation_analysis
+#: model:ir.ui.menu,name:exp_asset_custody.menu_account_operation_graph
+msgid "Operation Analysis"
+msgstr "تحليل العمليات"
+
+#. module: exp_asset_custody
+#: model_terms:ir.ui.view,arch_db:exp_asset_custody.view_account_asset_form
+msgid "Operations"
+msgstr "العمليات"
+
+#. module: exp_asset_custody
+#: model:ir.model.fields.selection,name:exp_asset_custody.selection__account_asset_operation__state__pending
+msgid "Pending"
+msgstr "معلق"
+
+#. module: exp_asset_custody
+#: model:ir.model.fields.selection,name:exp_asset_custody.selection__account_asset__custody_period__permanent
+#: model:ir.model.fields.selection,name:exp_asset_custody.selection__account_asset_operation__custody_period__permanent
+msgid "Permanent"
+msgstr "دائمة"
+
+#. module: exp_asset_custody
+#: model:ir.model.fields.selection,name:exp_asset_custody.selection__account_asset__custody_type__personal
+#: model:ir.model.fields.selection,name:exp_asset_custody.selection__account_asset_operation__custody_type__personal
+msgid "Personal"
+msgstr "شخصية"
+
+#. module: exp_asset_custody
+#: model:ir.model.fields,field_description:exp_asset_custody.field_account_asset_operation__product_id
+msgid "Product"
+msgstr "المنتج"
+
+#. module: exp_asset_custody
+#: model:ir.model.fields,field_description:exp_asset_custody.field_account_asset__purpose
+msgid "Purpose"
+msgstr "الغرض"
+
+#. module: exp_asset_custody
+#: model_terms:ir.ui.view,arch_db:exp_asset_custody.view_account_asset_multi_assignment_form
+#: model_terms:ir.ui.view,arch_db:exp_asset_custody.view_account_asset_multi_release_form
+#: model_terms:ir.ui.view,arch_db:exp_asset_custody.view_account_asset_multi_transfer_form
+#: model_terms:ir.ui.view,arch_db:exp_asset_custody.view_account_asset_operation_form
+msgid "Reject"
+msgstr "رفض"
+
+#. module: exp_asset_custody
+#: model:ir.model.fields.selection,name:exp_asset_custody.selection__account_asset_multi_operation__type__release
+#: model:ir.model.fields.selection,name:exp_asset_custody.selection__account_asset_operation__type__release
+#: model:ir.ui.menu,name:exp_asset_custody.menu_account_asset_release
+#: model:ir.ui.menu,name:exp_asset_custody.menu_account_multi_asset_release
+msgid "Release"
+msgstr "إرجاع"
+
+#. module: exp_asset_custody
+#: model_terms:ir.ui.view,arch_db:exp_asset_custody.view_account_asset_multi_release_form
+#: model_terms:ir.ui.view,arch_db:exp_asset_custody.view_account_asset_operation_form
+msgid "Release Info"
+msgstr "معلومات الإرجاع"
+
+#. module: exp_asset_custody
+#: model_terms:ir.ui.view,arch_db:exp_asset_custody.view_account_asset_multi_release_form
+#: model_terms:ir.ui.view,arch_db:exp_asset_custody.view_account_asset_operation_form
+#: model_terms:ir.ui.view,arch_db:exp_asset_custody.view_account_asset_release_tree
+msgid "Release Location"
+msgstr "موقع الإرجاع"
+
+#. module: exp_asset_custody
+#: model:ir.model.fields,field_description:exp_asset_custody.field_account_asset_operation__user_id
+msgid "Responsible"
+msgstr "المسئول"
+
+#. module: exp_asset_custody
+#: model:ir.model.fields,field_description:exp_asset_custody.field_account_asset_multi_operation__responsible_department_id
+#: model:ir.model.fields,field_description:exp_asset_custody.field_account_asset_operation__department_id
+#: model_terms:ir.ui.view,arch_db:exp_asset_custody.view_account_asset_operation_search
+msgid "Responsible Department"
+msgstr "الإدارة المسئولة"
+
+#. module: exp_asset_custody
+#: model:ir.model.fields,field_description:exp_asset_custody.field_account_asset_multi_operation__activity_user_id
+#: model:ir.model.fields,field_description:exp_asset_custody.field_account_asset_multi_operation__responsible_user_id
+#: model:ir.model.fields,field_description:exp_asset_custody.field_account_asset_operation__activity_user_id
+#: model_terms:ir.ui.view,arch_db:exp_asset_custody.view_account_asset_operation_search
+msgid "Responsible User"
+msgstr "الموظف المسئول"
+
+#. module: exp_asset_custody
+#: model:ir.model.fields,field_description:exp_asset_custody.field_account_asset__return_date
+#: model:ir.model.fields,field_description:exp_asset_custody.field_account_asset_operation__return_date
+msgid "Return Date"
+msgstr "تاريخ الإرجاع"
+
+#. module: exp_asset_custody
+#: model:ir.model.fields,field_description:exp_asset_custody.field_account_asset_multi_operation__message_has_sms_error
+#: model:ir.model.fields,field_description:exp_asset_custody.field_account_asset_operation__message_has_sms_error
+msgid "SMS Delivery error"
+msgstr "خطأ في تسليم الرسائل القصيرة"
+
+#. module: exp_asset_custody
+#: model:ir.model.fields.selection,name:exp_asset_custody.selection__account_asset__status__scrap
+#: model:ir.model.fields.selection,name:exp_asset_custody.selection__account_asset_operation__asset_status__scrap
+msgid "Scrap"
+msgstr "تالف"
+
+#. module: exp_asset_custody
+#: model_terms:ir.ui.view,arch_db:exp_asset_custody.asset_adjustment_report
+msgid "Serial No"
+msgstr "المتسلسل"
+
+#. module: exp_asset_custody
+#: model_terms:ir.ui.view,arch_db:exp_asset_custody.view_account_asset_assignment_tree
+#: model_terms:ir.ui.view,arch_db:exp_asset_custody.view_account_asset_multi_assignment_form
+#: model_terms:ir.ui.view,arch_db:exp_asset_custody.view_account_asset_multi_release_form
+#: model_terms:ir.ui.view,arch_db:exp_asset_custody.view_account_asset_multi_transfer_form
+#: model_terms:ir.ui.view,arch_db:exp_asset_custody.view_account_asset_operation_form
+#: model_terms:ir.ui.view,arch_db:exp_asset_custody.view_account_asset_release_tree
+#: model_terms:ir.ui.view,arch_db:exp_asset_custody.view_account_asset_transfer_tree
+msgid "Set to Draft"
+msgstr "تعيين كمسودة"
+
+#. module: exp_asset_custody
+#: model_terms:ir.ui.view,arch_db:exp_asset_custody.view_account_asset_assignment_tree
+#: model_terms:ir.ui.view,arch_db:exp_asset_custody.view_account_asset_release_tree
+#: model_terms:ir.ui.view,arch_db:exp_asset_custody.view_account_asset_transfer_tree
+msgid "Setup"
+msgstr "الإعداد"
+
+#. module: exp_asset_custody
+#: model_terms:ir.ui.view,arch_db:exp_asset_custody.asset_adjustment_report
+msgid "Signatures:"
+msgstr ""
+
+#. module: exp_asset_custody
+#: model_terms:ir.ui.view,arch_db:exp_asset_custody.view_account_asset_multi_assignment_form
+#: model_terms:ir.ui.view,arch_db:exp_asset_custody.view_account_asset_multi_release_form
+#: model_terms:ir.ui.view,arch_db:exp_asset_custody.view_account_asset_multi_transfer_form
+msgid "Start"
+msgstr "بدأ"
+
+#. module: exp_asset_custody
+#: model:ir.model.fields,field_description:exp_asset_custody.field_account_asset_multi_operation__state
+#: model:ir.model.fields,field_description:exp_asset_custody.field_account_asset_operation__state
+#: model_terms:ir.ui.view,arch_db:exp_asset_custody.view_account_asset_operation_search
+msgid "State"
+msgstr "الحالة"
+
+#. module: exp_asset_custody
+#: model:ir.model.fields,field_description:exp_asset_custody.field_account_asset__status
+#: model_terms:ir.ui.view,arch_db:exp_asset_custody.asset_adjustment_report
+msgid "Status"
+msgstr "الحالة"
+
+#. module: exp_asset_custody
+#: model:ir.model.fields,help:exp_asset_custody.field_account_asset_multi_operation__activity_state
+#: model:ir.model.fields,help:exp_asset_custody.field_account_asset_operation__activity_state
+msgid ""
+"Status based on activities\n"
+"Overdue: Due date is already passed\n"
+"Today: Activity date is today\n"
+"Planned: Future activities."
+msgstr "الأنشطة المستقبيلة"
+
+#. module: exp_asset_custody
+#: model:ir.model.fields.selection,name:exp_asset_custody.selection__account_asset_operation__state__submit
+#: model_terms:ir.ui.view,arch_db:exp_asset_custody.view_account_asset_assignment_tree
+#: model_terms:ir.ui.view,arch_db:exp_asset_custody.view_account_asset_operation_form
+msgid "Submit"
+msgstr "إرسال"
+
+#. module: exp_asset_custody
+#: model:ir.model.fields.selection,name:exp_asset_custody.selection__account_asset__custody_period__temporary
+#: model:ir.model.fields.selection,name:exp_asset_custody.selection__account_asset_operation__custody_period__temporary
+msgid "Temporary"
+msgstr "مؤقتة"
+
+#. module: exp_asset_custody
+#: code:addons/exp_asset_custody/models/account_asset.py:0
+#, python-format
+msgid "The period of %s is finished %s."
+msgstr "فترة %s قد إنتهت %s."
+
+#. module: exp_asset_custody
+#: model:ir.model.fields.selection,name:exp_asset_custody.selection__account_asset_multi_operation__type__transfer
+#: model:ir.model.fields.selection,name:exp_asset_custody.selection__account_asset_operation__type__transfer
+#: model:ir.ui.menu,name:exp_asset_custody.menu_account_asset_transfer
+#: model:ir.ui.menu,name:exp_asset_custody.menu_account_multi_asset_transfer
+msgid "Transfer"
+msgstr "نقل"
+
+#. module: exp_asset_custody
+#: model:ir.model.fields,field_description:exp_asset_custody.field_account_asset_adjustment__type
+#: model:ir.model.fields,field_description:exp_asset_custody.field_account_asset_multi_operation__type
+#: model:ir.model.fields,field_description:exp_asset_custody.field_account_asset_operation__type
+#: model_terms:ir.ui.view,arch_db:exp_asset_custody.view_account_asset_operation_search
+msgid "Type"
+msgstr "النوع"
+
+#. module: exp_asset_custody
+#: model:ir.model.fields,help:exp_asset_custody.field_account_asset_multi_operation__activity_exception_decoration
+#: model:ir.model.fields,help:exp_asset_custody.field_account_asset_operation__activity_exception_decoration
+msgid "Type of the exception activity on record."
+msgstr "نوع النشاط الاستثنائي المسجل."
+
+#. module: exp_asset_custody
+#: model_terms:ir.ui.view,arch_db:exp_asset_custody.asset_adjustment_report
+msgid "Type:"
+msgstr "النوع:"
+
+#. module: exp_asset_custody
+#: model:ir.model.fields,field_description:exp_asset_custody.field_account_asset_multi_operation__message_unread
+#: model:ir.model.fields,field_description:exp_asset_custody.field_account_asset_operation__message_unread
+msgid "Unread Messages"
+msgstr "الرسائل الجديدة"
+
+#. module: exp_asset_custody
+#: model:ir.model.fields,field_description:exp_asset_custody.field_account_asset_multi_operation__message_unread_counter
+#: model:ir.model.fields,field_description:exp_asset_custody.field_account_asset_operation__message_unread_counter
+msgid "Unread Messages Counter"
+msgstr "عدد الرسائل الجديدة"
+
+#. module: exp_asset_custody
+#: model:ir.model.fields,help:exp_asset_custody.field_account_asset_multi_operation___barcode_scanned
+msgid "Value of the last barcode scanned."
+msgstr "قيمة آخر باركود ممسوح ضوئيًا."
+
+#. module: exp_asset_custody
+#: model:ir.model.fields,field_description:exp_asset_custody.field_account_asset_multi_operation__website_message_ids
+#: model:ir.model.fields,field_description:exp_asset_custody.field_account_asset_operation__website_message_ids
+msgid "Website Messages"
+msgstr "رسائل الموقع"
+
+#. module: exp_asset_custody
+#: model:ir.model.fields,help:exp_asset_custody.field_account_asset_multi_operation__website_message_ids
+#: model:ir.model.fields,help:exp_asset_custody.field_account_asset_operation__website_message_ids
+msgid "Website communication history"
+msgstr "سجل تواصل الموقع"
+
+#. module: exp_asset_custody
+#: code:addons/exp_asset_custody/models/account_asset_multi_operation.py:0
+#, python-format
+msgid "You can not confirm operation without lines."
+msgstr "لا يمكن تأكيد العملية دون إدخال التفاصيل"
+
+#. module: exp_asset_custody
+#: model:ir.model,name:exp_asset_custody.model_account_asset_operation
+msgid "account.asset.operation"
+msgstr ""
diff --git a/dev_odex30_accounting/exp_asset_custody/models/__init__.py b/dev_odex30_accounting/exp_asset_custody/models/__init__.py
new file mode 100644
index 0000000..0cdea78
--- /dev/null
+++ b/dev_odex30_accounting/exp_asset_custody/models/__init__.py
@@ -0,0 +1,7 @@
+# -*- coding: utf-8 -*-
+# © Copyright (C) 2021 Expert Co. Ltd(<http:/www.exp-sa.com>)
+
+from . import account_asset
+from . import account_asset_operation
+from . import account_asset_adjustment
+from . import account_asset_multi_operation
\ No newline at end of file
diff --git a/dev_odex30_accounting/exp_asset_custody/models/__pycache__/__init__.cpython-311.pyc b/dev_odex30_accounting/exp_asset_custody/models/__pycache__/__init__.cpython-311.pyc
new file mode 100644
index 0000000..94d25a7
Binary files /dev/null and b/dev_odex30_accounting/exp_asset_custody/models/__pycache__/__init__.cpython-311.pyc differ
diff --git a/dev_odex30_accounting/exp_asset_custody/models/__pycache__/account_asset.cpython-311.pyc b/dev_odex30_accounting/exp_asset_custody/models/__pycache__/account_asset.cpython-311.pyc
new file mode 100644
index 0000000..549c2da
Binary files /dev/null and b/dev_odex30_accounting/exp_asset_custody/models/__pycache__/account_asset.cpython-311.pyc differ
diff --git a/dev_odex30_accounting/exp_asset_custody/models/__pycache__/account_asset_adjustment.cpython-311.pyc b/dev_odex30_accounting/exp_asset_custody/models/__pycache__/account_asset_adjustment.cpython-311.pyc
new file mode 100644
index 0000000..c48e013
Binary files /dev/null and b/dev_odex30_accounting/exp_asset_custody/models/__pycache__/account_asset_adjustment.cpython-311.pyc differ
diff --git a/dev_odex30_accounting/exp_asset_custody/models/__pycache__/account_asset_multi_operation.cpython-311.pyc b/dev_odex30_accounting/exp_asset_custody/models/__pycache__/account_asset_multi_operation.cpython-311.pyc
new file mode 100644
index 0000000..2cadc16
Binary files /dev/null and b/dev_odex30_accounting/exp_asset_custody/models/__pycache__/account_asset_multi_operation.cpython-311.pyc differ
diff --git a/dev_odex30_accounting/exp_asset_custody/models/__pycache__/account_asset_operation.cpython-311.pyc b/dev_odex30_accounting/exp_asset_custody/models/__pycache__/account_asset_operation.cpython-311.pyc
new file mode 100644
index 0000000..5749f40
Binary files /dev/null and b/dev_odex30_accounting/exp_asset_custody/models/__pycache__/account_asset_operation.cpython-311.pyc differ
diff --git a/dev_odex30_accounting/exp_asset_custody/models/account_asset.py b/dev_odex30_accounting/exp_asset_custody/models/account_asset.py
new file mode 100644
index 0000000..546e3cc
--- /dev/null
+++ b/dev_odex30_accounting/exp_asset_custody/models/account_asset.py
@@ -0,0 +1,67 @@
+# -*- coding: utf-8 -*-
+# © Copyright (C) 2021 Expert Co. Ltd(<http:/www.exp-sa.com>)
+
+from odoo import models, fields, api, _
+
+
+class AccountAssetAsset(models.Model):
+    _inherit = 'account.asset'
+
+    custody_type = fields.Selection(
+        selection=[('personal', 'Personal'), ('general', 'General')],
+    )
+    custody_period = fields.Selection(
+        selection=[('temporary', 'Temporary'), ('permanent', 'Permanent')],
+    )
+    purpose = fields.Html()
+    return_date = fields.Date()
+    department_id = fields.Many2one(
+        comodel_name='hr.department',
+        string='Current Department'
+    )
+    employee_id = fields.Many2one(
+        comodel_name='hr.employee',
+        string='Current Employee'
+    )
+    status = fields.Selection(
+        selection_add=[('reserved', 'Reserved'), ('assigned', 'Assigned'), ('scrap', 'Scrap')]
+    )
+    asset_operation_count = fields.Integer(
+        compute='_asset_operation_count',
+        string='# Done Operations',
+        help="Number of done asset operations"
+    )
+
+    def _asset_operation_count(self):
+        for asset in self:
+            asset.asset_operation_count = len(
+                self.env['account.asset.operation'].search([('asset_id', '=', asset.id), ('state', '=', 'done')]))
+
+    def open_asset_operation(self):
+        return {
+            'name': _('Asset Operations'),
+            'view_type': 'form',
+            'view_mode': 'tree,form',
+            'res_model': 'account.asset.operation',
+            'type': 'ir.actions.act_window',
+            'domain': [('asset_id', '=', self.id)],
+            'view_id': self.env.ref('exp_asset_custody.view_account_asset_operation_tree').id,
+            'views': [(self.env.ref('exp_asset_custody.view_account_asset_operation_tree').id, 'tree'),
+                      (self.env.ref('exp_asset_custody.view_account_asset_operation_form').id, 'form')],
+            'context': {'active_model': False, 'search_default_done': True},
+            'flags': {'search_view': True, 'action_buttons': False},
+        }
+
+    @api.model
+    def _asset_cron(self):
+        super(AccountAssetAsset, self)._asset_cron()
+        today = fields.Date.today()
+        for asset in self.search([('return_date', '=', today)]):
+            self.env['mail.activity'].sudo().create({
+                'res_model_id': self.env.ref('account_asset.model_account_asset_asset').id,
+                'res_id': asset.id,
+                'user_id': asset.responsible_user_id.id,
+                'activity_type_id': self.env.ref('mail.mail_activity_data_todo').id,
+                'summary': _('The period of %s is finished %s.') % (asset.name, asset.return_date),
+                'date_deadline': asset.return_date,
+            })
diff --git a/dev_odex30_accounting/exp_asset_custody/models/account_asset_adjustment.py b/dev_odex30_accounting/exp_asset_custody/models/account_asset_adjustment.py
new file mode 100644
index 0000000..3978758
--- /dev/null
+++ b/dev_odex30_accounting/exp_asset_custody/models/account_asset_adjustment.py
@@ -0,0 +1,44 @@
+# -*- coding: utf-8 -*-
+# © Copyright (C) 2021 Expert Co. Ltd(<http:/www.exp-sa.com>)
+
+from odoo import api, fields, models, exceptions,  _
+
+
+class AccountAssetAdjustment(models.Model):
+    _inherit = 'account.asset.adjustment'
+
+    type = fields.Selection(
+        selection_add=[('department', 'By Department'),
+                       ('employee', 'By Employee'),
+                       ('location', 'By Location')],
+        states={'draft': [('readonly', False)]},
+        readonly=True,
+    )
+    department_id = fields.Many2one(
+        comodel_name='hr.department',
+        states={'draft': [('readonly', False)]},
+        readonly=True,
+    )
+    employee_id = fields.Many2one(
+        comodel_name='hr.employee',
+        states={'draft': [('readonly', False)]},
+        readonly=True,
+    )
+    location_id = fields.Many2one(
+        comodel_name='account.asset.location',
+        states={'draft': [('readonly', False)]},
+        readonly=True,
+    )
+
+    def build_domain(self):
+        return self.type == 'employee' and [('employee_id', '=', self.employee_id.id)] or \
+               (self.type == 'department' and [('department_id', '=', self.department_id.id)]) or \
+               (self.type == 'location' and [('location_id', '=', self.location_id.id)]) or \
+               super(AccountAssetAdjustment, self).build_domain()
+
+    @api.onchange('type')
+    def onchange_type(self):
+        self.employee_id = False
+        self.department_id = False
+        self.location_id = False
+        super(AccountAssetAdjustment, self).onchange_type()
diff --git a/dev_odex30_accounting/exp_asset_custody/models/account_asset_multi_operation.py b/dev_odex30_accounting/exp_asset_custody/models/account_asset_multi_operation.py
new file mode 100644
index 0000000..2d45e74
--- /dev/null
+++ b/dev_odex30_accounting/exp_asset_custody/models/account_asset_multi_operation.py
@@ -0,0 +1,150 @@
+# -*- coding: utf-8 -*-
+# © Copyright (C) 2021 Expert Co. Ltd(<http:/www.exp-sa.com>)
+
+from odoo import models, fields, api, exceptions, _
+
+class AccountAssetMultiOperation(models.Model):
+    _name = 'account.asset.multi.operation'
+    _description = 'Asset Multi Operation'
+    _inherit = ['mail.thread', 'mail.activity.mixin', 'barcodes.barcode_events_mixin']
+
+    name = fields.Char(
+        states={'draft': [('readonly', False)]},
+        default='/', readonly=True
+    )
+    date = fields.Date(
+        default=fields.Date.context_today,
+        index=True, copy=False, readonly=True, required=True,
+        states={'draft': [('readonly', False)]}
+    )
+    type = fields.Selection(
+        selection=[('assignment', 'Assignment'),
+                   ('release', 'Release'),
+                   ('transfer', 'Transfer')],
+        states={'draft': [('readonly', False)]},
+        readonly=True, required=True
+    )
+    barcode = fields.Char(
+        states={'in_progress': [('readonly', False)]},
+        readonly=True,
+    )
+    responsible_user_id = fields.Many2one(
+        comodel_name='res.users',
+        default=lambda self: self.env.user,
+        states={'draft': [('readonly', False)]},
+        readonly=True, required=True
+    )
+    responsible_department_id = fields.Many2one(
+        comodel_name='hr.department',
+    )
+    new_employee_id = fields.Many2one(
+        comodel_name='hr.employee',
+        states={'draft': [('readonly', False)]},
+        readonly=True, string='Employee',
+    )
+    new_department_id = fields.Many2one(
+        comodel_name='hr.department',
+        states={'draft': [('readonly', False)]},
+        readonly=True, string='Department',
+    )
+    new_location_id = fields.Many2one(
+        comodel_name='account.asset.location',
+        states={'draft': [('readonly', False)]},
+        readonly=True, string='Location',
+    )
+    manual = fields.Boolean()
+    note = fields.Text(
+        states={'draft': [('readonly', False)]},
+        readonly=True, required=True
+    )
+    state = fields.Selection(
+        selection=[('draft', 'Draft'),
+                   ('in_progress', 'In Progress'),
+                   ('done', 'Done'),
+                   ('cancel', 'Cancel')],
+        required=True, default='draft'
+    )
+    operation_ids = fields.One2many(
+        'account.asset.operation', 'multi_operation_id',
+        states={'in_progress': [('readonly', False)]},
+        readonly=False,
+    )
+
+    @api.model
+    def create(self, values):
+        values['name'] = self.env['ir.sequence'].with_context(
+            ir_sequence_date=values['date']).next_by_code('asset.multi.operation.seq')
+        return super(AccountAssetMultiOperation, self).create(values)
+
+    def act_progress(self):
+        self.state = 'in_progress'
+
+    def act_confirm(self):
+        if not self.operation_ids:
+            raise exceptions.Warning(_('You can not confirm operation without lines.'))
+        for opt in self.operation_ids:
+            self.check_required_fields(opt)
+            opt.act_confirm()
+        self.state = 'done'
+
+    def act_reject(self):
+        self.state = 'cancel'
+
+    def act_draft(self):
+        self.state = 'draft'
+
+    def get_asset_domain(self):
+        if self.type == 'assignment':
+            return [('status', 'in', ['new','available'])]
+        elif self.type in ['transfer', 'release']:
+            return [('status', 'in', ['assigned'])]
+        return [('status', 'in', ['new', 'available', 'assigned', 'scrap'])]
+
+    @api.onchange('new_employee_id')
+    def onchange_new_employee(self):
+        self.new_department_id = self.new_employee_id.department_id.id
+
+    @api.onchange('barcode')
+    def onchange_barcode(self):
+        self.on_barcode_scanned(self.barcode)
+
+    def on_barcode_scanned(self, barcode):
+        if barcode:
+            operation_vals = self.get_operation_vals()
+            domain = self.get_asset_domain()
+            assets = self.barcode and self.env['account.asset'].search(domain + [('barcode', '=', barcode)])
+            self.barcode = False
+            if not assets:
+                raise exceptions.Warning(_('No asset found with the selected barcode'))
+            for s in assets:
+                operation_vals.update({
+                    'asset_id': s.id,
+                    'current_employee_id': s.employee_id.id,
+                    'current_department_id': s.department_id.id,
+                    'current_location_id': s.location_id.id,
+                    #'state': 'submit',
+                })
+            self.operation_ids = [(0, 0, operation_vals)]
+
+    def get_operation_vals(self):
+        return {
+            'state': 'draft',
+            'type': self.type,
+            'date': self.date,
+            'note': self.note,
+            'multi_operation_id': self.id,
+            'user_id': self.responsible_user_id.id,
+            'new_employee_id': self.new_employee_id.id,
+            'new_department_id': self.new_department_id.id,
+            'new_location_id': self.new_location_id.id,
+        }
+
+    def check_required_fields(self, operation):
+        if not operation.asset_id:
+            raise exceptions.Warning(_('Make sure you choose an asset in all operation line.'))
+        elif not operation.return_date and operation.custody_period == 'temporary':
+            raise exceptions.Warning(_('Make sure you enter the return date for all temporary custodies.'))
+        elif not operation.custody_type and operation.type in ['assignment', 'transfer']:
+            raise exceptions.Warning(_('Make sure you choose custody type for all operation lines.'))
+        elif not operation.custody_period and operation.type in ['assignment', 'transfer']:
+            raise exceptions.Warning(_('Make sure you choose custody period for all operation lines.'))
\ No newline at end of file
diff --git a/dev_odex30_accounting/exp_asset_custody/models/account_asset_operation.py b/dev_odex30_accounting/exp_asset_custody/models/account_asset_operation.py
new file mode 100644
index 0000000..8cca74d
--- /dev/null
+++ b/dev_odex30_accounting/exp_asset_custody/models/account_asset_operation.py
@@ -0,0 +1,150 @@
+# -*- coding: utf-8 -*-
+# © Copyright (C) 2021 Expert Co. Ltd(<http:/www.exp-sa.com>)
+
+from odoo import models, fields, api, exceptions, _
+
+
+class AccountAssetOperation(models.Model):
+    _name = 'account.asset.operation'
+    _description = 'Asset Operation'
+    _inherit = ['mail.thread', 'mail.activity.mixin']
+
+    multi_operation_id = fields.Many2one(comodel_name='account.asset.multi.operation')
+    name = fields.Char(required=True, default='/')
+    type = fields.Selection(selection=[('assignment', 'Assignment'), ('release', 'Release'),
+                                       ('transfer', 'Transfer')], required=True)
+    date = fields.Date(default=fields.Date.context_today, index=True, copy=False, readonly=True, required=True,
+                       states={'draft': [('readonly', False)]})
+    user_id = fields.Many2one(comodel_name='res.users',default=lambda self: self.env.user,
+                              states={'draft': [('readonly', False)]},string='Responsible',readonly=True)
+    asset_id = fields.Many2one(comodel_name='account.asset')
+    statea = fields.Selection(related='asset_id.status')
+    barcode = fields.Char(compute="_compute_related_fields", store=True)
+    department_id = fields.Many2one(comodel_name='hr.department',string='Responsible Department',
+                                    compute="_compute_related_fields", store=True)
+    model_id = fields.Many2one(comodel_name='account.asset',compute="_compute_related_fields",store=True)
+    state = fields.Selection(selection=[('draft', 'Draft'),('submit', 'Submit'),('done', 'Done'),('pending', 'Pending')
+                                        ,('cancel', 'Cancel')],required=True, default='draft')
+    note = fields.Text(states={'draft': [('readonly', False)]},readonly=True,)
+    # Asset Custody Operation
+    custody_type = fields.Selection(selection=[('personal', 'Personal'), ('general', 'General')],
+                                    states={'draft': [('readonly', False)]},readonly=True,)
+    custody_period = fields.Selection(selection=[('temporary', 'Temporary'), ('permanent', 'Permanent')],
+                                      states={'draft': [('readonly', False)]},readonly=True)
+    return_date = fields.Date(states={'draft': [('readonly', False)]},readonly=True)
+    current_employee_id = fields.Many2one(comodel_name='hr.employee',
+                                          states={'draft': [('readonly', False)]},readonly=True, string='Employee')
+    current_department_id = fields.Many2one(comodel_name='hr.department',states={'draft': [('readonly', False)]},
+                                            readonly=True, string='Department', )
+    current_location_id = fields.Many2one(comodel_name='account.asset.location',states={'draft': [('readonly', False)]},
+                                          readonly=True, string='Location')
+    new_employee_id = fields.Many2one(comodel_name='hr.employee', string='Employee')
+    new_department_id = fields.Many2one(comodel_name='hr.department', string='Department', )
+    new_location_id = fields.Many2one(comodel_name='account.asset.location', string='Location')
+    amount = fields.Float(states={'draft': [('readonly', False)]}, readonly=True, )
+    asset_status = fields.Selection(selection=[('good', 'Good'), ('scrap', 'Scrap')],
+                                    states={'draft': [('readonly', False)]}, readonly=True, )
+    asset_statuso = fields.Selection(related='asset_id.status')
+    asset_status2  = fields.Many2one(
+        comodel_name='asset.states',
+        string='Asset Status',states={'draft': [('readonly', False)]})
+    product_id = fields.Many2one(comodel_name='product.product',
+                                 domain=[('property_account_expense_id.can_create_asset', '=', True),
+                                         ('property_account_expense_id.user_type_id.internal_group', '=', 'asset')],
+                                 states={'draft': [('readonly', False)]}, readonly=True)
+
+    def action_read_operation(self):
+        self.ensure_one()
+        return {
+            'name': self.display_name,
+            'type': 'ir.actions.act_window',
+            'view_type': 'form',
+            'view_mode': 'form',
+            'res_model': 'account.asset.operation',
+            'res_id': self.id,
+        }
+
+    @api.depends('asset_id', 'asset_id.model_id', 'asset_id.responsible_dept_id', 'asset_id.barcode')
+    def _compute_related_fields(self):
+        for operation in self:
+            operation.barcode = operation.asset_id.barcode
+            operation.model_id = operation.asset_id.model_id.id
+            operation.department_id = operation.asset_id.responsible_dept_id.id
+
+    @api.model
+    def create(self, values):
+        values['name'] = self.env['ir.sequence'].with_context(
+            ir_sequence_date=values['date']).next_by_code('asset.operation.seq')
+        return super(AccountAssetOperation, self).create(values)
+
+    def unlink(self):
+        if self.search([('state', '!=', 'draft'), ('id', 'in', self.ids)]):
+            raise exceptions.Warning(_('Only draft operations can be deleted.'))
+        return super(AccountAssetOperation, self).unlink()
+
+    @api.model
+    def _get_tracked_fields(self):
+        fields = self.fields_get()
+        dels = [f for f in fields if f in models.LOG_ACCESS_COLUMNS or f.startswith('_') or f == 'id']
+        for x in dels:
+            del fields[x]
+        return set(fields)
+
+    @api.onchange('new_employee_id')
+    def onchange_new_employee(self):
+        self.new_department_id = self.new_employee_id.department_id.id
+
+    @api.onchange('asset_id')
+    def onchange_asset(self):
+        self.current_employee_id = self.asset_id.employee_id.id
+        self.current_department_id = self.asset_id.department_id.id
+        self.current_location_id = self.asset_id.location_id.id
+
+    def act_submit(self):
+        self.state = 'submit'
+
+    def act_confirm(self):
+        if not self.asset_id:
+            raise exceptions.Warning(_('Asset is required to confirm this operation.'))
+        if self.type in ('assignment', 'release', 'transfer'):
+            self.custody_confirm()
+        self.state = 'done'
+
+    def act_reject(self):
+        self.state = 'pending'
+
+    def act_cancel(self):
+        self.state = 'cancel'
+
+    def act_draft(self):
+        self.state = 'draft'
+
+    def custody_confirm(self):
+        self.asset_id.employee_id = self.new_employee_id.id
+        self.asset_id.department_id = self.new_department_id.id
+        self.asset_id.location_id = self.new_location_id.id
+        self.asset_id.custody_type = self.custody_type
+        self.asset_id.custody_period = self.custody_period
+        self.asset_id.return_date = self.return_date
+        self.asset_id.purpose = self.note
+        if self.type == 'assignment':
+            self.asset_id.status = 'assigned'
+        elif self.type == 'release':
+            self.asset_id.status = 'available'
+
+
+"""
+    def sell_dispose_confirm(self):
+        super(AccountAssetOperation, self).sell_dispose_confirm()
+        self.asset_id.custody_type = False
+        self.asset_id.custody_period = False
+        self.asset_id.purpose = False
+        self.asset_id.return_date = False
+        self.asset_id.department_id = False
+        self.asset_id.employee_id = False
+        self.asset_id.location_id = False
+        self.asset_id.status = False
+    """
+class AccountAssestatus(models.Model):
+    _name = 'asset.states'
+    name = fields.Char(string='Name')
diff --git a/dev_odex30_accounting/exp_asset_custody/reports/asset_adjustment_report.xml b/dev_odex30_accounting/exp_asset_custody/reports/asset_adjustment_report.xml
new file mode 100644
index 0000000..a73e10d
--- /dev/null
+++ b/dev_odex30_accounting/exp_asset_custody/reports/asset_adjustment_report.xml
@@ -0,0 +1,232 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<odoo>
+    <template id="asset_adjustment_report">
+        <t t-call="web.html_container">
+            <t t-foreach="docs" t-as="doc">
+                <t t-call="web.html_container">
+                    <t t-call="web.external_layout">
+                        <t t-set="total_debit" t-value="0"/>
+                        <t t-set="total_credit" t-value="0"/>
+                        <t t-set="o" t-value="doc"/>
+                        <div class="page" style="font-size: 12pt !important;">
+                            <center>
+                                <h3>
+                                    Assets Adjustment Report
+                                </h3>
+                            </center>
+                            <br/>
+                            <br/>
+                            <br/>
+                            <table class="borderless" style="width: 100%;">
+                                <tr>
+                                    <td  style="width:15%;">
+                                        <p style="font-weight: bold !important;">Description:</p>
+                                    </td>
+                                    <td>
+                                        <span t-field="o.name"/>
+                                    </td>
+                                    <td style="width:15%;">
+                                        <p style="font-weight: bold !important;">Date:</p></td>
+                                    <td>
+                                        <span t-field="o.date"/>
+                                    </td>
+                                </tr>
+                                <tr>
+                                    <td style="width:15%;">
+                                        <p style="font-weight: bold !important;">Type:</p></td>
+                                    <td>
+                                        <span t-field="o.type"/>
+                                    </td>
+                                </tr>
+                            </table>
+                            <br/>
+                            <br/>
+                            <table style="width:100%;">
+                                <thead>
+                                    <tr>
+                                        <th>Asset</th>
+                                        <th>Barcode</th>
+                                        <th>Serial No</th>
+                                        <th>Location</th>
+                                        <th>Department</th>
+                                        <th>Employee</th>
+                                        <th>Status</th>
+                                    </tr>
+                                </thead>
+                                <tbody>
+                                    <tr t-foreach="o.adjustment_line_ids.filtered(lambda r: r.exist == True)" t-as="l">
+                                        <td>
+                                            <span t-field="l.asset_id.name"/>
+                                        </td>
+                                        <td>
+                                            <span t-field="l.barcode"/>
+                                        </td>
+                                        <td>
+                                            <span t-field="l.serial_no"/>
+                                        </td>
+                                        <td>
+                                            <span t-field="l.asset_id.location_id.name"/>
+                                        </td>
+                                        <td>
+                                            <span t-field="l.asset_id.department_id.name"/>
+                                        </td>
+                                        <td>
+                                            <span t-field="l.asset_id.employee_id.name"/>
+                                        </td>
+                                        <td>
+                                            <span t-field="l.asset_status"/>
+                                        </td>
+                                    </tr>
+                                </tbody>
+                            </table>
+                            <br/>
+                            <p>
+                                <h4>Missing Assets:</h4>
+                            </p>
+                            <table style="width:100%;">
+                                <thead>
+                                    <tr>
+                                        <th>Asset</th>
+                                        <th>Barcode</th>
+                                        <th>Serial No</th>
+                                        <th>Location</th>
+                                        <th>Department</th>
+                                        <th>Employee</th>
+                                        <th>Status</th>
+                                    </tr>
+                                </thead>
+                                <tbody>
+                                    <tr t-foreach="o.adjustment_line_ids.filtered(lambda r: r.exist == False)" t-as="l">
+                                        <td>
+                                            <span t-field="l.asset_id.name"/>
+                                        </td>
+                                        <td>
+                                            <span t-field="l.barcode"/>
+                                        </td>
+                                        <td>
+                                            <span t-field="l.serial_no"/>
+                                        </td>
+                                        <td>
+                                            <span t-field="l.asset_id.location_id.name"/>
+                                        </td>
+                                        <td>
+                                            <span t-field="l.asset_id.department_id.name"/>
+                                        </td>
+                                        <td>
+                                            <span t-field="l.asset_id.employee_id.name"/>
+                                        </td>
+                                        <td>
+                                            <span t-field="l.asset_status"/>
+                                        </td>
+                                    </tr>
+                                </tbody>
+                            </table>
+                            <br/>
+                            <p>
+                                <h4>Signatures:</h4>
+                            </p>
+                            <table style="width:100%;height:200px;">
+                                <tr>
+                                    <td>
+                                        <span/>
+                                    </td>
+                                    <td>
+                                        <span/>
+                                    </td>
+                                </tr>
+                                <tr>
+                                    <td>
+                                        <span/>
+                                    </td>
+                                    <td>
+                                        <span/>
+                                    </td>
+                                </tr>
+                                <tr>
+                                    <td>
+                                        <span/>
+                                    </td>
+                                    <td>
+                                        <span/>
+                                    </td>
+                                </tr>
+                                <tr>
+                                    <td>
+                                        <span/>
+                                    </td>
+                                    <td>
+                                        <span/>
+                                    </td>
+                                </tr>
+                                <tr>
+                                    <td>
+                                        <span/>
+                                    </td>
+                                    <td>
+                                        <span/>
+                                    </td>
+                                </tr>
+                                <tr>
+                                    <td>
+                                        <span/>
+                                    </td>
+                                    <td>
+                                        <span/>
+                                    </td>
+                                </tr>
+                                <tr>
+                                    <td>
+                                        <span/>
+                                    </td>
+                                    <td>
+                                        <span/>
+                                    </td>
+                                </tr>
+                            </table>
+                            <style>
+                                @font-face {
+                                font-family: 'ae_AlMohanad';
+                                src: local('ae_AlMohanad'), local('ae_AlMohanad'),
+                                url('/account_gl_custom/static/fonts/ae_AlMohanad.ttf') format('truetype');
+                                }
+                                *{
+                                font-family: ae_AlMohanad;
+                                }
+                                table {
+                                border-collapse: collapse;
+                                }
+                                table{
+                                border: 1px solid black;
+                                }
+                                td{
+                                border: 1px solid grey;
+                                padding: 5px 5px 5px 5px;
+                                }
+                                th{
+                                border: 1px solid grey;
+                                padding: 5px 5px 5px 5px;
+                                font-weight: bold;
+                                text-align:center;
+                                background-color: #f5f5f5;
+                                }
+                                table.borderless,table.borderless td,table.borderless tr{
+                                border: none !important;
+                                }
+
+                            </style>
+                        </div>
+                    </t>
+                </t>
+            </t>
+        </t>
+    </template>
+    <report id="action_asset_adjustment_report"
+            model="account.asset.adjustment"
+            string="Asset Adjustment"
+            report_type="qweb-pdf"
+            name="exp_asset_custody.asset_adjustment_report"
+            file="exp_asset_custody.asset_adjustment_report"
+            paperformat="base.paperformat_euro"
+            attachment_use="False"
+    />
+</odoo>
\ No newline at end of file
diff --git a/dev_odex30_accounting/exp_asset_custody/security/ir.model.access.csv b/dev_odex30_accounting/exp_asset_custody/security/ir.model.access.csv
new file mode 100644
index 0000000..9e08178
--- /dev/null
+++ b/dev_odex30_accounting/exp_asset_custody/security/ir.model.access.csv
@@ -0,0 +1,6 @@
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_asset_operation,account.asset.operation,model_account_asset_operation,account.group_account_readonly,1,0,0,0
+access_asset_operation_manager,account.asset.operation,model_account_asset_operation,account.group_account_manager,1,1,1,1
+access_asset_multi_operation,account.asset.multi.operation,model_account_asset_multi_operation,account.group_account_readonly,1,0,0,0
+access_asset_multi_operation_manager,account.asset.multi.operation,model_account_asset_multi_operation,account.group_account_manager,1,1,1,1
+access_asset_state_operation_manager,account.state.multi.operation,model_asset_states,,1,1,1,1
\ No newline at end of file
diff --git a/dev_odex30_accounting/exp_asset_custody/static/description/icon.png b/dev_odex30_accounting/exp_asset_custody/static/description/icon.png
new file mode 100644
index 0000000..4141f52
Binary files /dev/null and b/dev_odex30_accounting/exp_asset_custody/static/description/icon.png differ
diff --git a/dev_odex30_accounting/exp_asset_custody/views/account_asset_adjustment_view.xml b/dev_odex30_accounting/exp_asset_custody/views/account_asset_adjustment_view.xml
new file mode 100644
index 0000000..74b7a95
--- /dev/null
+++ b/dev_odex30_accounting/exp_asset_custody/views/account_asset_adjustment_view.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <record model="ir.ui.view" id="asset_adjustment_form">
+        <field name="name">account.asset.adjustment.form</field>
+        <field name="model">account.asset.adjustment</field>
+        <field name="inherit_id" ref="exp_asset_base.asset_adjustment_form"/>
+        <field name="arch" type="xml">
+            <field name="model_id" position="after">
+                <field name="department_id"
+                       invisible="type != 'department'"
+                       required="type != 'department'"/>
+                <field name="employee_id"
+                       invisible="type != 'employee'"
+                       required="type == 'employee'"/>
+                <field name="location_id"
+                       invisible="type != 'location'"
+                       required="type == 'location'"
+
+                      />
+            </field>
+        </field>
+    </record>
+</odoo>
\ No newline at end of file
diff --git a/dev_odex30_accounting/exp_asset_custody/views/account_asset_custody_multi_operation.xml b/dev_odex30_accounting/exp_asset_custody/views/account_asset_custody_multi_operation.xml
new file mode 100644
index 0000000..bb94bfb
--- /dev/null
+++ b/dev_odex30_accounting/exp_asset_custody/views/account_asset_custody_multi_operation.xml
@@ -0,0 +1,274 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<odoo>
+        <!-- Asset Custody Multi Operation -->
+    <record model="ir.ui.view" id="view_account_asset_multi_operation_tree">
+        <field name="name">account.asset.multi.operation.tree</field>
+        <field name="model">account.asset.multi.operation</field>
+        <field name="arch" type="xml">
+            <list>
+                <field name="name"/>
+                <field name="date"/>
+                <field name="type"/>
+                <field name="responsible_user_id"/>
+                <field name="note"/>
+                <field name="state"/>
+            </list>
+        </field>
+    </record>
+
+    <record model="ir.ui.view" id="view_account_asset_multi_assignment_form">
+        <field name="name">account.asset.multi.assignment.form</field>
+        <field name="model">account.asset.multi.operation</field>
+        <field name="arch" type="xml">
+            <form duplicate="0">
+                <header>
+
+                    <button name="act_progress" invisible="state != 'draft'"  string="Start" type="object" class="oe_highlight"/>
+                    <button name="act_confirm"  groups='exp_asset_base.group_assets_manager' invisible="state != 'in_progress'"  string="Confirm" type="object"
+                            class="oe_highlight"/>
+                    <button name="act_reject" groups="exp_asset_base.group_assets_manager" invisible="state != 'in_progress'"  string="Reject" type="object"/>
+                    <button name="act_draft" groups="exp_asset_base.group_assets_manager" invisible="state != 'cancel'" string="Set to Draft" type="object" class="oe_highlight"/>
+                    <field name="state" widget="statusbar" statusbar_visible="draft,in_progress,done"/>
+                </header>
+                <sheet>
+                    <div class="oe_title">
+                        <h1>
+                            <field name="barcode" nolabel="1" placeholder="Barcode..."/>
+                        </h1>
+                    </div>
+
+                    <group>
+                        <group>
+                            <field name="name" readonly="1"/>
+                            <field name="date"/>
+                            <field name="responsible_department_id" readonly="1"/>
+                            <field name="manual" readonly="1"/>
+                        </group>
+                        <group>
+                            <field name="type" invisible="1"/>
+                            <field name="responsible_user_id"/>
+                            <field name="note"/>
+
+                        </group>
+                    </group>
+                    <group string="Assignment Info">
+                        <group>
+                            <field name="new_location_id"/>
+                            <field name="new_employee_id"/>
+                            <field name="new_department_id"/>
+                        </group>
+                    </group>
+                    <notebook colspan="4">
+                        <page string="Assets Assignment">
+                            <field name="operation_ids" nolabel="1"
+                                   context="{'default_user_id':responsible_user_id, 'default_type':type, 'default_date':date,
+                                            'default_note':note, 'default_new_employee_id':new_employee_id,
+                                            'default_new_department_id':new_department_id, 'default_new_location_id':new_location_id}">
+                                <list editable="top">
+                                    <field name="asset_id" required="1"
+                                           domain="[('status', 'in', ['new','available']), ('asset_type', '=', 'purchase'),
+                                                   ('state', '!=', 'model'), ('parent_id', '=', False)]"/>
+                                     <field name="custody_type" required="1"/>
+                                    <field name="custody_period" required="1"/>
+                                    <field name="return_date"
+                                           readonly="custody_period != 'temporary'"
+                                           required="custody_period == 'temporary'"/>
+                                    <field name="new_employee_id" invisible="1"/>
+                                    <field name="new_department_id" invisible="1"/>
+                                    <field name="new_location_id" invisible="1"/>
+                                    <field name="date" invisible="1"/>
+                                    <field name="type" invisible="1"/>
+                                    <field name="note" invisible="1"/>
+                                    <field name="user_id" invisible="1"/>
+                                    <field name="department_id" invisible="1"/>
+                                    <field name="state" invisible="1"/>
+                                </list>
+                            </field>
+                        </page>
+                    </notebook>
+                </sheet>
+                <chatter/>
+            </form>
+        </field>
+    </record>
+
+    <record model="ir.ui.view" id="view_account_asset_multi_release_form">
+        <field name="name">account.asset.multi.release.form</field>
+        <field name="model">account.asset.multi.operation</field>
+        <field name="arch" type="xml">
+            <form duplicate="0">
+                <header>
+                    <button name="act_progress" invisible="state != 'draft'" string="Start" type="object" class="oe_highlight"/>
+                    <button  groups="exp_asset_base.group_assets_manager" name="act_confirm"  invisible="state != 'in_progress'" string="Confirm" type="object"
+                            class="oe_highlight"/>
+                    <button groups="exp_asset_base.group_assets_manager" name="act_reject" invisible="state != 'in_progress'" string="Reject" type="object"/>
+                    <button groups="exp_asset_base.group_assets_manager" name="act_draft" invisible="state != 'cancel'" string="Set to Draft" type="object" class="oe_highlight"/>
+                    <field name="state" widget="statusbar" statusbar_visible="draft,in_progress,done"/>
+                </header>
+                <sheet>
+                    <div class="oe_title">
+                        <h1>
+                            <field name="_barcode_scanned" widget="barcode_handler"/>
+                            <field name="barcode" nolabel="1" placeholder="Barcode..."/>
+                        </h1>
+                    </div>
+
+                    <group>
+                        <group>
+                            <field name="name" readonly="1"/>
+                            <field name="date"/>
+                            <field name="responsible_department_id" readonly="1"/>
+                            <field name="manual" readonly="1"/>
+                        </group>
+                        <group>
+                            <field name="type" invisible="1"/>
+                            <field name="responsible_user_id"/>
+                            <field name="note"/>
+                        </group>
+                    </group>
+                    <group>
+                        <group string="Release Info">
+                            <field name="new_location_id" string="Release Location" required="1"/>
+                        </group>
+                    </group>
+                    <notebook colspan="4">
+                        <page string="Assets Release">
+                            <field name="operation_ids" nolabel="1"
+                                   context="{'default_user_id':responsible_user_id, 'default_type':type, 'default_date':date,
+                                            'default_note':note, 'default_new_location_id':new_location_id}">
+                                <list editable="top">
+                                    <field name="asset_id" required="1"
+                                           domain="[('status', 'in', ['assigned']), ('asset_type', '=', 'purchase'),
+                                                   ('state', '!=', 'model'), ('parent_id', '=', False)]"/>
+                                     <field name="current_employee_id"/>
+                                    <field name="current_department_id"/>
+                                    <field name="current_location_id"/>
+                                    <field name="asset_status2"/>
+                                    <field name="new_employee_id" invisible="1"/>
+                                    <field name="new_department_id" invisible="1"/>
+                                    <field name="new_location_id" invisible="1"/>
+                                    <field name="date" invisible="1"/>
+                                    <field name="type" invisible="1"/>
+                                    <field name="note" invisible="1"/>
+                                    <field name="user_id" invisible="1"/>
+                                    <field name="department_id" invisible="1"/>
+                                    <field name="state" invisible="1"/>
+                                </list>
+                            </field>
+                        </page>
+                    </notebook>
+                </sheet>
+                <chatter/>
+            </form>
+        </field>
+    </record>
+
+    <record model="ir.ui.view" id="view_account_asset_multi_transfer_form">
+        <field name="name">account.asset.multi.transfer.form</field>
+        <field name="model">account.asset.multi.operation</field>
+        <field name="arch" type="xml">
+            <form duplicate="0">
+                <header>
+                    <button name="act_progress" invisible="state != 'draft'" string="Start" type="object" class="oe_highlight"/>
+                    <button groups="exp_asset_base.group_assets_manager" name="act_confirm"  invisible="state != 'in_progress'" string="Confirm" type="object"
+                            class="oe_highlight"/>
+                    <button groups="exp_asset_base.group_assets_manager" name="act_reject" invisible="state != 'in_progress'" string="Reject" type="object"/>
+                    <button groups="exp_asset_base.group_assets_manager" name="act_draft"  invisible="state != 'cancel'" string="Set to Draft" type="object" class="oe_highlight"/>
+                    <field name="state" widget="statusbar" statusbar_visible="draft,in_progress,done"/>
+                </header>
+                <sheet>
+                    <div class="oe_title">
+                        <h1>
+                            <field name="barcode" nolabel="1" placeholder="Barcode..."/>
+                        </h1>
+                    </div>
+
+                    <group>
+                        <group>
+                            <field name="name" readonly="1"/>
+                            <field name="date"/>
+                            <field name="responsible_department_id" readonly="1"/>
+                            <field name="manual" readonly="1"/>
+                        </group>
+                        <group>
+                            <field name="type" invisible="1"/>
+                            <field name="responsible_user_id"/>
+                            <field name="note"/>
+
+                        </group>
+                    </group>
+                    <group invisible="type != 'transfer'" >
+                        <group string="New">
+                            <field name="new_employee_id"/>
+                            <field name="new_department_id"/>
+                            <field name="new_location_id"/>
+                        </group>
+                    </group>
+                    <notebook colspan="4">
+                        <page string="Assets Transfer">
+                            <field name="operation_ids" nolabel="1"
+                                   context="{'default_user_id':responsible_user_id, 'default_type':type, 'default_date':date,
+                                            'default_note':note, 'default_new_employee_id':new_employee_id,
+                                            'default_new_department_id':new_department_id, 'default_new_location_id':new_location_id}">
+                                <list editable="top">
+                                    <field name="asset_id" required="1"
+                                           domain="[('status', 'in', ['assigned']), ('asset_type', '=', 'purchase'),
+                                                   ('state', '!=', 'model'), ('parent_id', '=', False)]"/>
+                                    <field name="current_employee_id"/>
+                                    <field name="current_department_id"/>
+                                    <field name="current_location_id"/>
+                                    <field name="custody_type" required="1"/>
+                                    <field name="custody_period" required="1"/>
+                                    <field name="return_date"
+                                           required="custody_period == 'temporary'"
+                                           readonly="custody_period != 'temporary'"/>
+                                    <field name="new_employee_id" invisible="1"/>
+                                    <field name="new_department_id" invisible="1"/>
+                                    <field name="new_location_id" invisible="1"/>
+                                    <field name="date" invisible="1"/>
+                                    <field name="type" invisible="1"/>
+                                    <field name="note" invisible="1"/>
+                                    <field name="user_id" invisible="1"/>
+                                    <field name="department_id" invisible="1"/>
+                                    <field name="state" invisible="1"/>
+                                </list>
+                            </field>
+                        </page>
+                    </notebook>
+                </sheet>
+                <chatter/>
+            </form>
+        </field>
+    </record>
+
+    <record id="action_multi_asset_assignment" model="ir.actions.act_window">
+        <field name="name">Multiple Assignment</field>
+        <field name="res_model">account.asset.multi.operation</field>
+        <field name="view_mode">list,form</field>
+        <field name="context">{'default_manual':1, 'default_type':'assignment'}</field>
+        <field name="domain">[('type','=','assignment')]</field>
+        <field name="view_ids" eval="[(5, 0, 0),
+            (0, 0, {'view_mode': 'list'}),
+            (0, 0, {'view_mode': 'form', 'view_id': ref('view_account_asset_multi_assignment_form')})]"/>
+    </record>
+    <record id="action_multi_asset_release" model="ir.actions.act_window">
+        <field name="name">Multiple Release</field>
+        <field name="res_model">account.asset.multi.operation</field>
+        <field name="view_mode">list,form</field>
+        <field name="context">{'default_manual':1, 'default_type':'release'}</field>
+        <field name="domain">[('type','=','release')]</field>
+        <field name="view_ids" eval="[(5, 0, 0),
+            (0, 0, {'view_mode': 'list'}),
+            (0, 0, {'view_mode': 'form', 'view_id': ref('view_account_asset_multi_release_form')})]"/>
+    </record>
+    <record id="action_multi_asset_transfer" model="ir.actions.act_window">
+        <field name="name">Multiple Transfer</field>
+        <field name="res_model">account.asset.multi.operation</field>
+        <field name="view_mode">list,form</field>
+        <field name="context">{'default_manual':1, 'default_type':'transfer'}</field>
+        <field name="domain">[('type','=','transfer')]</field>
+        <field name="view_ids" eval="[(5, 0, 0),
+            (0, 0, {'view_mode': 'list'}),
+            (0, 0, {'view_mode': 'form', 'view_id': ref('view_account_asset_multi_transfer_form')})]"/>
+    </record>
+</odoo>
\ No newline at end of file
diff --git a/dev_odex30_accounting/exp_asset_custody/views/account_asset_custody_operation_view.xml b/dev_odex30_accounting/exp_asset_custody/views/account_asset_custody_operation_view.xml
new file mode 100644
index 0000000..13aa20f
--- /dev/null
+++ b/dev_odex30_accounting/exp_asset_custody/views/account_asset_custody_operation_view.xml
@@ -0,0 +1,337 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<odoo>
+
+    <!-- Asset Operations -->
+    <record id="view_account_asset_operation_search" model="ir.ui.view">
+        <field name="name">account.asset.operation.search</field>
+        <field name="model">account.asset.operation</field>
+        <field name="arch" type="xml">
+            <search string="Asset Account">
+                <field name="barcode"/>
+                <field name="asset_id"/>
+                <field name="model_id"/>
+                <field name="user_id"/>
+                <field name="department_id"/>
+                <field name="new_location_id"/>
+                <field name="new_employee_id"/>
+                <field name="new_department_id"/>
+                <field name="type"/>
+                <field name="date"/>
+                <field name="asset_statuso" invisible="1"/>
+                <filter string="Done" name="done" domain="[('state','=', 'done')]"
+                        help="Asset Operations in done state"/>
+                <group expand="0" string="Group By...">
+                    <filter string="Barcode" name="group_by_barcode" context="{'group_by':'barcode'}"/>
+                    <filter string="Asset" name="group_by_asset" context="{'group_by':'asset_id'}"/>
+                    <filter string="Model" name="group_by_model" context="{'group_by':'model_id'}"/>
+                    <filter string="Responsible User" name="group_by_user" context="{'group_by':'user_id'}"/>
+                    <filter string="Responsible Department" name="group_by_department"
+                            context="{'group_by': 'department_id'}"/>
+                    <filter string="Location" name="group_by_location" context="{'group_by':'new_location_id'}"/>
+                    <filter string="Employee" name="group_by_employee" context="{'group_by':'new_employee_id'}"/>
+                    <filter string="Department" name="group_by_department" context="{'group_by':'new_department_id'}"/>
+                    <filter string="Type" name="group_by_type" context="{'group_by': 'type'}"/>
+                    <filter string="Date" name="group_by_date" context="{'group_by': 'date'}"/>
+                    <filter string="State" name="group_by_state" context="{'group_by':'state'}"/>
+                </group>
+            </search>
+        </field>
+    </record>
+
+    <record model="ir.ui.view" id="view_account_asset_operation_tree">
+        <field name="name">account.asset.operation.tree</field>
+        <field name="model">account.asset.operation</field>
+        <field name="arch" type="xml">
+            <list>
+                <field name="name"/>
+                <field name="type"/>
+                <field name="date"/>
+                <field name="asset_id"/>
+                <field name="barcode"/>
+                <field name="state"/>
+            </list>
+        </field>
+    </record>
+
+    <record model="ir.ui.view" id="view_account_asset_operation_form">
+        <field name="name">account.asset.operation.form</field>
+        <field name="model">account.asset.operation</field>
+        <field name="arch" type="xml">
+            <form duplicate="0">
+                <header>
+                    <button name="act_submit" string="Submit" type="object"
+                            class="oe_highlight"  invisible="state != 'draft'"/>
+                    <button name="act_confirm" groups='exp_asset_base.group_assets_manager' string="Confirm" invisible="state != 'submit'"
+                            type="object" class="oe_highlight"/>
+                    <button name="act_reject" groups="exp_asset_base.group_assets_manager" string="Reject" type="object" invisible="state != 'draft'" />
+                    <button name="act_draft" groups="exp_asset_base.group_assets_manager" invisible="state != 'cancel'"  string="Set to Draft"
+                            type="object" class="oe_highlight"/>
+                    <field name="state" widget="statusbar"/>
+                </header>
+                <sheet>
+                    <div class="oe_title">
+                        <h1>
+                            <field name="type" readonly="1"/>
+                            -
+                            <field name="name" readonly="1"/>
+                        </h1>
+                    </div>
+
+                    <group>
+                        <group>
+                            <field name="date"/>
+                            <field name="user_id"/>
+                        </group>
+                        <group>
+                            <field name="product_id" invisible="1"/>
+                            <field name="asset_id"
+                                   required="type not in ['assignment', 'release']"
+                                   readonly="state not in ['draft', 'submit']"
+
+                                   domain="[('asset_type', '=', 'purchase'),
+                                            ('status', 'in', {'receive': ['new'], 'assignment': ['new','available'], 'release': ['assigned'], 'transfer': ['assigned']}.get(type, ['new', 'available', 'assigned', 'scrap']))]"/>
+                            <field name="department_id" readonly="1"/>
+                        </group>
+                    </group>
+
+
+                    <group string="Assignment Info" invisible="type != 'assignment'" >
+                        <group>
+                            <field name="custody_type" required="type == 'assignment'"  />
+                            <field name="custody_period" required="type == 'assignment'" />
+                            <field name="return_date"
+                                   invisible="custody_period != 'temporary'"
+                                   readonly="state != 'draft' or custody_period != 'temporary'"
+                                   />
+                        </group>
+                        <group>
+                            <field name="new_location_id"/>
+                            <field name="new_employee_id"
+                                   required="custody_type == 'personal'"
+                                  />
+                            <field name="new_department_id"
+                                   required="custody_type == 'general'"
+                                   />
+                        </group>
+                    </group>
+
+                    <group invisible="type != 'release'"  >
+                        <group string="Current Info">
+                            <field name="current_employee_id"  force_save="1"/>
+                            <field name="current_department_id"  force_save="1"/>
+                            <field name="current_location_id"  force_save="1"/>
+                        </group>
+                        <group string="Release Info">
+                            <field name="new_location_id" string="Release Location"
+                                   required="type != 'release'"/>
+                            <field name="asset_status2" required="type == 'release'"  />
+                            <field name="asset_status" invisible="1"/>
+                            <field name="amount" groups="exp_asset_base.group_asset_assessment"/>
+                        </group>
+                    </group>
+
+                    <group
+                    invisible="type != 'transfer'"
+                    >
+                        <group>
+                            <field name="custody_type" required="type == 'transfer'"  />
+                        </group>
+                        <group>
+                        </group>
+                        <group string="Current">
+                            <field name="current_employee_id" readonly="1" force_save="1"/>
+                            <field name="current_department_id" readonly="1" force_save="1"/>
+                            <field name="current_location_id" readonly="1" force_save="1"/>
+                        </group>
+                        <group string="New">
+                            <field name="new_employee_id"
+                                   required="custody_type == 'personal'"
+                                   />
+                            <field name="new_department_id"
+                                   required="custody_type == 'general'"/>
+                            <field name="new_location_id"/>
+                        </group>
+                    </group>
+
+                    <notebook colspan="4">
+                        <page string="Note">
+                            <field name="note" nolabel="1"/>
+                        </page>
+                    </notebook>
+                </sheet>
+                <chatter/>
+            </form>
+        </field>
+    </record>
+
+
+    <record model="ir.ui.view" id="view_account_asset_assignment_tree">
+        <field name="name">account.asset.assignment.tree</field>
+        <field name="model">account.asset.operation</field>
+        <field name="arch" type="xml">
+            <list>
+                <field name="name" readonly="1"/>
+                <field name="date"/>
+                <field name="product_id"/>
+                <field name="asset_id"
+                       required="state != 'draft'"
+                       readonly="state != 'submit'"
+                       domain="[('status', 'in', ['new','available']),('asset_type', '=', 'purchase')]"/>
+                <field name="type" invisible="1"/>
+                <field name="custody_type" required="1"/>
+                <field name="custody_period" required="1"/>
+                <field name="return_date"
+                       required="custody_period == 'temporary'"
+                       readonly="state != 'draft' or custody_period != 'temporary'"
+                       />
+                <field name="new_location_id"/>
+                <field name="new_employee_id"
+                       required="custody_type == 'personal'"
+
+                       />
+                <field name="new_department_id"
+                       required="custody_type == 'general'"/>
+                <field name="state" readonly="1"/>
+                <!--                <button name="act_submit" states="draft" string="Submit" type="object" class="oe_highlight"/>-->
+                <!--                <button name="act_confirm" states="submit" string="Confirm" type="object" class="oe_highlight"/>-->
+                <!--                <button name="act_cancel" states="done" string="Cancel" type="object"/>-->
+                <!--                <button name="act_draft" states="cancel" string="Set to Draft" type="object"/>-->
+                <!--                <button name="action_read_operation" type="object" string="Setup" class="float-right btn-secondary"/>-->
+            </list>
+        </field>
+    </record>
+    <record id="action_account_asset_assignment" model="ir.actions.act_window">
+        <field name="name">Assets Assignment</field>
+        <field name="res_model">account.asset.operation</field>
+        <field name="view_mode">list,form</field>
+        <!--        <field name="view_id" ref="view_account_asset_assignment_tree"/>-->
+        <field name="context">
+            {'default_type': 'assignment', 'default_custody_type': 'personal', 'default_custody_period': 'permanent'}
+        </field>
+        <field name="domain">[('type', '=', 'assignment')]</field>
+    </record>
+
+    <record model="ir.ui.view" id="view_account_asset_release_tree">
+        <field name="name">account.asset.release.tree</field>
+        <field name="model">account.asset.operation</field>
+        <field name="arch" type="xml">
+            <list>
+                <field name="name" readonly="1"/>
+                <field name="date"/>
+                <field name="asset_id" required="1"
+                       readonly="state != 'draft'"
+
+                       domain="[('status', 'in', ['assigned']),('asset_type', '=', 'purchase')]"/>
+                <field name="type" invisible="1"/>
+                <field name="current_employee_id" readonly="1" force_save="1"/>
+                <field name="current_department_id" readonly="1" force_save="1"/>
+                <field name="current_location_id" readonly="1" force_save="1"/>
+                <field name="new_location_id" string="Release Location" required="1"/>
+                <field name="asset_status2"/><field name="asset_status" invisible="1"/>
+                <field name="amount" groups="exp_asset_base.group_asset_assessment"/>
+                <field name="state" readonly="1"/>
+                <!--                <button name="act_confirm" states="draft" string="Confirm" type="object" class="oe_highlight"/>-->
+                <!--                <button name="act_cancel" states="done" string="Cancel" type="object"/>-->
+                <!--                <button name="act_draft" states="cancel" string="Set to Draft" type="object"/>-->
+                <!--                <button name="action_read_operation" type="object" string="Setup" class="float-right btn-secondary"/>-->
+            </list>
+        </field>
+    </record>
+    <record id="action_account_asset_release" model="ir.actions.act_window">
+        <field name="name">Assets Release</field>
+        <field name="res_model">account.asset.operation</field>
+        <field name="view_mode">list,form</field>
+        <field name="view_id" ref="view_account_asset_release_tree"/>
+        <field name="context">{'default_type': 'release'}</field>
+        <field name="domain">[('type', '=', 'release')]</field>
+    </record>
+
+    <record model="ir.ui.view" id="view_account_asset_transfer_tree">
+        <field name="name">account.asset.transfer.tree</field>
+        <field name="model">account.asset.operation</field>
+        <field name="arch" type="xml">
+            <list>
+                <field name="name" readonly="1"/>
+                <field name="date"/>
+                <field name="asset_id" required="1"
+                       readonly="state != 'draft'"
+                       domain="[('status', 'in', ['assigned']),('asset_type', '=', 'purchase')]"/>
+                <field name="type" invisible="1"/>
+                <field name="current_employee_id" readonly="1" force_save="1"/>
+                <field name="current_department_id" readonly="1" force_save="1"/>
+                <field name="current_location_id" readonly="1" force_save="1"/>
+                <field name="custody_type" required="1"/>
+                <field name="custody_period" required="1"/>
+                <field name="return_date"
+                       required="custody_period == 'temporary'"
+                       readonly="state != 'draft' or custody_period != 'temporary'"
+                     />
+                <field name="new_location_id" string="New Location"/>
+                <field name="new_employee_id" string="New Employee"
+                       required="custody_type == 'personal'"/>
+                <field name="new_department_id" string="New Department"
+                       required="custody_type == 'general'"/>
+                <field name="state" readonly="1"/>
+                <!--                <button name="act_confirm" states="draft" string="Confirm" type="object" class="oe_highlight"/>-->
+                <!--                <button name="act_cancel" states="done" string="Cancel" type="object"/>-->
+                <!--                <button name="act_draft" states="cancel" string="Set to Draft" type="object"/>-->
+                <!--                <button name="action_read_operation" type="object" string="Setup" class="float-right btn-secondary"/>-->
+            </list>
+        </field>
+    </record>
+    <record id="action_account_asset_transfer" model="ir.actions.act_window">
+        <field name="name">Assets Transfer</field>
+        <field name="res_model">account.asset.operation</field>
+        <field name="view_mode">list,form</field>
+        <field name="view_id" ref="view_account_asset_transfer_tree"/>
+        <field name="context">{'default_type': 'transfer'}</field>
+        <field name="domain">[('type', '=', 'transfer')]</field>
+    </record>
+
+
+    <!-- Operation Analysis -->
+    <record id="action_account_asset_operation_analysis" model="ir.actions.act_window">
+        <field name="name">Operation Analysis</field>
+        <field name="view_mode">graph,pivot,list</field>
+        <field name="search_view_id" ref="view_account_asset_operation_search"/>
+        <field name="view_ids" eval="[(5, 0, 0),
+            (0, 0, {'view_mode': 'graph'}),
+            (0, 0, {'view_mode': 'pivot'}),
+            (0, 0, {'view_mode': 'list', 'view_id': ref('view_account_asset_operation_tree')})]"/>
+        <field name="res_model">account.asset.operation</field>
+        <field name="context">{'search_default_group_by_type': True}</field>
+    </record>
+            <record id="asset_operation_view_form3" model="ir.ui.view">
+                <field name="name">asset_operation_form3.extend</field>
+                <field name="model">account.asset.multi.operation</field>
+                <field name="inherit_id" ref="exp_asset_custody.view_account_asset_multi_transfer_form"/>
+                <field name="arch" type="xml">
+                    <xpath expr="//button[@name='act_confirm']" position="attributes">
+                        <attribute name="groups">exp_asset_base.group_assets_manager</attribute>
+                    </xpath>
+                    <xpath expr="//button[@name='act_reject']" position="attributes">
+                        <attribute name="groups">exp_asset_base.group_assets_manager</attribute>
+                    </xpath>
+                    <xpath expr="//button[@name='act_draft']" position="attributes">
+                        <attribute name="groups">exp_asset_base.group_assets_manager</attribute>
+                    </xpath>
+                </field>
+            </record>
+            <record id="asset_operation_view_form5" model="ir.ui.view">
+                <field name="name">asset_operation_form5.extend</field>
+                <field name="model">account.asset.operation</field>
+                <field name="inherit_id" ref="exp_asset_custody.view_account_asset_operation_form"/>
+                <field name="arch" type="xml">
+                    <xpath expr="//button[@name='act_confirm']" position="attributes">
+                        <attribute name="groups">exp_asset_base.group_assets_manager</attribute>
+                    </xpath>
+                    <xpath expr="//button[@name='act_reject']" position="attributes">
+                        <attribute name="groups">exp_asset_base.group_assets_manager</attribute>
+                    </xpath>
+                    <xpath expr="//button[@name='act_draft']" position="attributes">
+                        <attribute name="groups">exp_asset_base.group_assets_manager</attribute>
+                    </xpath>
+                </field>
+            </record>
+
+</odoo>
diff --git a/dev_odex30_accounting/exp_asset_custody/views/account_asset_view.xml b/dev_odex30_accounting/exp_asset_custody/views/account_asset_view.xml
new file mode 100644
index 0000000..f011c6b
--- /dev/null
+++ b/dev_odex30_accounting/exp_asset_custody/views/account_asset_view.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<odoo>
+    <!-- Asset Register -->
+    <record id="view_account_asset_search" model="ir.ui.view">
+        <field name="name">account.asset.search</field>
+        <field name="model">account.asset</field>
+        <field name="inherit_id" ref="exp_asset_base.view_account_asset_search"/>
+        <field name="arch" type="xml">
+            <field name="analytic_distribution" position="after">
+                <field name="employee_id"/>
+                <field name="department_id"/>
+                <field name="location_id"/>
+            </field>
+            <filter name="cost_center" position="after">
+                <filter string="Employee" name="employee" domain="[]" context="{'group_by':'employee_id'}"/>
+                <filter string="Department" name="department" domain="[]" context="{'group_by':'department_id'}"/>
+                <filter string="Location" name="location" domain="[]" context="{'group_by':'location_id'}"/>
+                <filter string="Custody Type" name="custody_type" domain="[]" context="{'group_by':'custody_type'}"/>
+            </filter>
+        </field>
+    </record>
+    <record model="ir.ui.view" id="view_account_asset_form">
+        <field name="name">account.asset.form</field>
+        <field name="model">account.asset</field>
+        <field name="inherit_id" ref="odex30_account_asset.view_account_asset_form"/>
+        <field name="arch" type="xml">
+            <div name="button_box" position="inside">
+                <button class="oe_stat_button" name="open_asset_operation" type="object" icon="fa-pencil">
+                    <field string="Operations" name="asset_operation_count" widget="statinfo"/>
+                </button>
+            </div>
+            <notebook position="before">
+                <group string="Custody Info" invisible="state != 'model' or asset_type != 'purchase'" >
+                    <group>
+                        <field name="custody_type" readonly="1"/>
+                        <field name="purpose" readonly="1"/>
+                        <field name="custody_period" readonly="1"/>
+                        <field name="return_date" readonly="1"/>
+                    </group>
+                    <group>
+                        <field name="status" readonly="1"/>
+                        <field name="department_id" readonly="1"/>
+                        <field name="employee_id" readonly="1"/>
+                        <field name="location_id" readonly="1"/>
+                    </group>
+                </group>
+            </notebook>
+        </field>
+    </record>
+
+</odoo>
diff --git a/dev_odex30_accounting/exp_asset_custody/views/menus.xml b/dev_odex30_accounting/exp_asset_custody/views/menus.xml
new file mode 100644
index 0000000..d1c4ed7
--- /dev/null
+++ b/dev_odex30_accounting/exp_asset_custody/views/menus.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<odoo>
+    <data>
+        <!-- Asset Operations -->
+        <menuitem id="menu_account_asset_operation_main"
+                  parent="exp_asset_base.menu_account_asset_operation_main"
+                  name="Custody Operations"
+                  sequence="4"/>
+        <!-- Multi Operations -->
+        <menuitem id="menu_account_asset_multi_operation"
+                  parent="menu_account_asset_operation_main"
+                  name="Multiple operations"
+                  sequence="1"/>
+        <menuitem id="menu_account_multi_asset_assignment"
+                  parent="menu_account_asset_multi_operation"
+                  action="action_multi_asset_assignment"
+                  name="Assignment"
+                  sequence="4"/>
+        <menuitem id="menu_account_multi_asset_release"
+                  parent="menu_account_asset_multi_operation"
+                  action="action_multi_asset_release"
+                  name="Release"
+                  sequence="5"/>
+        <menuitem id="menu_account_multi_asset_transfer"
+                  parent="menu_account_asset_multi_operation"
+                  action="action_multi_asset_transfer"
+                  name="Transfer"
+                  sequence="6"/>
+        <!-- Custody Operation -->
+        <menuitem id="menu_account_asset_custody_operation"
+                  parent="menu_account_asset_operation_main"
+                  name="Custody operations"
+                  sequence="3"/>
+        <menuitem id="menu_account_asset_assignment"
+                  parent="menu_account_asset_custody_operation"
+                  action="action_account_asset_assignment"
+                  name="Assignment"
+                  sequence="1"/>
+        <menuitem id="menu_account_asset_release"
+                  parent="menu_account_asset_custody_operation"
+                  action="action_account_asset_release"
+                  name="Release"
+                  sequence="2"/>
+        <menuitem id="menu_account_asset_transfer"
+                  parent="menu_account_asset_custody_operation"
+                  action="action_account_asset_transfer"
+                  name="Transfer"
+                  sequence="3"/>
+
+        <menuitem id="menu_account_operation_graph"
+                  parent="exp_asset_base.menu_account_asset_reporting_main"
+                  action="action_account_asset_operation_analysis"
+                  name="Operation Analysis"
+                  sequence="3"/>
+    </data>
+</odoo>
diff --git a/dev_odex30_accounting/exp_asset_custody_link/__init__.py b/dev_odex30_accounting/exp_asset_custody_link/__init__.py
new file mode 100644
index 0000000..5305644
--- /dev/null
+++ b/dev_odex30_accounting/exp_asset_custody_link/__init__.py
@@ -0,0 +1,3 @@
+# -*- coding: utf-8 -*-
+
+from . import models
\ No newline at end of file
diff --git a/dev_odex30_accounting/exp_asset_custody_link/__manifest__.py b/dev_odex30_accounting/exp_asset_custody_link/__manifest__.py
new file mode 100644
index 0000000..9f6872b
--- /dev/null
+++ b/dev_odex30_accounting/exp_asset_custody_link/__manifest__.py
@@ -0,0 +1,23 @@
+# -*- coding: utf-8 -*-
+{
+    'name': "HR Custody Integration With Asset Custody",
+
+    'summary': """
+      - Assign Asset as a custody to an employee
+      - Release Asset as a custody from an employee
+      """,
+    'version': '14.0',
+    'sequence': 4,
+    'category': 'Odex30-Accounting/Odex30-Accounting',
+    'website': 'http://exp-sa.com',
+    'license': 'AGPL-3',
+    'author': 'Expert Co. Ltd.',
+    'depends': ['exp_employee_custody','exp_asset_custody','purchase'],
+
+    # always loaded
+    'data': [
+        'security/ir.model.access.csv',
+        'views/employee_custody_action.xml',
+    ],
+
+}
diff --git a/dev_odex30_accounting/exp_asset_custody_link/__pycache__/__init__.cpython-311.pyc b/dev_odex30_accounting/exp_asset_custody_link/__pycache__/__init__.cpython-311.pyc
new file mode 100644
index 0000000..9bdedac
Binary files /dev/null and b/dev_odex30_accounting/exp_asset_custody_link/__pycache__/__init__.cpython-311.pyc differ
diff --git a/dev_odex30_accounting/exp_asset_custody_link/i18n/ar_001.po b/dev_odex30_accounting/exp_asset_custody_link/i18n/ar_001.po
new file mode 100644
index 0000000..9468ab6
--- /dev/null
+++ b/dev_odex30_accounting/exp_asset_custody_link/i18n/ar_001.po
@@ -0,0 +1,266 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# 	* exp_asset_custody_link
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 14.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2023-01-31 13:21+0000\n"
+"PO-Revision-Date: 2023-01-31 13:21+0000\n"
+"Last-Translator: \n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: exp_asset_custody_link
+#: model:ir.model.fields,field_description:exp_asset_custody_link.field_asset_custody_line__asset_id
+msgid "Asset"
+msgstr "الأصل"
+
+#. module: exp_asset_custody_link
+#: model:ir.model.fields,field_description:exp_asset_custody_link.field_custom_employee_custody__asset_assign_count
+msgid "Asset Assignment"
+msgstr "إسناد أصل"
+
+#. module: exp_asset_custody_link
+#: model:ir.model.fields,field_description:exp_asset_custody_link.field_asset_custody_line__asset_custody_line
+msgid "Asset Custody Line"
+msgstr "بند أصل"
+
+#. module: exp_asset_custody_link
+#: model:ir.model.fields,field_description:exp_asset_custody_link.field_custom_employee_custody__asset_line_ids
+msgid "Asset Line"
+msgstr "بند الأصول"
+
+#. module: exp_asset_custody_link
+#: model_terms:ir.ui.view,arch_db:exp_asset_custody_link.employee_custody_form_view_inherit
+msgid "Asset Lines"
+msgstr "بند الأصول"
+
+#. module: exp_asset_custody_link
+#: model:ir.model,name:exp_asset_custody_link.model_account_asset_operation
+msgid "Asset Operation"
+msgstr "عمليات الأصول"
+
+#. module: exp_asset_custody_link
+#: model:ir.model.fields,field_description:exp_asset_custody_link.field_custom_employee_custody__asset_release_count
+msgid "Asset Release"
+msgstr "إرجاع عهدة"
+
+#. module: exp_asset_custody_link
+#: code:addons/exp_asset_custody_link/models/account_asset_operation.py:0
+#, python-format
+msgid "Asset is required to confirm this operation."
+msgstr "الأصل مطلوب لتأكيد هذه العملية"
+
+#. module: exp_asset_custody_link
+#: model:ir.actions.act_window,name:exp_asset_custody_link.action_account_asset_assignment1
+msgid "Assets Assignment"
+msgstr "إسناد عهدة"
+
+#. module: exp_asset_custody_link
+#: model:ir.actions.act_window,name:exp_asset_custody_link.action_account_asset_release1
+msgid "Assets Release"
+msgstr "إرجاع عهدة"
+
+#. module: exp_asset_custody_link
+#: code:addons/exp_asset_custody_link/models/employee_custody.py:0
+#: model:ir.model.fields.selection,name:exp_asset_custody_link.selection__asset_custody_line__type__assignment
+#: model:ir.model.fields.selection,name:exp_asset_custody_link.selection__custom_employee_custody__state__assign
+#, python-format
+msgid "Assignment"
+msgstr "إسناد"
+
+#. module: exp_asset_custody_link
+#: model_terms:ir.ui.view,arch_db:exp_asset_custody_link.employee_custody_form_view_inherit
+msgid "Assignments"
+msgstr "الإسناد"
+
+#. module: exp_asset_custody_link
+#: model:ir.model.fields,field_description:exp_asset_custody_link.field_asset_custody_line__create_uid
+msgid "Created by"
+msgstr ""
+
+#. module: exp_asset_custody_link
+#: model:ir.model.fields,field_description:exp_asset_custody_link.field_asset_custody_line__create_date
+msgid "Created on"
+msgstr ""
+
+#. module: exp_asset_custody_link
+#: model:ir.model.fields,field_description:exp_asset_custody_link.field_asset_custody_line__custody_period
+msgid "Custody Period"
+msgstr "فترة العهدة"
+
+#. module: exp_asset_custody_link
+#: model:ir.model.fields,field_description:exp_asset_custody_link.field_asset_custody_line__custody_type
+msgid "Custody Type"
+msgstr "نوع العهدة"
+
+#. module: exp_asset_custody_link
+#: model:ir.model.fields,field_description:exp_asset_custody_link.field_asset_custody_line__date
+msgid "Date"
+msgstr "التاريخ"
+
+#. module: exp_asset_custody_link
+#: code:addons/exp_asset_custody_link/models/employee_custody.py:0
+#: model:ir.model.fields.selection,name:exp_asset_custody_link.selection__custom_employee_custody__state__direct
+#, python-format
+msgid "Direct Manager"
+msgstr "المدير المباشر"
+
+#. module: exp_asset_custody_link
+#: model:ir.model.fields,field_description:exp_asset_custody_link.field_account_asset_operation__display_name
+#: model:ir.model.fields,field_description:exp_asset_custody_link.field_asset_custody_line__display_name
+#: model:ir.model.fields,field_description:exp_asset_custody_link.field_custom_employee_custody__display_name
+#: model:ir.model.fields,field_description:exp_asset_custody_link.field_mail_followers__display_name
+msgid "Display Name"
+msgstr "الاسم المعروض"
+
+#. module: exp_asset_custody_link
+#: model:ir.model,name:exp_asset_custody_link.model_mail_followers
+msgid "Document Followers"
+msgstr "متابعو المستند"
+
+#. module: exp_asset_custody_link
+#: code:addons/exp_asset_custody_link/models/employee_custody.py:0
+#: model:ir.model.fields.selection,name:exp_asset_custody_link.selection__custom_employee_custody__state__draft
+#, python-format
+msgid "Draft"
+msgstr "مسودة"
+
+#. module: exp_asset_custody_link
+#: model:ir.model.fields,field_description:exp_asset_custody_link.field_account_asset_operation__emp_asset_custody_id
+msgid "Emp Asset Custody"
+msgstr ""
+
+#. module: exp_asset_custody_link
+#: model:ir.model,name:exp_asset_custody_link.model_custom_employee_custody
+msgid "Employee custody"
+msgstr "العهد الغير مالية"
+
+#. module: exp_asset_custody_link
+#: model:ir.model.fields.selection,name:exp_asset_custody_link.selection__asset_custody_line__custody_type__general
+msgid "General"
+msgstr "عام"
+
+#. module: exp_asset_custody_link
+#: code:addons/exp_asset_custody_link/models/employee_custody.py:0
+#: model:ir.model.fields.selection,name:exp_asset_custody_link.selection__custom_employee_custody__state__admin
+#, python-format
+msgid "Human Resources Manager"
+msgstr "تصديق الموارد البشرية"
+
+#. module: exp_asset_custody_link
+#: model:ir.model.fields,field_description:exp_asset_custody_link.field_account_asset_operation__id
+#: model:ir.model.fields,field_description:exp_asset_custody_link.field_asset_custody_line__id
+#: model:ir.model.fields,field_description:exp_asset_custody_link.field_custom_employee_custody__id
+#: model:ir.model.fields,field_description:exp_asset_custody_link.field_mail_followers__id
+msgid "ID"
+msgstr "المُعرف"
+
+#. module: exp_asset_custody_link
+#: model:ir.model.fields,field_description:exp_asset_custody_link.field_account_asset_operation____last_update
+#: model:ir.model.fields,field_description:exp_asset_custody_link.field_asset_custody_line____last_update
+#: model:ir.model.fields,field_description:exp_asset_custody_link.field_custom_employee_custody____last_update
+#: model:ir.model.fields,field_description:exp_asset_custody_link.field_mail_followers____last_update
+msgid "Last Modified on"
+msgstr "آخر تعديل في"
+
+#. module: exp_asset_custody_link
+#: model:ir.model.fields,field_description:exp_asset_custody_link.field_asset_custody_line__write_uid
+msgid "Last Updated by"
+msgstr ""
+
+#. module: exp_asset_custody_link
+#: model:ir.model.fields,field_description:exp_asset_custody_link.field_asset_custody_line__write_date
+msgid "Last Updated on"
+msgstr ""
+
+#. module: exp_asset_custody_link
+#: model:ir.model.fields.selection,name:exp_asset_custody_link.selection__asset_custody_line__custody_period__permanent
+msgid "Permanent"
+msgstr "مستديمة"
+
+#. module: exp_asset_custody_link
+#: model:ir.model.fields.selection,name:exp_asset_custody_link.selection__asset_custody_line__custody_type__personal
+msgid "Personal"
+msgstr "شخصية"
+
+#. module: exp_asset_custody_link
+#: code:addons/exp_asset_custody_link/models/employee_custody.py:0
+#, python-format
+msgid "Please Select an asset"
+msgstr "الرجاء إختيار أصل"
+
+#. module: exp_asset_custody_link
+#: model_terms:ir.ui.view,arch_db:exp_asset_custody_link.employee_custody_form_view_inherit
+msgid "Purchase Request"
+msgstr "طلب شراء"
+
+#. module: exp_asset_custody_link
+#: code:addons/exp_asset_custody_link/models/employee_custody.py:0
+#: model:ir.model.fields.selection,name:exp_asset_custody_link.selection__custom_employee_custody__state__refuse
+#, python-format
+msgid "Refuse"
+msgstr "رفض"
+
+#. module: exp_asset_custody_link
+#: model_terms:ir.ui.view,arch_db:exp_asset_custody_link.employee_custody_form_view_inherit
+msgid "Releases"
+msgstr "رفض"
+
+#. module: exp_asset_custody_link
+#: model:ir.model.fields,field_description:exp_asset_custody_link.field_asset_custody_line__return_date
+msgid "Return Date"
+msgstr "تاريخ الإرجاع"
+
+#. module: exp_asset_custody_link
+#: code:addons/exp_asset_custody_link/models/employee_custody.py:0
+#: model:ir.model.fields.selection,name:exp_asset_custody_link.selection__custom_employee_custody__state__done
+#, python-format
+msgid "Return Done"
+msgstr "تم ارجاع العهده"
+
+#. module: exp_asset_custody_link
+#: model:ir.model.fields,field_description:exp_asset_custody_link.field_custom_employee_custody__state
+msgid "State"
+msgstr "الحالة"
+
+#. module: exp_asset_custody_link
+#: model:ir.model.fields.selection,name:exp_asset_custody_link.selection__asset_custody_line__custody_period__temporary
+msgid "Temporary"
+msgstr "موقتة"
+
+#. module: exp_asset_custody_link
+#: model:ir.model.fields,field_description:exp_asset_custody_link.field_asset_custody_line__type
+msgid "Type"
+msgstr "النوع"
+
+#. module: exp_asset_custody_link
+#: code:addons/exp_asset_custody_link/models/employee_custody.py:0
+#: model:ir.model.fields.selection,name:exp_asset_custody_link.selection__custom_employee_custody__state__wait
+#, python-format
+msgid "Wait Assignment"
+msgstr "إنتظار الإرجاع"
+
+#. module: exp_asset_custody_link
+#: code:addons/exp_asset_custody_link/models/employee_custody.py:0
+#: model:ir.model.fields.selection,name:exp_asset_custody_link.selection__custom_employee_custody__state__wait_release
+#, python-format
+msgid "Wait Release"
+msgstr "إنتظار الإسناد"
+
+#. module: exp_asset_custody_link
+#: model:ir.model,name:exp_asset_custody_link.model_asset_custody_line
+msgid "asset.custody.line"
+msgstr ""
+
+#. module: exp_asset_custody_link
+#: code:addons/exp_asset_custody_link/models/employee_custody.py:0
+#: model:ir.model.fields.selection,name:exp_asset_custody_link.selection__custom_employee_custody__state__submit
+#, python-format
+msgid "send"
+msgstr "إرسال"
diff --git a/dev_odex30_accounting/exp_asset_custody_link/models/__init__.py b/dev_odex30_accounting/exp_asset_custody_link/models/__init__.py
new file mode 100644
index 0000000..83a7fdf
--- /dev/null
+++ b/dev_odex30_accounting/exp_asset_custody_link/models/__init__.py
@@ -0,0 +1,4 @@
+# -*- coding: utf-8 -*-
+
+from . import account_asset_operation
+from . import employee_custody
\ No newline at end of file
diff --git a/dev_odex30_accounting/exp_asset_custody_link/models/__pycache__/__init__.cpython-311.pyc b/dev_odex30_accounting/exp_asset_custody_link/models/__pycache__/__init__.cpython-311.pyc
new file mode 100644
index 0000000..f166c2a
Binary files /dev/null and b/dev_odex30_accounting/exp_asset_custody_link/models/__pycache__/__init__.cpython-311.pyc differ
diff --git a/dev_odex30_accounting/exp_asset_custody_link/models/__pycache__/account_asset_operation.cpython-311.pyc b/dev_odex30_accounting/exp_asset_custody_link/models/__pycache__/account_asset_operation.cpython-311.pyc
new file mode 100644
index 0000000..b8a5880
Binary files /dev/null and b/dev_odex30_accounting/exp_asset_custody_link/models/__pycache__/account_asset_operation.cpython-311.pyc differ
diff --git a/dev_odex30_accounting/exp_asset_custody_link/models/__pycache__/employee_custody.cpython-311.pyc b/dev_odex30_accounting/exp_asset_custody_link/models/__pycache__/employee_custody.cpython-311.pyc
new file mode 100644
index 0000000..a769fe2
Binary files /dev/null and b/dev_odex30_accounting/exp_asset_custody_link/models/__pycache__/employee_custody.cpython-311.pyc differ
diff --git a/dev_odex30_accounting/exp_asset_custody_link/models/account_asset_operation.py b/dev_odex30_accounting/exp_asset_custody_link/models/account_asset_operation.py
new file mode 100644
index 0000000..0b55f82
--- /dev/null
+++ b/dev_odex30_accounting/exp_asset_custody_link/models/account_asset_operation.py
@@ -0,0 +1,71 @@
+from odoo import models, fields, api, _, exceptions
+class AccountAssetOperation(models.Model):
+    _inherit = 'account.asset.operation'
+
+    emp_asset_custody_id = fields.Many2one(comodel_name='custom.employee.custody')
+
+    def act_confirm(self):
+        module = self.env['ir.module.module'].sudo()
+        exp_petty_cash_module = module.search(
+            [('state', '=', 'installed'), ('name', '=', 'exp_employee_custody')])
+        if not self.asset_id:
+            raise exceptions.Warning(_('Asset is required to confirm this operation.'))
+        if self.type in ('assignment', 'release', 'transfer'):
+            self.custody_confirm()
+        self.state = 'done'
+        if self.type == 'assignment':
+            self.asset_id.status = 'assigned'
+            if exp_petty_cash_module:
+                custody = self.env['custom.employee.custody'].search([('id', '=', self.emp_asset_custody_id.id)])
+                print("===============================================================", custody)
+                for cus in custody:
+                    operation = self.env['account.asset.operation'].search(
+                        [('emp_asset_custody_id', '=', cus.id), ('type', '=', 'assignment')])
+                    # print("----------", operation)
+                    # print("----------", operation.state)
+                    if all(ope.state in 'done' for ope in operation):
+                        # print("----------", operation.state)
+                        cus.write({'state': 'assign'})
+        elif self.type == 'release':
+            self.asset_id.status = 'available'
+            # self.asset_id.status = self.asset_status == 'good' and 'available' or 'scrap'
+            if exp_petty_cash_module:
+                custody = self.env['custom.employee.custody'].search([('id', '=', self.emp_asset_custody_id.id)])
+                for cus in custody:
+                    operation = self.env['account.asset.operation'].search(
+                        [('emp_asset_custody_id', '=', cus.id), ('type', '=', 'release')])
+                    if all(ope.state in 'done' for ope in operation):
+                        cus.write({'state': 'done'})
+
+
+    # def custody_confirm(self):
+    #
+    #     self.asset_id.employee_id = self.new_employee_id.id
+    #     self.asset_id.department_id = self.new_department_id.id
+    #     self.asset_id.location_id = self.new_location_id.id
+    #     self.asset_id.custody_type = self.custody_type
+    #     self.asset_id.custody_period = self.custody_period
+    #     self.asset_id.return_date = self.return_date
+    #     self.asset_id.purpose = self.note
+class HrEmployee(models.Model):
+    _inherit = 'hr.employee'
+
+    petty_cash_count1 = fields.Integer(compute='_compute_assignment_no')
+
+    def _compute_assignment_no(self):
+        for emp in self:
+            items = self.env['account.asset.operation'].sudo().search([
+                ('asset_statuso','=','assigned'),('new_employee_id', '=',self.id )
+            ])
+            emp.petty_cash_count1 = len(items)
+
+    def get_assignment(self):
+        self.ensure_one()
+        return {
+            'type': 'ir.actions.act_window',
+            'name': 'Assignments',
+            'view_mode': 'tree',
+            'res_model': 'account.asset.operation',
+            'domain': [('asset_statuso','=','assigned'),('new_employee_id', '=', self.id)],
+            'context': "{'create': False}"
+        }
diff --git a/dev_odex30_accounting/exp_asset_custody_link/models/employee_custody.py b/dev_odex30_accounting/exp_asset_custody_link/models/employee_custody.py
new file mode 100644
index 0000000..cef70e6
--- /dev/null
+++ b/dev_odex30_accounting/exp_asset_custody_link/models/employee_custody.py
@@ -0,0 +1,125 @@
+from odoo import models, fields, api, _, exceptions
+from odoo import SUPERUSER_ID
+
+
+# from datetime import datetime , date
+
+
+class EmployeeCustody(models.Model):
+    _inherit = 'custom.employee.custody'
+
+    state = fields.Selection(selection=[
+        ("draft", _("Draft")),
+        ("submit", _("send")),
+        ("direct", _("Direct Manager")),
+        ("admin", _("Human Resources Manager")),
+        ("wait", _("Wait Assignment")),
+        ("assign", _("Assignment")),
+        ("wait_release", _("Wait Release")),
+        ("done", _("Return Done")),
+        ("refuse", _("Refuse"))
+    ], default='draft')
+
+    asset_line_ids = fields.One2many('asset.custody.line', 'asset_custody_line', required=True)
+    asset_assign_count = fields.Integer(compute='_asset_assign_count', string='Asset Assignment')
+    asset_release_count = fields.Integer(compute='_asset_release_count', string='Asset Release')
+
+    def create_asset_custody(self):
+        for i in self.asset_line_ids:
+            data = {
+                'date': self.current_date,
+                'asset_id': i.asset_id.id,
+                'type': 'assignment',
+                'custody_type': i.custody_type,
+                'custody_period': i.custody_period,
+                'state': 'draft',
+                'user_id': self.env.uid,
+                'new_employee_id': self.employee_id.id,
+                'new_department_id': self.department_id.id,
+                'emp_asset_custody_id': self.id,
+
+            }
+            self.env['account.asset.operation'].create(data)
+
+    def asset_custody_release(self):
+        for i in self.asset_line_ids:
+            data = {
+                'name': i.asset_id.name,
+                'date': self.current_date,
+                'asset_id': i.asset_id.id,
+                'type': 'release',
+                'custody_type': i.custody_type,
+                'custody_period': i.custody_period,
+                'state': 'draft',
+                'user_id': self.env.uid,
+                'current_employee_id': self.employee_id.id,
+                'new_employee_id': self.employee_id.id,
+                'current_department_id': self.department_id.id,
+                'emp_asset_custody_id': self.id,
+
+            }
+            self.env['account.asset.operation'].create(data)
+
+    def _asset_assign_count(self):
+        self.asset_assign_count = len(
+            self.env['asset.custody.line'].search([('asset_custody_line', '=', self.id)]))
+
+    def _asset_release_count(self):
+        self.asset_release_count = len(
+            self.env['asset.custody.line'].search([('asset_custody_line', '=', self.id)]))
+
+    def approve(self):
+        if not self.asset_line_ids:
+            raise exceptions.Warning(_('Please Select an asset'))
+        self.create_asset_custody()
+        self.write({'state': 'wait'})
+
+    def done(self):
+        self.asset_custody_release()
+        self.state = "wait_release"
+
+
+class EmployeeCustodyLine(models.Model):
+    _name = 'asset.custody.line'
+
+    # Asset custody fields
+    type = fields.Selection([('assignment', 'Assignment')])
+    custody_type = fields.Selection(selection=[('personal', 'Personal'), ('general', 'General')])
+    custody_period = fields.Selection(selection=[('temporary', 'Temporary'), ('permanent', 'Permanent')])
+    return_date = fields.Date()
+    date = fields.Date()
+    asset_id = fields.Many2one('account.asset')
+    asset_custody_line = fields.Many2one(comodel_name='custom.employee.custody')  # Inverse field
+
+    @api.model
+    def create(self, vals):
+        res = super(EmployeeCustodyLine, self).create(vals)
+        if res.asset_id and res.asset_id.status in ['new', 'available']:
+            res.asset_id.write({'status': 'reserved'})
+        return res
+
+    def unlink(self):
+        assets = self.mapped('asset_id')
+        result = super(EmployeeCustodyLine, self).unlink()
+        if result and assets:
+            assets.write({'status': 'available'})
+        return result
+
+
+class Followers(models.Model):
+    _inherit = 'mail.followers'
+
+    @api.model
+    def create(self, vals):
+        if 'res_model' in vals and 'res_id' in vals and 'partner_id' in vals:
+            dups = self.env['mail.followers'].search(
+                [('res_model', '=', vals.get('res_model')), ('res_id', '=', vals.get('res_id')),
+                 ('partner_id', '=', vals.get('partner_id'))])
+
+            if len(dups):
+                for p in dups:
+                    p.unlink()
+
+        res = super(Followers, self).create(vals)
+
+        return res
diff --git a/dev_odex30_accounting/exp_asset_custody_link/security/ir.model.access.csv b/dev_odex30_accounting/exp_asset_custody_link/security/ir.model.access.csv
new file mode 100644
index 0000000..356298c
--- /dev/null
+++ b/dev_odex30_accounting/exp_asset_custody_link/security/ir.model.access.csv
@@ -0,0 +1,2 @@
+id,name,model_id:id,group_id/id,perm_read,perm_write,perm_create,perm_unlink
+access_employee_asset_custody_line,access_employee_custody_asset_line,model_asset_custody_line,base.group_user,1,1,1,1
diff --git a/dev_odex30_accounting/exp_asset_custody_link/views/employee_custody_action.xml b/dev_odex30_accounting/exp_asset_custody_link/views/employee_custody_action.xml
new file mode 100644
index 0000000..f93852c
--- /dev/null
+++ b/dev_odex30_accounting/exp_asset_custody_link/views/employee_custody_action.xml
@@ -0,0 +1,95 @@
+<odoo>
+    <data>
+        <record id="action_account_asset_assignment1" model="ir.actions.act_window">
+            <field name="name">Assets Assignment</field>
+            <field name="res_model">account.asset.operation</field>
+            <field name="view_mode">list,form</field>
+            <field name="context">{ 'create': False }</field>
+            <field name="domain">[('emp_asset_custody_id', '=', active_id),('type', '=', 'assignment')]</field>
+            <field name="view_ids" eval="[(5, 0, 0),
+            (0, 0, {'view_mode': 'list', 'view_id': ref('exp_asset_custody.view_account_asset_assignment_tree')}),
+            (0, 0, {'view_mode': 'form', 'view_id': ref('exp_asset_custody.view_account_asset_operation_form')})]"/>
+        </record>
+
+        <record id="action_account_asset_release1" model="ir.actions.act_window">
+            <field name="name">Assets Release</field>
+            <field name="res_model">account.asset.operation</field>
+            <field name="view_mode">list,form</field>
+            <field name="context">{ 'create': False }</field>
+            <field name="domain">[('emp_asset_custody_id', '=', active_id),('type', '=', 'release')]</field>
+            <field name="view_ids" eval="[(5, 0, 0),
+            (0, 0, {'view_mode': 'list', 'view_id': ref('exp_asset_custody.view_account_asset_release_tree')}),
+            (0, 0, {'view_mode': 'form', 'view_id': ref('exp_asset_custody.view_account_asset_operation_form')})]"/>
+        </record>
+
+        <record model="ir.ui.view" id="employee_custody_form_view_inherit">
+        <field name="name">Employee Custody With Asset</field>
+        <field name="model">custom.employee.custody</field>
+        <field name="inherit_id" ref="exp_employee_custody.employee_custody_form_view"/>
+        <field name="arch" type="xml">
+            <button name="approve" position="after">
+                <button name="%(purchase.purchase_rfq)d" string="Purchase Request"
+                        class="oe_highlight" invisible="state != 'admin'" type="action" groups="hr.group_hr_user"/>
+            </button>
+            <button name="done" position="attributes">
+                <attribute name="modifiers">
+                    {'invisible': [['state', '!=', 'assign']]}
+                </attribute>
+            </button>
+             <xpath expr="//group[1]" position="before">
+                <div class="oe_button_box" name="button_box">
+                    <button class="oe_stat_button" type="action"
+                            name="%(action_account_asset_assignment1)d" icon="fa-pencil"
+                            invisible="asset_assign_count == 0">
+                        <field name="asset_assign_count" string="Assignments" widget="statinfo"/>
+                    </button>
+                    <button class="oe_stat_button" type="action"
+                            name="%(action_account_asset_release1)d" icon="fa-pencil"
+                            invisible="asset_release_count == 0 or  state not in ['wait_release','done','refuse']">
+                        <field name="asset_release_count" string="Releases" widget="statinfo"/>
+                    </button>
+                </div>
+            </xpath>
+<!--                                           domain="[('status', 'in', ['new','available']), ('asset_type', '=', 'purchase'),-->
+<!--                                                   ('state', '!=', 'model'), ('parent_id', '=', False)]"/>-->
+            <xpath expr="//notebook/page" position="after">
+                <page string="Asset Lines"
+                      invisible="state in  ['draft','submit','direct']"
+                      >
+                    <field name="asset_line_ids" nolabel="1" required="1"
+                           readonly="state in ['wait','assign','done']">
+                        <list string="Asset Lines" editable="top">
+                            <field name="asset_id" required="1"
+                            domain="[('status', 'in',{'assignment': ['available']}.get(type, ['new', 'available'])),('asset_type', '=', 'purchase')]"/>
+                            <field name="custody_type"
+                                   required="type == 'assignment'"/>
+                            <field name="custody_period"
+                                   required="type == 'assignment'"/>
+                            <field name="return_date" required="custody_period == 'temporary'"
+                                   invisible="custody_period != 'temporary'"
+                                   readonly="custody_period != 'temporary'"
+                                   />
+                            <field name="type" invisible="1"/>
+                        </list>
+                    </field>
+                </page>
+            </xpath>
+        </field>
+        </record>
+                <record id="hr_Employee_form_inherit0" model="ir.ui.view">
+            <field name="name">hr_employee.extend1.form2</field>
+            <field name="model">hr.employee</field>
+            <field name="inherit_id" ref="hr.view_employee_form"/>
+            <field name="priority" eval="8"/>
+            <field name="arch" type="xml">
+                <xpath expr="//div[@name='button_box']" position="inside">
+                    <button class="oe_stat_button" type="object" name="get_assignment"
+                            icon="fa-file">
+                        <field string="Assignments" name="petty_cash_count1" widget="statinfo"/>
+                    </button>
+                </xpath>
+            </field>
+        </record>
+
+    </data>
+</odoo>
diff --git a/dev_odex30_accounting/odex30_account_accountant/__init__.py b/dev_odex30_accounting/odex30_account_accountant/__init__.py
new file mode 100644
index 0000000..a31a691
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_accountant/__init__.py
@@ -0,0 +1,46 @@
+
+from . import models
+from . import wizard
+
+from odoo import Command
+
+import logging
+
+_logger = logging.getLogger(__name__)
+
+
+def _odex30_account_accountant_post_init(env):
+    country_code = env.company.country_id.code
+    if country_code:
+        module_list = []
+
+        # SEPA zone countries will be using SEPA
+        sepa_zone = env.ref('base.sepa_zone', raise_if_not_found=False)
+        sepa_zone_country_codes = sepa_zone and sepa_zone.mapped('country_ids.code') or []
+
+        if country_code in sepa_zone_country_codes:
+            module_list.extend(['account_iso20022', 'account_bank_statement_import_camt'])
+
+        module_ids = env['ir.module.module'].search([('name', 'in', module_list), ('state', '=', 'uninstalled')])
+        if module_ids:
+            module_ids.sudo().button_install()
+
+    for company in env['res.company'].search([('chart_template', '!=', False)], order="parent_path"):
+        ChartTemplate = env['account.chart.template'].with_company(company)
+        ChartTemplate._load_data({
+            'res.company': ChartTemplate._get_account_accountant_res_company(company.chart_template),
+        })
+
+
+def uninstall_hook(env):
+    # Disable the basic group to remove access menus defined in account
+    group_basic = env.ref('account.group_account_basic')
+    group_manager = env.ref('account.group_account_manager')
+    if group_basic:
+        group_basic.write({
+            'users': [Command.clear()],
+            'category_id': env.ref("base.module_category_hidden").id,
+        })
+        group_manager.write({
+            'implied_ids': [Command.unlink(group_basic.id)],
+        })
diff --git a/dev_odex30_accounting/odex30_account_accountant/__manifest__.py b/dev_odex30_accounting/odex30_account_accountant/__manifest__.py
new file mode 100644
index 0000000..9506e4b
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_accountant/__manifest__.py
@@ -0,0 +1,63 @@
+{
+    'name': 'Invoicing',
+    'version': '1.1',
+    'category': 'Odex30-Accounting/Odex30-Accounting',
+    'sequence': 30,
+    'summary': 'Manage financial and analytic accounting',
+    'description': """
+    Accounting Access Rights
+    ========================
+    It gives the Administrator user access to all accounting features such as journal items and the chart of accounts.
+
+    It assigns manager and user access rights to the Administrator for the accounting application and only user rights to the Demo user.
+    """,
+    'author': "Expert Co. Ltd.",
+    'website': "http://www.exp-sa.com",
+    'depends': ['account', 'web_tour'],
+    'data': [
+        'data/ir_cron.xml',
+        'data/digest_data.xml',
+        'data/odex30_account_accountant_tour.xml',
+
+        'security/ir.model.access.csv',
+        'security/odex30_account_accountant_security.xml',
+
+        'views/odex30_account_account_views.xml',
+        'views/account_fiscal_year_view.xml',
+        'views/account_journal_dashboard_views.xml',
+        'views/account_move_views.xml',
+        'views/account_payment_views.xml',
+        'views/odex30_account_reconcile_views.xml',
+        'views/account_reconcile_model_views.xml',
+        'views/odex30_account_accountant_menuitems.xml',
+        'views/digest_views.xml',
+        'views/res_config_settings_views.xml',
+        'views/product_views.xml',
+        'views/bank_rec_widget_views.xml',
+        'views/report_invoice.xml',
+
+        'wizard/account_change_lock_date.xml',
+        'wizard/account_auto_reconcile_wizard.xml',
+        'wizard/account_reconcile_wizard.xml',
+        'wizard/reconcile_model_wizard.xml',
+    ],
+
+    'installable': True,
+    'auto_install': True,
+    'post_init_hook': '_odex30_account_accountant_post_init',
+    'uninstall_hook': "uninstall_hook",
+    'assets': {
+        'web.assets_backend': [
+            'odex30_account_accountant/static/src/js/tours/account_accountant.js',
+            'odex30_account_accountant/static/src/components/**/*',
+            'odex30_account_accountant/static/src/**/*.xml',
+        ],
+        'web.assets_unit_tests': [
+            'odex30_account_accountant/static/tests/**/*',
+            ('remove', 'odex30_account_accountant/static/tests/tours/**/*'),
+        ],
+        'web.assets_tests': [
+            'odex30_account_accountant/static/tests/tours/**/*',
+        ],
+    }
+}
diff --git a/dev_odex30_accounting/odex30_account_accountant/__pycache__/__init__.cpython-311.pyc b/dev_odex30_accounting/odex30_account_accountant/__pycache__/__init__.cpython-311.pyc
new file mode 100644
index 0000000..c547485
Binary files /dev/null and b/dev_odex30_accounting/odex30_account_accountant/__pycache__/__init__.cpython-311.pyc differ
diff --git a/dev_odex30_accounting/odex30_account_accountant/data/digest_data.xml b/dev_odex30_accounting/odex30_account_accountant/data/digest_data.xml
new file mode 100644
index 0000000..666229e
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_accountant/data/digest_data.xml
@@ -0,0 +1,23 @@
+<?xml version='1.0' encoding='utf-8'?>
+<odoo>
+    <data noupdate="1">
+        <record id="digest.digest_digest_default" model="digest.digest">
+            <field name="kpi_account_bank_cash">True</field>
+        </record>
+    </data>
+    <data noupdate="0">
+        <record id="digest_tip_account_accountant_0" model="digest.tip">
+            <field name="name">Tip: Bulk update journal items</field>
+            <field name="sequence">900</field>
+            <field name="group_id" ref="account.group_account_user" />
+            <field name="tip_description" type="html">
+<div>
+    <b class="tip_title">Tip: Bulk update journal items</b>
+    <p class="tip_content">From any list view, select multiple records and the list becomes editable. If you update a cell, selected records are updated all at once. Use this feature to update multiple journal entries from the General Ledger, or any Journal view.</p>
+    <img src="/odex30_account_accountant/static/src/img/accounting-bulk.gif" width="540" class="illustration_border" />
+</div>
+            </field>
+        </record>
+
+    </data>
+</odoo>
diff --git a/dev_odex30_accounting/odex30_account_accountant/data/ir_cron.xml b/dev_odex30_accounting/odex30_account_accountant/data/ir_cron.xml
new file mode 100644
index 0000000..3398c92
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_accountant/data/ir_cron.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <record id="auto_reconcile_bank_statement_line" model="ir.cron">
+        <field name="name">Try to reconcile automatically your statement lines</field>
+        <field name="model_id" ref="model_account_bank_statement_line"/>
+        <field name="state">code</field>
+        <field name="code">model._cron_try_auto_reconcile_statement_lines(batch_size=100)</field>
+        <field name='interval_number'>1</field>
+        <field name='interval_type'>days</field>
+    </record>
+</odoo>
diff --git a/dev_odex30_accounting/odex30_account_accountant/data/odex30_account_accountant_tour.xml b/dev_odex30_accounting/odex30_account_accountant/data/odex30_account_accountant_tour.xml
new file mode 100644
index 0000000..4346f60
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_accountant/data/odex30_account_accountant_tour.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <record id="odex30_account_accountant_tour" model="web_tour.tour">
+        <field name="name">odex30_account_accountant_tour</field>
+        <field name="sequence">50</field>
+        <field name="rainbow_man_message"><![CDATA[
+            <strong><b>Good job!</b> You went through all steps of this tour.</strong>
+            <br>See how to manage your customer invoices in the <b>Customers/Invoices</b> menu
+        ]]></field>
+    </record>
+</odoo>
diff --git a/dev_odex30_accounting/odex30_account_accountant/i18n/ar.po b/dev_odex30_accounting/odex30_account_accountant/i18n/ar.po
new file mode 100644
index 0000000..580292e
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_accountant/i18n/ar.po
@@ -0,0 +1,2950 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# * odex30_account_accountant
+#
+# Translators:
+# Martin Trigaux, 2024
+# Mustafa J. Kadhem <safi2266@gmail.com>, 2024
+# Wil Odoo, 2025
+# Malaz Abuidris <msea@odoo.com>, 2025
+# Weblate <noreply-mt-weblate@weblate.org>, 2025.
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 18.0+e\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2025-10-16 18:48+0000\n"
+"PO-Revision-Date: 2025-11-10 12:44+0000\n"
+"Last-Translator: Weblate <noreply-mt-weblate@weblate.org>\n"
+"Language-Team: Arabic <https://translate.odoo.com/projects/odoo-18/"
+"account_accountant/ar/>\n"
+"Language: ar\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 "
+"&& n%100<=10 ? 3 : n%100>=11 ? 4 : 5;\n"
+"X-Generator: Weblate 5.12.2\n"
+
+#. module: odex30_account_accountant
+#. odoo-python
+#: code:addons/odex30_account_accountant/models/bank_rec_widget_line.py:0
+msgid ""
+"%(display_name_html)s with an open amount of %(open_amount)s will be fully "
+"reconciled by the transaction."
+msgstr ""
+"%(display_name_html)s مع مبلغ مفتوح قدره %(open_amount)s ستتم تسويته تماماً "
+"بواسطة المعاملة. "
+
+#. module: odex30_account_accountant
+#. odoo-python
+#: code:addons/odex30_account_accountant/models/bank_rec_widget_line.py:0
+msgid ""
+"%(display_name_html)s with an open amount of %(open_amount)s will be reduced "
+"by %(amount)s."
+msgstr ""
+"%(display_name_html)s مع مبلغ مفتوح قدره %(open_amount)s سيتم تقليله بـ %"
+"(amount)s. "
+
+#. module: odex30_account_accountant
+#: model_terms:ir.ui.view,arch_db:odex30_account_accountant.view_account_form
+msgid "-> Reconcile"
+msgstr "-> تسوية "
+
+#. module: odex30_account_accountant
+#: model_terms:digest.tip,tip_description:odex30_account_accountant.digest_tip_account_accountant_0
+msgid "<b class=\"tip_title\">Tip: Bulk update journal items</b>"
+msgstr "<b class=\"tip_title\">نصيحة: قم بتحديث بنود اليومية بالجملة</b>"
+
+#. module: odex30_account_accountant
+#: model_terms:digest.tip,tip_description:odex30_account_accountant.digest_tip_account_accountant_1
+msgid ""
+"<b class=\"tip_title\">Tip: Find an Accountant or register your Accounting "
+"Firm</b>"
+msgstr ""
+"<b class=\"tip_title\">نصيحة: اعثر على محاسب ليقوم بتسجيل شركة المحاسبة "
+"الخاصة بك</b>"
+
+#. module: odex30_account_accountant
+#: model_terms:ir.ui.view,arch_db:odex30_account_accountant.account_reconcile_model_form_inherit_account_accountant
+msgid ""
+"<i title=\"Run manually\" role=\"img\" aria-label=\"Run manually\" "
+"class=\"fa fa-refresh\"/>\n"
+"                            Run manually"
+msgstr ""
+"<i title=\"التشغيل يدوياً \" role=\"img\" aria-label=\"Run manually\" "
+"class=\"fa fa-refresh\"/>\n"
+"                            التشغيل يدوياً "
+
+#. module: odex30_account_accountant
+#: model_terms:ir.ui.view,arch_db:odex30_account_accountant.view_account_change_lock_date
+msgid "<i>Lock transactions up to specific dates, inclusive</i>"
+msgstr "<i>قفل المعاملات حتى تواريخ محددة، شاملة التواريخ نفسها</i> "
+
+#. module: odex30_account_accountant
+#: model_terms:ir.ui.view,arch_db:odex30_account_accountant.view_move_form_inherit
+msgid "<span class=\"o_stat_text\">1 Bank Transaction</span>"
+msgstr "<span class=\"o_stat_text\">معاملة بنكية واحدة 1</span>"
+
+#. module: odex30_account_accountant
+#: model_terms:ir.ui.view,arch_db:odex30_account_accountant.view_move_form_inherit
+msgid "<span class=\"o_stat_text\">Bank Statement</span>"
+msgstr "<span class=\"o_stat_text\">كشف حساب بنكي</span> "
+
+#. module: odex30_account_accountant
+#: model_terms:ir.ui.view,arch_db:odex30_account_accountant.view_account_reconcile_wizard
+msgid ""
+"<span class=\"oe_inline o_form_label mx-3\" invisible=\"reco_currency_id == "
+"company_currency_id\"> in </span>"
+msgstr ""
+"<span class=\"oe_inline o_form_label mx-3\" invisible=\"reco_currency_id == "
+"company_currency_id\"> في </span>"
+
+#. module: odex30_account_accountant
+#: model_terms:ir.ui.view,arch_db:odex30_account_accountant.view_account_reconcile_wizard
+msgid ""
+"<span class=\"oe_inline o_form_label mx-3\" "
+"invisible=\"single_currency_mode\"> in </span>"
+msgstr ""
+"<span class=\"oe_inline o_form_label mx-3\" "
+"invisible=\"single_currency_mode\"> في </span>"
+
+#. module: odex30_account_accountant
+#: model_terms:ir.ui.view,arch_db:odex30_account_accountant.view_account_change_lock_date
+msgid ""
+"<span class=\"text-danger o_form_label\" invisible=\"hard_lock_date == "
+"current_hard_lock_date\">\n"
+"                                            <i>This change is irreversible</"
+"i>\n"
+"                                        </span>"
+msgstr ""
+"<span class=\"text-danger o_form_label\" invisible=\"hard_lock_date == "
+"current_hard_lock_date\">\n"
+"                                            <i>لا يمكن التراجع عن هذا "
+"التغيير</i>\n"
+"                                        </span>"
+
+#. module: odex30_account_accountant
+#: model_terms:ir.ui.view,arch_db:odex30_account_accountant.view_account_change_lock_date
+msgid ""
+"<span class=\"text-muted o_form_label\" invisible=\"not "
+"min_fiscalyear_lock_date_exception_for_me_id                                                  "
+"or not min_fiscalyear_lock_date_exception_for_everyone_id\">\n"
+"                                      <span style=\"white-space: pre\">; </"
+"span>\n"
+"                                </span>"
+msgstr ""
+"<span class=\"text-muted o_form_label\" invisible=\"not "
+"min_fiscalyear_lock_date_exception_for_me_id                                                  "
+"or not min_fiscalyear_lock_date_exception_for_everyone_id\">\n"
+"                                      <span style=\"white-space: pre\">; </"
+"span>\n"
+"                                </span>"
+
+#. module: odex30_account_accountant
+#: model_terms:ir.ui.view,arch_db:odex30_account_accountant.view_account_change_lock_date
+msgid ""
+"<span class=\"text-muted o_form_label\" invisible=\"not "
+"min_purchase_lock_date_exception_for_me_id                                                  "
+"or not min_purchase_lock_date_exception_for_everyone_id\">\n"
+"                                      <span style=\"white-space: pre\">; </"
+"span>\n"
+"                                </span>"
+msgstr ""
+"<span class=\"text-muted o_form_label\" invisible=\"not "
+"min_purchase_lock_date_exception_for_me_id                                                  "
+"or not min_purchase_lock_date_exception_for_everyone_id\">\n"
+"                                      <span style=\"white-space: pre\">; </"
+"span>\n"
+"                                </span>"
+
+#. module: odex30_account_accountant
+#: model_terms:ir.ui.view,arch_db:odex30_account_accountant.view_account_change_lock_date
+msgid ""
+"<span class=\"text-muted o_form_label\" invisible=\"not "
+"min_sale_lock_date_exception_for_me_id                                                  "
+"or not min_sale_lock_date_exception_for_everyone_id\">\n"
+"                                      <span style=\"white-space: pre\">; </"
+"span>\n"
+"                                </span>"
+msgstr ""
+"<span class=\"text-muted o_form_label\" invisible=\"not "
+"min_sale_lock_date_exception_for_me_id                                                  "
+"or not min_sale_lock_date_exception_for_everyone_id\">\n"
+"                                      <span style=\"white-space: pre\">; </"
+"span>\n"
+"                                </span>"
+
+#. module: odex30_account_accountant
+#: model_terms:ir.ui.view,arch_db:odex30_account_accountant.view_account_change_lock_date
+msgid ""
+"<span class=\"text-muted o_form_label\" invisible=\"not "
+"min_tax_lock_date_exception_for_me_id                                                  "
+"or not min_tax_lock_date_exception_for_everyone_id\">\n"
+"                                      <span style=\"white-space: pre\">; </"
+"span>\n"
+"                                </span>"
+msgstr ""
+"<span class=\"text-muted o_form_label\" invisible=\"not "
+"min_tax_lock_date_exception_for_me_id                                                  "
+"or not min_tax_lock_date_exception_for_everyone_id\">\n"
+"                                      <span style=\"white-space: pre\">; </"
+"span>\n"
+"                                </span>"
+
+#. module: odex30_account_accountant
+#: model_terms:ir.ui.view,arch_db:odex30_account_accountant.view_account_change_lock_date
+msgid ""
+"<span class=\"text-muted\" "
+"invisible=\"min_fiscalyear_lock_date_exception_for_me_id or "
+"min_fiscalyear_lock_date_exception_for_everyone_id\">\n"
+"                                    <i>but allow exceptions</i>\n"
+"                                </span>"
+msgstr ""
+"<span class=\"text-muted\" "
+"invisible=\"min_fiscalyear_lock_date_exception_for_me_id or "
+"min_fiscalyear_lock_date_exception_for_everyone_id\">\n"
+"                                    <i>ولكن يُسمَح بالاستثناءات</i>\n"
+"                                </span> "
+
+#. module: odex30_account_accountant
+#: model_terms:ir.ui.view,arch_db:odex30_account_accountant.view_account_change_lock_date
+msgid ""
+"<span class=\"text-muted\" invisible=\"min_tax_lock_date_exception_for_me_id "
+"or min_tax_lock_date_exception_for_everyone_id\">\n"
+"                                    <i>after a tax closing</i>\n"
+"                                </span>"
+msgstr ""
+"<span class=\"text-muted\" invisible=\"min_tax_lock_date_exception_for_me_id "
+"or min_tax_lock_date_exception_for_everyone_id\">\n"
+"                                    <i>بعد الإقفال الضريبي</i>\n"
+"                                </span> "
+
+#. module: odex30_account_accountant
+#: model_terms:digest.tip,tip_description:odex30_account_accountant.digest_tip_account_accountant_1
+msgid "<span class=\"tip_button_text\">Find an Accountant</span>"
+msgstr "<span class=\"tip_button_text\">اعثر على محاسب</span>"
+
+#. module: odex30_account_accountant
+#: model_terms:digest.tip,tip_description:odex30_account_accountant.digest_tip_account_accountant_1
+msgid "<span class=\"tip_button_text\">Register your Accounting Firm</span>"
+msgstr ""
+"<span class=\"tip_button_text\">قم بتسجيل شركة المحاسبة الخاصة بك</span>"
+
+#. module: odex30_account_accountant
+#: model_terms:ir.ui.view,arch_db:odex30_account_accountant.view_account_reconcile_wizard
+msgid "<span> (</span>"
+msgstr "<span> (</span>"
+
+#. module: odex30_account_accountant
+#: model_terms:ir.ui.view,arch_db:odex30_account_accountant.view_account_reconcile_wizard
+msgid "<span>)</span>"
+msgstr "<span>)</span>"
+
+#. module: odex30_account_accountant
+#: model_terms:web_tour.tour,rainbow_man_message:odex30_account_accountant.odex30_account_accountant_tour
+msgid ""
+"<span><strong><b>Good job!</b> You went through all steps of this tour.</"
+"strong>\n"
+"            <br>See how to manage your customer invoices in the <b>Customers/"
+"Invoices</b> menu\n"
+"        </span>"
+msgstr ""
+"<span><strong><b>عمل رائع!</b> لقد اجتزت كافة خطوات هذه الجولة.</strong>\n"
+"            <br>تعرّف على كيفية إدارة فواتير العملاء من قائمة <b>العملاء/"
+"فواتير العملاء</b>\n"
+"        </span>"
+
+#. module: odex30_account_accountant
+#: model_terms:ir.ui.view,arch_db:odex30_account_accountant.view_account_change_lock_date
+msgid "<span>Exception</span>"
+msgstr "<span>استثناء</span> "
+
+#. module: odex30_account_accountant
+#. odoo-javascript
+#: code:addons/odex30_account_accountant/static/src/components/bank_reconciliation/bank_rec_form.xml:0
+#: code:addons/odex30_account_accountant/static/src/components/bank_reconciliation/kanban.js:0
+#: model:ir.model,name:odex30_account_accountant.model_account_account
+#: model:ir.model.fields,field_description:odex30_account_accountant.field_account_reconcile_wizard__account_id
+#: model:ir.model.fields,field_description:odex30_account_accountant.field_bank_rec_widget_line__account_id
+#: model_terms:ir.ui.view,arch_db:odex30_account_accountant.view_account_move_line_reconcile_search
+msgid "Account"
+msgstr "الحساب "
+
+#. module: odex30_account_accountant
+#: model:ir.model,name:odex30_account_accountant.model_account_chart_template
+msgid "Account Chart Template"
+msgstr "نموذج مخطط الحساب "
+
+#. module: odex30_account_accountant
+#: model:ir.actions.act_window,name:odex30_account_accountant.action_account_group_tree
+#: model:ir.ui.menu,name:odex30_account_accountant.menu_account_group
+msgid "Account Groups"
+msgstr "مجموعات الحساب"
+
+#. module: odex30_account_accountant
+#: model:ir.actions.act_window,name:odex30_account_accountant.account_tag_action
+#: model:ir.ui.menu,name:odex30_account_accountant.account_tag_menu
+msgid "Account Tags"
+msgstr "علامات تصنيف الحساب "
+
+#. module: odex30_account_accountant
+#: model:ir.model.fields,field_description:odex30_account_accountant.field_account_reconcile_wizard__transfer_from_account_id
+msgid "Account Transfer From"
+msgstr "استمارة تحويل الحساب "
+
+#. module: odex30_account_accountant
+#: model:ir.model,name:odex30_account_accountant.model_account_auto_reconcile_wizard
+msgid "Account automatic reconciliation wizard"
+msgstr "معالج تسوية الحساب الآلية "
+
+#. module: odex30_account_accountant
+#: model:ir.model,name:odex30_account_accountant.model_account_reconcile_wizard
+msgid "Account reconciliation wizard"
+msgstr "معالج تسوية الحساب "
+
+#. module: odex30_account_accountant
+#: model:ir.model.fields,help:odex30_account_accountant.field_res_config_settings__deferred_expense_account_id
+msgid "Account used for deferred expenses"
+msgstr "الحساب المستخدم للنفقات المؤجلة "
+
+#. module: odex30_account_accountant
+#: model:ir.model.fields,help:odex30_account_accountant.field_res_config_settings__deferred_revenue_account_id
+msgid "Account used for deferred revenues"
+msgstr "الحساب المستخدم للإيرادات المؤجلة "
+
+#. module: odex30_account_accountant
+#: model:ir.model.fields,field_description:odex30_account_accountant.field_account_auto_reconcile_wizard__account_ids
+msgid "Accounts"
+msgstr "الحسابات"
+
+#. module: odex30_account_accountant
+#: model:ir.model.fields,field_description:odex30_account_accountant.field_account_bank_statement__message_needaction
+msgid "Action Needed"
+msgstr "إجراء مطلوب"
+
+#. module: odex30_account_accountant
+#. odoo-javascript
+#: code:addons/odex30_account_accountant/static/src/components/bank_reconciliation/bank_rec_quick_create.xml:0
+msgid "Add & Close"
+msgstr "إضافة وإغلاق "
+
+#. module: odex30_account_accountant
+#. odoo-javascript
+#: code:addons/odex30_account_accountant/static/src/components/bank_reconciliation/bank_rec_quick_create.xml:0
+msgid "Add & New"
+msgstr "إضافة وجديد "
+
+#. module: odex30_account_accountant
+#: model_terms:ir.actions.act_window,help:odex30_account_accountant.account_tag_action
+msgid "Add a new tag"
+msgstr "إضافة علامة تصنيف جديدة "
+
+#. module: odex30_account_accountant
+#. odoo-javascript
+#: code:addons/odex30_account_accountant/static/src/js/tours/odex30_account_accountant.js:0
+msgid ""
+"After the data extraction, check and validate the bill. If no vendor has "
+"been found, add one before validating."
+msgstr ""
+"بعد استخلاص البيانات، تحقق من الفاتورة وقم بتصديقها. في حال عدم إيجادك "
+"لمورّد، قم بإضافة واحد قبل التصديق. "
+
+#. module: odex30_account_accountant
+#. odoo-javascript
+#: code:addons/odex30_account_accountant/static/src/components/bank_reconciliation/finish_buttons.xml:0
+msgid "All Transactions"
+msgstr "كافة المعاملات "
+
+#. module: odex30_account_accountant
+#: model:ir.model.fields,field_description:odex30_account_accountant.field_account_reconcile_wizard__reco_model_autocomplete_ids
+msgid "All reconciliation models"
+msgstr "كافة نماذج التسوية "
+
+#. module: odex30_account_accountant
+#: model:ir.model.fields,field_description:odex30_account_accountant.field_account_reconcile_wizard__allow_partials
+msgid "Allow partials"
+msgstr "السماج بالأجزاء "
+
+#. module: odex30_account_accountant
+#: model:res.groups,name:odex30_account_accountant.group_fiscal_year
+msgid "Allow to define fiscal years of more or less than a year"
+msgstr "السماح بإنشاء سنوات مالية أطول أو أقصر من عام"
+
+#. module: odex30_account_accountant
+#. odoo-javascript
+#: code:addons/odex30_account_accountant/static/src/components/bank_reconciliation/bank_rec_form.xml:0
+#: code:addons/odex30_account_accountant/static/src/components/bank_reconciliation/kanban.js:0
+#: model:ir.model.fields,field_description:odex30_account_accountant.field_account_reconcile_wizard__amount_currency
+#: model_terms:ir.ui.view,arch_db:odex30_account_accountant.view_account_move_line_reconcile_search
+#: model_terms:ir.ui.view,arch_db:odex30_account_accountant.view_account_reconcile_wizard
+msgid "Amount"
+msgstr "مبلغ"
+
+#. module: odex30_account_accountant
+#: model:ir.model.fields,field_description:odex30_account_accountant.field_bank_rec_widget_line__amount_currency
+msgid "Amount Currency"
+msgstr "عملة المبلغ"
+
+#. module: odex30_account_accountant
+#: model_terms:ir.ui.view,arch_db:odex30_account_accountant.view_account_move_line_list_bank_rec_widget
+msgid "Amount Due"
+msgstr "المبلغ المستحق"
+
+#. module: odex30_account_accountant
+#: model_terms:ir.ui.view,arch_db:odex30_account_accountant.view_account_move_line_list_bank_rec_widget
+msgid "Amount Due (in currency)"
+msgstr "المبلغ المستحق (بالعملة) "
+
+#. module: odex30_account_accountant
+#. odoo-javascript
+#: code:addons/odex30_account_accountant/static/src/components/bank_reconciliation/kanban.js:0
+#: model:ir.model.fields,field_description:odex30_account_accountant.field_bank_rec_widget_line__amount_transaction_currency
+msgid "Amount in Currency"
+msgstr "المبلغ بالعملة"
+
+#. module: odex30_account_accountant
+#: model:ir.model.fields,field_description:odex30_account_accountant.field_account_reconcile_wizard__amount
+msgid "Amount in company currency"
+msgstr "المبلغ بعملة الشركة "
+
+#. module: odex30_account_accountant
+#. odoo-python
+#: code:addons/odex30_account_accountant/wizard/account_reconcile_wizard.py:0
+msgid ""
+"An entry will transfer %(amount)s from %(from_account)s to %(to_account)s."
+msgstr "سيقوم القيد بتحويل %(amount)s من %(from_account)s إلى %(to_account)s. "
+
+#. module: odex30_account_accountant
+#. odoo-javascript
+#: code:addons/odex30_account_accountant/static/src/components/bank_reconciliation/bank_rec_form.xml:0
+#: code:addons/odex30_account_accountant/static/src/components/bank_reconciliation/kanban.js:0
+msgid "Analytic"
+msgstr "تحليلي"
+
+#. module: odex30_account_accountant
+#: model:ir.model.fields,field_description:odex30_account_accountant.field_bank_rec_widget_line__analytic_distribution
+msgid "Analytic Distribution"
+msgstr "التوزيع التحليلي"
+
+#. module: odex30_account_accountant
+#: model:ir.model.fields,field_description:odex30_account_accountant.field_bank_rec_widget_line__analytic_precision
+msgid "Analytic Precision"
+msgstr "الدقة التحليلية "
+
+#. module: odex30_account_accountant
+#: model:ir.model.fields,field_description:odex30_account_accountant.field_res_config_settings__use_anglo_saxon
+msgid "Anglo-Saxon Accounting"
+msgstr "المحاسبة الأنجلو-ساكسونية"
+
+#. module: odex30_account_accountant
+#: model:ir.model.fields,help:odex30_account_accountant.field_account_change_lock_date__current_hard_lock_date
+#: model:ir.model.fields,help:odex30_account_accountant.field_account_change_lock_date__hard_lock_date
+msgid ""
+"Any entry up to and including that date will be postponed to a later time, "
+"in accordance with its journal sequence. This lock date is irreversible and "
+"does not allow any exception."
+msgstr ""
+"سيتم تأجيل أي قيد حتى ذلك التاريخ إلى وقت لاحق، وفقًا لتسلسل دفتر اليومية "
+"الخاص به. لا يمكن التراجع عن تاريخ القفل هذا ولا يسمح بأي استثناء. "
+
+#. module: odex30_account_accountant
+#: model:ir.model.fields,help:odex30_account_accountant.field_account_change_lock_date__fiscalyear_lock_date
+msgid ""
+"Any entry up to and including that date will be postponed to a later time, "
+"in accordance with its journal's sequence."
+msgstr ""
+"أي قيد إلى ذلك التاريخ سيتم تأجيله إلى وقت لاحق، وفقًا لتسلسله في دفتر "
+"اليومية. "
+
+#. module: odex30_account_accountant
+#: model:ir.model.fields,help:odex30_account_accountant.field_account_change_lock_date__tax_lock_date
+msgid ""
+"Any entry with taxes up to and including that date will be postponed to a "
+"later time, in accordance with its journal's sequence. The tax lock date is "
+"automatically set when the tax closing entry is posted."
+msgstr ""
+"سيتم تأجيل أي قيد يتضمن ضرائب حتى ذلك التاريخ إلى وقت لاحق، وفقاً لتسلسل دفتر "
+"اليومية الخاص به. يتم تعيين تاريخ قفل الضرائب تلقائياً عند ترحيل قيد الإقفال "
+"الضريبي. "
+
+#. module: odex30_account_accountant
+#: model:ir.model.fields,help:odex30_account_accountant.field_account_change_lock_date__purchase_lock_date
+msgid ""
+"Any purchase entry prior to and including this date will be postponed to a "
+"later date, in accordance with its journal's sequence."
+msgstr ""
+"أي قيد شراء قبل ذلك التاريخ سيتم تأجيله إلى تاريخ لاحق، وفقاً لتسلسله في دفتر "
+"اليومية. "
+
+#. module: odex30_account_accountant
+#: model:ir.model.fields,help:odex30_account_accountant.field_account_change_lock_date__sale_lock_date
+msgid ""
+"Any sales entry prior to and including this date will be postponed to a "
+"later date, in accordance with its journal's sequence."
+msgstr ""
+"أي قيد بيع قبل ذلك التاريخ سيتم تأجيله إلى تاريخ لاحق، وفقاً لتسلسله في دفتر "
+"اليومية. "
+
+#. module: odex30_account_accountant
+#: model:ir.model.fields,field_description:odex30_account_accountant.field_account_bank_statement__message_attachment_count
+msgid "Attachment Count"
+msgstr "عدد المرفقات"
+
+#. module: odex30_account_accountant
+#: model:ir.model.fields,field_description:odex30_account_accountant.field_res_config_settings__sign_invoice
+msgid "Authorized Signatory on invoice"
+msgstr "الموقِّع المصرّح له في الفاتورة "
+
+#. module: odex30_account_accountant
+#: model_terms:ir.ui.view,arch_db:odex30_account_accountant.report_invoice_document
+msgid "Authorized signatory"
+msgstr "الموقِّع المصرّح له "
+
+#. module: odex30_account_accountant
+#. odoo-javascript
+#: code:addons/odex30_account_accountant/static/src/components/move_line_list_reconcile/move_line_list_reconcile.xml:0
+msgid "Auto-reconcile"
+msgstr "التسوية التلقائية "
+
+#. module: odex30_account_accountant
+#. odoo-python
+#: code:addons/odex30_account_accountant/wizard/account_auto_reconcile_wizard.py:0
+msgid "Automatically Reconciled Entries"
+msgstr "القيود المسواة آلياً "
+
+#. module: odex30_account_accountant
+#: model:ir.model.fields,field_description:odex30_account_accountant.field_bank_rec_widget__available_reco_model_ids
+msgid "Available Reco Model"
+msgstr "نموذج التسوية المتاح "
+
+#. module: odex30_account_accountant
+#. odoo-javascript
+#: code:addons/odex30_account_accountant/static/src/components/bank_reconciliation/finish_buttons.xml:0
+msgid "Back to"
+msgstr "العودة إلى "
+
+#. module: odex30_account_accountant
+#. odoo-javascript
+#: code:addons/odex30_account_accountant/static/src/components/bank_reconciliation/global_info.xml:0
+#: model:ir.model.fields,field_description:odex30_account_accountant.field_bank_rec_widget_line__balance
+msgid "Balance"
+msgstr "الرصيد"
+
+#. module: odex30_account_accountant
+#: model:ir.model.fields,field_description:odex30_account_accountant.field_digest_digest__kpi_account_bank_cash
+msgid "Bank & Cash Moves"
+msgstr "تحركات النقد والبنوك "
+
+#. module: odex30_account_accountant
+#. odoo-javascript
+#: code:addons/odex30_account_accountant/static/src/components/bank_reconciliation/bank_rec_form.xml:0
+#: model:ir.model.fields,field_description:odex30_account_accountant.field_bank_rec_widget_line__bank_account
+msgid "Bank Account"
+msgstr "الحساب البنكي"
+
+#. module: odex30_account_accountant
+#. odoo-python
+#: code:addons/odex30_account_accountant/models/account_bank_statement.py:0
+#: model:ir.actions.act_window,name:odex30_account_accountant.action_bank_statement_line_transactions
+#: model:ir.actions.act_window,name:odex30_account_accountant.action_bank_statement_line_transactions_kanban
+msgid "Bank Reconciliation"
+msgstr "التسوية البنكية"
+
+#. module: odex30_account_accountant
+#: model:ir.model,name:odex30_account_accountant.model_account_bank_statement
+#: model_terms:ir.ui.view,arch_db:odex30_account_accountant.view_bank_statement_form_bank_rec_widget
+msgid "Bank Statement"
+msgstr "كشف الحساب البنكي "
+
+#. module: odex30_account_accountant
+#. odoo-python
+#: code:addons/odex30_account_accountant/models/account_bank_statement.py:0
+msgid "Bank Statement %s.pdf"
+msgstr "كشف الحساب البنكي %s.pdf "
+
+#. module: odex30_account_accountant
+#: model:ir.model,name:odex30_account_accountant.model_account_bank_statement_line
+msgid "Bank Statement Line"
+msgstr "بند كشف الحساب البنكي"
+
+#. module: odex30_account_accountant
+#. odoo-python
+#: code:addons/odex30_account_accountant/models/account_bank_statement.py:0
+msgid "Bank Statement.pdf"
+msgstr "كشف الحساب البنكي.pdf"
+
+#. module: odex30_account_accountant
+#: model:ir.model,name:odex30_account_accountant.model_bank_rec_widget
+msgid "Bank reconciliation widget for a single statement line"
+msgstr "أداة التسوية البنكية لبند كشف حساب واحد "
+
+#. module: odex30_account_accountant
+#: model_terms:ir.ui.view,arch_db:odex30_account_accountant.res_config_settings_view_form
+msgid "Based on"
+msgstr "بناءً على"
+
+#. module: odex30_account_accountant
+#: model_terms:ir.ui.view,arch_db:odex30_account_accountant.view_account_reconcile_model_widget_wizard
+#: model_terms:ir.ui.view,arch_db:odex30_account_accountant.view_bank_statement_line_form_bank_rec_widget
+msgid "Cancel"
+msgstr "إلغاء"
+
+#. module: odex30_account_accountant
+#: model:ir.model,name:odex30_account_accountant.model_account_change_lock_date
+msgid "Change Lock Date"
+msgstr "تغيير تاريخ الإقفال"
+
+#. module: odex30_account_accountant
+#: model:ir.model.fields,help:odex30_account_accountant.field_account_reconcile_wizard__to_check
+msgid "Check if you are not certain of all the information of the counterpart."
+msgstr "تحقق من تأكدك من كافة المعلومات المقابلة. "
+
+#. module: odex30_account_accountant
+#: model:ir.model.fields,field_description:odex30_account_accountant.field_bank_rec_widget__st_line_checked
+msgid "Checked"
+msgstr "تم تحديده "
+
+#. module: odex30_account_accountant
+#. odoo-javascript
+#: code:addons/odex30_account_accountant/static/src/components/move_line_list/move_line_list.xml:0
+msgid "Choose a line to preview its attachments."
+msgstr "قم بتحديد بند لمعاينة مرفقاته. "
+
+#. module: odex30_account_accountant
+#: model:ir.model.fields.selection,name:odex30_account_accountant.selection__account_auto_reconcile_wizard__search_mode__zero_balance
+msgid "Clear Account"
+msgstr "تصفية الحساب "
+
+#. module: odex30_account_accountant
+#: model_terms:ir.actions.act_window,help:odex30_account_accountant.actions_account_fiscal_year
+msgid "Click here to create a new fiscal year."
+msgstr "انقر هنا لإنشاء سنة مالية جديدة."
+
+#. module: odex30_account_accountant
+#: model_terms:digest.tip,tip_description:odex30_account_accountant.digest_tip_account_accountant_1
+msgid ""
+"Click here to find an accountant or if you want to list out your accounting "
+"services on Odoo"
+msgstr ""
+"انقر هنا لإيجاد محاسب أو إذا كنت ترغب في إدراج خدماتك المحاسبية على أودو "
+
+#. module: odex30_account_accountant
+#. odoo-javascript
+#: code:addons/odex30_account_accountant/static/src/js/tours/odex30_account_accountant.js:0
+msgid ""
+"Click on a fetched bank transaction to start the reconciliation process."
+msgstr "انقر على المعاملة المصرفية التي تم جلبها لبدء عملية التسوية. "
+
+#. module: odex30_account_accountant
+#: model:ir.model,name:odex30_account_accountant.model_res_company
+msgid "Companies"
+msgstr "الشركات"
+
+#. module: odex30_account_accountant
+#: model:ir.model.fields,field_description:odex30_account_accountant.field_account_auto_reconcile_wizard__company_id
+#: model:ir.model.fields,field_description:odex30_account_accountant.field_account_change_lock_date__company_id
+#: model:ir.model.fields,field_description:odex30_account_accountant.field_account_fiscal_year__company_id
+#: model:ir.model.fields,field_description:odex30_account_accountant.field_account_reconcile_wizard__company_id
+#: model:ir.model.fields,field_description:odex30_account_accountant.field_bank_rec_widget__company_id
+#: model:ir.model.fields,field_description:odex30_account_accountant.field_bank_rec_widget_line__company_id
+msgid "Company"
+msgstr "الشركة "
+
+#. module: odex30_account_accountant
+#: model:ir.model.fields,field_description:odex30_account_accountant.field_account_reconcile_wizard__company_currency_id
+msgid "Company currency"
+msgstr "عملة الشركة "
+
+#. module: odex30_account_accountant
+#: model:ir.model,name:odex30_account_accountant.model_res_config_settings
+msgid "Config Settings"
+msgstr "تهيئة الإعدادات "
+
+#. module: odex30_account_accountant
+#. odoo-javascript
+#: code:addons/odex30_account_accountant/static/src/js/tours/odex30_account_accountant.js:0
+msgid "Confirm the transaction."
+msgstr "قم بتأكيد المعاملة. "
+
+#. module: odex30_account_accountant
+#. odoo-javascript
+#: code:addons/odex30_account_accountant/static/src/components/bank_reconciliation/rainbowman_content.xml:0
+msgid "Congrats, you're all done!"
+msgstr "تهانينا، لقد انتهيت!"
+
+#. module: odex30_account_accountant
+#. odoo-javascript
+#: code:addons/odex30_account_accountant/static/src/js/tours/odex30_account_accountant.js:0
+msgid "Connect your bank and get your latest transactions."
+msgstr "قم بربط مصرفك لتتمكن من رؤية أحدث معاملاتك. "
+
+#. module: odex30_account_accountant
+#: model_terms:ir.ui.view,arch_db:odex30_account_accountant.view_account_reconcile_model_widget_wizard
+msgid "Counterpart Values"
+msgstr "قيم مقابلة"
+
+#. module: odex30_account_accountant
+#: model:ir.model.fields,field_description:odex30_account_accountant.field_bank_rec_widget__country_code
+#: model:ir.model.fields,field_description:odex30_account_accountant.field_bank_rec_widget_line__country_code
+msgid "Country Code"
+msgstr "رمز الدولة "
+
+#. module: odex30_account_accountant
+#: model:ir.actions.act_window,name:odex30_account_accountant.action_bank_statement_form_bank_rec_widget
+msgid "Create Statement"
+msgstr "إنشاء كشف الحساب"
+
+#. module: odex30_account_accountant
+#: model_terms:ir.actions.act_window,help:odex30_account_accountant.action_account_group_tree
+msgid "Create a new account group"
+msgstr "إنشاء مجموعة حساب جديدة "
+
+#. module: odex30_account_accountant
+#. odoo-javascript
+#: code:addons/odex30_account_accountant/static/src/js/tours/odex30_account_accountant.js:0
+msgid "Create a new transaction."
+msgstr "إنشاء معاملة جديدة. "
+
+#. module: odex30_account_accountant
+#. odoo-javascript
+#: code:addons/odex30_account_accountant/static/src/components/bank_reconciliation/bank_rec_form.xml:0
+msgid "Create model"
+msgstr "إنشاء نموذج "
+
+#. module: odex30_account_accountant
+#. odoo-javascript
+#: code:addons/odex30_account_accountant/static/src/js/tours/odex30_account_accountant.js:0
+msgid ""
+"Create your first vendor bill.<br/><br/><i>Tip: If you don’t have one on "
+"hand, use our sample bill.</i>"
+msgstr ""
+"أنشئ فاتورة المورّد الأولى الخاصة بك. <br/><br/><i>نصيحة: إذا لم تكن لديك "
+"فاتورة في متناول اليد، فبإمكانك الاستعانة بنموذج الفاتورة لدينا.</i> "
+
+#. module: odex30_account_accountant
+#: model:ir.model.fields,field_description:odex30_account_accountant.field_account_auto_reconcile_wizard__create_uid
+#: model:ir.model.fields,field_description:odex30_account_accountant.field_account_change_lock_date__create_uid
+#: model:ir.model.fields,field_description:odex30_account_accountant.field_account_fiscal_year__create_uid
+#: model:ir.model.fields,field_description:odex30_account_accountant.field_account_reconcile_wizard__create_uid
+msgid "Created by"
+msgstr "أنشئ بواسطة"
+
+#. module: odex30_account_accountant
+#: model:ir.model.fields,field_description:odex30_account_accountant.field_account_auto_reconcile_wizard__create_date
+#: model:ir.model.fields,field_description:odex30_account_accountant.field_account_change_lock_date__create_date
+#: model:ir.model.fields,field_description:odex30_account_accountant.field_account_fiscal_year__create_date
+#: model:ir.model.fields,field_description:odex30_account_accountant.field_account_reconcile_wizard__create_date
+msgid "Created on"
+msgstr "أنشئ في"
+
+#. module: odex30_account_accountant
+#. odoo-javascript
+#: code:addons/odex30_account_accountant/static/src/components/bank_reconciliation/kanban.js:0
+#: model:ir.model.fields,field_description:odex30_account_accountant.field_bank_rec_widget_line__credit
+msgid "Credit"
+msgstr "الدائن"
+
+#. module: odex30_account_accountant
+#: model:ir.model.fields,field_description:odex30_account_accountant.field_account_bank_statement_line__cron_last_check
+msgid "Cron Last Check"
+msgstr "آخر فحص Cron "
+
+#. module: odex30_account_accountant
+#. odoo-javascript
+#: code:addons/odex30_account_accountant/static/src/components/bank_reconciliation/kanban.js:0
+#: model:ir.model.fields,field_description:odex30_account_accountant.field_bank_rec_widget_line__currency_id
+#: model_terms:ir.ui.view,arch_db:odex30_account_accountant.view_move_line_reconcile_tree
+msgid "Currency"
+msgstr "العملة"
+
+#. module: odex30_account_accountant
+#: model:ir.model.fields,field_description:odex30_account_accountant.field_account_reconcile_wizard__reco_currency_id
+msgid "Currency to use for reconciliation"
+msgstr "العملة لاستخدامها في التسوية "
+
+#. module: odex30_account_accountant
+#: model:ir.model.fields,field_description:odex30_account_accountant.field_account_change_lock_date__current_hard_lock_date
+msgid "Current Hard Lock"
+msgstr "تاريخ القفل الثابت الحالي "
+
+#. module: odex30_account_accountant
+#. odoo-python
+#: code:addons/odex30_account_accountant/models/bank_rec_widget.py:0
+msgid "Customer/Vendor"
+msgstr "العميل/المورد"
+
+#. module: odex30_account_accountant
+#. odoo-javascript
+#: code:addons/odex30_account_accountant/static/src/components/bank_reconciliation/bank_rec_form.xml:0
+#: code:addons/odex30_account_accountant/static/src/components/bank_reconciliation/kanban.js:0
+#: model:ir.model.fields,field_description:odex30_account_accountant.field_account_reconcile_wizard__date
+#: model:ir.model.fields,field_description:odex30_account_accountant.field_bank_rec_widget_line__date
+#: model_terms:ir.ui.view,arch_db:odex30_account_accountant.view_account_move_line_reconcile_search
+#: model_terms:ir.ui.view,arch_db:odex30_account_accountant.view_account_move_line_search_bank_rec_widget
+#: model_terms:ir.ui.view,arch_db:odex30_account_accountant.view_bank_statement_line_search_bank_rec_widget
+msgid "Date"
+msgstr "التاريخ"
+
+#. module: odex30_account_accountant
+#: model:ir.model.fields,help:odex30_account_accountant.field_account_move_line__deferred_end_date
+msgid "Date at which the deferred expense/revenue ends"
+msgstr "التاريخ الذي تنتهي فيه النفقات/الإيرادات المؤجلة "
+
+#. module: odex30_account_accountant
+#: model:ir.model.fields,help:odex30_account_accountant.field_account_move_line__deferred_start_date
+msgid "Date at which the deferred expense/revenue starts"
+msgstr "التاريخ الذي تبدأ فيه النفقات/الإيرادات المؤجلة "
+
+#. module: odex30_account_accountant
+#: model:ir.model.fields.selection,name:odex30_account_accountant.selection__res_company__deferred_expense_amount_computation_method__day
+#: model:ir.model.fields.selection,name:odex30_account_accountant.selection__res_company__deferred_revenue_amount_computation_method__day
+msgid "Days"
+msgstr "أيام "
+
+#. module: odex30_account_accountant
+#. odoo-javascript
+#: code:addons/odex30_account_accountant/static/src/components/bank_reconciliation/kanban.js:0
+#: model:ir.model.fields,field_description:odex30_account_accountant.field_bank_rec_widget_line__debit
+msgid "Debit"
+msgstr "المدين"
+
+#. module: odex30_account_accountant
+#: model:ir.model.fields,field_description:odex30_account_accountant.field_bank_rec_widget_line__journal_default_account_id
+msgid "Default Account"
+msgstr "الحساب الافتراضي "
+
+#. module: odex30_account_accountant
+#. odoo-python
+#: code:addons/odex30_account_accountant/models/account_move.py:0
+msgid "Deferral of %s"
+msgstr "تأجيل %s "
+
+#. module: odex30_account_accountant
+#. odoo-python
+#: code:addons/odex30_account_accountant/models/account_move.py:0
+#: model:ir.model.fields,field_description:odex30_account_accountant.field_account_bank_statement_line__deferred_move_ids
+#: model:ir.model.fields,field_description:odex30_account_accountant.field_account_move__deferred_move_ids
+#: model_terms:ir.ui.view,arch_db:odex30_account_accountant.view_move_form_inherit
+msgid "Deferred Entries"
+msgstr "القيم المؤجلة "
+
+#. module: odex30_account_accountant
+#: model:ir.model.fields,field_description:odex30_account_accountant.field_account_bank_statement_line__deferred_entry_type
+#: model:ir.model.fields,field_description:odex30_account_accountant.field_account_move__deferred_entry_type
+msgid "Deferred Entry Type"
+msgstr "نوع القيد المؤجل "
+
+#. module: odex30_account_accountant
+#: model:ir.model.fields.selection,name:odex30_account_accountant.selection__account_move__deferred_entry_type__expense
+msgid "Deferred Expense"
+msgstr "النفقات المؤجلة "
+
+#. module: odex30_account_accountant
+#: model:ir.model.fields,field_description:odex30_account_accountant.field_res_company__deferred_expense_account_id
+#: model:ir.model.fields,field_description:odex30_account_accountant.field_res_config_settings__deferred_expense_account_id
+msgid "Deferred Expense Account"
+msgstr "حساب النفقات المؤجلة "
+
+#. module: odex30_account_accountant
+#: model:ir.model.fields,field_description:odex30_account_accountant.field_res_company__deferred_expense_amount_computation_method
+#: model:ir.model.fields,field_description:odex30_account_accountant.field_res_config_settings__deferred_expense_amount_computation_method
+msgid "Deferred Expense Based on"
+msgstr "النفقات المؤجلة بناءً على "
+
+#. module: odex30_account_accountant
+#: model:ir.model.fields,field_description:odex30_account_accountant.field_res_company__deferred_expense_journal_id
+#: model:ir.model.fields,field_description:odex30_account_accountant.field_res_config_settings__deferred_expense_journal_id
+msgid "Deferred Expense Journal"
+msgstr "حساب الإيرادات المؤجلة "
+
+#. module: odex30_account_accountant
+#: model:ir.model.fields.selection,name:odex30_account_accountant.selection__account_move__deferred_entry_type__revenue
+msgid "Deferred Revenue"
+msgstr "الإيرادات المؤجلة "
+
+#. module: odex30_account_accountant
+#: model:ir.model.fields,field_description:odex30_account_accountant.field_res_company__deferred_revenue_account_id
+#: model:ir.model.fields,field_description:odex30_account_accountant.field_res_config_settings__deferred_revenue_account_id
+msgid "Deferred Revenue Account"
+msgstr "حساب الإيرادات المؤجلة "
+
+#. module: odex30_account_accountant
+#: model:ir.model.fields,field_description:odex30_account_accountant.field_res_company__deferred_revenue_amount_computation_method
+#: model:ir.model.fields,field_description:odex30_account_accountant.field_res_config_settings__deferred_revenue_amount_computation_method
+msgid "Deferred Revenue Based on"
+msgstr "الإيرادات المؤجلة بناءً على "
+
+#. module: odex30_account_accountant
+#: model:ir.model.fields,field_description:odex30_account_accountant.field_res_company__deferred_revenue_journal_id
+#: model:ir.model.fields,field_description:odex30_account_accountant.field_res_config_settings__deferred_revenue_journal_id
+msgid "Deferred Revenue Journal"
+msgstr "دفتر يومية الإيرادات المؤجلة "
+
+#. module: odex30_account_accountant
+#: model_terms:ir.ui.view,arch_db:odex30_account_accountant.res_config_settings_view_form
+msgid "Deferred expense"
+msgstr "النفقة المؤجلة "
+
+#. module: odex30_account_accountant
+#: model_terms:ir.ui.view,arch_db:odex30_account_accountant.res_config_settings_view_form
+msgid "Deferred expense entries:"
+msgstr "قيود النفقات المؤجلة: "
+
+#. module: odex30_account_accountant
+#: model_terms:ir.ui.view,arch_db:odex30_account_accountant.res_config_settings_view_form
+msgid "Deferred revenue"
+msgstr "الإيرادات المؤجلة "
+
+#. module: odex30_account_accountant
+#: model_terms:ir.ui.view,arch_db:odex30_account_accountant.res_config_settings_view_form
+msgid "Deferred revenue entries:"
+msgstr "قيود الإيرادات المؤجلة: "
+
+#. module: odex30_account_accountant
+#: model_terms:ir.ui.view,arch_db:odex30_account_accountant.res_config_settings_view_form
+msgid "Define fiscal years of more or less than one year"
+msgstr "تحديد السنوات المالية التي تزيد أو تقل عن السنة."
+
+#. module: odex30_account_accountant
+#: model_terms:ir.ui.view,arch_db:odex30_account_accountant.view_bank_statement_line_search_bank_rec_widget
+msgid "Deposits"
+msgstr "الدفعات المقدّمة"
+
+#. module: odex30_account_accountant
+#: model:ir.model,name:odex30_account_accountant.model_digest_digest
+msgid "Digest"
+msgstr "الموجز "
+
+#. module: odex30_account_accountant
+#: model_terms:ir.ui.view,arch_db:odex30_account_accountant.view_account_auto_reconcile_wizard
+#: model_terms:ir.ui.view,arch_db:odex30_account_accountant.view_account_change_lock_date
+#: model_terms:ir.ui.view,arch_db:odex30_account_accountant.view_account_reconcile_wizard
+msgid "Discard"
+msgstr "إهمال "
+
+#. module: odex30_account_accountant
+#: model_terms:ir.ui.view,arch_db:odex30_account_accountant.view_move_line_reconcile_tree
+msgid "Discount Amount"
+msgstr "مبلغ الخصم "
+
+#. module: odex30_account_accountant
+#: model_terms:ir.ui.view,arch_db:odex30_account_accountant.view_move_line_reconcile_tree
+msgid "Discount Date"
+msgstr "تاريخ الخصم"
+
+#. module: odex30_account_accountant
+#. odoo-javascript
+#: code:addons/odex30_account_accountant/static/src/components/bank_reconciliation/bank_rec_form.xml:0
+msgid "Discuss"
+msgstr "المناقشة "
+
+#. module: odex30_account_accountant
+#: model:ir.model.fields,field_description:odex30_account_accountant.field_account_reconcile_wizard__display_allow_partials
+msgid "Display Allow Partials"
+msgstr "عرض خيار السماح بعمليات التسوية الجزئية "
+
+#. module: odex30_account_accountant
+#: model:ir.model.fields,field_description:odex30_account_accountant.field_account_auto_reconcile_wizard__display_name
+#: model:ir.model.fields,field_description:odex30_account_accountant.field_account_change_lock_date__display_name
+#: model:ir.model.fields,field_description:odex30_account_accountant.field_account_fiscal_year__display_name
+#: model:ir.model.fields,field_description:odex30_account_accountant.field_account_reconcile_wizard__display_name
+#: model:ir.model.fields,field_description:odex30_account_accountant.field_bank_rec_widget__display_name
+#: model:ir.model.fields,field_description:odex30_account_accountant.field_bank_rec_widget_line__display_name
+msgid "Display Name"
+msgstr "اسم العرض "
+
+#. module: odex30_account_accountant
+#: model:ir.model.fields,field_description:odex30_account_accountant.field_bank_rec_widget_line__display_stroked_amount_currency
+msgid "Display Stroked Amount Currency"
+msgstr "عرض عملة المبلغ المشطوب "
+
+#. module: odex30_account_accountant
+#: model:ir.model.fields,field_description:odex30_account_accountant.field_bank_rec_widget_line__display_stroked_balance
+msgid "Display Stroked Balance"
+msgstr "عرض الرصيد المشطوب "
+
+#. module: odex30_account_accountant
+#: model:ir.model.fields,field_description:odex30_account_accountant.field_res_company__sign_invoice
+msgid "Display signing field on invoices"
+msgstr "عرض حقل التوقيع على الفاتورة "
+
+#. module: odex30_account_accountant
+#: model:ir.model.fields,field_description:odex30_account_accountant.field_bank_rec_widget_line__distribution_analytic_account_ids
+msgid "Distribution Analytic Account"
+msgstr "حساب التوزيع التحليلي "
+
+#. module: odex30_account_accountant
+#. odoo-python
+#: code:addons/odex30_account_accountant/models/digest.py:0
+msgid "Do not have access, skip this data for user's digest email"
+msgstr "لا تملك صلاحيات الوصول. تخط هذه البيانات لبريد الملخص للمستخدم. "
+
+#. module: odex30_account_accountant
+#: model_terms:ir.ui.view,arch_db:odex30_account_accountant.view_account_move_line_list_bank_rec_widget
+msgid "Document"
+msgstr "المستند "
+
+#. module: odex30_account_accountant
+#. odoo-python
+#: code:addons/odex30_account_accountant/wizard/account_change_lock_date.py:0
+msgid "Draft Entries"
+msgstr "القيود في حالة المسودة "
+
+#. module: odex30_account_accountant
+#: model:ir.model.fields,field_description:odex30_account_accountant.field_account_reconcile_wizard__edit_mode
+msgid "Edit Mode"
+msgstr "وضع التحرير "
+
+#. module: odex30_account_accountant
+#: model:ir.model.fields,field_description:odex30_account_accountant.field_account_reconcile_wizard__edit_mode_amount
+msgid "Edit Mode Amount"
+msgstr "وضع التحرير للمبلغ "
+
+#. module: odex30_account_accountant
+#: model:ir.model.fields,field_description:odex30_account_accountant.field_account_reconcile_wizard__edit_mode_reco_currency_id
+msgid "Edit Mode Reco Currency"
+msgstr "وضع التحرير لعملة التسوية "
+
+#. module: odex30_account_accountant
+#: model:ir.model.fields,field_description:odex30_account_accountant.field_account_reconcile_wizard__edit_mode_amount_currency
+msgid "Edit mode amount"
+msgstr "وضع التحرير للمبلغ "
+
+#. module: odex30_account_accountant
+#: model:ir.model.fields,field_description:odex30_account_accountant.field_account_fiscal_year__date_to
+#: model:ir.model.fields,field_description:odex30_account_accountant.field_account_move_line__deferred_end_date
+msgid "End Date"
+msgstr "تاريخ الانتهاء"
+
+#. module: odex30_account_accountant
+#: model:ir.model.fields,help:odex30_account_accountant.field_account_fiscal_year__date_to
+msgid "Ending Date, included in the fiscal year."
+msgstr "تاريخ الانتهاء، ضمن السنة المالية. "
+
+#. module: odex30_account_accountant
+#: model:ir.model.fields,help:odex30_account_accountant.field_res_company__invoicing_switch_threshold
+#: model:ir.model.fields,help:odex30_account_accountant.field_res_config_settings__invoicing_switch_threshold
+msgid ""
+"Every payment and invoice before this date will receive the 'From Invoicing' "
+"status, hiding all the accounting entries related to it. Use this option "
+"after installing Accounting if you were using only Invoicing before, before "
+"importing all your actual accounting data in to Odoo."
+msgstr ""
+"سوف يكون لكل فاتورة وعملية دفع قبل هذا التاريخ حالة ’من تطبيق الفوترة‘ والتي "
+"ستخفي كافة القيود المحاسبية المتعلقة بها. استخدم هذا الخيار بعد تثبيت تطبيق "
+"المحاسبة إذا كنت تستخدم تطبيق الفوترة وحده من قبل، قبل إدخالك لكافة بياناتك "
+"المحاسبية الفعلية في أودو. "
+
+#. module: odex30_account_accountant
+#: model:ir.model.fields,field_description:odex30_account_accountant.field_account_change_lock_date__exception_duration
+msgid "Exception Duration"
+msgstr "مدة الاستثناء "
+
+#. module: odex30_account_accountant
+#: model:ir.model.fields,field_description:odex30_account_accountant.field_account_change_lock_date__exception_needed_fields
+msgid "Exception Needed Fields"
+msgstr "الحقول التي تحتاج إلى استثناء "
+
+#. module: odex30_account_accountant
+#: model:ir.model.fields,field_description:odex30_account_accountant.field_account_change_lock_date__exception_reason
+msgid "Exception Reason"
+msgstr "سبب الاستثناء "
+
+#. module: odex30_account_accountant
+#: model:ir.model.fields,field_description:odex30_account_accountant.field_account_change_lock_date__exception_applies_to
+msgid "Exception applies"
+msgstr "يمكن تطبيق الاستثناء "
+
+#. module: odex30_account_accountant
+#: model:ir.model.fields,field_description:odex30_account_accountant.field_account_change_lock_date__exception_needed
+msgid "Exception needed"
+msgstr "بحاجة إلى استثناء "
+
+#. module: odex30_account_accountant
+#. odoo-python
+#: code:addons/odex30_account_accountant/models/bank_rec_widget.py:0
+msgid "Exchange Difference: %s"
+msgstr "فرق سعر الصرف: %s"
+
+#. module: odex30_account_accountant
+#: model:ir.model,name:odex30_account_accountant.model_account_fiscal_year
+#: model_terms:ir.ui.view,arch_db:odex30_account_accountant.res_config_settings_view_form
+msgid "Fiscal Year"
+msgstr "سنة مالية"
+
+#. module: odex30_account_accountant
+#: model_terms:ir.ui.view,arch_db:odex30_account_accountant.action_account_fiscal_year_form
+msgid "Fiscal Year 2018"
+msgstr "السنة المالية 2018"
+
+#. module: odex30_account_accountant
+#: model:ir.actions.act_window,name:odex30_account_accountant.actions_account_fiscal_year
+#: model:ir.model.fields,field_description:odex30_account_accountant.field_res_config_settings__group_fiscal_year
+#: model:ir.ui.menu,name:odex30_account_accountant.menu_account_fiscal_year
+#: model_terms:ir.ui.view,arch_db:odex30_account_accountant.res_config_settings_view_form
+msgid "Fiscal Years"
+msgstr "السنوات المالية"
+
+#. module: odex30_account_accountant
+#: model:ir.model.fields,field_description:odex30_account_accountant.field_res_config_settings__fiscalyear_last_day
+msgid "Fiscalyear Last Day"
+msgstr "آخر أيام السنة المالية"
+
+#. module: odex30_account_accountant
+#: model:ir.model.fields,field_description:odex30_account_accountant.field_res_config_settings__fiscalyear_last_month
+msgid "Fiscalyear Last Month"
+msgstr "آخر شهور السنة المالية"
+
+#. module: odex30_account_accountant
+#: model:ir.model.fields,field_description:odex30_account_accountant.field_bank_rec_widget_line__flag
+msgid "Flag"
+msgstr "إبلاغ"
+
+#. module: odex30_account_accountant
+#: model:ir.model.fields,field_description:odex30_account_accountant.field_account_bank_statement__message_follower_ids
+msgid "Followers"
+msgstr "المتابعين"
+
+#. module: odex30_account_accountant
+#: model:ir.model.fields,field_description:odex30_account_accountant.field_account_bank_statement__message_partner_ids
+msgid "Followers (Partners)"
+msgstr "المتابعين (الشركاء) "
+
+#. module: odex30_account_accountant
+#: model_terms:ir.ui.view,arch_db:odex30_account_accountant.view_account_change_lock_date
+msgid "For everyone:"
+msgstr "للجميع: "
+
+#. module: odex30_account_accountant
+#: model_terms:ir.ui.view,arch_db:odex30_account_accountant.view_account_change_lock_date
+msgid "For me:"
+msgstr "لي: "
+
+#. module: odex30_account_accountant
+#: model:ir.model.fields,field_description:odex30_account_accountant.field_account_reconcile_wizard__force_partials
+msgid "Force Partials"
+msgstr "فرض عمليات التسوية الجزئية "
+
+#. module: odex30_account_accountant
+#: model:ir.model.fields,field_description:odex30_account_accountant.field_bank_rec_widget_line__force_price_included_taxes
+msgid "Force Price Included Taxes"
+msgstr "فرض الأسعار شاملة الضريبة "
+
+#. module: odex30_account_accountant
+#: model:ir.model.fields,field_description:odex30_account_accountant.field_bank_rec_widget_line__transaction_currency_id
+msgid "Foreign Currency"
+msgstr "عملة أجنبية "
+
+#. module: odex30_account_accountant
+#: model:ir.model.fields,field_description:odex30_account_accountant.field_bank_rec_widget__form_index
+msgid "Form Index"
+msgstr "فهرس النموذج"
+
+#. module: odex30_account_accountant
+#: model:ir.model.fields,field_description:odex30_account_accountant.field_account_auto_reconcile_wizard__from_date
+msgid "From"
+msgstr "من"
+
+#. module: odex30_account_accountant
+#: model_terms:ir.ui.view,arch_db:odex30_account_accountant.view_account_move_line_reconcile_search
+msgid "From Trade Payable accounts"
+msgstr "من الحسابات الدائنة التجارية "
+
+#. module: odex30_account_accountant
+#: model_terms:ir.ui.view,arch_db:odex30_account_accountant.view_account_move_line_reconcile_search
+msgid "From Trade Receivable accounts"
+msgstr "من الحسابات المدينة التجارية "
+
+#. module: odex30_account_accountant
+#: model_terms:digest.tip,tip_description:odex30_account_accountant.digest_tip_account_accountant_0
+msgid ""
+"From any list view, select multiple records and the list becomes editable. "
+"If you update a cell, selected records are updated all at once. Use this "
+"feature to update multiple journal entries from the General Ledger, or any "
+"Journal view."
+msgstr ""
+"قم باختيار سجلات متعددة من أي نافذة عرض القائمة، وستصبح القائمة قابلة "
+"للتحرير. إذا قمت بتحديث إحدى الخلايا، يتم تحديث كافة السجلات المختارة دفعة "
+"واحدة. استخدم هذه الخاصية لتحديث عدة بنود في اليومية من دفتر الأستاذ العام "
+"أو أي نافذة عرض لليومية. "
+
+#. module: odex30_account_accountant
+#: model:ir.model.fields.selection,name:odex30_account_accountant.selection__res_company__deferred_expense_amount_computation_method__full_months
+#: model:ir.model.fields.selection,name:odex30_account_accountant.selection__res_company__deferred_revenue_amount_computation_method__full_months
+msgid "Full Months"
+msgstr "أشهر كاملة "
+
+#. module: odex30_account_accountant
+#: model:ir.model.fields,field_description:odex30_account_accountant.field_res_company__generate_deferred_expense_entries_method
+#: model:ir.model.fields,field_description:odex30_account_accountant.field_res_config_settings__generate_deferred_expense_entries_method
+msgid "Generate Deferred Expense Entries"
+msgstr "إنشاء قيود النفقات المؤجلة "
+
+#. module: odex30_account_accountant
+#: model:ir.model.fields,field_description:odex30_account_accountant.field_res_company__generate_deferred_revenue_entries_method
+#: model:ir.model.fields,field_description:odex30_account_accountant.field_res_config_settings__generate_deferred_revenue_entries_method
+msgid "Generate Deferred Revenue Entries"
+msgstr "إنشاء قيود الإيرادات المؤجلة "
+
+#. module: odex30_account_accountant
+#: model_terms:ir.ui.view,arch_db:odex30_account_accountant.res_config_settings_view_form
+msgid "Generate Entries"
+msgstr "إنشاء القيود"
+
+#. module: odex30_account_accountant
+#: model_terms:ir.ui.view,arch_db:odex30_account_accountant.view_account_move_line_reconcile_search
+msgid "Group By"
+msgstr "تجميع حسب"
+
+#. module: odex30_account_accountant
+#: model:ir.model.fields,field_description:odex30_account_accountant.field_bank_rec_widget_line__group_tax_id
+msgid "Group Tax"
+msgstr "مجموعة الضريبة "
+
+#. module: odex30_account_accountant
+#: model:ir.model.fields,field_description:odex30_account_accountant.field_account_change_lock_date__hard_lock_date
+msgid "Hard Lock"
+msgstr "تاريخ القفل الثابت "
+
+#. module: odex30_account_accountant
+#: model:ir.model.fields,field_description:odex30_account_accountant.field_account_move_line__has_abnormal_deferred_dates
+msgid "Has Abnormal Deferred Dates"
+msgstr "يحتوي على تواريخ مؤجلة غير معتادة "
+
+#. module: odex30_account_accountant
+#: model:ir.model.fields,field_description:odex30_account_accountant.field_account_move_line__has_deferred_moves
+msgid "Has Deferred Moves"
+msgstr "يحتوي على حركات مؤجلة "
+
+#. module: odex30_account_accountant
+#: model:ir.model.fields,field_description:odex30_account_accountant.field_account_bank_statement__has_message
+msgid "Has Message"
+msgstr "يحتوي على رسالة "
+
+#. module: odex30_account_accountant
+#: model:ir.model.fields,field_description:odex30_account_accountant.field_account_auto_reconcile_wizard__id
+#: model:ir.model.fields,field_description:odex30_account_accountant.field_account_change_lock_date__id
+#: model:ir.model.fields,field_description:odex30_account_accountant.field_account_fiscal_year__id
+#: model:ir.model.fields,field_description:odex30_account_accountant.field_account_reconcile_wizard__id
+#: model:ir.model.fields,field_description:odex30_account_accountant.field_bank_rec_widget__id
+#: model:ir.model.fields,field_description:odex30_account_accountant.field_bank_rec_widget_line__id
+msgid "ID"
+msgstr "المُعرف"
+
+#. module: odex30_account_accountant
+#: model:ir.model.fields,help:odex30_account_accountant.field_account_bank_statement__message_needaction
+msgid "If checked, new messages require your attention."
+msgstr "إذا كان محددًا، فهناك رسائل جديدة عليك رؤيتها. "
+
+#. module: odex30_account_accountant
+#: model:ir.model.fields,help:odex30_account_accountant.field_account_bank_statement__message_has_error
+#: model:ir.model.fields,help:odex30_account_accountant.field_account_bank_statement__message_has_sms_error
+msgid "If checked, some messages have a delivery error."
+msgstr "إذا كان محددًا، فقد حدث خطأ في تسليم بعض الرسائل."
+
+#. module: odex30_account_accountant
+#: model:ir.model.fields,help:odex30_account_accountant.field_bank_rec_widget__st_line_checked
+msgid ""
+"If this checkbox is not ticked, it means that the user was not sure of all "
+"the related information at the time of the creation of the move and that the "
+"move needs to be checked again."
+msgstr ""
+"إذا لم يكن هذا المربع محدداً، هذا يعني أن المستخدم لم يكن متأكداً من كافة "
+"المعلومات ذات الصلة في الوقت الذي أُنشئت فيه الحركة، وأنه يجب التحقق من "
+"الحركة مجدداً. "
+
+#. module: odex30_account_accountant
+#. odoo-javascript
+#: code:addons/odex30_account_accountant/static/src/components/bank_reconciliation/bank_rec_form.xml:0
+msgid "In Company Currency"
+msgstr "بعملة الشركة "
+
+#. module: odex30_account_accountant
+#: model_terms:ir.ui.view,arch_db:odex30_account_accountant.view_move_line_reconcile_tree
+msgid "In Currency"
+msgstr "بالعملة "
+
+#. module: odex30_account_accountant
+#. odoo-javascript
+#: code:addons/odex30_account_accountant/static/src/components/bank_reconciliation/bank_rec_form.xml:0
+msgid "In Foreign Currency"
+msgstr "بالعملة الأجنبية "
+
+#. module: odex30_account_accountant
+#: model_terms:ir.ui.view,arch_db:odex30_account_accountant.view_account_move_line_search_bank_rec_widget
+msgid "Incoming"
+msgstr "واردة "
+
+#. module: odex30_account_accountant
+#. odoo-python
+#: code:addons/odex30_account_accountant/models/res_config_settings.py:0
+msgid ""
+"Incorrect fiscal year date: day is out of range for month. Month: %(month)s; "
+"Day: %(day)s"
+msgstr ""
+"تاريخ السنة المالية غير صحيح: اليوم المدخل غير موجود في هذا الشهر. الشهر: %"
+"(month)s;اليوم:%(day)s "
+
+#. module: odex30_account_accountant
+#: model:ir.model.fields,field_description:odex30_account_accountant.field_bank_rec_widget_line__index
+msgid "Index"
+msgstr "الفهرس "
+
+#. module: odex30_account_accountant
+#. odoo-python
+#: code:addons/odex30_account_accountant/demo/odex30_account_accountant_demo.py:0
+msgid "Insurance 12 months"
+msgstr "ضمان لمدة 12 شهر "
+
+#. module: odex30_account_accountant
+#: model:ir.model.fields.selection,name:odex30_account_accountant.selection__bank_rec_widget__state__invalid
+msgid "Invalid"
+msgstr "غير صالح "
+
+#. module: odex30_account_accountant
+#: model_terms:ir.ui.view,arch_db:odex30_account_accountant.view_bank_statement_line_search_bank_rec_widget
+msgid "Invalid statements"
+msgstr "كشوفات الحساب غير صالحة "
+
+#. module: odex30_account_accountant
+#: model:ir.model.fields,help:odex30_account_accountant.field_bank_rec_widget__state
+msgid ""
+"Invalid: The bank transaction can't be validate since the suspense account "
+"is still involved\n"
+"Valid: The bank transaction can be validated.\n"
+"Reconciled: The bank transaction has already been processed. Nothing left to "
+"do."
+msgstr ""
+"غير صالح: لا يمكن تصديق المعاملة البنكية بما أن الحساب المعلق لا يزال "
+"موجوداً\n"
+"صالح: يمكن تصديق المعاملة البنكية.\n"
+"تمت التسوية: لقد تمت تسوية المعاملة البنكية بالفعل. لم يتبقَّ شيء للقيام به. "
+
+#. module: odex30_account_accountant
+#: model_terms:ir.ui.view,arch_db:odex30_account_accountant.view_account_move_line_list_bank_rec_widget
+#: model_terms:ir.ui.view,arch_db:odex30_account_accountant.view_account_move_line_reconcile_search
+#: model_terms:ir.ui.view,arch_db:odex30_account_accountant.view_account_move_line_search_bank_rec_widget
+#: model_terms:ir.ui.view,arch_db:odex30_account_accountant.view_bank_statement_line_search_bank_rec_widget
+#: model_terms:ir.ui.view,arch_db:odex30_account_accountant.view_move_line_reconcile_tree
+msgid "Invoice Date"
+msgstr "تاريخ الفاتورة"
+
+#. module: odex30_account_accountant
+#: model:ir.model.fields,field_description:odex30_account_accountant.field_res_company__invoicing_switch_threshold
+#: model:ir.model.fields,field_description:odex30_account_accountant.field_res_config_settings__invoicing_switch_threshold
+msgid "Invoicing Switch Threshold"
+msgstr "الحد الأدنى لتبديل الفوترة "
+
+#. module: odex30_account_accountant
+#: model:ir.model.fields,field_description:odex30_account_accountant.field_account_bank_statement__message_is_follower
+msgid "Is Follower"
+msgstr "متابع"
+
+#. module: odex30_account_accountant
+#: model:ir.model.fields,field_description:odex30_account_accountant.field_bank_rec_widget__is_multi_currency
+msgid "Is Multi Currency"
+msgstr "متعدد العملات "
+
+#. module: odex30_account_accountant
+#: model:ir.model.fields,field_description:odex30_account_accountant.field_account_reconcile_wizard__is_rec_pay_account
+msgid "Is Rec Pay Account"
+msgstr "حساب دفع التسوية "
+
+#. module: odex30_account_accountant
+#: model:ir.model.fields,field_description:odex30_account_accountant.field_bank_rec_widget__st_line_is_reconciled
+msgid "Is Reconciled"
+msgstr "تمت تسويته "
+
+#. module: odex30_account_accountant
+#: model:ir.model.fields,field_description:odex30_account_accountant.field_account_reconcile_wizard__is_write_off_required
+msgid "Is a write-off move required to reconcile"
+msgstr "حركة الشطب مطلوبة للمساواة "
+
+#. module: odex30_account_accountant
+#: model:ir.model.fields,field_description:odex30_account_accountant.field_account_reconcile_wizard__is_transfer_required
+msgid "Is an account transfer required"
+msgstr "تحويل الحساب مطلوب "
+
+#. module: odex30_account_accountant
+#: model:ir.model.fields,field_description:odex30_account_accountant.field_account_reconcile_wizard__transfer_warning_message
+msgid "Is an account transfer required to reconcile"
+msgstr "تحويل الحساب مطلوب للتسوية "
+
+#. module: odex30_account_accountant
+#: model:ir.model.fields,field_description:odex30_account_accountant.field_account_reconcile_wizard__lock_date_violated_warning_message
+msgid "Is the date violating the lock date of moves"
+msgstr "التاريخ يتعدى على تاريخ إقفال الحركات "
+
+#. module: odex30_account_accountant
+#. odoo-python
+#: code:addons/odex30_account_accountant/wizard/account_change_lock_date.py:0
+msgid "It is not possible to decrease or remove the Hard Lock Date."
+msgstr "لا يمكن تقديم تاريخ القفل الثابت أو إزالته. "
+
+#. module: odex30_account_accountant
+#: model:ir.model,name:odex30_account_accountant.model_account_journal
+#: model:ir.model.fields,field_description:odex30_account_accountant.field_account_reconcile_wizard__journal_id
+#: model:ir.model.fields,field_description:odex30_account_accountant.field_bank_rec_widget__st_line_journal_id
+#: model_terms:ir.ui.view,arch_db:odex30_account_accountant.res_config_settings_view_form
+#: model_terms:ir.ui.view,arch_db:odex30_account_accountant.view_account_move_line_reconcile_search
+#: model_terms:ir.ui.view,arch_db:odex30_account_accountant.view_bank_statement_line_search_bank_rec_widget
+msgid "Journal"
+msgstr "دفتر اليومية"
+
+#. module: odex30_account_accountant
+#: model:ir.model.fields,field_description:odex30_account_accountant.field_bank_rec_widget__journal_currency_id
+msgid "Journal Currency"
+msgstr "عملة اليومية "
+
+#. module: odex30_account_accountant
+#: model:ir.model,name:odex30_account_accountant.model_account_move
+#: model:ir.model.fields,field_description:odex30_account_accountant.field_bank_rec_widget__move_id
+#: model_terms:ir.ui.view,arch_db:odex30_account_accountant.view_account_move_line_reconcile_search
+#: model_terms:ir.ui.view,arch_db:odex30_account_accountant.view_account_move_line_search_bank_rec_widget
+#: model_terms:ir.ui.view,arch_db:odex30_account_accountant.view_bank_statement_line_search_bank_rec_widget
+#: model_terms:ir.ui.view,arch_db:odex30_account_accountant.view_move_line_reconcile_tree
+msgid "Journal Entry"
+msgstr "قيد اليومية"
+
+#. module: odex30_account_accountant
+#: model:ir.model,name:odex30_account_accountant.model_account_move_line
+#: model_terms:ir.ui.view,arch_db:odex30_account_accountant.view_account_move_line_reconcile_search
+#: model_terms:ir.ui.view,arch_db:odex30_account_accountant.view_account_move_line_search_bank_rec_widget
+msgid "Journal Item"
+msgstr "عنصر اليومية"
+
+#. module: odex30_account_accountant
+#: model_terms:ir.ui.view,arch_db:odex30_account_accountant.view_move_line_reconcile_tree
+msgid "Journal Items"
+msgstr "عناصر اليومية"
+
+#. module: odex30_account_accountant
+#: model:ir.actions.act_window,name:odex30_account_accountant.action_move_line_posted_unreconciled
+msgid "Journal Items to reconcile"
+msgstr "عناصر دفتر اليومية المُراد تسويتها "
+
+#. module: odex30_account_accountant
+#: model_terms:ir.ui.view,arch_db:odex30_account_accountant.view_account_move_line_reconcile_search
+msgid "Journal items where matching number isn't set"
+msgstr "عناصر دفتر اليومية التي لم يتم تعيين رقم مطابق لها "
+
+#. module: odex30_account_accountant
+#: model_terms:ir.ui.view,arch_db:odex30_account_accountant.view_account_move_line_reconcile_search
+msgid ""
+"Journal items where the account allows reconciliation no matter the residual "
+"amount"
+msgstr ""
+"بنود دفتر اليومية حيث يسمح الحساب بالتسوية بغض النظر عن المبلغ المتبقي "
+
+#. module: odex30_account_accountant
+#: model:ir.model.fields,help:odex30_account_accountant.field_res_config_settings__deferred_expense_journal_id
+#: model:ir.model.fields,help:odex30_account_accountant.field_res_config_settings__deferred_revenue_journal_id
+msgid "Journal used for deferred entries"
+msgstr "دفتر اليومية المستخدم للقيود المؤجلة "
+
+#. module: odex30_account_accountant
+#: model:ir.model.fields,field_description:odex30_account_accountant.field_digest_digest__kpi_account_bank_cash_value
+msgid "Kpi Account Bank Cash Value"
+msgstr "حساب المؤشر الرئيسي للأداء للقيمة النقدية للبنك "
+
+#. module: odex30_account_accountant
+#. odoo-javascript
+#: code:addons/odex30_account_accountant/static/src/components/bank_reconciliation/bank_rec_form.xml:0
+#: model:ir.model.fields,field_description:odex30_account_accountant.field_account_reconcile_wizard__label
+msgid "Label"
+msgstr "بطاقة عنوان"
+
+#. module: odex30_account_accountant
+#: model_terms:ir.ui.view,arch_db:odex30_account_accountant.res_config_settings_view_form
+msgid "Last Day"
+msgstr "اليوم الأخير"
+
+#. module: odex30_account_accountant
+#: model_terms:ir.ui.view,arch_db:odex30_account_accountant.account_journal_dashboard_kanban_view
+msgid "Last Statement"
+msgstr "آخر كشف حساب "
+
+#. module: odex30_account_accountant
+#: model:ir.model.fields,field_description:odex30_account_accountant.field_account_auto_reconcile_wizard__write_uid
+#: model:ir.model.fields,field_description:odex30_account_accountant.field_account_change_lock_date__write_uid
+#: model:ir.model.fields,field_description:odex30_account_accountant.field_account_fiscal_year__write_uid
+#: model:ir.model.fields,field_description:odex30_account_accountant.field_account_reconcile_wizard__write_uid
+msgid "Last Updated by"
+msgstr "آخر تحديث بواسطة"
+
+#. module: odex30_account_accountant
+#: model:ir.model.fields,field_description:odex30_account_accountant.field_account_auto_reconcile_wizard__write_date
+#: model:ir.model.fields,field_description:odex30_account_accountant.field_account_change_lock_date__write_date
+#: model:ir.model.fields,field_description:odex30_account_accountant.field_account_fiscal_year__write_date
+#: model:ir.model.fields,field_description:odex30_account_accountant.field_account_reconcile_wizard__write_date
+msgid "Last Updated on"
+msgstr "آخر تحديث في"
+
+#. module: odex30_account_accountant
+#: model_terms:ir.ui.view,arch_db:odex30_account_accountant.account_journal_dashboard_kanban_view
+msgid "Latest Statement"
+msgstr "أحدث كشف حساب "
+
+#. module: odex30_account_accountant
+#: model_terms:ir.ui.view,arch_db:odex30_account_accountant.res_config_settings_view_form
+msgid "Legal signatory"
+msgstr "الطرف الموقِّع القانوني "
+
+#. module: odex30_account_accountant
+#. odoo-javascript
+#: code:addons/odex30_account_accountant/static/src/js/tours/odex30_account_accountant.js:0
+msgid "Let’s go back to the dashboard."
+msgstr "فلنعد إلى لوحة البيانات. "
+
+#. module: odex30_account_accountant
+#: model:ir.model.fields,field_description:odex30_account_accountant.field_account_auto_reconcile_wizard__line_ids
+#: model:ir.model.fields,field_description:odex30_account_accountant.field_bank_rec_widget__line_ids
+msgid "Line"
+msgstr "البند "
+
+#. module: odex30_account_accountant
+#: model:ir.model,name:odex30_account_accountant.model_bank_rec_widget_line
+msgid "Line of the bank reconciliation widget"
+msgstr "بند أداة التسوية البنكية "
+
+#. module: odex30_account_accountant
+#: model:ir.ui.menu,name:odex30_account_accountant.menu_action_change_lock_date
+msgid "Lock Dates"
+msgstr "تواريخ الإقفال"
+
+#. module: odex30_account_accountant
+#: model:ir.model.fields,field_description:odex30_account_accountant.field_account_change_lock_date__fiscalyear_lock_date
+msgid "Lock Everything"
+msgstr "قفل الكل "
+
+#. module: odex30_account_accountant
+#: model:ir.model.fields,field_description:odex30_account_accountant.field_account_change_lock_date__fiscalyear_lock_date_for_everyone
+msgid "Lock Everything For Everyone"
+msgstr "إقفال كل شيء للجميع "
+
+#. module: odex30_account_accountant
+#: model:ir.model.fields,field_description:odex30_account_accountant.field_account_change_lock_date__fiscalyear_lock_date_for_me
+msgid "Lock Everything For Me"
+msgstr "إقفال كل شيء بالنسبة لي "
+
+#. module: odex30_account_accountant
+#: model:ir.actions.act_window,name:odex30_account_accountant.action_view_account_change_lock_date
+msgid "Lock Journal Entries"
+msgstr "إقفال قيود اليومية "
+
+#. module: odex30_account_accountant
+#: model:ir.model.fields,field_description:odex30_account_accountant.field_account_change_lock_date__purchase_lock_date
+msgid "Lock Purchases"
+msgstr "إقفال المشتريات "
+
+#. module: odex30_account_accountant
+#: model:ir.model.fields,field_description:odex30_account_accountant.field_account_change_lock_date__purchase_lock_date_for_everyone
+msgid "Lock Purchases For Everyone"
+msgstr "إقفال المشتريات للجميع "
+
+#. module: odex30_account_accountant
+#: model:ir.model.fields,field_description:odex30_account_accountant.field_account_change_lock_date__purchase_lock_date_for_me
+msgid "Lock Purchases For Me"
+msgstr "إقفال المشتريات بالنسبة لي "
+
+#. module: odex30_account_accountant
+#: model:ir.model.fields,field_description:odex30_account_accountant.field_account_change_lock_date__sale_lock_date
+msgid "Lock Sales"
+msgstr "إقفال المبيعات "
+
+#. module: odex30_account_accountant
+#: model:ir.model.fields,field_description:odex30_account_accountant.field_account_change_lock_date__sale_lock_date_for_everyone
+msgid "Lock Sales For Everyone"
+msgstr "إقفال المبيعات للجميع "
+
+#. module: odex30_account_accountant
+#: model:ir.model.fields,field_description:odex30_account_accountant.field_account_change_lock_date__sale_lock_date_for_me
+msgid "Lock Sales For Me"
+msgstr "إقفال المبيعات بالنسبة لي "
+
+#. module: odex30_account_accountant
+#: model:ir.model.fields,field_description:odex30_account_accountant.field_account_change_lock_date__tax_lock_date
+msgid "Lock Tax Return"
+msgstr "إقفال الإقرار الضريبي "
+
+#. module: odex30_account_accountant
+#: model:ir.model.fields,field_description:odex30_account_accountant.field_account_change_lock_date__tax_lock_date_for_everyone
+msgid "Lock Tax Return For Everyone"
+msgstr "إقفال الإقرار الضريبي للجميع "
+
+#. module: odex30_account_accountant
+#: model:ir.model.fields,field_description:odex30_account_accountant.field_account_change_lock_date__tax_lock_date_for_me
+msgid "Lock Tax Return For Me"
+msgstr "إقفال الإقرار الضريبي بالنسبة لي "
+
+#. module: odex30_account_accountant
+#: model:ir.model.fields,field_description:odex30_account_accountant.field_account_bank_statement__message_main_attachment_id
+msgid "Main Attachment"
+msgstr "المرفق الرئيسي"
+
+#. module: odex30_account_accountant
+#. odoo-javascript
+#: code:addons/odex30_account_accountant/static/src/components/bank_reconciliation/bank_rec_form.xml:0
+msgid "Manual Operations"
+msgstr "العمليات اليدوية "
+
+#. module: odex30_account_accountant
+#: model:ir.model.fields.selection,name:odex30_account_accountant.selection__res_company__generate_deferred_expense_entries_method__manual
+#: model:ir.model.fields.selection,name:odex30_account_accountant.selection__res_company__generate_deferred_revenue_entries_method__manual
+msgid "Manually & Grouped"
+msgstr "يدوياً ومجمع "
+
+#. module: odex30_account_accountant
+#: model:ir.model.fields,field_description:odex30_account_accountant.field_bank_rec_widget_line__manually_modified
+msgid "Manually Modified"
+msgstr "تم التعديل يدوياً "
+
+#. module: odex30_account_accountant
+#. odoo-javascript
+#: code:addons/odex30_account_accountant/static/src/components/bank_reconciliation/list_view_switcher.js:0
+msgid "Match"
+msgstr "مطابقة"
+
+#. module: odex30_account_accountant
+#. odoo-javascript
+#: code:addons/odex30_account_accountant/static/src/components/bank_reconciliation/bank_rec_form.xml:0
+msgid "Match Existing Entries"
+msgstr "مطابقة القيود الموجودة "
+
+#. module: odex30_account_accountant
+#: model_terms:ir.ui.view,arch_db:odex30_account_accountant.view_bank_statement_line_kanban_bank_rec_widget
+#: model_terms:ir.ui.view,arch_db:odex30_account_accountant.view_bank_statement_line_search_bank_rec_widget
+msgid "Matched"
+msgstr "تمت المطابقة "
+
+#. module: odex30_account_accountant
+#. odoo-python
+#: code:addons/odex30_account_accountant/models/account_payment.py:0
+msgid "Matched Transactions"
+msgstr "المعاملات المتطابقة "
+
+#. module: odex30_account_accountant
+#: model_terms:ir.ui.view,arch_db:odex30_account_accountant.view_move_line_reconcile_tree
+msgid "Matching"
+msgstr "مطابقة"
+
+#. module: odex30_account_accountant
+#: model:ir.model.fields,field_description:odex30_account_accountant.field_bank_rec_widget__matching_rules_allow_auto_reconcile
+msgid "Matching Rules Allow Auto Reconcile"
+msgstr "تسمح قواعد المطابقة بالتسوية التلقائية "
+
+#. module: odex30_account_accountant
+#: model_terms:ir.ui.view,arch_db:odex30_account_accountant.view_bank_statement_line_quick_create_form_bank_rec_widget
+msgid "Memo"
+msgstr "مذكرة "
+
+#. module: odex30_account_accountant
+#: model:ir.model,name:odex30_account_accountant.model_ir_ui_menu
+msgid "Menu"
+msgstr "القائمة "
+
+#. module: odex30_account_accountant
+#: model:ir.model.fields,field_description:odex30_account_accountant.field_account_bank_statement__message_has_error
+msgid "Message Delivery error"
+msgstr "خطأ في تسليم الرسائل"
+
+#. module: odex30_account_accountant
+#: model:ir.model.fields,field_description:odex30_account_accountant.field_account_bank_statement__message_ids
+msgid "Messages"
+msgstr "الرسائل"
+
+#. module: odex30_account_accountant
+#: model:ir.model.fields,help:odex30_account_accountant.field_res_config_settings__deferred_expense_amount_computation_method
+#: model:ir.model.fields,help:odex30_account_accountant.field_res_config_settings__deferred_revenue_amount_computation_method
+msgid "Method used to compute the amount of deferred entries"
+msgstr "الطريقة المستخدمة لاحتساب مبلغ القيود المؤجلة "
+
+#. module: odex30_account_accountant
+#: model:ir.model.fields,help:odex30_account_accountant.field_res_config_settings__generate_deferred_expense_entries_method
+#: model:ir.model.fields,help:odex30_account_accountant.field_res_config_settings__generate_deferred_revenue_entries_method
+msgid "Method used to generate deferred entries"
+msgstr "الطريقة المستخدمة لإنشاء القيود المؤجلة "
+
+#. module: odex30_account_accountant
+#: model:ir.model.fields,field_description:odex30_account_accountant.field_account_change_lock_date__min_fiscalyear_lock_date_exception_for_everyone_id
+msgid "Min Fiscalyear Lock Date Exception For Everyone"
+msgstr "الحد الأدنى لاستثناء تاريخ إقفال السنة المالية للجميع "
+
+#. module: odex30_account_accountant
+#: model:ir.model.fields,field_description:odex30_account_accountant.field_account_change_lock_date__min_fiscalyear_lock_date_exception_for_me_id
+msgid "Min Fiscalyear Lock Date Exception For Me"
+msgstr "الحد الأدنى لاستثناء تاريخ إقفال السنة المالية بالنسبة لي "
+
+#. module: odex30_account_accountant
+#: model:ir.model.fields,field_description:odex30_account_accountant.field_account_change_lock_date__min_purchase_lock_date_exception_for_everyone_id
+msgid "Min Purchase Lock Date Exception For Everyone"
+msgstr "الحد الأدنى لاستثناء تاريخ إقفال المشتريات للجميع "
+
+#. module: odex30_account_accountant
+#: model:ir.model.fields,field_description:odex30_account_accountant.field_account_change_lock_date__min_purchase_lock_date_exception_for_me_id
+msgid "Min Purchase Lock Date Exception For Me"
+msgstr "الحد الأدنى لاستثناء تاريخ إقفال المشتريات بالنسبة لي "
+
+#. module: odex30_account_accountant
+#: model:ir.model.fields,field_description:odex30_account_accountant.field_account_change_lock_date__min_sale_lock_date_exception_for_everyone_id
+msgid "Min Sale Lock Date Exception For Everyone"
+msgstr "الحد الأدنى لاستثناء تاريخ إقفال المبيعات للجميع "
+
+#. module: odex30_account_accountant
+#: model:ir.model.fields,field_description:odex30_account_accountant.field_account_change_lock_date__min_sale_lock_date_exception_for_me_id
+msgid "Min Sale Lock Date Exception For Me"
+msgstr "الحد الأدنى لاستثناء تاريخ إقفال المبيعات بالنسبة لي "
+
+#. module: odex30_account_accountant
+#: model:ir.model.fields,field_description:odex30_account_accountant.field_account_change_lock_date__min_tax_lock_date_exception_for_everyone_id
+msgid "Min Tax Lock Date Exception For Everyone"
+msgstr "الحد الأدنى لاستثناء تاريخ الإقفال الضريبي للجميع "
+
+#. module: odex30_account_accountant
+#: model:ir.model.fields,field_description:odex30_account_accountant.field_account_change_lock_date__min_tax_lock_date_exception_for_me_id
+msgid "Min Tax Lock Date Exception For Me"
+msgstr "الحد الأدنى لاستثناء تاريخ الإقفال الضريبي بالنسبة لي "
+
+#. module: odex30_account_accountant
+#. odoo-python
+#: code:addons/odex30_account_accountant/models/bank_rec_widget.py:0
+msgid "Misc"
+msgstr "متنوعات"
+
+#. module: odex30_account_accountant
+#: model:ir.model,name:odex30_account_accountant.model_ir_model
+msgid "Models"
+msgstr "النماذج"
+
+#. module: odex30_account_accountant
+#: model:ir.model.fields.selection,name:odex30_account_accountant.selection__res_company__deferred_expense_amount_computation_method__month
+#: model:ir.model.fields.selection,name:odex30_account_accountant.selection__res_company__deferred_revenue_amount_computation_method__month
+msgid "Months"
+msgstr "شهور "
+
+#. module: odex30_account_accountant
+#. odoo-javascript
+#: code:addons/odex30_account_accountant/static/src/components/bank_reconciliation/bank_rec_form.xml:0
+msgid "More"
+msgstr "المزيد "
+
+#. module: odex30_account_accountant
+#: model:ir.model.fields,field_description:odex30_account_accountant.field_account_move_line__move_attachment_ids
+msgid "Move Attachment"
+msgstr "نقل المرفق "
+
+#. module: odex30_account_accountant
+#: model:ir.model.fields,field_description:odex30_account_accountant.field_account_reconcile_wizard__move_line_ids
+msgid "Move lines to reconcile"
+msgstr "بنود الحركات بانتظار التسوية "
+
+#. module: odex30_account_accountant
+#: model:ir.model.fields,field_description:odex30_account_accountant.field_account_fiscal_year__name
+#: model:ir.model.fields,field_description:odex30_account_accountant.field_bank_rec_widget_line__name
+msgid "Name"
+msgstr "الاسم"
+
+#. module: odex30_account_accountant
+#: model:ir.model.fields,field_description:odex30_account_accountant.field_bank_rec_widget_line__narration
+msgid "Narration"
+msgstr ""
+
+#. module: odex30_account_accountant
+#: model_terms:ir.ui.view,arch_db:odex30_account_accountant.view_account_change_lock_date
+msgid "Need an irreversible lock to ensure inalterability, for all users?"
+msgstr "هل تحتاج إلى قفل دائم لضمان عدم قابلية التغيير لكافة المستخدمين؟ "
+
+#. module: odex30_account_accountant
+#. odoo-javascript
+#: code:addons/odex30_account_accountant/static/src/components/bank_reconciliation/bank_rec_form.xml:0
+msgid "New"
+msgstr "جديد"
+
+#. module: odex30_account_accountant
+#: model:ir.actions.act_window,name:odex30_account_accountant.action_bank_statement_line_form_bank_rec_widget
+#: model_terms:ir.ui.view,arch_db:odex30_account_accountant.view_bank_statement_line_form_bank_rec_widget
+#: model_terms:ir.ui.view,arch_db:odex30_account_accountant.view_bank_statement_line_quick_create_form_bank_rec_widget
+msgid "New Transaction"
+msgstr "معاملة جديدة "
+
+#. module: odex30_account_accountant
+#. odoo-javascript
+#: code:addons/odex30_account_accountant/static/src/components/move_line_list/move_line_list.xml:0
+msgid "No attachments linked."
+msgstr "لم يتم ربط أي مرفقات. "
+
+#. module: odex30_account_accountant
+#: model_terms:ir.ui.view,arch_db:odex30_account_accountant.view_bank_statement_line_search_bank_rec_widget
+msgid "No statement"
+msgstr "لا يوجد كشف حساب "
+
+#. module: odex30_account_accountant
+#: model_terms:ir.actions.act_window,help:odex30_account_accountant.action_bank_statement_line_transactions
+#: model_terms:ir.actions.act_window,help:odex30_account_accountant.action_bank_statement_line_transactions_kanban
+msgid "No transactions matching your filters were found."
+msgstr "لم يتم العثور على أي معاملات تطابق عوامل التصفية الخاصة بك. "
+
+#. module: odex30_account_accountant
+#: model_terms:ir.ui.view,arch_db:odex30_account_accountant.view_bank_statement_line_search_bank_rec_widget
+msgid "Not Matched"
+msgstr "غير مطابق "
+
+#. module: odex30_account_accountant
+#: model_terms:ir.ui.view,arch_db:odex30_account_accountant.view_account_change_lock_date
+msgid "Not locked"
+msgstr "لم يتم إقفاله "
+
+#. module: odex30_account_accountant
+#. odoo-javascript
+#: code:addons/odex30_account_accountant/static/src/components/bank_reconciliation/bank_rec_form.xml:0
+#: model_terms:ir.ui.view,arch_db:odex30_account_accountant.view_bank_statement_line_search_bank_rec_widget
+#: model_terms:ir.ui.view,arch_db:odex30_account_accountant.view_bank_statement_line_tree_bank_rec_widget
+msgid "Notes"
+msgstr "الملاحظات"
+
+#. module: odex30_account_accountant
+#: model_terms:ir.actions.act_window,help:odex30_account_accountant.action_bank_statement_line_transactions
+#: model_terms:ir.actions.act_window,help:odex30_account_accountant.action_bank_statement_line_transactions_kanban
+msgid "Nothing to do here!"
+msgstr "لا شيء لتفعله هنا! "
+
+#. module: odex30_account_accountant
+#. odoo-javascript
+#: code:addons/odex30_account_accountant/static/src/js/tours/odex30_account_accountant.js:0
+msgid "Now, we'll create your first invoice (accountant)"
+msgstr "والآن، سوف نقوم بإنشاء فاتورتك الأولى (محاسب) "
+
+#. module: odex30_account_accountant
+#: model:ir.model.fields,field_description:odex30_account_accountant.field_account_bank_statement__message_needaction_counter
+msgid "Number of Actions"
+msgstr "عدد الإجراءات"
+
+#. module: odex30_account_accountant
+#: model:ir.model.fields,field_description:odex30_account_accountant.field_account_bank_statement__message_has_error_counter
+msgid "Number of errors"
+msgstr "عدد الأخطاء "
+
+#. module: odex30_account_accountant
+#: model:ir.model.fields,help:odex30_account_accountant.field_account_bank_statement__message_needaction_counter
+msgid "Number of messages requiring action"
+msgstr "عدد الرسائل التي تتطلب اتخاذ إجراء"
+
+#. module: odex30_account_accountant
+#: model:ir.model.fields,help:odex30_account_accountant.field_account_bank_statement__message_has_error_counter
+msgid "Number of messages with delivery error"
+msgstr "عدد الرسائل الحادث بها خطأ في التسليم"
+
+#. module: odex30_account_accountant
+#: model:ir.model.fields.selection,name:odex30_account_accountant.selection__res_company__generate_deferred_expense_entries_method__on_validation
+#: model:ir.model.fields.selection,name:odex30_account_accountant.selection__res_company__generate_deferred_revenue_entries_method__on_validation
+msgid "On bill validation"
+msgstr "عند تصديق فاتورة المورّد "
+
+#. module: odex30_account_accountant
+#. odoo-python
+#: code:addons/odex30_account_accountant/wizard/account_change_lock_date.py:0
+msgid "Only Billing Administrators are allowed to change lock dates!"
+msgstr "مديرو الفوترة وحدهم المصرح لهم بتغيير تواريخ الإقفال! "
+
+#. module: odex30_account_accountant
+#: model_terms:ir.ui.view,arch_db:odex30_account_accountant.view_account_reconcile_wizard
+msgid ""
+"Only partial reconciliation is possible. Proceed in multiple steps if you "
+"want to full reconcile."
+msgstr ""
+"يُسمَح بالتسوية الجزئية فقط. يمكنك الاستمرار بعدة خطوات إذا أردت التسوية "
+"الكلية. "
+
+#. module: odex30_account_accountant
+#. odoo-javascript
+#: code:addons/odex30_account_accountant/static/src/components/move_line_list/move_line_list.xml:0
+msgid "Open attachment in pop out"
+msgstr "فتح المرفق في نافذة منبثقة "
+
+#. module: odex30_account_accountant
+#. odoo-python
+#: code:addons/odex30_account_accountant/models/bank_rec_widget.py:0
+msgid "Open balance of %(amount)s"
+msgstr "رصيد مفتوح بقيمة %(amount)s "
+
+#. module: odex30_account_accountant
+#. odoo-python
+#: code:addons/odex30_account_accountant/models/account_move.py:0
+msgid "Original Deferred Entries"
+msgstr "القيود المؤجلة الأصلية "
+
+#. module: odex30_account_accountant
+#: model:ir.model.fields,field_description:odex30_account_accountant.field_account_bank_statement_line__deferred_original_move_ids
+#: model:ir.model.fields,field_description:odex30_account_accountant.field_account_move__deferred_original_move_ids
+msgid "Original Invoices"
+msgstr "الفواتير الأصلية "
+
+#. module: odex30_account_accountant
+#: model_terms:ir.ui.view,arch_db:odex30_account_accountant.view_account_move_line_reconcile_search
+#: model_terms:ir.ui.view,arch_db:odex30_account_accountant.view_move_line_reconcile_tree
+msgid "Originator Tax"
+msgstr "ضريبة المُنشئ "
+
+#. module: odex30_account_accountant
+#: model_terms:ir.ui.view,arch_db:odex30_account_accountant.view_account_move_line_search_bank_rec_widget
+msgid "Outgoing"
+msgstr "الصادرة "
+
+#. module: odex30_account_accountant
+#. odoo-javascript
+#: code:addons/odex30_account_accountant/static/src/components/bank_reconciliation/bank_rec_form.xml:0
+#: code:addons/odex30_account_accountant/static/src/components/bank_reconciliation/kanban.js:0
+#: model:ir.model.fields,field_description:odex30_account_accountant.field_account_reconcile_wizard__to_partner_id
+#: model:ir.model.fields,field_description:odex30_account_accountant.field_bank_rec_widget__partner_id
+#: model:ir.model.fields,field_description:odex30_account_accountant.field_bank_rec_widget_line__partner_id
+#: model_terms:ir.ui.view,arch_db:odex30_account_accountant.view_account_move_line_reconcile_search
+#: model_terms:ir.ui.view,arch_db:odex30_account_accountant.view_bank_statement_line_quick_create_form_bank_rec_widget
+msgid "Partner"
+msgstr "الشريك"
+
+#. module: odex30_account_accountant
+#: model:ir.model.fields,field_description:odex30_account_accountant.field_bank_rec_widget_line__partner_currency_id
+msgid "Partner Currency"
+msgstr "عملة الشريك "
+
+#. module: odex30_account_accountant
+#: model:ir.model.fields,field_description:odex30_account_accountant.field_bank_rec_widget__partner_name
+msgid "Partner Name"
+msgstr "اسم الشريك"
+
+#. module: odex30_account_accountant
+#: model:ir.model.fields,field_description:odex30_account_accountant.field_bank_rec_widget_line__partner_payable_account_id
+msgid "Partner Payable Account"
+msgstr "حساب الشريك الدائن "
+
+#. module: odex30_account_accountant
+#: model:ir.model.fields,field_description:odex30_account_accountant.field_bank_rec_widget_line__partner_payable_amount
+msgid "Partner Payable Amount"
+msgstr "مبلغ الشريك الدائن "
+
+#. module: odex30_account_accountant
+#: model:ir.model.fields,field_description:odex30_account_accountant.field_bank_rec_widget_line__partner_receivable_account_id
+msgid "Partner Receivable Account"
+msgstr "حساب الشريك المدين "
+
+#. module: odex30_account_accountant
+#: model:ir.model.fields,field_description:odex30_account_accountant.field_bank_rec_widget_line__partner_receivable_amount
+msgid "Partner Receivable Amount"
+msgstr "مبلغ الشريك المدين "
+
+#. module: odex30_account_accountant
+#: model:ir.model.fields,field_description:odex30_account_accountant.field_account_auto_reconcile_wizard__partner_ids
+msgid "Partners"
+msgstr "الشركاء"
+
+#. module: odex30_account_accountant
+#: model_terms:ir.ui.view,arch_db:odex30_account_accountant.view_account_move_line_reconcile_search
+msgid "Payable"
+msgstr "الدائن"
+
+#. module: odex30_account_accountant
+#. odoo-javascript
+#: code:addons/odex30_account_accountant/static/src/components/bank_reconciliation/bank_rec_form.xml:0
+msgid "Payable:"
+msgstr "الدائن: "
+
+#. module: odex30_account_accountant
+#: model_terms:ir.ui.view,arch_db:odex30_account_accountant.view_account_payment_form_inherit_account_accountant
+msgid "Payment Matching"
+msgstr "مطابقة المدفوعات"
+
+#. module: odex30_account_accountant
+#: model:ir.model.fields,field_description:odex30_account_accountant.field_account_bank_statement_line__payment_state_before_switch
+#: model:ir.model.fields,field_description:odex30_account_accountant.field_account_move__payment_state_before_switch
+msgid "Payment State Before Switch"
+msgstr "حالة الدفع قبل التحويل "
+
+#. module: odex30_account_accountant
+#: model:ir.model,name:odex30_account_accountant.model_account_payment
+#: model_terms:ir.ui.view,arch_db:odex30_account_accountant.view_bank_statement_line_search_bank_rec_widget
+msgid "Payments"
+msgstr "الدفعات"
+
+#. module: odex30_account_accountant
+#: model_terms:ir.ui.view,arch_db:odex30_account_accountant.account_journal_dashboard_kanban_view
+msgid "Payments Matching"
+msgstr "مطابقة المدفوعات"
+
+#. module: odex30_account_accountant
+#: model:ir.model.fields.selection,name:odex30_account_accountant.selection__account_auto_reconcile_wizard__search_mode__one_to_one
+msgid "Perfect Match"
+msgstr "مطابق تماماً "
+
+#. module: odex30_account_accountant
+#. odoo-python
+#: code:addons/odex30_account_accountant/models/account_move.py:0
+msgid "Please set the deferred accounts in the accounting settings."
+msgstr "يرجى تعيين الحسابات المؤجلة في إعدادات المحاسبة. "
+
+#. module: odex30_account_accountant
+#. odoo-python
+#: code:addons/odex30_account_accountant/models/account_move.py:0
+msgid "Please set the deferred journal in the accounting settings."
+msgstr "يرجى إعداد دفتر اليومية المؤجل في إعدادات المحاسبة. "
+
+#. module: odex30_account_accountant
+#: model:ir.model.fields,field_description:odex30_account_accountant.field_res_company__predict_bill_product
+#: model:ir.model.fields,field_description:odex30_account_accountant.field_res_config_settings__predict_bill_product
+msgid "Predict Bill Product"
+msgstr "توقع منتج الفاتورة "
+
+#. module: odex30_account_accountant
+#: model_terms:ir.ui.view,arch_db:odex30_account_accountant.res_config_settings_view_form
+msgid "Predict vendor bill product"
+msgstr "توقع منتج فاتورة المورّد "
+
+#. module: odex30_account_accountant
+#: model:ir.model,name:odex30_account_accountant.model_account_reconcile_model
+msgid ""
+"Preset to create journal entries during a invoices and payments matching"
+msgstr "الإعداد المسبق لإنشاء قيود يومية خلال مطابقة الفواتير والدفعات"
+
+#. module: odex30_account_accountant
+#: model:ir.model.fields,field_description:odex30_account_accountant.field_account_bank_statement__rating_ids
+msgid "Ratings"
+msgstr "التقييمات "
+
+#. module: odex30_account_accountant
+#: model_terms:ir.ui.view,arch_db:odex30_account_accountant.view_account_change_lock_date
+msgid "Reason..."
+msgstr "السبب..."
+
+#. module: odex30_account_accountant
+#: model_terms:ir.ui.view,arch_db:odex30_account_accountant.view_account_move_line_reconcile_search
+msgid "Receivable"
+msgstr "المدين"
+
+#. module: odex30_account_accountant
+#. odoo-javascript
+#: code:addons/odex30_account_accountant/static/src/components/bank_reconciliation/bank_rec_form.xml:0
+msgid "Receivable:"
+msgstr "المدين: "
+
+#. module: odex30_account_accountant
+#: model:ir.model.fields,field_description:odex30_account_accountant.field_account_auto_reconcile_wizard__search_mode
+#: model:ir.ui.menu,name:odex30_account_accountant.menu_account_reconcile
+#: model_terms:ir.ui.view,arch_db:odex30_account_accountant.view_account_auto_reconcile_wizard
+#: model_terms:ir.ui.view,arch_db:odex30_account_accountant.view_account_reconcile_wizard
+#: model_terms:ir.ui.view,arch_db:odex30_account_accountant.view_move_line_payment_tree
+#: model_terms:ir.ui.view,arch_db:odex30_account_accountant.view_move_line_reconcile_tree
+#: model_terms:ir.ui.view,arch_db:odex30_account_accountant.view_move_line_tree
+msgid "Reconcile"
+msgstr "تسوية"
+
+#. module: odex30_account_accountant
+#: model_terms:ir.ui.view,arch_db:odex30_account_accountant.view_account_reconcile_wizard
+msgid "Reconcile & open"
+msgstr "تسوية وفتح "
+
+#. module: odex30_account_accountant
+#: model:ir.model.fields,field_description:odex30_account_accountant.field_account_reconcile_wizard__reco_account_id
+msgid "Reconcile Account"
+msgstr "تسوية الحساب "
+
+#. module: odex30_account_accountant
+#: model:ir.model.fields,field_description:odex30_account_accountant.field_bank_rec_widget_line__reconcile_model_id
+msgid "Reconcile Model"
+msgstr "نموذج التسوية "
+
+#. module: odex30_account_accountant
+#: model:ir.actions.act_window,name:odex30_account_accountant.action_open_auto_reconcile_wizard
+#: model_terms:ir.ui.view,arch_db:odex30_account_accountant.view_account_auto_reconcile_wizard
+msgid "Reconcile automatically"
+msgstr "التسوية تلقائياً "
+
+#. module: odex30_account_accountant
+#: model:ir.model.fields,help:odex30_account_accountant.field_account_auto_reconcile_wizard__search_mode
+msgid ""
+"Reconcile journal items with opposite balance or clear accounts with a zero "
+"balance"
+msgstr ""
+"تسوية بنود دفتر اليومية ذات الرصيد المعاكس أو تصفية الحسابات ذات الرصيد "
+"الصفري "
+
+#. module: odex30_account_accountant
+#: model:ir.model.fields.selection,name:odex30_account_accountant.selection__bank_rec_widget__state__reconciled
+msgid "Reconciled"
+msgstr "تمت التسوية"
+
+#. module: odex30_account_accountant
+#: model:ir.model.fields,field_description:odex30_account_accountant.field_account_reconcile_wizard__reco_model_id
+msgid "Reconciliation model"
+msgstr "نموذج التسوية "
+
+#. module: odex30_account_accountant
+#: model_terms:ir.ui.view,arch_db:odex30_account_accountant.res_config_settings_view_form
+msgid "Record cost of goods sold in your journal entries"
+msgstr "سجّل تكاليف البضاعة المباعة في قيود اليومية الخاصة بك "
+
+#. module: odex30_account_accountant
+#: model:ir.model.fields,field_description:odex30_account_accountant.field_bank_rec_widget_line__ref
+msgid "Ref"
+msgstr "المرجع "
+
+#. module: odex30_account_accountant
+#. odoo-javascript
+#: code:addons/odex30_account_accountant/static/src/components/bank_reconciliation/bank_rec_form.xml:0
+msgid "Reference"
+msgstr "الرقم المرجعي "
+
+#. module: odex30_account_accountant
+#: model_terms:ir.ui.view,arch_db:odex30_account_accountant.view_move_form_inherit
+msgid "Related Purchase(s)"
+msgstr "عمليات الشراء ذات الصلة "
+
+#. module: odex30_account_accountant
+#: model_terms:ir.ui.view,arch_db:odex30_account_accountant.view_move_form_inherit
+msgid "Related Sale(s)"
+msgstr "المبيعات ذات الصلة "
+
+#. module: odex30_account_accountant
+#. odoo-javascript
+#: code:addons/odex30_account_accountant/static/src/components/bank_reconciliation/bank_rec_form.xml:0
+msgid "Reset"
+msgstr "إعادة الضبط "
+
+#. module: odex30_account_accountant
+#: model_terms:ir.ui.view,arch_db:odex30_account_accountant.view_move_line_reconcile_tree
+msgid "Residual"
+msgstr "المتبقي"
+
+#. module: odex30_account_accountant
+#: model_terms:ir.ui.view,arch_db:odex30_account_accountant.view_move_line_reconcile_tree
+msgid "Residual in Currency"
+msgstr "المتبقي بالعملة "
+
+#. module: odex30_account_accountant
+#: model:ir.model.fields,field_description:odex30_account_accountant.field_bank_rec_widget__return_todo_command
+msgid "Return Todo Command"
+msgstr "إرجاع أمر قائمة المهام "
+
+#. module: odex30_account_accountant
+#: model_terms:ir.ui.view,arch_db:odex30_account_accountant.view_account_change_lock_date
+msgid "Review"
+msgstr "مراجعة"
+
+#. module: odex30_account_accountant
+#: model_terms:ir.ui.view,arch_db:odex30_account_accountant.view_account_change_lock_date
+msgid "Revoke"
+msgstr "إلغاء "
+
+#. module: odex30_account_accountant
+#: model:ir.model,name:odex30_account_accountant.model_account_reconcile_model_line
+msgid "Rules for the reconciliation model"
+msgstr "قواعد نموذج التسوية "
+
+#. module: odex30_account_accountant
+#: model:ir.model.fields,field_description:odex30_account_accountant.field_account_bank_statement__message_has_sms_error
+msgid "SMS Delivery error"
+msgstr "خطأ في تسليم الرسائل النصية القصيرة "
+
+#. module: odex30_account_accountant
+#: model_terms:ir.ui.view,arch_db:odex30_account_accountant.view_account_change_lock_date
+msgid "Save"
+msgstr "حفظ"
+
+#. module: odex30_account_accountant
+#: model_terms:ir.ui.view,arch_db:odex30_account_accountant.view_bank_statement_line_form_bank_rec_widget
+msgid "Save & Close"
+msgstr "حفظ وإغلاق"
+
+#. module: odex30_account_accountant
+#: model_terms:ir.ui.view,arch_db:odex30_account_accountant.view_bank_statement_line_form_bank_rec_widget
+msgid "Save & New"
+msgstr "حفظ و جديد"
+
+#. module: odex30_account_accountant
+#: model_terms:ir.ui.view,arch_db:odex30_account_accountant.view_account_move_line_reconcile_search
+msgid "Search Journal Items to Reconcile"
+msgstr "البحث عن القيود اليومية المُراد تسويتها "
+
+#. module: odex30_account_accountant
+#: model:ir.model.fields,help:odex30_account_accountant.field_res_config_settings__signing_user
+msgid ""
+"Select a user here to override every signature on invoice by this user's "
+"signature"
+msgstr ""
+"قم بتحديد مستخدم هنا لاستبدال كل توقيع في الفاتورة بتوقيع هذا المستخدم "
+
+#. module: odex30_account_accountant
+#: model:ir.model.fields,field_description:odex30_account_accountant.field_bank_rec_widget__selected_aml_ids
+msgid "Selected Aml"
+msgstr "Aml المحددة "
+
+#. module: odex30_account_accountant
+#: model:ir.model.fields,field_description:odex30_account_accountant.field_bank_rec_widget__selected_reco_model_id
+msgid "Selected Reco Model"
+msgstr "تحديد نموذج التسوية "
+
+#. module: odex30_account_accountant
+#. odoo-javascript
+#: code:addons/odex30_account_accountant/static/src/js/tours/odex30_account_accountant.js:0
+msgid "Set an amount."
+msgstr "قم بتعيين مبلغ. "
+
+#. module: odex30_account_accountant
+#. odoo-javascript
+#: code:addons/odex30_account_accountant/static/src/components/bank_reconciliation/bank_rec_form.xml:0
+msgid "Set as Checked"
+msgstr "التعيين كتمّ التحقق منه "
+
+#. module: odex30_account_accountant
+#. odoo-javascript
+#: code:addons/odex30_account_accountant/static/src/js/tours/odex30_account_accountant.js:0
+msgid "Set the payment reference."
+msgstr "قم بتعيين مرجع الدفع. "
+
+#. module: odex30_account_accountant
+#: model:ir.model.fields,field_description:odex30_account_accountant.field_account_change_lock_date__show_draft_entries_warning
+msgid "Show Draft Entries Warning"
+msgstr "إظهار تحذير القيود بحالة المسودة "
+
+#. module: odex30_account_accountant
+#: model:ir.model.fields,field_description:odex30_account_accountant.field_account_bank_statement_line__show_signature_area
+#: model:ir.model.fields,field_description:odex30_account_accountant.field_account_move__show_signature_area
+msgid "Show Signature Area"
+msgstr "إظهار مكان التوقيع "
+
+#. module: odex30_account_accountant
+#: model:ir.model.fields,field_description:odex30_account_accountant.field_res_config_settings__module_sign
+msgid "Sign"
+msgstr "توقيع"
+
+#. module: odex30_account_accountant
+#: model:ir.model.fields,field_description:odex30_account_accountant.field_account_bank_statement_line__signature
+#: model:ir.model.fields,field_description:odex30_account_accountant.field_account_move__signature
+msgid "Signature"
+msgstr "التوقيع "
+
+#. module: odex30_account_accountant
+#: model:ir.model.fields,field_description:odex30_account_accountant.field_res_config_settings__signing_user
+msgid "Signature used to sign all the invoice"
+msgstr "التوقيع المستَخدَم للتوقيع على الفاتورة بأكملها "
+
+#. module: odex30_account_accountant
+#: model:ir.model.fields,field_description:odex30_account_accountant.field_account_bank_statement_line__signing_user
+#: model:ir.model.fields,field_description:odex30_account_accountant.field_account_move__signing_user
+msgid "Signer"
+msgstr "الطرف الموقِّع "
+
+#. module: odex30_account_accountant
+#: model:ir.model.fields,field_description:odex30_account_accountant.field_res_company__signing_user
+msgid "Signing User"
+msgstr "المُستخدِم الموقِّع "
+
+#. module: odex30_account_accountant
+#: model:ir.model.fields,field_description:odex30_account_accountant.field_account_reconcile_wizard__single_currency_mode
+msgid "Single Currency Mode"
+msgstr "وضع العملة الواحدة "
+
+#. module: odex30_account_accountant
+#: model:ir.model.fields,field_description:odex30_account_accountant.field_bank_rec_widget_line__source_aml_id
+msgid "Source Aml"
+msgstr "Aml المصدرية "
+
+#. module: odex30_account_accountant
+#: model:ir.model.fields,field_description:odex30_account_accountant.field_bank_rec_widget_line__source_aml_move_id
+msgid "Source Aml Move"
+msgstr "حركة Aml المصدرية "
+
+#. module: odex30_account_accountant
+#: model:ir.model.fields,field_description:odex30_account_accountant.field_bank_rec_widget_line__source_aml_move_name
+msgid "Source Aml Move Name"
+msgstr "اسم حركة Aml المصدرية "
+
+#. module: odex30_account_accountant
+#: model:ir.model.fields,field_description:odex30_account_accountant.field_bank_rec_widget_line__source_amount_currency
+msgid "Source Amount Currency"
+msgstr "عملة المبلغ المصدري "
+
+#. module: odex30_account_accountant
+#: model:ir.model.fields,field_description:odex30_account_accountant.field_bank_rec_widget_line__source_balance
+msgid "Source Balance"
+msgstr "الرصيد المصدري "
+
+#. module: odex30_account_accountant
+#: model:ir.model.fields,field_description:odex30_account_accountant.field_bank_rec_widget_line__source_credit
+msgid "Source Credit"
+msgstr "مصدر الائتمان"
+
+#. module: odex30_account_accountant
+#: model:ir.model.fields,field_description:odex30_account_accountant.field_bank_rec_widget_line__source_debit
+msgid "Source Debit"
+msgstr "مصدر الخصم"
+
+#. module: odex30_account_accountant
+#: model:ir.model.fields,field_description:odex30_account_accountant.field_bank_rec_widget_line__source_rate
+msgid "Source Rate"
+msgstr ""
+
+#. module: odex30_account_accountant
+#: model:ir.model.fields,field_description:odex30_account_accountant.field_bank_rec_widget__st_line_id
+msgid "St Line"
+msgstr "بند كشف الحساب "
+
+#. module: odex30_account_accountant
+#: model:ir.model.fields,field_description:odex30_account_accountant.field_bank_rec_widget__st_line_transaction_details
+msgid "St Line Transaction Details"
+msgstr "تفاصيل معاملة بند كشف الحساب "
+
+#. module: odex30_account_accountant
+#: model:ir.model.fields,field_description:odex30_account_accountant.field_account_fiscal_year__date_from
+#: model:ir.model.fields,field_description:odex30_account_accountant.field_account_move_line__deferred_start_date
+msgid "Start Date"
+msgstr "تاريخ البدء "
+
+#. module: odex30_account_accountant
+#: model:ir.model.fields,help:odex30_account_accountant.field_account_fiscal_year__date_from
+msgid "Start Date, included in the fiscal year."
+msgstr "تاريخ البداية، ضمن السنة المالية. "
+
+#. module: odex30_account_accountant
+#: model:ir.model.fields,field_description:odex30_account_accountant.field_bank_rec_widget__state
+msgid "State"
+msgstr "الحالة"
+
+#. module: odex30_account_accountant
+#: model:ir.actions.server,name:odex30_account_accountant.action_bank_statement_attachment
+#: model_terms:ir.ui.view,arch_db:odex30_account_accountant.view_bank_statement_line_kanban_bank_rec_widget
+#: model_terms:ir.ui.view,arch_db:odex30_account_accountant.view_bank_statement_line_search_bank_rec_widget
+msgid "Statement"
+msgstr "كشف الحساب"
+
+#. module: odex30_account_accountant
+#: model_terms:ir.ui.view,arch_db:odex30_account_accountant.view_bank_statement_line_search_bank_rec_widget
+msgid "Statement Line"
+msgstr "بند كشف الحساب"
+
+#. module: odex30_account_accountant
+#. odoo-python
+#: code:addons/odex30_account_accountant/demo/odex30_account_accountant_demo.py:0
+msgid "Subscription 12 months"
+msgstr "اشتراك لمدة 12 شهر "
+
+#. module: odex30_account_accountant
+#: model:ir.model.fields,field_description:odex30_account_accountant.field_bank_rec_widget_line__suggestion_amount_currency
+msgid "Suggestion Amount Currency"
+msgstr "عملة المبلغ المقترح "
+
+#. module: odex30_account_accountant
+#: model:ir.model.fields,field_description:odex30_account_accountant.field_bank_rec_widget_line__suggestion_balance
+msgid "Suggestion Balance"
+msgstr "الرصيد المقترح "
+
+#. module: odex30_account_accountant
+#: model:ir.model.fields,field_description:odex30_account_accountant.field_bank_rec_widget_line__suggestion_html
+msgid "Suggestion Html"
+msgstr "Html المقترح "
+
+#. module: odex30_account_accountant
+#: model_terms:ir.ui.view,arch_db:odex30_account_accountant.view_account_move_line_list_bank_rec_widget
+msgid "Suggestions"
+msgstr "الاقتراحات "
+
+#. module: odex30_account_accountant
+#: model:ir.model,name:odex30_account_accountant.model_account_tax
+#: model:ir.model.fields,field_description:odex30_account_accountant.field_account_reconcile_wizard__tax_id
+#: model:ir.model.fields,field_description:odex30_account_accountant.field_bank_rec_widget_line__tax_ids
+msgid "Tax"
+msgstr "الضريبة"
+
+#. module: odex30_account_accountant
+#: model:ir.model.fields,field_description:odex30_account_accountant.field_bank_rec_widget_line__tax_base_amount_currency
+msgid "Tax Base Amount Currency"
+msgstr "عملة المبلغ الأساسي للضريبة "
+
+#. module: odex30_account_accountant
+#: model_terms:ir.ui.view,arch_db:odex30_account_accountant.view_move_line_reconcile_tree
+msgid "Tax Grids"
+msgstr "شبكات الضرائب"
+
+#. module: odex30_account_accountant
+#: model:ir.model.fields,field_description:odex30_account_accountant.field_bank_rec_widget_line__tax_repartition_line_id
+msgid "Tax Repartition Line"
+msgstr "بند التوزيع الضريبي"
+
+#. module: odex30_account_accountant
+#: model:ir.model.fields,field_description:odex30_account_accountant.field_bank_rec_widget_line__tax_tag_ids
+msgid "Tax Tag"
+msgstr "علامة تصنيف الضريبة "
+
+#. module: odex30_account_accountant
+#. odoo-javascript
+#: code:addons/odex30_account_accountant/static/src/components/bank_reconciliation/bank_rec_form.xml:0
+#: code:addons/odex30_account_accountant/static/src/components/bank_reconciliation/kanban.js:0
+msgid "Taxes"
+msgstr "الضرائب"
+
+#. module: odex30_account_accountant
+#. odoo-javascript
+#: code:addons/odex30_account_accountant/static/src/components/bank_reconciliation/rainbowman_content.xml:0
+msgid "That's on average"
+msgstr "هذا في المتوسط"
+
+#. module: odex30_account_accountant
+#: model:ir.model.fields,help:odex30_account_accountant.field_bank_rec_widget__country_code
+#: model:ir.model.fields,help:odex30_account_accountant.field_bank_rec_widget_line__country_code
+msgid ""
+"The ISO country code in two chars. \n"
+"You can use this field for quick search."
+msgstr ""
+"كود الدولة حسب المعيار الدولي أيزو المكون من حرفين.\n"
+"يمكنك استخدام هذا الحقل لإجراء بحث سريع."
+
+#. module: odex30_account_accountant
+#: model:ir.model.fields,help:odex30_account_accountant.field_bank_rec_widget_line__amount_transaction_currency
+msgid ""
+"The amount expressed in an optional other currency if it is a multi-currency "
+"entry."
+msgstr "يتم عرض المبلغ بعملة اختيارية أخرى إذا كان قيداً متعدد العملات. "
+
+#. module: odex30_account_accountant
+#. odoo-python
+#: code:addons/odex30_account_accountant/wizard/account_reconcile_wizard.py:0
+msgid ""
+"The amount of the write-off of a single credit line should be strictly "
+"negative."
+msgstr "يجب أن يكون مبلغ الشطب لبند ائتماني واحد قيمة سالبة فقط. "
+
+#. module: odex30_account_accountant
+#. odoo-python
+#: code:addons/odex30_account_accountant/wizard/account_reconcile_wizard.py:0
+msgid ""
+"The amount of the write-off of a single debit line should be strictly "
+"positive."
+msgstr "يجب أن يكون مبلغ الشطب لبند خصم واحد قيمة موجبة فقط. "
+
+#. module: odex30_account_accountant
+#. odoo-python
+#: code:addons/odex30_account_accountant/wizard/account_reconcile_wizard.py:0
+msgid "The amount of the write-off of a single line cannot be 0."
+msgstr "لا يمكن أن يكون مبلغ الشطب لبند واحد 0. "
+
+#. module: odex30_account_accountant
+#. odoo-python
+#: code:addons/odex30_account_accountant/wizard/account_reconcile_wizard.py:0
+msgid ""
+"The date you set violates the lock date of one of your entry. It will be "
+"overriden by the following date : %(replacement_date)s"
+msgstr ""
+"التاريخ الذي قمت بتحديده يتضارب مع تاريخ الإقفال لإحدى قيودك. سيتم تجاوزه من "
+"قِبَل التاريخ التالي: %(replacement_date)s"
+
+#. module: odex30_account_accountant
+#: model:ir.model.fields,help:odex30_account_accountant.field_account_bank_statement_line__deferred_move_ids
+#: model:ir.model.fields,help:odex30_account_accountant.field_account_move__deferred_move_ids
+msgid "The deferred entries created by this invoice"
+msgstr "القيود المؤجلة التي تم إنشاؤها من قِبَل هذه الفاتورة "
+
+#. module: odex30_account_accountant
+#. odoo-python
+#: code:addons/odex30_account_accountant/models/account_fiscal_year.py:0
+msgid "The ending date must not be prior to the starting date."
+msgstr "يجب ألا يقع تاريخ الانتهاء قبل تاريخ البداية. "
+
+#. module: odex30_account_accountant
+#. odoo-python
+#: code:addons/odex30_account_accountant/models/bank_rec_widget_line.py:0
+msgid ""
+"The invoice %(display_name_html)s with an open amount of %(open_amount)s "
+"will be entirely paid by the transaction."
+msgstr ""
+"الفاتورة %(display_name_html)s التي بها مبلغ مفتوح قيمته %(open_amount)s "
+"سيتم دفعها كاملة بواسطة المعاملة. "
+
+#. module: odex30_account_accountant
+#. odoo-python
+#: code:addons/odex30_account_accountant/models/bank_rec_widget_line.py:0
+msgid ""
+"The invoice %(display_name_html)s with an open amount of %(open_amount)s "
+"will be reduced by %(amount)s."
+msgstr ""
+"الفاتورة %(display_name_html)s مع مبلغ مفتوح قدره %(open_amount)s سيتم "
+"تقليله بـ %(amount)s. "
+
+#. module: odex30_account_accountant
+#: model_terms:ir.ui.view,arch_db:odex30_account_accountant.res_config_settings_view_form
+msgid ""
+"The invoices before this date will not be taken into account as accounting "
+"entries"
+msgstr "لن يتم اعتبار الفواتير قبل هذا التاريخ كقيود محاسبية "
+
+#. module: odex30_account_accountant
+#: model:ir.model.fields,help:odex30_account_accountant.field_bank_rec_widget_line__transaction_currency_id
+msgid "The optional other currency if it is a multi-currency entry."
+msgstr "العملة الاختيارية الأخرى إذا كان القيد متعدد العملات."
+
+#. module: odex30_account_accountant
+#: model:ir.model.fields,help:odex30_account_accountant.field_account_bank_statement_line__deferred_original_move_ids
+#: model:ir.model.fields,help:odex30_account_accountant.field_account_move__deferred_original_move_ids
+msgid "The original invoices that created the deferred entries"
+msgstr "الفواتير الأصلية التي قامت بإنشاء القيود المؤجلة "
+
+#. module: odex30_account_accountant
+#: model_terms:ir.ui.view,arch_db:odex30_account_accountant.res_config_settings_view_form
+msgid ""
+"The system will try to predict the product on vendor bill lines based on the "
+"label of the line"
+msgstr "سيحاول النظام توقع المنتج في بنود فاتورة المورد بناءً على عنوان البند. "
+
+#. module: odex30_account_accountant
+#: model_terms:ir.ui.view,arch_db:odex30_account_accountant.view_account_change_lock_date
+msgid ""
+"There are still draft entries in the period you want to lock.\n"
+"                                You should either post or delete them."
+msgstr ""
+"لا تزال هناك قيود بحالة المسودة في الفترة التي تريد إقفالها.\n"
+"                                عليك إما ترحيلها أو حذفها. "
+
+#. module: odex30_account_accountant
+#. odoo-python
+#: code:addons/odex30_account_accountant/models/account_bank_statement.py:0
+msgid ""
+"This bank transaction has been automatically validated using the "
+"reconciliation model '%s'."
+msgstr ""
+"هذه المعاملة البنكية قد تم تصديقها تلقائياً باستخدام نموذج التسوية '%s'. "
+
+#. module: odex30_account_accountant
+#. odoo-python
+#: code:addons/odex30_account_accountant/models/bank_rec_widget.py:0
+msgid ""
+"This bank transaction is locked up tighter than a squirrel in a nut factory! "
+"You can't hit the reset button on it. So, do you want to \"unreconcile\" it "
+"instead?"
+msgstr ""
+"هذه المعاملة البنكية مغلقة بإحكام أكثر من السنجاب في مصنع الجوز! لا يمكنك "
+"الضغط على زر إعادة ضبطها. لذا، أترغب في \"إلغاءها\" عوضاً عن ذلك؟ "
+
+#. module: odex30_account_accountant
+#. odoo-python
+#: code:addons/odex30_account_accountant/wizard/account_reconcile_wizard.py:0
+msgid "This can only be used on journal items"
+msgstr "يمكن استخدام ذلك فقط في عناصر اليومية "
+
+#. module: odex30_account_accountant
+#. odoo-python
+#: code:addons/odex30_account_accountant/models/account_reconcile_model_line.py:0
+msgid ""
+"This reconciliation model can't be used in the manual reconciliation widget "
+"because its configuration is not adapted"
+msgstr ""
+"لا يمكن استخدام نموذج التسوية في أداة التسوية اليدوية لعدم اعتماد تهيئته "
+
+#. module: odex30_account_accountant
+#: model:digest.tip,name:odex30_account_accountant.digest_tip_account_accountant_0
+msgid "Tip: Bulk update journal items"
+msgstr "نصيحة: قم بتحديث قيود اليومية بالجملة "
+
+#. module: odex30_account_accountant
+#: model:digest.tip,name:odex30_account_accountant.digest_tip_account_accountant_1
+msgid "Tip: Find an Accountant or register your Accounting Firm"
+msgstr "نصيحة: ابحث عن محاسب أو قم بتسجيل شركتك المحاسبة الخاصة بك "
+
+#. module: odex30_account_accountant
+#: model:ir.model.fields,field_description:odex30_account_accountant.field_account_auto_reconcile_wizard__to_date
+msgid "To"
+msgstr "إلى"
+
+#. module: odex30_account_accountant
+#. odoo-javascript
+#: code:addons/odex30_account_accountant/static/src/components/bank_reconciliation/bank_rec_form.xml:0
+#: model:ir.model.fields,field_description:odex30_account_accountant.field_account_reconcile_wizard__to_check
+#: model_terms:ir.ui.view,arch_db:odex30_account_accountant.view_bank_statement_line_search_bank_rec_widget
+msgid "To Check"
+msgstr "للتحقق منه "
+
+#. module: odex30_account_accountant
+#: model_terms:ir.ui.view,arch_db:odex30_account_accountant.view_bank_statement_line_kanban_bank_rec_widget
+msgid "To check"
+msgstr "للتحقق منه "
+
+#. module: odex30_account_accountant
+#: model_terms:ir.ui.view,arch_db:odex30_account_accountant.res_config_settings_view_form
+msgid "To enhance authenticity, add a signature to your invoices"
+msgstr "لتعزيز صحة مستنداتك، أضف توقيعاً إلى فواتيرك "
+
+#. module: odex30_account_accountant
+#: model:ir.model.fields,field_description:odex30_account_accountant.field_bank_rec_widget__todo_command
+msgid "Todo Command"
+msgstr "أمر قائمة المهام "
+
+#. module: odex30_account_accountant
+#: model_terms:ir.ui.view,arch_db:odex30_account_accountant.view_move_line_reconcile_tree
+msgid "Total Balance"
+msgstr "الرصيد الكلي "
+
+#. module: odex30_account_accountant
+#: model_terms:ir.ui.view,arch_db:odex30_account_accountant.view_move_line_reconcile_tree
+msgid "Total Credit"
+msgstr "إجمالي الائتمان"
+
+#. module: odex30_account_accountant
+#: model_terms:ir.ui.view,arch_db:odex30_account_accountant.view_move_line_reconcile_tree
+msgid "Total Debit"
+msgstr "إجمالي الدين"
+
+#. module: odex30_account_accountant
+#: model_terms:ir.ui.view,arch_db:odex30_account_accountant.view_move_line_reconcile_tree
+msgid "Total Residual"
+msgstr "إجمالي المتبقي "
+
+#. module: odex30_account_accountant
+#: model_terms:ir.ui.view,arch_db:odex30_account_accountant.view_move_line_reconcile_tree
+msgid "Total Residual in Currency"
+msgstr "إجمالي المتبقي بالعملة "
+
+#. module: odex30_account_accountant
+#: model_terms:ir.ui.view,arch_db:odex30_account_accountant.view_bank_statement_line_search_bank_rec_widget
+msgid "Transaction"
+msgstr "معاملة"
+
+#. module: odex30_account_accountant
+#: model:ir.model.fields,field_description:odex30_account_accountant.field_bank_rec_widget__transaction_currency_id
+msgid "Transaction Currency"
+msgstr "عملة المعاملة "
+
+#. module: odex30_account_accountant
+#. odoo-javascript
+#: code:addons/odex30_account_accountant/static/src/components/bank_reconciliation/bank_rec_form.xml:0
+msgid "Transaction Details"
+msgstr "تفاصيل المعاملة "
+
+#. module: odex30_account_accountant
+#: model_terms:ir.ui.view,arch_db:odex30_account_accountant.account_journal_dashboard_kanban_view
+#: model_terms:ir.ui.view,arch_db:odex30_account_accountant.view_bank_statement_tree
+msgid "Transactions"
+msgstr "المعاملات "
+
+#. module: odex30_account_accountant
+#. odoo-python
+#: code:addons/odex30_account_accountant/wizard/account_reconcile_wizard.py:0
+msgid "Transfer from %s"
+msgstr "التحويل من %s"
+
+#. module: odex30_account_accountant
+#. odoo-python
+#: code:addons/odex30_account_accountant/wizard/account_reconcile_wizard.py:0
+msgid "Transfer to %s"
+msgstr "التحويل إلى %s"
+
+#. module: odex30_account_accountant
+#: model:ir.actions.server,name:odex30_account_accountant.auto_reconcile_bank_statement_line_ir_actions_server
+msgid "Try to reconcile automatically your statement lines"
+msgstr "حاول تسوية بنود كشف حسابك تلقائياً "
+
+#. module: odex30_account_accountant
+#: model_terms:ir.ui.view,arch_db:odex30_account_accountant.view_account_move_line_reconcile_search
+msgid "Unreconciled"
+msgstr "غير المسواة"
+
+#. module: odex30_account_accountant
+#. odoo-python
+#: code:addons/odex30_account_accountant/models/res_company.py:0
+msgid "Unreconciled statements lines"
+msgstr "بنود كشف الحساب غير المسواة "
+
+#. module: odex30_account_accountant
+#: model:ir.model.fields.selection,name:odex30_account_accountant.selection__bank_rec_widget__state__valid
+msgid "Valid"
+msgstr "صالح"
+
+#. module: odex30_account_accountant
+#. odoo-javascript
+#: code:addons/odex30_account_accountant/static/src/components/bank_reconciliation/bank_rec_form.xml:0
+#: model_terms:ir.ui.view,arch_db:odex30_account_accountant.view_account_reconcile_model_widget_wizard
+msgid "Validate"
+msgstr "تصديق "
+
+#. module: odex30_account_accountant
+#. odoo-javascript
+#: code:addons/odex30_account_accountant/static/src/components/bank_reconciliation/list_view_switcher.js:0
+#: model_terms:ir.ui.view,arch_db:odex30_account_accountant.view_account_move_line_list_bank_rec_widget
+msgid "View"
+msgstr "أداة العرض"
+
+#. module: odex30_account_accountant
+#. odoo-python
+#: code:addons/odex30_account_accountant/models/bank_rec_widget.py:0
+msgid "View Reconciled Entries"
+msgstr "عرض القيود المسواة "
+
+#. module: odex30_account_accountant
+#. odoo-javascript
+#: code:addons/odex30_account_accountant/static/src/components/bank_reconciliation/bank_rec_form.xml:0
+msgid "View models"
+msgstr "عرض النماذج "
+
+#. module: odex30_account_accountant
+#: model:ir.model.fields,field_description:odex30_account_accountant.field_account_bank_statement__website_message_ids
+msgid "Website Messages"
+msgstr "رسائل الموقع الإلكتروني "
+
+#. module: odex30_account_accountant
+#: model:ir.model.fields,help:odex30_account_accountant.field_account_bank_statement__website_message_ids
+msgid "Website communication history"
+msgstr "سجل تواصل الموقع الإلكتروني "
+
+#. module: odex30_account_accountant
+#: model_terms:ir.ui.view,arch_db:odex30_account_accountant.view_account_move_line_reconcile_search
+msgid "With residual"
+msgstr "مع متبقي "
+
+#. module: odex30_account_accountant
+#: model:ir.model.fields,field_description:odex30_account_accountant.field_bank_rec_widget_line__wizard_id
+msgid "Wizard"
+msgstr "المعالج"
+
+#. module: odex30_account_accountant
+#: model:ir.model.fields,field_description:odex30_account_accountant.field_bank_rec_widget__company_currency_id
+#: model:ir.model.fields,field_description:odex30_account_accountant.field_bank_rec_widget_line__company_currency_id
+msgid "Wizard Company Currency"
+msgstr "معالج عملة الشركة "
+
+#. module: odex30_account_accountant
+#. odoo-python
+#: code:addons/odex30_account_accountant/wizard/account_reconcile_wizard.py:0
+msgid "Write-Off"
+msgstr "شطب"
+
+#. module: odex30_account_accountant
+#. odoo-python
+#: code:addons/odex30_account_accountant/wizard/account_reconcile_wizard.py:0
+msgid "Write-Off Entry"
+msgstr "شطب القيد "
+
+#. module: odex30_account_accountant
+#. odoo-python
+#: code:addons/odex30_account_accountant/models/account_fiscal_year.py:0
+msgid ""
+"You can not have an overlap between two fiscal years, please correct the "
+"start and/or end dates of your fiscal years."
+msgstr ""
+"لا يمكن أن يكون هناك تداخل بين سنتين ماليتين، الرجاء تصحيح تواريخ بدء و/أو "
+"انتهاء سنواتك المالية. "
+
+#. module: odex30_account_accountant
+#. odoo-python
+#: code:addons/odex30_account_accountant/wizard/account_reconcile_wizard.py:0
+msgid "You can only reconcile entries with up to two different accounts: %s"
+msgstr "يمكنك فقط تسوية القيود حتى حسابين مختلفين: %s"
+
+#. module: odex30_account_accountant
+#. odoo-python
+#: code:addons/odex30_account_accountant/models/bank_rec_widget.py:0
+msgid "You can't hit the reset button on a secured bank transaction."
+msgstr "لا يمكنك الضغط على زر إعادة الضبط في معاملة بنكية مؤمَّنة. "
+
+#. module: odex30_account_accountant
+#. odoo-python
+#: code:addons/odex30_account_accountant/models/account_move.py:0
+msgid ""
+"You cannot change the account for a deferred line in %(move_name)s if it has "
+"already been deferred."
+msgstr ""
+"لا يمكنك تغيير الحساب للبند المؤجل %(move_name)s إذا كان مؤجلاً بالفعل. "
+
+#. module: odex30_account_accountant
+#. odoo-python
+#: code:addons/odex30_account_accountant/models/account_move.py:0
+msgid "You cannot create a deferred entry with a start date but no end date."
+msgstr "لا يمكنك إنشاء قيد مؤجل مع تاريخ بدء ودون تاريخ انتهاء. "
+
+#. module: odex30_account_accountant
+#. odoo-python
+#: code:addons/odex30_account_accountant/models/account_move.py:0
+msgid ""
+"You cannot create a deferred entry with a start date later than the end date."
+msgstr "لا يمكنك إنشاء قيد مؤجل مع تاريخ بدء أبعد من تاريخ انتهاء. "
+
+#. module: odex30_account_accountant
+#. odoo-python
+#: code:addons/odex30_account_accountant/models/account_move.py:0
+msgid "You cannot generate deferred entries for a miscellaneous journal entry."
+msgstr "لا يمكنك إنشاء قيود مؤجلة لقيد يومية من المتفرقات. "
+
+#. module: odex30_account_accountant
+#. odoo-python
+#: code:addons/odex30_account_accountant/models/account_fiscal_year.py:0
+msgid "You cannot have a fiscal year on a child company."
+msgstr "لا يمكن أن يكون لديك عام مالي في شركة تابعة. "
+
+#. module: odex30_account_accountant
+#. odoo-python
+#: code:addons/odex30_account_accountant/models/account_move.py:0
+msgid ""
+"You cannot reset to draft an invoice that is grouped in deferral entry. You "
+"can create a credit note instead."
+msgstr ""
+"لا يمكنك إعادة تعيين فاتورة قد تم تجميعها في قيد مؤجل إلى حالة المسودة. "
+"يمكنك إنشاء إشعار دائن عوضاً عن ذلك. "
+
+#. module: odex30_account_accountant
+#. odoo-python
+#: code:addons/odex30_account_accountant/wizard/account_change_lock_date.py:0
+msgid "You cannot set a Lock Date in the future."
+msgstr "لا يمكنك تعيين تاريخ إقفال في المستقبل. "
+
+#. module: odex30_account_accountant
+#. odoo-python
+#: code:addons/odex30_account_accountant/models/bank_rec_widget_line.py:0
+msgid "You might want to %(btn_start)sfully reconcile%(btn_end)s the document."
+msgstr "قد ترغب بإجراء %(btn_start)sالتسوية الكلية%(btn_end)s للمستند.  "
+
+#. module: odex30_account_accountant
+#. odoo-python
+#: code:addons/odex30_account_accountant/models/bank_rec_widget_line.py:0
+msgid ""
+"You might want to make a %(btn_start)spartial reconciliation%(btn_end)s "
+"instead."
+msgstr "قد ترغب بإجراء %(btn_start)sالتسوية الجزئية%(btn_end)s عوضاً عن ذلك. "
+
+#. module: odex30_account_accountant
+#. odoo-python
+#: code:addons/odex30_account_accountant/models/bank_rec_widget_line.py:0
+msgid "You might want to record a %(btn_start)spartial payment%(btn_end)s."
+msgstr "قد ترغب بتسجيل %(btn_start)sالتسوية الجزئية%(btn_end)s. "
+
+#. module: odex30_account_accountant
+#. odoo-python
+#: code:addons/odex30_account_accountant/models/bank_rec_widget_line.py:0
+msgid ""
+"You might want to set the invoice as %(btn_start)sfully paid%(btn_end)s."
+msgstr "قد ترغب بتعيين الفاتورة كـ %(btn_start)sمدفوعة بالكامل%(btn_end)s. "
+
+#. module: odex30_account_accountant
+#. odoo-python
+#: code:addons/odex30_account_accountant/wizard/account_change_lock_date.py:0
+msgid "You need to select a duration for the exception."
+msgstr "عليك تحديد مدة للاستثناء. "
+
+#. module: odex30_account_accountant
+#. odoo-python
+#: code:addons/odex30_account_accountant/wizard/account_change_lock_date.py:0
+msgid "You need to select who the exception applies to."
+msgstr "عليك تحديد الأفراد الذين ينطبق عليهم الاستثناء. "
+
+#. module: odex30_account_accountant
+#. odoo-javascript
+#: code:addons/odex30_account_accountant/static/src/components/bank_reconciliation/rainbowman_content.xml:0
+msgid "You reconciled"
+msgstr "لقد قمت بتسوية "
+
+#. module: odex30_account_accountant
+#: model:ir.model.fields.selection,name:odex30_account_accountant.selection__bank_rec_widget_line__flag__aml
+msgid "aml"
+msgstr "aml"
+
+#. module: odex30_account_accountant
+#: model:ir.model.fields.selection,name:odex30_account_accountant.selection__bank_rec_widget_line__flag__auto_balance
+msgid "auto_balance"
+msgstr "auto_balance"
+
+#. module: odex30_account_accountant
+#: model_terms:ir.ui.view,arch_db:odex30_account_accountant.view_account_reconcile_model_widget_wizard
+msgid "e.g. Bank Fees"
+msgstr "مثال: الرسوم البنكية "
+
+#. module: odex30_account_accountant
+#: model:ir.model.fields.selection,name:odex30_account_accountant.selection__bank_rec_widget_line__flag__early_payment
+msgid "early_payment"
+msgstr "early_payment"
+
+#. module: odex30_account_accountant
+#: model:ir.model.fields.selection,name:odex30_account_accountant.selection__bank_rec_widget_line__flag__exchange_diff
+msgid "exchange_diff"
+msgstr "exchange_diff"
+
+#. module: odex30_account_accountant
+#: model:ir.model.fields.selection,name:odex30_account_accountant.selection__account_change_lock_date__exception_duration__1h
+msgid "for 1 hour"
+msgstr "لمدة ساعة واحدة "
+
+#. module: odex30_account_accountant
+#: model:ir.model.fields.selection,name:odex30_account_accountant.selection__account_change_lock_date__exception_duration__15min
+msgid "for 15 minutes"
+msgstr "لمدة 15 دقيقة "
+
+#. module: odex30_account_accountant
+#: model:ir.model.fields.selection,name:odex30_account_accountant.selection__account_change_lock_date__exception_duration__24h
+msgid "for 24 hours"
+msgstr "لمدة 24 ساعة "
+
+#. module: odex30_account_accountant
+#: model:ir.model.fields.selection,name:odex30_account_accountant.selection__account_change_lock_date__exception_duration__5min
+msgid "for 5 minutes"
+msgstr "لمدة 5 دقائق "
+
+#. module: odex30_account_accountant
+#: model:ir.model.fields.selection,name:odex30_account_accountant.selection__account_change_lock_date__exception_applies_to__everyone
+msgid "for everyone"
+msgstr "للجميع "
+
+#. module: odex30_account_accountant
+#: model:ir.model.fields.selection,name:odex30_account_accountant.selection__account_change_lock_date__exception_applies_to__me
+msgid "for me"
+msgstr "لي "
+
+#. module: odex30_account_accountant
+#: model:ir.model.fields.selection,name:odex30_account_accountant.selection__account_change_lock_date__exception_duration__forever
+msgid "forever"
+msgstr "للأبد "
+
+#. module: odex30_account_accountant
+#. odoo-javascript
+#: code:addons/odex30_account_accountant/static/src/components/bank_reconciliation/bank_rec_form.xml:0
+msgid "in"
+msgstr "في"
+
+#. module: odex30_account_accountant
+#: model:ir.model.fields.selection,name:odex30_account_accountant.selection__bank_rec_widget_line__flag__liquidity
+msgid "liquidity"
+msgstr "السيولة "
+
+#. module: odex30_account_accountant
+#: model:ir.model.fields.selection,name:odex30_account_accountant.selection__bank_rec_widget_line__flag__manual
+msgid "manual"
+msgstr "اليدوية "
+
+#. module: odex30_account_accountant
+#: model:ir.model.fields.selection,name:odex30_account_accountant.selection__bank_rec_widget_line__flag__new_aml
+msgid "new_aml"
+msgstr "new_aml"
+
+#. module: odex30_account_accountant
+#. odoo-javascript
+#: code:addons/odex30_account_accountant/static/src/components/bank_reconciliation/rainbowman_content.xml:0
+msgid "seconds per transaction."
+msgstr "ثوان لكل معاملة. "
+
+#. module: odex30_account_accountant
+#: model:ir.model.fields.selection,name:odex30_account_accountant.selection__bank_rec_widget_line__flag__tax_line
+msgid "tax_line"
+msgstr "tax_line"
+
+#. module: odex30_account_accountant
+#: model_terms:ir.ui.view,arch_db:odex30_account_accountant.account_journal_dashboard_kanban_view
+msgid "to check"
+msgstr "للتفقد"
+
+#. module: odex30_account_accountant
+#: model_terms:ir.ui.view,arch_db:odex30_account_accountant.account_journal_dashboard_kanban_view
+msgid "to reconcile"
+msgstr "بانتظار التسوية "
+
+#. module: odex30_account_accountant
+#. odoo-javascript
+#: code:addons/odex30_account_accountant/static/src/components/bank_reconciliation/rainbowman_content.xml:0
+msgid "transaction in"
+msgstr "معاملة في "
+
+#. module: odex30_account_accountant
+#. odoo-javascript
+#: code:addons/odex30_account_accountant/static/src/components/bank_reconciliation/rainbowman_content.xml:0
+msgid "transactions in"
+msgstr "معاملات في "
diff --git a/dev_odex30_accounting/odex30_account_accountant/models/__init__.py b/dev_odex30_accounting/odex30_account_accountant/models/__init__.py
new file mode 100644
index 0000000..ca01d9a
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_accountant/models/__init__.py
@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+from . import account_account
+from . import account_bank_statement
+from . import account_chart_template
+from . import account_fiscal_year
+from . import account_journal_dashboard
+from . import account_move
+from . import account_payment
+from . import account_reconcile_model
+from . import account_reconcile_model_line
+from . import account_tax
+from . import digest
+from . import res_config_settings
+from . import res_company
+from . import bank_rec_widget
+from . import bank_rec_widget_line
+from . import ir_ui_menu
+from . import ir_model
diff --git a/dev_odex30_accounting/odex30_account_accountant/models/__pycache__/__init__.cpython-311.pyc b/dev_odex30_accounting/odex30_account_accountant/models/__pycache__/__init__.cpython-311.pyc
new file mode 100644
index 0000000..79af41b
Binary files /dev/null and b/dev_odex30_accounting/odex30_account_accountant/models/__pycache__/__init__.cpython-311.pyc differ
diff --git a/dev_odex30_accounting/odex30_account_accountant/models/__pycache__/account_account.cpython-311.pyc b/dev_odex30_accounting/odex30_account_accountant/models/__pycache__/account_account.cpython-311.pyc
new file mode 100644
index 0000000..7111947
Binary files /dev/null and b/dev_odex30_accounting/odex30_account_accountant/models/__pycache__/account_account.cpython-311.pyc differ
diff --git a/dev_odex30_accounting/odex30_account_accountant/models/__pycache__/account_bank_statement.cpython-311.pyc b/dev_odex30_accounting/odex30_account_accountant/models/__pycache__/account_bank_statement.cpython-311.pyc
new file mode 100644
index 0000000..7c50e6a
Binary files /dev/null and b/dev_odex30_accounting/odex30_account_accountant/models/__pycache__/account_bank_statement.cpython-311.pyc differ
diff --git a/dev_odex30_accounting/odex30_account_accountant/models/__pycache__/account_chart_template.cpython-311.pyc b/dev_odex30_accounting/odex30_account_accountant/models/__pycache__/account_chart_template.cpython-311.pyc
new file mode 100644
index 0000000..a080f33
Binary files /dev/null and b/dev_odex30_accounting/odex30_account_accountant/models/__pycache__/account_chart_template.cpython-311.pyc differ
diff --git a/dev_odex30_accounting/odex30_account_accountant/models/__pycache__/account_fiscal_year.cpython-311.pyc b/dev_odex30_accounting/odex30_account_accountant/models/__pycache__/account_fiscal_year.cpython-311.pyc
new file mode 100644
index 0000000..e83ec3c
Binary files /dev/null and b/dev_odex30_accounting/odex30_account_accountant/models/__pycache__/account_fiscal_year.cpython-311.pyc differ
diff --git a/dev_odex30_accounting/odex30_account_accountant/models/__pycache__/account_journal_dashboard.cpython-311.pyc b/dev_odex30_accounting/odex30_account_accountant/models/__pycache__/account_journal_dashboard.cpython-311.pyc
new file mode 100644
index 0000000..3031d95
Binary files /dev/null and b/dev_odex30_accounting/odex30_account_accountant/models/__pycache__/account_journal_dashboard.cpython-311.pyc differ
diff --git a/dev_odex30_accounting/odex30_account_accountant/models/__pycache__/account_move.cpython-311.pyc b/dev_odex30_accounting/odex30_account_accountant/models/__pycache__/account_move.cpython-311.pyc
new file mode 100644
index 0000000..3f915e0
Binary files /dev/null and b/dev_odex30_accounting/odex30_account_accountant/models/__pycache__/account_move.cpython-311.pyc differ
diff --git a/dev_odex30_accounting/odex30_account_accountant/models/__pycache__/account_payment.cpython-311.pyc b/dev_odex30_accounting/odex30_account_accountant/models/__pycache__/account_payment.cpython-311.pyc
new file mode 100644
index 0000000..554b4f6
Binary files /dev/null and b/dev_odex30_accounting/odex30_account_accountant/models/__pycache__/account_payment.cpython-311.pyc differ
diff --git a/dev_odex30_accounting/odex30_account_accountant/models/__pycache__/account_reconcile_model.cpython-311.pyc b/dev_odex30_accounting/odex30_account_accountant/models/__pycache__/account_reconcile_model.cpython-311.pyc
new file mode 100644
index 0000000..382e5c7
Binary files /dev/null and b/dev_odex30_accounting/odex30_account_accountant/models/__pycache__/account_reconcile_model.cpython-311.pyc differ
diff --git a/dev_odex30_accounting/odex30_account_accountant/models/__pycache__/account_reconcile_model_line.cpython-311.pyc b/dev_odex30_accounting/odex30_account_accountant/models/__pycache__/account_reconcile_model_line.cpython-311.pyc
new file mode 100644
index 0000000..08eb771
Binary files /dev/null and b/dev_odex30_accounting/odex30_account_accountant/models/__pycache__/account_reconcile_model_line.cpython-311.pyc differ
diff --git a/dev_odex30_accounting/odex30_account_accountant/models/__pycache__/account_tax.cpython-311.pyc b/dev_odex30_accounting/odex30_account_accountant/models/__pycache__/account_tax.cpython-311.pyc
new file mode 100644
index 0000000..c2663ab
Binary files /dev/null and b/dev_odex30_accounting/odex30_account_accountant/models/__pycache__/account_tax.cpython-311.pyc differ
diff --git a/dev_odex30_accounting/odex30_account_accountant/models/__pycache__/bank_rec_widget.cpython-311.pyc b/dev_odex30_accounting/odex30_account_accountant/models/__pycache__/bank_rec_widget.cpython-311.pyc
new file mode 100644
index 0000000..2ab1c38
Binary files /dev/null and b/dev_odex30_accounting/odex30_account_accountant/models/__pycache__/bank_rec_widget.cpython-311.pyc differ
diff --git a/dev_odex30_accounting/odex30_account_accountant/models/__pycache__/bank_rec_widget_line.cpython-311.pyc b/dev_odex30_accounting/odex30_account_accountant/models/__pycache__/bank_rec_widget_line.cpython-311.pyc
new file mode 100644
index 0000000..44ad487
Binary files /dev/null and b/dev_odex30_accounting/odex30_account_accountant/models/__pycache__/bank_rec_widget_line.cpython-311.pyc differ
diff --git a/dev_odex30_accounting/odex30_account_accountant/models/__pycache__/digest.cpython-311.pyc b/dev_odex30_accounting/odex30_account_accountant/models/__pycache__/digest.cpython-311.pyc
new file mode 100644
index 0000000..57baa46
Binary files /dev/null and b/dev_odex30_accounting/odex30_account_accountant/models/__pycache__/digest.cpython-311.pyc differ
diff --git a/dev_odex30_accounting/odex30_account_accountant/models/__pycache__/ir_model.cpython-311.pyc b/dev_odex30_accounting/odex30_account_accountant/models/__pycache__/ir_model.cpython-311.pyc
new file mode 100644
index 0000000..e8af2c8
Binary files /dev/null and b/dev_odex30_accounting/odex30_account_accountant/models/__pycache__/ir_model.cpython-311.pyc differ
diff --git a/dev_odex30_accounting/odex30_account_accountant/models/__pycache__/ir_ui_menu.cpython-311.pyc b/dev_odex30_accounting/odex30_account_accountant/models/__pycache__/ir_ui_menu.cpython-311.pyc
new file mode 100644
index 0000000..e820a3e
Binary files /dev/null and b/dev_odex30_accounting/odex30_account_accountant/models/__pycache__/ir_ui_menu.cpython-311.pyc differ
diff --git a/dev_odex30_accounting/odex30_account_accountant/models/__pycache__/res_company.cpython-311.pyc b/dev_odex30_accounting/odex30_account_accountant/models/__pycache__/res_company.cpython-311.pyc
new file mode 100644
index 0000000..aedf37f
Binary files /dev/null and b/dev_odex30_accounting/odex30_account_accountant/models/__pycache__/res_company.cpython-311.pyc differ
diff --git a/dev_odex30_accounting/odex30_account_accountant/models/__pycache__/res_config_settings.cpython-311.pyc b/dev_odex30_accounting/odex30_account_accountant/models/__pycache__/res_config_settings.cpython-311.pyc
new file mode 100644
index 0000000..8a54df3
Binary files /dev/null and b/dev_odex30_accounting/odex30_account_accountant/models/__pycache__/res_config_settings.cpython-311.pyc differ
diff --git a/dev_odex30_accounting/odex30_account_accountant/models/account_account.py b/dev_odex30_accounting/odex30_account_accountant/models/account_account.py
new file mode 100644
index 0000000..d60cbf1
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_accountant/models/account_account.py
@@ -0,0 +1,14 @@
+import ast
+from odoo import models
+
+
+class AccountAccount(models.Model):
+    _inherit = "account.account"
+
+    def action_open_reconcile(self):
+        self.ensure_one()
+        action_values = self.env['ir.actions.act_window']._for_xml_id('odex30_account_accountant.action_move_line_posted_unreconciled')
+        domain = ast.literal_eval(action_values['domain'])
+        domain.append(('account_id', '=', self.id))
+        action_values['domain'] = domain
+        return action_values
diff --git a/dev_odex30_accounting/odex30_account_accountant/models/account_bank_statement.py b/dev_odex30_accounting/odex30_account_accountant/models/account_bank_statement.py
new file mode 100644
index 0000000..934c889
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_accountant/models/account_bank_statement.py
@@ -0,0 +1,223 @@
+import logging
+
+from odoo import _, api, fields, models
+from odoo.addons.base.models.res_bank import sanitize_account_number
+from odoo.exceptions import UserError
+from odoo.tools import html2plaintext
+
+from dateutil.relativedelta import relativedelta
+from itertools import product
+from lxml import etree
+from markupsafe import Markup
+
+_logger = logging.getLogger(__name__)
+
+class AccountBankStatement(models.Model):
+    _name = "account.bank.statement"
+    _inherit = ['mail.thread.main.attachment', 'account.bank.statement']
+
+    def action_open_bank_reconcile_widget(self):
+        self.ensure_one()
+        return self.env['account.bank.statement.line']._action_open_bank_reconciliation_widget(
+            name=self.name,
+            default_context={
+                'search_default_statement_id': self.id,
+                'search_default_journal_id': self.journal_id.id,
+            },
+            extra_domain=[('statement_id', '=', self.id)]
+        )
+
+    def action_generate_attachment(self):
+        ir_actions_report_sudo = self.env['ir.actions.report'].sudo()
+        statement_report_action = self.env.ref('account.action_report_account_statement')
+        for statement in self:
+            statement_report = statement_report_action.sudo()
+            content, _content_type = ir_actions_report_sudo._render_qweb_pdf(statement_report, res_ids=statement.ids)
+            statement.attachment_ids |= self.env['ir.attachment'].create({
+                'name': _("Bank Statement %s.pdf", statement.name) if statement.name else _("Bank Statement.pdf"),
+                'type': 'binary',
+                'mimetype': 'application/pdf',
+                'raw': content,
+                'res_model': statement._name,
+                'res_id': statement.id,
+            })
+        return statement_report_action.report_action(docids=self)
+
+class AccountBankStatementLine(models.Model):
+    _inherit = 'account.bank.statement.line'
+
+
+    cron_last_check = fields.Datetime()
+
+    def action_save_close(self):
+        return {'type': 'ir.actions.act_window_close'}
+
+    def action_save_new(self):
+        action = self.env['ir.actions.act_window']._for_xml_id('odex30_account_accountant.action_bank_statement_line_form_bank_rec_widget')
+        action['context'] = {'default_journal_id': self._context['default_journal_id']}
+        return action
+
+
+    @api.model
+    def _action_open_bank_reconciliation_widget(self, extra_domain=None, default_context=None, name=None, kanban_first=True):
+        action_reference = 'odex30_account_accountant.action_bank_statement_line_transactions' + ('_kanban' if kanban_first else '')
+        action = self.env['ir.actions.act_window']._for_xml_id(action_reference)
+
+        action.update({
+            'name': name or _("Bank Reconciliation"),
+            'context': default_context or {},
+            'domain': [('state', '!=', 'cancel')] + (extra_domain or []),
+        })
+
+        return action
+
+    def action_open_recon_st_line(self):
+        self.ensure_one()
+        return self.env['account.bank.statement.line']._action_open_bank_reconciliation_widget(
+            name=self.name,
+            default_context={
+                'default_statement_id': self.statement_id.id,
+                'default_journal_id': self.journal_id.id,
+                'default_st_line_id': self.id,
+                'search_default_id': self.id,
+            },
+        )
+
+    def _cron_try_auto_reconcile_statement_lines(self, batch_size=None, limit_time=0):
+
+        def _compute_st_lines_to_reconcile(configured_company):
+
+            remaining_line_id = None
+            limit = batch_size + 1 if batch_size else None
+            domain = [
+                ('is_reconciled', '=', False),
+                ('create_date', '>', start_time.date() - relativedelta(months=3)),
+                ('company_id', 'in', configured_company.ids),
+            ]
+            st_lines = self.search(domain, limit=limit, order="cron_last_check ASC NULLS FIRST, id")
+            if batch_size and len(st_lines) > batch_size:
+                remaining_line_id = st_lines[batch_size].id
+                st_lines = st_lines[:batch_size]
+            return st_lines, remaining_line_id
+
+        start_time = fields.Datetime.now()
+
+        configured_company = children_company = self.env['account.reconcile.model'].search_fetch([
+            ('auto_reconcile', '=', True),
+            ('rule_type', 'in', ('writeoff_suggestion', 'invoice_matching')),
+        ], ['company_id']).company_id
+        if not configured_company:
+            return
+        while children_company := children_company.child_ids:
+            configured_company += children_company
+
+        st_lines, remaining_line_id = (self, None) if self else _compute_st_lines_to_reconcile(configured_company)
+
+        if not st_lines:
+            return
+
+
+        self.env.cr.execute("SELECT 1 FROM account_bank_statement_line WHERE id in %s FOR UPDATE", [tuple(st_lines.ids)])
+
+        nb_auto_reconciled_lines = 0
+        for index, st_line in enumerate(st_lines):
+            if limit_time and fields.Datetime.now().timestamp() - start_time.timestamp() > limit_time:
+                remaining_line_id = st_line.id
+                st_lines = st_lines[:index]
+                break
+            wizard = self.env['bank.rec.widget'].with_context(default_st_line_id=st_line.id).new({})
+            wizard._action_trigger_matching_rules()
+            if wizard.state == 'valid' and wizard.matching_rules_allow_auto_reconcile:
+                try:
+                    wizard._action_validate()
+                    if st_line.is_reconciled:
+                        st_line.move_id.message_post(body=_(
+                            "This bank transaction has been automatically validated using the reconciliation model '%s'.",
+                            ', '.join(st_line.move_id.line_ids.reconcile_model_id.mapped('name')),
+                        ))
+                        nb_auto_reconciled_lines += 1
+                except UserError as e:
+                    _logger.info("Failed to auto reconcile statement line %s due to user error: %s",
+                        st_line.id,
+                        str(e)
+                    )
+                    continue
+
+        st_lines.write({'cron_last_check': start_time})
+
+        # If the next statement line has never been auto reconciled yet, force the trigger.
+        if remaining_line_id:
+            remaining_st_line = self.env['account.bank.statement.line'].browse(remaining_line_id)
+            if nb_auto_reconciled_lines or not remaining_st_line.cron_last_check:
+                self.env.ref('odex30_account_accountant.auto_reconcile_bank_statement_line')._trigger()
+
+    def _retrieve_partner(self):
+        self.ensure_one()
+
+        # Retrieve the partner from the statement line.
+        if self.partner_id:
+            return self.partner_id
+
+        # Retrieve the partner from the bank account.
+        if self.account_number:
+            account_number_nums = sanitize_account_number(self.account_number)
+            if account_number_nums:
+                domain = [('sanitized_acc_number', 'ilike', account_number_nums)]
+                for extra_domain in ([('company_id', 'parent_of', self.company_id.id)], [('company_id', '=', False)]):
+                    bank_accounts = self.env['res.partner.bank'].search(extra_domain + domain)
+                    if len(bank_accounts.partner_id) == 1:
+                        return bank_accounts.partner_id
+                    else:
+                        # We have several partner with same account, possibly some archived partner
+                        # so try to filter out inactive partner and if one remains, select this one
+                        bank_accounts = bank_accounts.filtered(lambda bacc: bacc.partner_id.active)
+                        if len(bank_accounts) == 1:
+                            return bank_accounts.partner_id
+
+        # Retrieve the partner from the partner name.
+        if self.partner_name:
+            # using 'complete_name' instead of 'name',
+            # as 'complete_name' is the first search criteria in _rec_names_search,
+            # and trigram indexed accordingly.
+            domains = product(
+                [
+                    ('complete_name', '=ilike', self.partner_name),
+                    ('complete_name', 'ilike', self.partner_name),
+                ],
+                [
+                    ('company_id', 'parent_of', self.company_id.id),
+                    ('company_id', '=', False),
+                ],
+            )
+            for domain in domains:
+                partner = self.env['res.partner'].search(list(domain) + [('parent_id', '=', False)], limit=2)
+                if len(partner) == 1:
+                    return partner
+        # Retrieve the partner from the 'reconcile models'.
+        rec_models = self.env['account.reconcile.model'].search([
+            *self.env['account.reconcile.model']._check_company_domain(self.company_id),
+            ('rule_type', '!=', 'writeoff_button'),
+        ])
+        for rec_model in rec_models:
+            partner = rec_model._get_partner_from_mapping(self)
+            if partner and rec_model._is_applicable_for(self, partner):
+                return partner
+
+        return self.env['res.partner']
+
+    def _get_st_line_strings_for_matching(self, allowed_fields=None):
+
+        self.ensure_one()
+
+        st_line_text_values = []
+        if not allowed_fields or 'payment_ref' in allowed_fields:
+            if self.payment_ref:
+                st_line_text_values.append(self.payment_ref)
+        if not allowed_fields or 'narration' in allowed_fields:
+            value = html2plaintext(self.narration or "")
+            if value:
+                st_line_text_values.append(value)
+        if not allowed_fields or 'ref' in allowed_fields:
+            if self.ref:
+                st_line_text_values.append(self.ref)
+        return st_line_text_values
diff --git a/dev_odex30_accounting/odex30_account_accountant/models/account_chart_template.py b/dev_odex30_accounting/odex30_account_accountant/models/account_chart_template.py
new file mode 100644
index 0000000..166ba8f
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_accountant/models/account_chart_template.py
@@ -0,0 +1,51 @@
+# -*- coding: utf-8 -*-
+from odoo.addons.account.models.chart_template import template
+from odoo import models
+
+class AccountChartTemplate(models.AbstractModel):
+    _inherit = 'account.chart.template'
+
+    def _get_account_accountant_res_company(self, chart_template):
+        company = self.env.company
+        data = self._get_chart_template_data(chart_template)
+        company_data = data['res.company'].get(company.id, {})
+
+        # Pre-reload to ensure the necessary xmlids for the load exist in case they were deleted or not created yet.
+        required_data = {k: v for k, v in data.items() if k in ['account.journal', 'account.account']}
+        self._pre_reload_data(company, data['template_data'], required_data)
+
+        return {
+            company.id: {
+                'deferred_expense_journal_id': company.deferred_expense_journal_id.id or company_data.get('deferred_expense_journal_id'),
+                'deferred_revenue_journal_id': company.deferred_revenue_journal_id.id or company_data.get('deferred_revenue_journal_id'),
+                'deferred_expense_account_id': company.deferred_expense_account_id.id or company_data.get('deferred_expense_account_id'),
+                'deferred_revenue_account_id': company.deferred_revenue_account_id.id or company_data.get('deferred_revenue_account_id'),
+            }
+        }
+
+    def _get_chart_template_data(self, chart_template):
+
+        data = super()._get_chart_template_data(chart_template)
+
+        for _company_id, company_data in data['res.company'].items():
+            company_data['deferred_expense_journal_id'] = (
+                company_data.get('deferred_expense_journal_id')
+                or next((xid for xid, d in data['account.journal'].items() if d['type'] == 'general'), None)
+            )
+
+            company_data['deferred_revenue_journal_id'] = (
+                company_data.get('deferred_revenue_journal_id')
+                or next((xid for xid, d in data['account.journal'].items() if d['type'] == 'general'), None)
+            )
+
+            company_data['deferred_expense_account_id'] = (
+                company_data.get('deferred_expense_account_id')
+                or next((xid for xid, d in data['account.account'].items() if d['account_type'] == 'asset_current'), None)
+            )
+
+            company_data['deferred_revenue_account_id'] = (
+                company_data.get('deferred_revenue_account_id')
+                or next((xid for xid, d in data['account.account'].items() if d['account_type'] == 'liability_current'), None)
+            )
+
+        return data
diff --git a/dev_odex30_accounting/odex30_account_accountant/models/account_fiscal_year.py b/dev_odex30_accounting/odex30_account_accountant/models/account_fiscal_year.py
new file mode 100644
index 0000000..01555d4
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_accountant/models/account_fiscal_year.py
@@ -0,0 +1,44 @@
+# -*- coding: utf-8 -*-
+
+from odoo.exceptions import ValidationError
+from odoo import api, fields, models, _
+
+
+from datetime import datetime
+
+
+class AccountFiscalYear(models.Model):
+    _name = 'account.fiscal.year'
+    _description = 'Fiscal Year'
+
+    name = fields.Char(string='Name', required=True)
+    date_from = fields.Date(string='Start Date', required=True,
+        help='Start Date, included in the fiscal year.')
+    date_to = fields.Date(string='End Date', required=True,
+        help='Ending Date, included in the fiscal year.')
+    company_id = fields.Many2one('res.company', string='Company', required=True,
+        default=lambda self: self.env.company)
+
+    @api.constrains('date_from', 'date_to', 'company_id')
+    def _check_dates(self):
+
+        for fy in self:
+            # Starting date must be prior to the ending date
+            date_from = fy.date_from
+            date_to = fy.date_to
+            if date_to < date_from:
+                raise ValidationError(_('The ending date must not be prior to the starting date.'))
+            if fy.company_id.parent_id:
+                raise ValidationError(_('You cannot have a fiscal year on a child company.'))
+
+            domain = [
+                ('id', '!=', fy.id),
+                ('company_id', '=', fy.company_id.id),
+                '|', '|',
+                '&', ('date_from', '<=', fy.date_from), ('date_to', '>=', fy.date_from),
+                '&', ('date_from', '<=', fy.date_to), ('date_to', '>=', fy.date_to),
+                '&', ('date_from', '<=', fy.date_from), ('date_to', '>=', fy.date_to),
+            ]
+
+            if self.search_count(domain) > 0:
+                raise ValidationError(_('You can not have an overlap between two fiscal years, please correct the start and/or end dates of your fiscal years.'))
diff --git a/dev_odex30_accounting/odex30_account_accountant/models/account_journal_dashboard.py b/dev_odex30_accounting/odex30_account_accountant/models/account_journal_dashboard.py
new file mode 100644
index 0000000..85f14c9
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_accountant/models/account_journal_dashboard.py
@@ -0,0 +1,62 @@
+from odoo import models
+
+
+class account_journal(models.Model):
+    _inherit = "account.journal"
+
+    def action_open_reconcile(self):
+        self.ensure_one()
+
+        if self.type in ('bank', 'cash', 'credit'):
+            return self.env['account.bank.statement.line']._action_open_bank_reconciliation_widget(
+                default_context={
+                    'default_journal_id': self.id,
+                    'search_default_journal_id': self.id,
+                    'search_default_not_matched': True,
+                },
+            )
+        else:
+            # Open reconciliation view for customers/suppliers
+            return self.env['ir.actions.act_window']._for_xml_id('odex30_account_accountant.action_move_line_posted_unreconciled')
+
+    def action_open_to_check(self):
+        self.ensure_one()
+        return self.env['account.bank.statement.line']._action_open_bank_reconciliation_widget(
+            default_context={
+                'search_default_to_check': True,
+                'search_default_journal_id': self.id,
+                'default_journal_id': self.id,
+            },
+        )
+
+    def action_open_bank_transactions(self):
+        self.ensure_one()
+        return self.env['account.bank.statement.line']._action_open_bank_reconciliation_widget(
+            default_context={
+                'search_default_journal_id': self.id,
+                'default_journal_id': self.id
+             },
+            kanban_first=False,
+        )
+
+    def action_open_reconcile_statement(self):
+        return self.env['account.bank.statement.line']._action_open_bank_reconciliation_widget(
+            default_context={
+                'search_default_statement_id': self.env.context.get('statement_id'),
+            },
+        )
+
+    def open_action(self):
+        # EXTENDS account
+        # set default action for liquidity journals in dashboard
+
+        if self.type in ('bank', 'cash', 'credit') and not self._context.get('action_name'):
+            self.ensure_one()
+            return self.env['account.bank.statement.line']._action_open_bank_reconciliation_widget(
+                extra_domain=[('line_ids.account_id', '=', self.default_account_id.id)],
+                default_context={
+                    'default_journal_id': self.id,
+                    'search_default_journal_id': self.id,
+                },
+            )
+        return super().open_action()
diff --git a/dev_odex30_accounting/odex30_account_accountant/models/account_move.py b/dev_odex30_accounting/odex30_account_accountant/models/account_move.py
new file mode 100644
index 0000000..7f549b8
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_accountant/models/account_move.py
@@ -0,0 +1,836 @@
+import calendar
+from contextlib import contextmanager
+from itertools import chain
+from dateutil.relativedelta import relativedelta
+import logging
+import re
+
+from odoo import fields, models, api, _, Command
+from odoo.exceptions import UserError
+from odoo.osv import expression
+from odoo.tools import SQL, float_compare
+
+
+_logger = logging.getLogger(__name__)
+
+
+DEFERRED_DATE_MIN = '1900-01-01'
+DEFERRED_DATE_MAX = '9999-12-31'
+
+
+class AccountMove(models.Model):
+    _inherit = "account.move"
+
+    # Technical field to keep the value of payment_state when switching from invoicing to accounting
+    # (using invoicing_switch_threshold setting field). It allows keeping the former payment state, so that
+    # we can restore it if the user misconfigured the switch date and wants to change it.
+    payment_state_before_switch = fields.Char(string="Payment State Before Switch", copy=False)
+
+    # Deferred management fields
+    deferred_move_ids = fields.Many2many(
+        string="Deferred Entries",
+        comodel_name='account.move',
+        relation='account_move_deferred_rel',
+        column1='original_move_id',
+        column2='deferred_move_id',
+        help="The deferred entries created by this invoice",
+        copy=False,
+    )
+    deferred_original_move_ids = fields.Many2many(
+        string="Original Invoices",
+        comodel_name='account.move',
+        relation='account_move_deferred_rel',
+        column1='deferred_move_id',
+        column2='original_move_id',
+        help="The original invoices that created the deferred entries",
+        copy=False,
+    )
+    deferred_entry_type = fields.Selection(
+        string="Deferred Entry Type",
+        selection=[
+            ('expense', 'Deferred Expense'),
+            ('revenue', 'Deferred Revenue'),
+        ],
+        compute='_compute_deferred_entry_type',
+        copy=False,
+    )
+
+    signing_user = fields.Many2one(
+        string='Signer',
+        comodel_name='res.users',
+        compute='_compute_signing_user', store=True,
+        copy=False,
+    )
+    show_signature_area = fields.Boolean(compute='_compute_signature')
+    signature = fields.Binary(compute='_compute_signature')  # can't be `related`: the sign module might not be there
+
+    @api.depends('state', 'move_type', 'invoice_user_id')
+    def _compute_signing_user(self):
+        other_moves = self.filtered(lambda move: not move.is_sale_document())
+        other_moves.signing_user = False
+
+        is_odoobot_user = self.env.user == self.env.ref('base.user_root')
+        is_backend_user = self.env.user.has_group('base.group_user')
+
+        for invoice in (self - other_moves).filtered(lambda inv: inv.state == 'posted'):
+            # signer priority:
+            #   - res.user set in res.settings
+            #   - real backend user posting the invoice
+            #   - if odoobot: the person that initiated the invoice ie: The salesman
+            #   - if invoice initiated by a portal user -> No signature
+            representative = invoice.company_id.signing_user
+            # checking `has_group('base.group_user')` ensure we never keep a portal user to sign
+            if is_odoobot_user:
+                user_can_sign = invoice.invoice_user_id and invoice.invoice_user_id.has_group('base.group_user')
+                invoice.signing_user = representative or invoice.invoice_user_id if user_can_sign else False
+            else:
+                invoice.signing_user = representative or self.env.user if is_backend_user else False
+
+    @api.depends('state')
+    def _compute_signature(self):
+        is_portal_user = self.env.user.has_group('base.group_portal')
+        # Checking `company_id.sign_invoice` removes the needs to check if the sign module is installed
+        # Setting it to True through `res.settings` auto install the sign module
+        moves_not_to_sign = self.filtered(
+            lambda inv: not inv.company_id.sign_invoice
+                        or inv.state in {'draft', 'cancel'}
+                        or not inv.is_sale_document()
+                        # Allow signature for portal user only if the invoice already went through the send&print workflow
+                        or (is_portal_user and not inv.invoice_pdf_report_id)
+        )
+        moves_not_to_sign.show_signature_area = False
+        moves_not_to_sign.signature = None
+
+        invoice_with_signature = self - moves_not_to_sign
+        invoice_with_signature.show_signature_area = True
+        for invoice in invoice_with_signature:
+            invoice.signature = invoice.signing_user.sudo().sign_signature
+
+    def _post(self, soft=True):
+        # Deferred management
+        posted = super()._post(soft)
+        for move in self:
+            if move._get_deferred_entries_method() == 'on_validation' and any(move.line_ids.mapped('deferred_start_date')):
+                move._generate_deferred_entries()
+        return posted
+
+    def action_post(self):
+        # EXTENDS 'account' to trigger the CRON auto-reconciling the statement lines.
+        res = super().action_post()
+        if self.statement_line_id and not self._context.get('skip_statement_line_cron_trigger'):
+            self.env.ref('odex30_odex30_account_accountant.auto_reconcile_bank_statement_line')._trigger()
+        return res
+
+    def button_draft(self):
+        if any(len(deferral_move.deferred_original_move_ids) > 1 for deferral_move in self.deferred_move_ids):
+            raise UserError(_("You cannot reset to draft an invoice that is grouped in deferral entry. You can create a credit note instead."))
+        reversed_moves = self.deferred_move_ids._unlink_or_reverse()
+        if reversed_moves:
+            for move in reversed_moves:
+                move.with_context(skip_readonly_check=True).write({
+                    'date':  move._get_accounting_date(move.date, move._affect_tax_report()),
+                })
+            self.deferred_move_ids |= reversed_moves
+        return super().button_draft()
+
+    def unlink(self):
+        # Prevent deferred moves under audit trail restriction from being unlinked
+        deferral_moves = self.filtered(lambda move: move._is_protected_by_audit_trail() and move.deferred_original_move_ids)
+        deferral_moves.deferred_original_move_ids.deferred_move_ids = False
+        deferral_moves._reverse_moves()
+        return super(AccountMove, self - deferral_moves).unlink()
+
+    # ============================= START - Deferred Management ====================================
+
+    def _get_deferred_entries_method(self):
+        self.ensure_one()
+        if self.is_purchase_document():
+            return self.company_id.generate_deferred_expense_entries_method
+        return self.company_id.generate_deferred_revenue_entries_method
+
+    @api.depends('deferred_original_move_ids')
+    def _compute_deferred_entry_type(self):
+        for move in self:
+            if move.deferred_original_move_ids:
+                move.deferred_entry_type = 'expense' if move.deferred_original_move_ids[0].is_purchase_document() else 'revenue'
+            else:
+                move.deferred_entry_type = False
+
+    @api.model
+    def _get_deferred_diff_dates(self, start, end):
+        """
+        Returns the number of months between two dates [start, end[
+        The computation is done by using months of 30 days so that the deferred amount for february
+        (28-29 days), march (31 days) and april (30 days) are all the same (in case of monthly computation).
+        See test_deferred_management_get_diff_dates for examples.
+        """
+        if start > end:
+            start, end = end, start
+        nb_months = end.month - start.month + 12 * (end.year - start.year)
+        start_day, end_day = start.day, end.day
+        if start_day == calendar.monthrange(start.year, start.month)[1]:
+            start_day = 30
+        if end_day == calendar.monthrange(end.year, end.month)[1]:
+            end_day = 30
+        nb_days = end_day - start_day
+        return (nb_months * 30 + nb_days) / 30
+
+    @api.model
+    def _get_deferred_period_amount(self, method, period_start, period_end, line_start, line_end, balance):
+        """
+        Returns the amount to defer for the given period taking into account the deferred method (day/month/full_months).
+        """
+        if period_end <= line_start or period_end <= period_start:
+            return 0  # invalid period
+        if method == 'day':
+            amount_per_day = balance / (line_end - line_start).days
+            return (period_end - period_start).days * amount_per_day
+        elif method in ('month', 'full_months'):
+            if method == 'full_months':
+                reset_day_1 = relativedelta(day=1)
+                line_start, line_end = line_start + reset_day_1, line_end + reset_day_1
+                period_start, period_end = period_start + reset_day_1, period_end + reset_day_1
+            line_diff = self._get_deferred_diff_dates(line_end, line_start)
+            period_diff = self._get_deferred_diff_dates(period_end, period_start)
+            return period_diff / line_diff * balance if line_diff else balance
+
+    @api.model
+    def _get_deferred_amounts_by_line(self, lines, periods, deferred_type):
+        """
+        :return: a list of dictionaries containing the deferred amounts for each line and each period
+        E.g. (where period1 = (date1, date2, label1), period2 = (date2, date3, label2), ...)
+        [
+            {'account_id': 1, period_1: 100, period_2: 200},
+            {'account_id': 1, period_1: 100, period_2: 200},
+            {'account_id': 2, period_1: 300, period_2: 400},
+        ]
+        """
+        values = []
+        for line in lines:
+            line_start = fields.Date.to_date(line['deferred_start_date'])
+            line_end = fields.Date.to_date(line['deferred_end_date'])
+            if line_end < line_start:
+                # This normally shouldn't happen, but if it does, would cause calculation errors later on.
+                # To not make the reports crash, we just set both dates to the same day.
+                # The user should fix the dates manually.
+                line_end = line_start
+
+            columns = {}
+            for period in periods:
+                if period[2] == 'not_started' and line_start <= period[0]:
+                    # The 'Not Started' column only considers lines starting the deferral after the report end date
+                    columns[period] = 0.0
+                    continue
+                # periods = [Total, Not Started, Before, ..., Current, ..., Later]
+                # The dates to calculate the amount for the current period
+                period_start = max(period[0], line_start)
+                period_end = min(period[1], line_end) + relativedelta(days=1)  # +1 to include  end date of report
+
+                columns[period] = self._get_deferred_period_amount(
+                    self.env.company.deferred_expense_amount_computation_method if deferred_type == "expense" else self.env.company.deferred_revenue_amount_computation_method,
+                    period_start, period_end,
+                    line_start, line_end + relativedelta(days=1),  # +1 to include the end date of the line
+                    line['balance']
+                )
+
+            values.append({
+                **self.env['account.move.line']._get_deferred_amounts_by_line_values(line),
+                **columns,
+            })
+        return values
+
+    @api.model
+    def _get_deferred_lines(self, line, deferred_account, deferred_type, period, ref, force_balance=None, grouping_field='account_id'):
+        """
+        :return: a list of Command objects to create the deferred lines of a single given period
+        """
+        deferred_amounts = self._get_deferred_amounts_by_line(line, [period], deferred_type)[0]
+        balance = deferred_amounts[period] if force_balance is None else force_balance
+        return [
+            Command.create({
+                **self.env['account.move.line']._get_deferred_lines_values(account.id, coeff * balance, ref, line.analytic_distribution, line),
+                'partner_id': line.partner_id.id,
+                'product_id': line.product_id.id,
+            })
+            for (account, coeff) in [(deferred_amounts[grouping_field], 1), (deferred_account, -1)]
+        ]
+
+    def _generate_deferred_entries(self):
+        """
+        Generates the deferred entries for the invoice.
+        """
+        self.ensure_one()
+        if self.state != 'posted':
+            return
+        if self.is_entry():
+            raise UserError(_("You cannot generate deferred entries for a miscellaneous journal entry."))
+        deferred_type = "expense" if self.is_purchase_document(include_receipts=True) else "revenue"
+        deferred_account = self.company_id.deferred_expense_account_id if deferred_type == "expense" else self.company_id.deferred_revenue_account_id
+        deferred_journal = self.company_id.deferred_expense_journal_id if deferred_type == "expense" else self.company_id.deferred_revenue_journal_id
+        if not deferred_journal:
+            raise UserError(_("Please set the deferred journal in the accounting settings."))
+        if not deferred_account:
+            raise UserError(_("Please set the deferred accounts in the accounting settings."))
+
+        moves_vals_to_create = []
+        lines_vals_to_create = []
+        lines_periods = []
+        for line in self.line_ids.filtered(lambda l: l.deferred_start_date and l.deferred_end_date):
+            periods = line._get_deferred_periods()
+            if not periods:
+                continue
+
+            start_date = line.deferred_start_date
+            end_date = line.deferred_end_date
+            accounting_date = line.date
+
+            # When using the 'full_months' computation method, every consumed month counts as a full month.
+            # We therefore need to subtract one month from the end date for the following check on dates.
+            if line.company_id.deferred_expense_amount_computation_method == 'full_months':
+                # We need to add one day to the end date since it's excluded by _get_deferred_diff_dates().
+                if self._get_deferred_diff_dates(start_date.replace(day=1), end_date + relativedelta(days=1)) < 2:
+                    end_date += relativedelta(months=-1)
+
+            # When all move line dates (start, end, accounting) are within the same month, we skip the line.
+            # It would otherwise lead to the creation of both a reversal and a deferral move that would cancel each other out.
+            if start_date.replace(day=1) == end_date.replace(day=1) == accounting_date.replace(day=1):
+                continue
+
+            ref = _("Deferral of %s", line.move_id.name or '')
+
+            moves_vals_to_create.append({
+                'move_type': 'entry',
+                'deferred_original_move_ids': [Command.set(line.move_id.ids)],
+                'journal_id': deferred_journal.id,
+                'company_id': self.company_id.id,
+                'partner_id': line.partner_id.id,
+                'auto_post': 'at_date',
+                'ref': ref,
+                'name': False,
+                'date': line.move_id.date,
+            })
+            lines_vals_to_create.append([
+                self.env['account.move.line']._get_deferred_lines_values(account.id, coeff * line.balance, ref, line.analytic_distribution, line)
+                for (account, coeff) in [(line.account_id, -1), (deferred_account, 1)]
+            ])
+            lines_periods.append((line, periods))
+        # create the deferred moves
+        moves_fully_deferred = self.create(moves_vals_to_create)
+        # We write the lines after creation, to make sure the `deferred_original_move_ids` is set.
+        # This way we can avoid adding taxes for deferred moves.
+        for move_fully_deferred, lines_vals in zip(moves_fully_deferred, lines_vals_to_create):
+            for line_vals in lines_vals:
+                # This will link the moves to the lines. Instead of move.write('line_ids': lines_ids)
+                line_vals['move_id'] = move_fully_deferred.id
+        self.env['account.move.line'].create(list(chain(*lines_vals_to_create)))
+
+        deferral_moves_vals = []
+        deferral_moves_line_vals = []
+        # Create the deferred entries for the periods [deferred_start_date, deferred_end_date]
+        for (line, periods), move_vals in zip(lines_periods, moves_vals_to_create):
+            remaining_balance = line.balance
+            for period_index, period in enumerate(periods):
+                # For the last deferral move the balance is forced to remaining balance to avoid rounding errors
+                force_balance = remaining_balance if period_index == len(periods) - 1 else None
+                deferred_amounts = self._get_deferred_amounts_by_line(line, [period], deferred_type)[0]
+                balance = deferred_amounts[period] if force_balance is None else force_balance
+                remaining_balance -= line.currency_id.round(balance)
+                deferral_moves_vals.append({**move_vals, 'date': period[1]})
+                deferral_moves_line_vals.append([
+                    {
+                        **self.env['account.move.line']._get_deferred_lines_values(account.id, coeff * balance, move_vals['ref'], line.analytic_distribution, line),
+                        'partner_id': line.partner_id.id,
+                        'product_id': line.product_id.id,
+                    }
+                    for (account, coeff) in [(deferred_amounts['account_id'], 1), (deferred_account, -1)]
+                ])
+
+        deferral_moves = self.create(deferral_moves_vals)
+        for deferral_move, lines_vals in zip(deferral_moves, deferral_moves_line_vals):
+            for line_vals in lines_vals:
+                # This will link the moves to the lines. Instead of move.write('line_ids': lines_ids)
+                line_vals['move_id'] = deferral_move.id
+        self.env['account.move.line'].create(list(chain(*deferral_moves_line_vals)))
+
+        # Avoid having deferral moves with a total amount of 0.
+        to_unlink = deferral_moves.filtered(lambda move: move.currency_id.is_zero(move.amount_total))
+        to_unlink.unlink()
+
+        (moves_fully_deferred + deferral_moves - to_unlink)._post(soft=True)
+
+    def open_deferred_entries(self):
+        self.ensure_one()
+        return {
+            'type': 'ir.actions.act_window',
+            'name': _("Deferred Entries"),
+            'res_model': 'account.move.line',
+            'domain': [('id', 'in', self.deferred_move_ids.line_ids.ids)],
+            'views': [(self.env.ref('odex30_account_accountant.view_deferred_entries_tree').id, 'list')],
+            'context': {
+                'search_default_group_by_move': True,
+                'expand': True,
+            }
+        }
+
+    def open_deferred_original_entry(self):
+        self.ensure_one()
+        action = {
+            'type': 'ir.actions.act_window',
+            'name': _("Original Deferred Entries"),
+            'res_model': 'account.move.line',
+            'domain': [('id', 'in', self.deferred_original_move_ids.line_ids.ids)],
+            'views': [(False, 'list'), (False, 'form')],
+            'context': {
+                'search_default_group_by_move': True,
+                'expand': True,
+            }
+        }
+        if len(self.deferred_original_move_ids) == 1:
+            action.update({
+                'res_model': 'account.move',
+                'res_id': self.deferred_original_move_ids[0].id,
+                'views': [(False, 'form')],
+            })
+        return action
+
+    # ============================= END - Deferred management ======================================
+
+    def action_open_bank_reconciliation_widget(self):
+        return self.statement_line_id._action_open_bank_reconciliation_widget(
+            default_context={
+                'search_default_journal_id': self.statement_line_id.journal_id.id,
+                'search_default_statement_line_id': self.statement_line_id.id,
+                'default_st_line_id': self.statement_line_id.id,
+            }
+        )
+
+    def action_open_bank_reconciliation_widget_statement(self):
+        return self.statement_line_id._action_open_bank_reconciliation_widget(
+            extra_domain=[('statement_id', 'in', self.statement_id.ids)],
+        )
+
+    def action_open_business_doc(self):
+        if self.statement_line_id:
+            return self.action_open_bank_reconciliation_widget()
+        else:
+            action = super().action_open_business_doc()
+            # prevent propagation of the following keys
+            action['context'] = action.get('context', {}) | {
+                'preferred_aml_value': None,
+                'preferred_aml_currency_id': None,
+            }
+            return action
+
+    def _get_mail_thread_data_attachments(self):
+        res = super()._get_mail_thread_data_attachments()
+        res += self.statement_line_id.statement_id.attachment_ids
+        return res
+
+    @contextmanager
+    def _get_edi_creation(self):
+        with super()._get_edi_creation() as move:
+            previous_lines = move.invoice_line_ids
+            yield move.with_context(disable_onchange_name_predictive=True)
+            for line in move.invoice_line_ids - previous_lines:
+                line._onchange_name_predictive()
+
+
+class AccountMoveLine(models.Model):
+    _name = "account.move.line"
+    _inherit = "account.move.line"
+
+    move_attachment_ids = fields.One2many('ir.attachment', compute='_compute_attachment')
+
+    # Deferred management fields
+    deferred_start_date = fields.Date(
+        string="Start Date",
+        compute='_compute_deferred_start_date', store=True, readonly=False,
+        index='btree_not_null',
+        copy=False,
+        help="Date at which the deferred expense/revenue starts"
+    )
+    deferred_end_date = fields.Date(
+        string="End Date",
+        index='btree_not_null',
+        copy=False,
+        help="Date at which the deferred expense/revenue ends"
+    )
+    has_deferred_moves = fields.Boolean(compute='_compute_has_deferred_moves')
+    has_abnormal_deferred_dates = fields.Boolean(compute='_compute_has_abnormal_deferred_dates')
+
+    def _order_to_sql(self, order, query, alias=None, reverse=False):
+        sql_order = super()._order_to_sql(order, query, alias, reverse)
+        preferred_aml_residual_value = self._context.get('preferred_aml_value')
+        preferred_aml_currency_id = self._context.get('preferred_aml_currency_id')
+        if preferred_aml_residual_value and preferred_aml_currency_id and order == self._order:
+            currency = self.env['res.currency'].browse(preferred_aml_currency_id)
+            # using round since currency.round(55.55) = 55.550000000000004
+            preferred_aml_residual_value = round(preferred_aml_residual_value, currency.decimal_places)
+            sql_residual_currency = self._field_to_sql(alias or self._table, 'amount_residual_currency', query)
+            sql_currency = self._field_to_sql(alias or self._table, 'currency_id', query)
+            return SQL(
+                "ROUND(%(residual_currency)s, %(decimal_places)s) = %(value)s "
+                "AND %(currency)s = %(currency_id)s DESC, %(order)s",
+                residual_currency=sql_residual_currency,
+                decimal_places=currency.decimal_places,
+                value=preferred_aml_residual_value,
+                currency=sql_currency,
+                currency_id=currency.id,
+                order=sql_order,
+            )
+        return sql_order
+
+    def copy_data(self, default=None):
+        data_list = super().copy_data(default=default)
+        for line, values in zip(self, data_list):
+            if 'move_reverse_cancel' in self._context:
+                values['deferred_start_date'] = line.deferred_start_date
+                values['deferred_end_date'] = line.deferred_end_date
+        return data_list
+
+    def write(self, vals):
+        """ Prevent changing the account of a move line when there are already deferral entries.
+        """
+        if 'account_id' in vals:
+            for line in self:
+                if (
+                    line.has_deferred_moves
+                    and line.deferred_start_date
+                    and line.deferred_end_date
+                    and vals['account_id'] != line.account_id.id
+                ):
+                    raise UserError(_(
+                        "You cannot change the account for a deferred line in %(move_name)s if it has already been deferred.",
+                        move_name=line.move_id.display_name
+                    ))
+        return super().write(vals)
+
+    # ============================= START - Deferred management ====================================
+    def _compute_has_deferred_moves(self):
+        for line in self:
+            line.has_deferred_moves = line.move_id.deferred_move_ids
+
+    @api.depends('deferred_start_date', 'deferred_end_date')
+    def _compute_has_abnormal_deferred_dates(self):
+
+        for line in self:
+            line.has_abnormal_deferred_dates = (
+                line.deferred_start_date
+                and line.deferred_end_date
+                and float_compare(
+                    self.env['account.move']._get_deferred_diff_dates(line.deferred_start_date, line.deferred_end_date + relativedelta(days=1)) % 1,  # end date is included
+                    1 / 30,
+                    precision_digits=2
+                ) == 0
+            )
+
+    def _has_deferred_compatible_account(self):
+        self.ensure_one()
+        return (
+            self.move_id.is_purchase_document(include_receipts=True)
+            and
+            self.account_id.account_type in ('expense', 'expense_depreciation', 'expense_direct_cost')
+        ) or (
+            self.move_id.is_sale_document(include_receipts=True)
+            and
+            self.account_id.account_type in ('income', 'income_other')
+        )
+
+    @api.onchange('deferred_start_date')
+    def _onchange_deferred_start_date(self):
+        if not self._has_deferred_compatible_account():
+            self.deferred_start_date = False
+
+    @api.onchange('deferred_end_date')
+    def _onchange_deferred_end_date(self):
+        if not self._has_deferred_compatible_account():
+            self.deferred_end_date = False
+
+    @api.depends('deferred_end_date', 'move_id.invoice_date', 'move_id.state')
+    def _compute_deferred_start_date(self):
+        for line in self:
+            if not line.deferred_start_date and line.move_id.invoice_date and line.deferred_end_date:
+                line.deferred_start_date = line.move_id.invoice_date
+
+    @api.constrains('deferred_start_date', 'deferred_end_date', 'account_id')
+    def _check_deferred_dates(self):
+        for line in self:
+            if line.deferred_start_date and not line.deferred_end_date:
+                raise UserError(_("You cannot create a deferred entry with a start date but no end date."))
+            elif line.deferred_start_date and line.deferred_end_date and line.deferred_start_date > line.deferred_end_date:
+                raise UserError(_("You cannot create a deferred entry with a start date later than the end date."))
+
+    @api.model
+    def _get_deferred_ends_of_month(self, start_date, end_date):
+
+        dates = []
+        while start_date <= end_date:
+            start_date = start_date + relativedelta(day=31)  # Go to end of month
+            dates.append(start_date)
+            start_date = start_date + relativedelta(days=1)  # Go to first day of next month
+        return dates
+
+    def _get_deferred_periods(self):
+
+        self.ensure_one()
+        periods = [
+            (max(self.deferred_start_date, date.replace(day=1)), min(date, self.deferred_end_date), 'current')
+            for date in self._get_deferred_ends_of_month(self.deferred_start_date, self.deferred_end_date)
+        ]
+        if not periods or len(periods) == 1 and periods[0][0].replace(day=1) == self.date.replace(day=1):
+            return []
+        else:
+            return periods
+
+    @api.model
+    def _get_deferred_amounts_by_line_values(self, line):
+        return {
+            'account_id': line['account_id'],
+            # line either be a dict with ids (coming from SQL query), or a real account.move.line object
+            'product_id': line['product_id'] if isinstance(line, dict) else line['product_id'].id,
+            'product_category_id': line['product_category_id'] if isinstance(line, dict) else line['product_category_id'].id,
+            'balance': line['balance'],
+            'move_id': line['move_id'],
+        }
+
+    @api.model
+    def _get_deferred_lines_values(self, account_id, balance, ref, analytic_distribution, line=None):
+        return {
+            'account_id': account_id,
+            # line either be a dict with ids (coming from SQL query), or a real account.move.line object
+            'product_id': line['product_id'] if isinstance(line, dict) else line['product_id'].id,
+            'product_category_id': line['product_category_id'] if isinstance(line, dict) else line['product_category_id'].id,
+            'balance': balance,
+            'name': ref,
+            'analytic_distribution': analytic_distribution,
+        }
+
+
+    def _get_computed_taxes(self):
+        if self.move_id.deferred_original_move_ids:
+
+            return self.tax_ids
+        return super()._get_computed_taxes()
+
+    def _compute_attachment(self):
+        for record in self:
+            record.move_attachment_ids = self.env['ir.attachment'].search(expression.OR(record._get_attachment_domains()))
+
+    def action_reconcile(self):
+
+        self = self.filtered(lambda x: x.balance or x.amount_currency)  # noqa: PLW0642
+        if not self:
+            return
+
+        wizard = self.env['account.reconcile.wizard'].with_context(
+            active_model='account.move.line',
+            active_ids=self.ids,
+        ).new({})
+        return wizard._action_open_wizard() if (wizard.is_write_off_required or wizard.force_partials) else wizard.reconcile()
+
+    def _get_predict_postgres_dictionary(self):
+        lang = self._context.get('lang') and self._context.get('lang')[:2]
+        return {'fr': 'french'}.get(lang, 'english')
+
+    @api.model
+    def _build_predictive_query(self, move_id, additional_domain=None):
+        move_query = self.env['account.move']._where_calc([
+            ('move_type', '=', move_id.move_type),
+            ('state', '=', 'posted'),
+            ('partner_id', '=', move_id.partner_id.id),
+            ('company_id', '=', move_id.journal_id.company_id.id or self.env.company.id),
+        ])
+        move_query.order = 'account_move.invoice_date'
+        move_query.limit = int(self.env["ir.config_parameter"].sudo().get_param(
+            "account.bill.predict.history.limit",
+            '100',
+        ))
+        return self.env['account.move.line']._where_calc([
+            ('move_id', 'in', move_query),
+            ('display_type', '=', 'product'),
+        ] + (additional_domain or []))
+
+    def _predicted_field(self, name, partner_id, field, query=None, additional_queries=None):
+
+        if not name or not partner_id:
+            return False
+
+        psql_lang = self._get_predict_postgres_dictionary()
+        description = name + ' account_move_line'  # give more priority to main query than additional queries
+        move_id = self.env.context.get('predicted_field_move', self.move_id)
+        parsed_description = re.sub(r"[*&()|!':<>=%/~@,.;$\[\]]+", " ", description)
+        parsed_description = ' | '.join(parsed_description.split())
+
+        try:
+            main_source = (query if query is not None else self._build_predictive_query(move_id)).select(
+                SQL("%s AS prediction", field),
+                SQL(
+                    "setweight(to_tsvector(%s, account_move_line.name), 'B') || setweight(to_tsvector('simple', 'account_move_line'), 'A') AS document",
+                    psql_lang
+                ),
+            )
+            if "(" in field.code:  # aggregate function
+                main_source = SQL("%s %s", main_source, SQL("GROUP BY account_move_line.id, account_move_line.name, account_move_line.partner_id"))
+
+            self.env.cr.execute(SQL("""
+                WITH account_move_line AS MATERIALIZED (%(account_move_line)s),
+
+                source AS (%(source)s),
+
+                ranking AS (
+                    SELECT prediction, ts_rank(source.document, query_plain) AS rank
+                      FROM source, to_tsquery(%(lang)s, %(description)s) query_plain
+                     WHERE source.document @@ query_plain
+                )
+
+                SELECT prediction, MAX(rank) AS ranking, COUNT(*)
+                  FROM ranking
+              GROUP BY prediction
+              ORDER BY ranking DESC, count DESC
+                 LIMIT 2
+                """,
+                account_move_line=self._build_predictive_query(move_id).select(SQL('*')),
+                source=SQL('(%s)', SQL(') UNION ALL (').join([main_source] + (additional_queries or []))),
+                lang=psql_lang,
+                description=parsed_description,
+            ))
+            result = self.env.cr.dictfetchall()
+            if result:
+                # Only confirm the prediction if it's at least 10% better than the second one
+                if len(result) > 1 and result[0]['ranking'] < 1.1 * result[1]['ranking']:
+                    return False
+                return result[0]['prediction']
+        except Exception:
+
+            _logger.exception('Error while predicting invoice line fields')
+        return False
+
+    def _predict_taxes(self):
+        field = SQL('array_agg(account_move_line__tax_rel__tax_ids.id ORDER BY account_move_line__tax_rel__tax_ids.id)')
+        query = self._build_predictive_query(self.move_id)
+        query.left_join('account_move_line', 'id', 'account_move_line_account_tax_rel', 'account_move_line_id', 'tax_rel')
+        query.left_join('account_move_line__tax_rel', 'account_tax_id', 'account_tax', 'id', 'tax_ids')
+        query.add_where('account_move_line__tax_rel__tax_ids.active IS NOT FALSE')
+        predicted_tax_ids = self._predicted_field(self.name, self.partner_id, field, query)
+        if predicted_tax_ids == [None]:
+            return False
+        if predicted_tax_ids is not False and set(predicted_tax_ids) != set(self.tax_ids.ids):
+            return predicted_tax_ids
+        return False
+
+    @api.model
+    def _predict_specific_tax(self, move, name, partner, amount_type, amount, type_tax_use):
+        field = SQL('array_agg(account_move_line__tax_rel__tax_ids.id ORDER BY account_move_line__tax_rel__tax_ids.id)')
+        query = self._build_predictive_query(move)
+        query.left_join('account_move_line', 'id', 'account_move_line_account_tax_rel', 'account_move_line_id', 'tax_rel')
+        query.left_join('account_move_line__tax_rel', 'account_tax_id', 'account_tax', 'id', 'tax_ids')
+        query.add_where("""
+            account_move_line__tax_rel__tax_ids.active IS NOT FALSE
+            AND account_move_line__tax_rel__tax_ids.amount_type = %s
+            AND account_move_line__tax_rel__tax_ids.type_tax_use = %s
+            AND account_move_line__tax_rel__tax_ids.amount = %s
+        """, (amount_type, type_tax_use, amount))
+        return self.with_context(predicted_field_move=move)._predicted_field(name, partner, field, query)
+
+    def _predict_product(self):
+        predict_product = int(self.env['ir.config_parameter'].sudo().get_param('account_predictive_bills.predict_product', '1'))
+        if predict_product and self.company_id.predict_bill_product:
+            query = self._build_predictive_query(self.move_id, ['|', ('product_id', '=', False), ('product_id.active', '=', True)])
+            predicted_product_id = self._predicted_field(self.name, self.partner_id, SQL('account_move_line.product_id'), query)
+            if predicted_product_id and predicted_product_id != self.product_id.id:
+                return predicted_product_id
+        return False
+
+    def _predict_account(self):
+        field = SQL('account_move_line.account_id')
+        if self.move_id.is_purchase_document(True):
+            excluded_group = 'income'
+        else:
+            excluded_group = 'expense'
+        account_query = self.env['account.account']._where_calc([
+            *self.env['account.account']._check_company_domain(self.move_id.company_id or self.env.company),
+            ('deprecated', '=', False),
+            ('internal_group', 'not in', (excluded_group, 'off')),
+            ('account_type', 'not in', ('liability_payable', 'asset_receivable')),
+        ])
+        account_name = self.env['account.account']._field_to_sql('account_account', 'name')
+        psql_lang = self._get_predict_postgres_dictionary()
+        additional_queries = [SQL(account_query.select(
+            SQL("account_account.id AS account_id"),
+            SQL("setweight(to_tsvector(%(psql_lang)s, %(account_name)s), 'B') AS document", psql_lang=psql_lang, account_name=account_name),
+        ))]
+        query = self._build_predictive_query(self.move_id, [('account_id', 'in', account_query)])
+
+        predicted_account_id = self._predicted_field(self.name, self.partner_id, field, query, additional_queries)
+        if predicted_account_id and predicted_account_id != self.account_id.id:
+            return predicted_account_id
+        return False
+
+    @api.onchange('name')
+    def _onchange_name_predictive(self):
+        if ((self.move_id.quick_edit_mode or self.move_id.move_type == 'in_invoice') and self.name and self.display_type == 'product'
+            and not self.env.context.get('disable_onchange_name_predictive', False)):
+
+            if not self.product_id:
+                predicted_product_id = self._predict_product()
+                if predicted_product_id:
+                    # We only update the price_unit, tax_ids and name in case they evaluate to False
+                    protected_fields = ['price_unit', 'tax_ids', 'name']
+                    to_protect = [self._fields[fname] for fname in protected_fields if self[fname]]
+                    with self.env.protecting(to_protect, self):
+                        self.product_id = predicted_product_id
+
+            # In case no product has been set, the account and taxes
+            # will not depend on any product and can thus be predicted
+            if not self.product_id:
+                # Predict account.
+                predicted_account_id = self._predict_account()
+                if predicted_account_id:
+                    self.account_id = predicted_account_id
+
+                # Predict taxes
+                predicted_tax_ids = self._predict_taxes()
+                if predicted_tax_ids:
+                    self.tax_ids = [Command.set(predicted_tax_ids)]
+
+    def _read_group_select(self, aggregate_spec, query):
+        # Enable to use HAVING clause that sum rounded values depending on the
+        # currency precision settings. Limitation: we only handle a having
+        # clause of one element with that specific method :sum_rounded.
+        fname, __, func = models.parse_read_group_spec(aggregate_spec)
+        if func != 'sum_rounded':
+            return super()._read_group_select(aggregate_spec, query)
+        currency_alias = query.make_alias(self._table, 'currency_id')
+        query.add_join('LEFT JOIN', currency_alias, 'res_currency', SQL(
+            "%s = %s",
+            self._field_to_sql(self._table, 'currency_id', query),
+            SQL.identifier(currency_alias, 'id'),
+        ))
+
+        return SQL(
+            'SUM(ROUND(%s, %s))',
+            self._field_to_sql(self._table, fname, query),
+            self.env['res.currency']._field_to_sql(currency_alias, 'decimal_places', query),
+        )
+
+    def _read_group_groupby(self, groupby_spec, query):
+        # enable grouping by :abs_rounded on fields, which is useful when trying
+        # to match positive and negative amounts
+        if ':' in groupby_spec:
+            fname, method = groupby_spec.split(':')
+            if method == 'abs_rounded':
+                # rounds with the used currency settings
+                currency_alias = query.make_alias(self._table, 'currency_id')
+                query.add_join('LEFT JOIN', currency_alias, 'res_currency', SQL(
+                    "%s = %s",
+                    self._field_to_sql(self._table, 'currency_id', query),
+                    SQL.identifier(currency_alias, 'id'),
+                ))
+
+                return SQL(
+                    'ROUND(ABS(%s), %s)',
+                    self._field_to_sql(self._table, fname, query),
+                    self.env['res.currency']._field_to_sql(currency_alias, 'decimal_places', query),
+                )
+
+        return super()._read_group_groupby(groupby_spec, query)
diff --git a/dev_odex30_accounting/odex30_account_accountant/models/account_payment.py b/dev_odex30_accounting/odex30_account_accountant/models/account_payment.py
new file mode 100644
index 0000000..d441aca
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_accountant/models/account_payment.py
@@ -0,0 +1,34 @@
+# -*- coding: utf-8 -*-
+import ast
+from odoo import models, _
+
+
+class AccountPayment(models.Model):
+    _inherit = "account.payment"
+
+    def action_open_manual_reconciliation_widget(self):
+
+        self.ensure_one()
+        action_values = self.env['ir.actions.act_window']._for_xml_id('odex30_account_accountant.action_move_line_posted_unreconciled')
+        if self.partner_id:
+            context = ast.literal_eval(action_values['context'])
+            context.update({'search_default_partner_id': self.partner_id.id})
+            if self.partner_type == 'customer':
+                context.update({'search_default_trade_receivable': 1})
+            elif self.partner_type == 'supplier':
+                context.update({'search_default_trade_payable': 1})
+            action_values['context'] = context
+        return action_values
+
+    def button_open_statement_lines(self):
+
+        self.ensure_one()
+
+        return self.env['account.bank.statement.line']._action_open_bank_reconciliation_widget(
+            extra_domain=[('id', 'in', self.reconciled_statement_line_ids.ids)],
+            default_context={
+                'create': False,
+                'default_st_line_id': self.reconciled_statement_line_ids.ids[-1],
+            },
+            name=_("Matched Transactions")
+        )
diff --git a/dev_odex30_accounting/odex30_account_accountant/models/account_reconcile_model.py b/dev_odex30_accounting/odex30_account_accountant/models/account_reconcile_model.py
new file mode 100644
index 0000000..7b0652d
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_accountant/models/account_reconcile_model.py
@@ -0,0 +1,485 @@
+from odoo import fields, models, Command, tools
+from odoo.tools import SQL
+
+import re
+from collections import defaultdict
+from dateutil.relativedelta import relativedelta
+
+
+class AccountReconcileModel(models.Model):
+    _inherit = 'account.reconcile.model'
+
+    ####################################################
+    # RECONCILIATION PROCESS
+    ####################################################
+
+    def _apply_lines_for_bank_widget(self, residual_amount_currency, partner, st_line):
+
+        self.ensure_one()
+        currency = st_line.foreign_currency_id or st_line.journal_id.currency_id or st_line.company_currency_id
+        vals_list = []
+        for line in self.line_ids:
+            vals = line._apply_in_bank_widget(residual_amount_currency, partner, st_line)
+            amount_currency = vals['amount_currency']
+
+            if currency.is_zero(amount_currency):
+                continue
+
+            vals_list.append(vals)
+            residual_amount_currency -= amount_currency
+
+        return vals_list
+
+
+    def _apply_rules(self, st_line, partner):
+
+        available_models = self.filtered(lambda m: m.rule_type != 'writeoff_button').sorted()
+
+        for rec_model in available_models:
+
+            if not rec_model._is_applicable_for(st_line, partner):
+                continue
+
+            if rec_model.rule_type == 'invoice_matching':
+                rules_map = rec_model._get_invoice_matching_rules_map()
+                for rule_index in sorted(rules_map.keys()):
+                    for rule_method in rules_map[rule_index]:
+                        candidate_vals = rule_method(st_line, partner)
+                        if not candidate_vals:
+                            continue
+
+                        if candidate_vals.get('amls'):
+                            res = rec_model._get_invoice_matching_amls_result(st_line, partner, candidate_vals)
+                            if res:
+                                return {
+                                    **res,
+                                    'model': rec_model,
+                                }
+                        else:
+                            return {
+                                **candidate_vals,
+                                'model': rec_model,
+                            }
+
+            elif rec_model.rule_type == 'writeoff_suggestion':
+                return {
+                    'model': rec_model,
+                    'status': 'write_off',
+                    'auto_reconcile': rec_model.auto_reconcile,
+                }
+        return {}
+
+    def _is_applicable_for(self, st_line, partner):
+
+        self.ensure_one()
+
+        # Filter on journals, amount nature, amount and partners
+        # All the conditions defined in this block are non-match conditions.
+        if ((self.match_journal_ids and st_line.move_id.journal_id not in self.match_journal_ids)
+            or (self.match_nature == 'amount_received' and st_line.amount < 0)
+            or (self.match_nature == 'amount_paid' and st_line.amount > 0)
+            or (self.match_amount == 'lower' and abs(st_line.amount) >= self.match_amount_max)
+            or (self.match_amount == 'greater' and abs(st_line.amount) <= self.match_amount_min)
+            or (self.match_amount == 'between' and (abs(st_line.amount) > self.match_amount_max or abs(st_line.amount) < self.match_amount_min))
+            or (self.match_partner and not partner)
+            or (self.match_partner and self.match_partner_ids and partner not in self.match_partner_ids)
+            or (self.match_partner and self.match_partner_category_ids and not (partner.category_id & self.match_partner_category_ids))
+        ):
+            return False
+
+        # Filter on label, note and transaction_type
+        for record, rule_field, record_field in [(st_line, 'label', 'payment_ref'), (st_line.move_id, 'note', 'narration'), (st_line, 'transaction_type', 'transaction_type')]:
+            rule_term = (self['match_' + rule_field + '_param'] or '').lower()
+            record_term = (record[record_field] or '').lower()
+
+            # This defines non-match conditions
+            if ((self['match_' + rule_field] == 'contains' and rule_term not in record_term)
+                or (self['match_' + rule_field] == 'not_contains' and rule_term in record_term)
+                or (self['match_' + rule_field] == 'match_regex' and not re.match(rule_term, record_term))
+            ):
+                return False
+
+        return True
+
+    def _get_invoice_matching_amls_domain(self, st_line, partner):
+        aml_domain = st_line._get_default_amls_matching_domain()
+
+        if st_line.amount > 0.0:
+            aml_domain.append(('balance', '>', 0.0))
+        else:
+            aml_domain.append(('balance', '<', 0.0))
+
+        currency = st_line.foreign_currency_id or st_line.currency_id
+        if self.match_same_currency:
+            aml_domain.append(('currency_id', '=', currency.id))
+
+        if partner:
+            aml_domain.append(('partner_id', '=', partner.id))
+
+        if self.past_months_limit:
+            date_limit = fields.Date.context_today(self) - relativedelta(months=self.past_months_limit)
+            aml_domain.append(('date', '>=', fields.Date.to_string(date_limit)))
+
+        return aml_domain
+
+    def _get_st_line_text_values_for_matching(self, st_line):
+
+        self.ensure_one()
+        allowed_fields = []
+        if self.match_text_location_label:
+            allowed_fields.append('payment_ref')
+        if self.match_text_location_note:
+            allowed_fields.append('narration')
+        if self.match_text_location_reference:
+            allowed_fields.append('ref')
+        return st_line._get_st_line_strings_for_matching(allowed_fields=allowed_fields)
+
+    def _get_invoice_matching_st_line_tokens(self, st_line):
+
+        st_line_text_values = self._get_st_line_text_values_for_matching(st_line)
+        significant_token_size = 4
+        numerical_tokens = []
+        exact_tokens = set()  # preventing duplicates
+        text_tokens = []
+        for text_value in st_line_text_values:
+            split_text = (text_value or '').split()
+            # Exact tokens
+            exact_tokens.add(text_value)
+            exact_tokens.update(
+                token for token in split_text
+                if len(token) >= significant_token_size
+            )
+            # Text tokens
+            tokens = [
+                ''.join(x for x in token if re.match(r'[0-9a-zA-Z\s]', x))
+                for token in split_text
+            ]
+
+            # Numerical tokens
+            for token in tokens:
+                # The token is too short to be significant.
+                if len(token) < significant_token_size:
+                    continue
+
+                text_tokens.append(token)
+
+                formatted_token = ''.join(x for x in token if x.isdecimal())
+
+                # The token is too short after formatting to be significant.
+                if len(formatted_token) < significant_token_size:
+                    continue
+
+                numerical_tokens.append(formatted_token)
+
+        return numerical_tokens, list(exact_tokens), text_tokens
+
+    def _get_invoice_matching_amls_candidates(self, st_line, partner):
+
+        def get_order_by_clause(prefix=SQL()):
+            direction = SQL(' DESC') if self.matching_order == 'new_first' else SQL(' ASC')
+            return SQL(", ").join(
+                SQL("%s%s%s", prefix, SQL(field), direction)
+                for field in ('date_maturity', 'date', 'id')
+            )
+
+        assert self.rule_type == 'invoice_matching'
+        self.env['account.move'].flush_model()
+        self.env['account.move.line'].flush_model()
+
+        aml_domain = self._get_invoice_matching_amls_domain(st_line, partner)
+        query = self.env['account.move.line']._where_calc(aml_domain)
+        tables = query.from_clause
+        where_clause = query.where_clause or SQL("TRUE")
+
+        aml_cte = SQL()
+        sub_queries: list[SQL] = []
+        numerical_tokens, exact_tokens, _text_tokens = self._get_invoice_matching_st_line_tokens(st_line)
+        if numerical_tokens or exact_tokens:
+            aml_cte = SQL('''
+                WITH aml_cte AS (
+                    SELECT
+                        account_move_line.id as account_move_line_id,
+                        account_move_line.date as account_move_line_date,
+                        account_move_line.date_maturity as account_move_line_date_maturity,
+                        account_move_line.name as account_move_line_name,
+                        account_move_line__move_id.name as account_move_line__move_id_name,
+                        account_move_line__move_id.ref as account_move_line__move_id_ref
+                    FROM %s
+                    JOIN account_move account_move_line__move_id ON account_move_line__move_id.id = account_move_line.move_id
+                    WHERE %s
+                )
+            ''', tables, where_clause)
+        if numerical_tokens:
+            for table_alias, field in (
+                ('account_move_line', 'name'),
+                ('account_move_line__move_id', 'name'),
+                ('account_move_line__move_id', 'ref'),
+            ):
+                sub_queries.append(SQL(r'''
+                    SELECT
+                        account_move_line_id as id,
+                        account_move_line_date as date,
+                        account_move_line_date_maturity as date_maturity,
+                        UNNEST(
+                            REGEXP_SPLIT_TO_ARRAY(
+                                SUBSTRING(
+                                    REGEXP_REPLACE(%(field)s, '[^0-9\s]', '', 'g'),
+                                    '\S(?:.*\S)*'
+                                ),
+                                '\s+'
+                            )
+                        ) AS token
+                    FROM aml_cte
+                    WHERE %(field)s IS NOT NULL
+                ''', field=SQL("%s_%s", SQL(table_alias), SQL(field))))
+        if exact_tokens:
+            for table_alias, field in (
+                ('account_move_line', 'name'),
+                ('account_move_line__move_id', 'name'),
+                ('account_move_line__move_id', 'ref'),
+            ):
+                sub_queries.append(SQL('''
+                    SELECT
+                        account_move_line_id as id,
+                        account_move_line_date as date,
+                        account_move_line_date_maturity as date_maturity,
+                        %(field)s AS token
+                    FROM aml_cte
+                    WHERE %(field)s != ''
+                ''', field=SQL("%s_%s", SQL(table_alias), SQL(field))))
+        if sub_queries:
+            order_by = get_order_by_clause(prefix=SQL('sub.'))
+            candidate_ids = [r[0] for r in self.env.execute_query(SQL(
+                '''
+                    %s
+                    SELECT
+                        sub.id,
+                        COUNT(*) AS nb_match
+                    FROM (%s) AS sub
+                    WHERE sub.token IN %s
+                    GROUP BY sub.date_maturity, sub.date, sub.id
+                    HAVING COUNT(*) > 0
+                    ORDER BY nb_match DESC, %s
+                ''',
+                aml_cte,
+                SQL(" UNION ALL ").join(sub_queries),
+                tuple(numerical_tokens + exact_tokens),
+                order_by,
+            ))]
+            if candidate_ids:
+                return {
+                    'allow_auto_reconcile': True,
+                    'amls': self.env['account.move.line'].browse(candidate_ids),
+                }
+            elif self.match_text_location_label or self.match_text_location_note or self.match_text_location_reference:
+                # In the case any of the Label, Note or Reference matching rule has been toggled, and the query didn't return
+                # any candidates, the model should not try to mount another aml instead.
+                return
+
+        if not partner:
+            st_line_currency = st_line.foreign_currency_id or st_line.journal_id.currency_id or st_line.company_currency_id
+            if st_line_currency == self.company_id.currency_id:
+                aml_amount_field = SQL('amount_residual')
+            else:
+                aml_amount_field = SQL('amount_residual_currency')
+
+            order_by = get_order_by_clause(prefix=SQL('account_move_line.'))
+            rows = self.env.execute_query(SQL(
+                '''
+                    SELECT account_move_line.id
+                    FROM %s
+                    WHERE
+                        %s
+                        AND account_move_line.currency_id = %s
+                        AND ROUND(account_move_line.%s, %s) = ROUND(%s, %s)
+                    ORDER BY %s
+                ''',
+                tables,
+                where_clause,
+                st_line_currency.id,
+                aml_amount_field,
+                st_line_currency.decimal_places,
+                -st_line.amount_residual,
+                st_line_currency.decimal_places,
+                order_by,
+            ))
+            amls = self.env['account.move.line'].browse([row[0] for row in rows])
+        else:
+            amls = self.env['account.move.line'].search(aml_domain, order=get_order_by_clause().code)
+
+        if amls:
+            return {
+                'allow_auto_reconcile': False,
+                'amls': amls,
+            }
+
+    def _get_invoice_matching_rules_map(self):
+
+        rules_map = defaultdict(list)
+        rules_map[10].append(self._get_invoice_matching_amls_candidates)
+        return rules_map
+
+    def _get_partner_from_mapping(self, st_line):
+
+        self.ensure_one()
+
+        if self.rule_type not in ('invoice_matching', 'writeoff_suggestion'):
+            return self.env['res.partner']
+
+        for partner_mapping in self.partner_mapping_line_ids:
+            match_payment_ref = True
+            if partner_mapping.payment_ref_regex:
+                match_payment_ref = re.match(partner_mapping.payment_ref_regex, st_line.payment_ref) if st_line.payment_ref else False
+
+            match_narration = True
+            if partner_mapping.narration_regex:
+                match_narration = re.match(
+                    partner_mapping.narration_regex,
+                    tools.html2plaintext(st_line.narration or '').rstrip(),
+                    flags=re.DOTALL, # Ignore '/n' set by online sync.
+                )
+
+            if match_payment_ref and match_narration:
+                return partner_mapping.partner_id
+        return self.env['res.partner']
+
+    def _get_invoice_matching_amls_result(self, st_line, partner, candidate_vals):
+        def _create_result_dict(amls_values_list, status):
+            if 'rejected' in status:
+                return
+
+            result = {'amls': self.env['account.move.line']}
+            for aml_values in amls_values_list:
+                result['amls'] |= aml_values['aml']
+
+            if 'allow_write_off' in status and self.line_ids:
+                result['status'] = 'write_off'
+
+            if 'allow_auto_reconcile' in status and candidate_vals['allow_auto_reconcile'] and self.auto_reconcile:
+                result['auto_reconcile'] = True
+
+            return result
+
+        st_line_currency = st_line.foreign_currency_id or st_line.currency_id
+        st_line_amount = st_line._prepare_move_line_default_vals()[1]['amount_currency']
+        sign = 1 if st_line_amount > 0.0 else -1
+
+        amls = candidate_vals['amls']
+        amls_values_list = []
+        amls_with_epd_values_list = []
+        same_currency_mode = amls.currency_id == st_line_currency
+        for aml in amls:
+            aml_values = {
+                'aml': aml,
+                'amount_residual': aml.amount_residual,
+                'amount_residual_currency': aml.amount_residual_currency,
+            }
+
+            amls_values_list.append(aml_values)
+
+            # Manage the early payment discount.
+            if aml.move_id._is_eligible_for_early_payment_discount(st_line_currency, st_line.date):
+
+                rate = abs(aml.amount_currency) / abs(aml.balance) if aml.balance else 1.0
+                amls_with_epd_values_list.append({
+                    **aml_values,
+                    'amount_residual': st_line.company_currency_id.round(aml.discount_amount_currency / rate),
+                    'amount_residual_currency': aml.discount_amount_currency,
+                })
+            else:
+                amls_with_epd_values_list.append(aml_values)
+
+        def match_batch_amls(amls_values_list):
+            if not same_currency_mode:
+                return None, []
+
+            kepts_amls_values_list = []
+            sum_amount_residual_currency = 0.0
+            for aml_values in amls_values_list:
+
+                if st_line_currency.compare_amounts(st_line_amount, -aml_values['amount_residual_currency']) == 0:
+                    # Special case: the amounts are the same, submit the line directly.
+                    return 'perfect', [aml_values]
+
+                if st_line_currency.compare_amounts(sign * (st_line_amount + sum_amount_residual_currency), 0.0) > 0:
+                    # Here, we still have room for other candidates ; so we add the current one to the list we keep.
+                    # Then, we continue iterating, even if there is no room anymore, just in case one of the following candidates
+                    # is an exact match, which would then be preferred on the current candidates.
+                    kepts_amls_values_list.append(aml_values)
+                    sum_amount_residual_currency += aml_values['amount_residual_currency']
+
+            if st_line_currency.is_zero(sign * (st_line_amount + sum_amount_residual_currency)):
+                return 'perfect', kepts_amls_values_list
+            elif kepts_amls_values_list:
+                return 'partial', kepts_amls_values_list
+            else:
+                return None, []
+
+        # Try to match a batch with the early payment feature. Only a perfect match is allowed.
+        match_type, kepts_amls_values_list = match_batch_amls(amls_with_epd_values_list)
+        if match_type != 'perfect':
+            kepts_amls_values_list = []
+
+        # Try to match the amls having the same currency as the statement line.
+        if not kepts_amls_values_list:
+            _match_type, kepts_amls_values_list = match_batch_amls(amls_values_list)
+
+        # Try to match the whole candidates.
+        if not kepts_amls_values_list:
+            kepts_amls_values_list = amls_values_list
+
+        # Try to match the amls having the same currency as the statement line.
+        if kepts_amls_values_list:
+            status = self._check_rule_propositions(st_line, kepts_amls_values_list)
+            result = _create_result_dict(kepts_amls_values_list, status)
+            if result:
+                return result
+
+    def _check_rule_propositions(self, st_line, amls_values_list):
+
+        self.ensure_one()
+
+        if not self.allow_payment_tolerance:
+            return {'allow_write_off', 'allow_auto_reconcile'}
+
+        st_line_currency = st_line.foreign_currency_id or st_line.currency_id
+        st_line_amount_curr = st_line._prepare_move_line_default_vals()[1]['amount_currency']
+        amls_amount_curr = sum(
+            st_line._prepare_counterpart_amounts_using_st_line_rate(
+                aml_values['aml'].currency_id,
+                aml_values['amount_residual'],
+                aml_values['amount_residual_currency'],
+            )['amount_currency']
+            for aml_values in amls_values_list
+        )
+        sign = 1 if st_line_amount_curr > 0.0 else -1
+        amount_curr_after_rec = st_line_currency.round(
+            sign * (amls_amount_curr + st_line_amount_curr)
+        )
+
+        if st_line_currency.is_zero(amount_curr_after_rec):
+            return {'allow_auto_reconcile'}
+
+
+        if amount_curr_after_rec > 0.0:
+            return {'allow_auto_reconcile'}
+
+        if self.payment_tolerance_param == 0:
+            return {'rejected'}
+
+
+        if self.payment_tolerance_type == 'fixed_amount' and st_line_currency.compare_amounts(-amount_curr_after_rec, self.payment_tolerance_param) <= 0:
+            return {'allow_write_off', 'allow_auto_reconcile'}
+
+        reconciled_percentage_left = (abs(amount_curr_after_rec / amls_amount_curr)) * 100.0
+        if self.payment_tolerance_type == 'percentage' and st_line_currency.compare_amounts(reconciled_percentage_left, self.payment_tolerance_param) <= 0:
+            return {'allow_write_off', 'allow_auto_reconcile'}
+
+        return {'rejected'}
+
+    def run_auto_reconciliation(self):
+
+
+        cron_limit_time = tools.config['limit_time_real_cron'] or -1
+        limit_time = cron_limit_time if 0 < cron_limit_time < 180 else 180
+        self.env['account.bank.statement.line']._cron_try_auto_reconcile_statement_lines(limit_time=limit_time)
diff --git a/dev_odex30_accounting/odex30_account_accountant/models/account_reconcile_model_line.py b/dev_odex30_accounting/odex30_account_accountant/models/account_reconcile_model_line.py
new file mode 100644
index 0000000..4be6936
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_accountant/models/account_reconcile_model_line.py
@@ -0,0 +1,117 @@
+from odoo import models, Command, _
+from odoo.exceptions import UserError
+
+import re
+
+from math import copysign
+
+
+class AccountReconcileModelLine(models.Model):
+    _inherit = 'account.reconcile.model.line'
+
+    def _prepare_aml_vals(self, partner):
+        """ Prepare a dictionary that will be used later to create a new journal item (account.move.line) for the
+        given reconcile model line.
+
+        :param partner: The partner to be linked to the journal item.
+        :return:        A python dictionary.
+        """
+        self.ensure_one()
+
+        taxes = self.tax_ids
+        if taxes and partner:
+            fiscal_position = self.env['account.fiscal.position']._get_fiscal_position(partner)
+            if fiscal_position:
+                taxes = fiscal_position.map_tax(taxes)
+
+        values = {
+            'name': self.label,
+            'partner_id': partner.id,
+            'analytic_distribution': self.analytic_distribution,
+            'tax_ids': [Command.set(taxes.ids)],
+            'reconcile_model_id': self.model_id.id,
+        }
+        if self.account_id:
+            values['account_id'] = self.account_id.id
+        return values
+
+    def _apply_in_manual_widget(self, residual_amount_currency, partner, currency):
+        """ Prepare a dictionary that will be used later to create a new journal item (account.move.line) for the
+        given reconcile model line used by the manual reconciliation widget.
+
+        Note: 'journal_id' is added to the returned dictionary even if it is a related readonly field.
+        It's a hack for the manual reconciliation widget. Indeed, a single journal entry will be created for each
+        journal.
+
+        :param residual_amount_currency:    The current balance expressed in the account's currency.
+        :param partner:                     The partner to be linked to the journal item.
+        :param currency:                    The currency set on the account in the manual reconciliation widget.
+        :return:                            A python dictionary.
+        """
+        self.ensure_one()
+
+        if self.amount_type == 'percentage':
+            amount_currency = currency.round(residual_amount_currency * (self.amount / 100.0))
+        elif self.amount_type == 'fixed':
+            sign = 1 if residual_amount_currency > 0.0 else -1
+            amount_currency = currency.round(self.amount * sign)
+        else:
+            raise UserError(_("This reconciliation model can't be used in the manual reconciliation widget because its "
+                              "configuration is not adapted"))
+
+        return {
+            **self._prepare_aml_vals(partner),
+            'currency_id': currency.id,
+            'amount_currency': amount_currency,
+            'journal_id': self.journal_id.id,
+        }
+
+    def _apply_in_bank_widget(self, residual_amount_currency, partner, st_line):
+        """ Prepare a dictionary that will be used later to create a new journal item (account.move.line) for the
+        given reconcile model line used by the bank reconciliation widget.
+
+        :param residual_amount_currency:    The current balance expressed in the statement line's currency.
+        :param partner:                     The partner to be linked to the journal item.
+        :param st_line:                     The statement line mounted inside the bank reconciliation widget.
+        :return:                            A python dictionary.
+        """
+        self.ensure_one()
+        currency = st_line.foreign_currency_id or st_line.journal_id.currency_id or st_line.company_currency_id
+
+        aml_values = {'currency_id': currency.id}
+
+        if self.amount_type == 'percentage_st_line':
+            transaction_amount, transaction_currency, journal_amount, journal_currency, _company_amount, _company_currency \
+                = st_line._get_accounting_amounts_and_currencies()
+            if self.model_id.rule_type == 'writeoff_button' and self.model_id.counterpart_type in ('sale', 'purchase'):
+                # The invoice should be created using the transaction currency.
+                aml_values['amount_currency'] = currency.round(-transaction_amount * self.amount / 100.0)
+                aml_values['percentage_st_line'] = self.amount / 100.0
+                aml_values['currency_id'] = transaction_currency.id
+            else:
+                # The additional journal items follow the journal currency.
+                aml_values['amount_currency'] = currency.round(-journal_amount * self.amount / 100.0)
+                aml_values['currency_id'] = journal_currency.id
+        elif self.amount_type == 'regex':
+            match = re.search(self.amount_string, st_line.payment_ref)
+            if match:
+                sign = 1 if residual_amount_currency > 0.0 else -1
+                decimal_separator = self.model_id.decimal_separator
+                try:
+                    extracted_match_group = re.sub(r'[^\d' + decimal_separator + ']', '', match.group(1))
+                    extracted_balance = float(extracted_match_group.replace(decimal_separator, '.'))
+                    aml_values['amount_currency'] = copysign(extracted_balance * sign, residual_amount_currency)
+                except ValueError:
+                    aml_values['amount_currency'] = 0.0
+            else:
+                aml_values['amount_currency'] = 0.0
+
+        if 'amount_currency' not in aml_values:
+            aml_values.update(self._apply_in_manual_widget(residual_amount_currency, partner, currency))
+        else:
+            aml_values.update(self._prepare_aml_vals(partner))
+
+        if not aml_values.get('name', False):
+            aml_values['name'] = st_line.payment_ref
+
+        return aml_values
diff --git a/dev_odex30_accounting/odex30_account_accountant/models/account_tax.py b/dev_odex30_accounting/odex30_account_accountant/models/account_tax.py
new file mode 100644
index 0000000..5e3dca9
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_accountant/models/account_tax.py
@@ -0,0 +1,52 @@
+from odoo import models
+
+
+class AccountTax(models.Model):
+    _inherit = "account.tax"
+
+    def _prepare_base_line_for_taxes_computation(self, record, **kwargs):
+        # EXTENDS 'account'
+        results = super()._prepare_base_line_for_taxes_computation(record, **kwargs)
+        results['deferred_start_date'] = self._get_base_line_field_value_from_record(record, 'deferred_start_date', kwargs, False)
+        results['deferred_end_date'] = self._get_base_line_field_value_from_record(record, 'deferred_end_date', kwargs, False)
+        return results
+
+    def _prepare_tax_line_for_taxes_computation(self, record, **kwargs):
+        # EXTENDS 'account'
+        results = super()._prepare_tax_line_for_taxes_computation(record, **kwargs)
+        results['deferred_start_date'] = self._get_base_line_field_value_from_record(record, 'deferred_start_date', kwargs, False)
+        results['deferred_end_date'] = self._get_base_line_field_value_from_record(record, 'deferred_end_date', kwargs, False)
+        return results
+
+    def _prepare_base_line_grouping_key(self, base_line):
+        # EXTENDS 'account'
+        results = super()._prepare_base_line_grouping_key(base_line)
+        results['deferred_start_date'] = base_line['deferred_start_date']
+        results['deferred_end_date'] = base_line['deferred_end_date']
+        return results
+
+    def _prepare_base_line_tax_repartition_grouping_key(self, base_line, base_line_grouping_key, tax_data, tax_rep_data):
+        # EXTENDS 'account'
+        results = super()._prepare_base_line_tax_repartition_grouping_key(base_line, base_line_grouping_key, tax_data, tax_rep_data)
+        record = base_line['record']
+        if (
+            isinstance(record, models.Model)
+            and record._name == 'account.move.line'
+            and record._has_deferred_compatible_account()
+            and base_line['deferred_start_date']
+            and base_line['deferred_end_date']
+            and not tax_rep_data['tax_rep'].use_in_tax_closing
+        ):
+            results['deferred_start_date'] = base_line['deferred_start_date']
+            results['deferred_end_date'] = base_line['deferred_end_date']
+        else:
+            results['deferred_start_date'] = False
+            results['deferred_end_date'] = False
+        return results
+
+    def _prepare_tax_line_repartition_grouping_key(self, tax_line):
+        # EXTENDS 'account'
+        results = super()._prepare_tax_line_repartition_grouping_key(tax_line)
+        results['deferred_start_date'] = tax_line['deferred_start_date']
+        results['deferred_end_date'] = tax_line['deferred_end_date']
+        return results
diff --git a/dev_odex30_accounting/odex30_account_accountant/models/bank_rec_widget.py b/dev_odex30_accounting/odex30_account_accountant/models/bank_rec_widget.py
new file mode 100644
index 0000000..3e4fa8d
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_accountant/models/bank_rec_widget.py
@@ -0,0 +1,1785 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+from collections import defaultdict
+from contextlib import contextmanager
+import json
+import markupsafe
+
+from odoo import _, api, fields, models, Command
+from odoo.addons.web.controllers.utils import clean_action
+from odoo.exceptions import UserError, RedirectWarning
+from odoo.tools.misc import formatLang
+
+
+class BankRecWidget(models.Model):
+    _name = "bank.rec.widget"
+    _description = "Bank reconciliation widget for a single statement line"
+
+    # This model is never saved inside the database.
+    # _auto=False' & _table_query = "0" prevent the ORM to create the corresponding postgresql table.
+    _auto = False
+    _table_query = "0"
+
+    # ==== Business fields ====
+    st_line_id = fields.Many2one(comodel_name='account.bank.statement.line')
+    move_id = fields.Many2one(
+        related='st_line_id.move_id',
+        depends=['st_line_id'],
+    )
+    st_line_checked = fields.Boolean(
+        related='st_line_id.move_id.checked',
+        depends=['st_line_id'],
+    )
+    st_line_is_reconciled = fields.Boolean(
+        related='st_line_id.is_reconciled',
+        depends=['st_line_id'],
+    )
+    st_line_journal_id = fields.Many2one(
+        related='st_line_id.journal_id',
+        depends=['st_line_id'],
+    )
+    st_line_transaction_details = fields.Html(
+        compute='_compute_st_line_transaction_details',
+    )
+    transaction_currency_id = fields.Many2one(
+        comodel_name='res.currency',
+        compute='_compute_transaction_currency_id',
+    )
+    journal_currency_id = fields.Many2one(
+        comodel_name='res.currency',
+        compute='_compute_journal_currency_id',
+    )
+    partner_id = fields.Many2one(
+        comodel_name='res.partner',
+        string="Partner",
+        compute='_compute_partner_id',
+        store=True,
+        readonly=False,
+    )
+    line_ids = fields.One2many(
+        comodel_name='bank.rec.widget.line',
+        inverse_name='wizard_id',
+        compute='_compute_line_ids',
+        compute_sudo=False,
+        store=True,
+        readonly=False,
+    )
+    available_reco_model_ids = fields.Many2many(
+        comodel_name='account.reconcile.model',
+        compute='_compute_available_reco_model_ids',
+        store=True,
+        readonly=False,
+    )
+    selected_reco_model_id = fields.Many2one(
+        comodel_name='account.reconcile.model',
+        compute='_compute_selected_reco_model_id',
+    )
+    partner_name = fields.Char(
+        related='st_line_id.partner_name',
+    )
+
+    company_id = fields.Many2one(
+        comodel_name='res.company',
+        related='st_line_id.company_id',
+        depends=['st_line_id'],
+    )
+
+    country_code = fields.Char(related='company_id.country_id.code', depends=['company_id'])
+
+    company_currency_id = fields.Many2one(
+        string="Wizard Company Currency",
+        related='company_id.currency_id',
+        depends=['st_line_id'],
+    )
+    matching_rules_allow_auto_reconcile = fields.Boolean()
+
+    # ==== Display fields ====
+    state = fields.Selection(
+        selection=[
+            ('invalid', "Invalid"),
+            ('valid', "Valid"),
+            ('reconciled', "Reconciled"),
+        ],
+        compute='_compute_state',
+        store=True,
+        help="Invalid: The bank transaction can't be validate since the suspense account is still involved\n"
+             "Valid: The bank transaction can be validated.\n"
+             "Reconciled: The bank transaction has already been processed. Nothing left to do."
+    )
+    is_multi_currency = fields.Boolean(
+        compute='_compute_is_multi_currency',
+    )
+
+    # ==== JS fields ====
+    selected_aml_ids = fields.Many2many(
+        comodel_name='account.move.line',
+        compute='_compute_selected_aml_ids',
+    )
+    todo_command = fields.Json(
+        store=False,
+    )
+    return_todo_command = fields.Json(
+        store=False,
+    )
+    form_index = fields.Char()
+
+
+    @api.depends('st_line_id')
+    def _compute_line_ids(self):
+        for wizard in self:
+            if wizard.st_line_id:
+
+                # Liquidity line.
+                line_ids_commands = [
+                    Command.clear(),
+                    Command.create(wizard._lines_prepare_liquidity_line()),
+                ]
+
+                _liquidity_lines, _suspense_lines, other_lines = wizard.st_line_id._seek_for_lines()
+                for aml in other_lines:
+                    exchange_diff_amls = (aml.matched_debit_ids + aml.matched_credit_ids) \
+                        .exchange_move_id.line_ids.filtered(lambda l: l.account_id != aml.account_id)
+                    if wizard.state == 'reconciled' and exchange_diff_amls:
+                        line_ids_commands.append(
+                            Command.create(wizard._lines_prepare_aml_line(
+                                aml,  # Create the aml line with un-squashed amounts (aml - exchange diff)
+                                balance=aml.balance - sum(exchange_diff_amls.mapped('balance')),
+                                amount_currency=aml.amount_currency - sum(exchange_diff_amls.mapped('amount_currency')),
+                            ))
+                        )
+                        for exchange_diff_aml in exchange_diff_amls:
+                            line_ids_commands.append(
+                                Command.create(wizard._lines_prepare_aml_line(exchange_diff_aml))
+                            )
+                    else:
+                        line_ids_commands.append(Command.create(wizard._lines_prepare_aml_line(aml)))
+
+                wizard.line_ids = line_ids_commands
+
+                wizard._lines_add_auto_balance_line()
+
+            else:
+
+                wizard.line_ids = [Command.clear()]
+
+    @api.depends('st_line_id')
+    def _compute_available_reco_model_ids(self):
+        for wizard in self:
+            if wizard.st_line_id:
+                available_reco_models = self.env['account.reconcile.model'].search([
+                    ('rule_type', '=', 'writeoff_button'),
+                    ('company_id', '=', wizard.st_line_id.company_id.id),
+                    '|',
+                    ('match_journal_ids', '=', False),
+                    ('match_journal_ids', '=', wizard.st_line_id.journal_id.id),
+                ])
+                available_reco_models = available_reco_models.filtered(
+                    lambda x: x.counterpart_type == 'general'
+                              or len(x.line_ids.journal_id) <= 1
+                )
+                wizard.available_reco_model_ids = [Command.set(available_reco_models.ids)]
+            else:
+                wizard.available_reco_model_ids = [Command.clear()]
+
+    @api.depends('line_ids.reconcile_model_id')
+    def _compute_selected_reco_model_id(self):
+        for wizard in self:
+            selected_reconcile_models = wizard.line_ids.reconcile_model_id.filtered(lambda x: x.rule_type == 'writeoff_button')
+            if len(selected_reconcile_models) == 1:
+                wizard.selected_reco_model_id = selected_reconcile_models.id
+            else:
+                wizard.selected_reco_model_id = None
+
+    @api.depends('st_line_id', 'line_ids.account_id')
+    def _compute_state(self):
+        for wizard in self:
+            if not wizard.st_line_id:
+                wizard.state = 'invalid'
+            elif wizard.st_line_id.is_reconciled:
+                wizard.state = 'reconciled'
+            else:
+                suspense_account = wizard.st_line_id.journal_id.suspense_account_id
+                if suspense_account in wizard.line_ids.account_id:
+                    wizard.state = 'invalid'
+                else:
+                    wizard.state = 'valid'
+
+    @api.depends('st_line_id')
+    def _compute_journal_currency_id(self):
+        for wizard in self:
+            wizard.journal_currency_id = wizard.st_line_id.journal_id.currency_id \
+                                         or wizard.st_line_id.journal_id.company_id.currency_id
+
+    def _format_transaction_details(self):
+        """ Format the 'transaction_details' field of the statement line to be more readable for the end user.
+
+        Example:
+            {
+                "debtor": {
+                    "name": None,
+                    "private_id": None,
+                },
+                "debtor_account": {
+                    "iban": "BE84103080286059",
+                    "bank_transaction_code": None,
+                    "credit_debit_indicator": "DBIT",
+                    "status": "BOOK",
+                    "value_date": "2022-12-29",
+                    "transaction_date": None,
+                    "balance_after_transaction": None,
+                },
+            }
+
+        Becomes:
+            debtor_account:
+                iban: BE84103080286059
+                credit_debit_indicator: DBIT
+                status: BOOK
+                value_date: 2022-12-29
+
+        :return: An html representation of the transaction details.
+        """
+        self.ensure_one()
+        details = self.st_line_id.transaction_details
+        if not details:
+            return
+
+        if isinstance(details, str):
+            details = json.loads(details, strict=False)
+
+        def node_to_html(header, node):
+            if not node:
+                return ""
+
+            if isinstance(node, dict):
+                li_elements = markupsafe.Markup("").join(node_to_html(f"{k}: ", v) for k, v in node.items())
+                value = li_elements and markupsafe.Markup('<ol>%s</ol>') % li_elements
+            elif isinstance(node, (tuple, list)):
+                li_elements = markupsafe.Markup("").join(node_to_html(f"{i}: ", v) for i, v in enumerate(node, start=1))
+                value = li_elements and markupsafe.Markup('<ol>%s</ol>') % li_elements
+            else:
+                value = node
+
+            if not value:
+                return ""
+
+            return markupsafe.Markup('<li style="list-style-type: none"><span><span class="fw-bolder">%(header)s</span>%(value)s</span></li>') % {
+                'header': header,
+                'value': value,
+            }
+
+        main_html = node_to_html('', details)
+        return markupsafe.Markup("<ol>%s</ol>") % main_html
+
+    @api.depends('st_line_id')
+    def _compute_st_line_transaction_details(self):
+        for wizard in self:
+            wizard.st_line_transaction_details = wizard._format_transaction_details()
+
+    @api.depends('st_line_id')
+    def _compute_transaction_currency_id(self):
+        for wizard in self:
+            wizard.transaction_currency_id = wizard.st_line_id.foreign_currency_id or wizard.journal_currency_id
+
+    @api.depends('st_line_id')
+    def _compute_partner_id(self):
+        for wizard in self:
+            if wizard.st_line_id:
+                wizard.partner_id = wizard.st_line_id._retrieve_partner()
+            else:
+                wizard.partner_id = None
+
+    @api.depends('company_id')
+    def _compute_is_multi_currency(self):
+        self.is_multi_currency = self.env.user.has_groups('base.group_multi_currency')
+
+    @api.depends('company_id', 'line_ids.source_aml_id')
+    def _compute_selected_aml_ids(self):
+        for wizard in self:
+            wizard.selected_aml_ids = [Command.set(wizard.line_ids.source_aml_id.ids)]
+
+    # -------------------------------------------------------------------------
+    # ONCHANGE METHODS
+    # -------------------------------------------------------------------------
+
+    @api.onchange('todo_command')
+    def _onchange_todo_command(self):
+        self.ensure_one()
+        todo_command = self.todo_command
+        self.todo_command = None
+        self.return_todo_command = None
+
+        # Ensure the lines are well loaded.
+        # Suppose the initial values of 'line_ids' are 2 lines,
+        # "self.line_ids = [Command.create(...)]" will produce a single new line in 'line_ids' but three lines in case
+        # the field is accessed before.
+        self._ensure_loaded_lines()
+
+        method_name = todo_command['method_name']
+        getattr(self, f'_js_action_{method_name}')(*todo_command.get('args', []), **todo_command.get('kwargs', {}))
+
+    # -------------------------------------------------------------------------
+    # LOW-LEVEL METHODS
+    # -------------------------------------------------------------------------
+
+    @api.model
+    def new(self, values=None, origin=None, ref=None):
+        widget = super().new(values=values, origin=origin, ref=ref)
+
+        # Ensure the lines are well loaded.
+        # Suppose the initial values of 'line_ids' are 2 lines,
+        # "self.line_ids = [Command.create(...)]" will produce a single new line in 'line_ids' but three lines in case
+        # the field is accessed before.
+        widget.line_ids
+
+        return widget
+
+    # -------------------------------------------------------------------------
+    # INIT
+    # -------------------------------------------------------------------------
+
+    @api.model
+    def fetch_initial_data(self):
+        # Fields.
+        fields = self.fields_get()
+        field_attributes = self.env['ir.ui.view']._get_view_field_attributes()
+        for field_name, field in self._fields.items():
+            if field.type == 'one2many':
+                fields[field_name]['relatedFields'] = self[field_name]\
+                    .fields_get(attributes=field_attributes)
+                del fields[field_name]['relatedFields'][field.inverse_name]
+                for one2many_fieldname, one2many_field in self[field_name]._fields.items():
+                    if one2many_field.type == "many2many":
+                        comodel = self.env[one2many_field.comodel_name]
+                        fields[field_name]['relatedFields'][one2many_fieldname]['relatedFields'] = comodel \
+                            .fields_get(allfields=['id', 'display_name'], attributes=field_attributes)
+            elif field.name == 'available_reco_model_ids':
+                fields[field_name]['relatedFields'] = self[field_name]\
+                    .fields_get(allfields=['id', 'display_name'], attributes=field_attributes)
+
+        fields['todo_command']['onChange'] = True
+
+        # Initial values.
+        initial_values = {}
+        for field_name, field in self._fields.items():
+            if field.type == 'one2many':
+                initial_values[field_name] = []
+            else:
+                initial_values[field_name] = field.convert_to_read(self[field_name], self, {})
+
+        return {
+            'initial_values': initial_values,
+            'fields': fields,
+        }
+
+    # -------------------------------------------------------------------------
+    # LINES METHODS
+    # -------------------------------------------------------------------------
+
+    def _ensure_loaded_lines(self):
+        # Ensure the lines are well loaded.
+        # Suppose the initial values of 'line_ids' are 2 lines,
+        # "self.line_ids = [Command.create(...)]" will produce a single new line in 'line_ids' but three lines in case
+        # the field is accessed before.
+        self.line_ids
+
+    def _lines_turn_auto_balance_into_manual_line(self, line):
+        # When editing an auto_balance line, it becomes a custom manual line.
+        if line.flag == 'auto_balance':
+            line.flag = 'manual'
+
+    def _lines_get_line_in_edit_form(self):
+        self.ensure_one()
+
+        if not self.form_index:
+            return
+
+        return self.line_ids.filtered(lambda x: x.index == self.form_index)
+
+    def _lines_prepare_aml_line(self, aml, **kwargs):
+        self.ensure_one()
+        return {
+            'flag': 'aml',
+            'source_aml_id': aml.id,
+            **kwargs,
+        }
+
+    def _lines_prepare_liquidity_line(self):
+        """ Create a line corresponding to the journal item having the liquidity account on the statement line."""
+        self.ensure_one()
+        st_line = self.st_line_id
+
+        # In case of a different currencies on the journal and on the transaction, we need to retrieve the transaction
+        # amount on the suspense line because a journal item can only have one foreign currency. Indeed, in such
+        # configuration, the foreign currency amount expressed in journal's currency is set on the liquidity line but
+        # the transaction amount is on the suspense account line.
+        liquidity_line, _suspense_lines, _other_lines = st_line._seek_for_lines()
+
+        return self._lines_prepare_aml_line(liquidity_line, flag='liquidity')
+
+    def _lines_prepare_auto_balance_line(self):
+        """ Create the auto_balance line if necessary in order to have fully balanced lines."""
+        self.ensure_one()
+        st_line = self.st_line_id
+
+        # Compute the current open balance.
+        transaction_amount, transaction_currency, journal_amount, _journal_currency, company_amount, _company_currency \
+            = self.st_line_id._get_accounting_amounts_and_currencies()
+        open_amount_currency = -transaction_amount
+        open_balance = -company_amount
+        for line in self.line_ids:
+            if line.flag in ('liquidity', 'auto_balance'):
+                continue
+
+            open_balance -= line.balance
+            journal_transaction_rate = abs(transaction_amount / journal_amount) if journal_amount else 0.0
+            company_transaction_rate = abs(transaction_amount / company_amount) if company_amount else 0.0
+            if line.currency_id == self.transaction_currency_id:
+                open_amount_currency -= line.amount_currency
+            elif line.currency_id == self.journal_currency_id:
+                open_amount_currency -= transaction_currency.round(line.amount_currency * journal_transaction_rate)
+            else:
+                open_amount_currency -= transaction_currency.round(line.balance * company_transaction_rate)
+
+        # Create a new auto-balance line.
+        account = None
+        partner = self.partner_id
+        if partner:
+            name = _("Open balance of %(amount)s", amount=formatLang(self.env, transaction_amount, currency_obj=transaction_currency))
+            partner_is_customer = partner.customer_rank and not partner.supplier_rank
+            partner_is_supplier = partner.supplier_rank and not partner.customer_rank
+            if partner_is_customer:
+                account = partner.with_company(st_line.company_id).property_account_receivable_id
+            elif partner_is_supplier:
+                account = partner.with_company(st_line.company_id).property_account_payable_id
+            elif st_line.amount > 0:
+                account = partner.with_company(st_line.company_id).property_account_receivable_id
+            else:
+                account = partner.with_company(st_line.company_id).property_account_payable_id
+
+        if not account:
+            name = st_line.payment_ref
+            account = st_line.journal_id.suspense_account_id
+
+        return {
+            'flag': 'auto_balance',
+
+            'account_id': account.id,
+            'name': name,
+            'amount_currency': open_amount_currency,
+            'balance': open_balance,
+        }
+
+    def _lines_add_auto_balance_line(self):
+        ''' Add the line auto balancing the debit/credit. '''
+
+        # Drop the existing line then re-create it to ensure this line is always the last one.
+        line_ids_commands = []
+        for auto_balance_line in self.line_ids.filtered(lambda x: x.flag == 'auto_balance'):
+            line_ids_commands.append(Command.unlink(auto_balance_line.id))
+
+        # Re-create a new auto-balance line if needed.
+        auto_balance_line_vals = self._lines_prepare_auto_balance_line()
+        if not self.company_currency_id.is_zero(auto_balance_line_vals['balance']):
+            line_ids_commands.append(Command.create(auto_balance_line_vals))
+        self.line_ids = line_ids_commands
+
+    def _lines_prepare_new_aml_line(self, aml, **kwargs):
+        return self._lines_prepare_aml_line(
+            aml,
+            flag='new_aml',
+            currency_id=aml.currency_id.id,
+            amount_currency=-aml.amount_residual_currency,
+            balance=-aml.amount_residual,
+            source_amount_currency=-aml.amount_residual_currency,
+            source_balance=-aml.amount_residual,
+            source_rate=(aml.amount_currency / aml.balance) if aml.balance else 0.0,
+            **kwargs,
+        )
+
+    def _lines_check_partial_amount(self, line):
+        if line.flag != 'new_aml':
+            return None
+
+        exchange_diff_line = self.line_ids\
+            .filtered(lambda x: x.flag == 'exchange_diff' and x.source_aml_id == line.source_aml_id)
+        auto_balance_line_vals = self._lines_prepare_auto_balance_line()
+
+        auto_balance = auto_balance_line_vals['balance']
+        current_balance = line.balance + exchange_diff_line.balance
+        has_enough_comp_debit = self.company_currency_id.compare_amounts(auto_balance, 0) < 0 \
+                                and self.company_currency_id.compare_amounts(current_balance, 0) > 0 \
+                                and self.company_currency_id.compare_amounts(current_balance, -auto_balance) > 0
+        has_enough_comp_credit = self.company_currency_id.compare_amounts(auto_balance, 0) > 0 \
+                                and self.company_currency_id.compare_amounts(current_balance, 0) < 0 \
+                                and self.company_currency_id.compare_amounts(-current_balance, auto_balance) > 0
+
+        auto_amount_currency = auto_balance_line_vals['amount_currency']
+        current_amount_currency = line.amount_currency
+        has_enough_curr_debit = line.currency_id.compare_amounts(auto_amount_currency, 0) < 0 \
+                                and line.currency_id.compare_amounts(current_amount_currency, 0) > 0 \
+                                and line.currency_id.compare_amounts(current_amount_currency, -auto_amount_currency) > 0
+        has_enough_curr_credit = line.currency_id.compare_amounts(auto_amount_currency, 0) > 0 \
+                                and line.currency_id.compare_amounts(current_amount_currency, 0) < 0 \
+                                and line.currency_id.compare_amounts(-current_amount_currency, auto_amount_currency) > 0
+
+        if line.currency_id == self.transaction_currency_id:
+            if has_enough_curr_debit or has_enough_curr_credit:
+                amount_currency_after_partial = current_amount_currency + auto_amount_currency
+
+                # Get the bank transaction rate.
+                transaction_amount, _transaction_currency, _journal_amount, _journal_currency, company_amount, _company_currency \
+                    = self.st_line_id._get_accounting_amounts_and_currencies()
+                rate = abs(company_amount / transaction_amount) if transaction_amount else 0.0
+
+                # Compute the amounts to make a partial.
+                balance_after_partial = line.company_currency_id.round(amount_currency_after_partial * rate)
+                new_line_balance = line.company_currency_id.round(balance_after_partial * abs(line.balance) / abs(current_balance))
+                exchange_diff_line_balance = balance_after_partial - new_line_balance
+                return {
+                    'exchange_diff_line': exchange_diff_line,
+                    'amount_currency': amount_currency_after_partial,
+                    'balance': new_line_balance,
+                    'exchange_balance': exchange_diff_line_balance,
+                }
+        elif has_enough_comp_debit or has_enough_comp_credit:
+            # Compute the new value for balance.
+            balance_after_partial = current_balance + auto_balance
+
+            # Get the rate of the original journal item.
+            rate = line.source_rate
+
+            # Compute the amounts to make a partial.
+            new_line_balance = line.company_currency_id.round(balance_after_partial * abs(line.balance) / abs(current_balance))
+            exchange_diff_line_balance = balance_after_partial - new_line_balance
+            amount_currency_after_partial = line.currency_id.round(new_line_balance * rate)
+            return {
+                'exchange_diff_line': exchange_diff_line,
+                'amount_currency': amount_currency_after_partial,
+                'balance': new_line_balance,
+                'exchange_balance': exchange_diff_line_balance,
+            }
+        return None
+
+    def _do_amounts_apply_for_early_payment(self, open_amount_currency, total_early_payment_discount):
+        return self.transaction_currency_id.compare_amounts(open_amount_currency, total_early_payment_discount) == 0
+
+    def _lines_check_apply_early_payment_discount(self):
+        """ Try to apply the early payment discount on the currently mounted journal items.
+        :return: True if applied, False otherwise.
+        """
+        all_aml_lines = self.line_ids.filtered(lambda x: x.flag == 'new_aml')
+
+        # Get the balance without the 'new_aml' lines.
+        auto_balance_line_vals = self._lines_prepare_auto_balance_line()
+        open_balance_wo_amls = auto_balance_line_vals['balance'] + sum(all_aml_lines.mapped('balance'))
+        open_amount_currency_wo_amls = auto_balance_line_vals['amount_currency'] + sum(all_aml_lines.mapped('amount_currency'))
+
+        # Get the balance after adding the 'new_aml' lines but without considering the partial amounts.
+        open_balance = open_balance_wo_amls - sum(all_aml_lines.mapped('source_balance'))
+        open_amount_currency = open_amount_currency_wo_amls - sum(all_aml_lines.mapped('source_amount_currency'))
+
+        is_same_currency = all_aml_lines.currency_id == self.transaction_currency_id
+        at_least_one_aml_for_early_payment = False
+
+        early_pay_aml_values_list = []
+        total_early_payment_discount = 0.0
+
+        for aml_line in all_aml_lines:
+            aml = aml_line.source_aml_id
+
+            if aml.move_id._is_eligible_for_early_payment_discount(self.transaction_currency_id, self.st_line_id.date):
+                at_least_one_aml_for_early_payment = True
+                total_early_payment_discount += aml.amount_currency - aml.discount_amount_currency
+
+                early_pay_aml_values_list.append({
+                    'aml': aml,
+                    'amount_currency': aml_line.amount_currency,
+                    'balance': aml_line.balance,
+                })
+
+        line_ids_create_command_list = []
+        is_early_payment_applied = False
+
+        # Cleanup the existing early payment discount lines.
+        for line in self.line_ids.filtered(lambda x: x.flag == 'early_payment'):
+            line_ids_create_command_list.append(Command.unlink(line.id))
+
+        if is_same_currency \
+            and at_least_one_aml_for_early_payment \
+            and self._do_amounts_apply_for_early_payment(open_amount_currency, total_early_payment_discount):
+            # == Compute the early payment discount lines ==
+            # Remove the partials on existing lines.
+            for aml_line in all_aml_lines:
+                aml_line.amount_currency = aml_line.source_amount_currency
+                aml_line.balance = aml_line.source_balance
+
+            # Add the early payment lines.
+            early_payment_values = self.env['account.move']._get_invoice_counterpart_amls_for_early_payment_discount(
+                early_pay_aml_values_list,
+                open_balance,
+            )
+
+            for vals_list in early_payment_values.values():
+                for vals in vals_list:
+                    line_ids_create_command_list.append(Command.create({
+                        'flag': 'early_payment',
+                        'account_id': vals['account_id'],
+                        'date': self.st_line_id.date,
+                        'name': vals['name'],
+                        'partner_id': vals['partner_id'],
+                        'currency_id': vals['currency_id'],
+                        'amount_currency': vals['amount_currency'],
+                        'balance': vals['balance'],
+                        'analytic_distribution': vals.get('analytic_distribution'),
+                        'tax_ids': vals.get('tax_ids', []),
+                        'tax_tag_ids': vals.get('tax_tag_ids', []),
+                        'tax_repartition_line_id': vals.get('tax_repartition_line_id'),
+                        'group_tax_id': vals.get('group_tax_id'),
+                    }))
+                    is_early_payment_applied = True
+
+        if line_ids_create_command_list:
+            self.line_ids = line_ids_create_command_list
+
+        return is_early_payment_applied
+
+    def _lines_check_apply_partial_matching(self):
+        """ Try to apply a partial matching on the currently mounted journal items.
+        :return: True if applied, False otherwise.
+        """
+        all_aml_lines = self.line_ids.filtered(lambda x: x.flag == 'new_aml')
+        if all_aml_lines:
+            last_line = all_aml_lines[-1]
+
+            # Cleanup the existing partials if not on the last line.
+            line_ids_commands = []
+            lines_impacted = self.env['bank.rec.widget.line']
+            for aml_line in all_aml_lines:
+                is_partial = aml_line.display_stroked_amount_currency or aml_line.display_stroked_balance
+                if is_partial and not aml_line.manually_modified:
+                    line_ids_commands.append(Command.update(aml_line.id, {
+                        'amount_currency': aml_line.source_amount_currency,
+                        'balance': aml_line.source_balance,
+                    }))
+                    lines_impacted |= aml_line
+            if line_ids_commands:
+                self.line_ids = line_ids_commands
+                self._lines_recompute_exchange_diff(lines_impacted)
+
+            # Check for a partial reconciliation.
+            partial_amounts = self._lines_check_partial_amount(last_line)
+
+            if partial_amounts:
+                # Make a partial: an auto-balance line is no longer necessary.
+                last_line.amount_currency = partial_amounts['amount_currency']
+                last_line.balance = partial_amounts['balance']
+                exchange_line = partial_amounts['exchange_diff_line']
+                if exchange_line:
+                    exchange_line.balance = partial_amounts['exchange_balance']
+                    if exchange_line.currency_id == self.company_currency_id:
+                        exchange_line.amount_currency = exchange_line.balance
+                return True
+
+        return False
+
+    def _lines_load_new_amls(self, amls, reco_model=None):
+        """ Create counterpart lines for the journal items passed as parameter."""
+        # Create a new line for each aml.
+        line_ids_commands = []
+        kwargs = {'reconcile_model_id': reco_model.id} if reco_model else {}
+        for aml in amls:
+            aml_line_vals = self._lines_prepare_new_aml_line(aml, **kwargs)
+            line_ids_commands.append(Command.create(aml_line_vals))
+
+        if not line_ids_commands:
+            return
+
+        self.line_ids = line_ids_commands
+
+    def _prepare_base_line_for_taxes_computation(self, line):
+        """ Convert the current dictionary in order to use the generic taxes computation method defined on account.tax.
+        :return: A python dictionary.
+        """
+        self.ensure_one()
+        tax_type = line.tax_ids[0].type_tax_use if line.tax_ids else None
+        is_refund = (tax_type == 'sale' and line.balance > 0.0) or (tax_type == 'purchase' and line.balance < 0.0)
+
+        if line.force_price_included_taxes and line.tax_ids:
+            special_mode = 'total_included'
+            base_amount = line.tax_base_amount_currency
+        else:
+            special_mode = 'total_excluded'
+            base_amount = line.amount_currency
+
+        return self.env['account.tax']._prepare_base_line_for_taxes_computation(
+            line,
+            price_unit=base_amount,
+            quantity=1.0,
+            is_refund=is_refund,
+            special_mode=special_mode,
+        )
+
+    def _prepare_tax_line_for_taxes_computation(self, line):
+        """ Convert the current dictionary in order to use the generic taxes computation method defined on account.tax.
+        :return: A python dictionary.
+        """
+        self.ensure_one()
+        return self.env['account.tax']._prepare_tax_line_for_taxes_computation(line)
+
+    def _lines_prepare_tax_line(self, tax_line_vals):
+        self.ensure_one()
+
+        tax_rep = self.env['account.tax.repartition.line'].browse(tax_line_vals['tax_repartition_line_id'])
+        name = tax_rep.tax_id.name
+        if self.st_line_id.payment_ref:
+            name = f'{name} - {self.st_line_id.payment_ref}'
+        currency = self.env['res.currency'].browse(tax_line_vals['currency_id'])
+        amount_currency = tax_line_vals['amount_currency']
+        balance = self.st_line_id._prepare_counterpart_amounts_using_st_line_rate(currency, None, amount_currency)['balance']
+
+        return {
+            'flag': 'tax_line',
+
+            'account_id': tax_line_vals['account_id'],
+            'date': self.st_line_id.date,
+            'name': name,
+            'partner_id': tax_line_vals['partner_id'],
+            'currency_id': currency.id,
+            'amount_currency': amount_currency,
+            'balance': balance,
+
+            'analytic_distribution': tax_line_vals['analytic_distribution'],
+            'tax_repartition_line_id': tax_rep.id,
+            'tax_ids': tax_line_vals['tax_ids'],
+            'tax_tag_ids': tax_line_vals['tax_tag_ids'],
+            'group_tax_id': tax_line_vals['group_tax_id'],
+        }
+
+    def _lines_recompute_taxes(self):
+        self.ensure_one()
+        AccountTax = self.env['account.tax']
+        base_amls = self.line_ids.filtered(lambda x: x.flag == 'manual' and not x.tax_repartition_line_id)
+        base_lines = [self._prepare_base_line_for_taxes_computation(x) for x in base_amls]
+        tax_amls = self.line_ids.filtered(lambda x: x.flag == 'tax_line')
+        tax_lines = [self._prepare_tax_line_for_taxes_computation(x) for x in tax_amls]
+        AccountTax._add_tax_details_in_base_lines(base_lines, self.company_id)
+        AccountTax._round_base_lines_tax_details(base_lines, self.company_id)
+        AccountTax._add_accounting_data_in_base_lines_tax_details(base_lines, self.company_id, include_caba_tags=True)
+        tax_results = AccountTax._prepare_tax_lines(base_lines, self.company_id, tax_lines=tax_lines)
+
+        line_ids_commands = []
+
+        # Update the base lines.
+        for base_line, to_update in tax_results['base_lines_to_update']:
+            line = base_line['record']
+            amount_currency = to_update['amount_currency']
+            balance = self.st_line_id\
+                ._prepare_counterpart_amounts_using_st_line_rate(line.currency_id, None, amount_currency)['balance']
+
+            line_ids_commands.append(Command.update(line.id, {
+                'balance': balance,
+                'amount_currency': amount_currency,
+                'tax_tag_ids': to_update['tax_tag_ids'],
+            }))
+
+        # Tax lines that are no longer needed.
+        for tax_line_vals in tax_results['tax_lines_to_delete']:
+            line_ids_commands.append(Command.unlink(tax_line_vals['record'].id))
+
+        # Newly created tax lines.
+        for tax_line_vals in tax_results['tax_lines_to_add']:
+            line_ids_commands.append(Command.create(self._lines_prepare_tax_line(tax_line_vals)))
+
+        # Update of existing tax lines.
+        for tax_line_vals, grouping_key, to_update in tax_results['tax_lines_to_update']:
+            new_line_vals = self._lines_prepare_tax_line({**grouping_key, **to_update})
+            line_ids_commands.append(Command.update(tax_line_vals['record'].id, {
+                'amount_currency': new_line_vals['amount_currency'],
+                'balance': new_line_vals['balance'],
+            }))
+
+        self.line_ids = line_ids_commands
+
+    def _get_key_mapping_aml_and_exchange_diff(self, line):
+        if line.source_aml_id:
+            return 'source_aml_id', line.source_aml_id.id
+        return None, None
+
+    def _reorder_exchange_and_aml_lines(self):
+        # Reorder to put each exchange line right after the corresponding new_aml.
+        new_lines_ids = []
+        exchange_lines = self.line_ids.filtered(lambda x: x.flag == 'exchange_diff')
+        source_2_exchange_mapping = defaultdict(lambda: self.env['bank.rec.widget.line'])
+        for line in exchange_lines:
+            source_2_exchange_mapping[self._get_key_mapping_aml_and_exchange_diff(line)] |= line
+        for line in self.line_ids:
+            if line in exchange_lines:
+                continue
+
+            new_lines_ids.append(line.id)
+            line_key = self._get_key_mapping_aml_and_exchange_diff(line)
+            if line_key in source_2_exchange_mapping:
+                new_lines_ids += source_2_exchange_mapping[line_key].mapped('id')
+        self.line_ids = self.env['bank.rec.widget.line'].browse(new_lines_ids)
+
+    def _remove_related_exchange_diff_lines(self, lines):
+        """ Delete the exchange_diff_lines related to the lines given in parameter.
+            If the parameter (lines) is not set, then all exchange_diff_lines will be removed
+        """
+        exch_diff_command_unlink = []
+        for line in lines:
+            if line.flag == 'exchange_diff':
+                continue
+
+            line_source_key, line_source_id = self._get_key_mapping_aml_and_exchange_diff(line)
+            if not line_source_key:
+                continue
+            exch_diff_command_unlink += [
+                Command.unlink(exch_diff.id)
+                for exch_diff in self.line_ids.filtered(lambda x: x[line_source_key] and x[line_source_key].id == line_source_id)
+            ]
+
+        if exch_diff_command_unlink:
+            self.line_ids = exch_diff_command_unlink
+
+    def _lines_get_account_balance_exchange_diff(self, currency, balance, amount_currency):
+        # Compute the balance of the line using the rate/currency coming from the bank transaction.
+        amounts_in_st_curr = self.st_line_id._prepare_counterpart_amounts_using_st_line_rate(
+            currency,
+            balance,
+            amount_currency,
+        )
+        origin_balance = amounts_in_st_curr['balance']
+        if currency == self.company_currency_id and self.transaction_currency_id != self.company_currency_id:
+            # The reconciliation will be expressed using the rate of the statement line.
+            origin_balance = balance
+        elif currency != self.company_currency_id and self.transaction_currency_id == self.company_currency_id:
+            # The reconciliation will be expressed using the foreign currency of the aml to cover the Mexican
+            # case.
+            origin_balance = currency\
+                ._convert(amount_currency, self.transaction_currency_id, self.company_id, self.st_line_id.date)
+
+        # Compute the exchange difference balance.
+        exchange_diff_balance = origin_balance - balance
+        if self.company_currency_id.is_zero(exchange_diff_balance):
+            return self.env['account.account'], 0.0
+
+        expense_exchange_account = self.company_id.expense_currency_exchange_account_id
+        income_exchange_account = self.company_id.income_currency_exchange_account_id
+
+        if exchange_diff_balance > 0.0:
+            account = expense_exchange_account
+        else:
+            account = income_exchange_account
+        return account, exchange_diff_balance
+
+    def _lines_get_exchange_diff_values(self, line):
+        if line.flag != 'new_aml':
+            return []
+        account, exchange_diff_balance = self._lines_get_account_balance_exchange_diff(line.currency_id, line.balance, line.amount_currency)
+        if line.currency_id.is_zero(exchange_diff_balance):
+            return []
+        return [{
+            'flag': 'exchange_diff',
+            'source_aml_id': line.source_aml_id.id,
+            'account_id': account.id,
+            'date': line.date,
+            'name': _("Exchange Difference: %s", line.name),
+            'partner_id': line.partner_id.id,
+            'currency_id': line.currency_id.id,
+            'amount_currency': exchange_diff_balance if line.currency_id == self.company_currency_id else 0.0,
+            'balance': exchange_diff_balance,
+            'source_amount_currency': line.amount_currency,
+            'source_balance': exchange_diff_balance,
+        }]
+
+    def _lines_recompute_exchange_diff(self, lines):
+        """ Recompute the exchange_diffs for the given lines, creating some if necessary.
+            If lines are not given, the method will be applied on all new_amls
+        """
+        self.ensure_one()
+        # If the method is called after deleting lines we should delete the related exchange diffs
+        deleted_lines = lines - self.line_ids
+        self._remove_related_exchange_diff_lines(deleted_lines)
+        lines = lines - deleted_lines
+
+        exchange_diffs_aml = self.line_ids.filtered(lambda x: x.flag == 'exchange_diff').grouped('source_aml_id')
+        line_ids_commands = []
+        reorder_needed = False
+
+        for line in lines:
+            exchange_diff_values = self._lines_get_exchange_diff_values(line)
+            if line.source_aml_id and line.source_aml_id in exchange_diffs_aml:
+                line_ids_commands += [
+                    Command.update(exchange_diffs_aml[line.source_aml_id].id, exch_diff_val)
+                    for exch_diff_val in exchange_diff_values
+                ]
+            else:
+                line_ids_commands += [
+                    Command.create(exch_diff_val)
+                    for exch_diff_val in exchange_diff_values
+                ]
+                reorder_needed = True
+
+        if line_ids_commands:
+            self.line_ids = line_ids_commands
+            if reorder_needed:
+                self._reorder_exchange_and_aml_lines()
+
+    def _lines_prepare_reco_model_write_off_vals(self, reco_model, write_off_vals):
+        self.ensure_one()
+
+        balance = self.st_line_id\
+            ._prepare_counterpart_amounts_using_st_line_rate(self.transaction_currency_id, None, write_off_vals['amount_currency'])['balance']
+
+        return {
+            'flag': 'manual',
+
+            'account_id': write_off_vals['account_id'],
+            'date': self.st_line_id.date,
+            'name': write_off_vals['name'],
+            'partner_id': write_off_vals['partner_id'],
+            'currency_id': write_off_vals['currency_id'],
+            'amount_currency': write_off_vals['amount_currency'],
+            'balance': balance,
+            'tax_base_amount_currency': write_off_vals['amount_currency'],
+            'force_price_included_taxes': True,
+
+            'reconcile_model_id': reco_model.id,
+            'analytic_distribution': write_off_vals['analytic_distribution'],
+            'tax_ids': write_off_vals['tax_ids'],
+        }
+
+    # -------------------------------------------------------------------------
+    # LINES UPDATE METHODS
+    # -------------------------------------------------------------------------
+
+    def _line_value_changed_account_id(self, line):
+        self.ensure_one()
+        self._lines_turn_auto_balance_into_manual_line(line)
+
+        # Recompute taxes.
+        if line.flag not in ('tax_line', 'early_payment') and line.tax_ids:
+            self._lines_recompute_taxes()
+            self._lines_add_auto_balance_line()
+
+    def _line_value_changed_date(self, line):
+        self.ensure_one()
+        if line.flag == 'liquidity' and line.date:
+            self.st_line_id.date = line.date
+            self._action_reload_liquidity_line()
+            self.return_todo_command = {'reset_global_info': True, 'reset_record': True}
+
+    def _line_value_changed_ref(self, line):
+        self.ensure_one()
+        if line.flag == 'liquidity':
+            self.st_line_id.move_id.ref = line.ref
+            self._action_reload_liquidity_line()
+            self.return_todo_command = {'reset_record': True}
+
+    def _line_value_changed_narration(self, line):
+        self.ensure_one()
+        if line.flag == 'liquidity':
+            self.st_line_id.move_id.narration = line.narration
+            self._action_reload_liquidity_line()
+            self.return_todo_command = {'reset_record': True}
+
+    def _line_value_changed_name(self, line):
+        self.ensure_one()
+        if line.flag == 'liquidity':
+            self.st_line_id.payment_ref = line.name
+            self._action_reload_liquidity_line()
+            self.return_todo_command = {'reset_global_info': True, 'reset_record': True}
+            return
+
+        self._lines_turn_auto_balance_into_manual_line(line)
+
+    def _line_value_changed_amount_transaction_currency(self, line):
+        self.ensure_one()
+        if line.flag == 'liquidity':
+            if line.transaction_currency_id != self.journal_currency_id:
+                self.st_line_id.amount_currency = line.amount_transaction_currency
+                self.st_line_id.foreign_currency_id = line.transaction_currency_id
+            else:
+                self.st_line_id.amount_currency = 0.0
+                self.st_line_id.foreign_currency_id = None
+            self._action_reload_liquidity_line()
+            self.return_todo_command = {'reset_global_info': True, 'reset_record': True}
+
+    def _line_value_changed_transaction_currency_id(self, line):
+        self._line_value_changed_amount_transaction_currency(line)
+
+    def _line_value_changed_amount_currency(self, line):
+        self.ensure_one()
+        if line.flag == 'liquidity':
+            self.st_line_id.amount = line.amount_currency
+            self._action_reload_liquidity_line()
+            self.return_todo_command = {'reset_global_info': True, 'reset_record': True}
+            return
+
+        self._lines_turn_auto_balance_into_manual_line(line)
+
+        sign = -1 if line.amount_currency < 0.0 else 1
+        if line.flag == 'new_aml':
+            # The balance must keep the same sign as the original aml and must not exceed its original value.
+            line.amount_currency = sign * max(0.0, min(abs(line.amount_currency), abs(line.source_amount_currency)))
+            line.manually_modified = True
+
+            # If the user remove completely the value, reset to the original balance.
+            if not line.amount_currency:
+                line.amount_currency = line.source_amount_currency
+
+        elif not line.amount_currency:
+            line.amount_currency = 0.0
+
+        if line.currency_id == line.company_currency_id:
+            # Single currency: amount_currency must be equal to balance.
+            line.balance = line.amount_currency
+        elif line.flag == 'new_aml':
+            if line.currency_id.compare_amounts(abs(line.amount_currency), abs(line.source_amount_currency)) == 0.0:
+                # The value has been reset to its original value. Reset the balance as well to avoid rounding issues.
+                line.balance = line.source_balance
+            else:
+                # Apply the rate.
+                if line.source_rate:
+                    line.balance = line.company_currency_id.round(line.amount_currency / line.source_rate)
+                else:
+                    line.balance = 0.0
+        elif line.flag in ('manual', 'early_payment', 'tax_line'):
+            if line.currency_id in (self.transaction_currency_id, self.journal_currency_id):
+                line.balance = self.st_line_id\
+                    ._prepare_counterpart_amounts_using_st_line_rate(line.currency_id, None, line.amount_currency)['balance']
+            else:
+                line.balance = line.currency_id\
+                    ._convert(line.amount_currency, self.company_currency_id, self.company_id, self.st_line_id.date)
+
+        if line.flag not in ('tax_line', 'early_payment'):
+            if line.tax_ids:
+                # Manual edition of amounts. Disable the price_included mode.
+                line.force_price_included_taxes = False
+                self._lines_recompute_taxes()
+            self._lines_recompute_exchange_diff(line)
+
+        self._lines_add_auto_balance_line()
+
+    def _line_value_changed_balance(self, line):
+        self.ensure_one()
+        if line.flag == 'liquidity':
+            self.st_line_id.amount = line.balance
+            self._action_reload_liquidity_line()
+            self.return_todo_command = {'reset_global_info': True, 'reset_record': True}
+            return
+
+        self._lines_turn_auto_balance_into_manual_line(line)
+
+        sign = -1 if line.balance < 0.0 else 1
+        if line.flag == 'new_aml':
+            # The balance must keep the same sign as the original aml and must not exceed its original value.
+            line.balance = sign * max(0.0, min(abs(line.balance), abs(line.source_balance)))
+            line.manually_modified = True
+
+            # If the user remove completely the value, reset to the original balance.
+            if not line.balance:
+                line.balance = line.source_balance
+
+        elif not line.balance:
+            line.balance = 0.0
+
+        # Single currency: amount_currency must be equal to balance.
+        if line.currency_id == line.company_currency_id:
+            line.amount_currency = line.balance
+            self._line_value_changed_amount_currency(line)
+        elif line.flag == 'exchange_diff':
+            self._lines_add_auto_balance_line()
+        else:
+            self._lines_recompute_exchange_diff(line)
+            self._lines_add_auto_balance_line()
+
+    def _line_value_changed_currency_id(self, line):
+        self.ensure_one()
+        self._line_value_changed_amount_currency(line)
+
+    def _line_value_changed_tax_ids(self, line):
+        self.ensure_one()
+        self._lines_turn_auto_balance_into_manual_line(line)
+
+        if line.tax_ids:
+            # Adding taxes but no tax before.
+            if not line.tax_base_amount_currency:
+                line.tax_base_amount_currency = line.amount_currency
+                line.force_price_included_taxes = True
+        else:
+            if line.force_price_included_taxes:
+                # Removing taxes letting the field empty.
+                # If the user didn't touch the amount_currency/balance, restore the original amount.
+                line.amount_currency = line.tax_base_amount_currency
+                self._line_value_changed_amount_currency(line)
+            line.tax_base_amount_currency = False
+
+        self._lines_recompute_taxes()
+        self._lines_add_auto_balance_line()
+
+    def _line_value_changed_partner_id(self, line):
+        self.ensure_one()
+        if line.flag == 'liquidity':
+            self.st_line_id.partner_id = line.partner_id
+            self._action_reload_liquidity_line()
+            self.return_todo_command = {'reset_global_info': True, 'reset_record': True}
+            return
+
+        self._lines_turn_auto_balance_into_manual_line(line)
+
+        new_account = None
+        if line.partner_id:
+            partner_is_customer = line.partner_id.customer_rank and not line.partner_id.supplier_rank
+            partner_is_supplier = line.partner_id.supplier_rank and not line.partner_id.customer_rank
+            is_partner_receivable_amount_zero = line.partner_currency_id.is_zero(line.partner_receivable_amount)
+            is_partner_payable_amount_zero = line.partner_currency_id.is_zero(line.partner_payable_amount)
+            if partner_is_customer or not is_partner_receivable_amount_zero and is_partner_payable_amount_zero:
+                new_account = line.partner_receivable_account_id
+            elif partner_is_supplier or is_partner_receivable_amount_zero and not is_partner_payable_amount_zero:
+                new_account = line.partner_payable_account_id
+            elif self.st_line_id.amount < 0.0:
+                new_account = line.partner_payable_account_id or line.partner_receivable_account_id
+            else:
+                new_account = line.partner_receivable_account_id or line.partner_payable_account_id
+
+        if new_account:
+            # Set the new receivable/payable account if any.
+            line.account_id = new_account
+            self._line_value_changed_account_id(line)
+        elif line.flag not in ('tax_line', 'early_payment') and line.tax_ids:
+            # Recompute taxes.
+            self._lines_recompute_taxes()
+            self._lines_add_auto_balance_line()
+
+    def _line_value_changed_analytic_distribution(self, line):
+        self.ensure_one()
+        self._lines_turn_auto_balance_into_manual_line(line)
+
+        if line.flag == 'liquidity':
+            st_line = self.st_line_id
+            liquidity_line, _suspense_lines, _write_off_lines = self.st_line_id._seek_for_lines()
+            liquidity_line.analytic_distribution = line.analytic_distribution
+            # We need to keep track of the statement line to avoid losing the data.
+            # Will be improved in master by turning _action_reload_liquidity_line into a context manager.
+            self.with_context(default_st_line_id=st_line.id)._action_reload_liquidity_line()
+            return
+
+        # Recompute taxes.
+        if line.flag not in ('tax_line', 'early_payment') and any(x.analytic for x in line.tax_ids):
+            self._lines_recompute_taxes()
+            self._lines_add_auto_balance_line()
+
+    # -------------------------------------------------------------------------
+    # ACTIONS
+    # -------------------------------------------------------------------------
+
+    def _action_trigger_matching_rules(self):
+        self.ensure_one()
+
+        if self.st_line_id.is_reconciled:
+            return
+
+        reconcile_models = self.env['account.reconcile.model'].search([
+            ('rule_type', '!=', 'writeoff_button'),
+            ('company_id', '=', self.company_id.id),
+            '|',
+            ('match_journal_ids', '=', False),
+            ('match_journal_ids', '=', self.st_line_id.journal_id.id),
+        ])
+        matching = reconcile_models._apply_rules(self.st_line_id, self.partner_id)
+
+        if matching.get('amls'):
+            reco_model = matching['model']
+            # In case there is a write-off, keep the whole amount and let the write-off doing the auto-balancing.
+            allow_partial = matching.get('status') != 'write_off'
+            self._action_add_new_amls(matching['amls'], reco_model=reco_model, allow_partial=allow_partial)
+        if matching.get('status') == 'write_off':
+            reco_model = matching['model']
+            self._action_select_reconcile_model(reco_model)
+        if matching.get('auto_reconcile'):
+            self.matching_rules_allow_auto_reconcile = True
+        return matching
+
+    def _prepare_embedded_views_data(self):
+        self.ensure_one()
+        st_line = self.st_line_id
+
+        context = {
+            'search_view_ref': 'odex30_account_accountant.view_account_move_line_search_bank_rec_widget',
+            'list_view_ref': 'odex30_account_accountant.view_account_move_line_list_bank_rec_widget',
+        }
+
+        if self.partner_id:
+            context['search_default_partner_id'] = self.partner_id.id
+
+        dynamic_filters = []
+
+        # == Dynamic Customer/Vendor filter ==
+        journal = st_line.journal_id
+
+        account_ids = set()
+
+        inbound_accounts = journal._get_journal_inbound_outstanding_payment_accounts() - journal.default_account_id
+        outbound_accounts = journal._get_journal_outbound_outstanding_payment_accounts() - journal.default_account_id
+
+        # Matching on debit account.
+        for account in inbound_accounts:
+            account_ids.add(account.id)
+
+        # Matching on credit account.
+        for account in outbound_accounts:
+            account_ids.add(account.id)
+
+        rec_pay_matching_filter = {
+            'name': 'receivable_payable_matching',
+            'description': _("Customer/Vendor"),
+            'domain': [
+                '|',
+                # Matching invoices.
+                '&',
+                ('account_id.account_type', 'in', ('asset_receivable', 'liability_payable')),
+                ('payment_id', '=', False),
+                # Matching Payments.
+                '&',
+                ('account_id', 'in', tuple(account_ids)),
+                ('payment_id', '!=', False),
+            ],
+            'no_separator': True,
+            'is_default': False,
+        }
+
+        misc_matching_filter = {
+            'name': 'misc_matching',
+            'description': _("Misc"),
+            'domain': ['!'] + rec_pay_matching_filter['domain'],
+            'is_default': False,
+        }
+
+        dynamic_filters.append(rec_pay_matching_filter)
+        dynamic_filters.append(misc_matching_filter)
+
+        # Stringify the domain.
+        for dynamic_filter in dynamic_filters:
+            dynamic_filter['domain'] = str(dynamic_filter['domain'])
+
+        return {
+            'amls': {
+                'domain': st_line._get_default_amls_matching_domain(),
+                'dynamic_filters': dynamic_filters,
+                'context': context,
+            },
+        }
+
+    def _action_mount_st_line(self, st_line):
+        self.ensure_one()
+        self.st_line_id = st_line
+        self.form_index = self.line_ids[0].index if self.state == 'reconciled' else None
+        self._action_trigger_matching_rules()
+
+    def _js_action_mount_st_line(self, st_line_id):
+        self.ensure_one()
+        st_line = self.env['account.bank.statement.line'].browse(st_line_id)
+        self._action_mount_st_line(st_line)
+        self.return_todo_command = self._prepare_embedded_views_data()
+
+    def _js_action_restore_st_line_data(self, initial_data):
+        self.ensure_one()
+        initial_values = initial_data['initial_values']
+
+        self.st_line_id = self.env['account.bank.statement.line'].browse(initial_values['st_line_id'])
+        return_todo_command = initial_values['return_todo_command']
+
+        # Skip restore and trigger matching rules if the liquidity line was modified
+        liquidity_line = self.line_ids.filtered(lambda l: l.flag == 'liquidity')
+        initial_liquidity_line_values = next((cmd[2] for cmd in initial_values['line_ids'] if cmd[2]['flag'] == 'liquidity'), {})
+        initial_liquidity_line = self.env['bank.rec.widget.line'].new(initial_liquidity_line_values)
+        for field in initial_liquidity_line_values.keys() - ['index', 'suggestion_html']:
+            if initial_liquidity_line[field] != liquidity_line[field]:
+                self._js_action_mount_st_line(self.st_line_id.id)
+                return
+
+        # If the user goes to reco model and create a new one, we want to make it appearing when coming back.
+        # That's why we pop 'available_reco_model_ids' as well.
+        for field_name in ('id', 'st_line_id', 'todo_command', 'return_todo_command', 'available_reco_model_ids'):
+            initial_values.pop(field_name, None)
+
+        st_line_domain = self.st_line_id._get_default_amls_matching_domain()
+        initial_values['line_ids'] = self._process_restore_lines_ids(initial_values['line_ids'])
+        self.update(initial_values)
+
+        if (
+            return_todo_command
+            and return_todo_command.get('res_model') == 'account.move'
+            and (created_invoice := self.env['account.move'].browse(return_todo_command['res_id']))
+            and created_invoice.state == 'posted'
+        ):
+            lines = created_invoice.line_ids.filtered_domain(st_line_domain)
+            self._action_add_new_amls(lines)
+        else:
+            self._lines_add_auto_balance_line()
+
+        self.return_todo_command = self._prepare_embedded_views_data()
+
+    def _process_restore_lines_ids(self, initial_commands):
+        st_line_domain = self.st_line_id._get_default_amls_matching_domain()
+        still_available_aml_ids = self.env['account.move.line'].browse(
+            orm_command[2]['source_aml_id']
+            for orm_command in initial_commands
+            if orm_command[0] == Command.CREATE and orm_command[2].get('source_aml_id')
+        ).filtered_domain(st_line_domain).ids
+        still_available_aml_ids += [None]  # still available if there was no source
+        line_ids_commands = [Command.clear()]
+        for orm_command in initial_commands:
+            match orm_command:
+                case (Command.CREATE, _, values) if values.get('source_aml_id' in still_available_aml_ids):
+                    # Discard the virtual id coming from the client
+                    line_ids_commands.append(Command.create(values))
+                case _:
+                    line_ids_commands.append(orm_command)
+        return line_ids_commands
+
+    def _action_reload_liquidity_line(self):
+        self.ensure_one()
+        self = self.with_context(default_st_line_id=self.st_line_id.id)
+
+        self.invalidate_model()
+
+        # Ensure the lines are well loaded.
+        # Suppose the initial values of 'line_ids' are 2 lines,
+        # "self.line_ids = [Command.create(...)]" will produce a single new line in 'line_ids' but three lines in case
+        # the field is accessed before.
+        self.line_ids
+
+        self._action_trigger_matching_rules()
+
+        # Focus back the liquidity line.
+        self._js_action_mount_line_in_edit(self.line_ids.filtered(lambda x: x.flag == 'liquidity').index)
+
+    def _validation_lines_vals(self, line_ids_create_command_list, aml_to_exchange_diff_vals, to_reconcile):
+        # Check which partner to set.
+        lines = self.line_ids.filtered(lambda x: x.flag != 'liquidity')
+        partners = lines.partner_id
+        partner_to_set = self.env['res.partner']
+        if len(partners) == 1:
+            # To avoid "Incompatible companies on records" error, make sure the user is linked to a main company.
+            allowed_companies = partners.company_id.root_id
+            if len(lines.company_id) == 1:
+                # Or the user is linked to the aml's company.
+                allowed_companies |= lines.company_id
+            # Or the user is not linked to any company.
+            if not partners.company_id or partners.company_id in allowed_companies:
+                partner_to_set = partners
+
+        source2exchange = self.line_ids.filtered(lambda l: l.flag == 'exchange_diff').grouped('source_aml_id')
+        for line in self.line_ids:
+            if line.flag == 'exchange_diff':
+                continue
+
+            amount_currency = line.amount_currency
+            balance = line.balance
+            if line.flag == 'new_aml':
+                to_reconcile.append((len(line_ids_create_command_list) + 1, line.source_aml_id))
+                exchange_diff = source2exchange.get(line.source_aml_id)
+                if exchange_diff:
+                    aml_to_exchange_diff_vals[len(line_ids_create_command_list) + 1] = {
+                        'amount_residual': exchange_diff.balance,
+                        'amount_residual_currency': exchange_diff.amount_currency,
+                        'analytic_distribution': exchange_diff.analytic_distribution,
+                    }
+                    # Squash amounts of exchange diff into corresponding new_aml
+                    amount_currency += exchange_diff.amount_currency
+                    balance += exchange_diff.balance
+            line_ids_create_command_list.append(Command.create(line._get_aml_values(
+                sequence=len(line_ids_create_command_list) + 1,
+                partner_id=partner_to_set.id if line.flag in ('liquidity', 'auto_balance') else line.partner_id.id,
+                amount_currency=amount_currency,
+                balance=balance,
+            )))
+
+    def _action_validate(self):
+        self.ensure_one()
+        # Prepare the lines to be created.
+        to_reconcile = []
+        line_ids_create_command_list = []
+        aml_to_exchange_diff_vals = {}
+
+        self._validation_lines_vals(line_ids_create_command_list, aml_to_exchange_diff_vals, to_reconcile)
+
+        st_line = self.st_line_id
+        move = st_line.move_id
+
+        # Update the move.
+        move_ctx = move.with_context(
+            force_delete=True,
+            skip_readonly_check=True,
+        )
+        move_ctx.write({'line_ids': [Command.clear()] + line_ids_create_command_list})
+
+        AccountMoveLine = self.env['account.move.line']
+        sequence2lines = move_ctx.line_ids.grouped('sequence')
+        lines = [
+            (sequence2lines[index], counterpart_aml)
+            for index, counterpart_aml in to_reconcile
+        ]
+        all_line_ids = tuple({_id for line, counterpart in lines for _id in (line + counterpart).ids})
+        # Handle exchange diffs
+        exchange_diff_moves = None
+        lines_with_exch_diff = AccountMoveLine
+        if aml_to_exchange_diff_vals:
+            exchange_diff_vals_list = []
+            for line, counterpart in lines:
+                line = line.with_prefetch(all_line_ids)
+                counterpart = counterpart.with_prefetch(all_line_ids)
+                exchange_diff_amounts = aml_to_exchange_diff_vals.get(line.sequence, {})
+                exchange_analytic_distribution = exchange_diff_amounts.pop('analytic_distribution', False)
+                if exchange_diff_amounts:
+                    related_exchange_diff_amls = line if exchange_diff_amounts['amount_residual'] * line.amount_residual > 0 else counterpart
+                    exchange_diff_vals_list.append(related_exchange_diff_amls._prepare_exchange_difference_move_vals(
+                        [exchange_diff_amounts],
+                        exchange_date=max(line.date, counterpart.date),
+                        exchange_analytic_distribution=exchange_analytic_distribution,
+                    ))
+                    lines_with_exch_diff += line
+            exchange_diff_moves = AccountMoveLine._create_exchange_difference_moves(exchange_diff_vals_list)
+
+        # Perform the reconciliation.
+        self.env['account.move.line']\
+            .with_context(no_exchange_difference_no_recursive=True)._reconcile_plan([
+                (line + counterpart).with_prefetch(all_line_ids)
+                for line, counterpart in lines
+            ])
+
+        # Assign exchange move to partials.
+        for index, line in enumerate(lines_with_exch_diff):
+            exchange_move = exchange_diff_moves[index]
+            for debit_credit in ('debit', 'credit'):
+                partials = line[f'matched_{debit_credit}_ids'] \
+                    .filtered(lambda partial: partial[f'{debit_credit}_move_id'].move_id != exchange_move)
+                partials.exchange_move_id = exchange_move
+
+        # Fill missing partner.
+        st_line_ctx = st_line.with_context(skip_account_move_synchronization=True, skip_readonly_check=True)
+
+        # Create missing partner bank if necessary.
+        if st_line.account_number and st_line.partner_id:
+            st_line_ctx.partner_bank_id = st_line._find_or_create_bank_account() or st_line.partner_bank_id
+
+        # Refresh analytic lines.
+        move.line_ids.with_context(validate_analytic=True)._inverse_analytic_distribution()
+
+    @contextmanager
+    def _action_validate_method(self):
+        self.ensure_one()
+        st_line = self.st_line_id
+
+        yield
+
+        # The current record has been invalidated. Reload it completely.
+        self.st_line_id = st_line
+        self._ensure_loaded_lines()
+        self.return_todo_command = {'done': True}
+
+    def _js_action_validate(self):
+        with self._action_validate_method():
+            self._action_validate()
+
+    def _action_to_check(self):
+        self.st_line_id.move_id.checked = False
+        self.invalidate_recordset(fnames=['st_line_checked'])
+        self._action_validate()
+
+    def _js_action_to_check(self):
+        self.ensure_one()
+
+        if self.state == 'valid':
+            # The validation can be performed.
+            with self._action_validate_method():
+                self._action_to_check()
+        else:
+            # No need any validation.
+            self.st_line_id.move_id.checked = False
+            self.invalidate_recordset(fnames=['st_line_checked'])
+            self.return_todo_command = {'done': True}
+
+    def _js_action_reset(self):
+        self.ensure_one()
+        st_line = self.st_line_id
+
+        # Hashed entries shouldn't be modified; we will provide clear errors as well as redirect the user if needed.
+        if st_line.inalterable_hash:
+            if not st_line.has_reconciled_entries:
+                raise UserError(_("You can't hit the reset button on a secured bank transaction."))
+            else:
+                raise RedirectWarning(
+                    message=_("This bank transaction is locked up tighter than a squirrel in a nut factory! You can't hit the reset button on it. So, do you want to \"unreconcile\" it instead?"),
+                    action=st_line.move_id.open_reconcile_view(),
+                    button_text=_('View Reconciled Entries'),
+                )
+
+        st_line.action_undo_reconciliation()
+
+        # The current record has been invalidated. Reload it completely.
+        self.st_line_id = st_line
+        self._ensure_loaded_lines()
+        self._action_trigger_matching_rules()
+        self.return_todo_command = {'done': True}
+
+    def _js_action_set_as_checked(self):
+        self.ensure_one()
+        self.st_line_id.move_id.checked = True
+        self.invalidate_recordset(fnames=['st_line_checked'])
+        self.return_todo_command = {'done': True}
+
+    def _action_clear_manual_operations_form(self):
+        self.form_index = None
+
+    def _action_remove_lines(self, lines):
+        self.ensure_one()
+        if not lines:
+            return
+
+        is_taxes_recomputation_needed = bool(lines.tax_ids)
+        has_new_aml = any(line.flag == 'new_aml' for line in lines)
+
+        # Update 'line_ids'.
+        self.line_ids = [
+            Command.unlink(line.id)
+            for line in lines
+        ]
+        self._remove_related_exchange_diff_lines(lines)
+
+        # Recompute taxes and auto balance the lines.
+        if is_taxes_recomputation_needed:
+            self._lines_recompute_taxes()
+        if has_new_aml and not self._lines_check_apply_early_payment_discount():
+            self._lines_check_apply_partial_matching()
+        self._lines_add_auto_balance_line()
+        self._action_clear_manual_operations_form()
+
+    def _js_action_remove_line(self, line_index):
+        self.ensure_one()
+        line = self.line_ids.filtered(lambda x: x.index == line_index)
+        self._action_remove_lines(line)
+
+    def _action_select_reconcile_model(self, reco_model):
+        self.ensure_one()
+
+        # Cleanup a previously selected model.
+        self.line_ids = [
+            Command.unlink(x.id)
+            for x in self.line_ids
+            if x.flag not in ('new_aml', 'liquidity') and x.reconcile_model_id and x.reconcile_model_id != reco_model
+        ]
+        self._lines_recompute_taxes()
+
+        if reco_model.to_check:
+            self.st_line_id.move_id.checked = False
+            self.invalidate_recordset(fnames=['st_line_checked'])
+
+        # Compute the residual balance on which apply the newly selected model.
+        auto_balance_line_vals = self._lines_prepare_auto_balance_line()
+        residual_balance = auto_balance_line_vals['amount_currency']
+
+        write_off_vals_list = reco_model._apply_lines_for_bank_widget(residual_balance, self.partner_id, self.st_line_id)
+
+        if reco_model.rule_type == 'writeoff_button' and reco_model.counterpart_type in ('sale', 'purchase'):
+            invoice = self._create_invoice_from_write_off_values(reco_model, write_off_vals_list)
+
+            action = {
+                'type': 'ir.actions.act_window',
+                'res_model': 'account.move',
+                'context': {'create': False},
+                'view_mode': 'form',
+                'res_id': invoice.id,
+            }
+            self.return_todo_command = clean_action(action, self.env)
+        else:
+            # Apply the newly generated lines.
+            self.line_ids = [
+                Command.create(self._lines_prepare_reco_model_write_off_vals(reco_model, x))
+                for x in write_off_vals_list
+            ]
+
+            self._lines_recompute_taxes()
+            self._lines_add_auto_balance_line()
+
+    def _js_action_select_reconcile_model(self, reco_model_id):
+        self.ensure_one()
+        reco_model = self.env['account.reconcile.model'].browse(reco_model_id)
+        self._action_select_reconcile_model(reco_model)
+
+    def _create_invoice_from_write_off_values(self, reco_model, write_off_vals_list):
+        # Create a new invoice/bill and redirect the user to it.
+        journal = reco_model.line_ids.journal_id[:1]
+
+        invoice_line_ids = []
+        total_amount_currency = 0.0
+        percentage_st_line = 0.0
+        for write_off_values in write_off_vals_list:
+            write_off_values = dict(write_off_values)
+            total_amount_currency -= (
+                write_off_values['amount_currency']
+                if 'percentage_st_line' not in write_off_values
+                else 0
+            )
+            percentage_st_line += write_off_values.pop('percentage_st_line', 0)
+            write_off_values.pop('currency_id', None)
+            write_off_values.pop('partner_id', None)
+            write_off_values.pop('reconcile_model_id', None)
+            invoice_line_ids.append(write_off_values)
+
+        st_line_amount = self.st_line_id.amount_currency if self.st_line_id.foreign_currency_id else self.st_line_id.amount
+        total_amount_currency += self.transaction_currency_id.round(st_line_amount * percentage_st_line)
+
+        # Type of move depends on debit or credit of bank statement line and reconciliation model chosen.
+        if reco_model.counterpart_type == 'sale':
+            move_type = 'out_invoice' if total_amount_currency > 0 else 'out_refund'
+        else:
+            move_type = 'in_invoice' if total_amount_currency < 0 else 'in_refund'
+
+        price_unit_sign = 1 if total_amount_currency < 0.0 else -1
+        invoice_line_ids_commands = []
+        for line_values in invoice_line_ids:
+            price_total = price_unit_sign * line_values.pop('amount_currency')
+            taxes = self.env['account.tax'].browse(line_values['tax_ids'][0][2])
+            line_values['price_unit'] = self._get_invoice_price_unit_from_price_total(price_total, taxes)
+            invoice_line_ids_commands.append(Command.create(line_values))
+
+        invoice_values = {
+            'invoice_date': self.st_line_id.date,
+            'move_type': move_type,
+            'partner_id': self.st_line_id.partner_id.id,
+            'currency_id': self.transaction_currency_id.id,
+            'payment_reference': self.st_line_id.payment_ref,
+            'invoice_line_ids': invoice_line_ids_commands,
+        }
+        if journal:
+            invoice_values['journal_id'] = journal.id
+
+        invoice = self.env['account.move'].create(invoice_values)
+        if not invoice.currency_id.is_zero(invoice.amount_total - total_amount_currency):
+            invoice._check_total_amount(abs(total_amount_currency))
+        return invoice
+
+    def _get_invoice_price_unit_from_price_total(self, price_total, taxes):
+        """ Determine price unit based on the total amount and taxes applied. """
+        self.ensure_one()
+        taxes_computation = taxes._get_tax_details(
+            price_total,
+            1.0,
+            precision_rounding=self.transaction_currency_id.rounding,
+            rounding_method=self.company_id.tax_calculation_rounding_method,
+            special_mode='total_included',
+        )
+        return taxes_computation['total_excluded'] + sum(x['tax_amount'] for x in taxes_computation['taxes_data'] if x['tax'].price_include)
+
+    def _action_add_new_amls(self, amls, reco_model=None, allow_partial=True):
+        self.ensure_one()
+        existing_amls = set(self.line_ids.filtered(lambda x: x.flag in ('new_aml', 'aml', 'liquidity')).source_aml_id)
+        amls = amls.filtered(lambda x: x not in existing_amls)
+        if not amls:
+            return
+
+        self._lines_load_new_amls(amls, reco_model=reco_model)
+        added_lines = self.line_ids.filtered(lambda x: x.flag == 'new_aml' and x.source_aml_id in amls)
+        self._lines_recompute_exchange_diff(added_lines)
+        if not self._lines_check_apply_early_payment_discount() and allow_partial:
+            self._lines_check_apply_partial_matching()
+        self._lines_add_auto_balance_line()
+        self._action_clear_manual_operations_form()
+
+    def _js_action_add_new_aml(self, aml_id):
+        self.ensure_one()
+        aml = self.env['account.move.line'].browse(aml_id)
+        self._action_add_new_amls(aml)
+
+    def _action_remove_new_amls(self, amls):
+        self.ensure_one()
+        to_remove = self.line_ids.filtered(lambda x: x.flag == 'new_aml' and x.source_aml_id in amls)
+        self._action_remove_lines(to_remove)
+
+    def _js_action_remove_new_aml(self, aml_id):
+        self.ensure_one()
+        aml = self.env['account.move.line'].browse(aml_id)
+        self._action_remove_new_amls(aml)
+
+    def _js_action_mount_line_in_edit(self, line_index):
+        self.ensure_one()
+        self.form_index = line_index
+
+    def _js_action_line_changed(self, form_index, field_name):
+        self.ensure_one()
+        line = self.line_ids.filtered(lambda x: x.index == form_index)
+
+        # Invalidate the cache of newly set value to force the recomputation of computed fields.
+        value = line[field_name]
+        line.invalidate_recordset(fnames=[field_name], flush=False)
+        line[field_name] = value
+
+        getattr(self, f'_line_value_changed_{field_name}')(line)
+
+    def _js_action_line_set_partner_receivable_account(self, form_index):
+        self.ensure_one()
+        line = self.line_ids.filtered(lambda x: x.index == form_index)
+        line.account_id = line.partner_receivable_account_id
+        self._line_value_changed_account_id(line)
+
+    def _js_action_line_set_partner_payable_account(self, form_index):
+        self.ensure_one()
+        line = self.line_ids.filtered(lambda x: x.index == form_index)
+        line.account_id = line.partner_payable_account_id
+        self._line_value_changed_account_id(line)
+
+    def _js_action_redirect_to_move(self, form_index):
+        self.ensure_one()
+        line = self.line_ids.filtered(lambda x: x.index == form_index)
+        move = line.source_aml_move_id
+
+        action = {
+            'type': 'ir.actions.act_window',
+            'context': {'create': False},
+            'view_mode': 'form',
+        }
+
+        if move.origin_payment_id:
+            action.update({
+                'res_model': 'account.payment',
+                'res_id': move.origin_payment_id.id,
+            })
+        else:
+            action.update({
+                'res_model': 'account.move',
+                'res_id': move.id,
+            })
+        self.return_todo_command = clean_action(action, self.env)
+
+    def _js_action_apply_line_suggestion(self, form_index):
+        self.ensure_one()
+        line = self.line_ids.filtered(lambda x: x.index == form_index)
+
+        # Since 'balance'/'amount_currency' are both dependencies of 'suggestion_balance'/'suggestion_amount_currency',
+        # keep the value in variable before assigning anything to avoid an inconsistency after applying
+        # 'suggestion_amount_currency' but before updating 'balance'.
+        suggestion_amount_currency = line.suggestion_amount_currency
+        suggestion_balance = line.suggestion_balance
+
+        line.amount_currency = suggestion_amount_currency
+        line.balance = suggestion_balance
+
+        if line.currency_id == line.company_currency_id:
+            self._line_value_changed_balance(line)
+        else:
+            self._line_value_changed_amount_currency(line)
+
+    @api.model
+    def collect_global_info_data(self, journal_id):
+        journal = self.env['account.journal'].browse(journal_id)
+        balance = ''
+        if journal.exists() and any(company in journal.company_id._accessible_branches() for company in self.env.companies):
+            balance = formatLang(self.env,
+                                 journal.current_statement_balance,
+                                 currency_obj=journal.currency_id or journal.company_id.sudo().currency_id)
+        return {'balance_amount': balance}
diff --git a/dev_odex30_accounting/odex30_account_accountant/models/bank_rec_widget_line.py b/dev_odex30_accounting/odex30_account_accountant/models/bank_rec_widget_line.py
new file mode 100644
index 0000000..98f2e9e
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_accountant/models/bank_rec_widget_line.py
@@ -0,0 +1,503 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+from odoo import _, api, fields, models, Command
+from odoo.osv import expression
+from odoo.tools.misc import formatLang, frozendict
+
+import markupsafe
+import uuid
+
+
+class BankRecWidgetLine(models.Model):
+    _name = "bank.rec.widget.line"
+    _inherit = "analytic.mixin"
+    _description = "Line of the bank reconciliation widget"
+
+    # This model is never saved inside the database.
+    # _auto=False' & _table_query = "0" prevent the ORM to create the corresponding postgresql table.
+    _auto = False
+    _table_query = "0"
+
+    wizard_id = fields.Many2one(comodel_name='bank.rec.widget')
+    index = fields.Char(compute='_compute_index')
+    flag = fields.Selection(
+        selection=[
+            ('liquidity', 'liquidity'),
+            ('new_aml', 'new_aml'),
+            ('aml', 'aml'),
+            ('exchange_diff', 'exchange_diff'),
+            ('tax_line', 'tax_line'),
+            ('manual', 'manual'),
+            ('early_payment', 'early_payment'),
+            ('auto_balance', 'auto_balance'),
+        ],
+    )
+
+    journal_default_account_id = fields.Many2one(
+        related='wizard_id.st_line_id.journal_id.default_account_id',
+        depends=['wizard_id'],
+    )
+    account_id = fields.Many2one(
+        comodel_name='account.account',
+        compute='_compute_account_id',
+        store=True,
+        readonly=False,
+        check_company=True,
+        domain="""[
+            ('deprecated', '=', False),
+            ('id', '!=', journal_default_account_id),
+            ('account_type', 'not in', ('asset_cash', 'off_balance')),
+        ]""",
+    )
+    date = fields.Date(
+        compute='_compute_date',
+        store=True,
+        readonly=False,
+    )
+    name = fields.Char(
+        compute='_compute_name',
+        store=True,
+        readonly=False,
+    )
+    partner_id = fields.Many2one(
+        comodel_name='res.partner',
+        compute='_compute_partner_id',
+        store=True,
+        readonly=False,
+    )
+    currency_id = fields.Many2one(
+        comodel_name='res.currency',
+        compute='_compute_currency_id',
+        store=True,
+        readonly=False,
+    )
+    company_id = fields.Many2one(related='wizard_id.company_id')
+    country_code = fields.Char(related='company_id.country_id.code', depends=['company_id'])
+    company_currency_id = fields.Many2one(related='wizard_id.company_currency_id')
+    amount_currency = fields.Monetary(
+        currency_field='currency_id',
+        compute='_compute_amount_currency',
+        store=True,
+        readonly=False,
+    )
+    balance = fields.Monetary(
+        currency_field='company_currency_id',
+        compute='_compute_balance',
+        store=True,
+        readonly=False,
+    )
+    transaction_currency_id = fields.Many2one(
+        related='wizard_id.st_line_id.foreign_currency_id',
+        depends=['wizard_id'],
+    )
+    amount_transaction_currency = fields.Monetary(
+        currency_field='transaction_currency_id',
+        related='wizard_id.st_line_id.amount_currency',
+        depends=['wizard_id'],
+    )
+    debit = fields.Monetary(
+        currency_field='company_currency_id',
+        compute='_compute_from_balance',
+    )
+    credit = fields.Monetary(
+        currency_field='company_currency_id',
+        compute='_compute_from_balance',
+    )
+    force_price_included_taxes = fields.Boolean()
+    tax_base_amount_currency = fields.Monetary(
+        currency_field='currency_id',
+    )
+
+    source_aml_id = fields.Many2one(comodel_name='account.move.line')
+    source_aml_move_id = fields.Many2one(
+        comodel_name='account.move',
+        compute='_compute_source_aml_fields',
+        store=True,
+        readonly=False,
+    )
+    source_aml_move_name = fields.Char(
+        compute='_compute_source_aml_fields',
+        store=True,
+        readonly=False,
+    )
+    tax_repartition_line_id = fields.Many2one(
+        comodel_name='account.tax.repartition.line',
+        compute='_compute_tax_repartition_line_id',
+        store=True,
+        readonly=False,
+    )
+    tax_ids = fields.Many2many(
+        comodel_name='account.tax',
+        compute='_compute_tax_ids',
+        store=True,
+        readonly=False,
+        check_company=True,
+    )
+    tax_tag_ids = fields.Many2many(
+        comodel_name='account.account.tag',
+        compute='_compute_tax_tag_ids',
+        store=True,
+        readonly=False,
+    )
+    group_tax_id = fields.Many2one(
+        comodel_name='account.tax',
+        compute='_compute_group_tax_id',
+        store=True,
+        readonly=False,
+    )
+    reconcile_model_id = fields.Many2one(comodel_name='account.reconcile.model')
+    source_amount_currency = fields.Monetary(currency_field='currency_id')
+    source_balance = fields.Monetary(currency_field='company_currency_id')
+    source_debit = fields.Monetary(
+        currency_field='company_currency_id',
+        compute='_compute_from_source_balance',
+    )
+    source_credit = fields.Monetary(
+        currency_field='company_currency_id',
+        compute='_compute_from_source_balance',
+    )
+    source_rate = fields.Float()
+
+    display_stroked_amount_currency = fields.Boolean(compute='_compute_display_stroked_amount_currency')
+    display_stroked_balance = fields.Boolean(compute='_compute_display_stroked_balance')
+
+    partner_currency_id = fields.Many2one(
+        comodel_name='res.currency',
+        compute='_compute_partner_info',
+    )
+    partner_receivable_account_id = fields.Many2one(
+        comodel_name='account.account',
+        compute='_compute_partner_info',
+    )
+    partner_payable_account_id = fields.Many2one(
+        comodel_name='account.account',
+        compute='_compute_partner_info',
+    )
+    partner_receivable_amount = fields.Monetary(
+        currency_field='partner_currency_id',
+        compute='_compute_partner_info',
+    )
+    partner_payable_amount = fields.Monetary(
+        currency_field='partner_currency_id',
+        compute='_compute_partner_info',
+    )
+
+    bank_account = fields.Char(
+        compute='_compute_bank_account',
+    )
+    suggestion_html = fields.Html(
+        compute='_compute_suggestion',
+        sanitize=False,
+    )
+    suggestion_amount_currency = fields.Monetary(
+        currency_field='currency_id',
+        compute='_compute_suggestion',
+    )
+    suggestion_balance = fields.Monetary(
+        currency_field='company_currency_id',
+        compute='_compute_suggestion',
+    )
+    ref = fields.Char(
+        compute='_compute_ref_narration',
+        store=True,
+        readonly=False,
+    )
+    narration = fields.Html(
+        compute='_compute_ref_narration',
+        store=True,
+        readonly=False,
+    )
+
+    manually_modified = fields.Boolean()
+
+    def _compute_index(self):
+        for line in self:
+            line.index = uuid.uuid4()
+
+    @api.depends('source_aml_id')
+    def _compute_account_id(self):
+        for line in self:
+            if line.flag in ('aml', 'new_aml', 'liquidity', 'exchange_diff'):
+                line.account_id = line.source_aml_id.account_id
+            else:
+                line.account_id = line.account_id
+
+    @api.depends('source_aml_id')
+    def _compute_date(self):
+        for line in self:
+            if line.flag in ('aml', 'new_aml', 'exchange_diff'):
+                line.date = line.source_aml_id.date
+            elif line.flag in ('liquidity', 'auto_balance', 'manual', 'early_payment', 'tax_line'):
+                line.date = line.wizard_id.st_line_id.date
+            else:
+                line.date = line.date
+
+    @api.depends('source_aml_id')
+    def _compute_name(self):
+        for line in self:
+            if line.flag in ('aml', 'new_aml', 'liquidity'):
+                # In the case the source_aml_id is from a credit note, the aml might not have a name set
+                line.name = line.source_aml_id.name or line.source_aml_move_name
+            else:
+                line.name = line.name
+
+    @api.depends('source_aml_id')
+    def _compute_partner_id(self):
+        for line in self:
+            if line.flag in ('aml', 'new_aml'):
+                line.partner_id = line.source_aml_id.partner_id
+            elif line.flag in ('liquidity', 'auto_balance', 'manual', 'early_payment', 'tax_line'):
+                line.partner_id = line.wizard_id.partner_id
+            else:
+                line.partner_id = line.partner_id
+
+    @api.depends('source_aml_id')
+    def _compute_currency_id(self):
+        for line in self:
+            if line.flag in ('aml', 'new_aml', 'liquidity', 'exchange_diff'):
+                line.currency_id = line.source_aml_id.currency_id
+            elif line.flag in ('auto_balance', 'manual', 'early_payment'):
+                line.currency_id = line.wizard_id.transaction_currency_id
+            else:
+                line.currency_id = line.currency_id
+
+    @api.depends('source_aml_id')
+    def _compute_balance(self):
+        for line in self:
+            if line.flag in ('aml', 'liquidity'):
+                line.balance = line.source_aml_id.balance
+            else:
+                line.balance = line.balance
+
+    @api.depends('source_aml_id')
+    def _compute_amount_currency(self):
+        for line in self:
+            if line.flag in ('aml', 'liquidity'):
+                line.amount_currency = line.source_aml_id.amount_currency
+            else:
+                line.amount_currency = line.amount_currency
+
+    @api.depends('balance')
+    def _compute_from_balance(self):
+        for line in self:
+            line.debit = line.balance if line.balance > 0.0 else 0.0
+            line.credit = -line.balance if line.balance < 0.0 else 0.0
+
+    @api.depends('source_balance')
+    def _compute_from_source_balance(self):
+        for line in self:
+            line.source_debit = line.source_balance if line.source_balance > 0.0 else 0.0
+            line.source_credit = -line.source_balance if line.source_balance < 0.0 else 0.0
+
+    @api.depends('source_aml_id', 'account_id', 'partner_id')
+    def _compute_analytic_distribution(self):
+        cache = {}
+        for line in self:
+            if line.flag in ('liquidity', 'aml'):
+                line.analytic_distribution = line.source_aml_id.analytic_distribution
+            elif line.flag in ('tax_line', 'early_payment'):
+                line.analytic_distribution = line.analytic_distribution
+            else:
+                arguments = frozendict({
+                    "partner_id": line.partner_id.id,
+                    "partner_category_id": line.partner_id.category_id.ids,
+                    "account_prefix": line.account_id.code,
+                    "company_id": line.company_id.id,
+                })
+                if arguments not in cache:
+                    cache[arguments] = self.env['account.analytic.distribution.model']._get_distribution(arguments)
+                line.analytic_distribution = cache[arguments] or line.analytic_distribution
+
+    @api.depends('source_aml_id')
+    def _compute_tax_repartition_line_id(self):
+        for line in self:
+            if line.flag == 'aml':
+                line.tax_repartition_line_id = line.source_aml_id.tax_repartition_line_id
+            else:
+                line.tax_repartition_line_id = line.tax_repartition_line_id
+
+    @api.depends('source_aml_id')
+    def _compute_tax_ids(self):
+        for line in self:
+            if line.flag == 'aml':
+                line.tax_ids = [Command.set(line.source_aml_id.tax_ids.ids)]
+            else:
+                line.tax_ids = line.tax_ids
+
+    @api.depends('source_aml_id')
+    def _compute_tax_tag_ids(self):
+        for line in self:
+            if line.flag == 'aml':
+                line.tax_tag_ids = [Command.set(line.source_aml_id.tax_tag_ids.ids)]
+            else:
+                line.tax_tag_ids = line.tax_tag_ids
+
+    @api.depends('source_aml_id')
+    def _compute_group_tax_id(self):
+        for line in self:
+            if line.flag == 'aml':
+                line.group_tax_id = line.source_aml_id.group_tax_id
+            else:
+                line.group_tax_id = line.group_tax_id
+
+    @api.depends('currency_id', 'amount_currency', 'source_amount_currency')
+    def _compute_display_stroked_amount_currency(self):
+        for line in self:
+            line.display_stroked_amount_currency = \
+                line.flag == 'new_aml' \
+                and line.currency_id.compare_amounts(line.amount_currency, line.source_amount_currency) != 0
+
+    @api.depends('currency_id', 'balance', 'source_balance')
+    def _compute_display_stroked_balance(self):
+        for line in self:
+            line.display_stroked_balance = \
+                line.flag in ('new_aml', 'exchange_diff') \
+                and line.currency_id.compare_amounts(line.balance, line.source_balance) != 0
+
+    @api.depends('flag')
+    def _compute_source_aml_fields(self):
+        for line in self:
+            line.source_aml_move_id = None
+            line.source_aml_move_name = None
+            if line.flag in ('new_aml', 'liquidity'):
+                line.source_aml_move_id = line.source_aml_id.move_id
+                line.source_aml_move_name = line.source_aml_id.move_id.name
+            elif line.flag == 'aml':
+                partials = line.source_aml_id.matched_debit_ids + line.source_aml_id.matched_credit_ids
+                all_counterpart_lines = partials.debit_move_id + partials.credit_move_id
+                counterpart_lines = all_counterpart_lines - line.source_aml_id - partials.exchange_move_id.line_ids
+                if len(counterpart_lines) == 1:
+                    line.source_aml_move_id = counterpart_lines.move_id
+                    line.source_aml_move_name = counterpart_lines.move_id.name
+
+    @api.depends('wizard_id.form_index', 'partner_id')
+    def _compute_partner_info(self):
+        for line in self:
+            line.partner_receivable_amount = 0.0
+            line.partner_payable_amount = 0.0
+            line.partner_currency_id = None
+            line.partner_receivable_account_id = None
+            line.partner_payable_account_id = None
+
+            if not line.partner_id or line.index != line.wizard_id.form_index:
+                continue
+
+            line.partner_currency_id = line.company_currency_id
+            partner = line.partner_id.with_company(line.wizard_id.company_id)
+            common_domain = [('parent_state', '=', 'posted'), ('partner_id', '=', partner.id)]
+            line.partner_receivable_account_id = partner.property_account_receivable_id
+            if line.partner_receivable_account_id:
+                results = self.env['account.move.line']._read_group(
+                    domain=expression.AND([common_domain, [('account_id', '=', line.partner_receivable_account_id.id)]]),
+                    aggregates=['amount_residual:sum'],
+                )
+                line.partner_receivable_amount = results[0][0]
+            line.partner_payable_account_id = partner.property_account_payable_id
+            if line.partner_payable_account_id:
+                results = self.env['account.move.line']._read_group(
+                    domain=expression.AND([common_domain, [('account_id', '=', line.partner_payable_account_id.id)]]),
+                    aggregates=['amount_residual:sum'],
+                )
+                line.partner_payable_amount = results[0][0]
+
+    @api.depends('flag')
+    def _compute_bank_account(self):
+        for line in self:
+            bank_account = line.wizard_id.st_line_id.partner_bank_id.display_name or line.wizard_id.st_line_id.account_number
+            if line.flag == 'liquidity' and bank_account:
+                line.bank_account = bank_account
+            else:
+                line.bank_account = None
+
+    @api.depends('wizard_id.form_index', 'amount_currency', 'balance')
+    def _compute_suggestion(self):
+        for line in self:
+            line.suggestion_html = None
+            line.suggestion_amount_currency = None
+            line.suggestion_balance = None
+
+            if line.flag != 'new_aml' or line.index != line.wizard_id.form_index:
+                continue
+
+            aml = line.source_aml_id
+            wizard = line.wizard_id
+            residual_amount_before_reco = abs(aml.amount_residual_currency)
+            residual_amount_after_reco = abs(aml.amount_residual_currency + line.amount_currency)
+            reconciled_amount = residual_amount_before_reco - residual_amount_after_reco
+            is_fully_reconciled = aml.currency_id.is_zero(residual_amount_after_reco)
+            is_invoice = aml.move_id.is_invoice(include_receipts=True)
+
+            if is_fully_reconciled:
+                lines = [
+                    _("The invoice %(display_name_html)s with an open amount of %(open_amount)s will be entirely paid by the transaction.")
+                    if is_invoice else
+                    _("%(display_name_html)s with an open amount of %(open_amount)s will be fully reconciled by the transaction.")
+                ]
+                partial_amounts = wizard._lines_check_partial_amount(line)
+                if partial_amounts:
+                    lines.append(
+                        _("You might want to record a %(btn_start)spartial payment%(btn_end)s.")
+                        if is_invoice else
+                        _("You might want to make a %(btn_start)spartial reconciliation%(btn_end)s instead.")
+                    )
+                    line.suggestion_amount_currency = partial_amounts['amount_currency']
+                    line.suggestion_balance = partial_amounts['balance']
+            else:
+                if is_invoice:
+                    lines = [
+                        _("The invoice %(display_name_html)s with an open amount of %(open_amount)s will be reduced by %(amount)s."),
+                        _("You might want to set the invoice as %(btn_start)sfully paid%(btn_end)s."),
+                    ]
+                else:
+                    lines = [
+                        _("%(display_name_html)s with an open amount of %(open_amount)s will be reduced by %(amount)s."),
+                        _("You might want to %(btn_start)sfully reconcile%(btn_end)s the document."),
+                    ]
+                line.suggestion_amount_currency = line.source_amount_currency
+                line.suggestion_balance = line.source_balance
+
+            display_name_html = markupsafe.Markup("""
+                <button name="action_redirect_to_move"
+                        class="btn btn-link p-0 align-baseline fst-italic">%(display_name)s</button>
+            """) % {
+                'display_name': aml.move_id.display_name,
+            }
+
+            extra_text = markupsafe.Markup('<br/>').join(lines) % {
+                'amount': formatLang(self.env, reconciled_amount, currency_obj=aml.currency_id),
+                'open_amount': formatLang(self.env, residual_amount_before_reco, currency_obj=aml.currency_id),
+                'display_name_html': display_name_html,
+                'btn_start': markupsafe.Markup(
+                    '<button name="action_apply_line_suggestion" class="btn btn-link p-0 align-baseline fst-italic">'),
+                'btn_end': markupsafe.Markup('</button>'),
+            }
+            line.suggestion_html = markupsafe.Markup("""<div class="text-muted">%s</div>""") % extra_text
+
+    @api.depends('flag')
+    def _compute_ref_narration(self):
+        for line in self:
+            if line.flag == 'liquidity':
+                line.ref = line.wizard_id.st_line_id.ref
+                line.narration = line.wizard_id.st_line_id.narration
+            else:
+                line.ref = line.narration = None
+
+    def _get_aml_values(self, **kwargs):
+        self.ensure_one()
+        create_dict = {
+            'name': self.name,
+            'account_id': self.account_id.id,
+            'currency_id': self.currency_id.id,
+            'amount_currency': self.amount_currency,
+            'balance': self.debit - self.credit,
+            'reconcile_model_id': self.reconcile_model_id.id,
+            'analytic_distribution': self.analytic_distribution,
+            'tax_repartition_line_id': self.tax_repartition_line_id.id,
+            'tax_ids': [Command.set(self.tax_ids.ids)],
+            'tax_tag_ids': [Command.set(self.tax_tag_ids.ids)],
+            'group_tax_id': self.group_tax_id.id,
+            **kwargs,
+        }
+        if self.flag == 'early_payment':
+            create_dict['display_type'] = 'epd'
+        return create_dict
diff --git a/dev_odex30_accounting/odex30_account_accountant/models/digest.py b/dev_odex30_accounting/odex30_account_accountant/models/digest.py
new file mode 100644
index 0000000..9be0abc
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_accountant/models/digest.py
@@ -0,0 +1,33 @@
+# -*- coding: utf-8 -*-
+
+from odoo import fields, models, _
+from odoo.exceptions import AccessError
+
+
+class Digest(models.Model):
+    _inherit = 'digest.digest'
+
+    kpi_account_bank_cash = fields.Boolean('Bank & Cash Moves')
+    kpi_account_bank_cash_value = fields.Monetary(compute='_compute_kpi_account_total_bank_cash_value')
+
+    def _compute_kpi_account_total_bank_cash_value(self):
+        if not self.env.user.has_group('account.group_account_user'):
+            raise AccessError(_("Do not have access, skip this data for user's digest email"))
+
+        start, end, companies = self._get_kpi_compute_parameters()
+        data = self.env['account.move']._read_group([
+            ('date', '>=', start),
+            ('date', '<', end),
+            ('journal_id.type', 'in', ('cash', 'bank')),
+            ('company_id', 'in', companies.ids),
+        ], ['company_id'], ['amount_total:sum'])
+        data = dict(data)
+
+        for record in self:
+            company = record.company_id or self.env.company
+            record.kpi_account_bank_cash_value = data.get(company)
+
+    def _compute_kpis_actions(self, company, user):
+        res = super(Digest, self)._compute_kpis_actions(company, user)
+        res.update({'kpi_account_bank_cash': 'account.open_account_journal_dashboard_kanban?menu_id=%s' % (self.env.ref('account.menu_finance').id)})
+        return res
diff --git a/dev_odex30_accounting/odex30_account_accountant/models/ir_model.py b/dev_odex30_accounting/odex30_account_accountant/models/ir_model.py
new file mode 100644
index 0000000..1ac8373
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_accountant/models/ir_model.py
@@ -0,0 +1,14 @@
+from odoo import api, models
+
+
+class IrModel(models.Model):
+    _inherit = 'ir.model'
+
+    @api.model
+    def _is_valid_for_model_selector(self, model):
+        return model not in {
+            # bank.rec.widget* does not have a psql table with _auto=False & _table_query="0",
+            # which makes the models unusable in the model selector.
+            'bank.rec.widget',
+            'bank.rec.widget.line',
+        } and super()._is_valid_for_model_selector(model)
diff --git a/dev_odex30_accounting/odex30_account_accountant/models/ir_ui_menu.py b/dev_odex30_accounting/odex30_account_accountant/models/ir_ui_menu.py
new file mode 100644
index 0000000..ce62e0d
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_accountant/models/ir_ui_menu.py
@@ -0,0 +1,21 @@
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+from odoo import models
+
+
+class IrUiMenu(models.Model):
+    _inherit = 'ir.ui.menu'
+
+    def _visible_menu_ids(self, debug=False):
+        visible_ids = super()._visible_menu_ids(debug)
+        # These menus should only be visible to accountants (users with group_account_readonly) and the group specified on the menu
+        # We want to avoid moving these menus to the new `accountant` module
+        if not self.env.user.has_group('account.group_account_readonly'):
+            accounting_menus = [
+                'odex30_account_accountant.account_tag_menu',
+                'odex30_account_accountant.menu_account_group',
+                'odex30_account_reports.menu_action_account_report_multicurrency_revaluation',
+            ]
+            hidden_menu_ids = {self.env.ref(r).sudo().id for r in accounting_menus if self.env.ref(r, raise_if_not_found=False)}
+            return visible_ids - hidden_menu_ids
+        return visible_ids
diff --git a/dev_odex30_accounting/odex30_account_accountant/models/res_company.py b/dev_odex30_accounting/odex30_account_accountant/models/res_company.py
new file mode 100644
index 0000000..2c72f7c
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_accountant/models/res_company.py
@@ -0,0 +1,208 @@
+from odoo import models, fields, _
+from odoo.tools.misc import DEFAULT_SERVER_DATE_FORMAT
+
+from datetime import timedelta
+from odoo.tools import date_utils
+
+
+class ResCompany(models.Model):
+    _inherit = 'res.company'
+
+    invoicing_switch_threshold = fields.Date(string="Invoicing Switch Threshold", help="Every payment and invoice before this date will receive the 'From Invoicing' status, hiding all the accounting entries related to it. Use this option after installing Accounting if you were using only Invoicing before, before importing all your actual accounting data in to Odoo.")
+    predict_bill_product = fields.Boolean(string="Predict Bill Product")
+
+    sign_invoice = fields.Boolean(string='Display signing field on invoices')
+    signing_user = fields.Many2one(comodel_name='res.users')
+
+    # Deferred expense management
+    deferred_expense_journal_id = fields.Many2one(
+        comodel_name='account.journal',
+        string="Deferred Expense Journal",
+    )
+    deferred_expense_account_id = fields.Many2one(
+        comodel_name='account.account',
+        string="Deferred Expense Account",
+    )
+    generate_deferred_expense_entries_method = fields.Selection(
+        string="Generate Deferred Expense Entries",
+        selection=[
+            ('on_validation', 'On bill validation'),
+            ('manual', 'Manually & Grouped'),
+        ],
+        default='on_validation',
+        required=True,
+    )
+    deferred_expense_amount_computation_method = fields.Selection(
+        string="Deferred Expense Based on",
+        selection=[
+            ('day', 'Days'),
+            ('month', 'Months'),
+            ('full_months', 'Full Months'),
+        ],
+        default='month',
+        required=True,
+    )
+
+    # Deferred revenue management
+    deferred_revenue_journal_id = fields.Many2one(
+        comodel_name='account.journal',
+        string="Deferred Revenue Journal",
+    )
+    deferred_revenue_account_id = fields.Many2one(
+        comodel_name='account.account',
+        string="Deferred Revenue Account",
+    )
+    generate_deferred_revenue_entries_method = fields.Selection(
+        string="Generate Deferred Revenue Entries",
+        selection=[
+            ('on_validation', 'On bill validation'),
+            ('manual', 'Manually & Grouped'),
+        ],
+        default='on_validation',
+        required=True,
+    )
+    deferred_revenue_amount_computation_method = fields.Selection(
+        string="Deferred Revenue Based on",
+        selection=[
+            ('day', 'Days'),
+            ('month', 'Months'),
+            ('full_months', 'Full Months'),
+        ],
+        default='month',
+        required=True,
+    )
+
+    def write(self, vals):
+        old_threshold_vals = {}
+        for record in self:
+            old_threshold_vals[record] = record.invoicing_switch_threshold
+
+        rslt = super(ResCompany, self).write(vals)
+
+        for record in self:
+            if 'invoicing_switch_threshold' in vals and old_threshold_vals[record] != vals['invoicing_switch_threshold']:
+                self.env['account.move.line'].flush_model(['move_id', 'parent_state'])
+                self.env['account.move'].flush_model(['company_id', 'date', 'state', 'payment_state', 'payment_state_before_switch'])
+                if record.invoicing_switch_threshold:
+                    # If a new date was set as threshold, we switch all the
+                    # posted moves and payments before it to 'invoicing_legacy'.
+                    # We also reset to posted all the moves and payments that
+                    # were 'invoicing_legacy' and were posterior to the threshold
+                    self.env.cr.execute("""
+                        update account_move_line aml
+                        set parent_state = 'posted'
+                        from account_move move
+                        where aml.move_id = move.id
+                        and move.payment_state = 'invoicing_legacy'
+                        and move.date >= %(switch_threshold)s
+                        and move.company_id = %(company_id)s;
+
+                        update account_move
+                        set state = 'posted',
+                            payment_state = payment_state_before_switch,
+                            payment_state_before_switch = null
+                        where payment_state = 'invoicing_legacy'
+                        and date >= %(switch_threshold)s
+                        and company_id = %(company_id)s;
+
+                        update account_move_line aml
+                        set parent_state = 'cancel'
+                        from account_move move
+                        where aml.move_id = move.id
+                        and move.state = 'posted'
+                        and move.date < %(switch_threshold)s
+                        and move.company_id = %(company_id)s;
+
+                        update account_move
+                        set state = 'cancel',
+                            payment_state_before_switch = payment_state,
+                            payment_state = 'invoicing_legacy'
+                        where state = 'posted'
+                        and date < %(switch_threshold)s
+                        and company_id = %(company_id)s;
+                    """, {'company_id': record.id, 'switch_threshold': record.invoicing_switch_threshold})
+                else:
+                    # If the threshold date has been emptied, we re-post all the
+                    # invoicing_legacy entries.
+                    self.env.cr.execute("""
+                        update account_move_line aml
+                        set parent_state = 'posted'
+                        from account_move move
+                        where aml.move_id = move.id
+                        and move.payment_state = 'invoicing_legacy'
+                        and move.company_id = %(company_id)s;
+
+                        update account_move
+                        set state = 'posted',
+                            payment_state = payment_state_before_switch,
+                            payment_state_before_switch = null
+                        where payment_state = 'invoicing_legacy'
+                        and company_id = %(company_id)s;
+                    """, {'company_id': record.id})
+
+                self.env['account.move.line'].invalidate_model(['parent_state'])
+                self.env['account.move'].invalidate_model(['state', 'payment_state', 'payment_state_before_switch'])
+
+        return rslt
+
+    def compute_fiscalyear_dates(self, current_date):
+        """Compute the start and end dates of the fiscal year where the given 'date' belongs to.
+
+        :param current_date: A datetime.date/datetime.datetime object.
+        :return: A dictionary containing:
+            * date_from
+            * date_to
+            * [Optionally] record: The fiscal year record.
+        """
+        self.ensure_one()
+        date_str = current_date.strftime(DEFAULT_SERVER_DATE_FORMAT)
+
+        # Search a fiscal year record containing the date.
+        # If a record is found, then no need further computation, we get the dates range directly.
+        fiscalyear = self.env['account.fiscal.year'].search([
+            ('company_id', '=', self.id),
+            ('date_from', '<=', date_str),
+            ('date_to', '>=', date_str),
+        ], limit=1)
+        if fiscalyear:
+            return {
+                'date_from': fiscalyear.date_from,
+                'date_to': fiscalyear.date_to,
+                'record': fiscalyear,
+            }
+
+        date_from, date_to = date_utils.get_fiscal_year(
+            current_date, day=self.fiscalyear_last_day, month=int(self.fiscalyear_last_month))
+
+        date_from_str = date_from.strftime(DEFAULT_SERVER_DATE_FORMAT)
+        date_to_str = date_to.strftime(DEFAULT_SERVER_DATE_FORMAT)
+
+        # Search for fiscal year records reducing the delta between the date_from/date_to.
+        # This case could happen if there is a gap between two fiscal year records.
+        # E.g. two fiscal year records: 2017-01-01 -> 2017-02-01 and 2017-03-01 -> 2017-12-31.
+        # => The period 2017-02-02 - 2017-02-30 is not covered by a fiscal year record.
+
+        fiscalyear_from = self.env['account.fiscal.year'].search([
+            ('company_id', '=', self.id),
+            ('date_from', '<=', date_from_str),
+            ('date_to', '>=', date_from_str),
+        ], limit=1)
+        if fiscalyear_from:
+            date_from = fiscalyear_from.date_to + timedelta(days=1)
+
+        fiscalyear_to = self.env['account.fiscal.year'].search([
+            ('company_id', '=', self.id),
+            ('date_from', '<=', date_to_str),
+            ('date_to', '>=', date_to_str),
+        ], limit=1)
+        if fiscalyear_to:
+            date_to = fiscalyear_to.date_from - timedelta(days=1)
+
+        return {'date_from': date_from, 'date_to': date_to}
+
+    def _get_unreconciled_statement_lines_redirect_action(self, unreconciled_statement_lines):
+        # OVERRIDE account
+        return self.env['account.bank.statement.line']._action_open_bank_reconciliation_widget(
+            extra_domain=[('id', 'in', unreconciled_statement_lines.ids)],
+            name=_('Unreconciled statements lines'),
+        )
diff --git a/dev_odex30_accounting/odex30_account_accountant/models/res_config_settings.py b/dev_odex30_accounting/odex30_account_accountant/models/res_config_settings.py
new file mode 100644
index 0000000..dce9496
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_accountant/models/res_config_settings.py
@@ -0,0 +1,111 @@
+from datetime import date
+
+from odoo import _, api, fields, models
+from odoo.exceptions import ValidationError
+
+
+class ResConfigSettings(models.TransientModel):
+    _inherit = 'res.config.settings'
+
+    fiscalyear_last_day = fields.Integer(related='company_id.fiscalyear_last_day', required=True, readonly=False)
+    fiscalyear_last_month = fields.Selection(related='company_id.fiscalyear_last_month', required=True, readonly=False)
+    use_anglo_saxon = fields.Boolean(string='Anglo-Saxon Accounting', related='company_id.anglo_saxon_accounting', readonly=False)
+    invoicing_switch_threshold = fields.Date(string="Invoicing Switch Threshold", related='company_id.invoicing_switch_threshold', readonly=False)
+    group_fiscal_year = fields.Boolean(string='Fiscal Years', implied_group='odex30_account_accountant.group_fiscal_year')
+    predict_bill_product = fields.Boolean(string="Predict Bill Product", related='company_id.predict_bill_product', readonly=False)
+
+    sign_invoice = fields.Boolean(string='Authorized Signatory on invoice', related='company_id.sign_invoice', readonly=False)
+    signing_user = fields.Many2one(
+        comodel_name='res.users',
+        string="Signature used to sign all the invoice",
+        readonly=False,
+        related='company_id.signing_user',
+        help="Select a user here to override every signature on invoice by this user's signature"
+    )
+    module_sign = fields.Boolean(string='Sign', compute='_compute_module_sign_status')
+
+    # Deferred expense management
+    deferred_expense_journal_id = fields.Many2one(
+        comodel_name='account.journal',
+        help='Journal used for deferred entries',
+        readonly=False,
+        related='company_id.deferred_expense_journal_id',
+    )
+    deferred_expense_account_id = fields.Many2one(
+        comodel_name='account.account',
+        help='Account used for deferred expenses',
+        readonly=False,
+        related='company_id.deferred_expense_account_id',
+    )
+    generate_deferred_expense_entries_method = fields.Selection(
+        related='company_id.generate_deferred_expense_entries_method',
+        readonly=False, required=True,
+        help='Method used to generate deferred entries',
+    )
+    deferred_expense_amount_computation_method = fields.Selection(
+        related='company_id.deferred_expense_amount_computation_method',
+        readonly=False, required=True,
+        help='Method used to compute the amount of deferred entries',
+    )
+
+    # Deferred revenue management
+    deferred_revenue_journal_id = fields.Many2one(
+        comodel_name='account.journal',
+        help='Journal used for deferred entries',
+        readonly=False,
+        related='company_id.deferred_revenue_journal_id',
+    )
+    deferred_revenue_account_id = fields.Many2one(
+        comodel_name='account.account',
+        help='Account used for deferred revenues',
+        readonly=False,
+        related='company_id.deferred_revenue_account_id',
+    )
+    generate_deferred_revenue_entries_method = fields.Selection(
+        related='company_id.generate_deferred_revenue_entries_method',
+        readonly=False, required=True,
+        help='Method used to generate deferred entries',
+    )
+    deferred_revenue_amount_computation_method = fields.Selection(
+        related='company_id.deferred_revenue_amount_computation_method',
+        readonly=False, required=True,
+        help='Method used to compute the amount of deferred entries',
+    )
+
+    @api.depends('sign_invoice')
+    def _compute_module_sign_status(self):
+        sign_installed = 'sign' in self.env['ir.module.module']._installed()
+        for settings in self:
+            settings.module_sign = sign_installed or settings.company_id.sign_invoice
+
+    @api.constrains('fiscalyear_last_day', 'fiscalyear_last_month')
+    def _check_fiscalyear(self):
+        # We try if the date exists in 2020, which is a leap year.
+        # We do not define the constrain on res.company, since the recomputation of the related
+        # fields is done one field at a time.
+        for wiz in self:
+            try:
+                date(2020, int(wiz.fiscalyear_last_month), wiz.fiscalyear_last_day)
+            except ValueError:
+                raise ValidationError(
+                    _('Incorrect fiscal year date: day is out of range for month. Month: %(month)s; Day: %(day)s',
+                    month=wiz.fiscalyear_last_month, day=wiz.fiscalyear_last_day),
+                )
+
+    @api.model_create_multi
+    def create(self, vals_list):
+        # Amazing workaround: non-stored related fields on company are a BAD idea since the 2 fields
+        # must follow the constraint '_check_fiscalyear_last_day'. The thing is, in case of related
+        # fields, the inverse write is done one value at a time, and thus the constraint is verified
+        # one value at a time... so it is likely to fail.
+        for vals in vals_list:
+            fiscalyear_last_day = vals.pop('fiscalyear_last_day', False) or self.env.company.fiscalyear_last_day
+            fiscalyear_last_month = vals.pop('fiscalyear_last_month', False) or self.env.company.fiscalyear_last_month
+            vals = {}
+            if fiscalyear_last_day != self.env.company.fiscalyear_last_day:
+                vals['fiscalyear_last_day'] = fiscalyear_last_day
+            if fiscalyear_last_month != self.env.company.fiscalyear_last_month:
+                vals['fiscalyear_last_month'] = fiscalyear_last_month
+            if vals:
+                self.env.company.write(vals)
+        return super().create(vals_list)
diff --git a/dev_odex30_accounting/odex30_account_accountant/security/ir.model.access.csv b/dev_odex30_accounting/odex30_account_accountant/security/ir.model.access.csv
new file mode 100644
index 0000000..34dba06
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_accountant/security/ir.model.access.csv
@@ -0,0 +1,12 @@
+"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
+"access_account_change_lock_date","access.account.change.lock.date","model_account_change_lock_date","account.group_account_manager",1,1,1,0
+"access_account_secure_entries_wizard","access.account.secure.entries.wizard","account.model_account_secure_entries_wizard","account.group_account_user",1,1,1,0
+"access_account_auto_reconcile_wizard","access.account.auto.reconcile.wizard","model_account_auto_reconcile_wizard","account.group_account_user",1,1,1,0
+"access_account_reconcile_wizard","access.account.reconcile.wizard","model_account_reconcile_wizard","account.group_account_user",1,1,1,0
+
+access_account_fiscal_year_readonly,account.fiscal.year.user,model_account_fiscal_year,account.group_account_readonly,1,0,0,0
+access_account_fiscal_year_basic,account.fiscal.year.basic,model_account_fiscal_year,account.group_account_basic,1,0,0,0
+access_account_fiscal_year_manager,account.fiscal.year.manager,model_account_fiscal_year,account.group_account_manager,1,1,1,1
+
+access_bank_rec_widget,access.bank.rec.widget,model_bank_rec_widget,account.group_account_user,1,1,1,1
+access_bank_rec_widget_line,access.bank.rec.widget.line,model_bank_rec_widget_line,account.group_account_user,1,1,1,1
diff --git a/dev_odex30_accounting/odex30_account_accountant/security/odex30_account_accountant_security.xml b/dev_odex30_accounting/odex30_account_accountant/security/odex30_account_accountant_security.xml
new file mode 100644
index 0000000..d81eca8
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_accountant/security/odex30_account_accountant_security.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+    <record model="ir.module.category" id="base.module_category_accounting_accounting">
+
+    </record>
+
+    <record id="account.group_account_basic" model="res.groups">
+        <field name="name">Invoicing &amp; Banks</field>
+        <field name="category_id" ref="base.module_category_accounting_accounting"/>
+    </record>
+
+    <record id="account.group_account_manager" model="res.groups">
+        <field name="implied_ids" eval="[(4, ref('account.group_account_basic'))]"/>
+    </record>
+
+    <record id="group_fiscal_year" model="res.groups">
+        <field name="name">Allow to define fiscal years of more or less than a year</field>
+        <field name="category_id" ref="base.module_category_hidden"/>
+    </record>
+</odoo>
diff --git a/dev_odex30_accounting/odex30_account_accountant/static/src/components/bank_reconciliation/amls_list_view.js b/dev_odex30_accounting/odex30_account_accountant/static/src/components/bank_reconciliation/amls_list_view.js
new file mode 100644
index 0000000..b4aabbc
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_accountant/static/src/components/bank_reconciliation/amls_list_view.js
@@ -0,0 +1,49 @@
+/** @odoo-module **/
+
+import { registry } from "@web/core/registry";
+import { EmbeddedListView } from "./embedded_list_view";
+import { ListRenderer } from "@web/views/list/list_renderer";
+import { useState, onWillUnmount } from "@odoo/owl";
+
+export class BankRecAmlsRenderer extends ListRenderer {
+    setup() {
+        super.setup();
+        this.globalState = useState(this.env.methods.getState());
+
+        onWillUnmount(this.saveSearchState);
+    }
+
+    /** @override **/
+    getRowClass(record) {
+        const classes = super.getRowClass(record);
+        const amlId = this.globalState.bankRecRecordData.selected_aml_ids.currentIds.find((x) => x === record.resId);
+        if (amlId){
+            return `${classes} o_rec_widget_list_selected_item table-info`;
+        }
+        return classes;
+    }
+
+    /** @override **/
+    async onCellClicked(record, column, ev) {
+        const amlId = this.globalState.bankRecRecordData.selected_aml_ids.currentIds.find((x) => x === record.resId);
+        if (amlId) {
+            this.env.config.actionRemoveNewAml(record.resId);
+        } else {
+            this.env.config.actionAddNewAml(record.resId);
+        }
+    }
+
+    /** Backup the search facets in order to restore them when the user comes back on this view. **/
+    saveSearchState() {
+        const initParams = this.globalState.bankRecEmbeddedViewsData.amls;
+        const searchModel = this.env.searchModel;
+        initParams.exportState = {searchModel: JSON.stringify(searchModel.exportState())};
+    }
+}
+
+export const BankRecAmls = {
+    ...EmbeddedListView,
+    Renderer: BankRecAmlsRenderer,
+};
+
+registry.category("views").add("bank_rec_amls_list_view", BankRecAmls);
diff --git a/dev_odex30_accounting/odex30_account_accountant/static/src/components/bank_reconciliation/bank_rec_form.xml b/dev_odex30_accounting/odex30_account_accountant/static/src/components/bank_reconciliation/bank_rec_form.xml
new file mode 100644
index 0000000..9537584
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_accountant/static/src/components/bank_reconciliation/bank_rec_form.xml
@@ -0,0 +1,752 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<templates id="template" xml:space="preserve">
+
+    <!-- Buttons -->
+    <t t-name="odex30_account_accountant.BankRecRecordFormButtonsHeaderLeft">
+        <div class="o_statusbar_buttons o_bank_rec_stats_buttons_aside_left py-1 ps-1">
+            <t t-set="areAllLinesValid" t-value="this.checkBankRecLinesInvalidFields(data)"/>
+            <button accesskey="v"
+                    class="btn btn-primary"
+                    t-if="data.state === 'valid' and areAllLinesValid"
+                    t-on-click="(ev) => this.actionValidate()">
+                <span>Validate</span>
+            </button>
+            <button class="btn btn-secondary text-muted"
+                    t-if="data.state === 'invalid' or (data.state === 'valid' and !areAllLinesValid)">
+                <span>Validate</span>
+            </button>
+            <button accesskey="r"
+                    class="btn btn-secondary"
+                    t-if="data.state === 'reconciled'"
+                    t-on-click="(ev) => this.actionReset()">
+                <span>Reset</span>
+            </button>
+            <button accesskey="e"
+                    class="btn btn-secondary"
+                    t-if="data.st_line_checked and areAllLinesValid"
+                    t-on-click="(ev) => this.actionToCheck()">
+                <span>To Check</span>
+            </button>
+            <button class="btn btn-secondary text-muted"
+                    t-if="data.st_line_checked and !areAllLinesValid">
+                <span>To Check</span>
+            </button>
+            <button accesskey="e"
+                    class="btn btn-secondary"
+                    t-if="!data.st_line_checked"
+                    t-on-click="(ev) => this.actionSetAsChecked()">
+                <span>Set as Checked</span>
+            </button>
+        </div>
+    </t>
+
+    <!-- Reconciliation models -->
+    <t t-name="odex30_account_accountant.BankRecRecordFormButtonsHeaderRight">
+        <div t-if="hasGroupReadOnly" class="o_statusbar_buttons o_bank_rec_stats_buttons_aside_right">
+            <div class="available_reco_model_ids">
+
+                <!-- Displayed reco models -->
+                <t t-set="nb_rendered_buttons" t-value="0"/>
+
+                <div class="o_bank_rec_reco_models_widget_div">
+                    <t t-foreach="data.available_reco_model_ids.records"
+                       t-as="reco_model"
+                       t-key="reco_model.data.id">
+                        <t t-set="is_selected"
+                           t-value="reco_model.data.id === data.selected_reco_model_id[0]"/>
+
+                        <t t-if="reco_model_index lt 5 or is_selected">
+                            <button
+                                t-att-accesskey="'SHIFT+'+(reco_model_index + 1)"
+                                t-on-click="() => this.actionSelectRecoModel(reco_model)"
+                                class="btn recon_model_button me-1 my-1"
+                                t-att-class="{'btn-secondary': !is_selected, 'btn-primary': is_selected}"
+                                t-out="reco_model.data.display_name"/>
+
+                            <t t-set="nb_rendered_buttons" t-value="nb_rendered_buttons + 1"/>
+                        </t>
+                    </t>
+
+                    <!-- Dropdown if more reco models -->
+                    <div t-if="data.available_reco_model_ids.records.length gt nb_rendered_buttons" class="bank_rec_reco_model_dropdown my-1">
+                        <Dropdown>
+                            <button class="btn btn-light">
+                                More
+                            </button>
+                            <t t-set-slot="content">
+                                <t t-foreach="data.available_reco_model_ids.records" t-as="reco_model" t-key="reco_model.data.id">
+                                    <t t-set="is_selected" t-value="reco_model.data.id === data.selected_reco_model_id.id"/>
+                                    <DropdownItem t-if="reco_model_index gte 5 and !is_selected"
+                                                  onSelected="() => this.actionSelectRecoModel(reco_model)">
+                                        <t t-out="reco_model.data.display_name"/>
+                                    </DropdownItem>
+                                </t>
+                            </t>
+                        </Dropdown>
+                    </div>
+                </div>
+
+                <!-- Creation of reco models -->
+                <div class="bank_rec_reco_model_dropdown">
+                    <Dropdown position="'bottom-end'">
+                        <button class="btn btn-light">
+                            <i class="fa fa-cog"/>
+                        </button>
+                        <t t-set-slot="content">
+                            <DropdownItem onSelected="() => this.actionCreateRecoModel()">
+                                Create model
+                            </DropdownItem>
+                            <DropdownItem onSelected="() => this.actionViewRecoModels()">
+                                View models
+                            </DropdownItem>
+                        </t>
+                    </Dropdown>
+                </div>
+
+            </div>
+        </div>
+    </t>
+
+    <!-- line_ids field -->
+    <t t-name="odex30_account_accountant.BankRecRecordFormLineIds">
+        <div name="line_ids" class="w-100">
+            <div class="o_list_renderer table-responsive">
+                <table class="o_list_table table table-sm position-relative mb-0 o_list_table_ungrouped table-striped o_bank_rec_lines_widget_table">
+                    <thead>
+                        <tr>
+                            <t t-foreach="line_ids_columns" t-as="column" t-key="column[0]">
+                                <t t-if="['amount_currency', 'debit', 'credit', 'balance'].includes(column[0])">
+                                    <th class="o_list_number_th text-end" t-esc="column[1]"/>
+                                </t>
+                                <t t-elif="column[0] === '__trash'">
+                                    <th class="o_list_actions_header"/>
+                                </t>
+                                <t t-else="">
+                                    <th t-out="column[1]"/>
+                                </t>
+                            </t>
+                        </tr>
+                    </thead>
+                    <tbody>
+                        <t t-foreach="data.line_ids.records" t-as="line" t-key="line_index">
+                            <t t-set="invalidFields" t-value="this.getBankRecLineInvalidFields(line)"/>
+
+                            <tr class="o_data_row o_selected_row o_list_no_open o_bank_rec_expanded_line"
+                                t-att-class="{
+                                    'o_bank_rec_liquidity_line': line.data.flag === 'liquidity',
+                                    'o_bank_rec_auto_balance_line': line.data.flag === 'auto_balance',
+                                    'o_bank_rec_selected_line': line.data.index === data.form_index and this.state.bankRecNotebookPage === 'manual_operations_tab',
+                                    'table-info': line.data.index === data.form_index and this.state.bankRecNotebookPage === 'manual_operations_tab',
+                                }"
+                                t-on-click="(ev) => this.handleLineClicked(ev, line)">
+
+                                <t t-foreach="line_ids_columns" t-as="column" t-key="column[0]">
+                                    <t t-if="column[0] === 'account'">
+                                        <td class="o_data_cell o_field_cell o_list_many2one"
+                                            t-att-class="{'o_invalid_cell': invalidFields.includes('account_id')}"
+                                            field="account_id"
+                                            t-att-title="line.data.account_id[1]"
+                                            t-out="line.data.account_id[1]"/>
+                                    </t>
+                                    <t t-if="column[0] === 'partner'">
+                                        <t t-if="line.data.flag === 'liquidity' and !line.data.partner_id">
+                                            <td class="o_data_cell o_field_cell o_list_many2one text-muted"
+                                                field="partner_id"
+                                                t-att-title="data.partner_name or ''"
+                                                t-out="data.partner_name or ''"/>
+                                        </t>
+                                        <t t-else="">
+                                            <td class="o_data_cell o_field_cell o_list_many2one"
+                                                field="partner_id"
+                                                t-att-title="line.data.partner_id[1]"
+                                                t-out="line.data.partner_id[1]"/>
+                                        </t>
+                                    </t>
+                                    <t t-if="column[0] === 'date'">
+                                        <t t-if="['manual', 'early_payment', 'auto_balance', 'tax_line'].includes(line.data.flag)">
+                                            <td class="o_data_cell o_field_cell" field="date">
+                                                <span field="date" class="badge text-bg-secondary">New</span>
+                                            </td>
+                                        </t>
+                                        <t t-else="">
+                                            <td class="o_data_cell o_field_cell"
+                                                t-att-class="{'o_invalid_cell': invalidFields.includes('date')}"
+                                                field="date"
+                                                t-out="formatDateField(line.data.date)"/>
+                                        </t>
+                                    </t>
+                                    <t t-if="column[0] === 'analytic_distribution'">
+                                        <td class="o_data_cell o_field_cell o_field_widget o_field_analytic_distribution" field="analytic_distribution">
+                                            <div class="o_field_tags d-inline-flex flex-wrap mw-100">
+                                                <AnalyticDistribution
+                                                    name="'analytic_distribution'"
+                                                    record="line"
+                                                    readonly="true"
+                                                    t-key="getKey(line.data)"
+                                                />
+                                            </div>
+                                        </td>
+                                    </t>
+                                    <t t-if="column[0] === 'taxes'" name="col_taxes">
+                                        <td class="o_data_cell o_field_cell o_field_widget o_field_many2many_tags"
+                                            field="tax_ids">
+                                            <div class="o_field_tags d-inline-flex flex-wrap mw-100">
+                                                <TagsList tags="line.data.tax_ids.records.map((tax) => ({text: tax.data.display_name, id: tax.resId}))"/>
+                                            </div>
+                                        </td>
+                                    </t>
+                                    <t t-if="column[0] === 'amount_currency'">
+                                        <t t-if="line.data.flag === 'exchange_diff'">
+                                            <td/>
+                                        </t>
+                                        <t t-else="">
+                                            <td class="o_data_cell o_field_cell o_list_number"
+                                                field="amount_currency"
+                                                style="justify-content: right;"
+                                                t-out="isMonetaryZero(line.data.amount_currency, line.data.currency_id[0]) ? '' : formatMonetaryField(line.data.amount_currency, line.data.currency_id[0])"/>
+                                        </t>
+                                    </t>
+                                    <t t-if="column[0] === 'currency'">
+                                        <t t-if="line.data.flag === 'exchange_diff'">
+                                            <td/>
+                                        </t>
+                                        <t t-else="">
+                                            <td class="o_data_cell o_field_cell o_list_many2one"
+                                                field="currency_id"
+                                                t-att-title="line.data.currency_id[1]"
+                                                t-out="line.data.currency_id[1]"/>
+                                        </t>
+                                    </t>
+                                    <t t-if="column[0] === 'debit'">
+                                        <td class="o_data_cell o_field_cell o_list_number"
+                                            field="debit"
+                                            t-out="isMonetaryZero(line.data.debit, line.data.company_currency_id[0]) ? '' : formatMonetaryField(line.data.debit, line.data.company_currency_id[0])"/>
+                                    </t>
+                                    <t t-if="column[0] === 'credit'">
+                                        <td class="o_data_cell o_field_cell o_list_number"
+                                            field="credit"
+                                            t-out="isMonetaryZero(line.data.credit, line.data.company_currency_id[0]) ? '' : formatMonetaryField(line.data.credit, line.data.company_currency_id[0])"/>
+                                    </t>
+                                    <t t-if="column[0] === 'balance'">
+                                        <td class="o_data_cell o_field_cell o_list_number"
+                                            field="balance"
+                                            t-out="isMonetaryZero(line.data.balance, line.data.company_currency_id[0]) ? '' : formatMonetaryField(line.data.balance, line.data.company_currency_id[0])"/>
+                                    </t>
+                                    <t t-if="column[0] === '__trash'">
+                                        <td class="o_list_record_remove">
+                                            <button t-if="['valid', 'invalid'].includes(data.state) and !['liquidity', 'auto_balance', 'tax_line'].includes(line.data.flag)"
+                                                    t-on-click.prevent.stop="(ev) => this.actionRemoveLine(line)"
+                                                    class="btn fa fa-trash-o"/>
+                                        </td>
+                                    </t>
+                                </t>
+                            </tr>
+                            <!-- Ensure the same color band will be applied -->
+                            <tr/>
+                            <tr class="o_data_row o_selected_row o_list_no_open o_bank_rec_second_line"
+                                t-att-class="{
+                                    'o_bank_rec_liquidity_line': line.data.flag === 'liquidity',
+                                    'o_bank_rec_auto_balance_line': line.data.flag === 'auto_balance',
+                                    'o_bank_rec_selected_line': line.data.index === data.form_index and this.state.bankRecNotebookPage === 'manual_operations_tab',
+                                    'table-info': line.data.index === data.form_index and this.state.bankRecNotebookPage === 'manual_operations_tab',
+                                }"
+                                t-on-click="(ev) => this.handleLineClicked(ev, line)">
+                                <td t-att-colspan="line_ids_columns.length - (display_currency_columns ? 5 : 3) + (hasGroupReadOnly ? 0 : 1)"
+                                    class="o_data_cell o_field_cell o_list_char text-wrap fw-normal"
+                                    field="name">
+                                    <t t-if="line.data.source_aml_move_id[0] and (['new_aml', 'aml'].includes(line.data.flag) or (line.data.flag == 'liquidity' and data.state == 'reconciled' and hasGroupReadOnly))">
+                                        <span class="o_form_uri fst-italic"
+                                              t-out="line.data.source_aml_move_id[1]"
+                                              t-on-click="() => this.actionRedirectToSourceMove(line)"/>
+                                        <span class="me-1 fst-italic" t-if="line.data.name">:</span>
+                                    </t>
+                                    <span t-if="line.data.bank_account"
+                                          class="text-muted fst-italic me-1"
+                                          t-out="line.data.bank_account"/>
+                                    <span class="text-muted fst-italic"
+                                          t-out="line.data.name"/>
+                                </td>
+                                <td t-if="display_currency_columns"
+                                    class="o_data_cell o_field_cell o_list_number"
+                                    field="amount_currency">
+                                    <span t-if="line.data.display_stroked_amount_currency"
+                                          class="text-muted text-decoration-line-through"
+                                          field="amount_currency"
+                                          t-out="formatMonetaryField(line.data.source_amount_currency, line.data.currency_id[0])"/>
+                                </td>
+                                <td t-if="display_currency_columns" field="currency_id"/>
+                                <td t-if="hasGroupReadOnly"
+                                    class="o_data_cell o_field_cell o_list_number text-end"
+                                    field="debit">
+                                    <span t-if="line.data.display_stroked_balance and !isMonetaryZero(line.data.debit, line.data.company_currency_id[0])"
+                                          class="text-muted text-decoration-line-through"
+                                          field="debit"
+                                          t-out="formatMonetaryField(line.data.source_debit, line.data.company_currency_id[0])"/>
+                                </td>
+                                <td t-if="hasGroupReadOnly"
+                                    class="o_data_cell o_field_cell o_list_number text-end"
+                                    field="credit">
+                                    <span t-if="line.data.display_stroked_balance and !isMonetaryZero(line.data.credit, line.data.company_currency_id[0])"
+                                          class="text-muted text-decoration-line-through"
+                                          field="credit"
+                                          t-out="formatMonetaryField(line.data.source_credit, line.data.company_currency_id[0])"/>
+                                </td>
+                                <td t-if="!hasGroupReadOnly"
+                                    class="o_data_cell o_field_cell o_list_number text-end"
+                                    field="balance">
+                                    <span t-if="line.data.display_stroked_balance and (!isMonetaryZero(line.data.debit, line.data.company_currency_id[0]) or !isMonetaryZero(line.data.credit, line.data.company_currency_id[0]))"
+                                          class="text-muted text-decoration-line-through"
+                                          field="balance"
+                                          t-out="formatMonetaryField(line.data.source_debit or line.data.source_credit, line.data.company_currency_id[0])"/>
+                                </td>
+                                <td class="empty_trash_cell"/>
+                            </tr>
+                        </t>
+
+                        <t t-set="nb_extra_lines" t-value="5 - data.line_ids.records.length"/>
+                        <tr t-foreach="[...Array(Math.max(nb_extra_lines, 0)).keys()]" t-as="i" t-key="i">
+                            <td t-att-colspan="line_ids_columns.length">&#8205;</td>
+                        </tr>
+
+                    </tbody>
+                </table>
+            </div>
+        </div>
+    </t>
+
+    <!-- Notebook - amls_tab -->
+    <t t-name="odex30_account_accountant.BankRecRecordNotebookAmls">
+        <div class="bank_rec_widget_form_amls_list_anchor" t-if="this.state.bankRecEmbeddedViewsData">
+            <BankRecViewEmbedder viewProps="this.notebookAmlsListViewProps()" t-key="data.st_line_id[0]"/>
+        </div>
+    </t>
+
+    <!-- Notebook - manual_operations_tab -->
+    <t t-name="odex30_account_accountant.BankRecRecordNotebookManualOperations">
+        <t t-set="line" t-value="this.getBankRecRecordLineInEdit()"/>
+        <t t-set="data" t-value="this.state.bankRecRecordData"/>
+        <div t-if="line" class="bank_rec_widget_manual_operations_anchor">
+            <t t-set="invalidFields" t-value="this.getBankRecLineInvalidFields(line)"/>
+            <t t-set="hasForcedNegativeValue"
+               t-value="['new_aml', 'exchange_diff'].includes(line.data.flag) and (line.data.source_balance lt 0.0 || line.data.source_amount_currency lt 0.0)"/>
+            <t t-set="reconciled"
+               t-value="data.state === 'reconciled'"/>
+
+            <div class="o_group row align-items-start">
+                <div class="o_inner_group grid col-lg-4">
+                    <t t-set="is_batch" t-value="line.data.flag == 'new_batch'"/>
+                    <!-- amount_currency (in journal currency) -->
+                    <t t-set="amountFieldReadonly" t-value="reconciled or is_batch"/>
+                    <t t-set="currencyFieldReadonly" t-value="reconciled or ['liquidity', 'tax_line', 'new_aml', 'new_batch'].includes(line.data.flag)"/>
+                    <div name="amount_currency"
+                         t-if="line.data.flag !== 'exchange_diff'"
+                         class="o_wrap_field d-flex d-sm-contents flex-column">
+                        <div class="o_cell o_wrap_label flex-grow-1 flex-sm-grow-0 w-100 text-break text-900">
+                            <label class="o_form_label" t-att-class="{'o_form_label_readonly': amountFieldReadonly}">
+                                Amount
+                            </label>
+                        </div>
+                        <div class="o_cell o_wrap_input flex-grow-1 flex-sm-grow-0 w-100">
+                            <div class="d-flex gap-2">
+                                <!-- amount -->
+                                <div class="o_field_widget o_field_monetary">
+                                    <BankRecMonetaryField
+                                        name="'amount_currency'"
+                                        record="line"
+                                        readonly="amountFieldReadonly"
+                                        hasForcedNegativeValue="hasForcedNegativeValue"
+                                    />
+                                </div>
+                                <!-- in -->
+                                <t t-if="!currencyFieldReadonly">in</t>
+                                <!-- currency -->
+                                <div t-if="!currencyFieldReadonly" class="o_field_widget o_field_many2one w-50">
+                                    <Many2OneField
+                                        t-if="!currencyFieldReadonly"
+                                        name="'currency_id'"
+                                        record="line"
+                                        readonly="currencyFieldReadonly"
+                                        canOpen="false"
+                                        canQuickCreate="false"
+                                        canCreateEdit="false"
+                                    />
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+
+                    <!-- amount_transaction_currency (in transaction currency) -->
+                    <t t-set="currencyFieldReadonly"
+                       t-value="reconciled || ['tax_line', 'new_aml'].includes(line.data.flag)"/>
+                    <div name="amount_transaction_currency"
+                         t-if="data.is_multi_currency and line.data.flag === 'liquidity' and (!reconciled || reconciled and line.data.transaction_currency_id[0])"
+                         class="o_wrap_field d-flex d-sm-contents flex-column">
+                        <div class="o_cell o_wrap_label flex-grow-1 flex-sm-grow-0 w-100 text-break text-900">
+                            <label class="o_form_label" t-att-class="{'o_form_label_readonly': amountFieldReadonly}">
+                                In Foreign Currency
+                            </label>
+                        </div>
+                        <div class="o_cell o_wrap_input flex-grow-1 flex-sm-grow-0 w-100">
+                            <div class="d-flex gap-2">
+                                <!-- amount -->
+                                <div class="o_field_widget o_field_monetary">
+                                    <BankRecMonetaryField
+                                        t-if="line.data.transaction_currency_id"
+                                        name="'amount_transaction_currency'"
+                                        record="line"
+                                        readonly="amountFieldReadonly"
+                                        hasForcedNegativeValue="hasForcedNegativeValue"
+                                    />
+                                </div>
+                                <!-- in -->
+                                <t>in</t>
+                                <!-- currency -->
+                                <div class="o_field_widget o_field_many2one w-50">
+                                    <Many2OneField
+                                        name="'transaction_currency_id'"
+                                        record="line"
+                                        readonly="currencyFieldReadonly"
+                                        canOpen="false"
+                                        canQuickCreate="false"
+                                        canCreateEdit="false"
+                                        domain="[['id', '!=', line.data.currency_id[0]]]"
+                                    />
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+
+                    <!-- balance (in company currency) -->
+                    <t t-set="amountFieldReadonly" t-value="reconciled or (line.data.flag === 'liquidity' and line.data.company_currency_id[0] !== line.data.currency_id[0]) or is_batch"/>
+                    <div name="balance"
+                         t-if="line.data.company_currency_id[0] !== line.data.currency_id[0] and line.data.company_currency_id[0] !== line.data.transaction_currency_id[0]"
+                         class="o_wrap_field d-flex d-sm-contents flex-column">
+                        <div class="o_cell o_wrap_label flex-grow-1 flex-sm-grow-0 w-100 text-break text-900">
+                            <label class="o_form_label" t-att-class="{'o_form_label_readonly': amountFieldReadonly}">
+                                In Company Currency
+                            </label>
+                        </div>
+                        <div class="o_cell o_wrap_input flex-grow-1 flex-sm-grow-0 w-100">
+                            <div class="d-flex">
+                                <!-- amount -->
+                                <div class="o_field_widget o_field_monetary">
+                                    <BankRecMonetaryField
+                                        name="'balance'"
+                                        record="line"
+                                        readonly="amountFieldReadonly"
+                                        hasForcedNegativeValue="hasForcedNegativeValue"
+                                    />
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+
+                    <!-- suggestion -->
+                    <div name="suggestion"
+                         t-if="line.data.suggestion_html != ''"
+                         class="o_wrap_field d-flex d-sm-contents flex-column">
+                        <div class="o_cell o_wrap_label flex-grow-1 flex-sm-grow-0 w-100 text-break text-900"/>
+                        <div class="o_cell o_wrap_input flex-grow-1 flex-sm-grow-0 w-100">
+                            <div t-on-click="handleSuggestionHtmlClicked">
+                                <t t-out="line.data.suggestion_html"/>
+                            </div>
+                        </div>
+                    </div>
+
+                    <!-- account_id -->
+                    <t t-set="readonly"
+                       t-value="reconciled || ['liquidity', 'new_aml', 'exchange_diff', 'new_batch'].includes(line.data.flag)"/>
+                    <div name="account_id"
+                         class="o_wrap_field d-flex d-sm-contents flex-column">
+                        <div class="o_cell o_wrap_label flex-grow-1 flex-sm-grow-0 w-100 text-break text-900">
+                            <label class="o_form_label" t-att-class="{'o_field_invalid': invalidFields.includes('account_id'), 'o_form_label_readonly': readonly}">
+                                Account
+                            </label>
+                        </div>
+                        <div class="o_cell o_wrap_input flex-grow-1 flex-sm-grow-0 w-100">
+                            <div class="o_field_widget o_field_many2one"
+                                 t-att-class="{'o_field_invalid': invalidFields.includes('account_id')}">
+                                <Many2OneField
+                                    name="'account_id'"
+                                    record="line"
+                                    readonly="readonly"
+                                    canOpen="false"
+                                    canQuickCreate="false"
+                                />
+                            </div>
+                        </div>
+                    </div>
+
+                    <!-- partner_id -->
+                    <t t-set="readonly"
+                       t-value="reconciled || ['tax_line', 'new_aml', 'exchange_diff', 'new_batch'].includes(line.data.flag)"/>
+                    <div name="partner_id"
+                         class="o_wrap_field d-flex d-sm-contents flex-column">
+                        <div class="o_cell o_wrap_label flex-grow-1 flex-sm-grow-0 w-100 text-break text-900">
+                            <label class="o_form_label" t-att-class="{'o_form_label_readonly': readonly}">
+                                Partner
+                            </label>
+                        </div>
+                        <div class="o_field_widget o_field_many2one">
+                            <Many2OneField
+                                name="'partner_id'"
+                                record="line"
+                                readonly="readonly"
+                                canQuickCreate="false"
+                                domain="[['company_id', 'in', [false, data.company_id[0]]], '|', ['parent_id', '=', false], ['is_company', '=', true]]"
+                            />
+                        </div>
+                    </div>
+
+                    <!-- partner extra values -->
+                    <div t-if="['auto_balance', 'manual'].includes(line.data.flag)
+                                and line.data.partner_receivable_account_id
+                                and line.data.partner_payable_account_id"
+                         class="o_wrap_field d-flex d-sm-contents flex-column">
+                        <div class="o_cell flex-grow-1 flex-sm-grow-0 o_wrap_label w-100 text-break text-900"/>
+                        <div class="o_cell flex-grow-1 flex-sm-grow-0 w-100">
+                            <div class="d-flex gap-1 align-items-center">
+                                <button class="btn btn-link text-nowrap" t-on-click="actionSetPartnerReceivableAccount">
+                                    Receivable:
+                                    <div class="o_field_widget o_readonly_modifier o_field_monetary text-muted">
+                                        <span t-out="formatMonetaryField(line.data.partner_receivable_amount, line.data.partner_currency_id[0])"/>
+                                    </div>
+                                </button>
+                                <span>-</span>
+                                <button class="btn btn-link text-nowrap" t-on-click="actionSetPartnerPayableAccount">
+                                    Payable:
+                                    <div class="o_field_widget o_readonly_modifier o_field_monetary text-muted">
+                                        <span t-out="formatMonetaryField(line.data.partner_payable_amount, line.data.partner_currency_id[0])"/>
+                                    </div>
+                                </button>
+                            </div>
+                        </div>
+                    </div>
+
+                    <!-- analytic_distribution -->
+                    <div name="analytic_distribution"
+                         t-if="hasGroupAnalyticAccounting"
+                         class="o_wrap_field d-flex d-sm-contents flex-column">
+                        <div class="o_cell o_wrap_label flex-grow-1 flex-sm-grow-0 w-100 text-break text-900">
+                            <label class="o_form_label" t-att-class="{'o_form_label_readonly': reconciled}">
+                                Analytic
+                            </label>
+                        </div>
+                        <div class="o_cell o_wrap_input flex-grow-1 flex-sm-grow-0 w-100">
+                            <div class="o_field_widget o_field_analytic_distribution">
+                                <!-- t-key is needed to force component rerender and avoid synchronization issue on record change -->
+                                <AnalyticDistribution
+                                    name="'analytic_distribution'"
+                                    record="line"
+                                    readonly="reconciled"
+                                    account_field="'account_id'"
+                                    business_domain="'general'"
+                                    allow_save="true"
+                                    t-key="line.data.index"
+                                />
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <div class="o_inner_group grid col-lg-4">
+                    <!-- date -->
+                    <div name="date"
+                         t-if="line.data.flag === 'liquidity'"
+                         class="o_wrap_field d-flex d-sm-contents flex-column">
+                        <div class="o_cell o_wrap_label flex-grow-1 flex-sm-grow-0 w-100 text-break text-900">
+                            <label class="o_form_label" t-att-class="{'o_field_invalid': invalidFields.includes('date'), 'o_form_label_readonly': reconciled}">
+                                Date
+                            </label>
+                        </div>
+                        <div class="o_cell o_wrap_input flex-grow-1 flex-sm-grow-0 w-100">
+                            <div class="o_field_widget o_field_date" t-att-class="{'o_field_invalid': invalidFields.includes('date')}">
+                                <DateTimeField
+                                    name="'date'"
+                                    record="line"
+                                    readonly="reconciled"
+                                />
+                            </div>
+                        </div>
+                    </div>
+                    <!-- reference -->
+                    <div name="reference"
+                         t-if="line.data.flag === 'liquidity' and line.data.ref"
+                         class="o_wrap_field d-flex d-sm-contents flex-column">
+                        <div class="o_cell o_wrap_label flex-grow-1 flex-sm-grow-0 w-100 text-break text-900">
+                            <label class="o_form_label" t-att-class="{'o_form_label_readonly': readonly}">
+                                Reference
+                            </label>
+                        </div>
+                        <div class="o_cell o_wrap_input flex-grow-1 flex-sm-grow-0 w-100">
+                            <div class="o_field_widget o_field_char">
+                                <CharField
+                                    name="'ref'"
+                                    record="line"
+                                    readonly="readonly"
+                                />
+                            </div>
+                        </div>
+                    </div>
+
+                    <!-- bank_account -->
+                    <div name="bank_account"
+                         t-if="line.data.flag === 'liquidity' and line.data.bank_account"
+                         class="o_wrap_field d-flex d-sm-contents flex-column">
+                        <div class="o_cell o_wrap_label flex-grow-1 flex-sm-grow-0 w-100 text-break text-900">
+                            <label class="o_form_label o_form_label_readonly">
+                                Bank Account
+                            </label>
+                        </div>
+                        <div class="o_cell o_wrap_input flex-grow-1 flex-sm-grow-0 w-100">
+                            <div class="o_field_widget o_field_many2one">
+                                <t t-out="line.data.bank_account"/>
+                            </div>
+                        </div>
+                    </div>
+
+                    <!-- tax_ids -->
+                    <div name="tax_ids"
+                         t-if="['manual', 'auto_balance'].includes(line.data.flag)"
+                         class="o_wrap_field d-flex d-sm-contents flex-column">
+                        <div class="o_cell o_wrap_label flex-grow-1 flex-sm-grow-0 w-100 text-break text-900">
+                            <label class="o_form_label" t-att-class="{'o_form_label_readonly': reconciled}">
+                                Taxes
+                            </label>
+                        </div>
+                        <div class="o_cell o_wrap_input flex-grow-1 flex-sm-grow-0 w-100">
+                            <div class="o_field_widget o_field_many2many_tags">
+                                <Many2ManyTagsField
+                                    name="'tax_ids'"
+                                    record="line"
+                                    readonly="reconciled"
+                                    canCreate="false"
+                                    canQuickCreate="false"
+                                    canCreateEdit="false"
+                                    context="{'append_type_to_tax_name': true}"
+                                />
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <div class="o_inner_group grid col-lg-4"/>
+            </div>
+            <div class="o_group row align-items-start">
+                <div class="o_inner_group grid">
+                    <!-- name -->
+                    <div name="name"
+                         class="o_wrap_field d-flex d-sm-contents flex-column">
+                        <div class="o_cell o_wrap_label flex-grow-1 flex-sm-grow-0 w-100 text-break text-900">
+                            <label class="o_form_label" t-att-class="{'o_form_label_readonly': readonly}">
+                                Label
+                            </label>
+                        </div>
+                        <div class="o_cell o_wrap_input flex-grow-1 flex-sm-grow-0 w-100">
+                            <div class="o_field_widget o_field_char">
+                                <CharField
+                                    name="'name'"
+                                    record="line"
+                                    readonly="readonly"
+                                />
+                            </div>
+                        </div>
+                    </div>
+                    <!-- notes/narration -->
+                    <div name="narration"
+                         t-if="line.data.flag === 'liquidity' and (!reconciled || (reconciled and line.data.narration))"
+                         class="o_wrap_field d-flex d-sm-contents flex-column">
+                        <div class="o_cell o_wrap_label flex-grow-1 flex-sm-grow-0 w-100 text-break text-900">
+                            <label class="o_form_label" t-att-class="{'o_form_label_readonly': reconciled}">
+                                Notes
+                            </label>
+                        </div>
+                        <div class="o_cell o_wrap_input flex-grow-1 flex-sm-grow-0 w-100">
+                            <div class="o_field_widget o_field_char">
+                                <HtmlField
+                                    name="'narration'"
+                                    record="line"
+                                    readonly="reconciled"
+                                    wysiwygOptions="{}"
+                                />
+                            </div>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </t>
+
+    <!-- Notebook - discuss -->
+    <t t-name="odex30_account_accountant.BankRecRecordNotebookChatter">
+        <div class="bank_rec_widget_form_discuss_anchor">
+            <Chatter threadModel="'account.move'" threadId="data.move_id[0]"/>
+        </div>
+    </t>
+
+    <!-- Notebook - transaction_details_tab -->
+    <t t-name="odex30_account_accountant.BankRecRecordNotebookTransactionDetails">
+        <div class="bank_rec_widget_form_transaction_details_anchor o_group row align-items-start">
+            <div class="o_wrap_field d-flex d-sm-contents flex-column mb-3 mb-sm-0">
+                <span t-out="data.st_line_transaction_details"/>
+            </div>
+        </div>
+    </t>
+
+    <!-- Main template -->
+    <t t-name="odex30_account_accountant.BankRecRecordForm">
+        <div class="o_xxl_form_view h-100 o_view_controller o_form_view">
+            <t t-set="record" t-value="this.bankRecModel.root"/>
+            <t t-set="data" t-value="state.bankRecRecordData"/>
+            <div class="o_form_view_container" t-ref="formContainer">
+                <div class="o_content">
+                    <div class="o_form_nosheet o_form_editable d-block">
+                        <!-- Header -->
+                        <div class="o_bank_rec_stats_buttons">
+                            <t t-call="odex30_account_accountant.BankRecRecordFormButtonsHeaderLeft"/>
+                            <t t-call="odex30_account_accountant.BankRecRecordFormButtonsHeaderRight"/>
+                        </div>
+
+                        <!-- line_ids -->
+                        <t t-call="odex30_account_accountant.BankRecRecordFormLineIds">
+                            <t t-set="line_ids_columns" t-value="this.getOne2ManyColumns()"/>
+                            <t t-set="display_currency_columns" t-value="!!line_ids_columns.find((c) => c[0] == 'currency')"/>
+                        </t>
+
+                        <!-- Notebook -->
+                        <Notebook t-key="state.bankRecStLineId" defaultPage="state.bankRecNotebookPage || ''" onPageUpdate.bind="onPageUpdate" >
+                            <t t-set-slot="amls_tab"
+                               name="'amls_tab'"
+                               title.translate="Match Existing Entries"
+                               isVisible="['valid', 'invalid'].includes(data.state)">
+                                <t t-call="odex30_account_accountant.BankRecRecordNotebookAmls"/>
+                            </t>
+                            <t t-set-slot="manual_operations_tab"
+                               name="'manual_operations_tab'"
+                               title.translate="Manual Operations"
+                               isVisible="hasGroupReadOnly">
+                                <t t-call="odex30_account_accountant.BankRecRecordNotebookManualOperations"/>
+                            </t>
+                            <t t-set-slot="discuss_tab"
+                               name="'discuss_tab'"
+                               title.translate="Discuss"
+                               isVisible="true">
+                                <t t-call="odex30_account_accountant.BankRecRecordNotebookChatter"/>
+                            </t>
+                            <t t-set-slot="transaction_details_tab"
+                               name="'transaction_details_tab'"
+                               title.translate="Transaction Details"
+                               isVisible="data.st_line_transaction_details and data.st_line_transaction_details != ''">
+                                <t t-call="odex30_account_accountant.BankRecRecordNotebookTransactionDetails"/>
+                            </t>
+                        </Notebook>
+
+                    </div>
+                </div>
+            </div>
+        </div>
+    </t>
+
+    <t t-name="odex30_account_accountant.BankRecEmbeddedListController" t-inherit="web.ListView" t-inherit-mode="primary">
+        <t t-set-slot="control-panel-additional-actions" position="replace"/>
+    </t>
+
+</templates>
diff --git a/dev_odex30_accounting/odex30_account_accountant/static/src/components/bank_reconciliation/bank_rec_quick_create.js b/dev_odex30_accounting/odex30_account_accountant/static/src/components/bank_reconciliation/bank_rec_quick_create.js
new file mode 100644
index 0000000..b1aca6e
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_accountant/static/src/components/bank_reconciliation/bank_rec_quick_create.js
@@ -0,0 +1,26 @@
+import { KanbanRecordQuickCreate, KanbanQuickCreateController } from "@web/views/kanban/kanban_record_quick_create";
+
+export class BankRecQuickCreateController extends KanbanQuickCreateController {
+    static template = "account.BankRecQuickCreateController";
+}
+
+export class BankRecQuickCreate extends KanbanRecordQuickCreate {
+    static template = "account.BankRecQuickCreate";
+    static props = {
+        ...Object.fromEntries(Object.entries(KanbanRecordQuickCreate.props).filter(([k, v]) => k !== 'group')),
+        globalState: { type: Object, optional: true },
+    };
+    static components = { BankRecQuickCreateController };
+
+    /**
+    Overriden.
+    **/
+    async getQuickCreateProps(props) {
+        await super.getQuickCreateProps({...props,
+            group: {
+                resModel: props.globalState.quickCreateState.resModel,
+                context: props.globalState.quickCreateState.context,
+            }
+        });
+    }
+}
diff --git a/dev_odex30_accounting/odex30_account_accountant/static/src/components/bank_reconciliation/bank_rec_quick_create.xml b/dev_odex30_accounting/odex30_account_accountant/static/src/components/bank_reconciliation/bank_rec_quick_create.xml
new file mode 100644
index 0000000..c1359f7
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_accountant/static/src/components/bank_reconciliation/bank_rec_quick_create.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<templates id="template" xml:space="preserve">
+
+    <t t-name="account.BankRecQuickCreate">
+        <BankRecQuickCreateController t-if="state.isLoaded" t-props="quickCreateProps" />
+    </t>
+
+    <t t-name="account.BankRecQuickCreateController">
+        <div
+            class="o_bank_rec_quick_create o_kanban_record o_form_view w-100"
+            t-ref="root"
+        >
+            <t t-component="props.Renderer" record="model.root" Compiler="props.Compiler" archInfo="props.archInfo"/>
+            <div class="d-flex flex-wrap justify-content-end gap-1 button_group border-top-0 mt-2">
+                <button class="btn btn-primary o_kanban_add me-1" t-on-click="() => this.validate('add')" data-hotkey="s">
+                    Add &amp; New
+                </button>
+                <button class="btn btn-secondary o_kanban_edit me-1" t-on-click="() => this.validate('add_close')" data-hotkey="shift+s">
+                    Add &amp; Close
+                </button>
+                <span class="flex-grow-1"></span>
+                <button class="btn btn-secondary o_kanban_cancel" t-on-click="() => this.cancel(true)" data-hotkey="d">
+                    <i class="fa fa-trash" />
+                </button>
+            </div>
+        </div>
+    </t>
+
+</templates>
diff --git a/dev_odex30_accounting/odex30_account_accountant/static/src/components/bank_reconciliation/bank_rec_record.js b/dev_odex30_accounting/odex30_account_accountant/static/src/components/bank_reconciliation/bank_rec_record.js
new file mode 100644
index 0000000..89aef87
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_accountant/static/src/components/bank_reconciliation/bank_rec_record.js
@@ -0,0 +1,86 @@
+/** @odoo-module **/
+
+import { Record } from "@web/model/relational_model/record";
+import { RelationalModel } from "@web/model/relational_model/relational_model";
+import { parseServerValue } from "@web/model/relational_model/utils";
+
+export class BankRecRecord extends Record {
+
+    /**
+     * override
+     * Track the changed field on lines.
+     */
+    async _update(changes) {
+        if(this.resModel === "bank.rec.widget.line"){
+            for(const fieldName of Object.keys(changes)){
+                this.model.lineIdsChangedField = fieldName;
+            }
+        }
+        return super._update(...arguments);
+    }
+
+    async updateToDoCommand(methodName, args, kwargs) {
+        this.dirty = true;
+
+        const onChangeFields = ["todo_command"];
+        const changes = {
+            todo_command: {
+                method_name: methodName,
+                args: args,
+                kwargs: kwargs,
+            },
+        };
+
+        const localChanges = this._getChanges(
+            { ...this._changes, ...changes },
+            { withReadonly: true }
+        );
+        const otherChanges = await this.model._onchange(this.config, {
+            changes: localChanges,
+            fieldNames: onChangeFields,
+            evalContext: this.evalContext,
+        });
+
+        const data = { ...this.data, ...changes };
+        for (const fieldName in otherChanges) {
+            data[fieldName] = parseServerValue(this.fields[fieldName], otherChanges[fieldName]);
+        }
+        const applyChanges = () => {
+            Object.assign(changes, this._parseServerValues(otherChanges, this.data));
+            if (Object.keys(changes).length > 0) {
+                this._applyChanges(changes);
+            }
+        };
+        return { data, applyChanges };
+    }
+
+    /**
+     * Bind an action to be called when a field on lines changed.
+     * @param {Function} callback: The action to call taking the changed field as parameter.
+     */
+    bindActionOnLineChanged(callback){
+        this._onUpdate = async () => {
+            const lineIdsChangedField = this.model.lineIdsChangedField;
+            if(lineIdsChangedField){
+                this.model.lineIdsChangedField = null;
+                await callback(lineIdsChangedField);
+            }
+        }
+    }
+}
+
+export class BankRecRelationalModel extends RelationalModel{
+    setup(params, { action, dialog, notification, rpc, user, view, company }) {
+        super.setup(...arguments);
+        this.lineIdsChangedField = null;
+    }
+
+    load({ values }) {
+        this.root = this._createRoot(this.config, values);
+    }
+
+    getInitialValues() {
+        return this.root._getChanges(this.root.data, { withReadonly: true })
+    }
+}
+BankRecRelationalModel.Record = BankRecRecord;
diff --git a/dev_odex30_accounting/odex30_account_accountant/static/src/components/bank_reconciliation/embedded_list_view.js b/dev_odex30_accounting/odex30_account_accountant/static/src/components/bank_reconciliation/embedded_list_view.js
new file mode 100644
index 0000000..bc7ebe2
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_accountant/static/src/components/bank_reconciliation/embedded_list_view.js
@@ -0,0 +1,36 @@
+/** @odoo-module **/
+
+import { ListController } from "@web/views/list/list_controller";
+import { listView } from "@web/views/list/list_view";
+
+export class BankRecEmbeddedListController extends ListController {
+    /** Remove the Export Cog **/
+    static template = "odex30_account_accountant.BankRecEmbeddedListController";
+}
+
+
+export class BankRecWidgetFormEmbeddedListModel extends listView.Model {
+    setup(params, { action, dialog, notification, rpc, user, view, company }) {
+        super.setup(...arguments);
+        this.storedDomainString = null;
+    }
+
+    /**
+    * @override
+    * the list of AMLs don't need to be fetched from the server every time the form view is re-rendered.
+    * this disables the retrieval, while still ensuring that the search bar works.
+    */
+    async load(params = {}) {
+        const currentDomain = params.domain.toString();
+        if (currentDomain !== this.storedDomainString) {
+            this.storedDomainString = currentDomain;
+            return super.load(params);
+        }
+    }
+}
+
+export const EmbeddedListView = {
+    ...listView,
+    Controller: BankRecEmbeddedListController,
+    Model: BankRecWidgetFormEmbeddedListModel,
+};
diff --git a/dev_odex30_accounting/odex30_account_accountant/static/src/components/bank_reconciliation/finish_buttons.js b/dev_odex30_accounting/odex30_account_accountant/static/src/components/bank_reconciliation/finish_buttons.js
new file mode 100644
index 0000000..56adc44
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_accountant/static/src/components/bank_reconciliation/finish_buttons.js
@@ -0,0 +1,49 @@
+/** @odoo-module **/
+import { Component, useState } from "@odoo/owl";
+
+export class BankRecFinishButtons extends Component {
+    static template = "odex30_account_accountant.BankRecFinishButtons";
+    static props = {};
+
+    setup() {
+        this.breadcrumbs = useState(this.env.config.breadcrumbs);
+    }
+
+    getJournalFilter() {
+        // retrieves the searchModel's searchItem for the journal
+        return Object.values(this.searchModel.searchItems).filter(i => i.type == "field" && i.fieldName == "journal_id")[0];
+    }
+
+    get searchModel() {
+        return this.env.searchModel;
+    }
+
+    get otherFiltersActive() {
+        const facets = this.searchModel.facets;
+        const journalFilterItem = this.getJournalFilter();
+        for (const facet of facets) {
+            if (facet.groupId !== journalFilterItem.groupId) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    clearFilters() {
+        const facets = this.searchModel.facets;
+        const journalFilterItem = this.getJournalFilter();
+        for (const facet of facets) {
+            if (facet.groupId !== journalFilterItem.groupId) {
+                this.searchModel.deactivateGroup(facet.groupId);
+            }
+        }
+    }
+
+    breadcrumbBackOrDashboard() {
+        if (this.breadcrumbs.length > 1) {
+            this.env.services.action.restore();
+        } else {
+            this.env.services.action.doAction("account.open_account_journal_dashboard_kanban", {clearBreadcrumbs: true});
+        }
+    }
+}
diff --git a/dev_odex30_accounting/odex30_account_accountant/static/src/components/bank_reconciliation/finish_buttons.xml b/dev_odex30_accounting/odex30_account_accountant/static/src/components/bank_reconciliation/finish_buttons.xml
new file mode 100644
index 0000000..d13871c
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_accountant/static/src/components/bank_reconciliation/finish_buttons.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<templates id="template" xml:space="preserve">
+    <t t-name="odex30_account_accountant.BankRecFinishButtons">
+        <p t-if="otherFiltersActive" class="btn btn-primary" t-on-click="clearFilters">All Transactions</p>
+        <p>
+            <t t-set="linkName" t-value="breadcrumbs.length > 1 ? breadcrumbs.slice(-2)[0].name : 'Dashboard'"/>
+            <a href="#" t-on-click.stop.prevent="breadcrumbBackOrDashboard">Back to <t t-out="linkName"/></a>
+        </p>
+    </t>
+</templates>
diff --git a/dev_odex30_accounting/odex30_account_accountant/static/src/components/bank_reconciliation/global_info.js b/dev_odex30_accounting/odex30_account_accountant/static/src/components/bank_reconciliation/global_info.js
new file mode 100644
index 0000000..e14bd7e
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_accountant/static/src/components/bank_reconciliation/global_info.js
@@ -0,0 +1,24 @@
+/** @odoo-module **/
+import { Component, onWillStart } from "@odoo/owl";
+import { user } from "@web/core/user";
+
+export class BankRecGlobalInfo extends Component {
+    static template = "odex30_account_accountant.BankRecGlobalInfo";
+    static props = {
+        journalId: { type: Number },
+        journalBalanceAmount: { type: String },
+    };
+
+    setup() {
+        this.hasGroupReadOnly = false;
+        onWillStart(async () => {
+            this.hasGroupReadOnly = await user.hasGroup("account.group_account_readonly");
+        })
+    }
+
+    /** Open the bank reconciliation report. **/
+    actionOpenBankGL() {
+        this.env.methods.actionOpenBankGL(this.props.journalId);
+    }
+
+}
diff --git a/dev_odex30_accounting/odex30_account_accountant/static/src/components/bank_reconciliation/global_info.xml b/dev_odex30_accounting/odex30_account_accountant/static/src/components/bank_reconciliation/global_info.xml
new file mode 100644
index 0000000..3a836f8
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_accountant/static/src/components/bank_reconciliation/global_info.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<templates xml:space="preserve">
+
+    <t t-name="odex30_account_accountant.BankRecGlobalInfo">
+        <div t-if="props.journalId"
+             class="journal-balance d-flex w-100"
+             t-att-class="{'pe-none': !hasGroupReadOnly}"
+             t-on-click="(ev) => hasGroupReadOnly ? this.actionOpenBankGL() : {}">
+            <span class="btn flex-fill text-900 text-start ps-0 fw-bold fs-4 align-self-center">
+                Balance
+            </span>
+            <span class="btn btn-link pe-0 fw-bold fs-4 align-self-center"
+                  t-if="props.journalBalanceAmount or props.journalBalanceAmount === 0"
+                  t-esc="props.journalBalanceAmount"/>
+        </div>
+    </t>
+
+</templates>
diff --git a/dev_odex30_accounting/odex30_account_accountant/static/src/components/bank_reconciliation/kanban.js b/dev_odex30_accounting/odex30_account_accountant/static/src/components/bank_reconciliation/kanban.js
new file mode 100644
index 0000000..fd0597e
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_accountant/static/src/components/bank_reconciliation/kanban.js
@@ -0,0 +1,1243 @@
+/** @odoo-module **/
+
+import { _t } from "@web/core/l10n/translation";
+import { registry } from "@web/core/registry";
+import { useService } from "@web/core/utils/hooks";
+import { scrollTo } from "@web/core/utils/scrolling";
+import { getCurrency } from "@web/core/currency";
+import { formatMonetary } from "@web/views/fields/formatters";
+import { formatDate } from "@web/core/l10n/dates";
+import { localization } from "@web/core/l10n/localization";
+
+import { CallbackRecorder, useSetupAction } from "@web/search/action_hook";
+import { RelationalModel } from "@web/model/relational_model/relational_model";
+import { makeActiveField } from "@web/model/relational_model/utils";
+import { kanbanView } from "@web/views/kanban/kanban_view";
+import { KanbanController } from "@web/views/kanban/kanban_controller";
+import { KanbanRenderer } from "@web/views/kanban/kanban_renderer";
+import { KanbanRecord } from "@web/views/kanban/kanban_record";
+
+import { Dropdown } from "@web/core/dropdown/dropdown";
+import { DropdownItem } from "@web/core/dropdown/dropdown_item";
+import { Chatter } from "@mail/chatter/web_portal/chatter";
+import { Many2ManyTagsField } from "@web/views/fields/many2many_tags/many2many_tags_field";
+import { Many2OneField } from "@web/views/fields/many2one/many2one_field";
+import { DateTimeField } from "@web/views/fields/datetime/datetime_field";
+import { CharField } from "@web/views/fields/char/char_field";
+import { AnalyticDistribution } from "@analytic/components/analytic_distribution/analytic_distribution";
+import { TagsList } from "@web/core/tags_list/tags_list";
+import { HtmlField } from "@web_editor/js/backend/html_field";
+import { RainbowMan } from "@web/core/effects/rainbow_man";
+import { Notebook } from "@web/core/notebook/notebook";
+import { user } from "@web/core/user";
+
+import { BankRecRelationalModel } from "./bank_rec_record";
+import { BankRecMonetaryField } from "./monetary_field_auto_signed_amount";
+import { BankRecViewEmbedder } from "./view_embedder";
+import { BankRecRainbowContent } from "./rainbowman_content";
+import { BankRecFinishButtons } from "./finish_buttons";
+import { BankRecGlobalInfo } from "./global_info";
+import { BankRecQuickCreate } from "./bank_rec_quick_create";
+
+import { onPatched, useState, useEffect, useRef, useChildSubEnv, markRaw } from "@odoo/owl";
+
+export class BankRecKanbanRecord extends KanbanRecord {
+    static template = "account.BankRecKanbanRecord";
+
+    setup(){
+        super.setup();
+        this.state = useState(this.env.methods.getState());
+    }
+
+    /** @override **/
+    getRecordClasses() {
+        let classes = `${super.getRecordClasses()} w-100 o_bank_rec_st_line`;
+        if (this.props.record.resId === this.state.bankRecStLineId) {
+            classes = `${classes} o_bank_rec_selected_st_line table-info`;
+        }
+        return classes;
+    }
+}
+
+
+export class BankRecKanbanController extends KanbanController {
+    static template = "account.BankRecoKanbanController";
+    static props = {
+        ...KanbanController.props,
+        skipRestore: { optional: true },
+    };
+    static components = {
+        ...KanbanController.components,
+        Dropdown,
+        DropdownItem,
+        Many2OneField,
+        Many2ManyTagsField,
+        DateTimeField,
+        CharField,
+        AnalyticDistribution,
+        Chatter,
+        TagsList,
+        HtmlField,
+        BankRecMonetaryField,
+        Notebook,
+        BankRecViewEmbedder,
+    };
+
+    async setup() {
+        super.setup();
+
+        // ==================== INITIAL SETUP ====================
+
+        // Actions.
+        this.action = useService("action");
+        this.orm = useService("orm");
+        this.ui = useService("ui");
+
+        // RelationalModel services.
+        this.relationalModelServices = Object.fromEntries(
+            RelationalModel.services.map((servName) => {
+                return [servName, useService(servName)];
+            })
+        );
+        this.relationalModelServices.orm = useService("orm");
+
+        useChildSubEnv(this.getChildSubEnv());
+
+        // Mount the correct statement line when the search panel changed
+        this.env.searchModel.addEventListener(
+            "update",
+            () => {
+                this.model.bus.addEventListener(
+                    "update",
+                    this.onKanbanSearchModelChanged.bind(this),
+                    { once: true },
+                );
+            },
+        );
+
+        // ==================== STATE ====================
+
+        this.bankRecModel = null;
+
+        this.state = useState({
+            // BankRec.
+            bankRecStLineId: null,
+            bankRecRecordData: null,
+            bankRecEmbeddedViewsData: null,
+            bankRecNotebookPage: null,
+            bankRecClickedColumn: null,
+
+            // Global info.
+            journalId: null,
+            journalBalanceAmount: "",
+
+            // Asynchronous validation stuff.
+            lockedStLineIds: new Set(),
+            lockedAmlIds: new Set(),
+
+            quickCreateState : {
+                isVisible: false,
+                view: this.props.archInfo.quickCreateView,
+                context: this.props.context,
+            },
+        });
+
+        this.counter = {
+            // Counter state is separated as it should not be impacted by asynchronous changes, the last update is final.
+            startTime: null,
+            timeDiff: null,
+            count: null,
+        };
+
+        // When focusing the manual operations tab, mount the last line in edition automatically.
+        useEffect(
+            () => {
+                if(
+                    this.state.bankRecNotebookPage === "manual_operations_tab"
+                    && this.state.bankRecRecordData
+                    && !this.state.bankRecRecordData.form_index
+                ){
+                    this.actionMountLastLineInEdit();
+                }
+            },
+            () => [this.state.bankRecNotebookPage],
+        );
+
+        // ==================== EXPORT STATE ====================
+
+        this.viewRef = useRef("root");
+
+        useSetupAction({
+            rootRef: this.viewRef,
+            getLocalState: () => {
+                const exportState = {};
+                if(this.bankRecModel.root.data.st_line_id){
+                    exportState.backupValues = Object.assign(
+                        {},
+                        this.state.bankRecEmbeddedViewsData,
+                        {
+                            bankRecStLineId: this.state.bankRecStLineId,
+                            initial_values: this.bankRecModel.getInitialValues(),
+                        },
+                    );
+                }
+                return exportState;
+            }
+        });
+
+        onPatched(() => {
+            if(
+                this.state.bankRecClickedColumn
+                && this.focusManualOperationField(this.state.bankRecClickedColumn)
+            ){
+                this.state.bankRecClickedColumn = null;
+            }
+        });
+
+        // ==================== LOCK SCREEN ====================
+
+        this.kanbanLock = false;
+        this.bankRecLock = false;
+        this.bankRecPromise = null;
+    }
+
+    // -----------------------------------------------------------------------------
+    // HELPERS CONCURRENCY
+    // -----------------------------------------------------------------------------
+
+    /**
+     * Execute the function passed as parameter initiated by the kanban.
+     * If some action is already processing by bankRecForm, it will wait until its completion.
+     * @param {Function} func: The action to execute.
+     */
+    async execProtectedAction(func){
+        if(this.kanbanLock){
+            return;
+        }
+        this.kanbanLock = true;
+        if(this.bankRecPromise){
+            await this.bankRecPromise;
+        }
+        await func();
+        this.kanbanLock = false;
+    }
+
+    /**
+     * Execute the function passed as parameter initiated by bankRecForm.
+     * If some concurrent actions are triggered by bankRecForm, the second one is ignored.
+     * @param {Function} func: The action to execute.
+     */
+    async execProtectedBankRecAction(func){
+        if(this.bankRecLock){
+            return;
+        }
+        this.bankRecLock = true;
+        try {
+            this.bankRecPromise = func();
+            await this.bankRecPromise;
+        } finally {
+            this.bankRecPromise = null;
+            this.bankRecLock = false;
+        }
+    }
+
+    // -----------------------------------------------------------------------------
+    // HELPERS STATE
+    // -----------------------------------------------------------------------------
+
+    getState(){
+        return this.state;
+    }
+
+    /**
+     * Since the kanban is driven by a reactive state for the additional stuff but by deep render
+     * in its base implementation, the code is turning crazy with rendering everytime a deep render
+     * is triggered. Indeed, notifying the model then changing things on the state could trigger a lot of
+     * mount/unmount of components implying useless rpc requests (when mounting multiple times an
+     * embedded list view for example).
+     * To avoid that, this method must be used everywhere to update only once the state and to delay
+     * the notify (itself triggering the deep render) after the update of the state.
+     * @param {Function} func: The action to execute taking the newState as parameter.
+     */
+    async withNewState(func){
+        const newState = {...this.state};
+        await func(newState);
+        if (newState.__commitChanges) {
+            newState.__commitChanges();
+            delete newState.__commitChanges;
+        }
+        Object.assign(this.state, newState);
+    }
+
+    // -----------------------------------------------------------------------------
+    // KANBAN OVERRIDES
+    // -----------------------------------------------------------------------------
+
+    /** override **/
+    get modelOptions() {
+        return {
+            ...super.modelOptions,
+            onWillStartAfterLoad: this.onWillStartAfterLoad.bind(this),
+        }
+    }
+
+    /**
+     * Define the sub environment allowing the sub-components to access some methods from
+     * the kanban.
+     */
+    getChildSubEnv(){
+        return {
+            // We don't care about subview states but we want to avoid them to record
+            // some callbacks in the BankRecKanbanController callback recorders passed
+            // by the action service.
+            __beforeLeave__: new CallbackRecorder(),
+            __getLocalState__: new CallbackRecorder(),
+            __getGlobalState__: new CallbackRecorder(),
+            __getContext__: new CallbackRecorder(),
+
+            // Accessible methods from sub-components.
+            methods: {
+                withNewState: this.withNewState.bind(this),
+                actionOpenBankGL: this.actionOpenBankGL.bind(this),
+                focusManualOperationField: this.focusManualOperationField.bind(this),
+                getState: this.getState.bind(this),
+                actionAddNewAml: this.actionAddNewAml.bind(this),
+                actionRemoveNewAml: this.actionRemoveNewAml.bind(this),
+                showRainbowMan: this.showRainbowMan.bind(this),
+                initReconCounter: this.initReconCounter.bind(this),
+                getCounterSummary: this.getCounterSummary.bind(this),
+                getRainbowManContentProps: this.getRainbowManContentProps.bind(this),
+                updateJournalState: this.updateJournalState.bind(this),
+            },
+        };
+    }
+
+    /** Called when the kanban is initialized. **/
+    async onWillStartAfterLoad(){
+        // Fetch groups.
+        this.hasGroupAnalyticAccounting = await user.hasGroup("analytic.group_analytic_accounting");
+        this.hasGroupReadOnly = await user.hasGroup("account.group_account_readonly");
+
+
+        // Prepare bankRecoModel.
+        await this.initBankRecModel();
+
+        let stLineId = null;
+        let backupValues = null;
+
+        // Try to restore.
+        if(this.props.state && this.props.state.backupValues && !this.props.skipRestore){
+            const backupStLineId = this.props.state.backupValues.bankRecStLineId;
+            if(this.model.root.records.find(x => x.resId === backupStLineId)){
+                stLineId = backupStLineId;
+                backupValues = this.props.state.backupValues;
+            }
+        }
+
+        // Find the next transaction to mount.
+        if(!stLineId){
+            stLineId = this.getNextAvailableStLineId();
+        }
+
+        await this.withNewState(async (newState) => {
+
+            // Mount the transaction if any.
+            if(stLineId){
+                await this._mountStLineInEdit(newState, stLineId, backupValues);
+            }else{
+                await this.updateJournalState(newState);
+            }
+
+            this.initReconCounter();
+        });
+    }
+
+    /** Called when the something changed in the kanban search model. **/
+    async onKanbanSearchModelChanged(){
+        await this.execProtectedAction(async () => {
+            await this.withNewState(async (newState) => {
+                if(this.model.root.records.find(x => x.resId === newState.bankRecStLineId)){
+                    return;
+                }
+
+                const nextStLineId = this.getNextAvailableStLineId();
+                await this._mountStLineInEdit(newState, nextStLineId);
+            });
+        });
+    }
+
+    /**
+    Method called when the user clicks on a card.
+    **/
+    async openRecord(record, mode) {
+        const currentStLineId = this.bankRecModel ? this.bankRecModel.root.data.st_line_id[0] : null;
+        const isSameStLineId = currentStLineId && currentStLineId === record.resId;
+        if (isSameStLineId) {
+            return;
+        }
+        await this.execProtectedAction(async () => {
+            await this.withNewState(async (newState) => {
+                await this._mountStLineInEdit(newState, record.resId);
+            });
+        });
+    }
+
+    /**
+    Method called when the user changes the search pager.
+    **/
+    async onUpdatedPager() {
+        await this.execProtectedAction(async () => {
+            await this.withNewState(async (newState) => {
+                const nextStLineId = this.getNextAvailableStLineId();
+                await this._mountStLineInEdit(newState, nextStLineId);
+            });
+        });
+    }
+
+    onPageUpdate(page) {
+        if (this.state.bankRecNotebookPage !== page) {
+            this.state.bankRecNotebookPage = page;
+        }
+    }
+
+    /**
+    Overriden.
+    **/
+    get canQuickCreate() {
+        return true;
+    }
+
+    /**
+    Overriden.
+    **/
+    createRecord() {
+        const { onCreate } = this.props.archInfo;
+        const searchModel = this.env.searchModel;
+        const journalFilter = Object.values(searchModel.searchItems).filter(i => i.type == "field" && i.fieldName == "journal_id")[0];
+
+        // If there are no records, deactivate all filters except the journal one.
+        if (!this.model.root.records.length) {
+            searchModel.facets.forEach(facet => {
+                if(facet.groupId !== journalFilter.groupId)
+                    searchModel.deactivateGroup(facet.groupId)
+            });
+        }
+
+        if (onCreate === "quick_create" && this.canQuickCreate) {
+            this.state.quickCreateState = {
+                ...this.state.quickCreateState,
+                isVisible: true,
+                resModel: this.props.resModel,
+                model: this.model,
+            };
+        }
+    }
+
+    // -----------------------------------------------------------------------------
+    // NEXT STATEMENT LINE
+    // -----------------------------------------------------------------------------
+
+    /**
+    Get the next eligible statement line for reconciliation.
+    @param afterStLineId:   An optional id of a statement line indicating we want the
+                            next available line after this one.
+    @param records:         An optional list of records.
+    **/
+    getNextAvailableStLineId(afterStLineId=null, records=null) {
+        const stLines = this.model.root.records;
+
+        // Find all available records that need to be validated.
+        const isRecordReady = (x) => (!x.data.is_reconciled || !x.data.checked);
+        let waitBeforeReturn = Boolean(afterStLineId);
+        let availableRecordIds = [];
+        for (const stLine of (records || stLines)) {
+            if (waitBeforeReturn) {
+                if (stLine.resId === afterStLineId) {
+                    waitBeforeReturn = false;
+                }
+            } else if (isRecordReady(stLine)) {
+                availableRecordIds.push(stLine.resId);
+            }
+        }
+
+        // No records left, focus the first record instead. This behavior is mainly there when clicking on "View" from
+        // the list view to show an already reconciled line.
+        if (!availableRecordIds.length && stLines.length === 1) {
+            availableRecordIds = [stLines[0].resId];
+        }
+
+        if (availableRecordIds.length){
+            return availableRecordIds[0];
+        } else if(stLines.length) {
+            return stLines[0].resId;
+        } else {
+            return null;
+        }
+    }
+
+    /**
+    Mount the statement line passed as parameter into the edition widget.
+    @param stLineId: The id of the statement line to mount.
+    **/
+    async _mountStLineInEdit(newState, stLineId, initialData = null) {
+        newState.bankRecStLineId = stLineId;
+        let data = {};
+        if (initialData) {
+            // Restore an existing transaction.
+            data = await this.onchange(newState, "restore_st_line_data", [initialData]);
+            const bankRecEmbeddedViewsData = data.return_todo_command;
+            for (const [key, value] of Object.entries(bankRecEmbeddedViewsData)) {
+                if (value instanceof Object) {
+                    bankRecEmbeddedViewsData[key] = Object.assign(
+                        {},
+                        initialData[key] || {},
+                        value
+                    );
+                } else {
+                    bankRecEmbeddedViewsData[key] = value;
+                }
+            }
+            newState.bankRecEmbeddedViewsData = markRaw(bankRecEmbeddedViewsData);
+            newState.bankRecNotebookPage = null;
+        } else if (stLineId) {
+            // Mount a new transaction.
+            data = await this.onchange(newState, "mount_st_line", [stLineId]);
+            const bankRecEmbeddedViewsData = data.return_todo_command
+            newState.bankRecEmbeddedViewsData = bankRecEmbeddedViewsData;
+            newState.bankRecNotebookPage = null;
+        } else {
+            // No transaction mounted.
+            newState.bankRecNotebookPage = null;
+            newState.bankRecRecordData = null;
+        }
+
+        // Refresh balance.
+        await this.updateJournalState(newState, data);
+
+        // Scroll to the next kanban card iff the view is mounted, a line is selected  and the kanban
+        // card is in the view (cannot use .o_bank_rec_selected_st_line as the dom may not be patched yet)
+        if (stLineId && this.viewRef.el) {
+            const selectedKanbanCardEl = this.viewRef.el.querySelector(
+                `[st-line-id="${stLineId}"]`
+            );
+            if (selectedKanbanCardEl) {
+                scrollTo(selectedKanbanCardEl, {});
+            }
+        }
+    }
+
+    /**
+    Mount the statement line passed as parameter into the edition widget.
+    @param stLineId: The id of the statement line to mount.
+    **/
+    async mountStLineInEdit(stLineId, initialData=null){
+        await this.withNewState(async (newState) => {
+            await this._mountStLineInEdit(newState, stLineId, initialData);
+        });
+    }
+
+    // -----------------------------------------------------------------------------
+    // BANK_REC_RECORD
+    // -----------------------------------------------------------------------------
+
+    async initBankRecModel(){
+        const initialData = await this.orm.call(
+            "bank.rec.widget",
+            "fetch_initial_data",
+        );
+
+        // Services.
+        function makeActiveFields(fields) {
+            const activeFields = {};
+            for (const fieldName in fields) {
+                const field = fields[fieldName];
+                activeFields[fieldName] = makeActiveField({ onChange: field.onChange});
+                if (field.relatedFields) {
+                    activeFields[fieldName].related = {
+                        fields: field.relatedFields,
+                        activeFields: makeActiveFields(field.relatedFields),
+                    }
+                }
+            }
+            return activeFields;
+        }
+        const activeFields = makeActiveFields(initialData.fields);
+        this.bankRecModel = new BankRecRelationalModel(
+            this.env,
+            {
+                config: {
+                    resModel: "bank.rec.widget",
+                    fields: initialData.fields,
+                    activeFields,
+                    mode: "edit",
+                    isMonoRecord: true,
+                }
+            },
+            this.relationalModelServices,
+        );
+
+        // Initial loading.
+        await this.bankRecModel.load({
+            values: initialData.initial_values,
+        });
+
+        const record = this.bankRecModel.root;
+        record.bindActionOnLineChanged(async (changedField) => {
+            await this.actionLineChanged(changedField);
+        });
+    }
+
+    getBankRecRecordLineInEdit(){
+        const data = this.state.bankRecRecordData;
+        const lineIndex = data.form_index;
+        return data.line_ids.records.find((x) => x.data.index === lineIndex);
+    }
+
+    // -----------------------------------------------------------------------------
+    // GLOBAL INFO
+    // -----------------------------------------------------------------------------
+
+    async updateJournalState(newState, data = {}) {
+        // Find the journal.
+        let journalId = null;
+        const stLineJournalId = data.st_line_journal_id;
+        if(stLineJournalId){
+            journalId = stLineJournalId[0];
+        }else if(this.model.root.records.length){
+            journalId = this.model.root.records[0].data.journal_id[0];
+        }else{
+            journalId = this.props.context.default_journal_id;
+        }
+        newState.journalId = journalId;
+        const values = await this.orm.call(
+            "bank.rec.widget",
+            "collect_global_info_data",
+            [journalId],
+        );
+        newState.journalBalanceAmount = values.balance_amount;
+    }
+
+    // -----------------------------------------------------------------------------
+    // COUNTER / RAINBOWMAN
+    // -----------------------------------------------------------------------------
+
+    /** Reset the timing and reconciliation counter */
+    initReconCounter() {
+        this.counter.startTime = luxon.DateTime.now();
+        this.counter.timeDiff = null;
+        this.counter.count = 0;
+    }
+
+    /** Increment the timing and reconciliation counter */
+    incrementReconCounter() {
+        const start = this.counter.startTime.set({millisecond: 0});
+        const end = luxon.DateTime.now().set({millisecond: 0});
+        this.counter.timeDiff = end.diff(start, "seconds");
+        this.counter.count += 1;
+    }
+
+    showRainbowMan(){
+        return this.counter.count > 0;
+    }
+
+    getCounterSummary() {
+        const diff = this.counter.timeDiff;
+        const total = this.counter.count;
+        const diffInSeconds = diff.seconds;
+        let units = ["seconds"];
+        if (diffInSeconds > 60) {
+            units.unshift("minutes");
+        }
+        if (diffInSeconds > 3600) {
+            units.unshift("hours");
+        }
+        return {
+            counter: total,
+            secondsPerTransaction: Math.round(diffInSeconds / total),
+            formattedDuration: diff.toFormat(localization.timeFormat.replace(/HH/, "hh")),
+            humanDuration: diff.shiftTo(...units).toHuman(),
+        }
+    }
+
+    getRainbowManContentProps(){
+        return {
+            fadeout: "no",
+            message: "",
+            imgUrl: "/web/static/img/smile.svg",
+            Component: BankRecRainbowContent,
+            close: () => {},
+        }
+    }
+
+    // -----------------------------------------------------------------------------
+    // HELPERS BANK_REC_RECORD
+    // -----------------------------------------------------------------------------
+
+    async moveToNextLine(newState){
+        const records = this.model.root.records;
+        const counter = newState.counter;
+        await this.model.root.load();
+
+        const nextStLineId = this.getNextAvailableStLineId(newState.bankRecStLineId, records);
+        if(nextStLineId != newState.bankRecStLineId){
+            await this._mountStLineInEdit(newState, nextStLineId);
+        }
+        newState.counter = counter;
+        newState.__kanbanNotify = true;
+    }
+
+    formatMonetaryField(amount, currencyId){
+        const currencyDigits = getCurrency(currencyId)?.digits;
+        return formatMonetary(amount, {
+            digits: currencyDigits,
+            currencyId: currencyId,
+        });
+    }
+
+    isMonetaryZero(amount, currencyId){
+        const currencyDigits = getCurrency(currencyId)?.digits;
+        return Number(amount.toFixed(currencyDigits ? currencyDigits[1] : 2)) === 0;
+    }
+
+    formatDateField(date){
+        return formatDate(date);
+    }
+
+    async onchange(newState, methodName, args, kwargs){
+        const record = this.bankRecModel.root;
+        const { data, applyChanges } = await record.updateToDoCommand(methodName, args, kwargs);
+
+        newState.__commitChanges = () => {
+            applyChanges();
+            newState.bankRecRecordData = record.data;
+            newState.__bankRecRecordNotify = true;
+        };
+        return data;
+    }
+
+    getOne2ManyColumns() {
+        const data = this.state.bankRecRecordData;
+        let lineIdsRecords = data.line_ids.records;
+
+        // Prepare columns.
+        let columns = [
+            ["date", _t("Date")],
+            ["partner", _t("Partner")],
+        ];
+        if(lineIdsRecords.some((x) => Boolean(Object.keys(x.data.analytic_distribution).length))){
+            columns.push(["analytic_distribution", _t("Analytic")]);
+        }
+        if(lineIdsRecords.some((x) => x.data.tax_ids.records.length)){
+            columns.push(["taxes", _t("Taxes")]);
+        }
+        if(lineIdsRecords.some((x) => x.data.currency_id[0] !== data.company_currency_id[0])){
+            columns.push(["amount_currency", _t("Amount in Currency")], ["currency", _t("Currency")]);
+        }
+        if (this.hasGroupReadOnly) {
+            columns.unshift(["account", _t("Account")]);
+            columns.push(
+                ["debit", _t("Debit")],
+                ["credit", _t("Credit")],
+                ["__trash", ""],
+            );
+        } else {
+            columns.push(
+                ["balance", _t("Amount")],
+                ["__trash", ""],
+            );
+        }
+
+        return columns;
+    }
+
+    getKey(lineData) {
+        return `${lineData.index} ${JSON.stringify(lineData.analytic_distribution)}`;
+    }
+
+    checkBankRecLineRequiredField(line, invalidFields, fieldName, condition){
+        if(!line.data[fieldName] && (!condition || condition())){
+            invalidFields.push(fieldName);
+        }
+    }
+
+    getBankRecLineInvalidFields(line){
+        const invalidFields = [];
+        this.checkBankRecLineRequiredField(line, invalidFields, "account_id");
+        this.checkBankRecLineRequiredField(line, invalidFields, "date", () => line.data.flag === "liquidity");
+        return invalidFields;
+    }
+
+    checkBankRecLinesInvalidFields(data){
+        return data.line_ids.records.filter((l) => this.getBankRecLineInvalidFields(l).length > 0).length === 0;
+    }
+
+    notebookAmlsListViewProps(){
+        const initParams = this.state.bankRecEmbeddedViewsData.amls;
+        const ctx = initParams.context;
+        const suspenseLine = this.state.bankRecRecordData.line_ids.records.filter((l) => l.data.flag == "auto_balance");
+        if (suspenseLine.length) {
+            // Change the sort order of the AML's in the list view based on the amount of the suspense line
+            // This is done from JS instead of python because the embedded_views_data is only prepared when selecting
+            // a statement line, and not after mounting an AML that would change the auto_balance value (suspense line)
+            ctx['preferred_aml_value'] = suspenseLine[0].data.amount_currency * -1;
+            ctx['preferred_aml_currency_id'] = suspenseLine[0].data.currency_id[0];
+        }
+        return {
+            type: "list",
+            noBreadcrumbs: true,
+            resModel: "account.move.line",
+            searchMenuTypes: ["filter", "favorite"],
+            domain: initParams.domain,
+            dynamicFilters: initParams.dynamic_filters,
+            context: ctx,
+            allowSelectors: false,
+            searchViewId: false, // little hack: force to load the search view info
+            globalState: initParams.exportState,
+            loadIrFilters: true,
+        }
+    }
+
+    /**
+    Focus the field corresponding to the column name passed as parameter inside the
+    manual operation page.
+    **/
+    focusManualOperationField(clickedColumn){
+        // Focus the field corresponding to the clicked column.
+        if (['debit', 'credit'].includes(clickedColumn)) {
+            if (this.focusElement("div[name='balance'] input")) {
+                return true;
+            }
+            if (this.focusElement("div[name='amount_currency'] input")) {
+                return true;
+            }
+        }
+
+        if (this.focusElement(`div[name='${clickedColumn}'] input`)) {
+            return true;
+        }
+        if (this.focusElement(`input[name='${clickedColumn}']`)) {
+            return true;
+        }
+        return false;
+    }
+
+    /** Helper to find the corresponding field to focus inside the DOM. **/
+    focusElement(selector) {
+        const inputEl = this.viewRef.el.querySelector(selector);
+        if (!inputEl) {
+            return false;
+        }
+
+        if (inputEl.tagName === "INPUT") {
+            inputEl.focus();
+            inputEl.select();
+        } else {
+            inputEl.focus();
+        }
+        return true;
+    }
+
+    // -----------------------------------------------------------------------------
+    // RPC
+    // -----------------------------------------------------------------------------
+
+    async actionOpenBankGL(journalId) {
+        const actionData = await this.orm.call(
+            "account.journal",
+            "action_open_bank_balance_in_gl",
+            [journalId],
+        );
+        this.action.doAction(actionData);
+    }
+
+    async actionRemoveLine(line){
+        await this.execProtectedBankRecAction(async () => {
+            await this.withNewState(async (newState) => {
+                await this.onchange(newState, "remove_line", [line.data.index]);
+
+                if(newState.bankRecNotebookPage === "manual_operations_tab"){
+                    newState.bankRecNotebookPage = "amls_tab";
+                }
+            });
+        });
+    }
+
+    async actionSelectRecoModel(recoModel){
+        await this.execProtectedBankRecAction(async () => {
+            await this.withNewState(async (newState) => {
+                const data = newState.bankRecRecordData;
+                if(recoModel.resId == data.selected_reco_model_id.id){
+                    return;
+                }
+                const { return_todo_command: actionData } = await this.onchange(newState, "select_reconcile_model", [recoModel.resId])
+                if(actionData){
+                    this.action.doAction(actionData);
+                }
+            });
+        });
+    }
+
+    actionCreateRecoModel(){
+        this.execProtectedBankRecAction(async () => {
+            const journalId = this.state.bankRecRecordData.st_line_journal_id[0];
+            const lines = this.state.bankRecRecordData.line_ids.records;
+
+            const defaultLineIds = [];
+            let balance = lines.filter(line => line.data.flag === "liquidity")[0].data.balance
+            if(!this.isMonetaryZero(balance, this.state.bankRecRecordData.company_currency_id[0])){
+                for (const line of lines) {
+                    const data = line.data;
+                    if (!["manual", "aml"].includes(data.flag)){
+                        continue;
+                    }
+
+                    defaultLineIds.push([0, 0, {
+                        label: data.name,
+                        account_id: data.account_id[0],
+                        tax_ids: [[6, 0, data.tax_ids.currentIds]],
+                        amount_type: "percentage",
+                        amount_string: ((-data.balance / balance) * 100).toFixed(5),
+                    }]);
+                    balance += data.balance;
+                }
+            }
+
+            this.action.doAction({
+                type: "ir.actions.act_window",
+                res_model: "account.reconcile.model",
+                views: [[false, "form"]],
+                target: "current",
+                context: {
+                    default_match_journal_ids: [journalId],
+                    default_line_ids: defaultLineIds,
+                    default_to_check: !this.state.bankRecRecordData.checked,
+                },
+            });
+        });
+    }
+
+    actionViewRecoModels(){
+        this.execProtectedBankRecAction(async () => {
+            this.action.doAction("account.action_account_reconcile_model");
+        });
+    }
+
+    async _actionValidate(newState){
+        const { return_todo_command: result } = await this.onchange(newState, "validate");
+        if(result.done){
+            this.incrementReconCounter();
+            await this.moveToNextLine(newState);
+        }
+        return result;
+    }
+
+    async actionValidate(){
+        await this.execProtectedBankRecAction(async () => {
+            await this.withNewState(async (newState) => {
+                await this._actionValidate(newState);
+            });
+        });
+    }
+
+    async actionReset(){
+        await this.execProtectedBankRecAction(async () => {
+            await this.withNewState(async (newState) => {
+                const { return_todo_command: result } = await this.onchange(newState, "reset");
+
+                if(result.done){
+                    await this.model.root.load();
+
+                    const stLineId = newState.bankRecStLineId;
+                    if(!stLineId){
+                        return;
+                    }
+
+                    const records = this.model.root.records;
+                    if(!records.length){
+                        // The transaction is not longer available on the kanban.
+                        newState.bankRecStLineId = null;
+                        newState.bankRecNotebookPage = null;
+                        newState.bankRecRecordData = null;
+                    }else if(!records.find((x) => x.resId === stLineId)){
+                        // Move to the next available transaction.
+                        const nextStLineId = this.getNextAvailableStLineId(stLineId);
+                        await this._mountStLineInEdit(newState, nextStLineId);
+                    }
+
+                    if(newState.bankRecNotebookPage != "amls_tab"){
+                        newState.bankRecNotebookPage = "amls_tab";
+                    }
+
+                    newState.__kanbanNotify = true;
+                }
+            });
+        });
+    }
+
+    async actionToCheck(){
+        await this.execProtectedBankRecAction(async () => {
+            await this.withNewState(async (newState) => {
+                const { return_todo_command: result } = await this.onchange(newState, "to_check");
+                if(result.done){
+                    await this.moveToNextLine(newState);
+                }
+            });
+        });
+    }
+
+    async actionSetAsChecked(){
+        await this.execProtectedBankRecAction(async () => {
+            await this.withNewState(async (newState) => {
+                const data = await this.onchange(newState, "set_as_checked");
+                const result = data.return_todo_command;
+                if(result.done && data.state === "reconciled"){
+                    await this.moveToNextLine(newState);
+                }else{
+                    await this.model.root.load();
+                    newState.__kanbanNotify = true;
+                }
+            });
+        });
+    }
+
+    async actionAddNewAml(amlId){
+        await this.execProtectedBankRecAction(async () => {
+            await this.withNewState(async (newState) => {
+                await this.onchange(newState, "add_new_aml", [amlId]);
+            });
+        });
+    }
+
+    async actionRemoveNewAml(amlId){
+        await this.execProtectedBankRecAction(async () => {
+            await this.withNewState(async (newState) => {
+                await this.onchange(newState, "remove_new_aml", [amlId]);
+             });
+        });
+    }
+
+    async _actionMountLineInEdit(newState, line){
+        const data = newState.bankRecRecordData;
+        const currentLineIndex = data.form_index;
+        if(line.data.index != currentLineIndex){
+            // Mount the line in edition on the form.
+            await this.onchange(newState, "mount_line_in_edit", [line.data.index]);
+        }
+
+        if(newState.bankRecNotebookPage !== "manual_operations_tab"){
+            newState.bankRecNotebookPage = "manual_operations_tab";
+        }
+    }
+
+    async actionMountLineInEdit(line){
+        await this.execProtectedBankRecAction(async () => {
+            await this.withNewState(async (newState) => {
+                await this._actionMountLineInEdit(newState, line);
+            });
+        });
+    }
+
+    async actionMountLastLineInEdit(){
+        await this.execProtectedBankRecAction(async () => {
+            await this.withNewState(async (newState) => {
+                const data = newState.bankRecRecordData;
+                const line = data.line_ids.records.at(-1);
+                await this._actionMountLineInEdit(newState, line);
+            });
+        });
+    }
+
+    async postprocessLineChangedReturnTodoCommand(newState, data) {
+        const todo = data.return_todo_command;
+        if(!todo){
+            return;
+        }
+        if(todo.reset_record){
+            await this.model.root.load();
+            newState.__kanbanNotify = true;
+        }
+        if(todo.reset_global_info){
+            await this.updateJournalState(newState, data);
+        }
+    }
+
+    async actionLineChanged(fieldName){
+        await this.execProtectedBankRecAction(async () => {
+            const line = this.getBankRecRecordLineInEdit();
+            await this.withNewState(async (newState) => {
+                if(line){
+                    const data = await this.onchange(newState, "line_changed", [line.data.index, fieldName]);
+                    await this.postprocessLineChangedReturnTodoCommand(newState, data);
+                }
+            });
+        });
+    }
+
+    async actionSetPartnerReceivableAccount(){
+        await this.execProtectedBankRecAction(async () => {
+            const line = this.getBankRecRecordLineInEdit();
+            await this.withNewState(async (newState) => {
+                if(line){
+                    const data = await this.onchange(newState, "line_set_partner_receivable_account", [line.data.index])
+                    await this.postprocessLineChangedReturnTodoCommand(newState, data);
+                }
+            });
+        });
+    }
+
+    async actionSetPartnerPayableAccount(){
+        await this.execProtectedBankRecAction(async () => {
+            const line = this.getBankRecRecordLineInEdit();
+            await this.withNewState(async (newState) => {
+                if(line){
+                    const data = await this.onchange(newState, "line_set_partner_payable_account", [line.data.index])
+                    await this.postprocessLineChangedReturnTodoCommand(newState, data);
+                }
+            });
+        });
+    }
+
+    async actionRedirectToSourceMove(line){
+        await this.execProtectedBankRecAction(async () => {
+            await this.withNewState(async (newState) => {
+                const { return_todo_command: actionData } = await this.onchange(newState, "redirect_to_move", [line.data.index])
+                if(actionData){
+                    this.action.doAction(actionData);
+                }
+            });
+        });
+    }
+
+    async actionApplyLineSuggestion(){
+        await this.execProtectedBankRecAction(async () => {
+            const line = this.getBankRecRecordLineInEdit();
+            await this.withNewState(async (newState) => {
+                if(line){
+                    await this.onchange(newState, "apply_line_suggestion", [line.data.index])
+                }
+            });
+        });
+    }
+
+    async handleLineClicked(ev, line){
+        const lineIndexBeforeClick = this.state.bankRecRecordData.form_index;
+        await this.actionMountLineInEdit(line);
+
+        let clickedColumn = null;
+        const target = ev.target.tagName === "TD" ? ev.target : ev.target.closest("td");
+        if (target?.attributes && target.attributes.field) {
+            clickedColumn = target.attributes.field.value;
+        }
+
+        // Track the clicked column to focus automatically the corresponding field on the manual operations page.
+        // In case we did not change the selected line we directly focus the corresponding field.
+        if(clickedColumn){
+            if(lineIndexBeforeClick === line.data.index) {
+                this.focusManualOperationField(clickedColumn);
+                this.state.bankRecClickedColumn = null;
+            } else {
+                this.state.bankRecClickedColumn = clickedColumn;
+            }
+        }
+    }
+
+    async handleSuggestionHtmlClicked(ev){
+        if (ev.target.tagName === "BUTTON"){
+            const buttonName = ev.target.attributes && ev.target.attributes.name ? ev.target.attributes.name.value : null;
+            if (!buttonName) {
+                return;
+            }
+
+            if (buttonName === "action_redirect_to_move"){
+                const line = this.getBankRecRecordLineInEdit();
+                await this.actionRedirectToSourceMove(line);
+            } else if (buttonName === "action_apply_line_suggestion"){
+                await this.actionApplyLineSuggestion();
+            }
+        }
+    }
+
+}
+
+export class BankRecKanbanRenderer extends KanbanRenderer {
+    static template = "account.BankRecKanbanRenderer";
+    static components = {
+        ...KanbanRenderer.components,
+        KanbanRecord: BankRecKanbanRecord,
+        RainbowMan,
+        BankRecFinishButtons,
+        BankRecGlobalInfo,
+        BankRecQuickCreate,
+    };
+    setup() {
+        super.setup();
+        this.globalState = useState(this.env.methods.getState());
+        this.action = useService("action");
+    }
+
+    /**
+    Prepares a list of statements based on the statement_id of the bank statement line records.
+    Statements are only displayed above the first line of the statement (all lines might not be visible in the kanban)
+    **/
+    groups() {
+        const { list } = this.props;
+        let statementGroups = [];
+        for (const record of list.records) {
+            let lastItem = statementGroups.slice(-1);
+            let statementId = record.data.statement_id && record.data.statement_id[0];
+            if (statementId && (!lastItem.length || lastItem[0].id != statementId)) {
+                statementGroups.push({
+                    id: statementId,
+                    name: record.data.statement_name,
+                    balance: formatMonetary(record.data.statement_balance_end_real, {currencyId: record.data.currency_id[0]}),
+                });
+            }
+        }
+        return statementGroups;
+    }
+
+    openStatementDialog(statementId) {
+        const action = {
+            type: "ir.actions.act_window",
+            res_model: "account.bank.statement",
+            res_id: statementId,
+            views: [[false, "form"]],
+            target: "current",
+            context: {
+                form_view_ref: "odex30_account_accountant.view_bank_statement_form_bank_rec_widget",
+            },
+        };
+
+        this.action.doAction(action);
+    }
+
+    // -----------------------------------------------------------------------------
+    // QUICK CREATE CALLBACKS
+    // -----------------------------------------------------------------------------
+
+    /**
+    Overriden.
+    **/
+    cancelQuickCreate() {
+        this.globalState.quickCreateState.isVisible = false;
+    }
+
+    /**
+    Overriden.
+    **/
+    validateQuickCreate(_recordId, mode) {
+        this.globalState.quickCreateState.model.load()
+        if (mode === "add_close") {
+            this.globalState.quickCreateState.isVisible = false;
+        }
+    }
+}
+
+export const BankRecKanbanView = {
+    ...kanbanView,
+    Controller: BankRecKanbanController,
+    Renderer: BankRecKanbanRenderer,
+    searchMenuTypes: ["filter", "favorite"],
+};
+
+registry.category("views").add('bank_rec_widget_kanban', BankRecKanbanView);
diff --git a/dev_odex30_accounting/odex30_account_accountant/static/src/components/bank_reconciliation/kanban.scss b/dev_odex30_accounting/odex30_account_accountant/static/src/components/bank_reconciliation/kanban.scss
new file mode 100644
index 0000000..9942d7e
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_accountant/static/src/components/bank_reconciliation/kanban.scss
@@ -0,0 +1,286 @@
+.o_bank_rec_main_div {
+    display: flex;
+    background-color: $o-view-background-color;
+    width: 100%;
+    height: 100%;
+
+    .o_form_view.o_xxl_form_view.o_view_controller .o_form_view_container {
+        width: 100%; 
+    }
+    
+    .o_kanban_renderer {
+        border-top: 0;
+    }
+
+    .o_bank_rec_kanban_div{
+        width: 30%;
+        height: 100%;
+        position: relative;
+        overflow: auto;
+        padding: 0;
+        margin: 0;
+        --KanbanRecord-padding-h: #{$o-kanban-inside-hgutter * 1.5};
+        --KanbanRecord-padding-v: #{$o-kanban-inside-vgutter};
+        --KanbanRecord-margin-h: #{$o-kanban-record-margin};
+
+        .o_reward {
+            .o_reward_rainbow_man {
+                top: -25% !important;
+            }
+        }
+
+        .journal-balance {
+            margin: 0px var(--KanbanRecord-margin-h) -1px;
+            padding: $o-kanban-inside-vgutter calc(var(--KanbanRecord-padding-h));
+            min-height: $o-statbutton-height;
+        }
+
+        .kanban-statement {
+            margin: 0px var(--KanbanRecord-margin-h) -1px;
+            padding: $o-kanban-inside-vgutter calc(var(--KanbanRecord-padding-h));
+            .kanban-statement-subline {
+                border: none;
+                font-size: 16px;
+                padding: 16px 0 0 0;
+            }
+        }
+
+        .o_bank_rec_st_line{
+            margin: 0px var(--KanbanRecord-margin-h) (-$border-width) !important;
+            align-items: center;
+
+            &:hover {
+                .statement_separator .btn-sm {
+                   opacity: 100;
+               }
+           }
+
+            &.o_bank_rec_selected_st_line {
+                background-color: var(--table-bg);
+            }
+
+            .statement_separator {
+                position: absolute;
+                height: 4px;
+                margin: 0;
+                padding: 2px 0 0 0;
+                border: 0;
+                z-index: 2;
+                background-color: transparent;
+
+                .btn-sm {
+                    position: relative;
+                    padding-top: 0;
+                    padding-bottom: 0;
+                    top: -21px;
+                    opacity: 0; // display: none doesn't work with tour
+                }
+            }
+        }
+    }
+
+    .o_bank_rec_right_div {
+        flex: 1 1 70%;
+        width: 70%;
+        border-left: 1px solid $border-color;
+        height: 100%;
+        position: relative;
+        overflow: auto;
+
+        .o_content{
+            .o_form_nosheet{
+                padding-left: 0 !important;
+                padding-right: 0 !important;
+
+                .row {
+                    margin-left: 0 !important;
+                    margin-right: 0 !important;
+                }
+
+                table tr td:first-child, table th:first-child {
+                  padding-left: 10px;
+                }
+
+                .o_list_table {
+                    --ListRenderer-thead-padding-y: #{$table-cell-padding-y-sm};
+                    th {
+                        border-left: none !important;
+                    }
+                }
+
+                .o_bank_rec_stats_buttons{
+                    display: flex;
+                    flex-flow: row nowrap;
+                    margin-top: -$o-sheet-vpadding;
+                    white-space: nowrap;
+                    border-bottom: 1px solid $border-color;
+                    height: fit-content;
+                    min-height: $o-statbutton-height;
+
+                    .o_bank_rec_stats_buttons_aside_left{
+                        flex-grow: 0;
+                        display: flex !important;
+                        flex-flow: row nowrap;
+                        border-right: 1px solid $border-color;
+
+                        .btn {
+                            margin-right: $o-statbutton-spacing;
+                        }
+                    }
+
+                    .o_bank_rec_stats_buttons_aside_right{
+                        width: 100%;
+                        overflow: auto;
+                        overflow-y: hidden;
+                        justify-content: right;
+                        flex-grow: 1;
+                        margin: 0px !important;
+
+                        .available_reco_model_ids {
+                            margin-bottom: 0;
+                            width: 100%;
+                            height: 100%;
+                            display: flex;
+                            justify-content: flex-end;
+
+                            .o_bank_rec_reco_models_widget_div{
+                                display: flex;
+                                flex-wrap: wrap;
+                                height: 100%;
+                                width: 100%;
+                                flex: 1 0;
+                                justify-content: flex-end;
+
+                                .recon_model_button {
+                                    flex: 0 1 auto;
+                                }
+                            }
+
+                            .bank_rec_reco_model_dropdown {
+                                display: flex;
+                                flex-shrink: 0;
+                            }
+                        }
+                    }
+                }
+
+                .bank_rec_widget_form_discuss_anchor, .bank_rec_widget_form_transaction_details_anchor{
+                    padding: 0 20px;
+                }
+
+                .o_form_label {
+                    text-wrap: nowrap;
+                }
+            }
+
+            .o_notebook {
+                --notebook-margin-x: 0 !important;
+            }
+        }
+    }
+}
+@include media-breakpoint-down(md) {
+    .o_bank_rec_widget_kanban_view {
+        --ControlPanel-border-bottom: initial;
+    }
+
+    .o_bank_rec_main_div {
+        .o_bank_rec_kanban_div {
+            --KanbanRecord-margin-h: #{-$border-width};
+        }
+
+        .o_bank_rec_kanban_div, .o_bank_rec_right_div {
+            flex: 1 0 95vw;
+        }
+    }
+}
+
+@include media-only(print) {
+    .o_bank_rec_widget_kanban_view .o_control_panel {
+        margin-bottom: $border-width;
+    }
+}
+
+.o_bank_rec_liquidity_line{
+    font-weight: bold;
+}
+
+.o_bank_rec_auto_balance_line{
+    color: $text-muted;
+}
+
+.o_bank_rec_lines_widget_table{
+    th{
+        border-top: none;
+    }
+}
+
+.o_bank_rec_model_button{
+    margin: 3px;
+}
+
+.o_bank_rec_selected_line > td {
+    background-color: var(--table-bg) !important;
+}
+
+.o_bank_rec_expanded_line{
+    border-bottom: transparent;
+    td {
+        padding-bottom: 0;
+    }
+}
+
+.o_bank_rec_second_line {
+    td {
+        padding-top: 0;
+        padding-bottom: 1rem;
+    }
+    .o_form_uri {
+        cursor: pointer;
+    }
+}
+
+.o_bank_rec_quick_create {
+    .o_form_renderer.o_form_nosheet.o_form_editable.d-block {
+        padding: 0;
+    }
+
+    &.o_form_view {
+        height: auto;
+    }
+
+    &.o_kanban_record > div:not(.o_dropdown_kanban) {
+        height: auto;
+    }
+
+    .o_inner_group {
+        display: flex;
+
+        .o_cell:first-child {
+            input,span {
+                font-weight: bold;
+            }
+        }
+
+        .o_cell:nth-child(2) {
+            input {
+                font-style: italic;
+            }
+        }
+    }
+
+    .o_wrap_field > :first-child {
+        flex: 0 0 27%;
+    }
+
+    .o_inner_group > .o_wrap_field:first-child > :first-child {
+        flex: 0 0 17%;
+    }
+}
+
+@media (min-width: 768px) {
+    .o_bank_rec_quick_create.o_form_view {
+        height: auto;
+        min-height: auto;
+    }
+}
diff --git a/dev_odex30_accounting/odex30_account_accountant/static/src/components/bank_reconciliation/kanban.xml b/dev_odex30_accounting/odex30_account_accountant/static/src/components/bank_reconciliation/kanban.xml
new file mode 100644
index 0000000..757adb4
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_accountant/static/src/components/bank_reconciliation/kanban.xml
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<templates id="template" xml:space="preserve">
+
+    <!-- Kanban controller -->
+    <t t-name="account.BankRecoKanbanController" t-inherit="web.KanbanView" t-inherit-mode="primary">
+        <xpath expr="//Layout" position="attributes">
+            <attribute name="className">'o_bank_rec_main_div overflow-auto'</attribute>
+        </xpath>
+        <xpath expr="//t[@t-component='props.Renderer']" position="after">
+            <div class="o_bank_rec_right_div">
+                <t t-if="state.bankRecStLineId and this.bankRecModel">
+                    <t t-call="odex30_account_accountant.BankRecRecordForm"/>
+                </t>
+            </div>
+        </xpath>
+    </t>
+
+    <!-- Kanban record -->
+    <t t-name="account.BankRecKanbanRecord" t-inherit="web.KanbanRecord" t-inherit-mode="primary">
+        <xpath expr="//article" position="attributes">
+            <attribute name="t-att-tabindex"/>
+        </xpath>
+    </t>
+
+    <!-- Kanban renderer -->
+    <t t-name="account.BankRecKanbanRenderer" t-inherit="web.KanbanRenderer" t-inherit-mode="primary">
+        <xpath expr="//div[@t-ref='root']" position="attributes">
+            <attribute name="class" add="o_bank_rec_kanban_div" separator=" "/>
+        </xpath>
+        <xpath expr="//t[@t-as='groupOrRecord']" position="before">
+            <t t-set="statementGroups" t-value="groups()"/>
+            <BankRecGlobalInfo t-if="globalState.bankRecStLineId and globalState.journalId"
+                                journalId="globalState.journalId"
+                                journalBalanceAmount="globalState.journalBalanceAmount"/>
+            <t t-if="globalState.quickCreateState.isVisible">
+                <BankRecQuickCreate globalState="globalState"
+                    onValidate="(record, mode) => this.validateQuickCreate(record, mode)"
+                    onCancel="() => this.cancelQuickCreate()"
+                    quickCreateView="props.quickCreateState.view"/>
+            </t>
+        </xpath>
+        <xpath expr="//t[@t-else='']/KanbanRecord" position="before">
+            <t t-set="recData" t-value="groupOrRecord.record.data"/>
+            <t t-if="recData.statement_id
+                     and statementGroups.length
+                     and recData.statement_id[0] === statementGroups[0].id">
+                <!-- remove the first statement from the list of statements -->
+                <t t-set="stGroup" t-value="statementGroups.shift()"/>
+                <t t-set="stClass" t-value="!(recData.statement_complete and recData.statement_valid) and 'text-danger' or ''"/>
+                <span t-if="stGroup" class="kanban-statement d-flex text-truncate align-self-center fw-bold w-100">
+                    <span t-attf-class="{{stClass}} kanban-statement-subline text-truncate flex-fill text-start"
+                          t-att-title="stGroup.name"
+                          t-out="stGroup.name"
+                        />
+                    <span t-on-click.stop.prevent="() => this.openStatementDialog(recData.statement_id[0])"
+                          t-attf-class="kanban-statement-subline btn btn-link"
+                          name="kanban-subline-clickable-amount"
+                          t-esc="stGroup.balance"/>
+                </span>
+            </t>
+        </xpath>
+        <t t-call="web.ActionHelper" position="replace">
+            <div t-if="props.noContentHelp" class="o_view_nocontent">
+                <div class="o_nocontent_help">
+                    <RainbowMan t-if="this.env.methods.showRainbowMan()" t-props="this.env.methods.getRainbowManContentProps()"/>
+                    <t t-else="">
+                        <t t-out="props.noContentHelp"/>
+                        <BankRecFinishButtons/>
+                    </t>
+                </div>
+            </div>
+        </t>
+    </t>
+
+</templates>
diff --git a/dev_odex30_accounting/odex30_account_accountant/static/src/components/bank_reconciliation/list.js b/dev_odex30_accounting/odex30_account_accountant/static/src/components/bank_reconciliation/list.js
new file mode 100644
index 0000000..643aea9
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_accountant/static/src/components/bank_reconciliation/list.js
@@ -0,0 +1,37 @@
+/** @odoo-module */
+
+import { registry } from "@web/core/registry";
+import { listView } from "@web/views/list/list_view";
+import { ListController } from "@web/views/list/list_controller";
+
+import { useChildSubEnv } from "@odoo/owl";
+
+export class BankRecListController extends ListController {
+
+    setup() {
+        super.setup(...arguments);
+
+        this.skipKanbanRestore = {};
+
+        useChildSubEnv({
+            skipKanbanRestoreNeeded: (stLineId) => this.skipKanbanRestore[stLineId],
+        });
+    }
+
+    /**
+      * Override
+      * Don't allow bank_rec_form to be restored with previous values since the statement line has changed.
+      */
+    async onRecordSaved(record) {
+        this.skipKanbanRestore[record.resId] = true;
+        return super.onRecordSaved(...arguments);
+    }
+
+}
+
+export const bankRecListView = {
+    ...listView,
+    Controller: BankRecListController,
+}
+
+registry.category("views").add("bank_rec_list", bankRecListView);
diff --git a/dev_odex30_accounting/odex30_account_accountant/static/src/components/bank_reconciliation/list_view_switcher.js b/dev_odex30_accounting/odex30_account_accountant/static/src/components/bank_reconciliation/list_view_switcher.js
new file mode 100644
index 0000000..0e08a60
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_accountant/static/src/components/bank_reconciliation/list_view_switcher.js
@@ -0,0 +1,39 @@
+/** @odoo-module **/
+
+import { _t } from "@web/core/l10n/translation";
+import { registry } from "@web/core/registry";
+import { useService } from "@web/core/utils/hooks";
+import { standardFieldProps } from "@web/views/fields/standard_field_props";
+import { Component } from "@odoo/owl";
+
+export class ListViewSwitcher extends Component {
+    static template = "odex30_account_accountant.ListViewSwitcher";
+    static props = standardFieldProps;
+
+    setup() {
+        this.action = useService("action");
+    }
+
+    /** Called when the Match/View button is clicked. **/
+    switchView() {
+        // Add a new search facet to restrict the results to the selected statement line.
+        const searchItem = Object.values(this.env.searchModel.searchItems).find((i) => i.fieldName === "statement_line_id");
+        const stLineId = this.props.record.resId;
+        const autocompleteValue = {
+            label: this.props.record.data.move_id[1],
+            operator: "=",
+            value: stLineId,
+        }
+        this.env.searchModel.addAutoCompletionValues(searchItem.id, autocompleteValue);
+
+        // Switch to the kanban.
+        this.action.switchView("kanban", { skipRestore: this.env.skipKanbanRestoreNeeded(stLineId) });
+    }
+
+    /** Give the button's label for the current record. **/
+    get buttonLabel() {
+        return this.props.record.data.is_reconciled ? _t("View") : _t("Match");
+    }
+}
+
+registry.category("fields").add('bank_rec_list_view_switcher', {component: ListViewSwitcher});
diff --git a/dev_odex30_accounting/odex30_account_accountant/static/src/components/bank_reconciliation/list_view_switcher.xml b/dev_odex30_accounting/odex30_account_accountant/static/src/components/bank_reconciliation/list_view_switcher.xml
new file mode 100644
index 0000000..8a4ae88
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_accountant/static/src/components/bank_reconciliation/list_view_switcher.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<templates id="template" xml:space="preserve">
+
+    <t t-name="odex30_account_accountant.ListViewSwitcher">
+        <button class="btn btn-sm btn-secondary"
+                t-on-click.stop="() => this.switchView()">
+            <t t-out="buttonLabel"/>
+        </button>
+    </t>
+
+</templates>
diff --git a/dev_odex30_accounting/odex30_account_accountant/static/src/components/bank_reconciliation/many2one_field_multi_edit.js b/dev_odex30_accounting/odex30_account_accountant/static/src/components/bank_reconciliation/many2one_field_multi_edit.js
new file mode 100644
index 0000000..9c5011b
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_accountant/static/src/components/bank_reconciliation/many2one_field_multi_edit.js
@@ -0,0 +1,21 @@
+/** @odoo-module **/
+import { registry } from "@web/core/registry";
+import { Many2OneField, many2OneField } from "@web/views/fields/many2one/many2one_field";
+
+export class BankRecMany2OneMultiID extends Many2OneField {
+
+    get Many2XAutocompleteProps() {
+        const props = super.Many2XAutocompleteProps;
+        if (this.props.record.selected && this.props.record.model.multiEdit) {
+            props.context.active_ids = this.env.model.root.selection.map((r) => r.resId);
+        }
+        return props;
+    }
+}
+
+export const bankRecMany2OneMultiID = {
+    ...many2OneField,
+    component: BankRecMany2OneMultiID,
+};
+
+registry.category("fields").add("bank_rec_list_many2one_multi_id", bankRecMany2OneMultiID);
diff --git a/dev_odex30_accounting/odex30_account_accountant/static/src/components/bank_reconciliation/monetary_field_auto_signed_amount.js b/dev_odex30_accounting/odex30_account_accountant/static/src/components/bank_reconciliation/monetary_field_auto_signed_amount.js
new file mode 100644
index 0000000..37c01fe
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_accountant/static/src/components/bank_reconciliation/monetary_field_auto_signed_amount.js
@@ -0,0 +1,38 @@
+/** @odoo-module **/
+import { MonetaryField, monetaryField } from "@web/views/fields/monetary/monetary_field";
+
+export class BankRecMonetaryField extends MonetaryField{
+    static template = "odex30_account_accountant.BankRecMonetaryField";
+    static props = {
+        ...MonetaryField.props,
+        hasForcedNegativeValue: { type: Boolean },
+    };
+
+    /** Override **/
+    get inputOptions(){
+        const options = super.inputOptions;
+        const parse = options.parse;
+        options.parse = (value) => {
+            let parsedValue = parse(value);
+            if (this.props.hasForcedNegativeValue) {
+                parsedValue = -Math.abs(parsedValue);
+            }
+            return parsedValue;
+        };
+        return options;
+    }
+
+    /** Override **/
+    get value() {
+        let value = super.value;
+        if(this.props.hasForcedNegativeValue){
+            value = Math.abs(value);
+        }
+        return value;
+    }
+}
+
+export const bankRecMonetaryField = {
+    ...monetaryField,
+    component: BankRecMonetaryField,
+};
diff --git a/dev_odex30_accounting/odex30_account_accountant/static/src/components/bank_reconciliation/monetary_field_auto_signed_amount.xml b/dev_odex30_accounting/odex30_account_accountant/static/src/components/bank_reconciliation/monetary_field_auto_signed_amount.xml
new file mode 100644
index 0000000..651e62d
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_accountant/static/src/components/bank_reconciliation/monetary_field_auto_signed_amount.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<templates id="template" xml:space="preserve">
+
+    <t t-name="odex30_account_accountant.BankRecMonetaryField" t-inherit="web.MonetaryField" t-inherit-mode="primary">
+        <xpath expr="//span[hasclass('o_input')]" position="before">
+            <span t-if="props.hasForcedNegativeValue and currency and currency.position === 'after'">-</span>
+        </xpath>
+
+        <xpath expr="//input" position="before">
+            <span t-if="props.hasForcedNegativeValue and currency and currency.position === 'before'">-</span>
+        </xpath>
+        <xpath expr="//span[hasclass('o_monetary_ghost_value')]" position="before">
+            <span class="opacity-0 mx-1" t-if="props.hasForcedNegativeValue">-</span>
+        </xpath>
+    </t>
+
+</templates>
diff --git a/dev_odex30_accounting/odex30_account_accountant/static/src/components/bank_reconciliation/rainbowman_content.js b/dev_odex30_accounting/odex30_account_accountant/static/src/components/bank_reconciliation/rainbowman_content.js
new file mode 100644
index 0000000..3eed2dc
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_accountant/static/src/components/bank_reconciliation/rainbowman_content.js
@@ -0,0 +1,19 @@
+/** @odoo-module **/
+import { BankRecFinishButtons } from "./finish_buttons";
+import { Component, onMounted, onWillUnmount } from "@odoo/owl";
+
+export class BankRecRainbowContent extends Component {
+    static template = "odex30_account_accountant.BankRecRainbowContent";
+    static components = { BankRecFinishButtons };
+    static props = {};
+
+    setup() {
+        onWillUnmount(() => {
+            this.env.methods.initReconCounter();
+        });
+        onMounted(() => {
+            document.querySelector(".o_reward").style.pointerEvents = "none";
+            document.querySelector(".o_reward_msg").style.pointerEvents = "auto";
+        });
+    }
+}
diff --git a/dev_odex30_accounting/odex30_account_accountant/static/src/components/bank_reconciliation/rainbowman_content.xml b/dev_odex30_accounting/odex30_account_accountant/static/src/components/bank_reconciliation/rainbowman_content.xml
new file mode 100644
index 0000000..69d619f
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_accountant/static/src/components/bank_reconciliation/rainbowman_content.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<templates id="template" xml:space="preserve">
+    <t t-name="odex30_account_accountant.BankRecRainbowContent">
+        <t t-set="summary" t-value="this.env.methods.getCounterSummary()"/>
+        <h2>Congrats, you're all done!</h2>
+        <p>You reconciled <strong t-out="summary.counter"/><t t-if="summary.counter gt 1"> transactions in </t><t t-else=""> transaction in </t><strong t-out="summary.humanDuration"/>.
+            <t t-if="summary.counter gt 1">
+                <br/>That's on average <b t-out="summary.secondsPerTransaction"/> seconds per transaction.
+            </t>
+        </p>
+        <BankRecFinishButtons/>
+    </t>
+</templates>
diff --git a/dev_odex30_accounting/odex30_account_accountant/static/src/components/bank_reconciliation/view_embedder.js b/dev_odex30_accounting/odex30_account_accountant/static/src/components/bank_reconciliation/view_embedder.js
new file mode 100644
index 0000000..3cfaf1d
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_accountant/static/src/components/bank_reconciliation/view_embedder.js
@@ -0,0 +1,18 @@
+/** @odoo-module */
+import { View } from "@web/views/view";
+import { Component, useSubEnv } from "@odoo/owl";
+
+export class BankRecViewEmbedder extends Component {
+    static props = ["viewProps"];
+    static template = "odex30_account_accountant.BankRecViewEmbedder";
+    static components = { View };
+
+    setup() {
+        // Little hack while better solution from framework js.
+        // Reset the config, especially the ControlPanel which was coming from a parent form view.
+        // It also reset the view switchers which was necessary to make them disappear.
+        useSubEnv({
+            config: {...this.env.methods},
+        });
+    }
+}
diff --git a/dev_odex30_accounting/odex30_account_accountant/static/src/components/bank_reconciliation/view_embedder.xml b/dev_odex30_accounting/odex30_account_accountant/static/src/components/bank_reconciliation/view_embedder.xml
new file mode 100644
index 0000000..6a782e3
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_accountant/static/src/components/bank_reconciliation/view_embedder.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<templates id="template" xml:space="preserve">
+
+    <t t-name="odex30_account_accountant.BankRecViewEmbedder">
+        <View t-props="props.viewProps"/>
+    </t>
+
+</templates>
diff --git a/dev_odex30_accounting/odex30_account_accountant/static/src/components/export_data_dialog/export_data_dialog.js b/dev_odex30_accounting/odex30_account_accountant/static/src/components/export_data_dialog/export_data_dialog.js
new file mode 100644
index 0000000..fa72931
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_accountant/static/src/components/export_data_dialog/export_data_dialog.js
@@ -0,0 +1,35 @@
+/** @odoo-module **/
+
+import { patch } from "@web/core/utils/patch";
+import { rpc } from "@web/core/network/rpc";
+import { ExportDataDialog } from "@web/views/view_dialogs/export_data_dialog";
+
+patch(ExportDataDialog.prototype, {
+    async fetchFields(value) {
+        await super.fetchFields(value);
+
+        const analyticLineIdsField = this.knownFields['analytic_line_ids'];
+        if (analyticLineIdsField) {
+            // If analytic_distribution field is here, we remove it to replace it by the new fields
+            this.state.exportList = this.state.exportList.filter(
+                (field) => field.id !== 'analytic_distribution'
+            );
+            const analyticLineFields = await rpc("/web/export/get_fields", {
+                model: analyticLineIdsField.params.model,
+                prefix: analyticLineIdsField.params.prefix,
+                parent_name: analyticLineIdsField.params.parent_field.string,
+                import_compat: analyticLineIdsField.default_export,
+                parent_field_type: analyticLineIdsField.params.parent_field.type,
+                domain:[],
+            });
+            // We exclude auto_account_id as it's a magic field who doesn't need to be exported
+            const filteredAnalyticLineFields = analyticLineFields.filter(
+                (field) => field.params?.model === 'account.analytic.account'
+                    && !field.id.includes('auto_account_id')
+                    || field.id === 'analytic_line_ids/amount'
+            );
+
+            this.state.exportList.push(...filteredAnalyticLineFields);
+        }
+    },
+});
diff --git a/dev_odex30_accounting/odex30_account_accountant/static/src/components/matching_link_widget/matching_link_widget.js b/dev_odex30_accounting/odex30_account_accountant/static/src/components/matching_link_widget/matching_link_widget.js
new file mode 100644
index 0000000..d45a9f7
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_accountant/static/src/components/matching_link_widget/matching_link_widget.js
@@ -0,0 +1,47 @@
+/** @odoo-module **/
+
+import { registry } from "@web/core/registry";
+import { useService } from "@web/core/utils/hooks";
+import { standardFieldProps } from "@web/views/fields/standard_field_props";
+import { Component } from "@odoo/owl";
+
+class MatchingLink extends Component {
+    static props = { ...standardFieldProps };
+    static template = "odex30_account_accountant.MatchingLink";
+
+    setup() {
+        this.orm = useService("orm");
+        this.action = useService("action");
+    }
+
+    async reconcile() {
+        this.action.doAction("odex30_account_accountant.action_move_line_posted_unreconciled", {
+            additionalContext: {
+                search_default_partner_id: this.props.record.data.partner_id[0],
+                search_default_account_id: this.props.record.data.account_id[0],
+            },
+        });
+    }
+
+    async viewMatch() {
+        const action = await this.orm.call("account.move.line", "open_reconcile_view", [this.props.record.resId], {});
+        this.action.doAction(action, { additionalContext: { is_matched_view: true } });
+    }
+
+    get colorCode() {
+        const matchValue = this.props.record.data[this.props.name];
+        const matchColorValue = matchValue.replace('P', '');
+        if (matchColorValue === '*') {
+            // reserve color code 0 for multi partial matches
+            return 0;
+        } else {
+            // there is 12 available color palette for 'o_tag_color_*'
+            // since the color code 0 has been reserved by 'P*', we can only use color codes between 1 and 11
+            return parseInt(matchColorValue) % 11 + 1;
+        }
+    }
+}
+
+registry.category("fields").add("matching_link_widget", {
+    component: MatchingLink,
+});
diff --git a/dev_odex30_accounting/odex30_account_accountant/static/src/components/matching_link_widget/matching_link_widget.xml b/dev_odex30_accounting/odex30_account_accountant/static/src/components/matching_link_widget/matching_link_widget.xml
new file mode 100644
index 0000000..07f52d7
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_accountant/static/src/components/matching_link_widget/matching_link_widget.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<templates>
+
+    <t t-name="odex30_account_accountant.MatchingLink">
+        <t t-if="props.record.context.is_matched_view">
+            <span t-out="props.record.data[props.name]" t-attf-class="o_tag o_badge badge rounded-pill {{'o_tag_color_' + colorCode}}"/>
+        </t>
+        <t t-elif="props.record.data[props.name]">
+            <a href='#' t-on-click.prevent="viewMatch" t-attf-class="o_tag o_badge badge rounded-pill {{'o_tag_color_' + colorCode}}">
+                <span t-out="props.record.data[props.name]"/>
+            </a>
+        </t>
+    </t>
+
+</templates>
diff --git a/dev_odex30_accounting/odex30_account_accountant/static/src/components/move_line_list/attachment_view_move_line.js b/dev_odex30_accounting/odex30_account_accountant/static/src/components/move_line_list/attachment_view_move_line.js
new file mode 100644
index 0000000..9e0db1b
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_accountant/static/src/components/move_line_list/attachment_view_move_line.js
@@ -0,0 +1,17 @@
+import { AttachmentView } from "@mail/core/common/attachment_view";
+import { onMounted } from "@odoo/owl";
+import { useBus } from "@web/core/utils/hooks";
+
+export class AttachmentViewMoveLine extends AttachmentView {
+    static props = [...AttachmentView.props, "openInPopout"];
+    static components = { AttachmentView };
+
+    setup() {
+        super.setup();
+        if (this.props.openInPopout) {
+            onMounted(this.onClickPopout);
+        }
+
+        useBus(this.uiService.bus, "resize", () => this.env.setPopout(false));
+    }
+}
diff --git a/dev_odex30_accounting/odex30_account_accountant/static/src/components/move_line_list/move_line_list.js b/dev_odex30_accounting/odex30_account_accountant/static/src/components/move_line_list/move_line_list.js
new file mode 100644
index 0000000..d5f9bf9
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_accountant/static/src/components/move_line_list/move_line_list.js
@@ -0,0 +1,125 @@
+import { AttachmentViewMoveLine } from "./attachment_view_move_line";
+
+import { registry } from "@web/core/registry";
+import { useService } from "@web/core/utils/hooks";
+import { listView } from "@web/views/list/list_view";
+import { ListRenderer } from "@web/views/list/list_renderer";
+import { ListController } from "@web/views/list/list_controller";
+import { SIZES } from "@web/core/ui/ui_service";
+import { useChildSubEnv, useState } from "@odoo/owl";
+import { makeActiveField } from "@web/model/relational_model/utils";
+
+export class AccountMoveLineListController extends ListController {
+    static template = "odex30_account_accountant.MoveLineListView";
+    static components = {
+        ...ListController.components,
+        AttachmentViewMoveLine,
+    };
+    setup() {
+        super.setup();
+        /** @type {import("@mail/core/common/store_service").Store} */
+        this.store = useState(useService("mail.store"));
+        this.ui = useState(useService("ui"));
+        this.mailPopoutService = useState(useService("mail.popout"));
+        this.attachmentPreviewState = useState({
+            displayAttachment:
+                localStorage.getItem("account.move_line_pdf_previewer_hidden") !== "false",
+            selectedRecord: false,
+            thread: null,
+        });
+        this.popout = useState({ active: false });
+
+        useChildSubEnv({
+            setPopout: this.setPopout.bind(this),
+        });
+
+        // We need to override the openRecord from ListController since it does things we do not want like opening the default form view
+        this.openRecord = () => {}
+    }
+
+    get previewEnabled() {
+        return (
+            !this.env.searchModel.context.disable_preview &&
+            (this.ui.size >= SIZES.XXL || this.mailPopoutService.externalWindow)
+        );
+    }
+
+    get modelParams() {
+        const params = super.modelParams;
+        params.config.activeFields.move_attachment_ids = makeActiveField();
+        params.config.activeFields.move_attachment_ids.related = {
+            fields: {
+                mimetype: { name: "mimetype", type: "char" },
+            },
+            activeFields: {
+                mimetype: makeActiveField(),
+            },
+        };
+        return params;
+    }
+
+    togglePreview() {
+        this.attachmentPreviewState.displayAttachment =
+            !this.attachmentPreviewState.displayAttachment;
+        localStorage.setItem(
+            "account.move_line_pdf_previewer_hidden",
+            this.attachmentPreviewState.displayAttachment
+        );
+    }
+
+    setPopout(value) {
+
+        if (this.attachmentPreviewState.thread?.attachmentsInWebClientView.length) {
+            this.popout.active = value;
+        }
+    }
+
+    setSelectedRecord(accountMoveLineData) {
+        this.attachmentPreviewState.selectedRecord = accountMoveLineData;
+        this.setThread(this.attachmentPreviewState.selectedRecord);
+    }
+
+    async setThread(accountMoveLineData) {
+        if (!accountMoveLineData || !accountMoveLineData.data.move_attachment_ids.records.length) {
+            this.attachmentPreviewState.thread = null;
+            return;
+        }
+        const thread = this.store.Thread.insert({
+            attachments: accountMoveLineData.data.move_attachment_ids.records.map((attachment) => ({
+                id: attachment.resId,
+                mimetype: attachment.data.mimetype,
+            })),
+            id: accountMoveLineData.data.move_id[0],
+            model: accountMoveLineData.fields["move_id"].relation,
+        });
+        if (!thread.mainAttachment && thread.attachmentsInWebClientView.length > 0) {
+            thread.update({ mainAttachment: thread.attachmentsInWebClientView[0] });
+        }
+        this.attachmentPreviewState.thread = thread;
+    }
+}
+
+export class AccountMoveLineListRenderer extends ListRenderer {
+    static props = [...ListRenderer.props, "setSelectedRecord?"];
+    onCellClicked(record, column, ev) {
+        this.props.setSelectedRecord(record);
+        super.onCellClicked(record, column, ev);
+    }
+
+    findFocusFutureCell(cell, cellIsInGroupRow, direction) {
+        const futureCell = super.findFocusFutureCell(cell, cellIsInGroupRow, direction);
+        if (futureCell) {
+            const dataPointId = futureCell.closest("tr").dataset.id;
+            const record = this.props.list.records.filter((x) => x.id === dataPointId)[0];
+            this.props.setSelectedRecord(record);
+        }
+        return futureCell;
+    }
+}
+export const AccountMoveLineListView = {
+    ...listView,
+    Renderer: AccountMoveLineListRenderer,
+    Controller: AccountMoveLineListController,
+};
+
+registry.category("views").add("account_move_line_list", AccountMoveLineListView);
diff --git a/dev_odex30_accounting/odex30_account_accountant/static/src/components/move_line_list/move_line_list.scss b/dev_odex30_accounting/odex30_account_accountant/static/src/components/move_line_list/move_line_list.scss
new file mode 100644
index 0000000..0b845c8
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_accountant/static/src/components/move_line_list/move_line_list.scss
@@ -0,0 +1,68 @@
+.o_move_line_list_view {
+    &.o_view_controller > .o_content {
+        overflow: hidden;
+        display: flex;
+        .o_list_renderer {
+            @include media-only(screen) {
+                overflow: auto;
+                height: 100%;
+                flex: 1 1 100%;
+            }
+        }
+    }
+
+    .o_attachment_preview {
+        height: 100%;
+        width: 40%;
+        border-left: $border-width solid $border-color;
+
+        .o_attachment_control.toggle {
+            border-radius: 0 30px 30px 0;
+            padding: 15px 15px 15px 5px;
+            &::after {
+                color: white;
+                content: '>>';
+            }
+        }
+
+        &.hidden {
+            width: 0;
+            .o_attachment_control.toggle {
+                right: 0;
+                border-radius: 30px 0 0 30px;
+                padding: 15px 0 15px 15px;
+                &::after {
+                    content: '<';
+                }
+                &:hover {
+                    padding-right: 5px;
+                    ::after {
+                        content: '<<';
+                    }
+                }
+            }
+        }
+    }
+
+    .o_popout_icon {
+        position: absolute;
+        top: 8%;
+        background-color: black;
+        opacity: 0.3;
+        margin-top: -15px;
+        transition: all 0.3s;
+        z-index: $zindex-dropdown;
+        right: 0;
+        border-radius: 30px 0 0 30px;
+        padding: 15px 0 15px 15px;
+        &:hover {
+            padding-right: 15px;
+        }
+    }
+
+    @include media-only(print) {
+        .o_search_panel {
+            display: none;
+        }
+    }
+}
diff --git a/dev_odex30_accounting/odex30_account_accountant/static/src/components/move_line_list/move_line_list.xml b/dev_odex30_accounting/odex30_account_accountant/static/src/components/move_line_list/move_line_list.xml
new file mode 100644
index 0000000..0505f08
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_accountant/static/src/components/move_line_list/move_line_list.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<templates xml:space="preserve">
+    <t t-name="odex30_account_accountant.MoveLineListView" t-inherit="web.ListView">
+        <xpath expr="//div[@t-ref='root']" position="attributes" type="add">
+            <attribute name="class" add="o_move_line_list_view" separator=" "/>
+        </xpath>
+        <xpath expr="//t[@t-component='props.Renderer']" position="attributes">
+            <attribute name="setSelectedRecord.bind">this.setSelectedRecord</attribute>
+        </xpath>
+        <xpath expr="//Layout" position="inside">
+            <t t-call="odex30_account_accountant.AttachmentPreview"/>
+        </xpath>
+    </t>
+
+    <t t-name="odex30_account_accountant.AttachmentPreview">
+        <div t-if="previewEnabled" class="o_attachment_preview d-print-none" t-att-class="{'hidden': !attachmentPreviewState.displayAttachment || mailPopoutService.externalWindow}">
+            <t t-if="this.attachmentPreviewState.displayAttachment || mailPopoutService.externalWindow">
+                <t t-if="this.attachmentPreviewState.thread and this.attachmentPreviewState.thread.attachmentsInWebClientView.length > 0">
+                    <AttachmentViewMoveLine
+                        threadId="this.attachmentPreviewState.thread.id"
+                        threadModel="this.attachmentPreviewState.thread.model"
+                        openInPopout="0"
+                    />
+                </t>
+                <t t-elif="!this.attachmentPreviewState.selectedRecord">
+                    <p class="text-center">Choose a line to preview its attachments.</p>
+                </t>
+                <t t-else="">
+                    <p class="text-center">No attachments linked.</p>
+                </t>
+            </t>
+            <div class="o_attachment_control toggle" t-on-click="togglePreview" t-if="!mailPopoutService.externalWindow"/>
+        </div>
+        <t t-else="">
+            <div class="o_popout_icon" t-on-click="() => this.setPopout(true)">
+                <i class="fa fa-window-restore" title="Open attachment in pop out"/>
+            </div>
+            <t t-if="this.popout.active">
+                <div class="o_attachment_preview d-print-none"
+                     t-if="this.attachmentPreviewState.thread?.attachmentsInWebClientView.length"
+                >
+                    <AttachmentViewMoveLine
+                        threadId="this.attachmentPreviewState.thread.id"
+                        threadModel="this.attachmentPreviewState.thread.model"
+                        openInPopout="1"
+                    />
+                </div>
+            </t>
+        </t>
+    </t>
+</templates>
diff --git a/dev_odex30_accounting/odex30_account_accountant/static/src/components/move_line_list_reconcile/move_line_list_reconcile.js b/dev_odex30_accounting/odex30_account_accountant/static/src/components/move_line_list_reconcile/move_line_list_reconcile.js
new file mode 100644
index 0000000..ceadab6
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_accountant/static/src/components/move_line_list_reconcile/move_line_list_reconcile.js
@@ -0,0 +1,48 @@
+/** @odoo-module **/
+
+import { registry } from "@web/core/registry";
+import { useSubEnv } from "@odoo/owl";
+import { AccountMoveLineListController, AccountMoveLineListRenderer, AccountMoveLineListView } from "../move_line_list/move_line_list";
+
+
+export class AccountMoveLineReconcileListController extends AccountMoveLineListController {
+
+    setup() {
+        super.setup();
+        useSubEnv({
+            callAutoReconcileAction: this.openAutoReconcileWizard.bind(this),
+        });
+    }
+
+    openAutoReconcileWizard(group=null) {
+        if (group) {
+            return this.actionService.doAction("odex30_account_accountant.action_open_auto_reconcile_wizard", {
+                additionalContext: {
+                    domain: group.list.domain,
+                }
+            });
+        } else {
+            return this.actionService.doAction("odex30_account_accountant.action_open_auto_reconcile_wizard");
+        }
+    }
+}
+
+export class AccountMoveLineReconcileListRenderer extends AccountMoveLineListRenderer {
+
+    static groupRowTemplate = "odex30_account_accountant.AccountMoveLineReconcileGroupRow";
+
+    setup() {
+        super.setup();
+        this.props.list.groups?.map(group => this.toggleGroup(group));  // unfold the first groups (account_id)
+    }
+
+}
+
+export const AccountMoveLineReconcileLineListView = {
+    ...AccountMoveLineListView,
+    Controller: AccountMoveLineReconcileListController,
+    Renderer: AccountMoveLineReconcileListRenderer,
+    buttonTemplate: "odex30_account_accountant.ListViewReconcile.Buttons",
+}
+
+registry.category("views").add("account_move_line_reconcile_list", AccountMoveLineReconcileLineListView);
diff --git a/dev_odex30_accounting/odex30_account_accountant/static/src/components/move_line_list_reconcile/move_line_list_reconcile.xml b/dev_odex30_accounting/odex30_account_accountant/static/src/components/move_line_list_reconcile/move_line_list_reconcile.xml
new file mode 100644
index 0000000..770a72a
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_accountant/static/src/components/move_line_list_reconcile/move_line_list_reconcile.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<templates>
+
+    <t t-name="odex30_account_accountant.ListViewReconcile.Buttons" t-inherit="web.ListView.Buttons" t-inherit-mode="primary">
+        <xpath expr="//div[hasclass('o_list_buttons')]" position="inside">
+            <button class="btn btn-primary"
+                    t-on-click="() => this.openAutoReconcileWizard()"
+                    groups="account.group_account_user">
+                Auto-reconcile
+            </button>
+        </xpath>
+    </t>
+
+    <t t-name="odex30_account_accountant.AccountMoveLineReconcileGroupRow" t-inherit="web.ListRenderer.GroupRow">
+        <xpath expr="//div[@class='o_group_buttons']" position="before">
+            <t t-set="grouped_by_account" t-value="group.list.evalContext.default_account_id"/>
+            <t t-if="group.groupByField.name == 'account_id' or (group.groupByField.name == 'partner_id' and grouped_by_account)">
+                <button class="btn btn-link"
+                        t-on-click.stop.prevent="() => this.env.callAutoReconcileAction(group)"
+                        groups="account.group_account_user">
+                    Auto-reconcile
+                </button>
+            </t>
+        </xpath>
+    </t>
+
+</templates>
diff --git a/dev_odex30_accounting/odex30_account_accountant/static/src/img/accounting-bulk.gif.gif b/dev_odex30_accounting/odex30_account_accountant/static/src/img/accounting-bulk.gif.gif
new file mode 100644
index 0000000..55f247e
Binary files /dev/null and b/dev_odex30_accounting/odex30_account_accountant/static/src/img/accounting-bulk.gif.gif differ
diff --git a/dev_odex30_accounting/odex30_account_accountant/static/src/js/tours/account_accountant.js b/dev_odex30_accounting/odex30_account_accountant/static/src/js/tours/account_accountant.js
new file mode 100644
index 0000000..48b1638
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_accountant/static/src/js/tours/account_accountant.js
@@ -0,0 +1,78 @@
+/** @odoo-module **/
+
+    import { _t } from "@web/core/l10n/translation";
+    import { registry } from "@web/core/registry";
+    import { patch } from "@web/core/utils/patch";
+    import { markup } from "@odoo/owl";
+    import { accountTourSteps } from "@account/js/tours/account";
+
+    patch(accountTourSteps, {
+        newInvoice() {
+            return [
+                {
+                    trigger: "button[name=action_create_new]",
+                    content: _t("Now, we'll create your first invoice (accountant)"),
+                    run: "click",
+                }
+            ]
+        },
+    });
+
+
+    registry.category("web_tour.tours").add('odex30_account_accountant_tour', {
+            url: "/odoo",
+            steps: () => [
+            ...accountTourSteps.goToAccountMenu('Let’s automate your bills, bank transactions and accounting processes.'),
+            // The tour will stop here if there is at least 1 vendor bill in the database.
+            // While not ideal, it is ok, since that means the user obviously knows how to create a vendor bill...
+            {
+                trigger: 'a[name="action_create_vendor_bill"]',
+                content: markup(_t('Create your first vendor bill.<br/><br/><i>Tip: If you don’t have one on hand, use our sample bill.</i>')),
+                tooltipPosition: 'bottom',
+                run: "click",
+            }, {
+                trigger: 'button.btn-primary[name="action_post"]',
+                content: _t('After the data extraction, check and validate the bill. If no vendor has been found, add one before validating.'),
+                tooltipPosition: 'bottom',
+                run: "click",
+            }, {
+                trigger: '.dropdown-item[data-menu-xmlid="account.menu_board_journal_1"]',
+                content: _t('Let’s go back to the dashboard.'),
+                tooltipPosition: 'bottom',
+                run: "click",
+            }, {
+                trigger: 'a[name="open_action"] span:contains(bank)',
+                content: _t('Connect your bank and get your latest transactions.'),
+                tooltipPosition: 'bottom',
+                run: "click",
+            }, {
+                trigger: 'button.o-kanban-button-new',
+                content: _t('Create a new transaction.'),
+                run: "click",
+            }, {
+                trigger: "div[name=amount] div input[id=amount_0]",
+                content: _t("Set an amount."),
+                tooltipPosition: "bottom",
+                run: "edit -19250.00",
+            }, {
+                trigger: "div[name=payment_ref] input[id=payment_ref_0]",
+                content: _t("Set the payment reference."),
+                tooltipPosition: "bottom",
+                run: "edit Payment Deco Adict",
+            }, {
+                trigger: "button.o_kanban_edit",
+                content: _t("Confirm the transaction."),
+                tooltipPosition: "bottom",
+                run: "click",
+            }, {
+                trigger: '.o_kanban_renderer:not(:has(.o_bank_rec_quick_create)) .o_bank_rec_st_line:not(.o_bank_rec_selected_st_line)',
+                content: _t('Click on a fetched bank transaction to start the reconciliation process.'),
+                run: "click",
+            }, {
+                isActive: ['auto'],
+                trigger: '.dropdown-item[data-menu-xmlid="account.menu_board_journal_1"]',
+                content: _t('Let’s go back to the dashboard.'),
+                run: "click",
+            },
+        ]
+    });
diff --git a/dev_odex30_accounting/odex30_account_accountant/static/tests/move_line.test.js b/dev_odex30_accounting/odex30_account_accountant/static/tests/move_line.test.js
new file mode 100644
index 0000000..643bbf6
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_accountant/static/tests/move_line.test.js
@@ -0,0 +1,340 @@
+import { beforeEach, test } from "@odoo/hoot";
+import { defineAccountModels } from "@account/../tests/account_test_helpers";
+import {
+    assertSteps,
+    click,
+    contains,
+    onRpcBefore,
+    openListView,
+    patchUiSize,
+    SIZES,
+    start,
+    startServer,
+    step,
+} from "@mail/../tests/mail_test_helpers";
+import { onRpc, serverState } from "@web/../tests/web_test_helpers";
+import { getOrigin } from "@web/core/utils/urls";
+
+const ROUTES_TO_IGNORE = [
+    "/bus/im_status",
+    "/web/dataset/call_kw/account.move.line/get_views",
+    "/web/webclient/load_menus",
+    "/web/dataset/call_kw/res.users/load_views",
+    "/hr_attendance/attendance_user_data",
+    "/web/dataset/call_kw/res.users/has_group",
+];
+const openPreparedView = async (size) => {
+    patchUiSize({ size: size });
+    onRpcBefore((route, args) => {
+        if (
+            ROUTES_TO_IGNORE.includes(route) ||
+            route.includes("/web/static/lib/pdfjs/web/viewer.html")
+        ) {
+            return;
+        }
+        step(`${route} - ${JSON.stringify(args)}`);
+    });
+    onRpc(({ method, model, args, kwargs }) => {
+        const route = `/web/dataset/call_kw/${model}/${method}`;
+        if (ROUTES_TO_IGNORE.includes(route)) {
+            return;
+        }
+        step(`${route} - {"kwargs":${JSON.stringify(kwargs)}}`);
+    });
+    await start();
+    await assertSteps([
+        `/mail/data - ${JSON.stringify({
+            init_messaging: {},
+            failures: true,
+            systray_get_activities: true,
+            context: { lang: "en", tz: "taht", uid: serverState.userId, allowed_company_ids: [1] },
+        })}`,
+    ]);
+    await openListView("account.move.line", {
+        context: { group_by: ["move_id"] },
+        arch: `
+        <list editable='bottom' js_class='account_move_line_list'>
+            <field name='id'/>
+            <field name='name'/>
+            <field name='move_id'/>
+        </list>`,
+    });
+};
+
+defineAccountModels();
+
+beforeEach(async () => {
+    const pyEnv = await startServer();
+    const accountMoveLineIds = pyEnv["account.move.line"].create([
+        { name: "line0" },
+        { name: "line1" },
+        { name: "line2" },
+        { name: "line3" },
+        { name: "line4" },
+        { name: "line5" },
+    ]);
+    const accountMove = pyEnv["account.move"].create([
+        { name: "move0", invoice_line_ids: [accountMoveLineIds[0], accountMoveLineIds[1]] },
+        { name: "move1", invoice_line_ids: [accountMoveLineIds[2], accountMoveLineIds[3]] },
+        { name: "move2", invoice_line_ids: [accountMoveLineIds[4], accountMoveLineIds[5]] },
+    ]);
+    const attachmentIds = pyEnv["ir.attachment"].create([
+        { res_id: accountMove[1], res_model: "account.move", mimetype: "application/pdf" },
+        { res_id: accountMove[2], res_model: "account.move", mimetype: "application/pdf" },
+    ]);
+    pyEnv["account.move"].write([accountMove[1]], { attachment_ids: [attachmentIds[0]] });
+    pyEnv["account.move.line"].write([accountMoveLineIds[0]], { move_id: accountMove[0] });
+    pyEnv["account.move.line"].write([accountMoveLineIds[1]], { move_id: accountMove[0] });
+    pyEnv["account.move.line"].write([accountMoveLineIds[2]], {
+        move_id: accountMove[1],
+        move_attachment_ids: [attachmentIds[0]],
+    });
+    pyEnv["account.move.line"].write([accountMoveLineIds[3]], {
+        move_id: accountMove[1],
+        move_attachment_ids: [attachmentIds[0]],
+    });
+    pyEnv["account.move.line"].write([accountMoveLineIds[4]], {
+        move_id: accountMove[2],
+        move_attachment_ids: [attachmentIds[1]],
+    });
+    pyEnv["account.move.line"].write([accountMoveLineIds[5]], {
+        move_id: accountMove[2],
+        move_attachment_ids: [attachmentIds[1]],
+    });
+});
+
+test("No preview on small devices", async () => {
+    await openPreparedView(SIZES.XL);
+    await contains(".o_move_line_list_view");
+    await assertSteps([
+        `/web/dataset/call_kw/account.move.line/web_read_group - ${JSON.stringify({
+            kwargs: {
+                orderby: "",
+                lazy: true,
+                offset: 0,
+                limit: 80,
+                context: {
+                    lang: "en",
+                    tz: "taht",
+                    uid: serverState.userId,
+                    allowed_company_ids: [1],
+                    group_by: ["move_id"],
+                },
+                groupby: ["move_id"],
+                domain: [],
+                fields: ["id:sum"],
+            },
+        })}`,
+    ]);
+    // weak test, no guarantee to wait long enough for the potential attachment preview to show
+    await contains(".o_attachment_preview", { count: 0 }); // The preview component shouldn't be mounted for small screens
+    await click(":nth-child(1 of .o_group_header)");
+    await contains(".o_data_row", { count: 2 });
+    await assertSteps([
+        `/web/dataset/call_kw/account.move.line/web_search_read - ${JSON.stringify({
+            kwargs: {
+                specification: {
+                    id: {},
+                    name: {},
+                    move_id: { fields: { display_name: {} } },
+                    move_attachment_ids: { fields: { mimetype: {} } },
+                },
+                offset: 0,
+                order: "",
+                limit: 80,
+                context: {
+                    lang: "en",
+                    tz: "taht",
+                    uid: serverState.userId,
+                    allowed_company_ids: [1],
+                    bin_size: true,
+                    group_by: ["move_id"],
+                    default_move_id: 1,
+                },
+                count_limit: 10001,
+                domain: [["move_id", "=", 1]],
+            },
+        })}`,
+    ]);
+    await click(":nth-child(1 of .o_data_row) :nth-child(2 of .o_data_cell)");
+    await contains(":nth-child(1 of .o_data_row) :nth-child(2 of .o_data_cell) input");
+    // weak test, no guarantee to wait long enough for the potential attachment preview to show
+    await contains(".o_attachment_preview", { count: 0 }); // The preview component shouldn't be mounted for small screens even when clicking on a line without attachment
+    await click(":nth-child(2 of .o_group_header)");
+    await contains(".o_data_row", { count: 4 });
+    await assertSteps([
+        `/web/dataset/call_kw/account.move.line/web_search_read - ${JSON.stringify({
+            kwargs: {
+                specification: {
+                    id: {},
+                    name: {},
+                    move_id: { fields: { display_name: {} } },
+                    move_attachment_ids: { fields: { mimetype: {} } },
+                },
+                offset: 0,
+                order: "",
+                limit: 80,
+                context: {
+                    lang: "en",
+                    tz: "taht",
+                    uid: serverState.userId,
+                    allowed_company_ids: [1],
+                    bin_size: true,
+                    group_by: ["move_id"],
+                    default_move_id: 2,
+                },
+                count_limit: 10001,
+                domain: [["move_id", "=", 2]],
+            },
+        })}`,
+    ]);
+    await click(":nth-child(4 of .o_data_row) :nth-child(2 of .o_data_cell)");
+    await contains(":nth-child(4 of .o_data_row) :nth-child(2 of .o_data_cell) input");
+    // weak test, no guarantee to wait long enough for the potential attachment preview to show
+    await contains(".o_attachment_preview", { count: 0 }); // The preview component shouldn't be mounted for small screens even when clicking on a line with attachment
+    await assertSteps([], { message: "no extra rpc should be done" });
+});
+
+test("Fetch and preview of attachments on big devices", async () => {
+    await openPreparedView(SIZES.XXL);
+    await contains(".o_move_line_list_view");
+    await assertSteps([
+        `/web/dataset/call_kw/account.move.line/web_read_group - ${JSON.stringify({
+            kwargs: {
+                orderby: "",
+                lazy: true,
+                offset: 0,
+                limit: 80,
+                context: {
+                    lang: "en",
+                    tz: "taht",
+                    uid: serverState.userId,
+                    allowed_company_ids: [1],
+                    group_by: ["move_id"],
+                },
+                groupby: ["move_id"],
+                domain: [],
+                fields: ["id:sum"],
+            },
+        })}`,
+    ]);
+    await contains(".o_attachment_preview");
+    await contains(".o_attachment_preview p", {
+        text: "Choose a line to preview its attachments.",
+    });
+    await contains(".o_attachment_preview iframe", { count: 0 });
+    await click(":nth-child(1 of .o_group_header)");
+    await contains(".o_data_row", { count: 2 });
+    await assertSteps([
+        `/web/dataset/call_kw/account.move.line/web_search_read - ${JSON.stringify({
+            kwargs: {
+                specification: {
+                    id: {},
+                    name: {},
+                    move_id: { fields: { display_name: {} } },
+                    move_attachment_ids: { fields: { mimetype: {} } },
+                },
+                offset: 0,
+                order: "",
+                limit: 80,
+                context: {
+                    lang: "en",
+                    tz: "taht",
+                    uid: serverState.userId,
+                    allowed_company_ids: [1],
+                    bin_size: true,
+                    group_by: ["move_id"],
+                    default_move_id: 1,
+                },
+                count_limit: 10001,
+                domain: [["move_id", "=", 1]],
+            },
+        })}`,
+    ]);
+    await click(":nth-child(1 of .o_data_row) :nth-child(2 of .o_data_cell)");
+    await contains(".o_attachment_preview iframe", { count: 0 });
+    await contains(".o_attachment_preview p", { text: "No attachments linked." });
+    await click(":nth-child(2 of .o_group_header)");
+    await contains(".o_data_row", { count: 4 });
+    await contains(".o_attachment_preview p", { text: "No attachments linked." });
+    await assertSteps([
+        `/web/dataset/call_kw/account.move.line/web_search_read - ${JSON.stringify({
+            kwargs: {
+                specification: {
+                    id: {},
+                    name: {},
+                    move_id: { fields: { display_name: {} } },
+                    move_attachment_ids: { fields: { mimetype: {} } },
+                },
+                offset: 0,
+                order: "",
+                limit: 80,
+                context: {
+                    lang: "en",
+                    tz: "taht",
+                    uid: serverState.userId,
+                    allowed_company_ids: [1],
+                    bin_size: true,
+                    group_by: ["move_id"],
+                    default_move_id: 2,
+                },
+                count_limit: 10001,
+                domain: [["move_id", "=", 2]],
+            },
+        })}`,
+    ]);
+    await click(":nth-child(4 of .o_data_row) :nth-child(2 of .o_data_cell)");
+    await contains(".o_attachment_preview p", { count: 0 });
+    await contains(
+        `.o_attachment_preview iframe[data-src='/web/static/lib/pdfjs/web/viewer.html?file=${encodeURIComponent(
+            getOrigin() + "/web/content/1"
+        )}#pagemode=none']`
+    );
+    await assertSteps([], { message: "no extra rpc should be done" });
+    await click(":nth-child(3 of .o_group_header)");
+    await contains(".o_data_row", { count: 6 });
+    // weak test, no guarantee to wait long enough for the potential attachment to change
+    await contains(
+        `.o_attachment_preview iframe[data-src='/web/static/lib/pdfjs/web/viewer.html?file=${encodeURIComponent(
+            getOrigin() + "/web/content/1"
+        )}#pagemode=none']`
+    ); // The previewer content shouldn't change without clicking on another line from another account.move
+    await assertSteps([
+        `/web/dataset/call_kw/account.move.line/web_search_read - ${JSON.stringify({
+            kwargs: {
+                specification: {
+                    id: {},
+                    name: {},
+                    move_id: { fields: { display_name: {} } },
+                    move_attachment_ids: { fields: { mimetype: {} } },
+                },
+                offset: 0,
+                order: "",
+                limit: 80,
+                context: {
+                    lang: "en",
+                    tz: "taht",
+                    uid: serverState.userId,
+                    allowed_company_ids: [1],
+                    bin_size: true,
+                    group_by: ["move_id"],
+                    default_move_id: 3,
+                },
+                count_limit: 10001,
+                domain: [["move_id", "=", 3]],
+            },
+        })}`,
+    ]);
+    await click(":nth-child(5 of .o_data_row) :nth-child(2 of .o_data_cell)");
+    await contains(":nth-child(5 of .o_data_row) :nth-child(2 of .o_data_cell) input");
+    await contains(
+        `.o_attachment_preview iframe[data-src='/web/static/lib/pdfjs/web/viewer.html?file=${encodeURIComponent(
+            getOrigin() + "/web/content/2"
+        )}#pagemode=none']`
+    );
+    await assertSteps([]);
+    await click(":nth-child(1 of .o_data_row) :nth-child(2 of .o_data_cell)");
+    await contains(".o_attachment_preview iframe", { count: 0 });
+    await contains(".o_attachment_preview p");
+    await assertSteps([]);
+});
diff --git a/dev_odex30_accounting/odex30_account_accountant/static/tests/tours/test_tour_bank_rec_rainbowman_reset.js b/dev_odex30_accounting/odex30_account_accountant/static/tests/tours/test_tour_bank_rec_rainbowman_reset.js
new file mode 100644
index 0000000..ed47772
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_accountant/static/tests/tours/test_tour_bank_rec_rainbowman_reset.js
@@ -0,0 +1,91 @@
+/** @odoo-module **/
+
+import { registry } from "@web/core/registry";
+import { stepUtils } from "@web_tour/tour_service/tour_utils";
+import { accountTourSteps } from "@account/js/tours/account";
+
+registry.category("web_tour.tours").add("account_accountant_bank_rec_widget_rainbowman_reset", {
+    url: "/odoo",
+    steps: () => [
+        stepUtils.showAppsMenuItem(),
+        ...accountTourSteps.goToAccountMenu("Open the accounting module"),
+
+        // Open the widget. The first line should be selected by default.
+        {
+            trigger: ".o_breadcrumb",
+        },
+        {
+            content: "Open the bank reconciliation widget",
+            trigger: "button.btn-secondary[name='action_open_reconcile']",
+            run: "click",
+        },
+        {
+            trigger: "div[name='line_ids'] td[field='name']:contains('line1')",
+        },
+        {
+            content: "'line1' should be selected and form mounted",
+            trigger: ".o_bank_rec_selected_st_line:contains('line1')",
+        },
+        // Rainbowman gets reset
+        {
+            content: "Mount invoice 2 for line 1",
+            trigger:
+                "div.bank_rec_widget_form_amls_list_anchor table.o_list_table td[name='move_id']:contains('INV/2019/00002')",
+            run: "click",
+        },
+        {
+            trigger:
+                "div.bank_rec_widget_form_amls_list_anchor table.o_list_table tr.o_rec_widget_list_selected_item td[name='move_id']:contains('INV/2019/00002')",
+        },
+        {
+            content: "Validate line1",
+            trigger: "button:contains('Validate')",
+            run: "click",
+        },
+        {
+            trigger: ".o_bank_rec_selected_st_line:contains('line2')",
+        },
+        {
+            content: "No records brings rainbows",
+            trigger: "div.o_kanban_view .o_searchview_input",
+            run: "fill thisShouldNotReturnAnyRecords",
+        },
+        {
+            content: "Select the Journal Entry search option from the dropdown",
+            trigger: ".o_searchview_autocomplete li:contains(Journal Entry)",
+            run: "click",
+        },
+        {
+            trigger: ".o_reward_rainbow_man:contains('You reconciled 1 transaction in')",
+        },
+        {
+            content: "Remove the filter while rainbow man is on screen",
+            trigger: ".o_kanban_view .o_searchview_facet:nth-child(3) .o_facet_remove",
+            run: "click",
+        },
+        {
+            trigger: ".o_bank_rec_st_line:contains('line2')",
+        },
+        {
+            content: "Search for no results again",
+            trigger: "div.o_kanban_view .o_searchview_input",
+            run: "fill thisShouldNotReturnAnyRecords",
+        },
+        {
+            content: "Select the Journal Entry search option from the dropdown",
+            trigger: ".o_searchview_autocomplete li:contains(Journal Entry)",
+            run: "click",
+        },
+        {
+            content: "No content helper is displayed instead of rainbowman",
+            trigger: ".o_view_nocontent_smiling_face",
+        },
+        // End
+        ...stepUtils.toggleHomeMenu(),
+        ...accountTourSteps.goToAccountMenu("Reset back to accounting module"),
+        {
+            content: "check that we're back on the dashboard",
+            trigger: 'a:contains("Customer Invoices")',
+        },
+    ],
+});
diff --git a/dev_odex30_accounting/odex30_account_accountant/static/tests/tours/test_tour_bank_rec_save_analytic_distribution.js b/dev_odex30_accounting/odex30_account_accountant/static/tests/tours/test_tour_bank_rec_save_analytic_distribution.js
new file mode 100644
index 0000000..7113a15
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_accountant/static/tests/tours/test_tour_bank_rec_save_analytic_distribution.js
@@ -0,0 +1,69 @@
+/** @odoo-module **/
+
+import { registry } from "@web/core/registry";
+import { stepUtils } from "@web_tour/tour_service/tour_utils";
+import { accountTourSteps } from "@account/js/tours/account";
+
+
+registry.category("web_tour.tours").add('account_accountant_bank_rec_widget_save_analytic_distribution', {
+    url: '/odoo',
+    steps: () => [
+        stepUtils.showAppsMenuItem(),
+        ...accountTourSteps.goToAccountMenu("Open the accounting module"),
+        {
+            trigger: ".o_breadcrumb",
+        },
+        {
+            content: "Open the bank reconciliation widget",
+            trigger: "button.btn-secondary[name='action_open_reconcile']",
+            run: "click",
+        },
+        {
+            trigger: "div[name='line_ids']",
+        },
+        {
+            content: "The 'line1' should be selected by default",
+            trigger: "div[name='line_ids'] td[field='name']:contains('line1')",
+            run: function() {},
+        },
+        {
+            content: "Click on first line",
+            trigger: "div[name='line_ids'] td[field='debit']:first",
+            run: "click",
+        },
+        {
+            content: "The 'manual_operations_tab' should be active now and the auto_balance line mounted in edit",
+            trigger: "a.active[name='manual_operations_tab']",
+            run: function() {},
+        },
+        {
+            content: "Enter an analytic distribution",
+            trigger: "div[name='analytic_distribution'] .o_input_dropdown",
+            run: "click",
+        },
+        {
+            content: "Select analytic distribution",
+            trigger: "tr[name='line_0'] input",
+            run: "edit analytic_account",
+        },
+        {
+            trigger: ".ui-autocomplete",
+        },
+        {
+            content: "Select analytic distribution",
+            trigger: ".ui-autocomplete:visible li:contains('analytic_account')",
+            run: "click",
+        },
+        {
+            content: "Close the analytic distribution",
+            trigger: ".o_button",
+            run: "click",
+        },
+        ...stepUtils.toggleHomeMenu(),
+        ...accountTourSteps.goToAccountMenu("Reset back to accounting module"),
+        {
+            content: "check that we're back on the dashboard",
+            trigger: 'a:contains("Customer Invoices")',
+        },
+    ]
+});
diff --git a/dev_odex30_accounting/odex30_account_accountant/static/tests/tours/test_tour_bank_rec_statements.js b/dev_odex30_accounting/odex30_account_accountant/static/tests/tours/test_tour_bank_rec_statements.js
new file mode 100644
index 0000000..31d37e8
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_accountant/static/tests/tours/test_tour_bank_rec_statements.js
@@ -0,0 +1,95 @@
+/** @odoo-module **/
+
+import { registry } from "@web/core/registry";
+import { stepUtils } from "@web_tour/tour_service/tour_utils";
+import { accountTourSteps } from "@account/js/tours/account";
+
+registry.category("web_tour.tours").add('account_accountant_bank_rec_widget_statements',
+    {
+        url: '/odoo',
+        steps: () => [
+        stepUtils.showAppsMenuItem(),
+        ...accountTourSteps.goToAccountMenu("Open the accounting module"),
+        {
+            trigger: ".o_breadcrumb",
+        },
+        {
+            content: "Open the bank reconciliation widget",
+            trigger: "button.btn-secondary[name='action_open_reconcile']",
+            run: "click",
+        },
+        {
+            content: "Statement button",
+            trigger:
+                ".o_bank_rec_st_line:eq(2) a.oe_kanban_action:contains('Statement'):not(:visible)",
+            run: "click",
+        },
+        {
+            trigger: ".modal-dialog:contains('Create Statement')",
+        },
+        {
+            content: "Save the statement with proposed values",
+            trigger: ".o_form_button_save",
+            run: "click",
+        },
+        {
+            content: "Click the Valid Statement with $ 1,000.00 that is visible in Kanban",
+            trigger: "span[name='kanban-subline-clickable-amount']:contains('$ 1,000.00')",
+            run: "click",
+        },
+        {
+            content: "Modify the end balance",
+            trigger: "input[id='balance_end_real_0']",
+            run: "edit 100 && click body",
+        },
+        {
+            trigger: ".alert-warning:contains('The running balance')",
+        },
+        {
+            content: "Dialog displays warning, save anyway",
+            trigger: ".breadcrumb-item.o_back_button:nth-of-type(2)",
+            run: "click",
+        },
+        {
+            trigger: ".btn-link:contains('$ 2,100.00')",
+        },
+        {
+            content: "Click the red statement, after checking the balance",
+            trigger: "span[name='kanban-subline-clickable-amount']:contains('$ 100.00')",
+            run: "click",
+        },
+        {
+            content: "Back in the form view",
+            trigger: ".alert-warning:contains('The running balance')",
+        },
+        {
+            content: "Click on Action",
+            trigger: ".o_cp_action_menus button",
+            run: "click",
+        },
+        {
+            content: "Click on Delete",
+            trigger: ".o-dropdown--menu span:contains('Delete')",
+            run: "click",
+        },
+        {
+            content: "Confirm Deletion",
+            trigger: ".btn-primary:contains('Delete')",
+            run: "click",
+        },
+        {
+            trigger: ".o_kanban_renderer:not(:has(.kanban-statement))",
+        },
+        {
+            content: "balance displays $3000.00 and no statement",
+            trigger: ".btn-link:contains('$ 3,000')",
+        },
+        // End
+        ...stepUtils.toggleHomeMenu(),
+        ...accountTourSteps.goToAccountMenu("Reset back to accounting module"),
+        {
+            content: "check that we're back on the dashboard",
+            trigger: 'a:contains("Customer Invoices")',
+        }
+    ]
+});
diff --git a/dev_odex30_accounting/odex30_account_accountant/static/tests/tours/test_tour_bank_rec_ui.js b/dev_odex30_accounting/odex30_account_accountant/static/tests/tours/test_tour_bank_rec_ui.js
new file mode 100644
index 0000000..00b9173
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_accountant/static/tests/tours/test_tour_bank_rec_ui.js
@@ -0,0 +1,960 @@
+/** @odoo-module **/
+
+import { registry } from "@web/core/registry";
+import { stepUtils } from "@web_tour/tour_service/tour_utils";
+import { patch } from "@web/core/utils/patch";
+import { accountTourSteps } from "@account/js/tours/account";
+
+patch(accountTourSteps, {
+    bankRecUiReportSteps() {
+        return [
+            {
+                trigger: ".o_bank_rec_selected_st_line:contains('line1')",
+            },
+            {
+                content: "balance is 2100",
+                trigger: ".btn-link:contains('$ 2,100.00')",
+            },
+        ];
+    },
+});
+
+registry.category("web_tour.tours").add("account_accountant_bank_rec_widget_ui", {
+    url: "/odoo",
+    steps: () => [
+        stepUtils.showAppsMenuItem(),
+        ...accountTourSteps.goToAccountMenu("Open the accounting module"),
+
+        // Open the widget. The first line should be selected by default.
+        {
+            trigger: ".o_breadcrumb",
+        },
+        {
+            content: "Open the bank reconciliation widget",
+            trigger: "button.btn-secondary[name='action_open_reconcile']",
+            run: "click",
+        },
+        {
+            trigger: "div[name='line_ids'] td[field='name']:contains('line1')",
+        },
+        {
+            content: "'line1' should be selected and form mounted",
+            trigger: ".o_bank_rec_selected_st_line:contains('line1')",
+        },
+        // Select line2. It should remain selected when returning using the breadcrumbs.
+        {
+            trigger: ".o_bank_rec_st_line:contains('line3')",
+        },
+        {
+            content: "select 'line2'",
+            trigger: ".o_bank_rec_st_line:contains('line2')",
+            run: "click",
+        },
+        {
+            content: "'line2' should be selected",
+            trigger: ".o_bank_rec_selected_st_line:contains('line2')",
+        },
+        {
+            content: "View an invoice",
+            trigger: "button.btn-secondary[name='action_open_business_doc']:eq(1)",
+            run: "click",
+        },
+        {
+            trigger: ".o_breadcrumb .active:contains('INV/2019/00001')",
+        },
+        {
+            content: "Breadcrumb back to Bank Reconciliation from INV/2019/00001",
+            trigger: ".breadcrumb-item:contains('Bank Reconciliation')",
+            run: "click",
+        },
+        {
+            trigger: ".o_bank_rec_st_line:contains('line1')",
+        },
+        {
+            content: "'line2' should be selected after returning",
+            trigger: ".o_bank_rec_selected_st_line:contains('line2')",
+            run: "click",
+        },
+        {
+            trigger: "div[name='line_ids'] td[field='name']:contains('line2')",
+        },
+        {
+            content: "'line2' form mounted",
+            trigger: ".o_bank_rec_selected_st_line:contains('line2')",
+            run: "click",
+        },
+        // Keep AML search, and prepared entry (line_ids) when changing tabs, using breadcrumbs, and view switcher
+        {
+            trigger:
+                "div.bank_rec_widget_form_amls_list_anchor table.o_list_table tr:nth-child(2) td[name='move_id']:contains('INV/2019/00001')",
+        },
+        {
+            content: "AMLs list has both invoices",
+            trigger:
+                "div.bank_rec_widget_form_amls_list_anchor table.o_list_table tr:nth-child(1) td[name='move_id']:contains('INV/2019/00002')",
+        },
+        {
+            trigger: "a.active[name='amls_tab']",
+        },
+        {
+            content: "Search for INV/2019/00001",
+            trigger: "div.bank_rec_widget_form_amls_list_anchor .o_searchview_input",
+            run: "edit INV/2019/00001",
+        },
+        {
+            content: "Select the Journal Entry search option from the dropdown",
+            trigger: ".o_searchview_autocomplete li:contains(Journal Entry)",
+            run: "click",
+        },
+        {
+            content: "AMLs list only displays one invoice",
+            trigger:
+                "div.bank_rec_widget_form_amls_list_anchor table.o_list_table tr:nth-child(1) td[name='move_id']:contains('INV/2019/00001')",
+        },
+        {
+            content: "Liquidity line displays debit '$ 1,000.00'",
+            trigger:
+                "div[name='line_ids'] table.o_list_table tr.o_bank_rec_liquidity_line td[field='debit']:contains('$ 1,000.00')",
+        },
+        {
+            content: "Select the liquidity line",
+            trigger: "tr.o_bank_rec_liquidity_line td[field='debit']",
+            run: "click",
+        },
+        {
+            content: "Modify the liquidity line amount",
+            trigger: "div[name='amount_currency'] input",
+            run: "edit 100.00 && click body",
+        },
+        {
+            content: "Liquidity line displays debit '$ 100.00'",
+            trigger:
+                "div[name='line_ids'] table.o_list_table tr.o_bank_rec_liquidity_line td[field='debit']:contains('$ 100.00')",
+        },
+        {
+            trigger: "div[name='partner_id'] input",
+        },
+        {
+            content: "Select 'amls_tab'",
+            trigger: "a[name='amls_tab']",
+            run: "click",
+        },
+        {
+            trigger:
+                "div.bank_rec_widget_form_amls_list_anchor .o_searchview_facet:nth-child(1) .o_facet_value:contains('INV/2019/00001')",
+        },
+        {
+            content: "AMLs list contains the search facet, and one invoice - select it",
+            trigger:
+                "div.bank_rec_widget_form_amls_list_anchor table.o_list_table tr:nth-child(1) td[name='move_id']:contains('INV/2019/00001')",
+            run: "click",
+        },
+        {
+            trigger:
+                "div.bank_rec_widget_form_amls_list_anchor table.o_list_table tr.o_rec_widget_list_selected_item td[name='move_id']:contains('INV/2019/00001')",
+        },
+        {
+            content: "Check INV/2019/00001 is well marked as selected",
+            trigger:
+                "div.bank_rec_widget_form_amls_list_anchor table.o_list_table tr.o_rec_widget_list_selected_item td[name='move_id']:contains('INV/2019/00001')",
+        },
+        {
+            content: "View an invoice",
+            trigger: "button.btn-secondary[name='action_open_business_doc']:nth-child(1)",
+            run: "click",
+        },
+        {
+            trigger: ".o_breadcrumb .active:contains('INV/2019/00001')",
+        },
+        {
+            content: "Breadcrumb back to Bank Reconciliation from INV/2019/00001",
+            trigger: ".breadcrumb-item:contains('Bank Reconciliation')",
+            run: "click",
+        },
+        {
+            trigger:
+                "div.bank_rec_widget_form_amls_list_anchor .o_searchview_facet:nth-child(1) .o_facet_value:contains('INV/2019/00001')",
+        },
+        {
+            content: "Check INV/2019/00001 is selected and still contains the search facet",
+            trigger:
+                "div.bank_rec_widget_form_amls_list_anchor table.o_list_table tr.o_rec_widget_list_selected_item td[name='move_id']:contains('INV/2019/00001')",
+        },
+        // Search should remove some lines, select the first unmatched record, and persist when returning with breadcrumbs
+        {
+            trigger: "a.active[name='amls_tab']",
+        },
+        {
+            content: "Search for line2",
+            trigger: "div.o_kanban_view .o_searchview_input",
+            run: "fill line2",
+        },
+        {
+            content: "Select the Transaction search option from the dropdown",
+            trigger: ".o_searchview_autocomplete li:contains(Transaction)",
+            run: "click",
+        },
+        {
+            trigger: "div[name='line_ids'] td[field='name']:contains('line2')",
+        },
+        {
+            content: "'line2' should be selected",
+            trigger: ".o_bank_rec_st_line:last():contains('line2')",
+        },
+        {
+            trigger:
+                "div.bank_rec_widget_form_amls_list_anchor .o_searchview_facet:nth-child(1) .o_facet_value:contains('INV/2019/00001')",
+        },
+        {
+            content:
+                "Nothing has changed: INV/2019/00001 is selected and still contains the search facet",
+            trigger:
+                "div.bank_rec_widget_form_amls_list_anchor table.o_list_table tr.o_rec_widget_list_selected_item td[name='move_id']:contains('INV/2019/00001')",
+        },
+        {
+            trigger: ".o_switch_view.o_kanban.active",
+        },
+        {
+            content: "Switch to list view",
+            trigger: ".o_switch_view.o_list",
+            run: "click",
+        },
+        {
+            trigger: ".o_switch_view.o_list.active",
+        },
+        {
+            content: "Switch back to kanban",
+            trigger: ".o_switch_view.o_kanban",
+            run: "click",
+        },
+        {
+            content: "Remove the kanban filter for line2",
+            trigger: ".o_kanban_view .o_searchview_facet:nth-child(3) .o_facet_remove",
+            run: "click",
+        },
+        {
+            trigger:
+                "div.bank_rec_widget_form_amls_list_anchor .o_searchview_facet:nth-child(1) .o_facet_value:contains('INV/2019/00001')",
+        },
+        {
+            content:
+                "Nothing has changed: INV/2019/00001 is still selected and contains the search facet",
+            trigger:
+                "div.bank_rec_widget_form_amls_list_anchor table.o_list_table tr.o_rec_widget_list_selected_item td[name='move_id']:contains('INV/2019/00001')",
+        },
+        // AML Search Facet is removed, and line_ids reset when changing line
+        {
+            trigger: ".o_bank_rec_st_line:contains('line3')",
+        },
+        {
+            content: "selecting 'line1' should reset the AML search filter ",
+            trigger: ".o_bank_rec_st_line:contains('line1')",
+            run: "click",
+        },
+        {
+            trigger: "div[name='line_ids'] td[field='name']:contains('line1')",
+        },
+        {
+            content: "select 'line2' again",
+            trigger: ".o_bank_rec_st_line:contains('line2')",
+            run: "click",
+        },
+        {
+            trigger: "div[name='line_ids'] td[field='name']:contains('line2')",
+        },
+        {
+            content: "Bank Suspense Account is back",
+            trigger: "div[name='line_ids'] .o_bank_rec_auto_balance_line",
+        },
+        {
+            content: "AML Search Filter has been reset",
+            trigger: ".o_list_view .o_searchview_input_container:not(:has(.o_searchview_facet))",
+        },
+        // Test statement line selection when using the pager
+        {
+            content: "Click Pager",
+            trigger: ".o_pager_value:first()",
+            run: "click",
+        },
+        {
+            content: "Change pager to display lines 1-2",
+            trigger: "input.o_pager_value",
+            run: "edit 1-2 && click body",
+        },
+        {
+            trigger: ".o_pager_value:contains('1-2')",
+        },
+        {
+            content: "Last St Line is line2",
+            trigger: ".o_bank_rec_st_line:last():contains('line2')",
+        },
+        {
+            content: "Page Next",
+            trigger: ".o_pager_next:first():not(:disabled)",
+            run: "click",
+        },
+        {
+            trigger: ".o_pager_value:contains('3-3')",
+        },
+        {
+            content: "Statement line3 is selected",
+            trigger: ".o_bank_rec_selected_st_line:contains('line3')",
+        },
+        {
+            content: "Page to beginning",
+            trigger: ".o_pager_next:first()",
+            run: "click",
+        },
+        {
+            trigger: "div[name='line_ids'] td[field='name']:contains('line1')",
+        },
+        {
+            content: "Statement line1 is selected",
+            trigger: ".o_bank_rec_selected_st_line:contains('line1')",
+        },
+        // HTML buttons
+        {
+            content: "Mount an invoice",
+            trigger:
+                "div.bank_rec_widget_form_amls_list_anchor table.o_list_table td[name='move_id']:contains('INV/2019/00003')",
+            run: "click",
+        },
+        {
+            trigger:
+                "div[name='line_ids']:has(.text-decoration-line-through:contains('$ 2,000.00'))",
+        },
+        {
+            content: "Select the mounted invoice line and check the strikethrough value",
+            trigger:
+                "div[name='line_ids'] tr.o_data_row:last() td[field='name']:contains('INV/2019/00003')",
+            run: "click",
+        },
+        {
+            trigger: "a.active[name='manual_operations_tab']",
+        },
+        {
+            content: "Fully Paid button",
+            trigger: "button[name='action_apply_line_suggestion']:contains('fully paid')",
+            run: "click",
+        },
+        {
+            content: "Check the remainder",
+            trigger:
+                "div[name='line_ids'] tr.o_data_row:contains('Suspense') td[field='debit']:contains('$ 1,000.00')",
+        },
+        {
+            content: "Partial Payment",
+            trigger: "button[name='action_apply_line_suggestion']:contains('partial payment')",
+            run: "click",
+        },
+        {
+            trigger: "button[name='action_apply_line_suggestion']:contains('fully paid')",
+        },
+        {
+            content: "View Invoice 0003",
+            trigger: "button[name='action_redirect_to_move']",
+            run: "click",
+        },
+        {
+            trigger: ".o_breadcrumb .active:contains('INV/2019/00003')",
+        },
+        {
+            content: "Breadcrumb back to Bank Reconciliation from INV/2019/00003",
+            trigger: ".breadcrumb-item:contains('Bank Reconciliation')",
+            run: "click",
+        },
+        {
+            content: "Select the mounted invoice line INV/2019/00003",
+            trigger:
+                "div[name='line_ids'] tr.o_data_row:last() td[field='name']:contains('INV/2019/00003')",
+            run: "click",
+        },
+        // Match Existing entries tab is activated when line is removed
+        {
+            trigger: "a.active[name='manual_operations_tab']",
+        },
+        {
+            content: "Remove the invoice",
+            trigger: ".o_list_record_remove .fa-trash-o",
+            run: "click",
+        },
+        {
+            content: "amls_tab is activated",
+            trigger: "a.active[name='amls_tab']",
+        },
+        {
+            content: "Activate Manual Operations to add manual entries",
+            trigger: "a[name='manual_operations_tab']",
+            run: "click",
+        },
+        {
+            content: "add manual entry 1",
+            trigger: "div[name='amount_currency'] input",
+            run: "edit -600.0 && click body",
+        },
+        {
+            content: "mount the remaining opening balance line",
+            trigger:
+                "div[name='line_ids'] tr.o_data_row:contains('Suspense') td[field='credit']:contains('$ 400.00')",
+            run: "click",
+        },
+        {
+            trigger: "div[name='amount_currency'] input:value('-400.00'):focus-within",
+        },
+        {
+            content: "Remove the manual entry",
+            trigger: ".o_list_record_remove .fa-trash-o",
+            run: "click",
+        },
+        {
+            trigger:
+                "div[name='line_ids'] tr.o_data_row:contains('Suspense') td[field='credit']:contains('$ 1,000.00')",
+        },
+        {
+            content: "amls_tab is activated and auto balancing line is 1000",
+            trigger: "a.active[name='amls_tab']",
+        },
+        {
+            content: "Mount another invoice",
+            trigger:
+                "div.bank_rec_widget_form_amls_list_anchor table.o_list_table td[name='move_id']:contains('INV/2019/00001')",
+            run: "click",
+        },
+        // After validating, line1 should disappear & line2 should be selected (due to filters)
+        {
+            trigger:
+                "div.bank_rec_widget_form_amls_list_anchor table.o_list_table tr.o_rec_widget_list_selected_item td[name='move_id']:contains('INV/2019/00001')",
+        },
+        {
+            content: "Validate line1",
+            trigger: "button:contains('Validate')",
+            run: "click",
+        },
+        {
+            trigger: "div[name='line_ids'] td[field='name']:contains('line2')",
+        },
+        {
+            content: "The 'line2' is the first kanban record and is selected",
+            trigger: ".o_bank_rec_st_line:first():contains('line2')",
+        },
+        // Test Reset, "Matched" badge and double-click
+        {
+            content: "Remove the kanban filter for 'Not Matched'",
+            trigger: ".o_kanban_view .o_searchview_facet:nth-child(2) .o_facet_remove",
+            run: "click",
+        },
+        {
+            trigger: "div[name='line_ids'] td[field='name']:contains('line2')",
+        },
+        {
+            content: "The 'line1' is the first kanban record with line2 selected",
+            trigger: ".o_bank_rec_st_line:first():contains('line1')",
+        },
+        {
+            content: "Mount invoice 2 for line 2",
+            trigger:
+                "div.bank_rec_widget_form_amls_list_anchor table.o_list_table td[name='move_id']:contains('INV/2019/00002')",
+            run: "click",
+        },
+        {
+            trigger:
+                "div.bank_rec_widget_form_amls_list_anchor table.o_list_table tr.o_rec_widget_list_selected_item td[name='move_id']:contains('INV/2019/00002')",
+        },
+        {
+            content: "Validate line2 with double click",
+            trigger: "button:contains('Validate')",
+            run: "dblclick",
+        },
+        {
+            trigger: ".o_bank_rec_st_line:contains('line2') .badge.text-bg-success",
+        },
+        {
+            content: "Click Pager again after line2 is matched",
+            trigger: ".o_pager_value:first()",
+            run: "click",
+        },
+        {
+            content: "Change pager to display lines 1-3",
+            trigger: "input.o_pager_value",
+            run: "edit 1-3 && click body",
+        },
+        {
+            trigger: ".o_bank_rec_selected_st_line:contains('line3')",
+        },
+        {
+            content: "manually select line2 again by clicking it's matched icon",
+            trigger: ".badge.text-bg-success:last()",
+            run: "click",
+        },
+        {
+            trigger:
+                "div[name='line_ids']:not(:has(.fa-trash-o)) td[field='name']:contains('line2')",
+        },
+        {
+            content: "Reset line2",
+            trigger: "button:contains('Reset')",
+            run: "click",
+        },
+        {
+            trigger: ".o_bank_rec_selected_st_line:contains('line2'):not(:has(div.badge))",
+        },
+        {
+            content: "amls_tab is activated while still on line2 which doesn't contain a badge",
+            trigger: ".o_notebook a.active[name='amls_tab']",
+        },
+        // Test view_switcher
+        {
+            trigger: ".o_switch_view.o_kanban.active",
+        },
+        {
+            content: "Switch to list view",
+            trigger: ".o_switch_view.o_list",
+            run: "click",
+        },
+        {
+            trigger: ".btn-secondary:contains('View')",
+        },
+        {
+            content: "Select the first Match Button (line2)",
+            trigger: ".btn-secondary:contains('Match')",
+            run: "click",
+        },
+        {
+            trigger: ".o_bank_rec_st_line:last():contains('line2')",
+        },
+        {
+            content: "Last St Line is line2",
+            trigger: ".o_bank_rec_selected_st_line:contains('line2')",
+            run: "click",
+        },
+        {
+            content: "Button To Check will reconcile since partner is saved on line2",
+            trigger: ".btn-secondary:contains('To Check')",
+            run: "click",
+        },
+        {
+            trigger:
+                ".o_bank_rec_selected_st_line:contains('line2'):has(div.badge[title='Matched'] i):has(span.badge:contains('To check'))",
+        },
+        {
+            content: "both badges are visible, trash icon is not, manual operation tab is active",
+            trigger:
+                "div[name='line_ids']:not(:has(.fa-trash-o))+.o_notebook a.active[name='manual_operations_tab']",
+        },
+        {
+            trigger: ".o_switch_view.o_kanban.active",
+        },
+        {
+            content: "Switch to list view",
+            trigger: ".o_switch_view.o_list",
+            run: "click",
+        },
+        {
+            trigger: ".o_switch_view.o_list.active",
+        },
+        {
+            content: "Remove the line filter",
+            trigger: ".o_searchview_facet:contains('0002') .o_facet_remove",
+            run: "click",
+        },
+        {
+            trigger: ".o_data_row:contains('line2'):has(.btn-secondary:contains('View'))",
+        },
+        {
+            content: "Select the first Match Button (line3)",
+            trigger: ".btn-secondary:contains('Match')",
+            run: "click",
+        },
+        {
+            trigger: ".o_bank_rec_stats_buttons",
+        },
+        {
+            content: "Open search bar menu",
+            trigger: ".o_searchview_dropdown_toggler:eq(0)",
+            run: "click",
+        },
+        // Test Reco Model
+        {
+            trigger: ".o-dropdown--menu.o_search_bar_menu",
+        },
+        {
+            content: "Choose a filter",
+            trigger: ".o_search_bar_menu .dropdown-item:first()",
+            run: "click",
+        },
+        {
+            trigger: ".o-dropdown--menu",
+        },
+        {
+            content: "Not Matched Filter",
+            trigger: ".dropdown-item:contains('Not Matched')",
+            run: "click",
+        },
+        {
+            trigger: ".o_switch_view.o_kanban.active",
+        },
+        {
+            content: "reco model dropdown",
+            trigger: ".bank_rec_reco_model_dropdown i",
+            run: "click",
+        },
+        {
+            trigger: ".o-dropdown--menu",
+        },
+        {
+            content: "create model",
+            trigger: ".dropdown-item:contains('Create model')",
+            run: "click",
+        },
+        {
+            content: "model name",
+            trigger: "input#name_0",
+            run: "edit Bank Fees",
+        },
+        {
+            content: "add an account",
+            trigger: "a:contains('Add a line')",
+            run: "click",
+        },
+        {
+            content: "search for bank fees account",
+            trigger: "[name='account_id'] input",
+            run: "edit Bank Fees",
+        },
+        {
+            trigger: ".o-autocomplete--dropdown-menu",
+        },
+        {
+            content: "select the bank fees account",
+            trigger: ".o-autocomplete--dropdown-item:contains('Bank Fees')",
+            run: "click",
+        },
+        {
+            trigger: ".o_breadcrumb .active > span:contains('New')",
+        },
+        {
+            content: "Breadcrumb back to Bank Reconciliation from the model",
+            trigger: ".breadcrumb-item:contains('Bank Reconciliation')",
+            run: "click",
+        },
+        {
+            content: "Choose Bank Fees Model",
+            trigger: ".recon_model_button:contains('Bank Fees')",
+            run: "click",
+        },
+        {
+            content: "Validate line3",
+            trigger: "button:contains('Validate').btn-primary",
+            run: "dblclick",
+        },
+        {
+            trigger: ".o_reward_rainbow_man",
+        },
+        {
+            content:
+                "Remove the kanbans 'not matched' filter to reset all lines - use the rainbow man button",
+            trigger: "p.btn-primary:contains('All Transactions')",
+            run: "click",
+        },
+        {
+            trigger:
+                ".o_kanban_view .o_searchview:first() .o_searchview_facet:last():contains('Bank')",
+        },
+        {
+            content: "Wait for search model change and line3 to appear",
+            trigger: ".o_bank_rec_st_line:last():contains('line3')",
+        },
+        {
+            trigger: ".o_bank_rec_selected_st_line:contains('line2')",
+        },
+        {
+            content: "'line2' should be selected, reset it",
+            trigger: "button:contains('Reset')",
+            run: "click",
+        },
+        {
+            trigger: ".o_bank_rec_st_line:contains('line2'):not(:has(div.badge))",
+        },
+        {
+            content: "select matched 'line3'",
+            trigger: ".o_bank_rec_st_line:contains('line3')",
+            run: "click",
+        },
+        {
+            trigger: ".o_bank_rec_selected_st_line:contains('line3')",
+        },
+        {
+            content: "'line3' should be selected, reset it",
+            trigger: "button:contains('Reset')",
+            run: "click",
+        },
+        {
+            trigger: ".o_bank_rec_st_line:contains('line3'):not(:has(div.badge))",
+        },
+        {
+            content: "select matched 'line1'",
+            trigger: ".o_bank_rec_st_line:contains('line1')",
+            run: "click",
+        },
+        {
+            trigger: ".o_bank_rec_selected_st_line:contains('line1')",
+        },
+        {
+            content: "'line1' should be selected, reset it",
+            trigger: "button:contains('Reset')",
+            run: "click",
+        },
+        {
+            trigger: ".o_bank_rec_stats_buttons",
+        },
+        {
+            content: "Open search bar menu",
+            trigger: ".o_searchview_dropdown_toggler:eq(0)",
+            run: "click",
+        },
+        {
+            trigger: "button:contains('Validate')",
+        },
+        {
+            content: "Filter Menu",
+            trigger: ".o_search_bar_menu .dropdown-item:first()",
+            run: "click",
+        },
+        {
+            trigger: ".o-dropdown--menu",
+        },
+        {
+            content: "Activate the Not Matched filter",
+            trigger: ".dropdown-item:contains('Not Matched')",
+            run: "click",
+        },
+        {
+            trigger: ".o_searchview_facet:contains('Not Matched')",
+        },
+        {
+            content: "Close the Filter Menu",
+            trigger: ".o_searchview_dropdown_toggler:eq(0)",
+            run: "click",
+        },
+        {
+            trigger: ".o_searchview_facet:contains('Not Matched')",
+        },
+        {
+            content: "select 'line2'",
+            trigger: ".o_bank_rec_st_line:contains('line2')",
+            run: "click",
+        },
+        {
+            trigger: ".o_bank_rec_selected_st_line:contains('line2')",
+        },
+        {
+            content: "Validate 'line2' again",
+            trigger: "button:contains('Validate')",
+            run: "click",
+        },
+        {
+            trigger: ".o_bank_rec_selected_st_line:contains('line3')",
+        },
+        {
+            content: "'line3' should be selected now",
+            trigger: ".o_bank_rec_selected_st_line:contains('line3')",
+        },
+        // Test the Balance when changing journal and liquidity line
+        ...stepUtils.toggleHomeMenu(),
+        ...accountTourSteps.goToAccountMenu("Reset back to accounting module"),
+        {
+            trigger: ".o_breadcrumb",
+        },
+        {
+            content: "Open the bank reconciliation widget for Bank2",
+            trigger: "button.btn-secondary[name='action_open_reconcile']:last()",
+            run: "click",
+        },
+        {
+            content: "Remove the kanbans 'not matched' filter",
+            trigger: ".o_kanban_view .o_searchview_facet:nth-child(2) .o_facet_remove",
+            run: "click",
+        },
+        {
+            content: "Remove the kanban 'journal' filter",
+            trigger: ".o_kanban_view .o_searchview_facet:nth-child(1) .o_facet_remove",
+            run: "click",
+        },
+        {
+            content: "select 'line1' from another journal",
+            trigger: ".o_bank_rec_st_line:contains('line1')",
+            run: "click",
+        },
+        ...accountTourSteps.bankRecUiReportSteps(),
+        {
+            content: "select 'line4' from this journal",
+            trigger: ".o_bank_rec_st_line:contains('line4')",
+            run: "click",
+        },
+        {
+            trigger: ".o_bank_rec_selected_st_line:contains('line4')",
+        },
+        {
+            content: "balance is $222.22",
+            trigger: ".btn-link:contains('$ 222.22')",
+        },
+        {
+            content: "Select the liquidity line",
+            trigger: "tr.o_bank_rec_liquidity_line td[field='debit']",
+            run: "click",
+        },
+        {
+            trigger: "div[name='amount_currency'] input:focus-within",
+        },
+        {
+            content: "Modify the liquidity line amount",
+            trigger: "div[name='amount_currency'] input",
+            run: "edit -333.33 && click body",
+        },
+        {
+            trigger: ".btn-link:contains('$ -333.33')",
+        },
+        {
+            content: "balance displays $-333.33",
+            trigger: ".btn-link:contains('$ -333.33')",
+        },
+        {
+            content: "Modify the label",
+            trigger: "div[name='name'] input",
+            run: "edit Spontaneous Combustion && click body",
+        },
+        {
+            content: "statement line displays combustion and $-333.33",
+            trigger: ".o_bank_rec_selected_st_line:contains('Combustion'):contains('$ -333.33')",
+        },
+        // Test that changing the balance in the list view updates the right side of the kanban view
+        // (including reapplying matching rules)
+        {
+            content: "select matched 'line2'",
+            trigger: ".o_bank_rec_st_line:contains('line2')",
+            run: "click",
+        },
+        {
+            trigger: ".o_bank_rec_selected_st_line:contains('line2')",
+        },
+        {
+            content: "'line2' should be selected, reset it",
+            trigger: "button:contains('Reset')",
+            run: "click",
+        },
+        {
+            trigger: ".o_bank_rec_selected_st_line:contains('line2'):not(:has(div.badge))",
+        },
+        {
+            content: "Liquidity line displays debit '$ 100.00'",
+            trigger:
+                "div[name='line_ids'] table.o_list_table tr.o_bank_rec_liquidity_line td[field='debit']:contains('$ 100.00')",
+        },
+        {
+            trigger: ".o_switch_view.o_kanban.active",
+        },
+        {
+            content: "Switch to list view",
+            trigger: ".o_switch_view.o_list",
+            run: "click",
+        },
+        {
+            content: "Click amount field of 'line2'; Selects the row",
+            trigger: "table.o_list_table tr.o_data_row:contains('line2') td[name='amount']",
+            run: "click",
+        },
+        {
+            content: "Set balance of 'line2' (selected row) to 500.00",
+            trigger: "table.o_list_table tr.o_data_row.o_selected_row td[name='amount'] input",
+            run: "edit 500.00 && click body",
+        },
+        {
+            trigger: ".o_switch_view.o_list.active",
+        },
+        {
+            content: "Switch back to kanban",
+            trigger: ".o_switch_view.o_kanban",
+            run: "click",
+        },
+        {
+            content: "'line2' is still selected",
+            trigger: ".o_bank_rec_st_line:contains('line2')",
+        },
+        {
+            content: "Liquidity line displays debit '$ 500.00'",
+            trigger:
+                "div[name='line_ids'] table.o_list_table tr.o_bank_rec_liquidity_line td[field='debit']:contains('$ 500.00')",
+        },
+        {
+            content:
+                "'INV/2019/00001' has been selected as matching existing entry by matching rules",
+            trigger:
+                "div.bank_rec_widget_form_amls_list_anchor table.o_list_table tr.o_rec_widget_list_selected_item td[name='name']:contains('INV/2019/00001')",
+        },
+        // End
+        ...stepUtils.toggleHomeMenu(),
+        ...accountTourSteps.goToAccountMenu("Reset back to accounting module"),
+        {
+            content: "check that we're back on the dashboard",
+            trigger: 'a:contains("Customer Invoices")',
+        },
+    ],
+});
+
+registry.category("web_tour.tours").add('account_accountant_bank_rec_widget_reconciliation_button',
+    {
+        url: '/odoo',
+        steps: () => [
+        stepUtils.showAppsMenuItem(),
+        ...accountTourSteps.goToAccountMenu("Open the accounting module"),
+        {
+            content: "Open the bank reconciliation widget",
+            trigger: "button.btn-secondary[name='action_open_reconcile']",
+            run: "click",
+        },
+        {
+            content: "Remove suggested line, if present",
+            trigger: ".o_list_record_remove",
+            run() {
+                const button = document.querySelector('.fa-trash-o');
+                if(button) {
+                    button.click();
+                }
+            }
+        },
+        {
+            content: "Wait for deletion",
+            trigger: ".o_data_row:contains('Open balance')",
+        },
+        {
+            content: "Select reconciliation model creating a new move",
+            trigger: ".recon_model_button:contains('test reconcile')",
+            run: "click",
+        },
+        {
+            content: "Confirm move created through reconciliation model writeoff button",
+            trigger: "button[name=action_post]",
+            run: "click",
+        },
+        {
+            trigger: ".o_breadcrumb",
+        },
+        {
+            content: "Breadcrumb back to Bank Reconciliation from created move",
+            trigger: ".breadcrumb-item:contains('Bank Reconciliation')",
+            run: "click",
+        },
+        {
+            content: "Validate created move added as a line in reco widget",
+            trigger: "button:contains('Validate')",
+            run: "click",
+        },
+        // End
+        ...stepUtils.toggleHomeMenu(),
+        ...accountTourSteps.goToAccountMenu("Reset back to accounting module"),
+        {
+            content: "check that we're back on the dashboard",
+            trigger: 'a:contains("Customer Invoices")',
+        },
+    ],
+});
diff --git a/dev_odex30_accounting/odex30_account_accountant/static/tests/tours/test_tour_bank_rec_widget.js b/dev_odex30_accounting/odex30_account_accountant/static/tests/tours/test_tour_bank_rec_widget.js
new file mode 100644
index 0000000..38296b8
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_accountant/static/tests/tours/test_tour_bank_rec_widget.js
@@ -0,0 +1,236 @@
+/** @odoo-module **/
+
+import { registry } from "@web/core/registry";
+import { stepUtils } from "@web_tour/tour_service/tour_utils";
+import { accountTourSteps } from "@account/js/tours/account";
+
+registry.category("web_tour.tours").add("account_accountant_bank_rec_widget", {
+    url: "/odoo",
+    steps: () => [
+        stepUtils.showAppsMenuItem(),
+        ...accountTourSteps.goToAccountMenu("Open the accounting module"),
+
+        // Open the widget. The first line should be selected by default.
+        {
+            trigger: ".o_breadcrumb",
+        },
+        {
+            content: "Open the bank reconciliation widget",
+            trigger: "button.btn-secondary[name='action_open_reconcile']",
+            run: "click",
+        },
+        {
+            trigger: "div[name='line_ids']",
+        },
+        {
+            content: "The 'line1' should be selected by default",
+            trigger: "div[name='line_ids'] td[field='name']:contains('line1')",
+        },
+
+        // Test 1: Check the loading of lazy notebook tabs.
+        // Check 'amls_tab' (active by default).
+        {
+            trigger: "div.bank_rec_widget_form_amls_list_anchor table.o_list_table",
+        },
+        {
+            content: "The 'amls_tab' should be active and the inner list view loaded",
+            trigger: "a.active[name='amls_tab']",
+        },
+        // Check 'discuss_tab'.
+        {
+            trigger: "a.active[name='amls_tab']",
+        },
+        {
+            content: "Click on the 'discuss_tab'",
+            trigger: "a[name='discuss_tab']",
+            run: "click",
+        },
+        {
+            trigger: "a.active[name='discuss_tab']",
+        },
+        {
+            content: "The 'discuss_tab' should be active and the chatter loaded",
+            trigger: "div.bank_rec_widget_form_discuss_anchor div.o-mail-Chatter",
+        },
+        // Check 'manual_operations_tab'.
+        {
+            trigger: "tr.o_bank_rec_auto_balance_line",
+        },
+        {
+            content: "Click on the 'auto_balance' to make the 'manual_operations_tab' visible",
+            trigger: "tr.o_bank_rec_auto_balance_line td[field='name']",
+            run: "click",
+        },
+        {
+            content: "The 'manual_operations_tab' should be active",
+            trigger: "a.active[name='manual_operations_tab']",
+        },
+        {
+            content: "The 'name' field should be focus automatically",
+            trigger: "div.o_notebook div[name='name'] input:focus",
+        },
+        {
+            trigger: "tr.o_bank_rec_auto_balance_line",
+        },
+        {
+            content: "Click on the 'credit' field to change the focus from 'name' to 'amount_currency'",
+            trigger: "tr.o_bank_rec_auto_balance_line td[field='credit']",
+            run: "click",
+        },
+        {
+            content: "Wait to avoid non-deterministic errors on the next step",
+            trigger: "tr.o_bank_rec_auto_balance_line td[field='credit']",
+        },
+        {
+            content: "The 'balance' field should be focus now",
+            trigger: "div.o_notebook div[name='amount_currency'] input:focus",
+        },
+
+        // Test 2: Test validation + auto select the next line.
+        {
+            trigger: "a.active[name='manual_operations_tab']",
+        },
+        {
+            content: "Click on the 'amls_tab'",
+            trigger: "a[name='amls_tab']",
+            run: "click",
+        },
+        {
+            trigger: "a.active[name='amls_tab']",
+        },
+        {
+            content: "Mount INV/2019/00002",
+            trigger:
+                "div.bank_rec_widget_form_amls_list_anchor table.o_list_table td[name='move_id']:contains('INV/2019/00002')",
+            run: "click",
+        },
+        {
+            trigger:
+                "div.bank_rec_widget_form_amls_list_anchor table.o_list_table tr.o_rec_widget_list_selected_item td[name='move_id']:contains('INV/2019/00002')",
+        },
+        {
+            content: "Check INV/2019/00002 is well marked as selected",
+            trigger:
+                "div.bank_rec_widget_form_amls_list_anchor table.o_list_table tr.o_rec_widget_list_selected_item td[name='move_id']:contains('INV/2019/00002')",
+        },
+        {
+            trigger:
+                "div.bank_rec_widget_form_amls_list_anchor table.o_list_table tr.o_rec_widget_list_selected_item td[name='move_id']:contains('INV/2019/00002')",
+        },
+        {
+            content: "Remove INV/2019/00002",
+            trigger: "tr td.o_list_record_remove button",
+            run: "click",
+        },
+        {
+            trigger:
+                "div.bank_rec_widget_form_amls_list_anchor table.o_list_table tr:not(.o_rec_widget_list_selected_item) td[name='move_id']:contains('INV/2019/00002')",
+        },
+        {
+            content: "Mount INV/2019/00001",
+            trigger:
+                "div.bank_rec_widget_form_amls_list_anchor table.o_list_table td[name='move_id']:contains('INV/2019/00001')",
+            run: "click",
+        },
+        {
+            trigger:
+                "div.bank_rec_widget_form_amls_list_anchor table.o_list_table tr.o_rec_widget_list_selected_item td[name='move_id']:contains('INV/2019/00001')",
+        },
+        {
+            content: "Validate",
+            trigger: "button:contains('Validate')",
+            run: "click",
+        },
+        {
+            trigger: "div[name='line_ids'] td[field='name']:contains('line2')",
+        },
+        {
+            content: "The 'line2' is the next not already reconciled line",
+            trigger: "div[name='line_ids'] td[field='name']:contains('line2')",
+        },
+
+        // Test 3: Test manual operations tab.
+        {
+            content: "Click on 'credit'",
+            trigger: "div[name='line_ids'] td[field='credit']:last",
+            run: "click",
+        },
+        {
+            content:
+                "The 'manual_operations_tab' should be active now and the auto_balance line mounted in edit",
+            trigger: "a.active[name='manual_operations_tab']",
+        },
+        {
+            content: "The last line should be selected",
+            trigger: "div[name='line_ids'] tr.o_bank_rec_selected_line",
+        },
+        {
+            content: "Search for 'partner_a'",
+            trigger: "div[name='partner_id'] input",
+            run: "edit partner_a",
+        },
+        {
+            trigger: ".ui-autocomplete .o_m2o_dropdown_option a:contains('Create')",
+        },
+        {
+            content: "Select 'partner_a'",
+            trigger: ".ui-autocomplete:visible li:contains('partner_a')",
+            run: "click",
+        },
+        {
+            trigger:
+                "tr:not(.o_bank_rec_auto_balance_line) td[field='partner_id']:contains('partner_a')",
+        },
+        {
+            content: "Select the payable account",
+            trigger: "button:contains('Payable')",
+            run: "click",
+        },
+        {
+            trigger:
+                "tr:not(.o_bank_rec_auto_balance_line) td[field='account_id']:contains('Payable')",
+        },
+        {
+            content: "Enter a tax",
+            trigger: "div[name='tax_ids'] input",
+            run: "edit 15",
+        },
+        {
+            trigger: ".ui-autocomplete",
+        },
+        {
+            content: "Select 'Tax 15% (Sales)'",
+            trigger: ".ui-autocomplete:visible li:contains('Sales')",
+            run: "click",
+        },
+        {
+            content: "Tax column appears in list of lines",
+            trigger: "div[name='line_ids'] td[field='tax_ids']",
+        },
+        {
+            content: "Wait to avoid non-deterministic errors on the next step",
+            trigger: "div[name='line_ids'] td:contains('Tax Received')",
+        },
+        {
+            trigger: "button.btn-primary:contains('Validate')",
+        },
+        {
+            content: "Validate",
+            trigger: "button:contains('Validate')",
+            run: "click",
+        },
+        {
+            trigger: "div[name='line_ids'] td[field='name']:contains('line3')",
+        },
+        {
+            content: "The 'line3' is the next not already reconciled line",
+            trigger: "div[name='line_ids'] td[field='name']:contains('line3')",
+        },
+        ...stepUtils.toggleHomeMenu(),
+        ...accountTourSteps.goToAccountMenu("Reset back to accounting module"),
+        {
+            content: "check that we're back on the dashboard",
+            trigger: 'a:contains("Customer Invoices")',
+        },
+    ],
+});
diff --git a/dev_odex30_accounting/odex30_account_accountant/static/tests/tours/test_tour_journal_items_export.js b/dev_odex30_accounting/odex30_account_accountant/static/tests/tours/test_tour_journal_items_export.js
new file mode 100644
index 0000000..c656afc
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_accountant/static/tests/tours/test_tour_journal_items_export.js
@@ -0,0 +1,51 @@
+/** @odoo-module **/
+
+import { registry } from "@web/core/registry";
+import { stepUtils } from "@web_tour/tour_service/tour_utils";
+import { accountTourSteps } from "@account/js/tours/account";
+
+registry.category("web_tour.tours").add("account_accountant_journal_items_export", {
+    url: "/web",
+    steps: () => [
+        stepUtils.showAppsMenuItem(),
+        ...accountTourSteps.goToAccountMenu("Open the accounting module"),
+
+        {
+            content: "Open journal items list view",
+            trigger: 'button[data-menu-xmlid="account.menu_finance_entries"]',
+            run: "click",
+        },
+        {
+            content: "Open journal items list view",
+            trigger: 'a[data-menu-xmlid="account.menu_action_account_moves_all"]',
+            run: "click",
+        },
+        {
+            content: "Select all items",
+            trigger: 'thead tr th.o_list_record_selector',
+            run: "click",
+        },
+        {
+            content: "Open export dialog",
+            trigger: 'i.fa-cog',
+            run: "click",
+        },
+        {
+            content: "Open export dialog",
+            trigger: 'i.fa-upload',
+            run: "click",
+        },
+        {
+            content: "Click on the cancel button",
+            trigger: 'button.o_form_button_cancel',
+            run: "click",
+        },
+        // End
+        ...stepUtils.toggleHomeMenu(),
+        ...accountTourSteps.goToAccountMenu("Reset back to accounting module"),
+        {
+            content: "check that we're back on the dashboard",
+            trigger: 'a:contains("Customer Invoices")',
+        },
+    ],
+});
diff --git a/dev_odex30_accounting/odex30_account_accountant/tests/__init__.py b/dev_odex30_accounting/odex30_account_accountant/tests/__init__.py
new file mode 100644
index 0000000..771a109
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_accountant/tests/__init__.py
@@ -0,0 +1,12 @@
+from . import test_account_fiscal_year
+from . import test_account_payment
+from . import test_bank_rec_widget
+from . import test_bank_rec_widget_tour
+from . import test_prediction
+from . import test_reconciliation_matching_rules
+from . import test_account_auto_reconcile_wizard
+from . import test_account_reconcile_wizard
+from . import test_deferred_management
+from . import test_ui
+from . import test_signature
+from . import test_change_lock_date_wizard
diff --git a/dev_odex30_accounting/odex30_account_accountant/tests/test_account_auto_reconcile_wizard.py b/dev_odex30_accounting/odex30_account_accountant/tests/test_account_auto_reconcile_wizard.py
new file mode 100644
index 0000000..bca7fe7
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_accountant/tests/test_account_auto_reconcile_wizard.py
@@ -0,0 +1,244 @@
+from odoo import fields
+from odoo.addons.account.tests.common import AccountTestInvoicingCommon
+from odoo.exceptions import UserError
+from odoo.tests import tagged
+
+
+@tagged('post_install', '-at_install')
+class TestAccountAutoReconcileWizard(AccountTestInvoicingCommon):
+    """ Tests the account automatic reconciliation and its wizard. """
+
+    @classmethod
+    def setUpClass(cls):
+        super().setUpClass()
+
+        cls.comp_curr = cls.company_data['currency']
+        cls.foreign_curr = cls.setup_other_currency('EUR')
+
+        cls.misc_journal = cls.company_data['default_journal_misc']
+        cls.partners = cls.partner_a + cls.partner_b
+        cls.receivable_account = cls.company_data['default_account_receivable']
+        cls.payable_account = cls.company_data['default_account_payable']
+        cls.revenue_account = cls.company_data['default_account_revenue']
+        cls.test_date = fields.Date.from_string('2016-01-01')
+
+    def _create_many_lines(self):
+        self.line_1_group_1 = self.create_line_for_reconciliation(1000.0, 1000.0, self.comp_curr, '2016-01-01', partner=self.partner_a)
+        self.line_2_group_1 = self.create_line_for_reconciliation(-1000.0, -1000.0, self.comp_curr, '2016-01-02', partner=self.partner_a)
+        self.line_3_group_1 = self.create_line_for_reconciliation(1000.0, 1000.0, self.comp_curr, '2016-01-03', partner=self.partner_a)
+        self.line_4_group_1 = self.create_line_for_reconciliation(-1000.0, -1000.0, self.comp_curr, '2016-01-04', partner=self.partner_a)
+        self.line_5_group_1 = self.create_line_for_reconciliation(1000.0, 1000.0, self.comp_curr, '2016-01-05', partner=self.partner_a)
+        self.group_1 = self.line_1_group_1 + self.line_2_group_1 + self.line_3_group_1 + self.line_4_group_1 + self.line_5_group_1
+
+        self.line_1_group_2 = self.create_line_for_reconciliation(500.0, 500.0, self.comp_curr, '2016-01-01', partner=self.partner_b)
+        self.line_2_group_2 = self.create_line_for_reconciliation(-500.0, -500.0, self.comp_curr, '2016-01-01', partner=self.partner_b)
+        self.line_3_group_2 = self.create_line_for_reconciliation(500.0, 500.0, self.comp_curr, '2017-01-02', partner=self.partner_b)
+        self.line_4_group_2 = self.create_line_for_reconciliation(-500.0, -500.0, self.comp_curr, '2017-01-02', partner=self.partner_b)
+        self.group_2 = self.line_1_group_2 + self.line_2_group_2 + self.line_3_group_2 + self.line_4_group_2
+
+        self.line_1_group_3 = self.create_line_for_reconciliation(1500.0, 3000.0, self.foreign_curr, '2016-01-01', partner=self.partner_b)
+        self.line_2_group_3 = self.create_line_for_reconciliation(-1000.0, -3000.0, self.foreign_curr, '2017-01-01', partner=self.partner_b)
+        self.line_3_group_3 = self.create_line_for_reconciliation(3000.0, 3000.0, self.comp_curr, '2016-01-01', partner=self.partner_b)
+        self.line_4_group_3 = self.create_line_for_reconciliation(-3000.0, -3000.0, self.comp_curr, '2016-01-01', partner=self.partner_b)
+        self.group_3 = self.line_1_group_3 + self.line_2_group_3 + self.line_3_group_3 + self.line_4_group_3
+
+        self.line_1_group_4 = self.create_line_for_reconciliation(1000.0, 1000.0, self.comp_curr, '2016-01-01', account_1=self.payable_account, partner=self.partner_a)
+        self.line_2_group_4 = self.create_line_for_reconciliation(-1000.0, -1000.0, self.comp_curr, '2016-01-02', account_1=self.payable_account, partner=self.partner_a)
+        self.group_4 = self.line_1_group_4 + self.line_2_group_4
+
+    def test_auto_reconcile_one_to_one(self):
+        self._create_many_lines()
+        should_be_reconciled = self.line_1_group_1 + self.line_2_group_1 + self.line_3_group_1 + self.line_4_group_1 \
+                               + self.line_1_group_2 + self.line_2_group_2 \
+                               + self.line_1_group_3 + self.line_2_group_3 + self.line_3_group_3 + self.line_4_group_3
+        wizard = self.env['account.auto.reconcile.wizard'].new({
+            'from_date': '2016-01-01',
+            'to_date': '2017-01-01',
+            'account_ids': self.receivable_account.ids,
+            'partner_ids': self.partners.ids,
+            'search_mode': 'one_to_one',
+        })
+        wizard.auto_reconcile()
+
+        self.assertTrue(should_be_reconciled.full_reconcile_id)
+        self.assertEqual(self.line_1_group_1.full_reconcile_id, self.line_2_group_1.full_reconcile_id,
+                         "Entries should be reconciled together since they are in the same group and have closer dates.")
+        self.assertEqual(self.line_3_group_1.full_reconcile_id, self.line_4_group_1.full_reconcile_id,
+                         "Entries should be reconciled together since they are in the same group and have closer dates.")
+        self.assertEqual(self.line_1_group_2.full_reconcile_id, self.line_1_group_2.full_reconcile_id,
+                         "Entries should be reconciled together since they are in the same group and have closer dates.")
+        self.assertEqual(self.line_1_group_3.full_reconcile_id, self.line_2_group_3.full_reconcile_id,
+                         "Entries should be reconciled together since they are in the same group and have closer dates.")
+        self.assertEqual(self.line_3_group_3.full_reconcile_id, self.line_4_group_3.full_reconcile_id,
+                         "Entries should be reconciled together since they are in the same group and have closer dates.")
+        self.assertNotEqual(self.line_2_group_3.full_reconcile_id, self.line_3_group_3.full_reconcile_id,
+                            "Entries should NOT be reconciled together as they are of different currencies.")
+        self.assertFalse(self.line_5_group_1.reconciled,
+                         "This entry shouldn't be reconciled since group 1 has an odd number of lines, they can't all be reconciled, and it's the most recent one.")
+        self.assertFalse((self.line_3_group_2 + self.line_4_group_2).full_reconcile_id,
+                         "Entries shouldn't be reconciled since it's outside of accepted date range of the wizard.")
+        self.assertFalse((self.line_1_group_4 + self.line_2_group_4).full_reconcile_id,
+                         "Entries shouldn't be reconciled since their account is out of the wizard's scope.")
+
+    def test_auto_reconcile_zero_balance(self):
+        self._create_many_lines()
+        should_be_reconciled = self.line_1_group_2 + self.line_2_group_2 + self.group_3
+        wizard = self.env['account.auto.reconcile.wizard'].new({
+            'from_date': '2016-01-01',
+            'to_date': '2017-01-01',
+            'account_ids': self.receivable_account.ids,
+            'partner_ids': self.partners.ids,
+            'search_mode': 'zero_balance',
+        })
+        wizard.auto_reconcile()
+
+        self.assertTrue(should_be_reconciled.full_reconcile_id)
+        self.assertFalse(self.group_1.full_reconcile_id,
+                         "Entries shouldn't be reconciled since their total balance is not zero.")
+        self.assertEqual((self.line_1_group_2 + self.line_2_group_2).mapped('matching_number'), [self.line_1_group_2.matching_number] * 2,
+                         "Entries should be reconciled together as their total balance is zero.")
+        self.assertEqual((self.line_1_group_3 + self.line_2_group_3).mapped('matching_number'), [self.line_1_group_3.matching_number] * 2,
+                         "Entries should be reconciled together as their total balance is zero with the same currency.")
+        self.assertEqual((self.line_3_group_3 + self.line_4_group_3).mapped('matching_number'), [self.line_3_group_3.matching_number] * 2,
+                         "Lines 3 and 4 are reconciled but not with two first lines since their currency is different.")
+        self.assertFalse(self.group_4.full_reconcile_id,
+                         "Entries shouldn't be reonciled since their account is out of the wizard's scope.")
+
+    def test_nothing_to_auto_reconcile(self):
+        wizard = self.env['account.auto.reconcile.wizard'].new({
+            'from_date': '2016-01-01',
+            'to_date': '2017-01-01',
+            'account_ids': self.receivable_account.ids,
+            'partner_ids': self.partners.ids,
+            'search_mode': 'zero_balance',
+        })
+        with self.assertRaises(UserError):
+            wizard.auto_reconcile()
+
+    def test_auto_reconcile_no_account_nor_partner_one_to_one(self):
+        self.create_line_for_reconciliation(1000.0, 1000.0, self.comp_curr, '2016-01-01', partner=self.partner_a)
+        self.create_line_for_reconciliation(-1000.0, -1000.0, self.comp_curr, '2016-01-02', partner=self.partner_a)
+        wizard = self.env['account.auto.reconcile.wizard'].new({
+            'from_date': '2016-01-01',
+            'to_date': '2017-01-01',
+        })
+        reconciled_amls = wizard._auto_reconcile_one_to_one()
+        self.assertTrue(reconciled_amls.full_reconcile_id)
+
+    def test_auto_reconcile_no_account_nor_partner_zero_balance(self):
+        self.create_line_for_reconciliation(1000.0, 1000.0, self.comp_curr, '2016-01-01', partner=self.partner_a)
+        self.create_line_for_reconciliation(-1000.0, -1000.0, self.comp_curr, '2016-01-02', partner=self.partner_a)
+        wizard = self.env['account.auto.reconcile.wizard'].new({
+            'from_date': '2016-01-01',
+            'to_date': '2017-01-01',
+        })
+        reconciled_amls = wizard._auto_reconcile_zero_balance()
+        self.assertTrue(reconciled_amls.full_reconcile_id)
+
+    def test_auto_reconcile_no_account_one_to_one(self):
+        self.create_line_for_reconciliation(1000.0, 1000.0, self.comp_curr, '2016-01-01', partner=self.partner_a)
+        self.create_line_for_reconciliation(-1000.0, -1000.0, self.comp_curr, '2016-01-02', partner=self.partner_a)
+        wizard = self.env['account.auto.reconcile.wizard'].new({
+            'from_date': '2016-01-01',
+            'to_date': '2017-01-01',
+            'partner_ids': self.partners.ids,
+        })
+        reconciled_amls = wizard._auto_reconcile_one_to_one()
+        self.assertTrue(reconciled_amls.full_reconcile_id)
+
+    def test_auto_reconcile_no_account_zero_balance(self):
+        self.create_line_for_reconciliation(1000.0, 1000.0, self.comp_curr, '2016-01-01', partner=self.partner_a)
+        self.create_line_for_reconciliation(-1000.0, -1000.0, self.comp_curr, '2016-01-02', partner=self.partner_a)
+        wizard = self.env['account.auto.reconcile.wizard'].new({
+            'from_date': '2016-01-01',
+            'to_date': '2017-01-01',
+            'partner_ids': self.partners.ids,
+        })
+        reconciled_amls = wizard._auto_reconcile_zero_balance()
+        self.assertTrue(reconciled_amls.full_reconcile_id)
+
+    def test_auto_reconcile_no_partner_one_to_one(self):
+        self.create_line_for_reconciliation(1000.0, 1000.0, self.comp_curr, '2016-01-01', partner=self.partner_a)
+        self.create_line_for_reconciliation(-1000.0, -1000.0, self.comp_curr, '2016-01-02', partner=self.partner_a)
+        wizard = self.env['account.auto.reconcile.wizard'].new({
+            'from_date': '2016-01-01',
+            'to_date': '2017-01-01',
+            'account_ids': self.receivable_account.ids,
+        })
+        reconciled_amls = wizard._auto_reconcile_one_to_one()
+        self.assertTrue(reconciled_amls.full_reconcile_id)
+
+    def test_auto_reconcile_no_partner_zero_balance(self):
+        self.create_line_for_reconciliation(1000.0, 1000.0, self.comp_curr, '2016-01-01', partner=self.partner_a)
+        self.create_line_for_reconciliation(-1000.0, -1000.0, self.comp_curr, '2016-01-02', partner=self.partner_a)
+        wizard = self.env['account.auto.reconcile.wizard'].new({
+            'from_date': '2016-01-01',
+            'to_date': '2017-01-01',
+            'account_ids': self.receivable_account.ids,
+        })
+        reconciled_amls = wizard._auto_reconcile_zero_balance()
+        self.assertTrue(reconciled_amls.full_reconcile_id)
+
+    def test_auto_reconcile_rounding_one_to_one(self):
+        """ Checks that two lines with different values, currency rounding aside, are reconciled in one-to-one mode. """
+        line_1 = self.create_line_for_reconciliation(1000.0, 1000.0, self.comp_curr, '2016-01-01', partner=self.partner_a)
+        line_2 = self.create_line_for_reconciliation(-1000.0, -1000.0, self.comp_curr, '2016-01-02', partner=self.partner_a)
+        # Need to manually update the values to bypass ORM
+        self.env.cr.execute(
+            """
+            UPDATE account_move_line SET amount_residual_currency = 1000.0000001 WHERE id = %(line_1_id)s;
+            UPDATE account_move_line SET amount_residual_currency = -999.999999 WHERE id = %(line_2_id)s;
+            """,
+            {'line_1_id': line_1.id, 'line_2_id': line_2.id}
+        )
+        wizard = self.env['account.auto.reconcile.wizard'].new({
+            'from_date': '2016-01-01',
+            'to_date': '2017-01-01',
+            'account_ids': self.receivable_account.ids,
+        })
+        reconciled_amls = wizard._auto_reconcile_one_to_one()
+        self.assertTrue(reconciled_amls.full_reconcile_id)
+
+    def test_auto_reconcile_rounding_zero_balance(self):
+        """ Checks that two lines with different values, currency rounding aside, are reconciled in zero balance mode. """
+        line_1 = self.create_line_for_reconciliation(1000.0, 1000.0, self.comp_curr, '2016-01-01', partner=self.partner_a)
+        line_2 = self.create_line_for_reconciliation(-1000.0, -1000.0, self.comp_curr, '2016-01-02', partner=self.partner_a)
+        # Need to manually update the values to bypass ORM
+        self.env.cr.execute(
+            """
+            UPDATE account_move_line SET amount_residual_currency = 1000.0000001 WHERE id = %(line_1_id)s;
+            UPDATE account_move_line SET amount_residual_currency = -999.999999 WHERE id = %(line_2_id)s;
+            """,
+            {'line_1_id': line_1.id, 'line_2_id': line_2.id}
+        )
+        wizard = self.env['account.auto.reconcile.wizard'].new({
+            'from_date': '2016-01-01',
+            'to_date': '2017-01-01',
+            'account_ids': self.receivable_account.ids,
+        })
+        reconciled_amls = wizard._auto_reconcile_zero_balance()
+        self.assertTrue(reconciled_amls.full_reconcile_id)
+
+    def test_preset_wizard(self):
+        """ Tests that giving lines_ids to wizard presets correctly values. """
+        line_1 = self.create_line_for_reconciliation(1000.0, 1000.0, self.comp_curr, '2016-01-30', partner=self.partner_a)
+        line_2 = self.create_line_for_reconciliation(-1000.0, -1000.0, self.comp_curr, '2016-01-31', partner=self.partner_a)
+        wizard = self.env['account.auto.reconcile.wizard'].with_context(domain=[('id', 'in', (line_1 + line_2).ids)]).create({})
+        self.assertRecordValues(wizard, [{
+            'account_ids': self.receivable_account.ids,
+            'partner_ids': self.partner_a.ids,
+            'from_date': fields.Date.from_string('2016-01-30'),
+            'to_date': fields.Date.from_string('2016-01-31'),
+            'search_mode': 'zero_balance',
+        }])
+
+        line_3 = self.create_line_for_reconciliation(1000.0, 1000.0, self.comp_curr, '2016-01-31', partner=self.partner_a)
+        line_4 = self.create_line_for_reconciliation(-500.0, -500.0, self.comp_curr, '2016-02-28', partner=None)
+        wizard = self.env['account.auto.reconcile.wizard'].with_context(domain=[('id', 'in', (line_3 + line_4).ids)]).create({})
+        self.assertRecordValues(wizard, [{
+            'account_ids': self.receivable_account.ids,
+            'partner_ids': [],
+            'from_date': fields.Date.from_string('2016-01-31'),
+            'to_date': fields.Date.from_string('2016-02-28'),
+            'search_mode': 'one_to_one',
+        }])
diff --git a/dev_odex30_accounting/odex30_account_accountant/tests/test_account_fiscal_year.py b/dev_odex30_accounting/odex30_account_accountant/tests/test_account_fiscal_year.py
new file mode 100644
index 0000000..1fad047
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_accountant/tests/test_account_fiscal_year.py
@@ -0,0 +1,128 @@
+# -*- coding: utf-8 -*-
+from odoo.addons.account.tests.common import AccountTestInvoicingCommon
+from odoo.tests import tagged
+from odoo import fields
+
+
+@tagged('post_install', '-at_install')
+class TestFiscalPosition(AccountTestInvoicingCommon):
+
+    def check_compute_fiscal_year(self, company, date, expected_date_from, expected_date_to):
+        '''Compute the fiscal year at a certain date for the company passed as parameter.
+        Then, check if the result matches the 'expected_date_from'/'expected_date_to' dates.
+
+        :param company: The company.
+        :param date: The date belonging to the fiscal year.
+        :param expected_date_from: The expected date_from after computation.
+        :param expected_date_to: The expected date_to after computation.
+        '''
+        current_date = fields.Date.from_string(date)
+        res = company.compute_fiscalyear_dates(current_date)
+        self.assertEqual(res['date_from'], fields.Date.from_string(expected_date_from))
+        self.assertEqual(res['date_to'], fields.Date.from_string(expected_date_to))
+
+    def test_default_fiscal_year(self):
+        '''Basic case with a fiscal year xxxx-01-01 - xxxx-12-31.'''
+        company = self.env.company
+        company.fiscalyear_last_day = 31
+        company.fiscalyear_last_month = '12'
+
+        self.check_compute_fiscal_year(
+            company,
+            '2017-12-31',
+            '2017-01-01',
+            '2017-12-31',
+        )
+
+        self.check_compute_fiscal_year(
+            company,
+            '2017-01-01',
+            '2017-01-01',
+            '2017-12-31',
+        )
+
+    def test_leap_fiscal_year_1(self):
+        '''Case with a leap year ending the 29 February.'''
+        company = self.env.company
+        company.fiscalyear_last_day = 29
+        company.fiscalyear_last_month = '2'
+
+        self.check_compute_fiscal_year(
+            company,
+            '2016-02-29',
+            '2015-03-01',
+            '2016-02-29',
+        )
+
+        self.check_compute_fiscal_year(
+            company,
+            '2015-03-01',
+            '2015-03-01',
+            '2016-02-29',
+        )
+
+    def test_leap_fiscal_year_2(self):
+        '''Case with a leap year ending the 28 February.'''
+        company = self.env.company
+        company.fiscalyear_last_day = 28
+        company.fiscalyear_last_month = '2'
+
+        self.check_compute_fiscal_year(
+            company,
+            '2016-02-29',
+            '2015-03-01',
+            '2016-02-29',
+        )
+
+        self.check_compute_fiscal_year(
+            company,
+            '2016-03-01',
+            '2016-03-01',
+            '2017-02-28',
+        )
+
+    def test_custom_fiscal_year(self):
+        '''Case with custom fiscal years.'''
+        company = self.env.company
+        company.fiscalyear_last_day = 31
+        company.fiscalyear_last_month = '12'
+
+        # Create custom fiscal year covering the 6 first months of 2017.
+        self.env['account.fiscal.year'].create({
+            'name': '6 month 2017',
+            'date_from': '2017-01-01',
+            'date_to': '2017-05-31',
+            'company_id': company.id,
+        })
+
+        # Check before the custom fiscal year).
+        self.check_compute_fiscal_year(
+            company,
+            '2017-02-01',
+            '2017-01-01',
+            '2017-05-31',
+        )
+
+        # Check after the custom fiscal year.
+        self.check_compute_fiscal_year(
+            company,
+            '2017-11-01',
+            '2017-06-01',
+            '2017-12-31',
+        )
+
+        # Create custom fiscal year covering the 3 last months of 2017.
+        self.env['account.fiscal.year'].create({
+            'name': 'last 3 month 2017',
+            'date_from': '2017-10-01',
+            'date_to': '2017-12-31',
+            'company_id': company.id,
+        })
+
+        # Check inside the custom fiscal years.
+        self.check_compute_fiscal_year(
+            company,
+            '2017-07-01',
+            '2017-06-01',
+            '2017-09-30',
+        )
diff --git a/dev_odex30_accounting/odex30_account_accountant/tests/test_account_payment.py b/dev_odex30_accounting/odex30_account_accountant/tests/test_account_payment.py
new file mode 100644
index 0000000..f3838e1
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_accountant/tests/test_account_payment.py
@@ -0,0 +1,34 @@
+from odoo.addons.account.tests.common import AccountTestInvoicingCommon
+from odoo.tests import tagged
+
+
+@tagged('post_install', '-at_install')
+class TestAccountBillPayment(AccountTestInvoicingCommon):
+    @classmethod
+    def setUpClass(cls):
+        super().setUpClass()
+
+        cls.bank_journal_1 = cls.company_data['default_journal_bank']
+
+    def test_bill_state_change_on_payment_state(self):
+        """Test that bill payment state changes correctly when payment state transitions occur.
+        • Draft payment case: Bill state reverts to 'not_paid' when payment is drafted
+        • Payment unlink case: Bill state reverts to 'not_paid' when payment is deleted
+        """
+        bill = self.init_invoice('in_invoice', post=True, partner=self.partner_a, products=self.product_a)
+
+        # We have to test it without any Outstanding Payment account set in Journal
+        self.bank_journal_1.outbound_payment_method_line_ids.payment_account_id = False
+
+        payment = self.env['account.payment.register']\
+            .with_context(active_model='account.move', active_ids=bill.ids)\
+            .create({})\
+            ._create_payments()
+        self.assertEqual(bill.payment_state, self.env['account.move']._get_invoice_in_payment_state())
+
+        payment.action_draft()
+        self.assertEqual(payment.state, 'draft')
+        self.assertEqual(payment.invoice_ids.payment_state, 'not_paid')
+
+        payment.unlink()
+        self.assertEqual(bill.payment_state, 'not_paid')
diff --git a/dev_odex30_accounting/odex30_account_accountant/tests/test_account_reconcile_wizard.py b/dev_odex30_accounting/odex30_account_accountant/tests/test_account_reconcile_wizard.py
new file mode 100644
index 0000000..d59de5a
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_accountant/tests/test_account_reconcile_wizard.py
@@ -0,0 +1,856 @@
+import re
+
+from odoo import Command, fields
+from odoo.exceptions import UserError
+from odoo.tests import tagged
+
+from odoo.addons.account.tests.common import AccountTestInvoicingCommon
+
+
+@tagged('post_install', '-at_install')
+class TestAccountReconcileWizard(AccountTestInvoicingCommon):
+    """ Tests the account reconciliation and its wizard. """
+
+    @classmethod
+    def setUpClass(cls):
+        super().setUpClass()
+
+        cls.receivable_account = cls.company_data['default_account_receivable']
+        cls.payable_account = cls.company_data['default_account_payable']
+        cls.revenue_account = cls.company_data['default_account_revenue']
+        cls.payable_account_2 = cls.env['account.account'].create({
+            'name': 'Payable Account 2',
+            'account_type': 'liability_current',
+            'code': 'PAY2.TEST',
+            'reconcile': True
+        })
+        cls.write_off_account = cls.env['account.account'].create({
+            'name': 'Write-Off Account',
+            'account_type': 'liability_current',
+            'code': 'WO.TEST',
+            'reconcile': False
+        })
+
+        cls.misc_journal = cls.company_data['default_journal_misc']
+        cls.test_date = fields.Date.from_string('2016-01-01')
+        cls.company_currency = cls.company_data['currency']
+        cls.foreign_currency = cls.setup_other_currency('EUR')
+        cls.foreign_currency_2 = cls.setup_other_currency('XAF', rates=[('2016-01-01', 6.0), ('2017-01-01', 4.0)])
+
+    # -------------------------------------------------------------------------
+    # HELPERS
+    # -------------------------------------------------------------------------
+    def assertWizardReconcileValues(self, selected_lines, input_values, wo_expected_values, expected_transfer_values=None):
+        wizard = self.env['account.reconcile.wizard'].with_context(
+            active_model='account.move.line',
+            active_ids=selected_lines.ids,
+        ).new(input_values)
+        if expected_transfer_values:
+            transfer_move = wizard.create_transfer()
+            # transfer move values
+            self.assertRecordValues(transfer_move.line_ids.sorted('balance'), expected_transfer_values)
+            # transfer warning message
+            self.assertTrue(wizard.transfer_warning_message)
+            regex_match = re.findall(r'([+-]*\d*,*\d+\.*\d+)', wizard.transfer_warning_message)
+            # match transferred amount
+            self.assertEqual(
+                float(regex_match[0].replace(',', '')),
+                transfer_move.amount_total_in_currency_signed or transfer_move.amount_total_signed
+            )
+            transfer_from_account = transfer_move.line_ids.filtered(lambda aml: 'Transfer from' in aml.name).account_id
+            transfer_to_account = transfer_move.line_ids.account_id - transfer_from_account
+            transfer_from_amls = transfer_move.line_ids.filtered(lambda aml: aml.account_id == transfer_from_account)
+            transfer_amount = sum(aml.balance for aml in transfer_from_amls)
+            # match account codes
+            if transfer_amount > 0:
+                self.assertEqual(regex_match[1:], [transfer_from_account.code, transfer_to_account.code])
+            else:
+                self.assertEqual(regex_match[1:], [transfer_to_account.code, transfer_from_account.code])
+        write_off_move = wizard.create_write_off()
+        self.assertRecordValues(write_off_move.line_ids.sorted('balance'), wo_expected_values)
+        wizard.reconcile()
+        if wizard.allow_partials or (
+            wizard.edit_mode
+            and wizard.reco_currency_id.compare_amounts(wizard.edit_mode_amount_currency, wizard.amount_currency)
+        ):
+            # partial reconcile
+            self.assertTrue(len(selected_lines.matched_debit_ids) > 0 or len(selected_lines.matched_credit_ids) > 0)
+        else:
+            # full reconcile
+            self.assertTrue(selected_lines.full_reconcile_id)
+            self.assertRecordValues(
+                selected_lines,
+                [{'amount_residual': 0.0, 'amount_residual_currency': 0.0, 'reconciled': True}] * len(selected_lines),
+            )
+
+    # -------------------------------------------------------------------------
+    # TESTS
+    # -------------------------------------------------------------------------
+    def test_wizard_should_not_open(self):
+        """ Test that when we reconcile two lines that belong to the same account and have a 0 balance should
+        reconcile silently and not open the write-off wizard.
+        """
+        line_1 = self.create_line_for_reconciliation(1000.0, 1000.0, self.company_currency, '2016-01-01')
+        line_2 = self.create_line_for_reconciliation(-1000.0, -1000.0, self.company_currency, '2016-01-01')
+        (line_1 + line_2).action_reconcile()
+        self.assertRecordValues(
+            line_1 + line_2,
+            [{'amount_residual': 0.0, 'amount_residual_currency': 0.0, 'reconciled': True}] * 2
+        )
+
+    def test_wizard_should_open(self):
+        """ Test that when a write-off is required (because of transfer or non-zero balance) the wizard opens. """
+        line_1 = self.create_line_for_reconciliation(1000.0, 1000.0, self.company_currency, '2016-01-01')
+        line_2 = self.create_line_for_reconciliation(-500.0, -500.0, self.company_currency, '2016-01-01')
+        line_3 = self.create_line_for_reconciliation(-500.0, -1500.0, self.foreign_currency, '2016-01-01')
+        line_4 = self.create_line_for_reconciliation(-900.0, -900.0, self.company_currency, '2016-01-01', account_1=self.payable_account)
+        for batch, sub_test_name in (
+                (line_1 + line_2, 'Batch with non-zero balance in company currency'),
+                (line_1 + line_3, 'Batch with non-zero balance in foreign currency'),
+                (line_1 + line_4, 'Batch with different accounts'),
+        ):
+            with self.subTest(sub_test_name=sub_test_name):
+                returned_action = batch.action_reconcile()
+                self.assertEqual(returned_action.get('res_model'), 'account.reconcile.wizard')
+
+    def test_reconcile_silently_same_account(self):
+        """ When balance is 0 we can silently reconcile items. """
+        line_1 = self.create_line_for_reconciliation(1000.0, 1000.0, self.company_currency, '2016-01-01')
+        line_2 = self.create_line_for_reconciliation(-1000.0, -1000.0, self.company_currency, '2016-01-01')
+        lines = (line_1 + line_2)
+        lines.action_reconcile()
+        self.assertTrue(lines.full_reconcile_id)
+        self.assertRecordValues(
+            lines,
+            [{'amount_residual': 0.0, 'amount_residual_currency': 0.0, 'reconciled': True}] * len(lines),
+        )
+
+    def test_reconcile_silently_transfer(self):
+        """ When balance is 0, and we need a transfer, we do the transfer+reconcile silently. """
+        line_1 = self.create_line_for_reconciliation(1000.0, 1000.0, self.company_currency, '2016-01-01')
+        line_2 = self.create_line_for_reconciliation(-1000.0, -1000.0, self.company_currency, '2016-01-01', account_1=self.payable_account)
+        lines = (line_1 + line_2)
+        lines.action_reconcile()
+        self.assertTrue(lines.full_reconcile_id)
+        self.assertRecordValues(
+            lines,
+            [{'amount_residual': 0.0, 'amount_residual_currency': 0.0, 'reconciled': True}] * len(lines),
+        )
+
+    def test_write_off_same_currency(self):
+        """ Reconciliation of two lines with no transfer/foreign currencies/taxes/reco models."""
+        line_1 = self.create_line_for_reconciliation(1000.0, 1000.0, self.company_currency, '2016-01-01')
+        line_2 = self.create_line_for_reconciliation(-500.0, -500.0, self.company_currency, '2016-01-01')
+        wizard_input_values = {
+            'journal_id': self.misc_journal.id,
+            'account_id': self.write_off_account.id,
+            'label': 'Write-Off Test Label',
+            'allow_partials': False,
+            'date': self.test_date,
+        }
+        write_off_expected_values = [
+            {'account_id': self.receivable_account.id, 'name': 'Write-Off Test Label', 'balance': -500.0},
+            {'account_id': self.write_off_account.id, 'name': 'Write-Off Test Label', 'balance': 500.0},
+        ]
+        self.assertWizardReconcileValues(line_1 + line_2, wizard_input_values, write_off_expected_values)
+
+    def test_write_off_one_foreign_currency(self):
+        """ Reconciliation of two lines with one of the two using foreign currency should reconcile in foreign currency."""
+        line_1 = self.create_line_for_reconciliation(1000.0, 1000.0, self.company_currency, '2016-01-01')
+        line_2 = self.create_line_for_reconciliation(-500.0, -1500.0, self.foreign_currency, '2016-01-01')
+        wizard_input_values = {
+            'journal_id': self.misc_journal.id,
+            'account_id': self.write_off_account.id,
+            'label': 'Write-Off Test Label',
+            'allow_partials': False,
+            'date': self.test_date,
+        }
+        expected_values = [
+            {'account_id': self.receivable_account.id, 'name': 'Write-Off Test Label',
+             'balance': -500.0, 'amount_currency': -1500.0, 'currency_id': self.foreign_currency.id},
+            {'account_id': self.write_off_account.id, 'name': 'Write-Off Test Label',
+             'balance': 500.0, 'amount_currency': 1500.0, 'currency_id': self.foreign_currency.id},
+        ]
+        self.assertWizardReconcileValues(line_1 + line_2, wizard_input_values, expected_values)
+
+    def test_write_off_one_foreign_currency_rounding(self):
+        """ Reconciliation of two lines with one of the two using foreign currency should reconcile in foreign currency."""
+        foreign_currency = self.setup_other_currency('CAD', rounding=0.01, rates=[('2016-01-01', 0.052972554919), ('2017-01-01', 4.0)])
+
+        # Check that the reconciliation works independently of
+        # - whether the foreign amount is debit or credit
+        # - the account type (payable / receivable)
+        self.assertFalse(self.payable_account_2.account_type in ('asset_receivable', 'liability_payable'))
+        self.assertTrue(self.receivable_account.account_type in ('asset_receivable', 'liability_payable'))
+        for foreign_amount_sign, account in [
+            (-1, self.payable_account_2),
+            (1, self.payable_account_2),
+            (-1, self.receivable_account),
+            (1, self.receivable_account),
+        ]:
+            with self.subTest(sub_test_name=f'sign: {foreign_amount_sign}, account: {account.name}'):
+                line_1 = self.create_line_for_reconciliation(
+                    -foreign_amount_sign * 372239.38, -foreign_amount_sign * 372239.38, self.company_currency,
+                    '2016-01-01', account_1=account,
+                )
+                line_2 = self.create_line_for_reconciliation(
+                    foreign_amount_sign * 377554.0, foreign_amount_sign * 20000.0, foreign_currency,
+                    '2016-01-01', account_1=account,
+                )
+                lines = line_1 + line_2
+
+                # Test the opening of the wizard without input values
+                wizard = self.env['account.reconcile.wizard'].with_context(
+                    active_model='account.move.line',
+                    active_ids=lines.ids,
+                ).new()
+                self.assertRecordValues(wizard, [{
+                    'is_write_off_required': True,
+                    'amount': foreign_amount_sign * 5314.62,
+                    'amount_currency': foreign_amount_sign * 281.53,
+                    'reco_currency_id': foreign_currency.id,
+                }])
+
+                # Check the created write-off move and that there is no residual
+                wizard_input_values = {
+                    'journal_id': self.misc_journal.id,
+                    'account_id': self.write_off_account.id,
+                    'label': 'Write-Off Test Label',
+                    'allow_partials': False,
+                    'date': self.test_date,
+                }
+                # We sort the expected values the same way as `assertWizardReconcileValues` sorts the lines
+                expected_values = sorted([
+                    {'account_id': account.id, 'name': 'Write-Off Test Label',
+                     'balance': -foreign_amount_sign * 5314.62,
+                     'amount_currency': -foreign_amount_sign * 281.53, 'currency_id': foreign_currency.id},
+                    {'account_id': self.write_off_account.id, 'name': 'Write-Off Test Label',
+                     'balance': foreign_amount_sign * 5314.62,
+                     'amount_currency': foreign_amount_sign * 281.53, 'currency_id': foreign_currency.id},
+                ], key=lambda vals: vals['balance'])
+                self.assertWizardReconcileValues(lines, wizard_input_values, expected_values)
+
+                full_reconcile = lines.full_reconcile_id
+                self.assertTrue(full_reconcile)
+                self.assertFalse(full_reconcile.exchange_move_id)
+
+    def test_write_off_mixed_foreign_currencies(self):
+        """ Write off with multiple currencies should reconcile in company currency."""
+        line_1 = self.create_line_for_reconciliation(1000.0, 1000.0, self.company_currency, '2016-01-01')
+        line_2 = self.create_line_for_reconciliation(-500.0, -1500.0, self.foreign_currency, '2016-01-01')
+        line_3 = self.create_line_for_reconciliation(-400.0, -2400.0, self.foreign_currency_2, '2016-01-01')
+        wizard_input_values = {
+            'journal_id': self.misc_journal.id,
+            'account_id': self.write_off_account.id,
+            'label': 'Write-Off Test Label',
+            'allow_partials': False,
+            'date': self.test_date,
+        }
+        expected_values = [
+            {'account_id': self.receivable_account.id, 'name': 'Write-Off Test Label',
+             'balance': -100.0, 'amount_currency': -100.0, 'currency_id': self.company_currency.id},
+            {'account_id': self.write_off_account.id, 'name': 'Write-Off Test Label',
+             'balance': 100.0, 'amount_currency': 100.0, 'currency_id': self.company_currency.id},
+        ]
+        self.assertWizardReconcileValues(line_1 + line_2 + line_3, wizard_input_values, expected_values)
+
+    def test_write_off_one_foreign_currency_change_rate(self):
+        """ Tests that write-off use the correct rate from/at wizard's date. """
+        foreign_currency = self.setup_other_currency('CAD', rounding=0.001, rates=[('2016-01-01', 0.5), ('2017-01-01', 1 / 3)])
+        new_date = fields.Date.from_string('2017-02-01')
+        line_1 = self.create_line_for_reconciliation(-2000.0, -2000.0, self.company_currency, '2017-01-01')  # conversion in 2017 => -666.67🍫
+        line_2 = self.create_line_for_reconciliation(2000.0, 1000.0, foreign_currency, '2016-01-01')
+        wizard_input_values = {
+            'journal_id': self.misc_journal.id,
+            'account_id': self.write_off_account.id,
+            'label': 'Write-Off Test Label',
+            'allow_partials': False,
+            'date': new_date,
+        }
+        expected_values = [
+            {'account_id': self.receivable_account.id, 'name': 'Write-Off Test Label',
+             'balance': -1000.0, 'amount_currency': -333.333, 'currency_id': foreign_currency.id},
+            {'account_id': self.write_off_account.id, 'name': 'Write-Off Test Label',
+             'balance': 1000.0, 'amount_currency': 333.333, 'currency_id': foreign_currency.id},
+        ]
+        self.assertWizardReconcileValues(line_1 + line_2, wizard_input_values, expected_values)
+
+    def test_write_off_mixed_foreign_currencies_change_rate(self):
+        """ Tests that write-off use the correct rate from/at wizard's date. """
+        new_date = fields.Date.from_string('2017-02-01')
+        line_1 = self.create_line_for_reconciliation(1000.0, 1000.0, self.company_currency, '2016-01-01')
+        line_2 = self.create_line_for_reconciliation(-500.0, -1500.0, self.foreign_currency, '2016-01-01')
+        line_3 = self.create_line_for_reconciliation(-400.0, -2400.0, self.foreign_currency_2, '2016-01-01')
+        wizard_input_values = {
+            'journal_id': self.misc_journal.id,
+            'account_id': self.write_off_account.id,
+            'label': 'Write-Off Test Label',
+            'allow_partials': False,
+            'date': new_date,
+        }
+        expected_values = [
+            {'account_id': self.receivable_account.id, 'name': 'Write-Off Test Label',
+             'balance': -100.0, 'amount_currency': -100.0, 'currency_id': self.company_currency.id},
+            {'account_id': self.write_off_account.id, 'name': 'Write-Off Test Label',
+             'balance': 100.0, 'amount_currency': 100.0, 'currency_id': self.company_currency.id},
+        ]
+        self.assertWizardReconcileValues(line_1 + line_2 + line_3, wizard_input_values, expected_values)
+
+    def test_write_off_both_same_foreign_currency_ensure_no_exchange_diff(self):
+        """ Test that if both AMLs have the same foreign currency and rate, the amount in company currency
+            is computed on the write-off in such a way that no exchange diff is created.
+        """
+        foreign_currency = self.setup_other_currency('CAD', rounding=0.01, rates=[('2016-01-01', 1 / 0.225)])
+        new_date = fields.Date.from_string('2017-02-01')
+        line_1 = self.create_line_for_reconciliation(21.38, 95.0, foreign_currency, '2016-01-01')
+        line_2 = self.create_line_for_reconciliation(1.13, 5.0, foreign_currency, '2016-01-01')
+        line_3 = self.create_line_for_reconciliation(1.13, 5.0, foreign_currency, '2016-01-01')
+        wizard_input_values = {
+            'journal_id': self.misc_journal.id,
+            'account_id': self.write_off_account.id,
+            'label': 'Write-Off Test Label',
+            'allow_partials': False,
+            'date': new_date,
+        }
+        expected_values = [
+            {'account_id': self.receivable_account.id, 'name': 'Write-Off Test Label',
+             'balance': -23.64, 'amount_currency': -105.0, 'currency_id': foreign_currency.id},
+            {'account_id': self.write_off_account.id, 'name': 'Write-Off Test Label',
+             'balance': 23.64, 'amount_currency': 105.0, 'currency_id': foreign_currency.id},
+        ]
+        self.assertWizardReconcileValues(line_1 + line_2 + line_3, wizard_input_values, expected_values)
+
+    def test_write_off_with_transfer_account_same_currency(self):
+        line_1 = self.create_line_for_reconciliation(1000.0, 1000.0, self.company_currency, '2016-01-01')
+        line_2 = self.create_line_for_reconciliation(100.0, 100.0, self.company_currency, '2016-01-01', account_1=self.payable_account)
+        wizard_input_values = {
+            'journal_id': self.misc_journal.id,
+            'account_id': self.write_off_account.id,
+            'label': 'Write-Off Test Label',
+            'allow_partials': False,
+            'date': self.test_date,
+        }
+        expected_transfer_values = [
+            {'account_id': self.payable_account.id, 'name': f'Transfer to {self.receivable_account.display_name}',
+             'balance': -100.0, 'amount_currency': -100.0, 'currency_id': self.company_currency.id},
+            {'account_id': self.receivable_account.id, 'name': f'Transfer from {self.payable_account.display_name}',
+             'balance': 100.0, 'amount_currency': 100.0, 'currency_id': self.company_currency.id},
+        ]
+        expected_values = [
+            {'account_id': self.receivable_account.id, 'name': 'Write-Off Test Label',
+             'balance': -1100.0, 'amount_currency': -1100.0, 'currency_id': self.company_currency.id},
+            {'account_id': self.write_off_account.id, 'name': 'Write-Off Test Label',
+             'balance': 1100.0, 'amount_currency': 1100.0, 'currency_id': self.company_currency.id},
+        ]
+        self.assertWizardReconcileValues(line_1 + line_2, wizard_input_values, expected_values, expected_transfer_values=expected_transfer_values)
+
+    def test_write_off_with_transfer_account_one_foreign_currency(self):
+        line_1 = self.create_line_for_reconciliation(1100.0, 1100.0, self.company_currency, '2016-01-01')
+        line_2 = self.create_line_for_reconciliation(100.0, 300.0, self.foreign_currency, '2016-01-01', account_1=self.payable_account)
+        wizard_input_values = {
+            'journal_id': self.misc_journal.id,
+            'account_id': self.write_off_account.id,
+            'label': 'Write-Off Test Label',
+            'allow_partials': False,
+            'date': self.test_date,
+        }
+        expected_transfer_values = [
+            {'account_id': self.payable_account.id, 'name': f'Transfer to {self.receivable_account.display_name}',
+             'balance': -100.0, 'amount_currency': -300.0, 'currency_id': self.foreign_currency.id},
+            {'account_id': self.receivable_account.id, 'name': f'Transfer from {self.payable_account.display_name}',
+             'balance': 100.0, 'amount_currency': 300.0, 'currency_id': self.foreign_currency.id},
+        ]
+        expected_values = [
+            {'account_id': self.receivable_account.id, 'name': 'Write-Off Test Label',
+             'balance': -1200.0, 'amount_currency': -3600.0, 'currency_id': self.foreign_currency.id},
+            {'account_id': self.write_off_account.id, 'name': 'Write-Off Test Label',
+             'balance': 1200.0, 'amount_currency': 3600.0, 'currency_id': self.foreign_currency.id},
+        ]
+        self.assertWizardReconcileValues(line_1 + line_2, wizard_input_values, expected_values, expected_transfer_values=expected_transfer_values)
+
+    def test_write_off_with_complex_transfer(self):
+        partner_1 = self.env['res.partner'].create({'name': 'Test Partner 1'})
+        partner_2 = self.env['res.partner'].create({'name': 'Test Partner 2'})
+        line_1 = self.create_line_for_reconciliation(1000.0, 1000.0, self.company_currency, '2016-01-01', partner=partner_2)
+        line_2 = self.create_line_for_reconciliation(-100.0, -300.0, self.foreign_currency, '2016-01-01', account_1=self.payable_account, partner=partner_1)
+        line_3 = self.create_line_for_reconciliation(-200.0, -200.0, self.company_currency, '2016-01-01', account_1=self.payable_account, partner=partner_2)
+        line_4 = self.create_line_for_reconciliation(-200.0, -600.0, self.foreign_currency, '2016-01-01', account_1=self.payable_account, partner=partner_2)
+        line_5 = self.create_line_for_reconciliation(-200.0, -600.0, self.foreign_currency, '2016-01-01', account_1=self.payable_account, partner=partner_2)
+        wizard_input_values = {
+            'journal_id': self.misc_journal.id,
+            'account_id': self.write_off_account.id,
+            'label': 'Write-Off Test Label',
+            'allow_partials': False,
+            'date': self.test_date,
+        }
+        expected_transfer_values = [
+            {'account_id': self.receivable_account.id, 'name': f'Transfer from {self.payable_account.display_name}',
+             'balance': -400.0, 'amount_currency': -1200.0, 'currency_id': self.foreign_currency.id, 'partner_id': partner_2.id},
+            {'account_id': self.receivable_account.id, 'name': f'Transfer from {self.payable_account.display_name}',
+             'balance': -200.0, 'amount_currency': -200.0, 'currency_id': self.company_currency.id, 'partner_id': partner_2.id},
+            {'account_id': self.receivable_account.id, 'name': f'Transfer from {self.payable_account.display_name}',
+             'balance': -100.0, 'amount_currency': -300.0, 'currency_id': self.foreign_currency.id, 'partner_id': partner_1.id},
+            {'account_id': self.payable_account.id, 'name': f'Transfer to {self.receivable_account.display_name}',
+             'balance': 100.0, 'amount_currency': 300.0, 'currency_id': self.foreign_currency.id, 'partner_id': partner_1.id},
+            {'account_id': self.payable_account.id, 'name': f'Transfer to {self.receivable_account.display_name}',
+             'balance': 200.0, 'amount_currency': 200.0, 'currency_id': self.company_currency.id, 'partner_id': partner_2.id},
+            {'account_id': self.payable_account.id, 'name': f'Transfer to {self.receivable_account.display_name}',
+             'balance': 400.0, 'amount_currency': 1200.0, 'currency_id': self.foreign_currency.id, 'partner_id': partner_2.id},
+        ]
+        expected_values = [
+            {'account_id': self.receivable_account.id, 'name': 'Write-Off Test Label',
+             'balance': -300.0, 'amount_currency': -900.0, 'currency_id': self.foreign_currency.id},
+            {'account_id': self.write_off_account.id, 'name': 'Write-Off Test Label',
+             'balance': 300.0, 'amount_currency': 900.0, 'currency_id': self.foreign_currency.id},
+        ]
+        self.assertWizardReconcileValues(line_1 + line_2 + line_3 + line_4 + line_5, wizard_input_values, expected_values, expected_transfer_values=expected_transfer_values)
+
+    def test_write_off_with_tax(self):
+        """ Tests write-off with a tax set on the wizard. """
+        line_1 = self.create_line_for_reconciliation(1000.0, 1000.0, self.company_currency, '2016-01-01')
+        line_2 = self.create_line_for_reconciliation(-500.0, -500.0, self.company_currency, '2016-01-01')
+        tax_recover_account_id = self.env['account.account'].create({
+            'name': 'Tax Account Test',
+            'account_type': 'liability_current',
+            'code': 'TAX.TEST',
+            'reconcile': False
+        })
+        base_tag = self.env['account.account.tag'].create({
+            'applicability': 'taxes',
+            'name': 'base_tax_tag',
+            'country_id': self.company_data['company'].country_id.id,
+        })
+        tax_tag = self.env['account.account.tag'].create({
+            'applicability': 'taxes',
+            'name': 'tax_tax_tag',
+            'country_id': self.company_data['company'].country_id.id,
+        })
+        tax_id = self.env['account.tax'].create({
+            'name': 'tax_test',
+            'amount_type': 'percent',
+            'amount': 25.0,
+            'type_tax_use': 'sale',
+            'company_id': self.company_data['company'].id,
+            'invoice_repartition_line_ids': [
+                Command.create({'factor_percent': 100, 'repartition_type': 'base', 'tag_ids': [Command.set(base_tag.ids)]}),
+                Command.create({'factor_percent': 100, 'account_id': tax_recover_account_id.id, 'tag_ids': [Command.set(tax_tag.ids)]}),
+            ],
+            'refund_repartition_line_ids': [
+                Command.create({'factor_percent': 100, 'repartition_type': 'base', 'tag_ids': [Command.set(base_tag.ids)]}),
+                Command.create({'factor_percent': 100, 'account_id': tax_recover_account_id.id, 'tag_ids': [Command.set(tax_tag.ids)]}),
+            ],
+        })
+        wizard_input_values = {
+            'journal_id': self.misc_journal.id,
+            'account_id': self.write_off_account.id,
+            'label': 'Write-Off Test Label',
+            'tax_id': tax_id.id,
+            'allow_partials': False,
+            'date': self.test_date,
+        }
+        write_off_expected_values = [
+            {'account_id': self.receivable_account.id, 'name': 'Write-Off Test Label', 'balance': -500.0},
+            {'account_id': tax_recover_account_id.id, 'name': f'{tax_id.name}', 'balance': 100.0},
+            {'account_id': self.write_off_account.id, 'name': 'Write-Off Test Label', 'balance': 400.0},
+        ]
+        self.assertWizardReconcileValues(line_1 + line_2, wizard_input_values, write_off_expected_values)
+
+    def test_reconcile_partials_allowed(self):
+        line_1 = self.create_line_for_reconciliation(1000.0, 1000.0, self.company_currency, '2016-01-01')
+        line_2 = self.create_line_for_reconciliation(-500.0, -500.0, self.company_currency, '2016-01-01')
+        lines = line_1 + line_2
+        wizard_input_values = {
+            'allow_partials': True,
+        }
+        wizard = self.env['account.reconcile.wizard'].with_context(
+            active_model='account.move.line',
+            active_ids=lines.ids,
+        ).new(wizard_input_values)
+        wizard.reconcile()
+        self.assertTrue(len(lines.matched_debit_ids) > 0 or len(lines.matched_credit_ids) > 0)
+
+    def test_raise_lock_date_violation(self):
+        """ If a write-off violates the lock date we display a banner and change the date afterwards. """
+        company_id = self.company_data['company']
+        company_id.fiscalyear_lock_date = fields.Date.from_string('2016-12-01')
+        line_1 = self.create_line_for_reconciliation(1000.0, 1000.0, self.company_currency, '2016-06-01')
+        line_2 = self.create_line_for_reconciliation(-500.0, -500.0, self.company_currency, '2016-06-01')
+        wizard = self.env['account.reconcile.wizard'].with_context(
+            active_model='account.move.line',
+            active_ids=(line_1 + line_2).ids,
+        ).new({'date': self.test_date})
+        self.assertTrue(bool(wizard.lock_date_violated_warning_message))
+
+    def test_raise_reconcile_too_many_accounts(self):
+        """ If you try to reconcile lines from more than 2 accounts, it should raise an error. """
+        line_1 = self.create_line_for_reconciliation(1000.0, 1000.0, self.company_currency, '2016-01-01')
+        line_2 = self.create_line_for_reconciliation(-500.0, -500.0, self.company_currency, '2016-01-01', account_1=self.payable_account)
+        line_3 = self.create_line_for_reconciliation(-500.0, -500.0, self.company_currency, '2016-01-01', account_1=self.payable_account_2)
+        with self.assertRaises(UserError):
+            (line_1 + line_2 + line_3).action_reconcile()
+
+    def test_reconcile_no_receivable_no_payable_account(self):
+        """ If you try to reconcile lines in an account that is neither from payable nor receivable
+        it should reconcile in company currency.
+        """
+        account = self.company_data['default_account_expense']
+        account.reconcile = True
+        line_1 = self.create_line_for_reconciliation(1000.0, 1000.0, self.company_currency, '2016-01-01', account_1=account)
+        line_2 = self.create_line_for_reconciliation(-500.0, -1500.0, self.foreign_currency, '2016-01-01', account_1=account)
+        wizard_input_values = {
+            'journal_id': self.misc_journal.id,
+            'account_id': self.write_off_account.id,
+            'label': 'Write-Off Test Label',
+            'allow_partials': False,
+            'date': self.test_date,
+        }
+        expected_values = [
+            {'account_id': account.id, 'name': 'Write-Off Test Label',
+             'balance': -500.0, 'amount_currency': -500.0, 'currency_id': self.company_currency.id},
+            {'account_id': self.write_off_account.id, 'name': 'Write-Off Test Label',
+             'balance': 500.0, 'amount_currency': 500.0, 'currency_id': self.company_currency.id},
+        ]
+        self.assertWizardReconcileValues(line_1 + line_2, wizard_input_values, expected_values)
+
+    def test_reconcile_exchange_diff_foreign_currency(self):
+        """ When reconciling exchange_diff with amount_residual_currency = 0 we need to reconcile in company_currency.
+        """
+        exchange_gain_account = self.company_data['company'].income_currency_exchange_account_id
+        exchange_gain_account.reconcile = True
+        line_1 = self.create_line_for_reconciliation(150.0, 0.0, self.foreign_currency, '2016-01-01')
+        line_2 = self.create_line_for_reconciliation(-100.0, 0.0, self.foreign_currency, '2016-01-01', account_1=exchange_gain_account)
+        wizard_input_values = {
+            'journal_id': self.misc_journal.id,
+            'account_id': self.write_off_account.id,
+            'label': 'Write-Off Test Label',
+            'allow_partials': False,
+            'date': self.test_date,
+        }
+        # Note the transfer will always be in the currency of the line transferred
+        expected_transfer_values = [
+            {'account_id': self.receivable_account.id, 'name': f'Transfer from {exchange_gain_account.display_name}',
+             'balance': -100.0, 'amount_currency': 0.0, 'currency_id': self.foreign_currency.id},
+            {'account_id': exchange_gain_account.id, 'name': f'Transfer to {self.receivable_account.display_name}',
+             'balance': 100.0, 'amount_currency': 0.0, 'currency_id': self.foreign_currency.id},
+        ]
+        expected_values = [
+            {'account_id': self.receivable_account.id, 'name': 'Write-Off Test Label',
+             'balance': -50.0, 'amount_currency': -50.0, 'currency_id': self.company_currency.id},
+            {'account_id': self.write_off_account.id, 'name': 'Write-Off Test Label',
+             'balance': 50.0, 'amount_currency': 50.0, 'currency_id': self.company_currency.id},
+        ]
+        self.assertWizardReconcileValues(line_1 + line_2, wizard_input_values, expected_values, expected_transfer_values=expected_transfer_values)
+
+    def test_write_off_on_same_account(self):
+        """ When creating a write-off in the same account than the one used by the lines to reconcile,
+        the lines and the write-off should be fully reconciled.
+        """
+        line_1 = self.create_line_for_reconciliation(1000.0, 1000.0, self.company_currency, '2016-01-01')
+        line_2 = self.create_line_for_reconciliation(2000.0, 2000.0, self.company_currency, '2016-01-01')
+        wizard_input_values = {
+            'journal_id': self.misc_journal.id,
+            'account_id': self.receivable_account.id,
+            'label': 'Write-Off Test Label',
+            'allow_partials': False,
+            'date': self.test_date,
+        }
+        write_off_expected_values = [
+            {'account_id': self.receivable_account.id, 'name': 'Write-Off Test Label', 'balance': -3000.0},
+            {'account_id': self.receivable_account.id, 'name': 'Write-Off Test Label', 'balance': 3000.0},
+        ]
+        self.assertWizardReconcileValues(line_1 + line_2, wizard_input_values, write_off_expected_values)
+
+    def test_reconcile_exchange_diff_foreign_currency_full(self):
+        """ When reconciling exchange_diff with amount_residual_currency = 0 we need to reconcile in company_currency.
+        """
+        exchange_gain_account = self.company_data['company'].income_currency_exchange_account_id
+        exchange_gain_account.reconcile = True
+        line_1 = self.create_line_for_reconciliation(100.0, 0.0, self.foreign_currency, '2016-01-01')
+        line_2 = self.create_line_for_reconciliation(-100.0, 0.0, self.foreign_currency, '2016-01-01', account_1=exchange_gain_account)
+        lines = line_1 + line_2
+        lines.action_reconcile()
+        self.assertTrue(lines.full_reconcile_id)
+        self.assertRecordValues(
+            lines,
+            [{'amount_residual': 0.0, 'amount_residual_currency': 0.0, 'reconciled': True}] * len(lines),
+        )
+
+    def test_write_off_kpmg_case(self):
+        """ Test that write-off does a full reconcile with 2 foreign currencies using a custom exchange rate. """
+        new_date = fields.Date.from_string('2017-02-01')
+        line_1 = self.create_line_for_reconciliation(1000.0, 1500.0, self.foreign_currency, '2016-01-01')
+        line_2 = self.create_line_for_reconciliation(-900.0, -5400.0, self.foreign_currency_2, '2016-01-01')
+        wizard_input_values = {
+            'journal_id': self.misc_journal.id,
+            'account_id': self.write_off_account.id,
+            'label': 'Write-Off Test Label',
+            'allow_partials': False,
+            'date': new_date,
+        }
+        self.assertWizardReconcileValues(line_1 + line_2, wizard_input_values, [
+            {
+                'account_id': self.receivable_account.id,
+                'balance': -100.0,
+                'amount_currency': -150.0,
+                'currency_id': self.foreign_currency.id,
+            },
+            {
+                'account_id': self.write_off_account.id,
+                'balance': 100.0,
+                'amount_currency': 150.0,
+                'currency_id': self.foreign_currency.id,
+            },
+        ])
+
+    def test_write_off_multi_curr_multi_residuals_force_partials(self):
+        """ Test that we raise an error when trying to reconcile lines with multiple residuals.
+         Here debit1 will be reconciled with credit1 first as they have the same currency.
+         Then residual of debit1 will try to reconcile with debit2 which is impossible
+         => 2 residuals both in foreign currency, we don't know in which currency we should make the write-off
+         => We should only allow partial reconciliation. """
+        debit_1 = self.create_line_for_reconciliation(2000.0, 12000.0, self.foreign_currency_2, '2016-01-01')
+        credit_1 = self.create_line_for_reconciliation(-1000.0, -6000.0, self.foreign_currency_2, '2016-01-01')
+        debit_2 = self.create_line_for_reconciliation(2000.0, 3000.0, self.foreign_currency, '2016-01-01')
+        wizard = self.env['account.reconcile.wizard'].with_context(
+            active_model='account.move.line',
+            active_ids=(debit_1 + debit_2 + credit_1).ids,
+        ).new()
+        self.assertRecordValues(wizard, [{'force_partials': True, 'allow_partials': True}])
+
+    def test_write_off_multi_curr_multi_residuals_exch_diff_force_partials(self):
+        debit_1 = self.create_line_for_reconciliation(2000.0, 0.0, self.foreign_currency_2, '2016-01-01')
+        credit_1 = self.create_line_for_reconciliation(-1000.0, 0.0, self.foreign_currency_2, '2016-01-01')
+        debit_2 = self.create_line_for_reconciliation(2000.0, 0.0, self.foreign_currency, '2016-01-01')
+        wizard = self.env['account.reconcile.wizard'].with_context(
+            active_model='account.move.line',
+            active_ids=(debit_1 + debit_2 + credit_1).ids,
+        ).new()
+        self.assertRecordValues(wizard, [{'force_partials': True, 'allow_partials': True}])
+
+    def test_reconcile_with_partner_change(self):
+        partner_1 = self.env['res.partner'].create({'name': 'Test Partner 1'})
+        partner_2 = self.env['res.partner'].create({'name': 'Test Partner 2'})
+        line_1 = self.create_line_for_reconciliation(-1000.0, -1000.0, self.company_currency, '2016-01-01', partner=partner_1)
+        line_2 = self.create_line_for_reconciliation(2000.0, 2000.0, self.company_currency, '2016-01-01')
+        wizard_input_values = {
+            'journal_id': self.misc_journal.id,
+            'account_id': self.receivable_account.id,
+            'to_partner_id': partner_2.id,
+            'label': 'Write-Off Test Label',
+            'allow_partials': False,
+            'date': self.test_date,
+            'tax_id': self.tax_sale_a.id,
+        }
+        write_off_expected_values = [
+            {'account_id': self.receivable_account.id, 'name': 'Write-Off Test Label', 'balance': -1000.0, 'partner_id': partner_1.id},
+            {'account_id': self.company_data['default_account_tax_sale'].id, 'name': '15%', 'balance': 130.43, 'partner_id': partner_2.id},
+            {'account_id': self.receivable_account.id, 'name': 'Write-Off Test Label', 'balance': 869.57, 'partner_id': partner_2.id},
+        ]
+        self.assertWizardReconcileValues(line_1 + line_2, wizard_input_values, write_off_expected_values)
+
+    def test_reconcile_with_partner_change_and_transfer(self):
+        partner_1 = self.env['res.partner'].create({'name': 'Test Partner 1'})
+        partner_2 = self.env['res.partner'].create({'name': 'Test Partner 2'})
+        line_1 = self.create_line_for_reconciliation(-1000.0, -1000.0, self.company_currency, '2016-01-01', account_1=self.payable_account)
+        line_2 = self.create_line_for_reconciliation(2000.0, 2000.0, self.company_currency, '2016-01-01', partner=partner_1)
+        wizard_input_values = {
+            'journal_id': self.misc_journal.id,
+            'account_id': self.receivable_account.id,
+            'to_partner_id': partner_2.id,
+            'label': 'Write-Off Test Label',
+            'allow_partials': False,
+            'date': self.test_date,
+        }
+        expected_transfer_values = [
+            {'account_id': self.receivable_account.id, 'name': f'Transfer from {self.payable_account.display_name}',
+             'balance': -1000.0, 'amount_currency': -1000.0, 'currency_id': self.company_currency.id},
+            {'account_id': self.payable_account.id, 'name': f'Transfer to {self.receivable_account.display_name}',
+             'balance': 1000.0, 'amount_currency': 1000.0, 'currency_id': self.company_currency.id},
+        ]
+        write_off_expected_values = [
+            {'account_id': self.receivable_account.id, 'name': 'Write-Off Test Label', 'balance': -1000.0, 'partner_id': partner_1.id},
+            {'account_id': self.receivable_account.id, 'name': 'Write-Off Test Label', 'balance': 1000.0, 'partner_id': partner_2.id},
+        ]
+        self.assertWizardReconcileValues(line_1 + line_2, wizard_input_values, write_off_expected_values, expected_transfer_values)
+
+    def test_reconcile_edit_mode_partial_foreign_curr(self):
+        line_1 = self.create_line_for_reconciliation(100.0, 300.0, self.foreign_currency, '2016-01-01')
+        wizard_input_values = {
+            'account_id': self.write_off_account.id,
+            'label': 'Write-Off Test Label',
+            'date': self.test_date,
+            'edit_mode_amount_currency': 30.0,
+        }
+        expected_values = [
+            {'account_id': self.receivable_account.id, 'name': 'Write-Off Test Label',
+             'balance': -10.0, 'amount_currency': -30.0, 'currency_id': self.foreign_currency.id},
+            {'account_id': self.write_off_account.id, 'name': 'Write-Off Test Label',
+             'balance': 10.0, 'amount_currency': 30.0, 'currency_id': self.foreign_currency.id},
+        ]
+        self.assertWizardReconcileValues(line_1, wizard_input_values, expected_values)
+
+    def test_reconcile_edit_mode_partial_company_curr(self):
+        line_1 = self.create_line_for_reconciliation(300.0, 300.0, self.company_currency, '2016-01-01')
+        wizard_input_values = {
+            'account_id': self.write_off_account.id,
+            'label': 'Write-Off Test Label',
+            'date': self.test_date,
+            'edit_mode_amount_currency': 100.0,
+        }
+        expected_values = [
+            {'account_id': self.receivable_account.id, 'name': 'Write-Off Test Label',
+             'balance': -100.0, 'amount_currency': -100.0, 'currency_id': self.company_currency.id},
+            {'account_id': self.write_off_account.id, 'name': 'Write-Off Test Label',
+             'balance': 100.0, 'amount_currency': 100.0, 'currency_id': self.company_currency.id},
+        ]
+        self.assertWizardReconcileValues(line_1, wizard_input_values, expected_values)
+
+    def test_reconcile_edit_mode_partial_wrong_amount_raises(self):
+        line_1 = self.create_line_for_reconciliation(300.0, 300.0, self.company_currency, '2016-01-01')
+        wizard_input_values = {
+            'account_id': self.write_off_account.id,
+        }
+        wizard = self.env['account.reconcile.wizard'].with_context(
+            active_model='account.move.line',
+            active_ids=line_1.ids,
+        ).create(wizard_input_values)
+        with self.assertRaisesRegex(UserError, 'The amount of the write-off'):
+            wizard.edit_mode_amount_currency = -100.0
+
+    def test_reconcile_edit_mode_full_reconcile(self):
+        line_1 = self.create_line_for_reconciliation(300.0, 300.0, self.company_currency, '2016-01-01')
+        wizard_input_values = {
+            'account_id': self.write_off_account.id,
+            'label': 'Write-Off Test Label',
+            'edit_mode_amount_currency': 300.0,
+        }
+        expected_values = [
+            {'account_id': self.receivable_account.id, 'name': 'Write-Off Test Label',
+             'balance': -300.0, 'amount_currency': -300.0, 'currency_id': self.company_currency.id},
+            {'account_id': self.write_off_account.id, 'name': 'Write-Off Test Label',
+             'balance': 300.0, 'amount_currency': 300.0, 'currency_id': self.company_currency.id},
+        ]
+        self.assertWizardReconcileValues(line_1, wizard_input_values, expected_values)
+
+    def test_reconcile_same_currency_same_side_not_recpay(self):
+        """
+        Test the reconciliation with two lines on the same side (debit/credit), same currency and not on a receivable/payable account
+        """
+        current_assets_account = self.company_data['default_account_assets'].copy({'name': 'Current Assets', 'account_type': 'asset_current', 'reconcile': True})
+        line_1 = self.create_line_for_reconciliation(200, 200, self.company_currency, '2016-01-01', current_assets_account)
+        line_2 = self.create_line_for_reconciliation(200, 200, self.company_currency, '2016-01-01', current_assets_account)
+
+        # Test the opening of the wizard without input values
+        wizard = self.env['account.reconcile.wizard'].with_context(
+            active_model='account.move.line',
+            active_ids=(line_1 + line_2).ids,
+        ).new()
+
+        self.assertRecordValues(wizard, [{'is_write_off_required': True, 'amount': 400, 'amount_currency': 400}])
+
+        wizard_input_values = {
+            'journal_id': self.misc_journal.id,
+            'account_id': self.write_off_account.id,
+            'label': 'Write-Off Test Label',
+            'allow_partials': False,
+            'date': self.test_date,
+        }
+        expected_values = [
+            {'account_id': current_assets_account.id, 'name': 'Write-Off Test Label',
+             'balance': -400.0, 'amount_currency': -400.0, 'currency_id': self.company_currency.id},
+            {'account_id': self.write_off_account.id, 'name': 'Write-Off Test Label',
+             'balance': 400.0, 'amount_currency': 400.0, 'currency_id': self.company_currency.id},
+        ]
+        self.assertWizardReconcileValues(line_1 + line_2, wizard_input_values, expected_values)
+
+    def test_reconcile_foreign_currency_same_side_not_recpay(self):
+        """
+        Test the reconciliation with two lines on the same side (debit/credit), one foreign currency and not on a receivable/payable account
+        """
+        current_assets_account = self.company_data['default_account_assets'].copy({'name': 'Current Assets', 'account_type': 'asset_current', 'reconcile': True})
+        line_1 = self.create_line_for_reconciliation(200, 300, self.foreign_currency, '2016-01-01', current_assets_account)
+        line_2 = self.create_line_for_reconciliation(200, 200, self.company_currency, '2016-01-01', current_assets_account)
+
+        # Test the opening of the wizard without input values
+        wizard = self.env['account.reconcile.wizard'].with_context(
+            active_model='account.move.line',
+            active_ids=(line_1 + line_2).ids,
+        ).new()
+
+        self.assertRecordValues(wizard, [{'is_write_off_required': True, 'amount': 400, 'amount_currency': 400}])
+
+        wizard_input_values = {
+            'journal_id': self.misc_journal.id,
+            'account_id': self.write_off_account.id,
+            'label': 'Write-Off Test Label',
+            'allow_partials': False,
+            'date': self.test_date,
+        }
+        expected_values = [
+            {'account_id': current_assets_account.id, 'name': 'Write-Off Test Label',
+             'balance': -400.0, 'amount_currency': -400.0, 'currency_id': self.company_currency.id},
+            {'account_id': self.write_off_account.id, 'name': 'Write-Off Test Label',
+             'balance': 400.0, 'amount_currency': 400.0, 'currency_id': self.company_currency.id},
+        ]
+        self.assertWizardReconcileValues(line_1 + line_2, wizard_input_values, expected_values)
+
+    def test_reconcile_same_side_exch_diff(self):
+        """
+        Test the reconciliation with two lines on the same side (debit/credit), one exchange diff in foreign currency,
+        one regular aml in company currency
+        """
+        exchange_gain_account = self.company_data['company'].income_currency_exchange_account_id
+        exchange_gain_account.reconcile = True
+        line_1 = self.create_line_for_reconciliation(150.0, 150.0, self.company_currency, '2016-01-01')
+        line_2 = self.create_line_for_reconciliation(100.0, 0.0, self.foreign_currency, '2016-01-01', account_1=exchange_gain_account)
+        wizard_input_values = {
+            'journal_id': self.misc_journal.id,
+            'account_id': self.write_off_account.id,
+            'label': 'Write-Off Test Label',
+            'allow_partials': False,
+            'date': self.test_date,
+        }
+        # Note the transfer will always be in the currency of the line transferred
+        expected_transfer_values = [
+            {'account_id': exchange_gain_account.id, 'name': f'Transfer to {self.receivable_account.display_name}',
+             'balance': -100.0, 'amount_currency': 0.0, 'currency_id': self.foreign_currency.id},
+            {'account_id': self.receivable_account.id, 'name': f'Transfer from {exchange_gain_account.display_name}',
+             'balance': 100.0, 'amount_currency': 0.0, 'currency_id': self.foreign_currency.id},
+        ]
+        expected_values = [
+            {'account_id': self.receivable_account.id, 'name': 'Write-Off Test Label',
+             'balance': -250.0, 'amount_currency': -250.0, 'currency_id': self.company_currency.id},
+            {'account_id': self.write_off_account.id, 'name': 'Write-Off Test Label',
+             'balance': 250.0, 'amount_currency': 250.0, 'currency_id': self.company_currency.id},
+        ]
+        self.assertWizardReconcileValues(line_1 + line_2, wizard_input_values, expected_values, expected_transfer_values=expected_transfer_values)
+
+    def test_reconcile_transfer_with_different_partners(self):
+        """ When balance is 0, and we need a transfer, we do the transfer+reconcile silently. """
+        partner_a = self.env['res.partner'].create({'name': 'Test Partner A'})
+        partner_b = self.env['res.partner'].create({'name': 'Test Partner B'})
+        partner_c = self.env['res.partner'].create({'name': 'Test Partner C'})
+        # when reconciling journal items on 2 different accounts from 2 different partners that balance themselves,
+        # all journal items should be fully reconciled together
+        line_a1 = self.create_line_for_reconciliation(1000.0, 1000.0, self.company_currency, '2016-01-01', account_1=self.receivable_account, partner=partner_a)
+        line_b1 = self.create_line_for_reconciliation(-1000.0, -1000.0, self.company_currency, '2016-01-01', account_1=self.payable_account, partner=partner_b)
+        lines = line_a1 + line_b1
+        lines.action_reconcile()
+        transfer_lines = lines.full_reconcile_id.reconciled_line_ids.filtered(lambda line: line.id not in lines.ids)
+        self.assertRecordValues(transfer_lines, [
+            {'balance': -1000.0, 'account_id': self.receivable_account.id, 'partner_id': partner_a.id},
+            {'balance': 1000.0, 'account_id': self.payable_account.id, 'partner_id': partner_b.id},
+        ])
+        # even if the journal items on one of the accounts are for several different partners,
+        # the journal items should be fully reconciled together
+        line_a2 = self.create_line_for_reconciliation(1000.0, 1000.0, self.company_currency, '2016-01-01', account_1=self.receivable_account, partner=partner_a)
+        line_b2 = self.create_line_for_reconciliation(-600.0, -600.0, self.company_currency, '2016-01-01', account_1=self.payable_account, partner=partner_b)
+        line_c2 = self.create_line_for_reconciliation(-400.0, -400.0, self.company_currency, '2016-01-01', account_1=self.payable_account, partner=partner_c)
+        lines = line_a2 + line_b2 + line_c2
+        lines.action_reconcile()
+        transfer_lines = lines.full_reconcile_id.reconciled_line_ids.filtered(lambda line: line.id not in lines.ids)
+        self.assertRecordValues(transfer_lines, [
+            {'balance': -1000.0, 'account_id': self.receivable_account.id, 'partner_id': partner_a.id},
+            {'balance': 600.0, 'account_id': self.payable_account.id, 'partner_id': partner_b.id},
+            {'balance': 400.0, 'account_id': self.payable_account.id, 'partner_id': partner_c.id},
+        ])
diff --git a/dev_odex30_accounting/odex30_account_accountant/tests/test_bank_rec_widget.py b/dev_odex30_accounting/odex30_account_accountant/tests/test_bank_rec_widget.py
new file mode 100644
index 0000000..5bec5d6
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_accountant/tests/test_bank_rec_widget.py
@@ -0,0 +1,3726 @@
+# -*- coding: utf-8 -*-
+from odoo.addons.odex30_account_accountant.tests.test_bank_rec_widget_common import TestBankRecWidgetCommon
+from odoo.tests import tagged
+from odoo.tools import html2plaintext
+from odoo import fields, Command
+
+from freezegun import freeze_time
+from unittest.mock import patch
+import re
+
+
+@tagged('post_install', '-at_install')
+class TestBankRecWidget(TestBankRecWidgetCommon):
+
+    @classmethod
+    def setUpClass(cls):
+        super().setUpClass()
+        cls.company_data_2 = cls.setup_other_company()
+
+        cls.early_payment_term = cls.env['account.payment.term'].create({
+            'name': "early_payment_term",
+            'company_id': cls.company_data['company'].id,
+            'discount_percentage': 10,
+            'discount_days': 10,
+            'early_discount': True,
+            'line_ids': [
+                Command.create({
+                    'value': 'percent',
+                    'value_amount': 100,
+                    'nb_days': 20,
+                }),
+            ],
+        })
+
+        cls.account_revenue1 = cls.company_data['default_account_revenue']
+        cls.account_revenue2 = cls.copy_account(cls.account_revenue1)
+
+        cls.reco_model_bill = cls.env['account.reconcile.model'].create({
+            'name': "test create bill",
+            'rule_type': 'writeoff_button',
+            'counterpart_type': 'purchase',
+            'line_ids': [
+                Command.create({'amount_string': '50'}),
+                Command.create({'amount_string': '50'}),
+            ],
+        })
+
+    def assert_form_extra_text_value(self, wizard, regex):
+        line = wizard.line_ids.filtered(lambda x: x.index == wizard.form_index)
+        value = line.suggestion_html
+        if regex:
+            cleaned_value = html2plaintext(value).replace('\n', '')
+            if not re.match(regex, cleaned_value):
+                self.fail(f"The following 'form_extra_text':\n\n'{cleaned_value}'\n\n...doesn't match the provided regex:\n\n'{regex}'")
+        else:
+            self.assertFalse(value)
+
+    def test_retrieve_partner_from_account_number(self):
+        st_line = self._create_st_line(1000.0, partner_id=None, account_number="014 474 8555")
+        bank_account = self.env['res.partner.bank'].create({
+            'acc_number': '0144748555',
+            'partner_id': self.partner_a.id,
+        })
+        self.assertEqual(st_line._retrieve_partner(), bank_account.partner_id)
+
+        # Can't retrieve the partner since the bank account is used by multiple partners.
+        self.env['res.partner.bank'].create({
+            'acc_number': '0144748555',
+            'partner_id': self.partner_b.id,
+        })
+        self.assertEqual(st_line._retrieve_partner(), self.env['res.partner'])
+
+        # Archive partner_a and see if partner_b is then chosen
+        self.partner_a.active = False
+        self.assertEqual(st_line._retrieve_partner(), self.partner_b)
+
+    def test_retrieve_partner_from_account_number_in_other_company(self):
+        st_line = self._create_st_line(1000.0, partner_id=None, account_number="014 474 8555")
+        self.env['res.partner.bank'].create({
+            'acc_number': '0144748555',
+            'partner_id': self.partner_a.id,
+        })
+
+        # Bank account is owned by another company.
+        new_company = self.env['res.company'].create({'name': "test_retrieve_partner_from_account_number_in_other_company"})
+        self.partner_a.company_id = new_company
+        self.assertEqual(st_line._retrieve_partner(), self.env['res.partner'])
+
+    def test_retrieve_partner_from_partner_name(self):
+        """ Ensure the partner having a name fitting exactly the 'partner_name' is retrieved first.
+        This test create two partners that will be ordered in the lexicographic order when performing
+        a search. So:
+        row1: "Turlututu tsoin tsoin"
+        row2: "turlututu"
+
+        Since "turlututu" matches exactly (case insensitive) the partner_name of the statement line,
+        it should be suggested first.
+
+        However if we have two partners called turlututu, we should not suggest any or we risk selecting
+        the wrong one.
+        """
+        _partner_a, partner_b = self.env['res.partner'].create([
+            {'name': "Turlututu tsoin tsoin"},
+            {'name': "turlututu"},
+        ])
+
+        st_line = self._create_st_line(1000.0, partner_id=None, partner_name="Turlututu")
+        self.assertEqual(st_line._retrieve_partner(), partner_b)
+
+        self.env['res.partner'].create({'name': "turlututu"})
+        self.assertFalse(st_line._retrieve_partner())
+
+    def test_retrieve_partner_suggested_account_from_rank(self):
+        """ Ensure a retrieved partner is proposing his receivable/payable according his customer/supplier rank. """
+        partner = self.env['res.partner'].create({'name': "turlututu"})
+        rec_account_id = partner.property_account_receivable_id.id
+        pay_account_id = partner.property_account_payable_id.id
+
+        st_line = self._create_st_line(1000.0, partner_id=None, partner_name="turlututu")
+        liq_account_id = st_line.journal_id.default_account_id.id
+        wizard = self.env['bank.rec.widget'].with_context(default_st_line_id=st_line.id).new({})
+        self.assertRecordValues(wizard.line_ids, [
+            # pylint: disable=C0326
+            {'flag': 'liquidity',     'account_id': liq_account_id, 'balance': 1000.0},
+            {'flag': 'auto_balance',  'account_id': rec_account_id, 'balance': -1000.0},
+        ])
+
+        partner._increase_rank('supplier_rank', 1)
+        wizard = self.env['bank.rec.widget'].with_context(default_st_line_id=st_line.id).new({})
+        self.assertRecordValues(wizard.line_ids, [
+            # pylint: disable=C0326
+            {'flag': 'liquidity',     'account_id': liq_account_id, 'balance': 1000.0},
+            {'flag': 'auto_balance',  'account_id': pay_account_id, 'balance': -1000.0},
+        ])
+
+    def test_res_partner_bank_find_create_when_archived(self):
+        """ Test we don't get the "The combination Account Number/Partner must be unique." error with archived
+        bank account.
+        """
+        partner = self.env['res.partner'].create({
+            'name': "Zitycard",
+            'bank_ids': [Command.create({
+                'acc_number': "123456789",
+                'active': False,
+            })],
+        })
+
+        st_line = self._create_st_line(
+            100.0,
+            partner_name="Zeumat Zitycard",
+            account_number="123456789",
+        )
+        inv_line = self._create_invoice_line(
+            'out_invoice',
+            partner_id=partner.id,
+            invoice_line_ids=[{'price_unit': 100.0, 'tax_ids': []}],
+        )
+        wizard = self.env['bank.rec.widget'].with_context(default_st_line_id=st_line.id).new({})
+        wizard._action_add_new_amls(inv_line)
+        wizard._action_validate()
+
+        # Should not trigger the error.
+        self.env['res.partner.bank'].flush_model()
+
+    def test_res_partner_bank_find_create_multi_company(self):
+        """ Test we don't get the "The combination Account Number/Partner must be unique." error when the bank account
+        already exists on another company.
+        """
+        partner = self.env['res.partner'].create({
+            'name': "Zitycard",
+            'bank_ids': [Command.create({'acc_number': "123456789"})],
+        })
+        partner.bank_ids.company_id = self.company_data_2['company']
+        self.env.user.company_ids = self.env.company
+
+        st_line = self._create_st_line(
+            100.0,
+            partner_name="Zeumat Zitycard",
+            account_number="123456789",
+        )
+        inv_line = self._create_invoice_line(
+            'out_invoice',
+            partner_id=partner.id,
+            invoice_line_ids=[{'price_unit': 100.0, 'tax_ids': []}],
+        )
+        wizard = self.env['bank.rec.widget'].with_context(default_st_line_id=st_line.id).new({})
+        wizard._action_add_new_amls(inv_line)
+        wizard._action_validate()
+
+        # Should not trigger the error.
+        self.env['res.partner.bank'].flush_model()
+
+    def test_validation_base_case(self):
+        st_line = self._create_st_line(
+            1000.0,
+            date='2017-01-01',
+        )
+
+        wizard = self.env['bank.rec.widget'].with_context(default_st_line_id=st_line.id).new({})
+        line = wizard.line_ids.filtered(lambda x: x.flag == 'auto_balance')
+        wizard._js_action_mount_line_in_edit(line.index)
+        line.account_id = self.account_revenue1
+        wizard._line_value_changed_account_id(line)
+        self.assertRecordValues(wizard.line_ids, [
+            # pylint: disable=C0326
+            {'flag': 'liquidity',     'amount_currency': 1000.0,  'currency_id': self.company_data['currency'].id,    'balance': 1000.0},
+            {'flag': 'manual',        'amount_currency': -1000.0, 'currency_id': self.company_data['currency'].id,    'balance': -1000.0},
+        ])
+        self.assertRecordValues(wizard, [{'state': 'valid'}])
+
+        # The amount is the same, no message under the 'amount' field.
+        self.assert_form_extra_text_value(wizard, False)
+
+        wizard._action_validate()
+        self.assertRecordValues(st_line.line_ids, [
+            # pylint: disable=C0326
+            {'account_id': st_line.journal_id.default_account_id.id,    'amount_currency': 1000.0,      'currency_id': self.company_data['currency'].id,    'balance': 1000.0,  'reconciled': False},
+            {'account_id': self.account_revenue1.id,                    'amount_currency': -1000.0,     'currency_id': self.company_data['currency'].id,    'balance': -1000.0, 'reconciled': False},
+        ])
+
+        self.assertRecordValues(wizard.line_ids, [
+            # pylint: disable=C0326
+            {'flag': 'liquidity', 'account_id': st_line.journal_id.default_account_id.id,  'amount_currency': 1000.0,  'currency_id': self.company_data['currency'].id,    'balance': 1000.0},
+            {'flag': 'aml',       'account_id': self.account_revenue1.id,                  'amount_currency': -1000.0, 'currency_id': self.company_data['currency'].id,    'balance': -1000.0},
+        ])
+
+    def test_validation_exchange_difference(self):
+        # 240.0 curr2 == 120.0 comp_curr
+        st_line = self._create_st_line(
+            120.0,
+            date='2017-01-01',
+            foreign_currency_id=self.other_currency.id,
+            amount_currency=240.0,
+        )
+        # 240.0 curr2 == 80.0 comp_curr
+        inv_line = self._create_invoice_line(
+            'out_invoice',
+            currency_id=self.other_currency.id,
+            invoice_date='2016-01-01',
+            invoice_line_ids=[{'price_unit': 240.0}],
+        )
+
+        wizard = self.env['bank.rec.widget'].with_context(default_st_line_id=st_line.id).new({})
+        wizard._action_add_new_amls(inv_line)
+        self.assertRecordValues(wizard.line_ids, [
+            # pylint: disable=C0326
+            {'flag': 'liquidity',       'amount_currency': 120.0,       'currency_id': self.company_data['currency'].id,    'balance': 120.0},
+            {'flag': 'new_aml',         'amount_currency': -240.0,      'currency_id': self.other_currency.id,              'balance': -80.0},
+            {'flag': 'exchange_diff',   'amount_currency': 0.0,         'currency_id': self.other_currency.id,              'balance': -40.0},
+        ])
+        self.assertRecordValues(wizard, [{'state': 'valid'}])
+
+        wizard._action_validate()
+
+        # Check the statement line.
+        self.assertRecordValues(st_line.line_ids.sorted(), [
+            # pylint: disable=C0326
+            {'account_id': st_line.journal_id.default_account_id.id,    'amount_currency': 120.0,   'currency_id': self.company_data['currency'].id,    'balance': 120.0,  'reconciled': False},
+            {'account_id': inv_line.account_id.id,                      'amount_currency': -240.0,  'currency_id': self.other_currency.id,              'balance': -120.0, 'reconciled': True},
+        ])
+
+        # Check the partials.
+        partials = st_line.line_ids.matched_debit_ids
+        exchange_move = partials.exchange_move_id
+        _liquidity_line, _suspense_line, other_line = st_line._seek_for_lines()
+        self.assertRecordValues(partials.sorted(), [
+            # pylint: disable=C0326
+            {
+                'amount': 40.0,
+                'debit_amount_currency': 0.0,
+                'credit_amount_currency': 0.0,
+                'debit_move_id': exchange_move.line_ids.sorted()[0].id,
+                'credit_move_id': other_line.id,
+                'exchange_move_id': False,
+            },
+            {
+                'amount': 80.0,
+                'debit_amount_currency': 240.0,
+                'credit_amount_currency': 240.0,
+                'debit_move_id': inv_line.id,
+                'credit_move_id': other_line.id,
+                'exchange_move_id': exchange_move.id,
+            },
+        ])
+
+        # Check the exchange diff journal entry.
+        self.assertRecordValues(exchange_move.line_ids.sorted(), [
+            # pylint: disable=C0326
+            {'account_id': inv_line.account_id.id,                                  'amount_currency': 0.0,     'currency_id': self.other_currency.id,  'balance': 40.0,  'reconciled': True},
+            {'account_id': self.env.company.income_currency_exchange_account_id.id, 'amount_currency': 0.0,     'currency_id': self.other_currency.id,  'balance': -40.0, 'reconciled': False},
+        ])
+
+    def test_validation_new_aml_same_foreign_currency(self):
+        income_exchange_account = self.env.company.income_currency_exchange_account_id
+
+        # 6000.0 curr2 == 1200.0 comp_curr (bank rate 5:1 instead of the odoo rate 4:1)
+        st_line = self._create_st_line(
+            1200.0,
+            date='2017-01-01',
+            foreign_currency_id=self.other_currency_2.id,
+            amount_currency=6000.0,
+        )
+        # 6000.0 curr2 == 1000.0 comp_curr (rate 6:1)
+        inv_line = self._create_invoice_line(
+            'out_invoice',
+            currency_id=self.other_currency_2.id,
+            invoice_date='2016-01-01',
+            invoice_line_ids=[{'price_unit': 6000.0}],
+        )
+
+        wizard = self.env['bank.rec.widget'].with_context(default_st_line_id=st_line.id).new({})
+        wizard._action_add_new_amls(inv_line)
+        self.assertRecordValues(wizard.line_ids, [
+            # pylint: disable=C0326
+            {'flag': 'liquidity',       'amount_currency': 1200.0,      'currency_id': self.company_data['currency'].id,    'balance': 1200.0},
+            {'flag': 'new_aml',         'amount_currency': -6000.0,     'currency_id': self.other_currency_2.id,            'balance': -1000.0},
+            {'flag': 'exchange_diff',   'amount_currency': 0.0,         'currency_id': self.other_currency_2.id,            'balance': -200.0},
+        ])
+        self.assertRecordValues(wizard, [{'state': 'valid'}])
+
+        # The amount is the same, no message under the 'amount' field.
+        self.assert_form_extra_text_value(wizard, False)
+
+        wizard._action_validate()
+        self.assertRecordValues(st_line.line_ids, [
+            # pylint: disable=C0326
+            {'account_id': st_line.journal_id.default_account_id.id,    'amount_currency': 1200.0,      'currency_id': self.company_data['currency'].id,    'balance': 1200.0,  'reconciled': False},
+            {'account_id': inv_line.account_id.id,                      'amount_currency': -6000.0,     'currency_id': self.other_currency_2.id,            'balance': -1200.0, 'reconciled': True},
+        ])
+        self.assertRecordValues(st_line, [{'is_reconciled': True}])
+        self.assertRecordValues(inv_line.move_id, [{'payment_state': 'paid'}])
+        self.assertRecordValues(inv_line.matched_credit_ids.exchange_move_id.line_ids, [
+            # pylint: disable=C0326
+            {'account_id': inv_line.account_id.id,                      'amount_currency': 0.0,         'currency_id': self.other_currency_2.id, 'balance': 200.0,   'reconciled': True,  'date': fields.Date.from_string('2017-01-31')},
+            {'account_id': income_exchange_account.id,                  'amount_currency': 0.0,         'currency_id': self.other_currency_2.id, 'balance': -200.0,  'reconciled': False, 'date': fields.Date.from_string('2017-01-31')},
+        ])
+
+        # Reset the wizard.
+        wizard._js_action_reset()
+        self.assertRecordValues(wizard.line_ids, [
+            # pylint: disable=C0326
+            {'flag': 'liquidity',       'amount_currency': 1200.0,      'currency_id': self.company_data['currency'].id,    'balance': 1200.0},
+            {'flag': 'auto_balance',    'amount_currency': -6000.0,     'currency_id': self.other_currency_2.id,            'balance': -1200.0},
+        ])
+
+        # Create the same invoice with a higher amount to check the partial flow.
+        # 9000.0 curr2 == 1500.0 comp_curr (rate 6:1)
+        inv_line = self._create_invoice_line(
+            'out_invoice',
+            currency_id=self.other_currency_2.id,
+            invoice_date='2016-01-01',
+            invoice_line_ids=[{'price_unit': 9000.0}],
+        )
+        wizard._action_add_new_amls(inv_line)
+        self.assertRecordValues(wizard.line_ids, [
+            # pylint: disable=C0326
+            {'flag': 'liquidity',       'amount_currency': 1200.0,      'currency_id': self.company_data['currency'].id,    'balance': 1200.0,  'name': "turlututu"},
+            {'flag': 'new_aml',         'amount_currency': -6000.0,     'currency_id': self.other_currency_2.id,            'balance': -1000.0, 'name': "INV/2016/00002"},
+            {'flag': 'exchange_diff',   'amount_currency': 0.0,         'currency_id': self.other_currency_2.id,            'balance': -200.0,  'name': "Exchange Difference: INV/2016/00002"},
+        ])
+
+        # Check the message under the 'amount' field.
+        line = wizard.line_ids.filtered(lambda x: x.flag == 'new_aml')
+        wizard._js_action_mount_line_in_edit(line.index)
+        self.assert_form_extra_text_value(
+            wizard,
+            r".+open amount of 9,000.000.+ reduced by 6,000.000.+ set the invoice as fully paid .",
+        )
+        self.assertRecordValues(line, [{
+            'suggestion_amount_currency': -9000.0,
+            'suggestion_balance': -1500.0,
+        }])
+
+        # Switch to a full reconciliation.
+        wizard._js_action_apply_line_suggestion(line.index)
+        self.assertRecordValues(wizard.line_ids, [
+            # pylint: disable=C0326
+            {'flag': 'liquidity',       'amount_currency': 1200.0,      'currency_id': self.company_data['currency'].id,    'balance': 1200.0,  'name': "turlututu"},
+            {'flag': 'new_aml',         'amount_currency': -9000.0,     'currency_id': self.other_currency_2.id,            'balance': -1500.0, 'name': "INV/2016/00002"},
+            {'flag': 'exchange_diff',   'amount_currency': 0.0,         'currency_id': self.other_currency_2.id,            'balance': -300.0,  'name': "Exchange Difference: INV/2016/00002"},
+            {'flag': 'auto_balance',    'amount_currency': 3000.0,      'currency_id': self.other_currency_2.id,            'balance': 600.0,   'name': "Open balance of 6,000.000 $"},
+        ])
+
+        # Check the message under the 'amount' field.
+        line = wizard.line_ids.filtered(lambda x: x.flag == 'new_aml')
+        wizard._js_action_mount_line_in_edit(line.index)
+        self.assert_form_extra_text_value(
+            wizard,
+            r".+open amount of 9,000.000.+ paid .+ record a partial payment .",
+        )
+        self.assertRecordValues(line, [{
+            'suggestion_amount_currency': -6000.0,
+            'suggestion_balance': -1000.0,
+        }])
+
+        # Switch back to a partial reconciliation.
+        wizard._js_action_apply_line_suggestion(line.index)
+        self.assertRecordValues(wizard, [{'state': 'valid'}])
+
+        # Reconcile
+        wizard._action_validate()
+        self.assertRecordValues(st_line.line_ids, [
+            # pylint: disable=C0326
+            {'account_id': st_line.journal_id.default_account_id.id,    'amount_currency': 1200.0,      'currency_id': self.company_data['currency'].id,    'balance': 1200.0,  'reconciled': False},
+            {'account_id': inv_line.account_id.id,                      'amount_currency': -6000.0,     'currency_id': self.other_currency_2.id,            'balance': -1200.0, 'reconciled': True},
+        ])
+        self.assertRecordValues(st_line, [{'is_reconciled': True}])
+        self.assertRecordValues(inv_line.move_id, [{
+            'payment_state': 'partial',
+            'amount_residual': 3000.0,
+        }])
+        self.assertRecordValues(inv_line.matched_credit_ids.exchange_move_id.line_ids, [
+            # pylint: disable=C0326
+            {'account_id': inv_line.account_id.id,                      'amount_currency': 0.0,         'currency_id': self.other_currency_2.id, 'balance': 200.0,   'reconciled': True,  'date': fields.Date.from_string('2017-01-31')},
+            {'account_id': income_exchange_account.id,                  'amount_currency': 0.0,         'currency_id': self.other_currency_2.id, 'balance': -200.0,  'reconciled': False, 'date': fields.Date.from_string('2017-01-31')},
+        ])
+
+    def test_validation_expense_exchange_difference(self):
+        expense_exchange_account = self.env.company.expense_currency_exchange_account_id
+
+        # 1200.0 comp_curr = 3600.0 foreign_curr in 2016 (rate 1:3)
+        st_line = self._create_st_line(
+            1200.0,
+            date='2016-01-01',
+        )
+        # 1800.0 comp_curr = 3600.0 foreign_curr in 2017 (rate 1:2)
+        inv_line = self._create_invoice_line(
+            'out_invoice',
+            currency_id=self.other_currency.id,
+            invoice_date='2017-01-01',
+            invoice_line_ids=[{'price_unit': 3600.0}],
+        )
+
+        wizard = self.env['bank.rec.widget'].with_context(default_st_line_id=st_line.id).new({})
+        wizard._action_add_new_amls(inv_line)
+        self.assertRecordValues(wizard.line_ids, [
+            # pylint: disable=C0326
+            {'flag': 'liquidity',       'amount_currency': 1200.0,      'currency_id': self.company_data['currency'].id,    'balance': 1200.0},
+            {'flag': 'new_aml',         'amount_currency': -3600.0,     'currency_id': self.other_currency.id,              'balance': -1800.0},
+            {'flag': 'exchange_diff',   'amount_currency': 0.0,         'currency_id': self.other_currency.id,              'balance': 600.0},
+        ])
+        self.assertRecordValues(wizard, [{'state': 'valid'}])
+
+        wizard._action_validate()
+        self.assertRecordValues(st_line.line_ids, [
+            # pylint: disable=C0326
+            {'account_id': st_line.journal_id.default_account_id.id,    'amount_currency': 1200.0,      'currency_id': self.company_data['currency'].id,    'balance': 1200.0,   'reconciled': False},
+            {'account_id': inv_line.account_id.id,                      'amount_currency': -3600.0,     'currency_id': self.other_currency.id,              'balance': -1200.0,  'reconciled': True},
+        ])
+        self.assertRecordValues(st_line, [{'is_reconciled': True}])
+        self.assertRecordValues(inv_line.move_id, [{'payment_state': 'paid'}])
+        self.assertRecordValues(inv_line.matched_credit_ids.exchange_move_id.line_ids, [
+            # pylint: disable=C0326
+            {'account_id': inv_line.account_id.id,          'amount_currency': 0.0,     'currency_id': self.other_currency.id,   'balance': -600.0,  'reconciled': True,     'date': fields.Date.from_string('2017-01-31')},
+            {'account_id': expense_exchange_account.id,     'amount_currency': 0.0,     'currency_id': self.other_currency.id,   'balance': 600.0,   'reconciled': False,    'date': fields.Date.from_string('2017-01-31')},
+        ])
+        # Checks that the wizard still display the 3 initial lines
+        self.assertRecordValues(wizard.line_ids, [
+            # pylint: disable=C0326
+            {'flag': 'liquidity',       'amount_currency': 1200.0,      'currency_id': self.company_data['currency'].id,    'balance': 1200.0},
+            {'flag': 'aml',             'amount_currency': -3600.0,     'currency_id': self.other_currency.id,              'balance': -1800.0},
+            {'flag': 'aml',             'amount_currency': 0.0,         'currency_id': self.other_currency.id,              'balance': 600.0},
+        ])
+
+    def test_validation_income_exchange_difference(self):
+        income_exchange_account = self.env.company.income_currency_exchange_account_id
+
+        # 1800.0 comp_curr = 3600.0 foreign_curr in 2017 (rate 1:2)
+        st_line = self._create_st_line(
+            1800.0,
+            date='2017-01-01',
+        )
+        # 1200.0 comp_curr = 3600.0 foreign_curr in 2016 (rate 1:3)
+        inv_line = self._create_invoice_line(
+            'out_invoice',
+            currency_id=self.other_currency.id,
+            invoice_date='2016-01-01',
+            invoice_line_ids=[{'price_unit': 3600.0}],
+        )
+
+        wizard = self.env['bank.rec.widget'].with_context(default_st_line_id=st_line.id).new({})
+        wizard._action_add_new_amls(inv_line)
+        self.assertRecordValues(wizard.line_ids, [
+            # pylint: disable=C0326
+            {'flag': 'liquidity',       'amount_currency': 1800.0,      'currency_id': self.company_data['currency'].id,    'balance': 1800.0},
+            {'flag': 'new_aml',         'amount_currency': -3600.0,     'currency_id': self.other_currency.id,              'balance': -1200.0},
+            {'flag': 'exchange_diff',   'amount_currency': 0.0,         'currency_id': self.other_currency.id,              'balance': -600.0},
+        ])
+        self.assertRecordValues(wizard, [{'state': 'valid'}])
+
+        wizard._action_validate()
+        self.assertRecordValues(st_line.line_ids, [
+            # pylint: disable=C0326
+            {'account_id': st_line.journal_id.default_account_id.id,    'amount_currency': 1800.0,      'currency_id': self.company_data['currency'].id,    'balance': 1800.0,   'reconciled': False},
+            {'account_id': inv_line.account_id.id,                      'amount_currency': -3600.0,     'currency_id': self.other_currency.id,              'balance': -1800.0,  'reconciled': True},
+        ])
+        self.assertRecordValues(st_line, [{'is_reconciled': True}])
+        self.assertRecordValues(inv_line.move_id, [{'payment_state': 'paid'}])
+        self.assertRecordValues(inv_line.matched_credit_ids.exchange_move_id.line_ids, [
+            # pylint: disable=C0326
+            {'account_id': inv_line.account_id.id,          'amount_currency': 0.0,     'currency_id': self.other_currency.id,   'balance': 600.0,   'reconciled': True,     'date': fields.Date.from_string('2017-01-31')},
+            {'account_id': income_exchange_account.id,      'amount_currency': 0.0,     'currency_id': self.other_currency.id,   'balance': -600.0,  'reconciled': False,    'date': fields.Date.from_string('2017-01-31')},
+        ])
+        # Checks that the wizard still display the 3 initial lines
+        self.assertRecordValues(wizard.line_ids, [
+            # pylint: disable=C0326
+            {'flag': 'liquidity',       'amount_currency': 1800.0,      'currency_id': self.company_data['currency'].id,    'balance': 1800.0},
+            {'flag': 'aml',             'amount_currency': -3600.0,     'currency_id': self.other_currency.id,              'balance': -1200.0},
+            {'flag': 'aml',             'amount_currency': 0.0,         'currency_id': self.other_currency.id,              'balance': -600.0},
+        ])
+
+    def test_validation_income_exchange_difference_with_rounding(self):
+        # 1000.0 comp_curr = 3000.0 foreign_curr in 2016 (rate 1:3)
+        # However divided in 3 invoices + rounding we have 333.33333 ≃ 333.33 comp_curr = 1000.0 foreign_curr
+        # this implies that the full amount has been used in foreign_curr but there is 0.01 in comp_curr
+        st_line = self._create_st_line(
+            1000.0,
+            date='2016-01-01',
+        )
+
+        # 1500 comp_curr = 3000.0 foreign_curr in 2017 (rate 1:2)
+        inv_line_1 = self._create_invoice_line(
+            'out_invoice',
+            currency_id=self.other_currency.id,
+            invoice_date='2017-01-01',
+            invoice_line_ids=[{'price_unit': 1000.0}],
+        )
+
+        inv_line_2 = self._create_invoice_line(
+            'out_invoice',
+            currency_id=self.other_currency.id,
+            invoice_date='2017-01-01',
+            invoice_line_ids=[{'price_unit': 1000.0}],
+        )
+
+        inv_line_3 = self._create_invoice_line(
+            'out_invoice',
+            currency_id=self.other_currency.id,
+            invoice_date='2017-01-01',
+            invoice_line_ids=[{'price_unit': 1000.0}],
+        )
+
+        wizard = self.env['bank.rec.widget'].with_context(default_st_line_id=st_line.id).new({})
+        wizard._action_add_new_amls(inv_line_1 + inv_line_2 + inv_line_3)
+
+        self.assertRecordValues(wizard.line_ids, [
+            # pylint: disable=C0326
+            {'flag': 'liquidity',       'amount_currency': 1000.0,      'currency_id': self.company_data['currency'].id,    'balance': 1000.0},
+            {'flag': 'new_aml',         'amount_currency': -1000.0,     'currency_id': self.other_currency.id,   'balance': -500.0},
+            {'flag': 'exchange_diff',   'amount_currency': 0.0,         'currency_id': self.other_currency.id,   'balance': 166.67},
+            {'flag': 'new_aml',         'amount_currency': -1000.0,     'currency_id': self.other_currency.id,   'balance': -500.0},
+            {'flag': 'exchange_diff',   'amount_currency': 0.0,         'currency_id': self.other_currency.id,   'balance': 166.67},
+            {'flag': 'new_aml',         'amount_currency': -1000.0,     'currency_id': self.other_currency.id,   'balance': -500.0},
+            {'flag': 'exchange_diff',   'amount_currency': 0.0,         'currency_id': self.other_currency.id,   'balance': 166.67},
+            {'flag': 'auto_balance',    'amount_currency': -0.01,       'currency_id': self.company_data['currency'].id,    'balance': -0.01},
+        ])
+
+        # Remove 0.01 cent in the balance of first exchange line
+        first_exchange_line = wizard.line_ids.filtered(lambda x: x.flag == 'exchange_diff')[:1]
+        wizard._js_action_mount_line_in_edit(first_exchange_line.index)
+        first_exchange_line.balance = 166.66
+        wizard._line_value_changed_balance(first_exchange_line)
+
+        # Every line balance so no 'auto_balance' is generated
+        self.assertRecordValues(wizard.line_ids, [
+            # pylint: disable=C0326
+            {'flag': 'liquidity',       'amount_currency': 1000.0,      'currency_id': self.company_data['currency'].id,    'balance': 1000.0},
+            {'flag': 'new_aml',         'amount_currency': -1000.0,     'currency_id': self.other_currency.id,   'balance': -500.0},
+            {'flag': 'exchange_diff',   'amount_currency': 0.0,         'currency_id': self.other_currency.id,   'balance': 166.66},
+            {'flag': 'new_aml',         'amount_currency': -1000.0,     'currency_id': self.other_currency.id,   'balance': -500.0},
+            {'flag': 'exchange_diff',   'amount_currency': 0.0,         'currency_id': self.other_currency.id,   'balance': 166.67},
+            {'flag': 'new_aml',         'amount_currency': -1000.0,     'currency_id': self.other_currency.id,   'balance': -500.0},
+            {'flag': 'exchange_diff',   'amount_currency': 0.0,         'currency_id': self.other_currency.id,   'balance': 166.67},
+        ])
+
+        self.assertRecordValues(wizard, [{'state': 'valid'}])
+
+        wizard._action_validate()
+
+        # Check that the first line with exchange has -0.01 compared to others
+        self.assertRecordValues(st_line.line_ids, [
+            # pylint: disable=C0326
+            {'account_id': st_line.journal_id.default_account_id.id,    'amount_currency': 1000.0,      'currency_id': self.company_data['currency'].id,    'balance': 1000.0,   'reconciled': False},
+            {'account_id': inv_line_1.account_id.id,                    'amount_currency': -1000.0,     'currency_id': self.other_currency.id,   'balance': -333.34,  'reconciled': True},
+            {'account_id': inv_line_2.account_id.id,                    'amount_currency': -1000.0,     'currency_id': self.other_currency.id,   'balance': -333.33,  'reconciled': True},
+            {'account_id': inv_line_3.account_id.id,                    'amount_currency': -1000.0,     'currency_id': self.other_currency.id,   'balance': -333.33,  'reconciled': True},
+        ])
+
+        self.assertRecordValues(st_line, [{'is_reconciled': True}])
+        self.assertRecordValues(inv_line_1.move_id, [{'payment_state': 'paid'}])
+        self.assertRecordValues(inv_line_2.move_id, [{'payment_state': 'paid'}])
+        self.assertRecordValues(inv_line_3.move_id, [{'payment_state': 'paid'}])
+
+    def test_validation_exchange_diff_multiple(self):
+        income_exchange_account = self.env.company.income_currency_exchange_account_id
+        foreign_currency = self.setup_other_currency('AED', rates=[('2016-01-01', 6.0), ('2017-01-01', 5.0)])
+
+        # 6000.0 curr2 == 1200.0 comp_curr (bank rate 5:1 instead of the odoo rate 6:1)
+        st_line = self._create_st_line(
+            1200.0,
+            date='2016-01-01',
+            foreign_currency_id=foreign_currency.id,
+            amount_currency=6000.0,
+        )
+        # 1000.0 foreign_curr == 166.67 comp_curr (rate 6:1)
+        inv_line_1 = self._create_invoice_line(
+            'out_invoice',
+            currency_id=foreign_currency.id,
+            invoice_date='2016-01-01',
+            invoice_line_ids=[{'price_unit': 1000.0}],
+        )
+        # 2000.00 foreign_curr == 400.0 comp_curr (rate 5:1)
+        inv_line_2 = self._create_invoice_line(
+            'out_invoice',
+            currency_id=foreign_currency.id,
+            invoice_date='2017-01-01',
+            invoice_line_ids=[{'price_unit': 2000.0}],
+        )
+        # 3000.0 foreign_curr == 500.0 comp_curr (rate 6:1)
+        inv_line_3 = self._create_invoice_line(
+            'out_invoice',
+            currency_id=foreign_currency.id,
+            invoice_date='2016-01-01',
+            invoice_line_ids=[{'price_unit': 3000.0}],
+        )
+
+        wizard = self.env['bank.rec.widget'].with_context(default_st_line_id=st_line.id).new({})
+        wizard._action_add_new_amls(inv_line_1 + inv_line_2 + inv_line_3)
+        self.assertRecordValues(wizard.line_ids, [
+            # pylint: disable=C0326
+            {'flag': 'liquidity',       'amount_currency': 1200.0,      'currency_id': self.company_data['currency'].id,  'balance': 1200.0},
+            {'flag': 'new_aml',         'amount_currency': -1000.0,     'currency_id': foreign_currency.id,               'balance': -166.67},
+            {'flag': 'exchange_diff',   'amount_currency': 0.0,         'currency_id': foreign_currency.id,               'balance': -33.33},
+            {'flag': 'new_aml',         'amount_currency': -2000.0,     'currency_id': foreign_currency.id,               'balance': -400.0},
+            {'flag': 'new_aml',         'amount_currency': -3000.0,     'currency_id': foreign_currency.id,               'balance': -500.0},
+            {'flag': 'exchange_diff',   'amount_currency': 0.0,         'currency_id': foreign_currency.id,               'balance': -100.0},
+        ])
+        self.assertRecordValues(wizard, [{'state': 'valid'}])
+
+        # The amount is the same, no message under the 'amount' field.
+        self.assert_form_extra_text_value(wizard, False)
+
+        wizard._action_validate()
+        self.assertRecordValues(st_line.line_ids, [
+            # pylint: disable=C0326
+            {'account_id': st_line.journal_id.default_account_id.id,      'amount_currency': 1200.0,      'currency_id': self.company_data['currency'].id,  'balance': 1200.0,  'reconciled': False},
+            {'account_id': inv_line_1.account_id.id,                      'amount_currency': -1000.0,     'currency_id': foreign_currency.id,               'balance': -200.0,  'reconciled': True},
+            {'account_id': inv_line_2.account_id.id,                      'amount_currency': -2000.0,     'currency_id': foreign_currency.id,               'balance': -400.0,  'reconciled': True},
+            {'account_id': inv_line_3.account_id.id,                      'amount_currency': -3000.0,     'currency_id': foreign_currency.id,               'balance': -600.0,  'reconciled': True},
+        ])
+        self.assertRecordValues(st_line, [{'is_reconciled': True}])
+        self.assertRecordValues(inv_line_1.move_id, [{'payment_state': 'paid'}])
+        self.assertRecordValues(inv_line_2.move_id, [{'payment_state': 'paid'}])
+        self.assertRecordValues(inv_line_3.move_id, [{'payment_state': 'paid'}])
+        self.assertRecordValues((inv_line_1 + inv_line_2 + inv_line_3).matched_credit_ids.exchange_move_id.line_ids, [
+            # pylint: disable=C0326
+            {'account_id': inv_line_1.account_id.id,    'amount_currency': 0.0, 'currency_id': foreign_currency.id, 'balance': 33.33,   'reconciled': True},
+            {'account_id': income_exchange_account.id,  'amount_currency': 0.0, 'currency_id': foreign_currency.id, 'balance': -33.33,  'reconciled': False},
+            {'account_id': inv_line_3.account_id.id,    'amount_currency': 0.0, 'currency_id': foreign_currency.id, 'balance': 100.0,   'reconciled': True},
+            {'account_id': income_exchange_account.id,  'amount_currency': 0.0, 'currency_id': foreign_currency.id, 'balance': -100.0,  'reconciled': False},
+        ])
+
+    def test_validation_foreign_curr_st_line_comp_curr_payment_partial_exchange_difference(self):
+        comp_curr = self.env.company.currency_id
+        foreign_curr = self.other_currency
+
+        st_line = self._create_st_line(
+            650.0,
+            date='2017-01-01',
+            foreign_currency_id=foreign_curr.id,
+            amount_currency=800,
+        )
+
+        payment = self.env['account.payment'].create({
+            'partner_id': self.partner_a.id,
+            'payment_type': 'inbound',
+            'partner_type': 'customer',
+            'date': '2017-01-01',
+            'amount': 725.0,
+        })
+        payment.action_post()
+        pay_line, _counterpart_lines, _writeoff_lines = payment._seek_for_lines()
+
+        wizard = self.env['bank.rec.widget'].with_context(default_st_line_id=st_line.id).new({})
+        wizard._action_add_new_amls(pay_line)
+
+        self.assertRecordValues(wizard.line_ids, [
+            # pylint: disable=C0326
+            {'flag': 'liquidity',       'amount_currency': 650.0,       'currency_id': comp_curr.id,        'balance': 650.0},
+            {'flag': 'new_aml',         'amount_currency': -650.0,      'currency_id': comp_curr.id,        'balance': -650.0},
+        ])
+
+        # Switch to a full reconciliation.
+        line = wizard.line_ids.filtered(lambda x: x.flag == 'new_aml')
+        wizard._js_action_mount_line_in_edit(line.index)
+        wizard._js_action_apply_line_suggestion(line.index)
+
+        # 725 * 800 / 650 = 892.308
+        self.assertRecordValues(wizard.line_ids, [
+            # pylint: disable=C0326
+            {'flag': 'liquidity',       'amount_currency': 650.0,       'currency_id': comp_curr.id,        'balance': 650.0},
+            {'flag': 'new_aml',         'amount_currency': -725.0,      'currency_id': comp_curr.id,        'balance': -725.0},
+            {'flag': 'auto_balance',    'amount_currency': 92.308,      'currency_id': foreign_curr.id,     'balance': 75.0},
+        ])
+
+        # Switch to a partial reconciliation.
+        wizard._js_action_apply_line_suggestion(line.index)
+
+        self.assertRecordValues(wizard.line_ids, [
+            # pylint: disable=C0326
+            {'flag': 'liquidity',       'amount_currency': 650.0,       'currency_id': comp_curr.id,        'balance': 650.0},
+            {'flag': 'new_aml',         'amount_currency': -650.0,      'currency_id': comp_curr.id,        'balance': -650.0},
+        ])
+
+        wizard._action_validate()
+        self.assertRecordValues(pay_line, [{'amount_residual': 75.0}])
+
+    def test_validation_remove_exchange_difference(self):
+        """ Test the case when the foreign currency is missing on the statement line.
+        In that case, the user can remove the exchange difference in order to fully reconcile both items without additional
+        write-off/exchange difference.
+        """
+        # 1200.0 comp_curr = 2400.0 foreign_curr in 2017 (rate 1:2)
+        st_line = self._create_st_line(
+            1200.0,
+            date='2017-01-01',
+        )
+        # 1200.0 comp_curr = 3600.0 foreign_curr in 2016 (rate 1:3)
+        inv_line = self._create_invoice_line(
+            'out_invoice',
+            currency_id=self.other_currency.id,
+            invoice_date='2016-01-01',
+            invoice_line_ids=[{'price_unit': 3600.0}],
+        )
+
+        wizard = self.env['bank.rec.widget'].with_context(default_st_line_id=st_line.id).new({})
+        wizard._action_add_new_amls(inv_line)
+        self.assertRecordValues(wizard.line_ids, [
+            # pylint: disable=C0326
+            {'flag': 'liquidity',       'amount_currency': 1200.0,      'currency_id': self.company_data['currency'].id,    'balance': 1200.0},
+            {'flag': 'new_aml',         'amount_currency': -2400.0,     'currency_id': self.other_currency.id,              'balance': -800.0},
+            {'flag': 'exchange_diff',   'amount_currency': 0.0,         'currency_id': self.other_currency.id,              'balance': -400.0},
+        ])
+        self.assertRecordValues(wizard, [{'state': 'valid'}])
+
+        # Remove the partial.
+        line_index = wizard.line_ids.filtered(lambda x: x.flag == 'new_aml').index
+        wizard._js_action_mount_line_in_edit(line_index)
+        wizard._js_action_apply_line_suggestion(line_index)
+        self.assertRecordValues(wizard.line_ids, [
+            # pylint: disable=C0326
+            {'flag': 'liquidity',       'amount_currency': 1200.0,      'currency_id': self.company_data['currency'].id,    'balance': 1200.0},
+            {'flag': 'new_aml',         'amount_currency': -3600.0,     'currency_id': self.other_currency.id,              'balance': -1200.0},
+            {'flag': 'exchange_diff',   'amount_currency': 0.0,         'currency_id': self.other_currency.id,              'balance': -600.0},
+            {'flag': 'auto_balance',    'amount_currency': 600.0,       'currency_id': self.company_data['currency'].id,    'balance': 600.0},
+        ])
+
+        exchange_diff_index = wizard.line_ids.filtered(lambda x: x.flag == 'exchange_diff').index
+        wizard._js_action_remove_line(exchange_diff_index)
+        self.assertRecordValues(wizard.line_ids, [
+            # pylint: disable=C0326
+            {'flag': 'liquidity',       'amount_currency': 1200.0,      'currency_id': self.company_data['currency'].id,    'balance': 1200.0},
+            {'flag': 'new_aml',         'amount_currency': -3600.0,     'currency_id': self.other_currency.id,              'balance': -1200.0},
+        ])
+
+        wizard._action_validate()
+        self.assertRecordValues(st_line.line_ids, [
+            # pylint: disable=C0326
+            {'account_id': st_line.journal_id.default_account_id.id,    'amount_currency': 1200.0,      'currency_id': self.company_data['currency'].id,    'balance': 1200.0,   'reconciled': False},
+            {'account_id': inv_line.account_id.id,                      'amount_currency': -3600.0,     'currency_id': self.other_currency.id,              'balance': -1200.0,  'reconciled': True},
+        ])
+        self.assertRecordValues(st_line, [{'is_reconciled': True}])
+        self.assertRecordValues(inv_line.move_id, [{'payment_state': 'paid'}])
+
+    def test_validation_new_aml_one_foreign_currency_on_st_line(self):
+        income_exchange_account = self.env.company.income_currency_exchange_account_id
+
+        # 4800.0 curr2 == 1200.0 comp_curr (rate 4:1)
+        st_line = self._create_st_line(
+            1200.0,
+            date='2017-01-01',
+        )
+        # 4800.0 curr2 in 2016 (rate 6:1)
+        inv_line = self._create_invoice_line(
+            'out_invoice',
+            invoice_date='2016-01-01',
+            currency_id=self.other_currency_2.id,
+            invoice_line_ids=[{'price_unit': 4800.0}],
+        )
+
+        wizard = self.env['bank.rec.widget'].with_context(default_st_line_id=st_line.id).new({})
+        wizard._action_add_new_amls(inv_line)
+        self.assertRecordValues(wizard.line_ids, [
+            # pylint: disable=C0326
+            {'flag': 'liquidity',       'amount_currency': 1200.0,      'currency_id': self.company_data['currency'].id,    'balance': 1200.0},
+            {'flag': 'new_aml',         'amount_currency': -4800.0,     'currency_id': self.other_currency_2.id,            'balance': -800.0},
+            {'flag': 'exchange_diff',   'amount_currency': 0.0,         'currency_id': self.other_currency_2.id,            'balance': -400.0},
+        ])
+        self.assertRecordValues(wizard, [{'state': 'valid'}])
+
+        # The amount is the same, no message under the 'amount' field.
+        self.assert_form_extra_text_value(wizard, False)
+
+        wizard._action_validate()
+        self.assertRecordValues(st_line.line_ids, [
+            # pylint: disable=C0326
+            {'account_id': st_line.journal_id.default_account_id.id,    'amount_currency': 1200.0,       'currency_id': self.company_data['currency'].id,    'balance': 1200.0,   'reconciled': False},
+            {'account_id': inv_line.account_id.id,                      'amount_currency': -4800.0,      'currency_id': self.other_currency_2.id,            'balance': -1200.0,  'reconciled': True},
+        ])
+        self.assertRecordValues(st_line, [{'is_reconciled': True}])
+        self.assertRecordValues(inv_line.move_id, [{'payment_state': 'paid'}])
+        self.assertRecordValues(inv_line.matched_credit_ids.exchange_move_id.line_ids, [
+            # pylint: disable=C0326
+            {'account_id': inv_line.account_id.id,                      'amount_currency': 0.0,     'currency_id': self.other_currency_2.id,  'balance': 400.0,   'reconciled': True,    'date': fields.Date.from_string('2017-01-31')},
+            {'account_id': income_exchange_account.id,                  'amount_currency': 0.0,     'currency_id': self.other_currency_2.id,  'balance': -400.0,  'reconciled': False,   'date': fields.Date.from_string('2017-01-31')},
+        ])
+
+        # Checks that the wizard still display the 3 initial lines
+        self.assertRecordValues(wizard.line_ids, [
+            # pylint: disable=C0326
+            {'flag': 'liquidity',       'amount_currency': 1200.0,      'currency_id': self.company_data['currency'].id,    'balance': 1200.0},
+            {'flag': 'aml',             'amount_currency': -4800.0,     'currency_id': self.other_currency_2.id,            'balance': -800.0},
+            {'flag': 'aml',             'amount_currency': 0.0,         'currency_id': self.other_currency_2.id,            'balance': -400.0},  # represents the exchange diff
+        ])
+
+        # Reset the wizard.
+        wizard._js_action_reset()
+        self.assertRecordValues(wizard.line_ids, [
+            # pylint: disable=C0326
+            {'flag': 'liquidity',       'amount_currency': 1200.0,      'currency_id': self.company_data['currency'].id,    'balance': 1200.0},
+            {'flag': 'auto_balance',    'amount_currency': -1200.0,     'currency_id': self.company_data['currency'].id,    'balance': -1200.0},
+        ])
+
+        # Create the same invoice with a higher amount to check the partial flow.
+        # 4800.0 curr2 in 2016 (rate 6:1)
+        inv_line = self._create_invoice_line(
+            'out_invoice',
+            invoice_date='2016-01-01',
+            currency_id=self.other_currency_2.id,
+            invoice_line_ids=[{'price_unit': 9600.0}],
+        )
+        wizard._action_add_new_amls(inv_line)
+        self.assertRecordValues(wizard.line_ids, [
+            # pylint: disable=C0326
+            {'flag': 'liquidity',       'amount_currency': 1200.0,  'currency_id': self.company_data['currency'].id,        'balance': 1200.0},
+            {'flag': 'new_aml',         'amount_currency': -4800.0, 'currency_id': self.other_currency_2.id,                'balance': -800.0},
+            {'flag': 'exchange_diff',   'amount_currency': 0.0,     'currency_id': self.other_currency_2.id,                'balance': -400.0},
+        ])
+
+        # Check the message under the 'amount' field.
+        line = wizard.line_ids.filtered(lambda x: x.flag == 'new_aml')
+        wizard._js_action_mount_line_in_edit(line.index)
+        self.assert_form_extra_text_value(
+            wizard,
+            r".+open amount of 9,600.000.+ reduced by 4,800.000.+ set the invoice as fully paid .",
+        )
+        self.assertRecordValues(line, [{
+            'suggestion_amount_currency': -9600.0,
+            'suggestion_balance': -1600.0,
+        }])
+
+        # Switch to a full reconciliation.
+        wizard._js_action_apply_line_suggestion(line.index)
+        self.assertRecordValues(wizard.line_ids, [
+            # pylint: disable=C0326
+            {'flag': 'liquidity',       'amount_currency': 1200.0,      'currency_id': self.company_data['currency'].id,    'balance': 1200.0},
+            {'flag': 'new_aml',         'amount_currency': -9600.0,     'currency_id': self.other_currency_2.id,            'balance': -1600.0},
+            {'flag': 'exchange_diff',   'amount_currency': 0.0,         'currency_id': self.other_currency_2.id,            'balance': -800.0},
+            {'flag': 'auto_balance',    'amount_currency': 1200.0,      'currency_id': self.company_data['currency'].id,    'balance': 1200.0},
+        ])
+
+        # Check the message under the 'amount' field.
+        line = wizard.line_ids.filtered(lambda x: x.flag == 'new_aml')
+        wizard._js_action_mount_line_in_edit(line.index)
+        self.assert_form_extra_text_value(
+            wizard,
+            r".+open amount of 9,600.000.+ paid .+ record a partial payment .",
+        )
+        self.assertRecordValues(line, [{
+            'suggestion_amount_currency': -4800.0,
+            'suggestion_balance': -800.0,
+        }])
+
+        # Switch back to a partial reconciliation.
+        wizard._js_action_apply_line_suggestion(line.index)
+        self.assertRecordValues(wizard, [{'state': 'valid'}])
+
+        # Reconcile
+        wizard._action_validate()
+        self.assertRecordValues(st_line.line_ids, [
+            # pylint: disable=C0326
+            {'account_id': st_line.journal_id.default_account_id.id,    'amount_currency': 1200.0,       'currency_id': self.company_data['currency'].id,    'balance': 1200.0,   'reconciled': False},
+            {'account_id': inv_line.account_id.id,                      'amount_currency': -4800.0,      'currency_id': self.other_currency_2.id,            'balance': -1200.0,  'reconciled': True},
+        ])
+        self.assertRecordValues(st_line, [{'is_reconciled': True}])
+        self.assertRecordValues(inv_line.move_id, [{
+            'payment_state': 'partial',
+            'amount_residual': 4800.0,
+        }])
+        self.assertRecordValues(inv_line, [{
+            'amount_residual_currency': 4800.0,
+            'amount_residual': 800.0,
+            'reconciled': False,
+        }])
+        self.assertRecordValues(inv_line.matched_credit_ids.exchange_move_id.line_ids, [
+            # pylint: disable=C0326
+            {'account_id': inv_line.account_id.id,      'amount_currency': 0.0, 'currency_id': self.other_currency_2.id, 'balance': 400.0,   'reconciled': True,     'date': fields.Date.from_string('2017-01-31')},
+            {'account_id': income_exchange_account.id,  'amount_currency': 0.0, 'currency_id': self.other_currency_2.id, 'balance': -400.0,  'reconciled': False,    'date': fields.Date.from_string('2017-01-31')},
+        ])
+
+    def test_validation_new_aml_one_foreign_currency_on_inv_line(self):
+        income_exchange_account = self.env.company.income_currency_exchange_account_id
+
+        # 1200.0 comp_curr is equals to 4800.0 curr2 in 2017 (rate 4:1)
+        st_line = self._create_st_line(
+            1200.0,
+            date='2017-01-01',
+        )
+        # 4800.0 curr2 == 800.0 comp_curr (rate 6:1)
+        inv_line = self._create_invoice_line(
+            'out_invoice',
+            currency_id=self.other_currency_2.id,
+            invoice_date='2016-01-01',
+            invoice_line_ids=[{'price_unit': 4800.0}],
+        )
+
+        wizard = self.env['bank.rec.widget'].with_context(default_st_line_id=st_line.id).new({})
+        wizard._action_add_new_amls(inv_line)
+        self.assertRecordValues(wizard.line_ids, [
+            # pylint: disable=C0326
+            {'flag': 'liquidity',       'amount_currency': 1200.0,      'currency_id': self.company_data['currency'].id,    'balance': 1200.0},
+            {'flag': 'new_aml',         'amount_currency': -4800.0,     'currency_id': self.other_currency_2.id,            'balance': -800.0},
+            {'flag': 'exchange_diff',   'amount_currency': 0.0,         'currency_id': self.other_currency_2.id,            'balance': -400.0},
+        ])
+        self.assertRecordValues(wizard, [{'state': 'valid'}])
+
+        # The amount is the same, no message under the 'amount' field.
+        self.assert_form_extra_text_value(wizard, False)
+
+        # Remove the line to see if the exchange difference is well removed.
+        wizard._action_remove_new_amls(inv_line)
+        self.assertRecordValues(wizard.line_ids, [
+            # pylint: disable=C0326
+            {'flag': 'liquidity',       'amount_currency': 1200.0,      'currency_id': self.company_data['currency'].id,    'balance': 1200.0},
+            {'flag': 'auto_balance',    'amount_currency': -1200.0,     'currency_id': self.company_data['currency'].id,    'balance': -1200.0},
+        ])
+        self.assertRecordValues(wizard, [{'state': 'invalid'}])
+
+        # Mount the line again and validate.
+        wizard._action_add_new_amls(inv_line)
+        wizard._action_validate()
+        self.assertRecordValues(st_line.line_ids, [
+            # pylint: disable=C0326
+            {'account_id': st_line.journal_id.default_account_id.id,    'amount_currency': 1200.0,      'currency_id': self.company_data['currency'].id,    'balance': 1200.0,   'reconciled': False},
+            {'account_id': inv_line.account_id.id,                      'amount_currency': -4800.0,     'currency_id': self.other_currency_2.id,            'balance': -1200.0,  'reconciled': True},
+        ])
+        self.assertRecordValues(st_line, [{'is_reconciled': True}])
+        self.assertRecordValues(inv_line.move_id, [{'payment_state': 'paid'}])
+        self.assertRecordValues(inv_line.matched_credit_ids.exchange_move_id.line_ids, [
+            # pylint: disable=C0326
+            {'account_id': inv_line.account_id.id,                      'amount_currency': 0.0,         'currency_id': self.other_currency_2.id, 'balance': 400.0,   'reconciled': True,  'date': fields.Date.from_string('2017-01-31')},
+            {'account_id': income_exchange_account.id,                  'amount_currency': 0.0,         'currency_id': self.other_currency_2.id, 'balance': -400.0,  'reconciled': False, 'date': fields.Date.from_string('2017-01-31')},
+        ])
+
+        # Reset the wizard.
+        wizard._js_action_reset()
+        self.assertRecordValues(wizard.line_ids, [
+            # pylint: disable=C0326
+            {'flag': 'liquidity',       'amount_currency': 1200.0,      'currency_id': self.company_data['currency'].id,    'balance': 1200.0},
+            {'flag': 'auto_balance',    'amount_currency': -1200.0,     'currency_id': self.company_data['currency'].id,    'balance': -1200.0},
+        ])
+
+        # Create the same invoice with a higher amount to check the partial flow.
+        # 7200.0 curr2 == 1200.0 comp_curr (rate 6:1)
+        inv_line = self._create_invoice_line(
+            'out_invoice',
+            currency_id=self.other_currency_2.id,
+            invoice_date='2016-01-01',
+            invoice_line_ids=[{'price_unit': 7200.0}],
+        )
+        wizard._action_add_new_amls(inv_line)
+        self.assertRecordValues(wizard.line_ids, [
+            # pylint: disable=C0326
+            {'flag': 'liquidity',       'amount_currency': 1200.0,      'currency_id': self.company_data['currency'].id,    'balance': 1200.0},
+            {'flag': 'new_aml',         'amount_currency': -4800.0,     'currency_id': self.other_currency_2.id,            'balance': -800.0},
+            {'flag': 'exchange_diff',   'amount_currency': 0.0,         'currency_id': self.other_currency_2.id,            'balance': -400.0},
+        ])
+
+        # Check the message under the 'amount' field.
+        line = wizard.line_ids.filtered(lambda x: x.flag == 'new_aml')
+        wizard._js_action_mount_line_in_edit(line.index)
+        self.assert_form_extra_text_value(
+            wizard,
+            r".+open amount of 7,200.000.+ reduced by 4,800.000.+ set the invoice as fully paid .",
+        )
+        self.assertRecordValues(line, [{
+            'suggestion_amount_currency': -7200.0,
+            'suggestion_balance': -1200.0,
+        }])
+
+        # Switch to a full reconciliation.
+        wizard._js_action_apply_line_suggestion(line.index)
+        self.assertRecordValues(wizard.line_ids, [
+            # pylint: disable=C0326
+            {'flag': 'liquidity',       'amount_currency': 1200.0,      'currency_id': self.company_data['currency'].id,    'balance': 1200.0},
+            {'flag': 'new_aml',         'amount_currency': -7200.0,     'currency_id': self.other_currency_2.id,            'balance': -1200.0},
+            {'flag': 'exchange_diff',   'amount_currency': 0.0,         'currency_id': self.other_currency_2.id,            'balance': -600.0},
+            {'flag': 'auto_balance',    'amount_currency': 600.0,       'currency_id': self.company_data['currency'].id,    'balance': 600.0},
+        ])
+
+        # Check the message under the 'amount' field.
+        line = wizard.line_ids.filtered(lambda x: x.flag == 'new_aml')
+        wizard._js_action_mount_line_in_edit(line.index)
+        self.assert_form_extra_text_value(
+            wizard,
+            r".+open amount of 7,200.000.+ paid .+ record a partial payment .",
+        )
+        self.assertRecordValues(line, [{
+            'suggestion_amount_currency': -4800.0,
+            'suggestion_balance': -800.0,
+        }])
+
+        # Switch back to a partial reconciliation.
+        wizard._js_action_apply_line_suggestion(line.index)
+        self.assertRecordValues(wizard, [{'state': 'valid'}])
+
+        # Reconcile
+        wizard._action_validate()
+        self.assertRecordValues(st_line.line_ids, [
+            # pylint: disable=C0326
+            {'account_id': st_line.journal_id.default_account_id.id,    'amount_currency': 1200.0,      'currency_id': self.company_data['currency'].id,    'balance': 1200.0,  'reconciled': False},
+            {'account_id': inv_line.account_id.id,                      'amount_currency': -4800.0,     'currency_id': self.other_currency_2.id,            'balance': -1200.0,  'reconciled': True},
+        ])
+        self.assertRecordValues(st_line, [{'is_reconciled': True}])
+        self.assertRecordValues(inv_line.move_id, [{
+            'payment_state': 'partial',
+            'amount_residual': 2400.0,
+        }])
+        self.assertRecordValues(inv_line.matched_credit_ids.exchange_move_id.line_ids, [
+            # pylint: disable=C0326
+            {'account_id': inv_line.account_id.id,                      'amount_currency': 0.0,         'currency_id': self.other_currency_2.id, 'balance': 400.0,   'reconciled': True,  'date': fields.Date.from_string('2017-01-31')},
+            {'account_id': income_exchange_account.id,                  'amount_currency': 0.0,         'currency_id': self.other_currency_2.id, 'balance': -400.0,  'reconciled': False, 'date': fields.Date.from_string('2017-01-31')},
+        ])
+
+    def test_validation_new_aml_multi_currencies(self):
+        # 6300.0 curr2 == 1800.0 comp_curr (bank rate 3.5:1 instead of the odoo rate 4:1)
+        st_line = self._create_st_line(
+            1800.0,
+            date='2017-01-01',
+            foreign_currency_id=self.other_currency_2.id,
+            amount_currency=6300.0,
+        )
+        # 21600.0 curr3 == 1800.0 comp_curr (rate 12:1)
+        inv_line = self._create_invoice_line(
+            'out_invoice',
+            currency_id=self.other_currency_3.id,
+            invoice_date='2016-01-01',
+            invoice_line_ids=[{'price_unit': 21600.0}],
+        )
+
+        wizard = self.env['bank.rec.widget'].with_context(default_st_line_id=st_line.id).new({})
+        wizard._action_add_new_amls(inv_line)
+        self.assertRecordValues(wizard.line_ids, [
+            # pylint: disable=C0326
+            {'flag': 'liquidity',   'amount_currency': 1800.0,      'currency_id': self.company_data['currency'].id,    'balance': 1800.0},
+            {'flag': 'new_aml',     'amount_currency': -21600.0,    'currency_id': self.other_currency_3.id,            'balance': -1800.0},
+        ])
+        self.assertRecordValues(wizard, [{'state': 'valid'}])
+
+        # The amount is the same, no message under the 'amount' field.
+        self.assert_form_extra_text_value(wizard, False)
+
+        wizard._action_validate()
+        self.assertRecordValues(st_line.line_ids, [
+            # pylint: disable=C0326
+            {'account_id': st_line.journal_id.default_account_id.id,    'amount_currency': 1800.0,      'currency_id': self.company_data['currency'].id,    'balance': 1800.0,  'reconciled': False},
+            {'account_id': inv_line.account_id.id,                      'amount_currency': -21600.0,    'currency_id': self.other_currency_3.id,            'balance': -1800.0, 'reconciled': True},
+        ])
+        self.assertRecordValues(st_line, [{'is_reconciled': True}])
+        self.assertRecordValues(inv_line.move_id, [{'payment_state': 'paid'}])
+
+        # Reset the wizard.
+        wizard._js_action_reset()
+        self.assertRecordValues(wizard.line_ids, [
+            # pylint: disable=C0326
+            {'flag': 'liquidity',       'amount_currency': 1800.0,      'currency_id': self.company_data['currency'].id,    'balance': 1800.0},
+            {'flag': 'auto_balance',    'amount_currency': -6300.0,     'currency_id': self.other_currency_2.id,            'balance': -1800.0},
+        ])
+
+        # Create the same invoice with a higher amount to check the partial flow.
+        # 32400.0 curr3 == 2700.0 comp_curr (rate 12:1)
+        inv_line = self._create_invoice_line(
+            'out_invoice',
+            currency_id=self.other_currency_3.id,
+            invoice_date='2016-01-01',
+            invoice_line_ids=[{'price_unit': 32400.0}],
+        )
+        wizard._action_add_new_amls(inv_line)
+        self.assertRecordValues(wizard.line_ids, [
+            # pylint: disable=C0326
+            {'flag': 'liquidity',   'amount_currency': 1800.0,      'currency_id': self.company_data['currency'].id,    'balance': 1800.0},
+            {'flag': 'new_aml',     'amount_currency': -21600.0,    'currency_id': self.other_currency_3.id,            'balance': -1800.0},
+        ])
+
+        # Check the message under the 'amount' field.
+        line = wizard.line_ids.filtered(lambda x: x.flag == 'new_aml')
+        wizard._js_action_mount_line_in_edit(line.index)
+        self.assert_form_extra_text_value(
+            wizard,
+            r".+open amount of 32,400.000.+ reduced by 21,600.000.+ set the invoice as fully paid .",
+        )
+        self.assertRecordValues(line, [{
+            'suggestion_amount_currency': -32400.0,
+            'suggestion_balance': -2700.0,
+        }])
+
+        # Switch to a full reconciliation.
+        wizard._js_action_apply_line_suggestion(line.index)
+        self.assertRecordValues(wizard.line_ids, [
+            # pylint: disable=C0326
+            {'flag': 'liquidity',       'amount_currency': 1800.0,      'currency_id': self.company_data['currency'].id,    'balance': 1800.0},
+            {'flag': 'new_aml',         'amount_currency': -32400.0,    'currency_id': self.other_currency_3.id,            'balance': -2700.0},
+            {'flag': 'auto_balance',    'amount_currency': 3150.0,      'currency_id': self.other_currency_2.id,            'balance': 900.0},
+        ])
+
+        # Check the message under the 'amount' field.
+        line = wizard.line_ids.filtered(lambda x: x.flag == 'new_aml')
+        wizard._js_action_mount_line_in_edit(line.index)
+        self.assert_form_extra_text_value(
+            wizard,
+            r".+open amount of 32,400.000.+ paid .+ record a partial payment .",
+        )
+        self.assertRecordValues(line, [{
+            'suggestion_amount_currency': -21600.0,
+            'suggestion_balance': -1800.0,
+        }])
+
+        # Switch back to a partial reconciliation.
+        wizard._js_action_apply_line_suggestion(line.index)
+        self.assertRecordValues(wizard, [{'state': 'valid'}])
+
+        # Reconcile
+        wizard._action_validate()
+        self.assertRecordValues(st_line.line_ids, [
+            # pylint: disable=C0326
+            {'account_id': st_line.journal_id.default_account_id.id,    'amount_currency': 1800.0,      'currency_id': self.company_data['currency'].id,    'balance': 1800.0,  'reconciled': False},
+            {'account_id': inv_line.account_id.id,                      'amount_currency': -21600.0,    'currency_id': self.other_currency_3.id,            'balance': -1800.0, 'reconciled': True},
+        ])
+        self.assertRecordValues(st_line, [{'is_reconciled': True}])
+        self.assertRecordValues(inv_line.move_id, [{
+            'payment_state': 'partial',
+            'amount_residual': 10800.0,
+        }])
+
+    def test_validation_new_aml_multi_currencies_exchange_diff_custom_rates(self):
+        self.company_data['default_journal_bank'].currency_id = self.other_currency
+
+        self.env['res.currency.rate'].create([
+            {
+                'name': '2017-02-01',
+                'rate': 1.0683,
+                'currency_id': self.other_currency.id,
+                'company_id': self.env.company.id,
+            },
+            {
+                'name': '2017-03-01',
+                'rate': 1.0812,
+                'currency_id': self.other_currency.id,
+                'company_id': self.env.company.id,
+            },
+        ])
+
+        # 960.14 curr1 = 888.03 comp_curr
+        st_line = self._create_st_line(
+            -960.14,
+            date='2017-03-01',
+        )
+        # 112.7 curr1 == 105.49 comp_curr
+        inv_line1 = self._create_invoice_line(
+            'in_invoice',
+            currency_id=self.other_currency.id,
+            invoice_date='2017-02-01',
+            invoice_line_ids=[{'price_unit': 112.7}],
+        )
+        # 847.44 curr1 == 793.26 comp_curr
+        inv_line2 = self._create_invoice_line(
+            'in_invoice',
+            currency_id=self.other_currency.id,
+            invoice_date='2017-02-01',
+            invoice_line_ids=[{'price_unit': 847.44}],
+        )
+
+        wizard = self.env['bank.rec.widget'].with_context(default_st_line_id=st_line.id).new({})
+        wizard._action_add_new_amls(inv_line1)
+        wizard._action_add_new_amls(inv_line2)
+
+        self.assertRecordValues(wizard.line_ids, [
+            # pylint: disable=C0326
+            {'flag': 'liquidity',       'amount_currency': -960.14,     'balance': -888.03},
+            {'flag': 'new_aml',         'amount_currency': 112.7,       'balance': 105.49},
+            {'flag': 'exchange_diff',   'amount_currency': 0.0,         'balance': -1.25},
+            {'flag': 'new_aml',         'amount_currency': 847.44,      'balance': 793.26},
+            {'flag': 'exchange_diff',   'amount_currency': 0.0,         'balance': -9.47},
+        ])
+        wizard._action_remove_new_amls(inv_line1 + inv_line2)
+        wizard._action_add_new_amls(inv_line2)
+        wizard._action_add_new_amls(inv_line1)
+
+        self.assertRecordValues(wizard.line_ids, [
+            # pylint: disable=C0326
+            {'flag': 'liquidity',       'amount_currency': -960.14,     'balance': -888.03},
+            {'flag': 'new_aml',         'amount_currency': 847.44,      'balance': 793.26},
+            {'flag': 'exchange_diff',   'amount_currency': 0.0,         'balance': -9.47},
+            {'flag': 'new_aml',         'amount_currency': 112.7,       'balance': 105.49},
+            {'flag': 'exchange_diff',   'amount_currency': 0.0,         'balance': -1.25},
+        ])
+
+    def test_validation_new_aml_from_partially_reconciled_invoice(self):
+        """ In this scenario, the invoice we are reconciling with is already partially reconciled.
+            We need to make sure the new aml's balance is computed using a rate computed from the
+            invoice's balance / amount_currency rather than the invoice's amount_residual / amount_residual_currency.
+        """
+        self.env['res.currency.rate'].create([
+            {
+                'name': '2017-02-01',
+                'rate': 1 / 19.839,
+                'currency_id': self.other_currency.id,
+                'company_id': self.env.company.id,
+            },
+            {
+                'name': '2017-03-01',
+                'rate': 1 / 19.9338,
+                'currency_id': self.other_currency.id,
+                'company_id': self.env.company.id,
+            },
+        ])
+
+        # 600000 comp_curr
+        st_line = self._create_st_line(
+            600000,
+            date='2017-03-01',
+        )
+        liquidity_line, suspense_line, _other_lines = st_line._seek_for_lines()
+        outstanding_account = suspense_line.account_id
+
+        # 23664 curr1 = 469470.10 comp_curr
+        inv_line = self._create_invoice_line(
+            'out_invoice',
+            currency_id=self.other_currency.id,
+            invoice_date='2017-02-01',
+            invoice_line_ids=[{'price_unit': 23664}],
+        )
+
+        # Register a partial payment on the invoice at the same date as the invoice.
+        payment = self.env['account.payment.register'].with_context(active_model='account.move', active_ids=inv_line.move_id.ids).create({
+            'amount': 9.0,
+            'payment_difference_handling': 'open',
+            'currency_id': self.other_currency.id,
+            'payment_method_line_id': self.inbound_payment_method_line.id,
+        })._create_payments()
+
+        # Sanity check that the residuals on the invoice are as expected
+        self.assertRecordValues(inv_line, [{
+            'balance': 469470.1,
+            'amount_currency': 23664.0,
+            'amount_residual': 469291.55,
+            'amount_residual_currency': 23655.0,
+        }])
+
+        # Create the wizard
+        wizard = self.env['bank.rec.widget'].with_context(default_st_line_id=st_line.id).new({})
+        wizard._action_add_new_amls(inv_line)
+
+        self.assertRecordValues(wizard.line_ids, [
+            # pylint: disable=C0326
+            {'flag': 'liquidity',       'amount_currency': 600000,      'balance': 600000.0},
+            {'flag': 'new_aml',         'amount_currency': -23655.0,    'balance': -469291.55},
+            {'flag': 'exchange_diff',   'amount_currency': 0.0,         'balance': -2242.49},
+            {'flag': 'auto_balance',    'amount_currency': -128465.96,  'balance': -128465.96},
+        ])
+
+        # Custom amount_currency.
+        line = wizard.line_ids.filtered(lambda x: x.flag == 'new_aml')
+        wizard._js_action_mount_line_in_edit(line.index)
+        line.amount_currency = -6954.76
+        wizard._line_value_changed_amount_currency(line)
+
+        # Check that the new aml is adjusted according to the invoice rate rather than the invoice residuals' rate.
+        self.assertRecordValues(wizard.line_ids, [
+            # pylint: disable=C0326
+            {'flag': 'liquidity',       'amount_currency': 600000,      'balance': 600000.0},
+            {'flag': 'new_aml',         'amount_currency': -6954.76,    'balance': -137975.48},
+            {'flag': 'exchange_diff',   'amount_currency': 0.0,         'balance': -659.31},
+            {'flag': 'auto_balance',    'amount_currency': -461365.21,  'balance': -461365.21},
+        ])
+
+        # Check that after reconciling, the new aml has 0 residual.
+        wizard._action_validate()
+        self.assertRecordValues(st_line.line_ids, [
+            {
+                'account_id': st_line.journal_id.default_account_id.id,
+                'amount_currency': 600000.0,
+                'balance': 600000.0,
+                'currency_id': self.company_data['currency'].id,
+                'reconciled': False,
+            },
+            {
+                'account_id': inv_line.account_id.id,
+                'amount_currency': -6954.76,
+                'balance': -138634.79,
+                'currency_id': self.other_currency.id,
+                'reconciled': True,
+            },
+            {
+                'account_id': outstanding_account.id,
+                'amount_currency': -461365.21,
+                'currency_id': self.company_data['currency'].id,
+                'balance': -461365.21,
+                'reconciled': False,
+            },
+        ])
+        self.assertRecordValues(inv_line.move_id, [{
+            'payment_state': 'partial',
+            'amount_residual': 16700.24,
+        }])
+
+    def test_validation_with_partner(self):
+        partner = self.partner_a.copy()
+
+        st_line = self._create_st_line(1000.0, partner_id=self.partner_a.id)
+
+        # The wizard can be validated directly thanks to the receivable account set on the partner.
+        wizard = self.env['bank.rec.widget'].with_context(default_st_line_id=st_line.id).new({})
+        self.assertRecordValues(wizard, [{'state': 'valid'}])
+
+        # Validate and check the statement line.
+        wizard._action_validate()
+        self.assertRecordValues(st_line, [{'partner_id': self.partner_a.id}])
+        liquidity_line, _suspense_line, other_line = st_line._seek_for_lines()
+        account = self.partner_a.property_account_receivable_id
+        self.assertRecordValues(liquidity_line + other_line, [
+            # pylint: disable=C0326
+            {'account_id': liquidity_line.account_id.id,    'balance': 1000.0},
+            {'account_id': account.id,                      'balance': -1000.0},
+        ])
+        self.assertRecordValues(wizard, [{'state': 'reconciled'}])
+
+        # Match an invoice with a different partner.
+        wizard._js_action_reset()
+        inv_line = self._create_invoice_line(
+            'out_invoice',
+            partner_id=partner.id,
+            invoice_line_ids=[{'price_unit': 1000.0}],
+        )
+        wizard._action_add_new_amls(inv_line)
+        wizard._action_validate()
+        liquidity_line, suspense_line, other_line = st_line._seek_for_lines()
+        self.assertRecordValues(st_line, [{'partner_id': partner.id}])
+        self.assertRecordValues(st_line.move_id, [{'partner_id': partner.id}])
+        self.assertRecordValues(liquidity_line + other_line, [
+            # pylint: disable=C0326
+            {'account_id': liquidity_line.account_id.id,    'partner_id': partner.id,   'balance': 1000.0},
+            {'account_id': inv_line.account_id.id,          'partner_id': partner.id,   'balance': -1000.0},
+        ])
+        self.assertRecordValues(wizard, [{'state': 'reconciled'}])
+
+        # Reset the wizard and match invoices with different partners.
+        wizard._js_action_reset()
+        partner1 = self.partner_a.copy()
+        inv_line1 = self._create_invoice_line(
+            'out_invoice',
+            partner_id=partner1.id,
+            invoice_line_ids=[{'price_unit': 300.0}],
+        )
+        partner2 = self.partner_a.copy()
+        inv_line2 = self._create_invoice_line(
+            'out_invoice',
+            partner_id=partner2.id,
+            invoice_line_ids=[{'price_unit': 300.0}],
+        )
+        wizard._action_add_new_amls(inv_line1 + inv_line2)
+        wizard._action_validate()
+        liquidity_line, _suspense_line, other_line = st_line._seek_for_lines()
+        self.assertRecordValues(st_line, [{'partner_id': False}])
+        self.assertRecordValues(st_line.move_id, [{'partner_id': False}])
+        self.assertRecordValues(liquidity_line + other_line, [
+            # pylint: disable=C0326
+            {'account_id': liquidity_line.account_id.id,    'partner_id': False,        'balance': 1000.0},
+            {'account_id': inv_line1.account_id.id,         'partner_id': partner1.id,  'balance': -300.0},
+            {'account_id': inv_line2.account_id.id,         'partner_id': partner2.id,  'balance': -300.0},
+            {'account_id': account.id,                      'partner_id': False,        'balance': -400.0},
+        ])
+        self.assertRecordValues(wizard, [{'state': 'reconciled'}])
+
+        # Clear the accounts set on the partner and reset the widget.
+        # The wizard should be invalid since we are not able to set an open balance.
+        partner.property_account_receivable_id = None
+        wizard._js_action_reset()
+        liquidity_line, suspense_line, other_line = st_line._seek_for_lines()
+        self.assertRecordValues(wizard.line_ids, [
+            # pylint: disable=C0326
+            {'flag': 'liquidity',       'account_id': liquidity_line.account_id.id},
+            {'flag': 'auto_balance',    'account_id': suspense_line.account_id.id},
+        ])
+        self.assertRecordValues(wizard, [{'state': 'invalid'}])
+
+    def test_partner_receivable_payable_account(self):
+        self.partner_a.write({'customer_rank': 1, 'supplier_rank': 0})  # always receivable
+        self.partner_b.write({'customer_rank': 0, 'supplier_rank': 1})  # always payable
+        partner_c = self.partner_b.copy({'customer_rank': 3, 'supplier_rank': 2})  # no preference
+
+        positive_st_line = self._create_st_line(1000)
+        journal_account = positive_st_line.journal_id.default_account_id
+
+        wizard = self.env['bank.rec.widget'].with_context(default_st_line_id=positive_st_line.id).new({})
+        suspense_line = wizard.line_ids.filtered(lambda l: l.flag != "liquidity")
+        wizard._js_action_mount_line_in_edit(suspense_line.index)
+
+        suspense_line.partner_id = self.partner_a
+        wizard._line_value_changed_partner_id(suspense_line)
+        self.assertRecordValues(wizard.line_ids, [
+            # pylint: disable=C0326
+            {'partner_id': False,             'account_id': journal_account.id},
+            {'partner_id': self.partner_a.id, 'account_id': self.partner_a.property_account_receivable_id.id},
+        ])
+
+        suspense_line.partner_id = self.partner_b
+        wizard._line_value_changed_partner_id(suspense_line)
+        self.assertRecordValues(wizard.line_ids, [
+            # pylint: disable=C0326
+            {'partner_id': False,             'account_id': journal_account.id},
+            {'partner_id': self.partner_b.id, 'account_id': self.partner_b.property_account_payable_id.id},
+        ])
+
+        suspense_line.partner_id = partner_c
+        wizard._line_value_changed_partner_id(suspense_line)
+        self.assertRecordValues(wizard.line_ids, [
+            # pylint: disable=C0326
+            {'partner_id': False,             'account_id': journal_account.id},
+            {'partner_id': partner_c.id,      'account_id': partner_c.property_account_receivable_id.id},
+        ])
+
+        negative_st_line = self._create_st_line(-1000)
+        wizard = self.env['bank.rec.widget'].with_context(default_st_line_id=negative_st_line.id).new({})
+        suspense_line = wizard.line_ids.filtered(lambda l: l.flag != "liquidity")
+        wizard._js_action_mount_line_in_edit(suspense_line.index)
+
+        suspense_line.partner_id = self.partner_a
+        wizard._line_value_changed_partner_id(suspense_line)
+        self.assertRecordValues(wizard.line_ids, [
+            # pylint: disable=C0326
+            {'partner_id': False,             'account_id': journal_account.id},
+            {'partner_id': self.partner_a.id, 'account_id': self.partner_a.property_account_receivable_id.id},
+        ])
+
+        suspense_line.partner_id = self.partner_b
+        wizard._line_value_changed_partner_id(suspense_line)
+        self.assertRecordValues(wizard.line_ids, [
+            # pylint: disable=C0326
+            {'partner_id': False,             'account_id': journal_account.id},
+            {'partner_id': self.partner_b.id, 'account_id': self.partner_b.property_account_payable_id.id},
+        ])
+
+        suspense_line.partner_id = partner_c
+        wizard._line_value_changed_partner_id(suspense_line)
+        self.assertRecordValues(wizard.line_ids, [
+            # pylint: disable=C0326
+            {'partner_id': False,             'account_id': journal_account.id},
+            {'partner_id': partner_c.id,      'account_id': partner_c.property_account_payable_id.id},
+        ])
+
+    def test_validation_using_custom_account(self):
+        st_line = self._create_st_line(1000.0)
+
+        # By default, the wizard can't be validated directly due to the suspense account.
+        wizard = self.env['bank.rec.widget'].with_context(default_st_line_id=st_line.id).new({})
+        self.assertRecordValues(wizard, [{'state': 'invalid'}])
+
+        # Mount the auto-balance line in edit mode.
+        line = wizard.line_ids.filtered(lambda x: x.flag == 'auto_balance')
+        wizard._js_action_mount_line_in_edit(line.index)
+        liquidity_line, suspense_line, _other_lines = st_line._seek_for_lines()
+        self.assertRecordValues(line, [{
+            'account_id': suspense_line.account_id.id,
+            'balance': -1000.0,
+        }])
+
+        # Switch to a custom account.
+        account = self.env['account.account'].create({
+            'name': "test_validation_using_custom_account",
+            'code': "424242",
+            'account_type': "asset_current",
+        })
+        line.account_id = account
+        wizard._line_value_changed_account_id(line)
+        self.assertRecordValues(wizard.line_ids, [
+            # pylint: disable=C0326
+            {'flag': 'liquidity',   'account_id': liquidity_line.account_id.id, 'balance': 1000.0},
+            {'flag': 'manual',      'account_id': account.id,                   'balance': -1000.0},
+        ])
+
+        # The wizard can be validated.
+        self.assertRecordValues(wizard, [{'state': 'valid'}])
+
+        # Validate and check the statement line.
+        wizard._action_validate()
+        liquidity_line, _suspense_line, other_line = st_line._seek_for_lines()
+        self.assertRecordValues(liquidity_line + other_line, [
+            # pylint: disable=C0326
+            {'account_id': liquidity_line.account_id.id,    'balance': 1000.0},
+            {'account_id': account.id,                      'balance': -1000.0},
+        ])
+        self.assertRecordValues(wizard, [{'state': 'reconciled'}])
+
+    def test_validation_with_taxes(self):
+        st_line = self._create_st_line(1000.0)
+
+        tax_tags = self.env['account.account.tag'].create({
+            'name': f'tax_tag_{i}',
+            'applicability': 'taxes',
+            'country_id': self.env.company.account_fiscal_country_id.id,
+        } for i in range(4))
+
+        tax_21 = self.env['account.tax'].create({
+            'name': "tax_21",
+            'amount': 21,
+            'invoice_repartition_line_ids': [
+                Command.create({
+                    'factor_percent': 100,
+                    'repartition_type': 'base',
+                    'tag_ids': [Command.set(tax_tags[0].ids)],
+                }),
+                Command.create({
+                    'factor_percent': 100,
+                    'repartition_type': 'tax',
+                    'tag_ids': [Command.set(tax_tags[1].ids)],
+                }),
+            ],
+            'refund_repartition_line_ids': [
+                Command.create({
+                    'factor_percent': 100,
+                    'repartition_type': 'base',
+                    'tag_ids': [Command.set(tax_tags[2].ids)],
+                }),
+                Command.create({
+                    'factor_percent': 100,
+                    'repartition_type': 'tax',
+                    'tag_ids': [Command.set(tax_tags[3].ids)],
+                }),
+            ],
+        })
+
+        wizard = self.env['bank.rec.widget'].with_context(default_st_line_id=st_line.id).new({})
+        line = wizard.line_ids.filtered(lambda x: x.flag == 'auto_balance')
+        wizard._js_action_mount_line_in_edit(line.index)
+        line.tax_ids = [Command.link(tax_21.id)]
+        wizard._line_value_changed_tax_ids(line)
+
+        self.assertRecordValues(wizard.line_ids, [
+            # pylint: disable=C0326
+            {'flag': 'liquidity',   'balance': 1000.0,  'tax_tag_ids': []},
+            {'flag': 'manual',      'balance': -826.45, 'tax_tag_ids': tax_tags[0].ids},
+            {'flag': 'tax_line',    'balance': -173.55, 'tax_tag_ids': tax_tags[1].ids},
+        ])
+
+        # Remove the tax directly.
+        line.tax_ids = [Command.clear()]
+        wizard._line_value_changed_tax_ids(line)
+
+        self.assertRecordValues(wizard.line_ids, [
+            # pylint: disable=C0326
+            {'flag': 'liquidity',   'balance': 1000.0,  'tax_tag_ids': []},
+            {'flag': 'manual',      'balance': -1000.0, 'tax_tag_ids': []},
+        ])
+
+        # Edit the base line. The tax tags should be the refund ones.
+        line = wizard.line_ids.filtered(lambda x: x.flag == 'manual')
+        wizard._js_action_mount_line_in_edit(line.index)
+        line.tax_ids = [Command.link(tax_21.id)]
+        wizard._line_value_changed_tax_ids(line)
+        line.balance = 500.0
+        wizard._line_value_changed_balance(line)
+
+        self.assertRecordValues(wizard.line_ids, [
+            # pylint: disable=C0326
+            {'flag': 'liquidity',       'balance': 1000.0,      'tax_tag_ids': []},
+            {'flag': 'manual',          'balance': 500.0,       'tax_tag_ids': tax_tags[2].ids},
+            {'flag': 'tax_line',        'balance': 105.0,       'tax_tag_ids': tax_tags[3].ids},
+            {'flag': 'auto_balance',    'balance': -1605.0,     'tax_tag_ids': []},
+        ])
+
+        # Edit the base line.
+        line = wizard.line_ids.filtered(lambda x: x.flag == 'manual')
+        wizard._js_action_mount_line_in_edit(line.index)
+        line.balance = -500.0
+        wizard._line_value_changed_balance(line)
+
+        self.assertRecordValues(wizard.line_ids, [
+            # pylint: disable=C0326
+            {'flag': 'liquidity',       'balance': 1000.0,  'tax_tag_ids': []},
+            {'flag': 'manual',          'balance': -500.0,  'tax_tag_ids': tax_tags[0].ids},
+            {'flag': 'tax_line',        'balance': -105.0,  'tax_tag_ids': tax_tags[1].ids},
+            {'flag': 'auto_balance',    'balance': -395.0,  'tax_tag_ids': []},
+        ])
+
+        # Edit the tax line.
+        line = wizard.line_ids.filtered(lambda x: x.flag == 'tax_line')
+        wizard._js_action_mount_line_in_edit(line.index)
+        line.balance = -100.0
+        wizard._line_value_changed_balance(line)
+
+        self.assertRecordValues(wizard.line_ids, [
+            # pylint: disable=C0326
+            {'flag': 'liquidity',       'balance': 1000.0,  'tax_tag_ids': []},
+            {'flag': 'manual',          'balance': -500.0,  'tax_tag_ids': tax_tags[0].ids},
+            {'flag': 'tax_line',        'balance': -100.0,  'tax_tag_ids': tax_tags[1].ids},
+            {'flag': 'auto_balance',    'balance': -400.0,  'tax_tag_ids': []},
+        ])
+
+        # Add a new tax.
+        tax_10 = self.env['account.tax'].create({
+            'name': "tax_10",
+            'amount': 10,
+        })
+
+        line = wizard.line_ids.filtered(lambda x: x.flag == 'manual')
+        wizard._js_action_mount_line_in_edit(line.index)
+        line.tax_ids = [Command.link(tax_10.id)]
+        wizard._line_value_changed_tax_ids(line)
+
+        self.assertRecordValues(wizard.line_ids, [
+            # pylint: disable=C0326
+            {'flag': 'liquidity',       'balance': 1000.0},
+            {'flag': 'manual',          'balance': -500.0},
+            {'flag': 'tax_line',        'balance': -105.0},
+            {'flag': 'tax_line',        'balance': -50.0},
+            {'flag': 'auto_balance',    'balance': -345.0},
+        ])
+
+        # Remove the taxes.
+        line = wizard.line_ids.filtered(lambda x: x.flag == 'manual')
+        wizard._js_action_mount_line_in_edit(line.index)
+        line.tax_ids = [Command.clear()]
+        wizard._line_value_changed_tax_ids(line)
+
+        self.assertRecordValues(wizard.line_ids, [
+            # pylint: disable=C0326
+            {'flag': 'liquidity',       'balance': 1000.0},
+            {'flag': 'manual',          'balance': -500.0},
+            {'flag': 'auto_balance',    'balance': -500.0},
+        ])
+
+        # Reset the amount.
+        line = wizard.line_ids.filtered(lambda x: x.flag == 'manual')
+        wizard._js_action_mount_line_in_edit(line.index)
+        line.balance = -1000.0
+        wizard._line_value_changed_balance(line)
+
+        self.assertRecordValues(wizard.line_ids, [
+            # pylint: disable=C0326
+            {'flag': 'liquidity',       'balance': 1000.0},
+            {'flag': 'manual',          'balance': -1000.0},
+        ])
+
+        # Add taxes. We should be back into the "price included taxes" mode.
+        line = wizard.line_ids.filtered(lambda x: x.flag == 'manual')
+        wizard._js_action_mount_line_in_edit(line.index)
+        line.tax_ids = [Command.link(tax_21.id)]
+        wizard._line_value_changed_tax_ids(line)
+
+        self.assertRecordValues(wizard.line_ids, [
+            # pylint: disable=C0326
+            {'flag': 'liquidity',   'balance': 1000.0},
+            {'flag': 'manual',      'balance': -826.45},
+            {'flag': 'tax_line',    'balance': -173.55},
+        ])
+
+        line = wizard.line_ids.filtered(lambda x: x.flag == 'manual')
+        wizard._js_action_mount_line_in_edit(line.index)
+        line.tax_ids = [Command.link(tax_10.id)]
+        wizard._line_value_changed_tax_ids(line)
+
+        self.assertRecordValues(wizard.line_ids, [
+            # pylint: disable=C0326
+            {'flag': 'liquidity',   'balance': 1000.0},
+            {'flag': 'manual',      'balance': -763.35},
+            {'flag': 'tax_line',    'balance': -160.31},
+            {'flag': 'tax_line',    'balance': -76.34},
+        ])
+
+        # Changing the account should recompute the taxes but preserve the "price included taxes" mode.
+        line = wizard.line_ids.filtered(lambda x: x.flag == 'manual')
+        wizard._js_action_mount_line_in_edit(line.index)
+        line.account_id = self.account_revenue1
+        wizard._line_value_changed_account_id(line)
+
+        self.assertRecordValues(wizard.line_ids, [
+            # pylint: disable=C0326
+            {'flag': 'liquidity',   'balance': 1000.0},
+            {'flag': 'manual',      'balance': -763.35},
+            {'flag': 'tax_line',    'balance': -160.31},
+            {'flag': 'tax_line',    'balance': -76.34},
+        ])
+
+        # The wizard can be validated.
+        self.assertRecordValues(wizard, [{'state': 'valid'}])
+
+        # Validate and check the statement line.
+        wizard._action_validate()
+        self.assertRecordValues(st_line.line_ids, [
+            # pylint: disable=C0326
+            {'balance': 1000.0},
+            {'balance': -763.35},
+            {'balance': -160.31},
+            {'balance': -76.34},
+        ])
+        self.assertRecordValues(wizard, [{'state': 'reconciled'}])
+
+    def test_validation_caba_tax_account(self):
+        """ Cash basis taxes usually put their tax lines on a transition account, and the cash basis entries then move those amounts
+        to the regular tax accounts. When using a cash basis tax in the bank reconciliation widget, their won't be any cash basis
+        entry and the lines will directly be exigible, so we want to use the final tax account directly.
+        """
+        tax_account = self.company_data['default_account_tax_sale']
+
+        caba_tax = self.env['account.tax'].create({
+            'name': "CABA",
+            'amount_type': 'percent',
+            'amount': 20.0,
+            'tax_exigibility': 'on_payment',
+            'cash_basis_transition_account_id': self.safe_copy(tax_account).id,
+            'invoice_repartition_line_ids': [
+                (0, 0, {
+                    'repartition_type': 'base',
+                }),
+                (0, 0, {
+                    'repartition_type': 'tax',
+                    'account_id': tax_account.id,
+                }),
+            ],
+            'refund_repartition_line_ids': [
+                (0, 0, {
+                    'repartition_type': 'base',
+                }),
+                (0, 0, {
+                    'repartition_type': 'tax',
+                    'account_id': tax_account.id,
+                }),
+            ],
+        })
+
+        st_line = self._create_st_line(120.0)
+
+        wizard = self.env['bank.rec.widget'].with_context(default_st_line_id=st_line.id).new({})
+        line = wizard.line_ids.filtered(lambda x: x.flag == 'auto_balance')
+        wizard._js_action_mount_line_in_edit(line.index)
+        line.account_id = self.account_revenue1
+        line.tax_ids = [Command.link(caba_tax.id)]
+        wizard._line_value_changed_tax_ids(line)
+
+        self.assertRecordValues(wizard.line_ids, [
+            # pylint: disable=C0326
+            {'flag': 'liquidity',   'balance': 120.0,  'account_id': st_line.journal_id.default_account_id.id},
+            {'flag': 'manual',      'balance': -100.0, 'account_id': self.account_revenue1.id},
+            {'flag': 'tax_line',    'balance': -20.0,  'account_id': tax_account.id},
+        ])
+
+        self.assertRecordValues(wizard, [{'state': 'valid'}])
+
+        wizard._action_validate()
+        self.assertRecordValues(st_line.line_ids, [
+            # pylint: disable=C0326
+            {'balance': 120.0,  'tax_ids': [],           'tax_line_id': False,       'account_id': st_line.journal_id.default_account_id.id},
+            {'balance': -100.0, 'tax_ids': caba_tax.ids, 'tax_line_id': False,       'account_id': self.account_revenue1.id},
+            {'balance': -20.0,  'tax_ids': [],           'tax_line_id': caba_tax.id, 'account_id': tax_account.id},
+        ])
+        self.assertRecordValues(wizard, [{'state': 'reconciled'}])
+
+    def test_validation_changed_default_account(self):
+        st_line = self._create_st_line(100.0, partner_id=self.partner_a.id)
+        original_journal_account_id = st_line.journal_id.default_account_id
+        # Change the default account of the journal (exceptional case)
+        st_line.journal_id.default_account_id = self.company_data['default_journal_cash'].default_account_id
+        wizard = self.env['bank.rec.widget'].with_context(default_st_line_id=st_line.id).new({})
+        self.assertRecordValues(wizard, [{'state': 'valid'}])
+        # Validate and check the statement line.
+        wizard._action_validate()
+        liquidity_line, _suspense_line, _other_line = st_line._seek_for_lines()
+        self.assertRecordValues(liquidity_line, [
+            {'account_id': original_journal_account_id.id, 'balance': 100.0},
+        ])
+        self.assertRecordValues(wizard, [{'state': 'reconciled'}])
+
+    def test_apply_taxes_with_reco_model(self):
+        st_line = self._create_st_line(1000.0)
+
+        tax_21 = self.env['account.tax'].create({
+            'name': "tax_21",
+            'amount': 21,
+        })
+
+        reco_model = self.env['account.reconcile.model'].create({
+            'name': "test_apply_taxes_with_reco_model",
+            'rule_type': 'writeoff_button',
+            'line_ids': [Command.create({
+                'account_id': self.account_revenue1.id,
+                'tax_ids': [Command.set(tax_21.ids)],
+            })],
+        })
+
+        wizard = self.env['bank.rec.widget'].with_context(default_st_line_id=st_line.id).new({})
+        wizard._action_select_reconcile_model(reco_model)
+
+        self.assertRecordValues(wizard.line_ids, [
+            # pylint: disable=C0326
+            {'flag': 'liquidity',   'balance': 1000.0},
+            {'flag': 'manual',      'balance': -826.45},
+            {'flag': 'tax_line',    'balance': -173.55},
+        ])
+
+    def test_percentage_st_line_with_reco_model(self):
+        journal_curr = self.other_currency
+        foreign_curr = self.other_currency_2
+        self.company_data['default_journal_bank'].currency_id = journal_curr
+
+        # Setup triple currency.
+        st_line = self._create_st_line(
+            1000.0,
+            date='2018-01-01',
+            foreign_currency_id=foreign_curr.id,
+            amount_currency=4000.0,
+        )
+
+        reco_model = self.env['account.reconcile.model'].create({
+            'name': "test_percentage_st_line_with_reco_model",
+            'rule_type': 'writeoff_button',
+            'line_ids': [
+                Command.create({
+                    'amount_type': 'percentage_st_line',
+                    'amount_string': str(percentage),
+                    'label': str(i),
+                    'account_id': self.account_revenue1.id,
+                })
+                for i, percentage in enumerate((74.0, 24.0, 12.0, -10.0))
+            ],
+        })
+
+        wizard = self.env['bank.rec.widget'].with_context(default_st_line_id=st_line.id).new({})
+        wizard._action_select_reconcile_model(reco_model)
+
+        self.assertRecordValues(wizard.line_ids, [
+            {'flag': 'liquidity',   'currency_id': journal_curr.id,     'amount_currency': 1000.0,      'balance': 500.0},
+            {'flag': 'manual',      'currency_id': journal_curr.id,     'amount_currency': -740.0,      'balance': -370.0},
+            {'flag': 'manual',      'currency_id': journal_curr.id,     'amount_currency': -240.0,      'balance': -120.0},
+            {'flag': 'manual',      'currency_id': journal_curr.id,     'amount_currency': -120.0,      'balance': -60.0},
+            {'flag': 'manual',      'currency_id': journal_curr.id,     'amount_currency': 100.0,       'balance': 50.0},
+        ])
+
+    def test_manual_edits_not_replaced(self):
+        """ 2 partial payments should keep the edited balance """
+        st_line = self._create_st_line(
+            1200.0,
+            date='2017-02-01',
+        )
+        inv_line_1 = self._create_invoice_line(
+            'out_invoice',
+            invoice_date='2016-01-01',
+            invoice_line_ids=[{'price_unit': 3000.0}],
+        )
+        inv_line_2 = self._create_invoice_line(
+            'out_invoice',
+            invoice_date='2017-01-01',
+            invoice_line_ids=[{'price_unit': 4000.0}],
+        )
+
+        wizard = self.env['bank.rec.widget'].with_context(default_st_line_id=st_line.id).new({})
+        wizard._action_add_new_amls(inv_line_1)
+        self.assertRecordValues(wizard.line_ids, [
+            # pylint: disable=C0326
+            {'flag': 'liquidity',    'balance': 1200.0},
+            {'flag': 'new_aml',      'balance':-1200.0},
+        ])
+
+        line = wizard.line_ids.filtered(lambda x: x.flag == 'new_aml')
+        wizard._js_action_mount_line_in_edit(line.index)
+        line.balance = -600.0
+        wizard._line_value_changed_balance(line)
+
+        self.assertRecordValues(wizard.line_ids, [
+            # pylint: disable=C0326
+            {'flag': 'liquidity',    'balance': 1200.0},
+            {'flag': 'new_aml',      'balance': -600.0},
+            {'flag': 'auto_balance', 'balance': -600.0},
+        ])
+
+        wizard._action_add_new_amls(inv_line_2)
+
+        self.assertRecordValues(wizard.line_ids, [
+            # pylint: disable=C0326
+            {'flag': 'liquidity',    'balance': 1200.0},
+            {'flag': 'new_aml',      'balance': -600.0},
+            {'flag': 'new_aml',      'balance': -600.0},
+        ])
+
+    def test_manual_edits_not_replaced_multicurrency(self):
+        """ 2 partial payments should keep the edited amount_currency """
+        st_line = self._create_st_line(
+            1200.0,
+            date='2018-01-01',
+            foreign_currency_id=self.other_currency_2.id,
+            amount_currency=6000.0,  # rate 5:1
+        )
+
+        inv_line_1 = self._create_invoice_line(
+            'out_invoice',
+            invoice_date='2016-01-01',
+            currency_id=self.other_currency_2.id,
+            invoice_line_ids=[{'price_unit': 6000.0}],  # 1000 company curr (rate 6:1)
+        )
+        inv_line_2 = self._create_invoice_line(
+            'out_invoice',
+            invoice_date='2017-01-01',
+            currency_id=self.other_currency_2.id,
+            invoice_line_ids=[{'price_unit': 4000.0}], # 1000 company curr (rate 4:1)
+        )
+
+        wizard = self.env['bank.rec.widget'].with_context(default_st_line_id=st_line.id).new({})
+        wizard._action_add_new_amls(inv_line_1)
+        self.assertRecordValues(wizard.line_ids, [
+            # pylint: disable=C0326
+            {'flag': 'liquidity',     'amount_currency': 1200.0, 'balance': 1200.0},
+            {'flag': 'new_aml',       'amount_currency':-6000.0, 'balance':-1000.0},
+            {'flag': 'exchange_diff', 'amount_currency':    0.0, 'balance': -200.0},
+        ])
+
+        line = wizard.line_ids.filtered(lambda x: x.flag == 'new_aml')
+        wizard._js_action_mount_line_in_edit(line.index)
+        line.amount_currency = -3000.0
+        wizard._line_value_changed_amount_currency(line)
+
+        self.assertRecordValues(wizard.line_ids, [
+            # pylint: disable=C0326
+            {'flag': 'liquidity',     'amount_currency': 1200.0, 'balance': 1200.0},
+            {'flag': 'new_aml',       'amount_currency':-3000.0, 'balance': -500.0},
+            {'flag': 'exchange_diff', 'amount_currency':    0.0, 'balance': -100.0},
+            {'flag': 'auto_balance',  'amount_currency':-3000.0, 'balance': -600.0},
+        ])
+
+        wizard._action_add_new_amls(inv_line_2)
+
+        self.assertRecordValues(wizard.line_ids, [
+            # pylint: disable=C0326
+            {'flag': 'liquidity',     'amount_currency': 1200.0, 'balance': 1200.0},
+            {'flag': 'new_aml',       'amount_currency':-3000.0, 'balance': -500.0},
+            {'flag': 'exchange_diff', 'amount_currency':    0.0, 'balance': -100.0},
+            {'flag': 'new_aml',       'amount_currency':-3000.0, 'balance': -750.0},
+            {'flag': 'exchange_diff', 'amount_currency':    0.0, 'balance':  150.0},
+        ])
+
+    def test_creating_manual_line_multi_currencies(self):
+        # 6300.0 curr2 == 1800.0 comp_curr (bank rate 3.5:1 instead of the odoo rate 4:1)
+        st_line = self._create_st_line(
+            1800.0,
+            date='2017-01-01',
+            foreign_currency_id=self.other_currency_2.id,
+            amount_currency=6300.0,
+        )
+
+        wizard = self.env['bank.rec.widget'].with_context(default_st_line_id=st_line.id).new({})
+        self.assertRecordValues(wizard.line_ids, [
+            # pylint: disable=C0326
+            {'flag': 'liquidity',       'amount_currency': 1800.0,  'currency_id': self.company_data['currency'].id,    'balance': 1800.0},
+            {'flag': 'auto_balance',    'amount_currency': -6300.0, 'currency_id': self.other_currency_2.id,            'balance': -1800.0},
+        ])
+
+        # Custom balance.
+        line = wizard.line_ids.filtered(lambda x: x.flag == 'auto_balance')
+        wizard._js_action_mount_line_in_edit(line.index)
+        line.balance = -1500.0
+        wizard._line_value_changed_balance(line)
+        self.assertRecordValues(wizard.line_ids, [
+            # pylint: disable=C0326
+            {'flag': 'liquidity',       'amount_currency': 1800.0,  'currency_id': self.company_data['currency'].id,    'balance': 1800.0},
+            {'flag': 'manual',          'amount_currency': -6300.0, 'currency_id': self.other_currency_2.id,            'balance': -1500.0},
+            {'flag': 'auto_balance',    'amount_currency': 0.0,     'currency_id': self.other_currency_2.id,            'balance': -300.0},
+        ])
+
+        # Custom amount_currency.
+        line = wizard.line_ids.filtered(lambda x: x.flag == 'manual')
+        wizard._js_action_mount_line_in_edit(line.index)
+        line.amount_currency = -4200.0
+        wizard._line_value_changed_amount_currency(line)
+        self.assertRecordValues(wizard.line_ids, [
+            # pylint: disable=C0326
+            {'flag': 'liquidity',       'amount_currency': 1800.0,  'currency_id': self.company_data['currency'].id,    'balance': 1800.0},
+            {'flag': 'manual',          'amount_currency': -4200.0, 'currency_id': self.other_currency_2.id,            'balance': -1200.0},
+            {'flag': 'auto_balance',    'amount_currency': -2100.0, 'currency_id': self.other_currency_2.id,            'balance': -600.0},
+        ])
+
+        # Custom currency_id.
+        line = wizard.line_ids.filtered(lambda x: x.flag == 'manual')
+        wizard._js_action_mount_line_in_edit(line.index)
+        line.currency_id = self.other_currency
+        wizard._line_value_changed_currency_id(line)
+        self.assertRecordValues(wizard.line_ids, [
+            # pylint: disable=C0326
+            {'flag': 'liquidity',       'amount_currency': 1800.0,  'currency_id': self.company_data['currency'].id,    'balance': 1800.0},
+            {'flag': 'manual',          'amount_currency': -4200.0, 'currency_id': self.other_currency.id,              'balance': -2100.0},
+            {'flag': 'auto_balance',    'amount_currency': 1050.0,  'currency_id': self.other_currency_2.id,            'balance': 300.0},
+        ])
+
+        # Custom balance.
+        line = wizard.line_ids.filtered(lambda x: x.flag == 'manual')
+        wizard._js_action_mount_line_in_edit(line.index)
+        line.balance = -1800.0
+        wizard._line_value_changed_balance(line)
+        self.assertRecordValues(wizard.line_ids, [
+            # pylint: disable=C0326
+            {'flag': 'liquidity',       'amount_currency': 1800.0,  'currency_id': self.company_data['currency'].id,    'balance': 1800.0},
+            {'flag': 'manual',          'amount_currency': -4200.0, 'currency_id': self.other_currency.id,              'balance': -1800.0},
+        ])
+
+    def test_auto_reconcile_cron(self):
+        self.env['account.reconcile.model'].search([('company_id', '=', self.company_data['company'].id)]).unlink()
+        cron = self.env.ref('account_accountant.auto_reconcile_bank_statement_line')
+        self.env['ir.cron.trigger'].search([('cron_id', '=', cron.id)]).unlink()
+
+        st_line = self._create_st_line(1234.0, partner_id=self.partner_a.id, date='2017-01-01')
+        self.assertEqual(len(self.env['ir.cron.trigger'].search([('cron_id', '=', cron.id)])), 1)
+
+        self._create_invoice_line(
+            'out_invoice',
+            invoice_date='2017-01-01',
+            invoice_line_ids=[{'price_unit': 1234.0}],
+        )
+
+        rule = self.env['account.reconcile.model'].create({
+            'name': "test_auto_reconcile_cron",
+            'rule_type': 'writeoff_suggestion',
+            'auto_reconcile': False,
+            'line_ids': [Command.create({'account_id': self.account_revenue1.id})],
+        })
+
+        # The CRON is not doing anything since the model is not auto reconcile.
+        with freeze_time('2017-01-01'):
+            self.env['account.bank.statement.line']._cron_try_auto_reconcile_statement_lines()
+        self.assertRecordValues(st_line, [{'is_reconciled': False, 'cron_last_check': False}])
+        self.assertEqual(len(self.env['ir.cron.trigger'].search([('cron_id', '=', cron.id)])), 1)
+
+        rule.auto_reconcile = True
+
+        # The CRON don't consider old statement lines.
+        with freeze_time('2017-06-01'):
+            self.env['account.bank.statement.line']._cron_try_auto_reconcile_statement_lines()
+        self.assertRecordValues(st_line, [{'is_reconciled': False, 'cron_last_check': False}])
+        self.assertEqual(len(self.env['ir.cron.trigger'].search([('cron_id', '=', cron.id)])), 1)
+
+        # The CRON will auto-reconcile the line.
+        with freeze_time('2017-01-02'):
+            self.env['account.bank.statement.line']._cron_try_auto_reconcile_statement_lines()
+        self.assertRecordValues(st_line, [{'is_reconciled': True, 'cron_last_check': fields.Datetime.from_string('2017-01-02 00:00:00')}])
+        self.assertEqual(len(self.env['ir.cron.trigger'].search([('cron_id', '=', cron.id)])), 1)
+
+        st_line1 = self._create_st_line(1234.0, partner_id=self.partner_a.id, date='2018-01-01')
+        self.assertEqual(len(self.env['ir.cron.trigger'].search([('cron_id', '=', cron.id)])), 2)
+        self._create_invoice_line(
+            'out_invoice',
+            invoice_date='2018-01-01',
+            invoice_line_ids=[{'price_unit': 1234.0}],
+        )
+        st_line2 = self._create_st_line(1234.0, partner_id=self.partner_a.id, date='2018-01-01')
+        self.assertEqual(len(self.env['ir.cron.trigger'].search([('cron_id', '=', cron.id)])), 3)
+        self._create_invoice_line(
+            'out_invoice',
+            invoice_date='2018-01-01',
+            invoice_line_ids=[{'price_unit': 1234.0}],
+        )
+
+        # Simulate the cron already tried to process 'st_line1' before.
+        with freeze_time('2017-12-31'):
+            st_line1.cron_last_check = fields.Datetime.now()
+
+        # The statement line with no 'cron_last_check' must be processed before others.
+        with freeze_time('2018-01-02'):
+            self.env['account.bank.statement.line']._cron_try_auto_reconcile_statement_lines(batch_size=1)
+
+        self.assertRecordValues(st_line1 + st_line2, [
+            {'is_reconciled': False, 'cron_last_check': fields.Datetime.from_string('2017-12-31 00:00:00')},
+            {'is_reconciled': True, 'cron_last_check': fields.Datetime.from_string('2018-01-02 00:00:00')},
+        ])
+        self.assertEqual(len(self.env['ir.cron.trigger'].search([('cron_id', '=', cron.id)])), 4)
+
+        with freeze_time('2018-01-03'):
+            self.env['account.bank.statement.line']._cron_try_auto_reconcile_statement_lines(batch_size=1)
+
+        self.assertRecordValues(st_line1, [{'is_reconciled': True, 'cron_last_check': fields.Datetime.from_string('2018-01-03 00:00:00')}])
+        self.assertEqual(len(self.env['ir.cron.trigger'].search([('cron_id', '=', cron.id)])), 4)
+
+        st_line3 = self._create_st_line(1234.0, date='2018-01-01')
+        self.assertEqual(len(self.env['ir.cron.trigger'].search([('cron_id', '=', cron.id)])), 5)
+        self._create_invoice_line(
+            'out_invoice',
+            invoice_date='2018-01-01',
+            invoice_line_ids=[{'price_unit': 1234.0}],
+        )
+        st_line4 = self._create_st_line(1234.0, date='2018-01-01')
+        self.assertEqual(len(self.env['ir.cron.trigger'].search([('cron_id', '=', cron.id)])), 6)
+        self._create_invoice_line(
+            'out_invoice',
+            invoice_date='2018-01-01',
+            invoice_line_ids=[{'price_unit': 1234.0}],
+        )
+
+        # Make sure the CRON is no longer applicable.
+        rule.match_partner = True
+        rule.match_partner_ids = [Command.set(self.partner_a.ids)]
+        with freeze_time('2018-01-01'):
+            self.env['account.bank.statement.line']._cron_try_auto_reconcile_statement_lines(batch_size=1)
+
+        self.assertRecordValues(st_line3 + st_line4, [
+            {'is_reconciled': False, 'cron_last_check': fields.Datetime.from_string('2018-01-01 00:00:00')},
+            {'is_reconciled': False, 'cron_last_check': False},
+        ])
+        self.assertEqual(len(self.env['ir.cron.trigger'].search([('cron_id', '=', cron.id)])), 7)
+
+        # Make sure the statement lines are reconciled by the cron in the right order.
+        self.assertRecordValues(st_line3 + st_line4, [
+            {'is_reconciled': False, 'cron_last_check': fields.Datetime.from_string('2018-01-01 00:00:00')},
+            {'is_reconciled': False, 'cron_last_check': False},
+        ])
+
+        # st_line4 is processed because cron_last_check is null.
+        with freeze_time('2018-01-02'):
+            self.env['account.bank.statement.line']._cron_try_auto_reconcile_statement_lines(batch_size=1)
+
+        self.assertRecordValues(st_line3 + st_line4, [
+            {'is_reconciled': False, 'cron_last_check': fields.Datetime.from_string('2018-01-01 00:00:00')},
+            {'is_reconciled': False, 'cron_last_check': fields.Datetime.from_string('2018-01-02 00:00:00')},
+        ])
+        self.assertEqual(len(self.env['ir.cron.trigger'].search([('cron_id', '=', cron.id)])), 7)
+
+        # st_line3 is processed because it has the oldest cron_last_check.
+        with freeze_time('2018-01-03'):
+            self.env['account.bank.statement.line']._cron_try_auto_reconcile_statement_lines(batch_size=1)
+
+        self.assertRecordValues(st_line3 + st_line4, [
+            {'is_reconciled': False, 'cron_last_check': fields.Datetime.from_string('2018-01-03 00:00:00')},
+            {'is_reconciled': False, 'cron_last_check': fields.Datetime.from_string('2018-01-02 00:00:00')},
+        ])
+        self.assertEqual(len(self.env['ir.cron.trigger'].search([('cron_id', '=', cron.id)])), 7)
+
+    def test_duplicate_amls_constraint(self):
+        st_line = self._create_st_line(1000.0)
+        inv_line = self._create_invoice_line(
+            'out_invoice',
+            invoice_line_ids=[{'price_unit': 1000.0}],
+        )
+
+        wizard = self.env['bank.rec.widget'].with_context(default_st_line_id=st_line.id).new({})
+        wizard._action_add_new_amls(inv_line)
+        self.assertTrue(len(wizard.line_ids), 2)
+
+        wizard._action_add_new_amls(inv_line)
+        self.assertTrue(len(wizard.line_ids), 2)
+
+    @freeze_time('2017-01-01')
+    def test_reconcile_model_with_payment_tolerance(self):
+        self.env['account.reconcile.model'].search([('company_id', '=', self.company_data['company'].id)]).unlink()
+
+        invoice_line = self._create_invoice_line(
+            'out_invoice',
+            invoice_date='2017-01-01',
+            invoice_line_ids=[{'price_unit': 1000.0}],
+        )
+        st_line = self._create_st_line(998.0, partner_id=self.partner_a.id, date='2017-01-01', payment_ref=invoice_line.move_id.name)
+
+        rule = self.env['account.reconcile.model'].create({
+            'name': "test_reconcile_model_with_payment_tolerance",
+            'rule_type': 'invoice_matching',
+            'allow_payment_tolerance': True,
+            'payment_tolerance_type': 'percentage',
+            'payment_tolerance_param': 2.0,
+            'line_ids': [Command.create({'account_id': self.account_revenue1.id})],
+        })
+
+        wizard = self.env['bank.rec.widget'].with_context(default_st_line_id=st_line.id).new({})
+        wizard._action_trigger_matching_rules()
+        self.assertRecordValues(wizard.line_ids, [
+            # pylint: disable=C0326
+            {'flag': 'liquidity',       'balance': 998.0,   'reconcile_model_id': False},
+            {'flag': 'new_aml',         'balance': -1000.0, 'reconcile_model_id': rule.id},
+            {'flag': 'manual',          'balance': 2.0,     'reconcile_model_id': rule.id},
+        ])
+
+    @freeze_time('2017-01-01')
+    def test_auto_reconcile_model_with_archived_partner(self):
+        self.env['account.reconcile.model'].search([('company_id', '=', self.company_data['company'].id)]).unlink()
+        self.env['res.partner.bank'].search([('company_id', '=', self.company_data['company'].id)]).unlink()
+
+        # Needed as partner_a does not have a company and we need a company in order to find matching partner from account_number
+        self.partner_a.company_id = self.company_data['company'].id
+        self.env['res.partner.bank'].create({
+            'partner_id': self.partner_a.id,
+            'acc_number': '12345',
+        })
+        invoice_line = self._create_invoice_line(
+            'out_invoice',
+            invoice_date='2017-01-01',
+            invoice_line_ids=[{'price_unit': 1000.0}],
+        )
+        st_line = self._create_st_line(1000.0, account_number='12345', date='2017-01-01', payment_ref=invoice_line.move_id.name)
+
+        self.env['account.reconcile.model'].create({
+            'name': "test_reconcile_model_with_archived_partner",
+            'rule_type': 'invoice_matching',
+            'auto_reconcile': True,
+            'match_partner': True,
+        })
+
+        wizard = self.env['bank.rec.widget'].with_context(default_st_line_id=st_line.id).new({})
+        wizard._action_trigger_matching_rules()
+        self.assertEqual(wizard.partner_id, self.partner_a)
+        self.assertTrue(wizard.matching_rules_allow_auto_reconcile)
+
+        # archive partner and trigger again, partner should still be set (match based on account_number), because it's the only match
+        self.partner_a.active = False
+        wizard = self.env['bank.rec.widget'].with_context(default_st_line_id=st_line.id).new({})
+        wizard._action_trigger_matching_rules()
+        self.assertEqual(wizard.partner_id, self.partner_a)  # Partner should still be set
+        self.assertTrue(wizard.matching_rules_allow_auto_reconcile)  # no special process because the partner is unactive
+
+    def test_early_payment_included_multi_currency(self):
+        self.env['account.reconcile.model'].search([('company_id', '=', self.company_data['company'].id)]).unlink()
+        self.early_payment_term.early_pay_discount_computation = 'included'
+        income_exchange_account = self.env.company.income_currency_exchange_account_id
+        expense_exchange_account = self.env.company.expense_currency_exchange_account_id
+
+        inv_line1_with_epd = self._create_invoice_line(
+            'out_invoice',
+            currency_id=self.other_currency_2.id,
+            partner_id=self.partner_a.id,
+            invoice_payment_term_id=self.early_payment_term.id,
+            invoice_date='2016-12-01',
+            invoice_line_ids=[
+                {
+                    'price_unit': 4800.0,
+                    'account_id': self.account_revenue1.id,
+                    'tax_ids': [Command.set(self.company_data['default_tax_sale'].ids)],
+                },
+                {
+                    'price_unit': 9600.0,
+                    'account_id': self.account_revenue2.id,
+                    'tax_ids': [Command.set(self.company_data['default_tax_sale'].ids)],
+                },
+            ],
+        )
+        inv_line1_with_epd_rec_lines = inv_line1_with_epd.move_id.line_ids\
+            .filtered(lambda x: x.account_type == 'asset_receivable')\
+            .sorted(lambda x: x.discount_date or x.date_maturity)
+        self.assertRecordValues(
+            inv_line1_with_epd_rec_lines,
+            [
+                {
+                    'amount_currency': 16560.0,
+                    'balance': 2760.0,
+                    'discount_amount_currency': 14904.0,
+                    'discount_balance': 2484.0,
+                    'discount_date': fields.Date.from_string('2016-12-11'),
+                    'date_maturity': fields.Date.from_string('2016-12-21'),
+                },
+            ],
+        )
+
+        inv_line2_with_epd = self._create_invoice_line(
+            'out_invoice',
+            currency_id=self.other_currency_2.id,
+            partner_id=self.partner_a.id,
+            invoice_payment_term_id=self.early_payment_term.id,
+            invoice_date='2017-01-20',
+            invoice_line_ids=[
+                {
+                    'price_unit': 480.0,
+                    'account_id': self.account_revenue1.id,
+                    'tax_ids': [Command.set(self.company_data['default_tax_sale'].ids)],
+                },
+                {
+                    'price_unit': 960.0,
+                    'account_id': self.account_revenue2.id,
+                    'tax_ids': [Command.set(self.company_data['default_tax_sale'].ids)],
+                },
+            ],
+        )
+        inv_line2_with_epd_rec_lines = inv_line2_with_epd.move_id.line_ids\
+            .filtered(lambda x: x.account_type == 'asset_receivable')\
+            .sorted(lambda x: x.discount_date or x.date_maturity)
+        self.assertRecordValues(
+            inv_line2_with_epd_rec_lines,
+            [
+                {
+                    'amount_currency': 1656.0,
+                    'balance': 414.0,
+                    'discount_amount_currency': 1490.4,
+                    'discount_balance': 372.6,
+                    'discount_date': fields.Date.from_string('2017-01-30'),
+                    'date_maturity': fields.Date.from_string('2017-02-09'),
+                },
+            ],
+        )
+
+        # inv1: 16560.0 (no epd)
+        # inv2: 1490.4 (epd)
+        st_line = self._create_st_line(
+            4512.0, # instead of 4512.6 (rate 1:4)
+            date='2017-01-04',
+            foreign_currency_id=self.other_currency_2.id,
+            amount_currency=18050.4,
+        )
+
+        wizard = self.env['bank.rec.widget'].with_context(default_st_line_id=st_line.id).new({})
+
+        # Add all lines from the first invoice plus the first one from the second one.
+        wizard._action_add_new_amls(inv_line1_with_epd_rec_lines + inv_line2_with_epd_rec_lines)
+        liquidity_acc = st_line.journal_id.default_account_id
+        receivable_acc = self.company_data['default_account_receivable']
+        early_pay_acc = self.env.company.account_journal_early_pay_discount_loss_account_id
+        tax_acc = self.company_data['default_tax_sale'].invoice_repartition_line_ids.account_id
+        self.assertRecordValues(wizard.line_ids, [
+            # pylint: disable=C0326
+            {'flag': 'liquidity',       'amount_currency': 4512.0,      'balance': 4512.0,      'account_id': liquidity_acc.id},
+            {'flag': 'new_aml',         'amount_currency': -16560.0,    'balance': -2760.0,     'account_id': receivable_acc.id},
+            {'flag': 'exchange_diff',   'amount_currency': 0.0,         'balance': -1379.45,    'account_id': income_exchange_account.id},
+            {'flag': 'new_aml',         'amount_currency': -1656.0,     'balance': -414.0,      'account_id': receivable_acc.id},
+            {'flag': 'exchange_diff',   'amount_currency': 0.0,         'balance': 0.06,        'account_id': expense_exchange_account.id},
+            {'flag': 'early_payment',   'amount_currency': 144.0,       'balance': 36.0,        'account_id': early_pay_acc.id},
+            {'flag': 'early_payment',   'amount_currency': 21.6,        'balance': 5.4,         'account_id': tax_acc.id},
+            {'flag': 'early_payment',   'amount_currency': 0.0,         'balance': -0.01,       'account_id': income_exchange_account.id},
+        ])
+
+    def test_early_payment_excluded_multi_currency(self):
+        self.env['account.reconcile.model'].search([('company_id', '=', self.company_data['company'].id)]).unlink()
+        self.early_payment_term.early_pay_discount_computation = 'excluded'
+        income_exchange_account = self.env.company.income_currency_exchange_account_id
+        expense_exchange_account = self.env.company.expense_currency_exchange_account_id
+
+        inv_line1_with_epd = self._create_invoice_line(
+            'out_invoice',
+            currency_id=self.other_currency_2.id,
+            partner_id=self.partner_a.id,
+            invoice_payment_term_id=self.early_payment_term.id,
+            invoice_date='2016-12-01',
+            invoice_line_ids=[
+                {
+                    'price_unit': 4800.0,
+                    'account_id': self.account_revenue1.id,
+                    'tax_ids': [Command.set(self.company_data['default_tax_sale'].ids)],
+                },
+                {
+                    'price_unit': 9600.0,
+                    'account_id': self.account_revenue2.id,
+                    'tax_ids': [Command.set(self.company_data['default_tax_sale'].ids)],
+                },
+            ],
+        )
+        inv_line1_with_epd_rec_lines = inv_line1_with_epd.move_id.line_ids\
+            .filtered(lambda x: x.account_type == 'asset_receivable')\
+            .sorted(lambda x: x.discount_date or x.date_maturity)
+        self.assertRecordValues(
+            inv_line1_with_epd_rec_lines,
+            [
+                {
+                    'amount_currency': 16560.0,
+                    'balance': 2760.0,
+                    'discount_amount_currency': 15120.0,
+                    'discount_balance': 2520.0,
+                    'discount_date': fields.Date.from_string('2016-12-11'),
+                    'date_maturity': fields.Date.from_string('2016-12-21'),
+                },
+            ],
+        )
+
+        inv_line2_with_epd = self._create_invoice_line(
+            'out_invoice',
+            currency_id=self.other_currency_2.id,
+            partner_id=self.partner_a.id,
+            invoice_payment_term_id=self.early_payment_term.id,
+            invoice_date='2017-01-20',
+            invoice_line_ids=[
+                {
+                    'price_unit': 480.0,
+                    'account_id': self.account_revenue1.id,
+                    'tax_ids': [Command.set(self.company_data['default_tax_sale'].ids)],
+                },
+                {
+                    'price_unit': 960.0,
+                    'account_id': self.account_revenue2.id,
+                    'tax_ids': [Command.set(self.company_data['default_tax_sale'].ids)],
+                },
+            ],
+        )
+        inv_line2_with_epd_rec_lines = inv_line2_with_epd.move_id.line_ids\
+            .filtered(lambda x: x.account_type == 'asset_receivable')\
+            .sorted(lambda x: x.discount_date or x.date_maturity)
+        self.assertRecordValues(
+            inv_line2_with_epd_rec_lines,
+            [
+                {
+                    'amount_currency': 1656.0,
+                    'balance': 414.0,
+                    'discount_amount_currency': 1512.0,
+                    'discount_balance': 378.0,
+                    'discount_date': fields.Date.from_string('2017-01-30'),
+                    'date_maturity': fields.Date.from_string('2017-02-09'),
+                },
+            ],
+        )
+
+        # inv1: 16560.0 (no epd)
+        # inv2: 1512.0 (epd)
+        st_line = self._create_st_line(
+            4515.0, # instead of 4518.0 (rate 1:4)
+            date='2017-01-04',
+            foreign_currency_id=self.other_currency_2.id,
+            amount_currency=18072.0,
+        )
+
+        wizard = self.env['bank.rec.widget'].with_context(default_st_line_id=st_line.id).new({})
+
+        # Add all lines from the first invoice plus the first one from the second one.
+        wizard._action_add_new_amls(inv_line1_with_epd_rec_lines + inv_line2_with_epd_rec_lines[:2])
+        liquidity_acc = st_line.journal_id.default_account_id
+        receivable_acc = self.company_data['default_account_receivable']
+        early_pay_acc = self.env.company.account_journal_early_pay_discount_loss_account_id
+        self.assertRecordValues(wizard.line_ids, [
+            # pylint: disable=C0326
+            {'flag': 'liquidity',       'amount_currency': 4515.0,      'balance': 4515.0,      'account_id': liquidity_acc.id},
+            {'flag': 'new_aml',         'amount_currency': -16560.0,    'balance': -2760.0,     'account_id': receivable_acc.id},
+            {'flag': 'exchange_diff',   'amount_currency': 0.0,         'balance': -1377.25,    'account_id': income_exchange_account.id},
+            {'flag': 'new_aml',         'amount_currency': -1656.0,     'balance': -414.0,      'account_id': receivable_acc.id},
+            {'flag': 'exchange_diff',   'amount_currency': 0.0,         'balance': 0.27,        'account_id': expense_exchange_account.id},
+            {'flag': 'early_payment',   'amount_currency': 144.0,       'balance': 36.0,        'account_id': early_pay_acc.id},
+            {'flag': 'early_payment',   'amount_currency': 0.0,         'balance': -0.02,       'account_id': income_exchange_account.id},
+        ])
+
+    def test_early_payment_mixed_multi_currency(self):
+        self.env['account.reconcile.model'].search([('company_id', '=', self.company_data['company'].id)]).unlink()
+        self.early_payment_term.early_pay_discount_computation = 'mixed'
+        income_exchange_account = self.env.company.income_currency_exchange_account_id
+        expense_exchange_account = self.env.company.expense_currency_exchange_account_id
+
+        inv_line1_with_epd = self._create_invoice_line(
+            'out_invoice',
+            currency_id=self.other_currency_2.id,
+            partner_id=self.partner_a.id,
+            invoice_payment_term_id=self.early_payment_term.id,
+            invoice_date='2016-12-01',
+            invoice_line_ids=[
+                {
+                    'price_unit': 4800.0,
+                    'account_id': self.account_revenue1.id,
+                    'tax_ids': [Command.set(self.company_data['default_tax_sale'].ids)],
+                },
+                {
+                    'price_unit': 9600.0,
+                    'account_id': self.account_revenue2.id,
+                    'tax_ids': [Command.set(self.company_data['default_tax_sale'].ids)],
+                },
+            ],
+        )
+        inv_line1_with_epd_rec_lines = inv_line1_with_epd.move_id.line_ids\
+            .filtered(lambda x: x.account_type == 'asset_receivable')\
+            .sorted(lambda x: x.discount_date or x.date_maturity)
+        self.assertRecordValues(
+            inv_line1_with_epd_rec_lines,
+            [
+                {
+                    'amount_currency': 16344.0,
+                    'balance': 2724.0,
+                    'discount_amount_currency': 14904.0,
+                    'discount_balance': 2484.0,
+                    'discount_date': fields.Date.from_string('2016-12-11'),
+                    'date_maturity': fields.Date.from_string('2016-12-21'),
+                },
+            ],
+        )
+
+        inv_line2_with_epd = self._create_invoice_line(
+            'out_invoice',
+            currency_id=self.other_currency_2.id,
+            partner_id=self.partner_a.id,
+            invoice_payment_term_id=self.early_payment_term.id,
+            invoice_date='2017-01-20',
+            invoice_line_ids=[
+                {
+                    'price_unit': 480.0,
+                    'account_id': self.account_revenue1.id,
+                    'tax_ids': [Command.set(self.company_data['default_tax_sale'].ids)],
+                },
+                {
+                    'price_unit': 960.0,
+                    'account_id': self.account_revenue2.id,
+                    'tax_ids': [Command.set(self.company_data['default_tax_sale'].ids)],
+                },
+            ],
+        )
+        inv_line2_with_epd_rec_lines = inv_line2_with_epd.move_id.line_ids\
+            .filtered(lambda x: x.account_type == 'asset_receivable')\
+            .sorted(lambda x: x.discount_date or x.date_maturity)
+        self.assertRecordValues(
+            inv_line2_with_epd_rec_lines,
+            [
+                {
+                    'amount_currency': 1634.4,
+                    'balance': 408.6,
+                    'discount_amount_currency': 1490.4,
+                    'discount_balance': 372.6,
+                    'discount_date': fields.Date.from_string('2017-01-30'),
+                    'date_maturity': fields.Date.from_string('2017-02-09'),
+                },
+            ],
+        )
+
+        # inv1: 16344.0 (no epd)
+        # inv2: 1490.4 (epd)
+        st_line = self._create_st_line(
+            4458.0, # instead of 4458.6 (rate 1:4)
+            date='2017-01-04',
+            foreign_currency_id=self.other_currency_2.id,
+            amount_currency=17834.4,
+        )
+
+        wizard = self.env['bank.rec.widget'].with_context(default_st_line_id=st_line.id).new({})
+
+        # Add all lines from the first invoice plus the first one from the second one.
+        wizard._action_add_new_amls(inv_line1_with_epd_rec_lines + inv_line2_with_epd_rec_lines[:2])
+        liquidity_acc = st_line.journal_id.default_account_id
+        receivable_acc = self.company_data['default_account_receivable']
+        early_pay_acc = self.env.company.account_journal_early_pay_discount_loss_account_id
+        self.assertRecordValues(wizard.line_ids, [
+            # pylint: disable=C0326
+            {'flag': 'liquidity',       'amount_currency': 4458.0,      'balance': 4458.0,      'account_id': liquidity_acc.id},
+            {'flag': 'new_aml',         'amount_currency': -16344.0,    'balance': -2724.0,     'account_id': receivable_acc.id},
+            {'flag': 'exchange_diff',   'amount_currency': 0.0,         'balance': -1361.45,    'account_id': income_exchange_account.id},
+            {'flag': 'new_aml',         'amount_currency': -1634.4,     'balance': -408.6,      'account_id': receivable_acc.id},
+            {'flag': 'exchange_diff',   'amount_currency': 0.0,         'balance': 0.05,        'account_id': expense_exchange_account.id},
+            {'flag': 'early_payment',   'amount_currency': 144.0,       'balance': 36.0,        'account_id': early_pay_acc.id},
+        ])
+
+    def test_early_payment_included_intracomm_bill(self):
+        tax_tags = self.env['account.account.tag'].create({
+            'name': f'tax_tag_{i}',
+            'applicability': 'taxes',
+            'country_id': self.env.company.account_fiscal_country_id.id,
+        } for i in range(6))
+
+        intracomm_tax = self.env['account.tax'].create({
+            'name': 'tax20',
+            'amount_type': 'percent',
+            'amount': 20,
+            'type_tax_use': 'purchase',
+            'invoice_repartition_line_ids': [
+                # pylint: disable=bad-whitespace
+                Command.create({'repartition_type': 'base', 'factor_percent': 100.0,    'tag_ids': [Command.set(tax_tags[0].ids)]}),
+                Command.create({'repartition_type': 'tax',  'factor_percent': 100.0,    'tag_ids': [Command.set(tax_tags[1].ids)]}),
+                Command.create({'repartition_type': 'tax',  'factor_percent': -100.0,   'tag_ids': [Command.set(tax_tags[2].ids)]}),
+            ],
+            'refund_repartition_line_ids': [
+                # pylint: disable=bad-whitespace
+                Command.create({'repartition_type': 'base', 'factor_percent': 100.0,    'tag_ids': [Command.set(tax_tags[3].ids)]}),
+                Command.create({'repartition_type': 'tax',  'factor_percent': 100.0,    'tag_ids': [Command.set(tax_tags[4].ids)]}),
+                Command.create({'repartition_type': 'tax',  'factor_percent': -100.0,   'tag_ids': [Command.set(tax_tags[5].ids)]}),
+            ],
+        })
+
+        early_payment_term = self.env['account.payment.term'].create({
+            'name': "early_payment_term",
+            'company_id': self.company_data['company'].id,
+            'early_pay_discount_computation': 'included',
+            'early_discount': True,
+            'discount_percentage': 2,
+            'discount_days': 7,
+            'line_ids': [
+                Command.create({
+                    'value': 'percent',
+                    'value_amount': 100.0,
+                    'nb_days': 30,
+                }),
+            ],
+        })
+
+        bill = self.env['account.move'].create({
+            'move_type': 'in_invoice',
+            'partner_id': self.partner_a.id,
+            'invoice_payment_term_id': early_payment_term.id,
+            'invoice_date': '2019-01-01',
+            'date': '2019-01-01',
+            'invoice_line_ids': [
+                Command.create({
+                    'name': 'line',
+                    'price_unit': 1000.0,
+                    'tax_ids': [Command.set(intracomm_tax.ids)],
+                }),
+            ],
+        })
+        bill.action_post()
+
+        st_line = self._create_st_line(
+            -980.0,
+            date='2017-01-01',
+        )
+
+        wizard = self.env['bank.rec.widget'].with_context(default_st_line_id=st_line.id).new({})
+        wizard._action_add_new_amls(bill.line_ids.filtered(lambda x: x.account_type == 'liability_payable'))
+        wizard._action_validate()
+
+        self.assertRecordValues(st_line.line_ids.sorted('balance'), [
+            # pylint: disable=bad-whitespace
+            {'amount_currency': -980.0, 'tax_ids': [],                  'tax_tag_ids': [],              'tax_tag_invert': False},
+            {'amount_currency': -20.0,  'tax_ids': intracomm_tax.ids,   'tax_tag_ids': tax_tags[3].ids, 'tax_tag_invert': True},
+            {'amount_currency': -4.0,   'tax_ids': [],                  'tax_tag_ids': tax_tags[4].ids, 'tax_tag_invert': True},
+            {'amount_currency': 4.0,    'tax_ids': [],                  'tax_tag_ids': tax_tags[5].ids, 'tax_tag_invert': True},
+            {'amount_currency': 1000.0, 'tax_ids': [],                  'tax_tag_ids': [],              'tax_tag_invert': False},
+        ])
+
+    def test_early_payment_eligibility_date(self):
+        inv_line = self._create_invoice_line(
+            'out_invoice',
+            partner_id=self.partner_a.id,
+            invoice_payment_term_id=self.early_payment_term.id,
+            invoice_date='2017-01-01',
+            invoice_line_ids=[
+                {
+                    'price_unit': 1000.0,
+                    'account_id': self.account_revenue1.id,
+                },
+            ]
+        )
+        st_line = self._create_st_line(900.0, partner_id=self.partner_a.id, date='2017-01-10')
+
+        self.early_payment_term.discount_days = 5
+
+        liquidity_acc = st_line.journal_id.default_account_id
+        receivable_acc = self.company_data['default_account_receivable']
+        early_pay_acc = self.env.company.account_journal_early_pay_discount_loss_account_id
+
+        wizard = self.env['bank.rec.widget'].with_context(default_st_line_id=st_line.id).new({})
+        wizard._action_add_new_amls(inv_line)
+        self.assertRecordValues(wizard.line_ids, [
+            # pylint: disable=bad-whitespace
+            {'flag': 'liquidity',       'amount_currency': 900.0,       'balance': 900.0,       'account_id': liquidity_acc.id},
+            {'flag': 'new_aml',         'amount_currency': -1000.0,     'balance': -1000.0,     'account_id': receivable_acc.id},
+            {'flag': 'early_payment',   'amount_currency': 100.0,       'balance': 100.0,       'account_id': early_pay_acc.id},
+        ])
+
+    def test_multi_currencies_with_custom_rate(self):
+        self.company_data['default_journal_bank'].currency_id = self.other_currency
+        st_line = self._create_st_line(1200.0) # rate 1:2
+        self.assertRecordValues(st_line.move_id.line_ids, [
+            # pylint: disable=C0326
+            {'amount_currency': 1200.0,     'balance': 600.0},
+            {'amount_currency': -1200.0,    'balance': -600.0},
+        ])
+
+        # invoice with other_currency and rate 1:2
+        invoice_line1 = self._create_invoice_line(
+            'out_invoice',
+            currency_id=self.other_currency.id,
+            invoice_date='2017-01-01',
+            invoice_line_ids=[{'price_unit': 300.0}], # = 150 USD
+        )
+
+        # Remove all rates.
+        self.other_currency.rate_ids.unlink()
+
+        wizard = self.env['bank.rec.widget'].with_context(default_st_line_id=st_line.id).new({})
+        self.assertRecordValues(wizard.line_ids, [
+            # pylint: disable=C0326
+            {'flag': 'liquidity',       'amount_currency': 1200.0,  'balance': 600.0},
+            {'flag': 'auto_balance',    'amount_currency': -1200.0, 'balance': -600.0},
+        ])
+
+        # invoice with other_currency_2 and rate 1:6
+        invoice_line2 = self._create_invoice_line(
+            'out_invoice',
+            currency_id=self.other_currency_2.id,
+            invoice_date='2016-01-01',
+            invoice_line_ids=[{'price_unit': 600.0}], # = 100 USD
+        )
+        # invoice with other_currency_2 and rate 1:4
+        invoice_line3 = self._create_invoice_line(
+            'out_invoice',
+            currency_id=self.other_currency_2.id,
+            invoice_date='2017-01-01',
+            invoice_line_ids=[{'price_unit': 400.0}], # = 100 USD
+        )
+
+        # Remove all rates.
+        self.other_currency_2.rate_ids.unlink()
+
+        # Ensure no conversion rate has been made.
+        wizard._action_add_new_amls(invoice_line1 + invoice_line2 + invoice_line3)
+        self.assertRecordValues(wizard.line_ids, [
+            # pylint: disable=C0326
+            {'flag': 'liquidity',       'amount_currency': 1200.0,  'balance': 600.0},
+            {'flag': 'new_aml',         'amount_currency': -300.0,  'balance': -150.0},
+            {'flag': 'new_aml',         'amount_currency': -600.0,  'balance': -100.0},
+            {'flag': 'new_aml',         'amount_currency': -400.0,  'balance': -100.0},
+            {'flag': 'auto_balance',    'amount_currency': -500.0,  'balance': -250.0},
+        ])
+
+    def test_partial_reconciliation_suggestion_with_mixed_invoice_and_refund(self):
+        """ Test the partial reconciliation suggestion is well recomputed when adding another
+        line. For example, when adding 2 invoices having an higher amount then a refund. In that
+        case, the partial on the second invoice should be removed since the difference is filled
+        by the newly added refund.
+        """
+        st_line = self._create_st_line(
+            1800.0,
+            date='2017-01-01',
+            foreign_currency_id=self.other_currency.id,
+            amount_currency=3600.0,
+        )
+
+        inv1 = self._create_invoice_line(
+            'out_invoice',
+            currency_id=self.other_currency.id,
+            invoice_date='2016-01-01',
+            invoice_line_ids=[{'price_unit': 2400.0}],
+        )
+        inv2 = self._create_invoice_line(
+            'out_invoice',
+            currency_id=self.other_currency.id,
+            invoice_date='2016-01-01',
+            invoice_line_ids=[{'price_unit': 2400.0}],
+        )
+        refund = self._create_invoice_line(
+            'out_refund',
+            currency_id=self.other_currency.id,
+            invoice_date='2016-01-01',
+            invoice_line_ids=[{'price_unit': 1200.0}],
+        )
+
+        wizard = self.env['bank.rec.widget'].with_context(default_st_line_id=st_line.id).new({})
+        wizard._action_add_new_amls(inv1 + inv2)
+        self.assertRecordValues(wizard.line_ids, [
+            # pylint: disable=C0326
+            {'flag': 'liquidity',       'amount_currency': 1800.0,  'balance': 1800.0},
+            {'flag': 'new_aml',         'amount_currency': -2400.0, 'balance': -800.0},
+            {'flag': 'exchange_diff',   'amount_currency': 0.0,     'balance': -400.0},
+            {'flag': 'new_aml',         'amount_currency': -1200.0, 'balance': -400.0},
+            {'flag': 'exchange_diff',   'amount_currency': 0.0,     'balance': -200.0},
+        ])
+        wizard._action_add_new_amls(refund)
+        self.assertRecordValues(wizard.line_ids, [
+            # pylint: disable=C0326
+            {'flag': 'liquidity',       'amount_currency': 1800.0,  'balance': 1800.0},
+            {'flag': 'new_aml',         'amount_currency': -2400.0, 'balance': -800.0},
+            {'flag': 'exchange_diff',   'amount_currency': 0.0,     'balance': -400.0},
+            {'flag': 'new_aml',         'amount_currency': -2400.0, 'balance': -800.0},
+            {'flag': 'exchange_diff',   'amount_currency': 0.0,     'balance': -400.0},
+            {'flag': 'new_aml',         'amount_currency': 1200.0,  'balance': 400.0},
+            {'flag': 'exchange_diff',   'amount_currency': 0.0,     'balance': 200.0},
+        ])
+
+    def test_auto_reconcile_cron_with_time_limit(self):
+        self.env['account.reconcile.model'].search([('company_id', '=', self.company_data['company'].id)]).unlink()
+        cron = self.env.ref('account_accountant.auto_reconcile_bank_statement_line')
+        self.env['ir.cron.trigger'].search([('cron_id', '=', cron.id)]).unlink()
+
+        st_line1 = self._create_st_line(1234.0, partner_id=self.partner_a.id, date='2017-01-01')
+        self.assertEqual(len(self.env['ir.cron.trigger'].search([('cron_id', '=', cron.id)])), 1)
+        st_line2 = self._create_st_line(5678.0, partner_id=self.partner_a.id, date='2017-01-02')
+        self.assertEqual(len(self.env['ir.cron.trigger'].search([('cron_id', '=', cron.id)])), 2)
+
+        self._create_invoice_line(
+            'out_invoice',
+            invoice_date='2017-01-01',
+            invoice_line_ids=[{'price_unit': 1234.0}],
+        )
+        self._create_invoice_line(
+            'out_invoice',
+            invoice_date='2017-01-01',
+            invoice_line_ids=[{'price_unit': 5678.0}],
+        )
+        self.env['account.reconcile.model'].create({
+            'name': "test_auto_reconcile_cron_with_time_limit",
+            'rule_type': 'writeoff_suggestion',
+            'auto_reconcile': True,
+            'line_ids': [Command.create({'account_id': self.account_revenue1.id})],
+        })
+
+        with freeze_time('2017-01-01 00:00:00') as frozen_time:
+            def datetime_now_override():
+                frozen_time.tick()
+                return frozen_time()
+            with patch('odoo.fields.Datetime.now', side_effect=datetime_now_override):
+                # we simulate that the time limit is reached after first loop
+                self.env['account.bank.statement.line']._cron_try_auto_reconcile_statement_lines(limit_time=1)
+        # after first loop, only one statement should be reconciled
+        self.assertRecordValues(st_line1, [{'is_reconciled': True, 'cron_last_check': fields.Datetime.from_string('2017-01-01 00:00:01')}])
+        # the other one should be in queue for regular cron tigger
+        self.assertRecordValues(st_line2, [{'is_reconciled': False, 'cron_last_check': False}])
+        self.assertEqual(len(self.env['ir.cron.trigger'].search([('cron_id', '=', cron.id)])), 3)
+
+    def test_auto_reconcile_cron_with_provided_statements_lines(self):
+        self.env['account.reconcile.model'].search([('company_id', '=', self.company_data['company'].id)]).unlink()
+
+        st_line1 = self._create_st_line(1234.0, partner_id=self.partner_a.id, date='2017-01-01')
+        st_line2 = self._create_st_line(5678.0, partner_id=self.partner_a.id, date='2017-01-02')
+        self._create_invoice_line(
+            'out_invoice',
+            invoice_date='2017-01-01',
+            invoice_line_ids=[{'price_unit': 1234.0}],
+        )
+        self._create_invoice_line(
+            'out_invoice',
+            invoice_date='2017-01-01',
+            invoice_line_ids=[{'price_unit': 5678.0}],
+        )
+        self.env['account.reconcile.model'].create({
+            'name': "test_auto_reconcile_cron_with_time_limit",
+            'rule_type': 'writeoff_suggestion',
+            'auto_reconcile': True,
+            'line_ids': [Command.create({'account_id': self.account_revenue1.id})],
+        })
+        with freeze_time('2017-01-01 00:00:00'):
+            # we call auto reconcile on st_lines1 **only**
+            st_line1._cron_try_auto_reconcile_statement_lines()
+        self.assertRecordValues(st_line1, [{'is_reconciled': True, 'cron_last_check': fields.Datetime.from_string('2017-01-01 00:00:00')}])
+        self.assertRecordValues(st_line2, [{'is_reconciled': False, 'cron_last_check': False}])
+
+    @freeze_time('2019-01-01')
+    def test_button_apply_reco_model(self):
+        inv_line = self._create_invoice_line(
+            'in_invoice',
+            invoice_date='2019-01-01',
+            invoice_line_ids=[{'price_unit': 980.0}],
+        )
+        st_line = self._create_st_line(-1000.0, partner_id=self.partner_a.id, date=inv_line.date, payment_ref=inv_line.move_name)
+
+        reco_model = self.env['account.reconcile.model'].create({
+            'name': "test_apply_taxes_with_reco_model",
+            'rule_type': 'writeoff_button',
+            'line_ids': [Command.create({
+                'account_id': self.account_revenue1.copy().id,
+                'label': 'Bank Fees'
+            })],
+        })
+
+        wizard = self.env['bank.rec.widget'].with_context(default_st_line_id=st_line.id).new({})
+        wizard._action_trigger_matching_rules()
+
+        self.assertRecordValues(wizard.line_ids, [
+            # pylint: disable=C0326
+            {'flag': 'liquidity',    'account_id': st_line.journal_id.default_account_id.id,        'balance': -1000.0},
+            {'flag': 'new_aml',      'account_id': inv_line.account_id.id,                          'balance':   980.0},
+            {'flag': 'auto_balance', 'account_id': self.company_data['default_account_payable'].id, 'balance':    20.0},
+        ])
+
+        wizard._action_select_reconcile_model(reco_model)
+
+        self.assertRecordValues(wizard.line_ids, [
+            # pylint: disable=C0326
+            {'flag': 'liquidity',    'account_id': st_line.journal_id.default_account_id.id,        'balance': -1000.0},
+            {'flag': 'new_aml',      'account_id': inv_line.account_id.id,                          'balance':   980.0},
+            {'flag': 'manual',       'account_id': reco_model.line_ids[0].account_id.id,            'balance':    20.0},
+        ])
+
+    def test_exchange_diff_on_partial_aml_multi_currency(self):
+        self.company_data['default_journal_bank'].currency_id = self.other_currency
+        st_line = self._create_st_line(-36000.0) # rate 1:2
+        inv_line = self._create_invoice_line(
+            'in_invoice',
+            invoice_date='2016-01-01', # rate 1:3
+            currency_id=self.other_currency.id,
+            invoice_line_ids=[{'price_unit': 38000.0}],
+        )
+
+        wizard = self.env['bank.rec.widget'].with_context(default_st_line_id=st_line.id).new({})
+        wizard._action_add_new_amls(inv_line)
+
+        self.assertRecordValues(wizard.line_ids, [
+            # pylint: disable=C0326
+            {'flag': 'liquidity',       'amount_currency': -36000.0,    'currency_id': self.other_currency.id,   'balance': -18000.0},
+            {'flag': 'new_aml',         'amount_currency': 36000.0,     'currency_id': self.other_currency.id,   'balance': 12000.0},
+            {'flag': 'exchange_diff',   'amount_currency': 0.0,         'currency_id': self.other_currency.id,   'balance': 6000.0},
+        ])
+
+    def test_exchange_diff_on_partial_aml_multi_currency_close_amount(self):
+        self.other_currency.rate_ids.rate = 0.9839
+        self.company_data['default_journal_bank'].currency_id = self.other_currency
+
+        st_line = self._create_st_line(-37436.50)
+        self.assertRecordValues(st_line.line_ids, [
+            # pylint: disable=C0326
+            {'amount_currency': -37436.50,  'balance': -38049.09},
+            {'amount_currency': 37436.50,   'balance': 38049.09},
+        ])
+
+        inv_line = self._create_invoice_line(
+            'in_invoice',
+            invoice_date=st_line.date,
+            currency_id=self.other_currency.id,
+            invoice_line_ids=[{'price_unit': 37436.52}],
+        )
+        self.assertRecordValues(inv_line, [{
+            'amount_currency': -37436.52,
+            'balance': -38049.11,
+        }])
+
+        wizard = self.env['bank.rec.widget'].with_context(default_st_line_id=st_line.id).new({})
+        wizard._action_add_new_amls(inv_line)
+
+        self.assertRecordValues(wizard.line_ids, [
+            # pylint: disable=C0326
+            {'flag': 'liquidity',       'amount_currency': -37436.50,   'currency_id': self.other_currency.id,   'balance': -38049.09},
+            {'flag': 'new_aml',         'amount_currency': 37436.50,    'currency_id': self.other_currency.id,   'balance': 38049.09},
+        ])
+
+    def test_matching_zero_amount_misc_entry(self):
+        """ Check for division by zero with foreign currencies and some 0 making a broken rate. """
+        self.company_data['default_journal_bank'].currency_id = self.other_currency
+        st_line = self._create_st_line(0.0, amount_currency=10.0, foreign_currency_id=self.company_data['currency'].id)
+
+        entry = self.env['account.move'].create({
+            'date': '2019-01-01',
+            'line_ids': [
+                Command.create({
+                    'account_id': self.company_data['default_account_receivable'].id,
+                    'currency_id': self.other_currency.id,
+                    'debit': 1.0,
+                    'credit': 0.0,
+                }),
+                Command.create({
+                    'account_id': self.company_data['default_account_revenue'].id,
+                    'currency_id': self.other_currency.id,
+                    'debit': 0.0,
+                    'credit': 1.0,
+                }),
+            ]
+        })
+        entry.action_post()
+
+        wizard = self.env['bank.rec.widget'].with_context(default_st_line_id=st_line.id).new({})
+        aml = entry.line_ids.filtered('debit')
+        wizard._action_add_new_amls(aml)
+        self.assertRecordValues(wizard.line_ids, [
+            # pylint: disable=C0326
+            {'flag': 'liquidity',       'balance': 10.0},
+            {'flag': 'new_aml',         'balance': -1.0},
+            {'flag': 'exchange_diff',   'balance': 1.0},
+            {'flag': 'auto_balance',    'balance': -10.0},
+        ])
+
+    def test_amls_order_with_matching_amount(self):
+        """ AML's with a matching amount_residual should be displayed first when the order is not specified. """
+
+        foreign_st_line = self._create_st_line(
+            500.0,
+            date='2016-01-01',
+            foreign_currency_id=self.other_currency.id,
+            amount_currency=1500.0,
+        )
+        st_line = self._create_st_line(
+            66.66,
+            date='2016-01-01',
+        )
+        wizard = self.env['bank.rec.widget'].with_context(default_st_line_id=foreign_st_line.id).new({})
+
+        aml1_id = self._create_invoice_line(
+            'out_invoice',
+            invoice_date='2017-01-30',
+            invoice_line_ids=[{'price_unit': 1000.0}],
+        ).id
+        aml2_id = self._create_invoice_line(
+            'out_invoice',
+            invoice_date='2017-01-29',
+            currency_id=self.other_currency.id,
+            invoice_line_ids=[{'price_unit': 1500.0}], # = 100 USD
+        ).id
+        aml3_id = self._create_invoice_line(
+            'out_invoice',
+            invoice_date='2017-01-28',
+            invoice_line_ids=[{'price_unit': 500.0}],
+        ).id
+        aml4_id = self._create_invoice_line(
+            'out_invoice',
+            invoice_date='2017-01-27',
+            invoice_line_ids=[{'price_unit': 55.55}], # = 55.550000000000004
+        ).id
+        aml5_id = self._create_invoice_line(
+            'out_invoice',
+            invoice_date='2017-01-26',
+            invoice_line_ids=[{'price_unit': 66.66}],
+        ).id
+
+        # Check the lines without the context key.
+        wizard._js_action_mount_st_line(foreign_st_line.id)
+        domain = wizard.return_todo_command['amls']['domain']
+        amls_list = self.env['account.move.line'].search_fetch(domain=domain, field_names=['id'])
+        self.assertEqual(
+            [x['id'] for x in amls_list],
+            [aml1_id, aml2_id, aml3_id, aml4_id, aml5_id],
+        )
+
+        # Check the lines with the context key.
+        suspense_line = wizard.line_ids.filtered(lambda l: l.flag == 'auto_balance')
+        amls_list = self.env['account.move.line']\
+            .with_context(preferred_aml_value=suspense_line.amount_currency * -1, preferred_aml_currency_id=suspense_line.currency_id.id)\
+            .search_fetch(domain=domain, field_names=['id'])
+        self.assertEqual(
+            [x['id'] for x in amls_list],
+            [aml2_id, aml1_id, aml3_id, aml4_id, aml5_id],
+        )
+
+        # Check the order with limits and offsets
+        amls_list = self.env['account.move.line']\
+            .with_context(preferred_aml_value=suspense_line.amount_currency * -1, preferred_aml_currency_id=suspense_line.currency_id.id)\
+            .search_fetch(domain=domain, field_names=['id'], limit=2)
+        self.assertEqual(
+            [x['id'] for x in amls_list],
+            [aml2_id, aml1_id],
+        )
+        amls_list = self.env['account.move.line']\
+            .with_context(preferred_aml_value=suspense_line.amount_currency * -1, preferred_aml_currency_id=suspense_line.currency_id.id)\
+            .search_fetch(domain=domain, field_names=['id'], offset=2, limit=3)
+        self.assertEqual(
+            [x['id'] for x in amls_list],
+            [aml3_id, aml4_id, aml5_id],
+        )
+
+        # Check rounding and new suspense line
+        wizard._js_action_mount_st_line(st_line.id)
+        suspense_line = wizard.line_ids.filtered(lambda l: l.flag == 'auto_balance')
+        amls_list = self.env['account.move.line']\
+            .with_context(preferred_aml_value=suspense_line.amount_currency * -1, preferred_aml_currency_id=suspense_line.currency_id.id)\
+            .search_fetch(domain=domain, field_names=['id'])
+        self.assertEqual(
+            [x['id'] for x in amls_list],
+            [aml5_id, aml1_id, aml2_id, aml3_id, aml4_id],
+        )
+        wizard._js_action_mount_line_in_edit(suspense_line.index)
+        suspense_line.balance = -11.11
+        wizard._line_value_changed_balance(suspense_line)
+        suspense_line = wizard.line_ids.filtered(lambda l: l.flag == 'auto_balance')
+        self.assertEqual(suspense_line.balance, -55.55)
+        self.env.cr.execute(f"""
+            UPDATE account_move_line SET amount_residual_currency = 55.550000001 WHERE id = {aml4_id};
+        """)
+        amls_list = self.env['account.move.line']\
+            .with_context(preferred_aml_value=55.550003, preferred_aml_currency_id=suspense_line.currency_id.id)\
+            .search_fetch(domain=domain, field_names=['id'])
+        self.assertEqual(
+            [x['id'] for x in amls_list],
+            [aml4_id, aml1_id, aml2_id, aml3_id, aml5_id],
+        )
+
+        # Check that context keys are not propagated
+        action = amls_list[0].action_open_business_doc()
+        self.assertFalse(action['context'].get('preferred_aml_value'))
+
+    @freeze_time('2023-12-25')
+    def test_analtyic_distribution_model_exchange_diff_line(self):
+        """Test that the analytic distribution model is present on the exchange diff line."""
+        expense_exchange_account = self.env.company.expense_currency_exchange_account_id
+        analytic_plan = self.env['account.analytic.plan'].create({
+            'name': 'Plan 1',
+            'default_applicability': 'unavailable',
+        })
+        analytic_account_1 = self.env['account.analytic.account'].create({'name': 'Account 1', 'plan_id': analytic_plan.id})
+        analytic_account_2 = self.env['account.analytic.account'].create({'name': 'Account 1', 'plan_id': analytic_plan.id})
+        distribution_model = self.env['account.analytic.distribution.model'].create({
+            'account_prefix': expense_exchange_account.code,
+            'partner_id': self.partner_a.id,
+            'analytic_distribution': {analytic_account_1.id: 100},
+        })
+
+        # 1200.0 comp_curr = 3600.0 foreign_curr in 2016 (rate 1:3)
+        st_line = self._create_st_line(
+            1200.0,
+            date='2016-01-01',
+        )
+        # 1800.0 comp_curr = 3600.0 foreign_curr in 2017 (rate 1:2)
+        inv_line = self._create_invoice_line(
+            'out_invoice',
+            currency_id=self.other_currency.id,
+            invoice_date='2017-01-01',
+            invoice_line_ids=[{'price_unit': 3600.0}],
+        )
+
+        wizard = self.env['bank.rec.widget'].with_context(default_st_line_id=st_line.id).new({})
+        wizard._action_add_new_amls(inv_line)
+        self.assertRecordValues(wizard.line_ids, [
+            # pylint: disable=C0326
+            {'flag': 'liquidity',     'amount_currency': 1200.0,  'currency_id': self.company_data['currency'].id,  'balance': 1200.0,  'analytic_distribution': False},
+            {'flag': 'new_aml',       'amount_currency': -3600.0, 'currency_id': self.other_currency.id,            'balance': -1800.0, 'analytic_distribution': False},
+            {'flag': 'exchange_diff', 'amount_currency': 0.0,     'currency_id': self.other_currency.id,            'balance': 600.0,   'analytic_distribution': distribution_model.analytic_distribution},
+        ])
+
+        # Test that the analytic distribution is kept on the creation of the exchange diff move
+        new_distribution = {**distribution_model.analytic_distribution, str(analytic_account_2.id): 100}
+
+        line = wizard.line_ids.filtered(lambda x: x.flag == 'exchange_diff')
+        line.analytic_distribution = new_distribution
+        wizard._action_validate()
+
+        self.assertRecordValues(inv_line.matched_credit_ids.exchange_move_id.line_ids, [
+            {'analytic_distribution': False},
+            {'analytic_distribution': new_distribution},
+        ])
+
+    def test_access_child_bank_with_user_set_on_child(self):
+        """
+        Demo user with a Child Company as default company/allowed companies
+        should be able to access the Bank set on this same Child Company
+        """
+        child_company = self.env['res.company'].create({
+            'name': 'Childest Company',
+            'parent_id': self.env.company.id,
+        })
+        child_bank_journal = self.env['account.journal'].create({
+            'name': 'Child Bank',
+            'type': 'bank',
+            'company_id': child_company.id,
+        })
+        self.user.write({
+            'company_ids': [Command.set(child_company.ids)],
+            'company_id': child_company.id,
+            'groups_id': [
+                Command.set(self.env.ref('account.group_account_user').ids),
+            ]
+        })
+        res = self.env['bank.rec.widget'].with_user(self.user).collect_global_info_data(child_bank_journal.id)
+        self.assertTrue(res, "Journal should be accessible")
+
+    def test_collect_global_info_data_other_company_bank_journal_with_user_on_main_company(self):
+        """ The aim of this test is checking that a user who having
+            access to 2 companies will have values even when he's
+            calling collect_global_info_data function if
+            it's current company it's not the one on the journal
+            but is still available.
+            To do that, we add 2 companies to the user, and try to
+            call collect_global_info_data on the journal of the second
+            company, even if the main company it's the first one.
+        """
+        self.user.write({
+            'company_ids': [Command.set((self.company_data['company'] + self.company_data_2['company']).ids)],
+            'company_id': self.company_data['company'].id,
+        })
+
+        result = self.env['bank.rec.widget'].with_user(self.user).collect_global_info_data(self.company_data_2['default_journal_bank'].id)
+        self.assertTrue(result['balance_amount'], "Balance amount shouldn't be False value")
+
+    def test_collect_global_info_data_non_existing_bank_journal(self):
+        """ The aim of this test is checking that we receive an empty
+            string when we call collect_global_info_data function
+            with a non-existing journal. This use case could happen
+            when we try to open the bank rec widget on a journal that
+            is not actually existing. As this function is callable by
+            rpc, this usecase could happen.
+        """
+        result = self.env['bank.rec.widget'].with_user(self.user).collect_global_info_data(99999999)
+        self.assertEqual(result['balance_amount'], "", "If no value, the function should return an empty string")
+
+    def test_res_partner_bank_find_create_multi_account(self):
+        """ Make sure that we can save multiple bank accounts for a partner. """
+        partner = self.env['res.partner'].create({'name': "Zitycard"})
+
+        for acc_number in ("123456789", "123456780"):
+            st_line = self._create_st_line(100.0, account_number=acc_number)
+            inv_line = self._create_invoice_line(
+                'out_invoice',
+                partner_id=partner.id,
+                invoice_line_ids=[{'price_unit': 100.0, 'tax_ids': []}],
+            )
+            wizard = self.env['bank.rec.widget'].with_context(default_st_line_id=st_line.id).new({})
+            wizard._action_add_new_amls(inv_line)
+            wizard._action_validate()
+
+        bank_accounts = self.env['res.partner.bank'].sudo().with_context(active_test=False).search([
+            ('partner_id', '=', partner.id),
+        ])
+        self.assertEqual(len(bank_accounts), 2, "Second bank account was not registered!")
+
+    ####################################################
+    # RECO MODEL MOVE CREATION
+    ####################################################
+
+    def create_test_reco_invoice(self, st_line, reco_model):
+        """ Helper method to create a move given a statement line and reconciliation model """
+        wizard = self.env['bank.rec.widget'].with_context(default_st_line_id=st_line.id).new({})
+        wizard._action_select_reconcile_model(reco_model)
+        move = self.env['account.move'].browse(wizard.return_todo_command['res_id'])
+        return move
+
+    def assert_reco_invoice_values(self, move, st_line, expected_move_type, expected_amount_total=None):
+        """ Helper method to assert that values in a move match the information in the given statement line """
+        if expected_amount_total is None:
+            expected_amount_total = abs(st_line.amount)
+        self.assertRecordValues(move, [{
+            'amount_total': expected_amount_total,
+            'move_type': expected_move_type,
+            'partner_id': st_line.partner_id.id,
+            'invoice_date': st_line.date,
+        }])
+
+    def test_invoice_creation_from_reco_model(self):
+        """ Test the created invoice from a sale/purchase reconciliation model. """
+        reco_model_invoice = self.env['account.reconcile.model'].create({
+            'name': "test reconcile create invoice",
+            'rule_type': 'writeoff_button',
+            'counterpart_type': 'sale',
+            'line_ids': [
+                Command.create({'amount_string': '50'}),
+                Command.create({'amount_string': '50'}),
+            ],
+        })
+
+        for st_line_amount, move_type, reco_model in (
+            (1000.0, 'out_invoice', reco_model_invoice),
+            (-1000.0, 'out_refund', reco_model_invoice),
+            (1000.0, 'in_refund', self.reco_model_bill),
+            (-1000.0, 'in_invoice', self.reco_model_bill),
+        ):
+            st_line = self._create_st_line(st_line_amount, partner_id=self.partner_a.id)
+            with self.subTest():
+                move = self.create_test_reco_invoice(st_line, reco_model)
+                self.assert_reco_invoice_values(move, st_line, move_type)
+
+    def test_invoice_reco_model_round_odd(self):
+        """ Test if correct move is created when rounding is needed for multiple reco model lines"""
+        # Odd amount and a reconciliation model with two lines (50% each line) requires rounding to ensure values match.
+        st_line = self._create_st_line(amount=-111.11, partner_id=self.partner_a.id)
+        move = self.create_test_reco_invoice(st_line, self.reco_model_bill)
+        self.assert_reco_invoice_values(move, st_line, 'in_invoice')
+
+    def test_invoice_reco_model_round_single_line(self):
+        """ Test if correct move is created with single-line reco model when rounding is needed """
+        # A st_line of $150 with 15% tax (default) requires rounding, as without it the invoice would total $149.99
+        reco_model_single_line = self.env['account.reconcile.model'].create({
+            'name': "single line reco model",
+            'rule_type': 'writeoff_button',
+            'counterpart_type': 'purchase',
+            'line_ids': [Command.create({})],
+        })
+        st_line = self._create_st_line(amount=150, partner_id=self.partner_a.id)
+        move = self.create_test_reco_invoice(st_line, reco_model_single_line)
+        self.assert_reco_invoice_values(move, st_line, 'in_refund')
+
+    def test_invoice_reco_model_round_large_percentage(self):
+        """ Test if total move amount is correctly rounded when reco model lines go above 100% of st_line amount """
+        # Reco model with two 100% st_line amount lines
+        reco_model_two_lines = self.env['account.reconcile.model'].create({
+            'name': "two lines reco model",
+            'rule_type': 'writeoff_button',
+            'counterpart_type': 'purchase',
+            'line_ids': [Command.create({}), Command.create({})],
+        })
+        # Reco model with one 200% st_line amount line
+        reco_model_single_line = self.env['account.reconcile.model'].create({
+            'name': "single line reco model",
+            'rule_type': 'writeoff_button',
+            'counterpart_type': 'purchase',
+            'line_ids': [Command.create({'amount_string': '200'})],
+        })
+        st_line = self._create_st_line(-150, partner_id=self.partner_a.id)
+        for reco_model in (reco_model_two_lines, reco_model_single_line):
+            with self.subTest():
+                move = self.create_test_reco_invoice(st_line, reco_model)
+                # Total move amount should equal 2 * st_line amount = 300 in both cases
+                self.assert_reco_invoice_values(move, st_line, 'in_invoice', 300.0)
+
+    def test_invoice_reco_model_round_combined(self):
+        """ Test if total move amount is correctly rounded when reco model lines are a combination of
+        percentage_st_line and fixed amount types """
+        # Reco model with 100% amount + fixed amount, total move amount should equal st_line amount + fixed amount
+        reco_model_percentage_fixed = self.env['account.reconcile.model'].create({
+            'name': "combined percentage + fixed reco model",
+            'rule_type': 'writeoff_button',
+            'counterpart_type': 'sale',
+            'line_ids': [
+                Command.create({}),
+                Command.create({
+                    'amount_type': 'fixed',
+                    'amount_string': '50',
+                }),
+            ],
+        })
+        st_line = self._create_st_line(amount=100, partner_id=self.partner_a.id)
+        move = self.create_test_reco_invoice(st_line, reco_model_percentage_fixed)
+        self.assert_reco_invoice_values(move, st_line, 'out_invoice', 150.0)
+
+    def test_invoice_reco_model_multiple_taxes(self):
+        """
+        Test if correct move is created through reco model writeoff button when the
+        reconciliation model has more than one tax per line.
+        Note: this only works if taxes are all price_include or all not price_include
+        """
+        tax_21 = self.env['account.tax'].create({
+            'name': "tax_21",
+            'amount': 21,
+        })
+        reco_model_bill_mult_taxes = self.env['account.reconcile.model'].create({
+            'name': "test reconcile bill multiple taxes",
+            'rule_type': 'writeoff_button',
+            'counterpart_type': 'purchase',
+            'line_ids': [
+                Command.create({
+                    'tax_ids': [Command.set((tax_21 + self.company_data['default_tax_purchase']).ids)],
+                }),
+            ],
+        })
+        st_line = self._create_st_line(amount=-100, partner_id=self.partner_a.id)
+        move = self.create_test_reco_invoice(st_line, reco_model_bill_mult_taxes)
+        self.assert_reco_invoice_values(move, st_line, 'in_invoice')
+
+    def test_invoice_creation_reco_model_percentage(self):
+        """ Test if correct move is created when rounding is needed """
+        # Odd amount and a reconciliation model with two lines (50% each line) requires rounding to ensure values match.
+        st_line = self._create_st_line(amount=150, partner_id=self.partner_a.id)
+        reco_model_bill_balance = self.env['account.reconcile.model'].create({
+            'name': "test balance",
+            'rule_type': 'writeoff_button',
+            'counterpart_type': 'purchase',
+            'line_ids': [
+                Command.create({
+                    'amount_type': 'percentage',
+                    'amount_string': '50',
+                }),
+                Command.create({
+                    'amount_type': 'percentage',
+                    'amount_string': '50',
+                }),
+            ],
+        })
+        move = self.create_test_reco_invoice(st_line, reco_model_bill_balance)
+        self.assert_reco_invoice_values(move, st_line, 'in_refund', 112.5)
+
+    def test_invoice_creation_reco_model_fixed(self):
+        """ Test if correct move is created when rounding is needed """
+        # Odd amount and a reconciliation model with two lines (50% each line) requires rounding to ensure values match.
+        st_line = self._create_st_line(amount=-150, partner_id=self.partner_a.id)
+        reco_model_invoice_fixed = self.env['account.reconcile.model'].create({
+            'name': "test fixed",
+            'rule_type': 'writeoff_button',
+            'counterpart_type': 'sale',
+            'line_ids': [
+                Command.create({
+                    'amount_type': 'fixed',
+                    'amount_string': '100',
+                }),
+            ],
+        })
+        move = self.create_test_reco_invoice(st_line, reco_model_invoice_fixed)
+        self.assert_reco_invoice_values(move, st_line, 'out_refund', 100.0)
+
+    def test_invoice_creation_reco_model_regex(self):
+        """ Test if correct move is created when rounding is needed """
+        # Odd amount and a reconciliation model with two lines (50% each line) requires rounding to ensure values match.
+        st_line = self._create_st_line(amount=150, partner_id=self.partner_a.id, payment_ref="150 invoice", statement_name='150 invoice')
+        reco_model_invoice_regex = self.env['account.reconcile.model'].create({
+            'name': "test label/regex",
+            'rule_type': 'writeoff_button',
+            'counterpart_type': 'sale',
+            'line_ids': [
+                Command.create({
+                    'amount_type': 'regex',
+                    'amount_string': r'([\d,.]+)',
+                }),
+            ],
+        })
+        move = self.create_test_reco_invoice(st_line, reco_model_invoice_regex)
+        self.assert_reco_invoice_values(move, st_line, 'out_invoice', 150.0)
+
+    def test_unreconciled_with_other_lines(self):
+        """Test that other lines are shown in the widget if they exist."""
+        st_line = self._create_st_line(
+            1000.0,
+            date='2017-01-01',
+        )
+
+        # Edit the associated move to partially reconcile some of the suspense amount; i.e. we add another line
+        liquidity_line, suspense_line, other_line = st_line._seek_for_lines()
+        other_account = st_line.journal_id.company_id.default_cash_difference_income_account_id
+        self.assertFalse(other_line)
+        move = st_line.move_id
+        move.button_draft()
+        move.write({'line_ids': [
+            Command.create({'account_id': other_account.id, 'credit': 100.0}),
+            Command.update(suspense_line.id, {'credit': 900.0}),
+        ]})
+        move.action_post()
+        liquidity_line, suspense_line, other_line = st_line._seek_for_lines()
+        self.assertTrue(other_line)
+
+        # Check that the wizard displays the new line
+        wizard = self.env['bank.rec.widget'].with_context(default_st_line_id=st_line.id).new({})
+        self.assertRecordValues(wizard.line_ids, [
+            # pylint: disable=C0326
+            {'flag': 'liquidity',      'account_id': liquidity_line.account_id.id,   'amount_currency': 1000.0},
+            {'flag': 'aml',            'account_id': other_line.account_id.id,       'amount_currency': -100.0},
+            {'flag': 'auto_balance',   'account_id': suspense_line.account_id.id,    'amount_currency': -900.0},
+        ])
+
+    def test_caba_reconcile_account_multi_currency(self):
+        self.env.company.tax_exigibility = True
+        cash_basis_transfer_account = self.env['account.account'].create({
+            'code': 'cash.basis.transfer.account',
+            'name': 'cash_basis_transfer_account',
+            'account_type': 'income',
+            'reconcile': True,
+        })
+        tax_account = self.env['account.account'].create({
+            'code': 'cash.basis.tax.account',
+            'name': 'cash_basis_tax_account',
+            'account_type': 'income',
+        })
+        caba_tax = self.env['account.tax'].create({
+            'name': 'tax_caba',
+            'amount': 15.0,
+            'cash_basis_transition_account_id': cash_basis_transfer_account.id,
+            'tax_exigibility': 'on_payment',
+            'invoice_repartition_line_ids': [
+                Command.create({'repartition_type': 'base'}),
+                Command.create({
+                    'repartition_type': 'tax',
+                    'account_id': tax_account.id,
+                }),
+            ],
+            'refund_repartition_line_ids': [
+                Command.create({'repartition_type': 'base'}),
+                Command.create({
+                    'repartition_type': 'tax',
+                    'account_id': tax_account.id,
+                }),
+            ],
+        })
+
+        currency = self.other_currency
+        inv_line = self._create_invoice_line(
+            'out_invoice',
+            currency_id=currency.id,
+            invoice_date='2016-01-01',
+            invoice_line_ids=[{'price_unit': 1200.0, 'tax_ids': [Command.set(caba_tax.ids)]}],
+        )
+        inv = inv_line.move_id
+        st_line = self._create_st_line(
+            690.0,
+            date='2017-01-01',
+            foreign_currency_id=currency.id,
+            amount_currency=1380.0,
+        )
+        wizard = self.env['bank.rec.widget'].with_context(default_st_line_id=st_line.id).new({})
+        wizard._action_add_new_amls(inv_line)
+
+        self.assertRecordValues(wizard.line_ids, [
+            {'flag': 'liquidity',       'balance': 690.0,   'amount_currency': 690.0,   'currency_id': self.env.company.currency_id.id},
+            {'flag': 'new_aml',         'balance': -460.0,  'amount_currency': -1380.0, 'currency_id': currency.id},
+            {'flag': 'exchange_diff',   'balance': -230.0,  'amount_currency': 0.0,     'currency_id': currency.id},
+        ])
+
+        line = wizard.line_ids.filtered(lambda x: x.flag == 'exchange_diff')
+        wizard._js_action_mount_line_in_edit(line.index)
+        line.balance = -240.0
+        wizard._line_value_changed_balance(line)
+
+        self.assertRecordValues(wizard.line_ids, [
+            {'flag': 'liquidity',       'balance': 690.0,   'amount_currency': 690.0,   'currency_id': self.env.company.currency_id.id},
+            {'flag': 'new_aml',         'balance': -460.0,  'amount_currency': -1380.0, 'currency_id': currency.id},
+            {'flag': 'exchange_diff',   'balance': -240.0,  'amount_currency': 0.0,     'currency_id': currency.id},
+            {'flag': 'auto_balance',    'balance': 10.0,    'amount_currency': 0.0,     'currency_id': currency.id},
+        ])
+
+        wizard._action_validate()
+
+        self.assertRecordValues(st_line.line_ids, [
+            {'balance': 690.0,  'amount_currency': 690.0,   'currency_id': self.env.company.currency_id.id},
+            {'balance': -700.0, 'amount_currency': -1380.0, 'currency_id': currency.id},
+            {'balance': 10.0,   'amount_currency': 0.0,     'currency_id': currency.id},
+        ])
+
+        caba_move = inv.tax_cash_basis_created_move_ids
+        product_account = self.company_data['default_account_revenue']
+        self.assertRecordValues(caba_move.line_ids, [
+            {'balance': 608.7,      'amount_currency': 1200.0,  'currency_id': currency.id,     'account_id': product_account.id},
+            {'balance': -608.7,     'amount_currency': -1200.0, 'currency_id': currency.id,     'account_id': product_account.id},
+            {'balance': 91.3,       'amount_currency': 180.0,   'currency_id': currency.id,     'account_id': cash_basis_transfer_account.id},
+            {'balance': -91.3,      'amount_currency': -180.0,  'currency_id': currency.id,     'account_id': tax_account.id},
+        ])
+
+        tax_line = inv.line_ids.filtered('tax_repartition_line_id')
+        _liquidity_line, _suspense_line, other_line = st_line._seek_for_lines()
+        self.assertRecordValues(caba_move.line_ids + inv_line + tax_line + other_line, [
+            {'amount_residual': 0.0,  'amount_residual_currency': 0.0},
+        ] * 7)
+
+        exchange_diff_moves = self.env['account.move'].search([('journal_id', '=', self.env.company.currency_exchange_journal_id.id)])
+        self.assertRecordValues(exchange_diff_moves.line_ids, [
+            # Exchange diff CABA entry with invoice for the tax line ((180 / 2) - (180 / 3) = 90 - 60 = 30):
+            {'balance': -31.3,  'amount_currency': 0.0, 'currency_id': currency.id},
+            {'balance': 31.3,   'amount_currency': 0.0, 'currency_id': currency.id},
+            # Exchange diff st_line with invoice ((1380 / 2) - (1380 / 3) = 690 - 430 = 230):
+            {'balance': 240.0,  'amount_currency': 0.0, 'currency_id': currency.id},
+            {'balance': -240.0, 'amount_currency': 0.0, 'currency_id': currency.id},
+        ])
+
+    def test_reconciliation_with_branch(self):
+        """
+        Test the reconciliation flow with different configurations of company with a branch
+        """
+        company = self.company_data['company']
+        branch = self.env['res.company'].create({
+            'name': "Branch A",
+            'parent_id': company.id,
+        })
+        # Load CoA
+        self.cr.precommit.run()
+
+        partner_branch = self.env['res.partner'].create({
+            'name': 'Partner Branch',
+            'company_id': branch.id,
+        })
+
+        aml_branch = self._create_invoice_line(
+            'out_invoice',
+            company_id=branch.id,
+            partner_id=partner_branch.id,
+            invoice_date='2019-01-01',
+            invoice_line_ids=[{'name': 'Test reco', 'quantity': 1, 'price_unit': 1000}],
+        )
+        st_line_main = self._create_st_line(
+            1000.0,
+            company_id=company.id,
+            date='2019-01-01',
+            payment_ref='Test reco',
+        )
+        st_line_branch = self._create_st_line(
+            1000.0,
+            company_id=branch.id,
+            date='2019-01-01',
+            payment_ref='Test reco2',
+            partner_id=partner_branch.id,
+        )
+
+        # Case 1: reconciliation with st_line on the main company + aml on the branch
+        wizard = self.env['bank.rec.widget'].with_context(default_st_line_id=st_line_main.id).new({})
+        wizard._action_add_new_amls(aml_branch)
+        wizard._action_validate()
+
+        # Assert that the partner is not set to avoid "Incompatible companies on records" error
+        self.assertFalse(st_line_main.partner_id)
+
+        st_line_main.action_undo_reconciliation()
+
+        # Case 2: reconciliation with both st_line and aml on the branch
+        wizard_branch = self.env['bank.rec.widget'].with_context(default_st_line_id=st_line_branch.id).new({})
+        wizard_branch._action_add_new_amls(aml_branch)
+        wizard_branch._action_validate()
+
+        # Assert that the partner remains set on the transaction
+        self.assertEqual(st_line_branch.partner_id, partner_branch, "The partner should remain set on the transaction for the branch company.")
+
+        st_line_branch.action_undo_reconciliation()
+
+        # Case 3: reconciliation with both st_line and aml on the branch, no partner on the st_line
+        st_line_branch.partner_id = False
+        wizard_branch = self.env['bank.rec.widget'].with_context(default_st_line_id=st_line_branch.id).new({})
+        wizard_branch._action_add_new_amls(aml_branch)
+        wizard_branch._action_validate()
+
+        # Assert that the partner is set from the aml on the transaction
+        self.assertEqual(st_line_branch.partner_id, partner_branch, "The partner should be automatically set on the transaction for the branch company if it's set on the aml.")
+
+    def test_analytic_distribution_for_early_payment_statement(self):
+        """
+        Test that the analytic is applied for statement with early discount
+        """
+        early_payment_term = self.env['account.payment.term'].create({
+            'name': "early_payment_term",
+            'company_id': self.company_data['company'].id,
+            'early_pay_discount_computation': 'included',
+            'early_discount': True,
+            'discount_percentage': 2,
+            'discount_days': 7,
+            'line_ids': [
+                Command.create({
+                    'value': 'percent',
+                    'value_amount': 100.0,
+                    'nb_days': 30,
+                }),
+            ],
+        })
+
+        analytic_plan = self.env['account.analytic.plan'].create({
+            'name': 'existential plan',
+        })
+        analytic_account = self.env['account.analytic.account'].create({
+            'name': 'positive_account',
+            'plan_id': analytic_plan.id,
+        })
+
+        cash_discount_account = self.company_data['company'].account_journal_early_pay_discount_loss_account_id
+        self.env['account.analytic.distribution.model'].create({
+            'account_prefix': cash_discount_account.code,
+            'analytic_distribution': {analytic_account.id: 100.0},
+        })
+
+        invoice = self.env['account.move'].create([{
+            'move_type': 'out_invoice',
+            'partner_id': self.partner_a.id,
+            'date': '2017-01-01',
+            'invoice_date': '2017-01-01',
+            'invoice_payment_term_id': early_payment_term.id,
+            'invoice_line_ids': [Command.create({
+                'name': 'line',
+                'price_unit': 100.0,
+            })]
+        }])
+        invoice.action_post()
+
+        statement = self.env['account.bank.statement.line'].create({
+            'date': '2017-01-01',
+            'payment_ref': invoice.payment_reference,
+            'partner_id': self.partner_b.id,
+            'amount': 98.0,
+            'journal_id': self.company_data['default_journal_bank'].id,
+        })
+
+        wizard = self.env['bank.rec.widget'].with_context(default_st_line_id=statement.id).new({})
+        receivable_line = invoice.line_ids.filtered(lambda l: l.account_id.account_type == 'asset_receivable')
+        wizard._action_add_new_amls(receivable_line)
+        wizard._action_validate()
+
+        early_payment_line = statement.line_ids.filtered(lambda p: p.balance == 2.0)
+        self.assertTrue(early_payment_line.analytic_distribution)
+
+    def test_reconcile_no_caba_move_on_bank_journal_entry(self):
+        """ Test that no cash basis move is created for a bank reconciliation journal entry. """
+        self.env.company.tax_exigibility = True
+        cash_basis_transfer_account = self.env['account.account'].create({
+            'code': 'cash.basis.transfer.account',
+            'name': 'cash_basis_transfer_account',
+            'account_type': 'income',
+            'reconcile': True,
+        })
+        tax_account = self.env['account.account'].create({
+            'code': 'cash.basis.tax.account',
+            'name': 'cash_basis_tax_account',
+            'account_type': 'income',
+        })
+        caba_tax = self.env['account.tax'].create({
+            'name': 'tax_caba',
+            'amount': 15.0,
+            'cash_basis_transition_account_id': cash_basis_transfer_account.id,
+            'tax_exigibility': 'on_payment',
+            'invoice_repartition_line_ids': [
+                Command.create({'repartition_type': 'base'}),
+                Command.create({
+                    'repartition_type': 'tax',
+                    'account_id': tax_account.id,
+                }),
+            ],
+            'refund_repartition_line_ids': [
+                Command.create({'repartition_type': 'base'}),
+                Command.create({
+                    'repartition_type': 'tax',
+                    'account_id': tax_account.id,
+                }),
+            ],
+        })
+
+        inv_line = self._create_invoice_line(
+            'out_invoice',
+            invoice_date='2017-01-01',
+            invoice_line_ids=[{'price_unit': 200.0, 'tax_ids': caba_tax}],
+        )
+        inv = inv_line.move_id
+        st_line = self._create_st_line(200.0, date='2017-01-01')
+
+        wizard = self.env['bank.rec.widget'].with_context(default_st_line_id=st_line.id).new({})
+        wizard._action_add_new_amls(inv_line)
+
+        self.assertRecordValues(wizard.line_ids, [
+            {'flag': 'liquidity',     'balance': 200.0},
+            {'flag': 'new_aml',       'balance': -200.0},
+        ])
+
+        # Switch to a full reconciliation.
+        new_line = wizard.line_ids.filtered(lambda x: x.flag == 'new_aml')
+        wizard._js_action_mount_line_in_edit(new_line.index)
+        wizard._js_action_apply_line_suggestion(new_line.index)
+
+        self.assertRecordValues(wizard.line_ids, [
+            {'flag': 'liquidity',        'balance': 200.0},
+            {'flag': 'new_aml',          'balance': -230.0},
+            {'flag': 'auto_balance',     'balance': 30.0},
+        ])
+
+        # Add the CABA tax to the auto-balance line
+        auto_balance_line = wizard.line_ids.filtered(lambda x: x.flag == 'auto_balance')
+        wizard._js_action_mount_line_in_edit(auto_balance_line.index)
+        auto_balance_line.account_id = self.company_data['default_account_expense']
+        wizard._line_value_changed_account_id(auto_balance_line)
+        auto_balance_line.tax_ids = [Command.link(caba_tax.id)]
+        wizard._line_value_changed_tax_ids(auto_balance_line)
+
+        self.assertRecordValues(wizard.line_ids, [
+            {'flag': 'liquidity',     'balance': 200.0},
+            {'flag': 'new_aml',       'balance': -230.0},
+            {'flag': 'manual',        'balance': 26.09},
+            {'flag': 'tax_line',      'balance': 3.91},
+        ])
+
+        wizard._action_validate()
+        # Cash basis move should be created for the invoice
+        caba_move = inv.tax_cash_basis_created_move_ids
+        product_account = self.company_data['default_account_revenue']
+
+        self.assertRecordValues(caba_move.line_ids, [
+            {'balance': 200.0,      'account_id': product_account.id},
+            {'balance': -200.0,     'account_id': product_account.id},
+            {'balance': 30.0,       'account_id': cash_basis_transfer_account.id},
+            {'balance': -30.0,      'account_id': tax_account.id},
+        ])
+
+        # No cash basis move should be created for the bank journal entry
+        self.assertFalse(st_line.move_id.tax_cash_basis_created_move_ids)
diff --git a/dev_odex30_accounting/odex30_account_accountant/tests/test_bank_rec_widget_common.py b/dev_odex30_accounting/odex30_account_accountant/tests/test_bank_rec_widget_common.py
new file mode 100644
index 0000000..b961a5c
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_accountant/tests/test_bank_rec_widget_common.py
@@ -0,0 +1,68 @@
+# -*- coding: utf-8 -*-
+from odoo import Command
+from odoo.addons.account.tests.common import AccountTestInvoicingCommon
+
+
+class TestBankRecWidgetCommon(AccountTestInvoicingCommon):
+
+    @classmethod
+    def setUpClass(cls):
+        super().setUpClass()
+        cls.other_currency = cls.setup_other_currency('EUR')
+        cls.other_currency_2 = cls.setup_other_currency('CAD', rounding=0.001, rates=[('2016-01-01', 6.0), ('2017-01-01', 4.0)])
+        cls.other_currency_3 = cls.setup_other_currency('XAF', rounding=0.001, rates=[('2016-01-01', 12.0), ('2017-01-01', 8.0)])
+
+    @classmethod
+    def _create_invoice_line(cls, move_type, **kwargs):
+        ''' Create an invoice on the fly.'''
+        kwargs.setdefault('partner_id', cls.partner_a.id)
+        kwargs.setdefault('invoice_date', '2017-01-01')
+        kwargs.setdefault('invoice_line_ids', [])
+        for one2many_values in kwargs['invoice_line_ids']:
+            one2many_values.setdefault('name', 'xxxx')
+            one2many_values.setdefault('quantity', 1)
+            one2many_values.setdefault('tax_ids', [])
+
+        invoice = cls.env['account.move'].create({
+            'move_type': move_type,
+            **kwargs,
+            'invoice_line_ids': [Command.create(x) for x in kwargs['invoice_line_ids']],
+        })
+        invoice.action_post()
+        return invoice.line_ids\
+            .filtered(lambda l: l.account_id.account_type in ('asset_receivable', 'liability_payable'))
+
+    @classmethod
+    def _create_st_line(cls, amount, date='2019-01-01', payment_ref='turlututu', **kwargs):
+        st_line = cls.env['account.bank.statement.line'].create({
+            'amount': amount,
+            'date': date,
+            'payment_ref': payment_ref,
+            'journal_id': kwargs.get('journal_id', cls.company_data['default_journal_bank'].id),
+            **kwargs,
+        })
+        # The automatic reconcile cron checks the create_date when considering st_lines to run on.
+        # create_date is a protected field so this is the only way to set it correctly
+        cls.env.cr.execute("UPDATE account_bank_statement_line SET create_date = %s WHERE id=%s",
+                           (st_line.date, st_line.id))
+        return st_line
+
+    @classmethod
+    def _create_reconcile_model(cls, **kwargs):
+        return cls.env['account.reconcile.model'].create({
+            'name': "test",
+            'rule_type': 'invoice_matching',
+            'allow_payment_tolerance': True,
+            'payment_tolerance_type': 'percentage',
+            'payment_tolerance_param': 0.0,
+            **kwargs,
+            'line_ids': [
+                Command.create({
+                    'account_id': cls.company_data['default_account_revenue'].id,
+                    'amount_type': 'percentage',
+                    'label': f"test {i}",
+                    **line_vals,
+                })
+                for i, line_vals in enumerate(kwargs.get('line_ids', []))
+            ],
+        })
diff --git a/dev_odex30_accounting/odex30_account_accountant/tests/test_bank_rec_widget_tour.py b/dev_odex30_accounting/odex30_account_accountant/tests/test_bank_rec_widget_tour.py
new file mode 100644
index 0000000..e8e6217
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_accountant/tests/test_bank_rec_widget_tour.py
@@ -0,0 +1,221 @@
+# -*- coding: utf-8 -*-
+from odoo.addons.odex30_account_accountant.tests.test_bank_rec_widget_common import TestBankRecWidgetCommon
+from odoo.tests import tagged, HttpCase
+from odoo import Command
+
+
+@tagged('post_install', '-at_install')
+class TestBankRecWidget(TestBankRecWidgetCommon, HttpCase):
+
+    @classmethod
+    def setUpClass(cls):
+        super().setUpClass()
+
+        cls.st_line1 = cls._create_st_line(1000.0, payment_ref="line1", sequence=1)
+        cls.st_line2 = cls._create_st_line(1000.0, payment_ref="line2", sequence=2)
+        cls._create_st_line(1000.0, payment_ref="line3", sequence=3)
+        cls._create_st_line(1000.0, payment_ref="line_credit", sequence=4, journal_id=cls.company_data['default_journal_credit'].id)
+
+        # INV/2019/00001:
+        cls._create_invoice_line(
+            'out_invoice',
+            partner_id=cls.partner_a.id,
+            invoice_date='2019-01-01',
+            invoice_line_ids=[{'price_unit': 1000.0}],
+        )
+
+        # INV/2019/00002:
+        cls._create_invoice_line(
+            'out_invoice',
+            partner_id=cls.partner_a.id,
+            invoice_date='2019-01-01',
+            invoice_line_ids=[{'price_unit': 1000.0}],
+        )
+
+        cls.env['account.reconcile.model']\
+            .search([('company_id', '=', cls.company_data['company'].id)])\
+            .write({'past_months_limit': None})
+
+        cls.reco_model_invoice = cls.env['account.reconcile.model'].create({
+            'name': "test reconcile create invoice",
+            'rule_type': 'writeoff_button',
+            'counterpart_type': 'sale',
+            'line_ids': [
+                Command.create({'amount_string': '50'}),
+                Command.create({'amount_string': '50'}),
+            ],
+        })
+
+    def test_tour_bank_rec_widget(self):
+        self.start_tour('/odoo', 'account_accountant_bank_rec_widget', login=self.env.user.login)
+
+        self.assertRecordValues(self.st_line1.line_ids, [
+            # pylint: disable=C0326
+            {'account_id': self.st_line1.journal_id.default_account_id.id,      'balance': 1000.0,  'reconciled': False},
+            {'account_id': self.company_data['default_account_receivable'].id,  'balance': -1000.0, 'reconciled': True},
+        ])
+
+        tax_account = self.company_data['default_tax_sale'].invoice_repartition_line_ids.account_id
+        self.assertRecordValues(self.st_line2.line_ids, [
+            # pylint: disable=C0326
+            {'account_id': self.st_line2.journal_id.default_account_id.id,      'balance': 1000.0,  'tax_ids': []},
+            {'account_id': self.company_data['default_account_payable'].id,     'balance': -869.57, 'tax_ids': self.company_data['default_tax_sale'].ids},
+            {'account_id': tax_account.id,                                      'balance': -130.43, 'tax_ids': []},
+        ])
+
+    def test_tour_bank_rec_widget_ui(self):
+        bank2 = self.env['account.journal'].create({
+            'name': 'Bank2',
+            'type': 'bank',
+            'code': 'BNK2',
+        })
+        self._create_st_line(222.22, payment_ref="line4", sequence=4, journal_id=bank2.id)
+        # INV/2019/00003:
+        self._create_invoice_line(
+            'out_invoice',
+            partner_id=self.partner_a.id,
+            invoice_date='2019-01-01',
+            invoice_line_ids=[{'price_unit': 2000.0}],
+        )
+        self.st_line2.payment_ref = self.st_line2.payment_ref + ' - ' + 'INV/2019/00001'
+        self.start_tour('/odoo?debug=assets', 'account_accountant_bank_rec_widget_ui', timeout=120, login=self.env.user.login)
+
+    def test_tour_bank_rec_widget_rainbowman_reset(self):
+        self.start_tour('/odoo?debug=assets', 'account_accountant_bank_rec_widget_rainbowman_reset', login=self.env.user.login)
+
+    def test_tour_bank_rec_journal_items_export(self):
+        self.start_tour('/web?debug=assets', 'account_accountant_journal_items_export', login=self.env.user.login)
+
+    def test_tour_bank_rec_widget_statements(self):
+        self.start_tour('/odoo?debug=assets', 'account_accountant_bank_rec_widget_statements', login=self.env.user.login)
+
+    def test_tour_invoice_creation_from_reco_model(self):
+        """ Test if move is created and added as a new_aml line in bank reconciliation widget """
+        st_line = self._create_st_line(amount=1000, partner_id=self.partner_a.id)
+        wizard = self.env['bank.rec.widget'].with_context(default_st_line_id=st_line.id).new({})
+        # The tour creates a move through reco model button, posts it, returns to widget and validates the move
+        self.start_tour(
+            '/odoo',
+            'account_accountant_bank_rec_widget_reconciliation_button',
+            login=self.env.user.login,
+        )
+        # Mount the validated statement line to confirm that information matches.
+        wizard._js_action_mount_st_line(st_line.id)
+        self.assertRecordValues(wizard.line_ids, [
+            {'flag': 'liquidity',   'account_id': st_line.journal_id.default_account_id.id,             'balance': 1000},
+            {'flag': 'aml',         'account_id': self.company_data['default_account_receivable'].id,   'balance': -1000},
+        ])
+        # Check that the aml comes from a move, and not from the auto-balance line
+        self.assertTrue(wizard.line_ids[1].source_aml_move_id)
+
+    def test_tour_invoice_creation_reco_model_currency(self):
+        """ Test move creation through reconcile button when a foreign currency is used for the statement line """
+        st_line = self._create_st_line(
+            1800.0,
+            date='2019-02-01',
+            foreign_currency_id=self.other_currency.id,  # rate 2:1
+            amount_currency=3600.0,
+            partner_id=self.partner_a.id,
+        )
+
+        wizard = self.env['bank.rec.widget'].with_context(default_st_line_id=st_line.id).new({})
+
+        self.start_tour(
+            '/odoo',
+            'account_accountant_bank_rec_widget_reconciliation_button',
+            login=self.env.user.login,
+        )
+        # Mount the validated statement line to confirm that information matches.
+        wizard._js_action_mount_st_line(st_line.id)
+
+        # Move is created in the foreign currency, but in bank widget the balance appears in main currency.
+        # If aml was created from the reco model button, display name matches payment_ref.
+        self.assertRecordValues(wizard.line_ids, [
+            {'flag': 'liquidity',   'balance': 1800,     'amount_currency': 1800},
+            {'flag': 'aml',         'balance': -1800,    'amount_currency': -3600},
+        ])
+        # Confirm that the aml comes from a move, and not from the auto-balance line
+        self.assertTrue(wizard.line_ids[1].source_aml_move_id)
+
+    def test_tour_invoice_creation_combined_reco_model(self):
+        """ Test creation of a move from a reconciliation model with different amount types """
+        self.reco_model_invoice.name = "old test"  # rename previous reco model to be able to reuse the existing tour
+        self.env['account.reconcile.model'].create({
+            'name': "test reconcile combined",
+            'rule_type': 'writeoff_button',
+            'counterpart_type': 'purchase',
+            'line_ids': [
+                Command.create({
+                    'amount_type': 'percentage_st_line',
+                    'amount_string': '50',
+                }),
+                Command.create({
+                    'amount_type': 'percentage',
+                    'amount_string': '50',
+                    'tax_ids': self.tax_purchase_b.ids,
+                }),
+                Command.create({
+                    'amount_type': 'fixed',
+                    'amount_string': '100',
+                    'account_id': self.env.company.expense_currency_exchange_account_id.id,
+                    'tax_ids': [Command.clear()]  # remove default tax added
+                }),
+                # Regex line will not be added to move, as the label of st line does not include digits
+                Command.create({
+                    'amount_type': 'regex',
+                    'amount_string': r'BRT: ([\d,.]+)',
+                }),
+            ],
+        })
+
+        st_line = self._create_st_line(amount=-1000, partner_id=self.partner_a.id, payment_ref="combined test")
+        wizard = self.env['bank.rec.widget'].with_context(default_st_line_id=st_line.id).new({})
+        # The tour creates a move through reco model button, posts it, returns to widget and validates the move
+        self.start_tour(
+            '/odoo',
+            'account_accountant_bank_rec_widget_reconciliation_button',
+            login=self.env.user.login,
+        )
+        # Mount the validated statement line to confirm that widget line matches created move and balance line is added.
+        wizard._js_action_mount_st_line(st_line.id)
+        self.assertRecordValues(wizard.line_ids, [
+            {'flag': 'liquidity',   'account_id': st_line.journal_id.default_account_id.id,          'balance': -1000},
+            {'flag': 'aml',         'account_id': self.company_data['default_account_payable'].id,   'balance': 850},
+            {'flag': 'aml',         'account_id': self.company_data['default_account_payable'].id,   'balance': 150},
+        ])
+        # Check that the aml comes from an existing move
+        move = wizard.line_ids[1].source_aml_move_id
+        self.assertTrue(move)
+
+        # The total price of these lines should match the percentage or fixed amount of reco model lines
+        self.assertRecordValues(move.line_ids, [
+            # 50% of statement line (of 1000.0)
+            {'price_total': 500,   'debit': 434.78,   'credit': 0,     'name': 'combined test',   'account_id': self.company_data['default_account_expense'].id},
+            # 50% of balance (of residual value = 500.0)
+            {'price_total': 250,   'debit': 217.39,   'credit': 0,     'name': 'combined test',   'account_id': self.company_data['default_account_expense'].id},
+            # fixed amount of 100.0, no tax in reco model line
+            {'price_total': 100,   'debit': 100,      'credit': 0,     'name': 'combined test',   'account_id': self.env.company.expense_currency_exchange_account_id.id},
+            # Tax for line 1 (65.22 + 434.78 = 500)
+            {'price_total': 0,     'debit': 65.22,    'credit': 0,     'name': '15%',             'account_id': self.company_data['default_account_tax_purchase'].id},
+            # Tax for line 1 (32.61 + 217.39 = 250)
+            {'price_total': 0,     'debit': 32.61,    'credit': 0,     'name': '15% (Copy)',      'account_id': self.company_data['default_account_tax_purchase'].id},
+            {'price_total': 0,     'debit': 0,        'credit': 850,   'name': 'combined test',   'account_id': self.company_data['default_account_payable'].id},
+        ])
+
+    def test_analytic_distribution_saved(self):
+        """
+        Test that the analytic distribution is saved when it is changed on the account.move.line in the banc rec
+        """
+        analytic_plan = self.env['account.analytic.plan'].create({
+            'name': 'Default',
+            'sequence': 1, # Used to simplify analytic distribution selector during the tour
+        })
+        analytic_account = self.env['account.analytic.account'].create({
+            'name': 'analytic_account',
+            'plan_id': analytic_plan.id,
+            'company_id': False,
+        })
+        self.env.user.write({'groups_id': [Command.link(self.env.ref('analytic.group_analytic_accounting').id)]})
+        self.start_tour('/web', 'account_accountant_bank_rec_widget_save_analytic_distribution', login=self.env.user.login)
+        line1 = self.env['account.move.line'].search([('name', '=', 'line1')], limit=1)
+        self.assertEqual(line1.analytic_distribution, {str(analytic_account.id): 100})
diff --git a/dev_odex30_accounting/odex30_account_accountant/tests/test_change_lock_date_wizard.py b/dev_odex30_accounting/odex30_account_accountant/tests/test_change_lock_date_wizard.py
new file mode 100644
index 0000000..7063330
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_accountant/tests/test_change_lock_date_wizard.py
@@ -0,0 +1,201 @@
+from datetime import timedelta
+
+from odoo import fields
+from odoo.addons.account.tests.common import AccountTestInvoicingCommon
+from odoo.addons.odex30_account_accountant.wizard.account_change_lock_date import SOFT_LOCK_DATE_FIELDS
+from odoo.exceptions import UserError
+from odoo.tests import tagged
+from odoo.tools import frozendict
+
+
+@tagged('post_install', '-at_install')
+class TestChangeLockDateWizard(AccountTestInvoicingCommon):
+
+    def test_exception_generation(self):
+        """
+        Test the exception generation from the wizard.
+        Note that exceptions for 'everyone' and 'forever' are not tested here.
+        They do not create an exception (no 'account.lock_exception' object), but just change the lock date.
+        (See `test_everyone_forever_exception`.)
+        """
+        self.env['account.lock_exception'].search([]).sudo().unlink()
+
+        for lock_date_field in SOFT_LOCK_DATE_FIELDS:
+            with self.subTest(lock_date_field=lock_date_field), self.cr.savepoint() as sp:
+                # We can set the lock date if there is none.
+                self.env['account.change.lock.date'].create({lock_date_field: '2010-01-01'}).change_lock_date()
+                self.assertEqual(self.env.company[lock_date_field], fields.Date.from_string('2010-01-01'))
+
+                # We can increase the lock date if there is one.
+                self.env['account.change.lock.date'].create({lock_date_field: '2011-01-01'}).change_lock_date()
+                self.assertEqual(self.env.company[lock_date_field], fields.Date.from_string('2011-01-01'))
+
+                # We cannot remove the lock date; but we can create an exception
+                wizard = self.env['account.change.lock.date'].create({
+                    lock_date_field: False,
+                    'exception_applies_to': 'everyone',
+                    'exception_duration': '1h',
+                    'exception_reason': ':TestChangeLockDateWizard.test_exception_generation; remove',
+                })
+                wizard.change_lock_date()
+                self.assertEqual(self.env['account.lock_exception'].search_count([]), 1)
+                exception = self.env['account.lock_exception'].search([])
+                self.assertEqual(len(exception), 1)
+                self.assertRecordValues(exception, [{
+                    lock_date_field: False,
+                    'company_id': self.env.company.id,
+                    'user_id': False,
+                    'create_uid': self.env.user.id,
+                    'end_datetime': self.env.cr.now() + timedelta(hours=1),
+                    'reason': ':TestChangeLockDateWizard.test_exception_generation; remove',
+                }])
+                exception.sudo().unlink()
+
+                # Ensure we have not created any exceptions yet
+                self.assertEqual(self.env['account.lock_exception'].search_count([]), 0)
+
+                # We cannot decrease the lock date; but we can create an exception
+                self.env['account.change.lock.date'].create({lock_date_field: '2009-01-01'}).change_lock_date()
+                self.assertEqual(self.env.company[lock_date_field], fields.Date.from_string('2011-01-01'))
+                exception = self.env['account.lock_exception'].search([])
+                self.assertEqual(len(exception), 1)
+                # Check lock date and default values on exception
+                self.assertRecordValues(exception, [{
+                    lock_date_field: fields.Date.from_string('2009-01-01'),
+                    'company_id': self.env.company.id,
+                    'user_id': self.env.user.id,
+                    'create_uid': self.env.user.id,
+                    'end_datetime': self.env.cr.now() + timedelta(minutes=5),
+                    'reason': False,
+                }])
+
+                sp.close()  # Rollback to ensure all subtests start in the same situation
+
+    def test_exception_generation_multiple(self):
+        """
+        Test the exception generation from the wizard.
+        Here we test the case that we create multiple exceptions at once.
+        This should create an exception object for every changed lock date.
+        """
+        self.env['account.lock_exception'].search([]).sudo().unlink()
+
+        wizard = self.env['account.change.lock.date'].create({
+            'fiscalyear_lock_date': '2010-01-01',
+            'tax_lock_date': '2010-01-01',
+            'sale_lock_date': '2010-01-01',
+            'purchase_lock_date': '2010-01-01',
+        })
+        wizard.change_lock_date()
+
+        self.assertRecordValues(self.env.company, [{
+            'fiscalyear_lock_date': fields.Date.from_string('2010-01-01'),
+            'tax_lock_date': fields.Date.from_string('2010-01-01'),
+            'sale_lock_date': fields.Date.from_string('2010-01-01'),
+            'purchase_lock_date': fields.Date.from_string('2010-01-01'),
+        }])
+
+        wizard = self.env['account.change.lock.date'].create({
+            'fiscalyear_lock_date': '2009-01-01',
+            'tax_lock_date': '2009-01-01',
+            'sale_lock_date': '2009-01-01',
+            'purchase_lock_date': '2009-01-01',
+            'exception_applies_to': 'everyone',
+            'exception_duration': '1h',
+            'exception_reason': ':TestChangeLockDateWizard.test_exception_generation; remove',
+        })
+        wizard.change_lock_date()
+
+        exceptions = self.env['account.lock_exception'].search([])
+        self.assertEqual(len(exceptions), 4)
+        expected_exceptions = {
+            frozendict({
+                'lock_date_field': 'fiscalyear_lock_date',
+                'lock_date': fields.Date.from_string('2009-01-01'),
+            }),
+            frozendict({
+                'lock_date_field': 'tax_lock_date',
+                'lock_date': fields.Date.from_string('2009-01-01'),
+            }),
+            frozendict({
+                'lock_date_field': 'sale_lock_date',
+                'lock_date': fields.Date.from_string('2009-01-01'),
+            }),
+            frozendict({
+                'lock_date_field': 'purchase_lock_date',
+                'lock_date': fields.Date.from_string('2009-01-01'),
+            }),
+        }
+        created_exceptions = {
+            frozendict({
+                'lock_date_field': exception.lock_date_field,
+                'lock_date': exception.lock_date,
+            })
+            for exception in exceptions
+        }
+        self.assertSetEqual(created_exceptions, expected_exceptions)
+
+    def test_hard_lock_date(self):
+        self.env['account.lock_exception'].search([]).sudo().unlink()
+
+        # We can set the hard lock date if there is none.
+        self.env['account.change.lock.date'].create({'hard_lock_date': '2010-01-01'}).change_lock_date()
+        self.assertEqual(self.env.company.hard_lock_date, fields.Date.from_string('2010-01-01'))
+
+        # We can increase the hard lock date if there is one.
+        self.env['account.change.lock.date'].create({'hard_lock_date': '2011-01-01'}).change_lock_date()
+        self.assertEqual(self.env.company.hard_lock_date, fields.Date.from_string('2011-01-01'))
+
+        # We cannot decrease the hard lock date; not even with an exception.
+        wizard = self.env['account.change.lock.date'].create({
+            'hard_lock_date': '2009-01-01',
+            'exception_applies_to': 'everyone',
+            'exception_duration': '1h',
+            'exception_reason': ':TestChangeLockDateWizard.test_hard_lock_date',
+        })
+        with self.assertRaises(UserError), self.env.cr.savepoint():
+            wizard.change_lock_date()
+        self.assertEqual(self.env.company.hard_lock_date, fields.Date.from_string('2011-01-01'))
+
+        # We cannot remove the hard lock date; not even with an exception.
+        wizard = self.env['account.change.lock.date'].create({
+            'hard_lock_date': False,
+            'exception_applies_to': 'everyone',
+            'exception_duration': '1h',
+            'exception_reason': ':TestChangeLockDateWizard.test_hard_lock_date',
+        })
+        with self.assertRaises(UserError), self.env.cr.savepoint():
+            wizard.change_lock_date()
+        self.assertEqual(self.env.company.hard_lock_date, fields.Date.from_string('2011-01-01'))
+
+        self.assertEqual(self.env['account.lock_exception'].search_count([]), 0)
+
+    def test_everyone_forever_exception(self):
+        self.env['account.lock_exception'].search([]).sudo().unlink()
+
+        for lock_date_field in SOFT_LOCK_DATE_FIELDS:
+            with self.subTest(lock_date_field=lock_date_field), self.cr.savepoint() as sp:
+                self.env['account.change.lock.date'].create({lock_date_field: '2010-01-01'}).change_lock_date()
+                self.assertEqual(self.env.company[lock_date_field], fields.Date.from_string('2010-01-01'))
+
+                # We can decrease the lock date with a 'forever' / 'everyone' exception.
+                self.env['account.change.lock.date'].create({
+                    lock_date_field: '2009-01-01',
+                    'exception_applies_to': 'everyone',
+                    'exception_duration': 'forever',
+                    'exception_reason': ':TestChangeLockDateWizard.test_everyone_forever_exception; remove',
+                }).change_lock_date()
+                self.assertEqual(self.env.company[lock_date_field], fields.Date.from_string('2009-01-01'))
+
+                # We can remove the lock date with a 'forever' / 'everyone' exception.
+                self.env['account.change.lock.date'].create({
+                    lock_date_field: False,
+                    'exception_applies_to': 'everyone',
+                    'exception_duration': 'forever',
+                    'exception_reason': ':TestChangeLockDateWizard.test_everyone_forever_exception; remove',
+                }).change_lock_date()
+                self.assertEqual(self.env.company[lock_date_field], False)
+
+                # Ensure we have not created any exceptions
+                self.assertEqual(self.env['account.lock_exception'].search_count([]), 0)
+
+                sp.close()  # Rollback to ensure all subtests start in the same situation
diff --git a/dev_odex30_accounting/odex30_account_accountant/tests/test_deferred_management.py b/dev_odex30_accounting/odex30_account_accountant/tests/test_deferred_management.py
new file mode 100644
index 0000000..44afaaa
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_accountant/tests/test_deferred_management.py
@@ -0,0 +1,778 @@
+# -*- coding: utf-8 -*-
+# pylint: disable=C0326
+import datetime
+
+from odoo import Command, fields
+from odoo.tests import tagged
+from odoo.addons.account.tests.common import AccountTestInvoicingCommon
+
+from freezegun import freeze_time
+
+
+@tagged('post_install', '-at_install')
+class TestDeferredManagement(AccountTestInvoicingCommon):
+    @classmethod
+    def setUpClass(cls):
+        super().setUpClass()
+        cls.expense_accounts = [cls.env['account.account'].create({
+            'name': f'Expense {i}',
+            'code': f'EXP{i}',
+            'account_type': 'expense',
+        }) for i in range(3)]
+        cls.revenue_accounts = [cls.env['account.account'].create({
+            'name': f'Revenue {i}',
+            'code': f'REV{i}',
+            'account_type': 'income',
+        }) for i in range(3)]
+
+        cls.company.deferred_expense_journal_id = cls.company_data['default_journal_misc'].id
+        cls.company.deferred_revenue_journal_id = cls.company_data['default_journal_misc'].id
+        cls.company.deferred_expense_account_id = cls.company_data['default_account_deferred_expense'].id
+        cls.company.deferred_revenue_account_id = cls.company_data['default_account_deferred_revenue'].id
+
+        cls.expense_lines = [
+            [cls.expense_accounts[0], 1000, '2023-01-01', '2023-04-30'],  # 4 full months (=250/month)
+            [cls.expense_accounts[0], 1050, '2023-01-16', '2023-04-30'],  # 3 full months + 15 days (=300/month)
+            [cls.expense_accounts[1], 1225, '2023-01-01', '2023-04-15'],  # 3 full months + 15 days (=350/month)
+            [cls.expense_accounts[2], 1680, '2023-01-21', '2023-04-14'],  # 2 full months + 10 days + 14 days (=600/month)
+            [cls.expense_accounts[2],  225, '2023-04-01', '2023-04-15'],  # 15 days (=450/month)
+        ]
+        cls.revenue_lines = [
+            [cls.revenue_accounts[0], 1000, '2023-01-01', '2023-04-30'],  # 4 full months (=250/month)
+            [cls.revenue_accounts[0], 1050, '2023-01-16', '2023-04-30'],  # 3 full months + 15 days (=300/month)
+            [cls.revenue_accounts[1], 1225, '2023-01-01', '2023-04-15'],  # 3 full months + 15 days (=350/month)
+            [cls.revenue_accounts[2], 1680, '2023-01-21', '2023-04-14'],  # 2 full months + 10 days + 14 days (=600/month)
+            [cls.revenue_accounts[2],  225, '2023-04-01', '2023-04-15'],  # 15 days (=450/month)
+        ]
+
+    def create_invoice(self, move_type, invoice_lines, date=None, post=True):
+        journal = self.company_data['default_journal_purchase'] if move_type in self.env['account.move'].get_purchase_types() else self.company_data['default_journal_sale']
+        move = self.env['account.move'].create({
+            'move_type': move_type,
+            'partner_id': self.partner_a.id,
+            'date': date or '2023-01-01',
+            'invoice_date': date or '2023-01-01',
+            'journal_id': journal.id,
+            'invoice_line_ids': [
+                Command.create({
+                    'product_id': self.product_a.id,
+                    'quantity': 1,
+                    'account_id': account.id,
+                    'price_unit': price_unit,
+                    'deferred_start_date': start_date,
+                    'deferred_end_date': end_date,
+                }) for account, price_unit, start_date, end_date in invoice_lines
+            ]
+        })
+        if post:
+            move.action_post()
+        return move
+
+    def test_deferred_management_get_diff_dates(self):
+        def assert_get_diff_dates(start, end, expected):
+            diff = self.env['account.move']._get_deferred_diff_dates(fields.Date.to_date(start), fields.Date.to_date(end))
+            self.assertAlmostEqual(diff, expected, 3)
+
+        assert_get_diff_dates('2023-01-01', '2023-01-01', 0)
+        assert_get_diff_dates('2023-01-01', '2023-01-02', 1/30)
+        assert_get_diff_dates('2023-01-01', '2023-01-20', 19/30)
+        assert_get_diff_dates('2023-01-01', '2023-01-31', 29/30)
+        assert_get_diff_dates('2023-01-01', '2023-01-30', 29/30)
+        assert_get_diff_dates('2023-01-01', '2023-02-01', 1)
+        assert_get_diff_dates('2023-01-01', '2023-02-28', 1 + 29/30)
+        assert_get_diff_dates('2023-02-01', '2023-02-28', 29/30)
+        assert_get_diff_dates('2023-02-10', '2023-02-28', 20/30)
+        assert_get_diff_dates('2023-01-01', '2023-02-15', 1 + 14/30)
+        assert_get_diff_dates('2023-01-01', '2023-03-31', 2 + 29/30)
+        assert_get_diff_dates('2023-01-01', '2023-04-01', 3)
+        assert_get_diff_dates('2023-01-01', '2023-04-30', 3 + 29/30)
+        assert_get_diff_dates('2023-01-10', '2023-04-30', 3 + 20/30)
+        assert_get_diff_dates('2023-01-10', '2023-04-09', 2 + 29/30)
+        assert_get_diff_dates('2023-01-10', '2023-04-10', 3)
+        assert_get_diff_dates('2023-01-10', '2023-04-11', 3 + 1/30)
+        assert_get_diff_dates('2023-02-20', '2023-04-10', 1 + 20/30)
+        assert_get_diff_dates('2023-01-31', '2023-04-30', 3)
+        assert_get_diff_dates('2023-02-28', '2023-04-10', 1 + 10/30)
+        assert_get_diff_dates('2023-03-01', '2023-04-10', 1 + 9/30)
+        assert_get_diff_dates('2023-04-10', '2023-03-01', 1 + 9/30)
+        assert_get_diff_dates('2023-01-01', '2023-12-31', 11 + 29/30)
+        assert_get_diff_dates('2023-01-01', '2024-01-01', 12)
+        assert_get_diff_dates('2023-01-01', '2024-07-01', 18)
+        assert_get_diff_dates('2023-01-01', '2024-07-10', 18 + 9/30)
+
+    def test_get_ends_of_month(self):
+        def assertEndsOfMonths(start_date, end_date, expected):
+            self.assertEqual(
+                self.env['account.move.line']._get_deferred_ends_of_month(
+                    fields.Date.to_date(start_date),
+                    fields.Date.to_date(end_date)
+                ),
+                [fields.Date.to_date(date) for date in expected]
+            )
+
+        assertEndsOfMonths('2023-01-01', '2023-01-01', ['2023-01-31'])
+        assertEndsOfMonths('2023-01-01', '2023-01-02', ['2023-01-31'])
+        assertEndsOfMonths('2023-01-01', '2023-01-20', ['2023-01-31'])
+        assertEndsOfMonths('2023-01-01', '2023-01-30', ['2023-01-31'])
+        assertEndsOfMonths('2023-01-01', '2023-01-31', ['2023-01-31'])
+        assertEndsOfMonths('2023-01-01', '2023-02-01', ['2023-01-31', '2023-02-28'])
+        assertEndsOfMonths('2023-01-01', '2023-02-28', ['2023-01-31', '2023-02-28'])
+        assertEndsOfMonths('2023-02-01', '2023-02-28', ['2023-02-28'])
+        assertEndsOfMonths('2023-02-10', '2023-02-28', ['2023-02-28'])
+        assertEndsOfMonths('2023-01-01', '2023-02-15', ['2023-01-31', '2023-02-28'])
+        assertEndsOfMonths('2023-01-01', '2023-03-31', ['2023-01-31', '2023-02-28', '2023-03-31'])
+        assertEndsOfMonths('2023-01-01', '2023-04-01', ['2023-01-31', '2023-02-28', '2023-03-31', '2023-04-30'])
+        assertEndsOfMonths('2023-01-01', '2023-04-30', ['2023-01-31', '2023-02-28', '2023-03-31', '2023-04-30'])
+        assertEndsOfMonths('2023-01-10', '2023-04-30', ['2023-01-31', '2023-02-28', '2023-03-31', '2023-04-30'])
+        assertEndsOfMonths('2023-01-10', '2023-04-09', ['2023-01-31', '2023-02-28', '2023-03-31', '2023-04-30'])
+
+    def test_deferred_abnormal_dates(self):
+        """
+        Test that we correctly detect abnormal dates.
+        In the deferred computations, we always assume that both the start and end date are inclusive
+        E.g: 1st January -> 31st December is *exactly* 1 year = 12 months
+        However, the user may instead put 1st January -> 1st January of next year which is then
+        12 months + 1/30 month = 12.03 months which may result in odd amounts when deferrals are created.
+        This is what we call abnormal dates.
+        Other cases were the number of months is not round should not be handled and are not considered abnormal.
+        """
+        move = self.create_invoice('in_invoice', [
+            [self.expense_accounts[0], 0, '2023-01-01', '2023-12-30'],
+            [self.expense_accounts[0], 1, '2023-01-01', '2023-12-31'],
+            [self.expense_accounts[0], 2, '2023-01-01', '2024-01-01'],
+            [self.expense_accounts[0], 3, '2023-01-01', '2024-01-02'],
+            [self.expense_accounts[0], 4, '2023-01-01', '2024-01-31'],
+            [self.expense_accounts[0], 5, '2023-01-01', '2024-02-01'],
+            [self.expense_accounts[0], 6, '2023-01-02', '2024-02-01'],
+            [self.expense_accounts[0], 7, '2023-01-02', '2024-02-02'],
+            [self.expense_accounts[0], 8, '2023-01-31', '2024-01-30'],
+            [self.expense_accounts[0], 9, '2023-01-31', '2024-02-28'],  # 29 days in Feb 2024
+            # Following one is abnormal because we have a full months in February (= 30 accounting days) + 1 day in January
+            [self.expense_accounts[0], 10, '2023-01-31', '2024-02-29'],
+            [self.expense_accounts[0], 11, '2023-02-01', '2024-02-29'],
+        ], post=True)
+        lines = move.invoice_line_ids.sorted('price_unit')
+        self.assertFalse(lines[0].has_abnormal_deferred_dates)
+        self.assertFalse(lines[1].has_abnormal_deferred_dates)
+        self.assertTrue(lines[2].has_abnormal_deferred_dates)
+        self.assertFalse(lines[3].has_abnormal_deferred_dates)
+        self.assertFalse(lines[4].has_abnormal_deferred_dates)
+        self.assertTrue(lines[5].has_abnormal_deferred_dates)
+        self.assertFalse(lines[6].has_abnormal_deferred_dates)
+        self.assertTrue(lines[7].has_abnormal_deferred_dates)
+        self.assertFalse(lines[8].has_abnormal_deferred_dates)
+        self.assertFalse(lines[9].has_abnormal_deferred_dates)
+        self.assertTrue(lines[10].has_abnormal_deferred_dates)
+        self.assertFalse(lines[11].has_abnormal_deferred_dates)
+
+    def test_deferred_expense_generate_entries_method(self):
+        # The deferred entries are NOT generated when the invoice is validated if the method is set to 'manual'.
+        self.company.generate_deferred_expense_entries_method = 'manual'
+        move = self.create_invoice('in_invoice', [self.expense_lines[0]], post=True)
+        self.assertEqual(len(move.deferred_move_ids), 0)
+
+        move = self.create_invoice('in_refund', [self.expense_lines[0]], post=True)
+        self.assertEqual(len(move.deferred_move_ids), 0)
+
+        # Test that the deferred entries are generated when the invoice is validated.
+        self.company.generate_deferred_expense_entries_method = 'on_validation'
+        move = self.create_invoice('in_invoice', [self.expense_lines[0]], post=True)
+        self.assertEqual(len(move.deferred_move_ids), 5)  # 1 for the invoice deferred + 4 for the deferred entries
+
+        move = self.create_invoice('in_refund', [self.expense_lines[0]], post=True)
+        self.assertEqual(len(move.deferred_move_ids), 5)
+        # See test_deferred_expense_credit_note for the values
+
+    def test_deferred_expense_reset_to_draft(self):
+        """
+        Test that the deferred entries are deleted/reverted when the invoice is reset to draft.
+        """
+        move = self.create_invoice('in_invoice', [(self.expense_accounts[0], 1680, '2023-01-21', '2023-04-14')], date='2023-03-15')
+        self.assertEqual(len(move.deferred_move_ids), 5)
+        move.button_draft()
+        self.assertFalse(move.deferred_move_ids)
+
+        # With a lock date, we should reverse the moves that cannot be deleted
+        move.action_post()  # Post the move to create the deferred entries with 'on_validation' method
+        self.assertEqual(len(move.deferred_move_ids), 5)
+        move.company_id.fiscalyear_lock_date = fields.Date.to_date('2023-02-15')
+        move.button_draft()
+        # January deferred entry is in lock period, so it is reversed, not deleted, thus we have one deferred entry and its revert
+        self.assertEqual(len(move.deferred_move_ids), 2)
+        self.assertEqual(move.deferred_move_ids[0].date, fields.Date.to_date('2023-01-31'))
+        self.assertEqual(move.deferred_move_ids[1].date, fields.Date.to_date('2023-02-28'))
+
+        # If we repost the move, it should be allowed
+        move.action_post()
+        self.assertEqual(len(move.deferred_move_ids), 2 + 5)
+
+    @freeze_time('2023-03-15')
+    def test_deferred_invoice_reset_to_draft_with_audit_trail(self):
+        """
+        Test that the deferred entries in draft are deleted when the invoice is reset to draft
+        and the posted deferred entries are cancelled.
+        """
+        invoice = self.create_invoice('out_invoice', [(self.revenue_accounts[0], 1680, '2023-02-01', '2023-04-30')], date='2023-03-15')
+        posted_deferred_entries = invoice.deferred_move_ids.filtered(lambda move: move.state == 'posted')
+        draft_deferred_move_ids = invoice.deferred_move_ids.filtered(lambda move: move.state =="draft")
+        self.assertEqual(len(posted_deferred_entries), 2)
+        self.assertEqual(len(draft_deferred_move_ids), 2)
+
+        # Set the company's audit trail to True
+        self.env.company.check_account_audit_trail = True
+
+        invoice.button_draft()
+
+        # Assert that the draft moves no longer exist
+        remaining_draft_moves = self.env['account.move'].search([('id', 'in', draft_deferred_move_ids.ids)])
+        self.assertFalse(remaining_draft_moves)
+        # The posted deferred entries should be cancelled
+        self.assertEqual(len(posted_deferred_entries.filtered(lambda move: move.state == 'cancel')), 2)
+
+    def assert_invoice_lines(self, move, expected_values, source_account, deferred_account):
+        deferred_moves = move.deferred_move_ids.sorted('date')
+        for deferred_move, expected_value in zip(deferred_moves, expected_values):
+            expected_date, expense_line_debit, expense_line_credit, deferred_line_debit, deferred_line_credit = expected_value
+            self.assertRecordValues(deferred_move, [{
+                'state': 'posted',
+                'move_type': 'entry',
+                'partner_id': self.partner_a.id,
+                'date': fields.Date.to_date(expected_date),
+            }])
+            expense_line = deferred_move.line_ids.filtered(lambda line: line.account_id == source_account)
+            self.assertRecordValues(expense_line, [
+                {'debit': expense_line_debit, 'credit': expense_line_credit, 'partner_id': self.partner_a.id},
+            ])
+            deferred_line = deferred_move.line_ids.filtered(lambda line: line.account_id == deferred_account)
+            self.assertEqual(deferred_line.debit, deferred_line_debit)
+            self.assertEqual(deferred_line.credit, deferred_line_credit)
+
+    def test_default_tax_on_account_not_on_deferred_entries(self):
+        """
+        Test that the default taxes on an account are not calculated on deferral entries, since this would impact the
+        tax report.
+        """
+        revenue_account_with_taxes = self.env['account.account'].create({
+            'name': 'Revenue with Taxes',
+            'code': 'REVWTAXES',
+            'account_type': 'income',
+            'tax_ids': [Command.set(self.tax_sale_a.ids)]
+        })
+
+        move = self.create_invoice(
+            'out_invoice',
+            [[revenue_account_with_taxes, 1000, '2023-01-01', '2023-04-30']],
+            date='2022-12-10'
+        )
+
+        expected_line_values = [
+            # Date         [Line expense] [Line deferred]
+            ('2022-12-10',  1000,      0,      0,   1000),
+            ('2023-01-31',     0,    250,    250,      0),
+            ('2023-02-28',     0,    250,    250,      0),
+            ('2023-03-31',     0,    250,    250,      0),
+        ]
+
+        self.assert_invoice_lines(
+            move,
+            expected_line_values,
+            revenue_account_with_taxes,
+            self.company_data['default_account_deferred_revenue']
+        )
+
+        for deferred_move in move.deferred_move_ids:
+            # There are no extra lines besides the two lines we checked before
+            self.assertEqual(len(deferred_move.line_ids), 2)
+
+
+    def test_deferred_values(self):
+        """
+        Test that the debit/credit values are correctly computed, even after a credit note is issued.
+        """
+
+        expected_line_values1 = [
+            # Date         [Line expense] [Line deferred]
+            ('2022-12-10',     0,   1000,    1000,     0),
+            ('2023-01-31',   250,      0,       0,   250),
+            ('2023-02-28',   250,      0,       0,   250),
+            ('2023-03-31',   250,      0,       0,   250),
+        ]
+        expected_line_values2 = [
+            # Date         [Line expense] [Line deferred]
+            ('2022-12-10',  1000,      0,      0,   1000),
+            ('2023-01-31',     0,    250,    250,      0),
+            ('2023-02-28',     0,    250,    250,      0),
+            ('2023-03-31',     0,    250,    250,      0),
+        ]
+
+        # Vendor bill and credit note
+        move = self.create_invoice('in_invoice', [self.expense_lines[0]], post=True, date='2022-12-10')
+        self.assert_invoice_lines(move, expected_line_values1, self.expense_accounts[0], self.company_data['default_account_deferred_expense'])
+        reverse_move = move._reverse_moves()
+        self.assert_invoice_lines(reverse_move, expected_line_values2, self.expense_accounts[0], self.company_data['default_account_deferred_expense'])
+
+        # Customer invoice and credit note
+        move2 = self.create_invoice('out_invoice', [self.revenue_lines[0]], post=True, date='2022-12-10')
+        self.assert_invoice_lines(move2, expected_line_values2, self.revenue_accounts[0], self.company_data['default_account_deferred_revenue'])
+        reverse_move2 = move2._reverse_moves()
+        self.assert_invoice_lines(reverse_move2, expected_line_values1, self.revenue_accounts[0], self.company_data['default_account_deferred_revenue'])
+
+    def test_deferred_values_rounding(self):
+        """
+        Test that the debit/credit values are correctly computed when values are rounded
+        """
+
+        # Vendor Bill
+        expense_line = [self.expense_accounts[0], 500, '2020-08-07', '2020-12-07']
+        expected_line_values = [
+            # Date         [Line expense] [Line deferred]
+            ('2020-08-07',      0, 500,   500,      0),
+            ('2020-08-31',  99.17,   0,     0,  99.17),
+            ('2020-09-30', 123.97,   0,     0, 123.97),
+            ('2020-10-31', 123.97,   0,     0, 123.97),
+            ('2020-11-30', 123.97,   0,     0, 123.97),
+            ('2020-12-07',  28.92,   0,     0,  28.92),
+        ]
+        self.assertEqual(self.company.currency_id.round(sum(x[1] for x in expected_line_values)), 500)
+        move = self.create_invoice('in_invoice', [expense_line], date='2020-08-07')
+        self.assert_invoice_lines(move, expected_line_values, self.expense_accounts[0], self.company_data['default_account_deferred_expense'])
+
+        # Customer invoice
+        revenue_line = [self.revenue_accounts[0], 500, '2020-08-07', '2020-12-07']
+        expected_line_values = [
+            # Date         [Line expense] [Line deferred]
+            ('2020-08-07', 500,      0,      0,       500),
+            ('2020-08-31',   0,  99.17,  99.17,         0),
+            ('2020-09-30',   0, 123.97, 123.97,         0),
+            ('2020-10-31',   0, 123.97, 123.97,         0),
+            ('2020-11-30',   0, 123.97, 123.97,         0),
+            ('2020-12-07',   0,  28.92,  28.92,         0),
+        ]
+        self.assertEqual(self.company.currency_id.round(sum(x[2] for x in expected_line_values)), 500)
+        move = self.create_invoice('out_invoice', [revenue_line], post=True, date='2020-08-07')
+        self.assert_invoice_lines(move, expected_line_values, self.revenue_accounts[0], self.company_data['default_account_deferred_revenue'])
+
+    def test_deferred_expense_avoid_useless_deferred_entries(self):
+        """
+        If we have an invoice with a start date in the beginning of the month, and an end date in the end of the month,
+        we should not create the deferred entries because the original invoice will be totally deferred
+        on the last day of the month, but the full amount will be accounted for on the same day too, thus
+        cancelling each other. Therefore we should not create the deferred entries. This is only the case
+        if the invoice date is also inside the deferred period.
+        """
+        move = self.create_invoice('in_invoice', [(self.expense_accounts[0], 1680, '2023-01-01', '2023-01-31')], date='2023-01-01')
+        self.assertEqual(len(move.deferred_move_ids), 0)
+        move = self.create_invoice('in_invoice', [(self.expense_accounts[0], 1680, '2023-01-01', '2023-01-31')], date='2022-01-01')
+        self.assertEqual(len(move.deferred_move_ids), 2)
+
+    def test_deferred_expense_single_period_entries(self):
+        """
+        If we have an invoice covering only one period, we should only avoid creating deferral entries when the
+        accounting date is the same as the period for the deferral. Otherwise we should still generate a deferral entry.
+        """
+        self.company.deferred_expense_amount_computation_method = 'month'
+        move = self.create_invoice('in_invoice', [(self.expense_accounts[0], 1680, '2023-02-01', '2023-02-28')])
+        self.assertRecordValues(move.deferred_move_ids, [
+            {'date': fields.Date.to_date('2023-01-01')},
+            {'date': fields.Date.to_date('2023-02-28')},
+        ])
+
+    def test_taxes_deferred_after_date_added(self):
+        """
+        Test that applicable taxes get deferred also when the dates of the base line are filled in after a first save.
+        """
+
+        expected_line_values = [
+            # Date         [Line expense] [Line deferred]
+            ('2022-12-10',     0,    100,     100,     0),
+            ('2022-12-10',     0,   1000,    1000,     0),
+            ('2023-01-31',    25,      0,       0,    25),
+            ('2023-01-31',   250,      0,       0,   250),
+            ('2023-02-28',    25,      0,       0,    25),
+            ('2023-02-28',   250,      0,       0,   250),
+            ('2023-03-31',    25,      0,       0,    25),
+            ('2023-03-31',   250,      0,       0,   250),
+        ]
+
+        partially_deductible_tax = self.env['account.tax'].create({
+            'name': 'Partially deductible Tax',
+            'amount': 20,
+            'amount_type': 'percent',
+            'type_tax_use': 'purchase',
+            'invoice_repartition_line_ids': [
+                Command.create({'repartition_type': 'base'}),
+                Command.create({
+                    'factor_percent': 50,
+                    'repartition_type': 'tax',
+                    'use_in_tax_closing': False
+                }),
+                Command.create({
+                    'factor_percent': 50,
+                    'repartition_type': 'tax',
+                    'account_id': self.company_data['default_account_tax_purchase'].id,
+                    'use_in_tax_closing': True
+                }),
+            ],
+            'refund_repartition_line_ids': [
+                Command.create({'repartition_type': 'base'}),
+                Command.create({
+                    'factor_percent': 50,
+                    'repartition_type': 'tax',
+                    'use_in_tax_closing': False
+                }),
+                Command.create({
+                    'factor_percent': 50,
+                    'repartition_type': 'tax',
+                    'account_id': self.company_data['default_account_tax_purchase'].id,
+                    'use_in_tax_closing': True
+                }),
+            ],
+        })
+
+        move = self.env['account.move'].create({
+            'move_type': 'in_invoice',
+            'partner_id': self.partner_a.id,
+            'date': '2022-12-10',
+            'invoice_date': '2022-12-10',
+            'journal_id': self.company_data['default_journal_purchase'].id,
+            'invoice_line_ids': [
+                Command.create({
+                    'quantity': 1,
+                    'account_id': self.expense_lines[0][0].id,
+                    'price_unit': self.expense_lines[0][1],
+                    'tax_ids': [Command.set(partially_deductible_tax.ids)],
+                })
+            ]
+        })
+
+        move.invoice_line_ids.write({
+            'deferred_start_date': self.expense_lines[0][2],
+            'deferred_end_date': self.expense_lines[0][3],
+        })
+
+        move.action_post()
+
+        self.assert_invoice_lines(move, expected_line_values, self.expense_accounts[0], self.company_data['default_account_deferred_expense'])
+
+    def test_deferred_tax_key(self):
+        """
+        Test that the deferred tax key is correctly computed.
+        and is the same between _compute_tax_key and _compute_all_tax
+        """
+        lines = [
+            [self.expense_accounts[0], 1000, '2023-01-01', '2023-04-30'],
+            [self.expense_accounts[0], 1000, False, False],
+        ]
+        move = self.create_invoice('in_invoice', lines, post=True)
+        original_amount_total = move.amount_total
+        self.assertEqual(len(move.line_ids.filtered(lambda l: l.display_type == 'tax')), 1)
+        move.button_draft()
+        move.action_post()
+        # The number of tax lines shouldn't change, nor the total amount
+        self.assertEqual(len(move.line_ids.filtered(lambda l: l.display_type == 'tax')), 1)
+        self.assertEqual(move.amount_total, original_amount_total)
+
+    def test_compute_empty_start_date(self):
+        """
+        Test that the deferred start date is computed when empty and posting the move.
+        """
+        lines = [[self.expense_accounts[0], 1000, False, '2023-04-30']]
+        move = self.create_invoice('in_invoice', lines, post=False)
+
+        # We don't have a deferred date in the beginning
+        self.assertFalse(move.line_ids[0].deferred_start_date)
+
+        move.action_post()
+        # Deferred start date is set after post
+        self.assertEqual(move.line_ids[0].deferred_start_date, datetime.date(2023, 1, 1))
+
+        move.button_draft()
+        move.line_ids[0].deferred_start_date = False
+        move.invoice_date = '2023-02-01'
+        # Start date is set when changing invoice date
+        self.assertEqual(move.line_ids[0].deferred_start_date, datetime.date(2023, 2, 1))
+
+        move.line_ids[0].deferred_start_date = False
+        move.line_ids[0].deferred_end_date = '2023-05-31'
+        # Start date is set when changing deferred end date
+        self.assertEqual(move.line_ids[0].deferred_start_date, datetime.date(2023, 2, 1))
+
+    def test_deferred_on_accounting_date(self):
+        """
+        When we are in `on_validation` mode, the deferral of the total amount should happen on the
+        accounting date of the move.
+        """
+        move = self.create_invoice(
+            'in_invoice',
+            [(self.expense_accounts[0], 1680, '2023-01-01', '2023-02-28')],
+            date='2023-01-10',
+            post=False
+        )
+        move.date = '2023-01-15'
+        move.action_post()
+        self.assertRecordValues(move.deferred_move_ids, [
+            {'date': fields.Date.to_date('2023-01-15')},
+            {'date': fields.Date.to_date('2023-01-31')},
+            {'date': fields.Date.to_date('2023-02-28')},
+        ])
+
+    def test_deferred_entries_not_created_on_future_invoice(self):
+        """Test that we don't create deferred entries on a future posted invoice"""
+        tomorrow = fields.Date.to_date(fields.Date.today()) + datetime.timedelta(days=1)
+        move = self.create_invoice(
+            'out_invoice',
+            [(self.expense_accounts[0], 1680, tomorrow, tomorrow + datetime.timedelta(days=100))],
+            date=tomorrow,
+            post=False
+        )
+        move.auto_post = "at_date"
+        move._post()
+        self.assertFalse(move.deferred_move_ids)
+
+        with freeze_time(tomorrow):
+            self.env.ref('account.ir_cron_auto_post_draft_entry').method_direct_trigger()
+            self.assertEqual(move.state, 'posted')
+            self.assertTrue(move.deferred_move_ids)
+
+    def test_deferred_entries_created_on_auto_post_invoice(self):
+        """Test that deferred entries are created on an invoice with auto_post set to 'at_date'"""
+        yesterday = fields.Date.to_date(fields.Date.today()) - datetime.timedelta(days=1)
+        move = self.create_invoice(
+            'out_invoice',
+            [(self.expense_accounts[0], 1680, yesterday, yesterday + datetime.timedelta(days=45))],
+            date=yesterday,
+            post=False
+        )
+        move.auto_post = "at_date"
+        move._post()
+        self.assertEqual(move.state, 'posted')
+        self.assertTrue(move.deferred_move_ids)
+
+    def test_deferred_compute_method_full_months(self):
+        """
+        Test that the deferred amount is correctly computed when the new full_months method computation is used
+        """
+        self.company.deferred_expense_amount_computation_method = 'full_months'
+
+        dates = (('2024-06-05', '2025-06-04'), ('2024-06-30', '2025-06-29'))
+        for (date_from, date_to) in dates:
+            move = self.create_invoice('in_invoice', [(self.expense_accounts[0], 12000, date_from, date_to)], date='2024-06-05')
+            self.assertRecordValues(move.deferred_move_ids.sorted('date'), [
+                {'date': fields.Date.to_date('2024-06-05'), 'amount_total': 12000},
+                {'date': fields.Date.to_date('2024-06-30'), 'amount_total': 1000},
+                {'date': fields.Date.to_date('2024-07-31'), 'amount_total': 1000},
+                {'date': fields.Date.to_date('2024-08-31'), 'amount_total': 1000},
+                {'date': fields.Date.to_date('2024-09-30'), 'amount_total': 1000},
+                {'date': fields.Date.to_date('2024-10-31'), 'amount_total': 1000},
+                {'date': fields.Date.to_date('2024-11-30'), 'amount_total': 1000},
+                {'date': fields.Date.to_date('2024-12-31'), 'amount_total': 1000},
+                {'date': fields.Date.to_date('2025-01-31'), 'amount_total': 1000},
+                {'date': fields.Date.to_date('2025-02-28'), 'amount_total': 1000},
+                {'date': fields.Date.to_date('2025-03-31'), 'amount_total': 1000},
+                {'date': fields.Date.to_date('2025-04-30'), 'amount_total': 1000},
+                {'date': fields.Date.to_date('2025-05-31'), 'amount_total': 1000},
+                # 0 for June 2025, so no move created
+            ])
+
+        # Start of month <=> Equal per month method
+        move = self.create_invoice('in_invoice', [(self.expense_accounts[0], 12000, '2024-07-01', '2025-06-30')], date='2024-07-01')
+        self.assertRecordValues(move.deferred_move_ids.sorted(lambda m: (m.date, m.amount_total)), [
+            {'date': fields.Date.to_date('2024-07-01'), 'amount_total': 12000},
+            {'date': fields.Date.to_date('2024-07-31'), 'amount_total': 1000},
+            {'date': fields.Date.to_date('2024-08-31'), 'amount_total': 1000},
+            {'date': fields.Date.to_date('2024-09-30'), 'amount_total': 1000},
+            {'date': fields.Date.to_date('2024-10-31'), 'amount_total': 1000},
+            {'date': fields.Date.to_date('2024-11-30'), 'amount_total': 1000},
+            {'date': fields.Date.to_date('2024-12-31'), 'amount_total': 1000},
+            {'date': fields.Date.to_date('2025-01-31'), 'amount_total': 1000},
+            {'date': fields.Date.to_date('2025-02-28'), 'amount_total': 1000},
+            {'date': fields.Date.to_date('2025-03-31'), 'amount_total': 1000},
+            {'date': fields.Date.to_date('2025-04-30'), 'amount_total': 1000},
+            {'date': fields.Date.to_date('2025-05-31'), 'amount_total': 1000},
+            {'date': fields.Date.to_date('2025-06-30'), 'amount_total': 1000},
+        ])
+
+        # Nothing to defer, everything is in the same month
+        move = self.create_invoice('in_invoice', [(self.expense_accounts[0], 12000, '2024-01-01', '2024-01-16')], date='2024-01-01')
+        self.assertFalse(move.deferred_move_ids)
+
+        # Round period of 2 months -> Divide by 2
+        move = self.create_invoice('in_invoice', [(self.expense_accounts[0], 12000, '2024-01-01', '2024-02-29')], date='2024-01-01')
+        self.assertRecordValues(move.deferred_move_ids.sorted(lambda m: (m.date, m.amount_total)), [
+            {'date': fields.Date.to_date('2024-01-01'), 'amount_total': 12000},
+            {'date': fields.Date.to_date('2024-01-31'), 'amount_total': 6000},
+            {'date': fields.Date.to_date('2024-02-29'), 'amount_total': 6000},
+        ])
+
+        # Round period of 2 months -> Divide by 2
+        move = self.create_invoice('in_invoice', [(self.expense_accounts[0], 12000, '2024-01-15', '2024-03-14')], date='2024-01-01')
+        self.assertRecordValues(move.deferred_move_ids.sorted(lambda m: (m.date, m.amount_total)), [
+            {'date': fields.Date.to_date('2024-01-01'), 'amount_total': 12000},
+            {'date': fields.Date.to_date('2024-01-31'), 'amount_total': 6000},
+            {'date': fields.Date.to_date('2024-02-29'), 'amount_total': 6000},
+        ])
+
+        # Period of exactly one month: full amount should be in Jan. So we revert 1st Jan, and account for 31st Jan <=> don't generate anything
+        move = self.create_invoice('in_invoice', [(self.expense_accounts[0], 12000, '2024-01-15', '2024-02-14')], date='2024-01-01')
+        self.assertFalse(move.deferred_move_ids)
+
+        # Not-round period of 1.5 month with only one end of month in January (same explanation as above)
+        move = self.create_invoice('in_invoice', [(self.expense_accounts[0], 12000, '2024-01-01', '2024-02-15')], date='2024-01-01')
+        self.assertFalse(move.deferred_move_ids)
+
+        # Not-round period of 1.5+ month with only one end of month in January (same explanation as above)
+        move = self.create_invoice('in_invoice', [(self.expense_accounts[0], 12000, '2024-01-05', '2024-02-15')], date='2024-01-01')
+        self.assertFalse(move.deferred_move_ids)
+
+        # Period of exactly one month: full amount should be in Feb. So we revert 1st Jan, and account for all on 29th Feb.
+        # Deferrals are in different months for this case, so we should the deferrals should be generated.
+        move = self.create_invoice('in_invoice', [(self.expense_accounts[0], 12000, '2024-02-15', '2024-03-14')], date='2024-01-01')
+        self.assertRecordValues(move.deferred_move_ids.sorted(lambda m: (m.date, m.amount_total)), [
+            {'date': fields.Date.to_date('2024-01-01'), 'amount_total': 12000},
+            {'date': fields.Date.to_date('2024-02-29'), 'amount_total': 12000},
+        ])
+
+        # Not-round period of 1.5+ month: full amount should be in Feb. So we revert 1st Jan, and account for all on 29th Feb.
+        # Deferrals are in different months for this case, so we should the deferrals should be generated.
+        move = self.create_invoice('in_invoice', [(self.expense_accounts[0], 12000, '2024-02-05', '2024-03-15')], date='2024-01-01')
+        self.assertRecordValues(move.deferred_move_ids.sorted(lambda m: (m.date, m.amount_total)), [
+            {'date': fields.Date.to_date('2024-01-01'), 'amount_total': 12000},
+            {'date': fields.Date.to_date('2024-02-29'), 'amount_total': 12000},
+        ])
+
+        # Not-round period of 1.5 month with 2 ends of months, so divide balance by 2
+        move = self.create_invoice('in_invoice', [(self.expense_accounts[0], 12000, '2024-01-16', '2024-02-29')], date='2024-01-01')
+        self.assertRecordValues(move.deferred_move_ids.sorted(lambda m: (m.date, m.amount_total)), [
+            {'date': fields.Date.to_date('2024-01-01'), 'amount_total': 12000},
+            {'date': fields.Date.to_date('2024-01-31'), 'amount_total': 6000},
+            {'date': fields.Date.to_date('2024-02-29'), 'amount_total': 6000},
+        ])
+
+        # Not-round period of 2.5 month, with 3 ends of months, so divide balance by 3
+        move = self.create_invoice('in_invoice', [(self.expense_accounts[0], 12000, '2024-01-16', '2024-03-31')], date='2024-01-01')
+        self.assertRecordValues(move.deferred_move_ids.sorted(lambda m: (m.date, m.amount_total)), [
+            {'date': fields.Date.to_date('2024-01-01'), 'amount_total': 12000},
+            {'date': fields.Date.to_date('2024-01-31'), 'amount_total': 4000},
+            {'date': fields.Date.to_date('2024-02-29'), 'amount_total': 4000},
+            {'date': fields.Date.to_date('2024-03-31'), 'amount_total': 4000},
+        ])
+
+    def test_deferral_moves_not_removed(self):
+        """
+        Test that when there are multiple amls with the same price on the original invoice the deferral_moves are not removed
+        """
+        move = self.create_invoice('in_invoice', [
+            (self.expense_accounts[0], 1000, '2025-05-10', '2025-05-25'),
+            (self.expense_accounts[0], 1000, '2025-05-10', '2025-05-25')
+        ], date='2025-04-11')
+        self.assertEqual(len(move.deferred_move_ids), 4)
+
+    def test_case_1_deferred_entries_computations_period_across_months(self):
+        """
+        Tests deferred expense recognition when the invoice is dated in a month
+        after the service period has already begun.
+        Corresponds to Case from Row 6 of the user's image.
+
+        - Service Period: June 25, 2024 -> July 7, 2024 (13 days)
+        - Invoice Date: July 1, 2024
+        - Expected: The system should correctly create a back-dated expense entry for
+          the 6 days in June (dated June 30) and an entry for the 7 days in July
+          (dated July 7).
+        """
+        invoice_date = '2024-07-01'
+        invoice_line_data = [self.expense_accounts[0], 1300, '2024-06-25', '2024-07-07']
+
+        expected_line_values = [
+            ('2024-06-30',       600,     0,      0,      600),
+            (invoice_date,         0,  1300,   1300,        0),
+            ('2024-07-07',       700,     0,      0,      700),
+        ]
+
+        move = self.create_invoice(
+            'in_invoice', [invoice_line_data], date=invoice_date
+        )
+
+        self.assert_invoice_lines(
+            move,
+            expected_line_values,
+            self.expense_accounts[0],
+            self.company_data['default_account_deferred_expense']
+        )
+
+    def test_case_2_deferred_entries_computations_period_across_months(self):
+        """
+           Tests deferred expense recognition when the invoice is dated within the
+           service period, which spans across two months.
+           Corresponds to Case from Row 7 of the user's image.
+
+           - Service Period: June 25, 2024 -> July 7, 2024 (13 days)
+           - Invoice Date: June 29, 2024
+           - Expected: The system should correctly prorate the expense with 6 days
+             in June and 7 days in July.
+        """
+        invoice_date = '2024-06-29'
+        invoice_line_data = [self.expense_accounts[0], 1300, '2024-06-25', '2024-07-07']
+
+        expected_line_values = [
+            (invoice_date,         0,  1300,   1300,        0),
+            ('2024-06-30',       600,     0,      0,      600),
+            ('2024-07-07',       700,     0,      0,     700),
+        ]
+
+        move = self.create_invoice(
+            'in_invoice', [invoice_line_data], date=invoice_date
+        )
+
+        self.assert_invoice_lines(
+            move,
+            expected_line_values,
+            self.expense_accounts[0],
+            self.company_data['default_account_deferred_expense']
+        )
+
+    def test_case_3_deferred_entries_computations_period_across_months(self):
+        """
+        Tests deferred expense recognition for a longer service period that spans
+        across two months, with the invoice dated within the first month.
+        Corresponds to Case from Row 8 in the user's image.
+
+        - Service Period: June 25, 2024 -> July 23, 2024 (29 days)
+        - Invoice Date: June 29, 2024
+        - Expected: The system should correctly split the expense between June
+          (6/29 of total) and July (23/29 of total).
+        """
+        invoice_date = '2024-06-29'
+        # Using 2900 for the amount to keep the numbers clean
+        invoice_line_data = [self.expense_accounts[0], 2900, '2024-06-25', '2024-07-23']
+
+        expected_line_values = [
+            (invoice_date,         0,  2900,   2900,        0),
+            ('2024-06-30',       600,     0,      0,      600),
+            ('2024-07-23',      2300,     0,      0,     2300),
+        ]
+
+        move = self.create_invoice(
+            'in_invoice', [invoice_line_data], date=invoice_date
+        )
+
+        self.assert_invoice_lines(
+            move,
+            expected_line_values,
+            self.expense_accounts[0],
+            self.company_data['default_account_deferred_expense']
+        )
+
+    def test_deferred_moves_from_same_move_different_lines(self):
+        """
+        Test that fully deferred move and deferral move from different lines are not cancelling each other
+        when having the same amount.
+        """
+        move = self.create_invoice('in_invoice', [(self.expense_accounts[0], amount, '2025-10-01', '2025-11-30') for amount in (1000, 500)], date='2025-11-30')
+        self.assertRecordValues(move.deferred_move_ids.sorted('date'), [
+            {'date': fields.Date.to_date('2025-10-31'), 'amount_total': 500},
+            {'date': fields.Date.to_date('2025-10-31'), 'amount_total': 250},
+            {'date': fields.Date.to_date('2025-11-30'), 'amount_total': 1000},
+            {'date': fields.Date.to_date('2025-11-30'), 'amount_total': 500},
+            {'date': fields.Date.to_date('2025-11-30'), 'amount_total': 500},
+            {'date': fields.Date.to_date('2025-11-30'), 'amount_total': 250},
+        ])
diff --git a/dev_odex30_accounting/odex30_account_accountant/tests/test_prediction.py b/dev_odex30_accounting/odex30_account_accountant/tests/test_prediction.py
new file mode 100644
index 0000000..84cdf5b
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_accountant/tests/test_prediction.py
@@ -0,0 +1,203 @@
+# -*- encoding: utf-8 -*-
+
+from odoo.addons.account.tests.common import AccountTestInvoicingCommon
+from odoo import fields, Command
+from odoo.tests import Form, tagged
+
+
+@tagged('post_install', '-at_install')
+class TestBillsPrediction(AccountTestInvoicingCommon):
+
+    @classmethod
+    def setUpClass(cls):
+        super().setUpClass()
+
+        cls.company.predict_bill_product = True
+
+        cls.test_partners = cls.env['res.partner'].create([{'name': 'test partner %s' % i} for i in range(7)])
+
+        accounts_data = [{
+            'code': 'test%s' % i,
+            'name': name,
+            'account_type': 'expense',
+        } for i, name in enumerate((
+            "Test Maintenance and Repair",
+            "Test Purchase of services, studies and preparatory work",
+            "Test Various Contributions",
+            "Test Rental Charges",
+            "Test Purchase of commodity",
+        ))]
+
+        cls.test_accounts = cls.env['account.account'].create(accounts_data)
+
+        cls.frozen_today = fields.Date.today()
+
+    def _create_bill(self, vendor, line_name, expected_account, account_to_set=None, post=True):
+        ''' Create a new vendor bill to test the prediction.
+        :param vendor:              The vendor to set on the invoice.
+        :param line_name:           The name of the invoice line that will be used to predict.
+        :param expected_account:    The expected predicted account.
+        :param account_to_set:      The optional account to set as a correction of the predicted account.
+        :return:                    The newly created vendor bill.
+        '''
+        invoice_form = Form(self.env['account.move'].with_context(default_move_type='in_invoice'))
+        invoice_form.partner_id = vendor
+        invoice_form.invoice_date = self.frozen_today
+        with invoice_form.invoice_line_ids.new() as invoice_line_form:
+            # Set the default account to avoid "account_id is a required field" in case of bad configuration.
+            invoice_line_form.account_id = self.company_data['default_journal_purchase'].default_account_id
+
+            invoice_line_form.quantity = 1.0
+            invoice_line_form.price_unit = 42.0
+            invoice_line_form.name = line_name
+        invoice = invoice_form.save()
+        invoice_line = invoice.invoice_line_ids
+
+        self.assertEqual(
+            invoice_line.account_id,
+            expected_account,
+            "Account '%s' should have been predicted instead of '%s'" % (
+                expected_account.display_name,
+                invoice_line.account_id.display_name,
+            ),
+        )
+
+        if account_to_set:
+            invoice_line.account_id = account_to_set
+
+        if post:
+            invoice.action_post()
+        return invoice
+
+    def test_account_prediction_flow(self):
+        default_account = self.company_data['default_journal_purchase'].default_account_id
+        self._create_bill(self.test_partners[0], "Maintenance and repair", self.test_accounts[0])
+        self._create_bill(self.test_partners[5], "Subsidies obtained", default_account, account_to_set=self.test_accounts[1])
+        self._create_bill(self.test_partners[6], "Prepare subsidies file", default_account, account_to_set=self.test_accounts[1])
+        self._create_bill(self.test_partners[6], "Prepare subsidies file", self.test_accounts[1])
+        self._create_bill(self.test_partners[1], "Contributions January", self.test_accounts[2])
+        self._create_bill(self.test_partners[2], "Coca-cola", default_account, account_to_set=self.test_accounts[4])
+        self._create_bill(self.test_partners[1], "Contribution February", self.test_accounts[2])
+        self._create_bill(self.test_partners[3], "Electricity Bruxelles", default_account, account_to_set=self.test_accounts[3])
+        self._create_bill(self.test_partners[3], "Electricity Grand-Rosière", self.test_accounts[3])
+        self._create_bill(self.test_partners[2], "Purchase of coca-cola", self.test_accounts[4])
+        self._create_bill(self.test_partners[4], "Crate of coca-cola", default_account, account_to_set=self.test_accounts[4])
+        self._create_bill(self.test_partners[4], "Crate of coca-cola", self.test_accounts[4])
+        self._create_bill(self.test_partners[1], "March", self.test_accounts[2])
+
+    def test_account_prediction_from_label_expected_behavior(self):
+        """Prevent the prediction from being annoying."""
+        default_account = self.company_data['default_journal_purchase'].default_account_id
+        payable_account = self.company_data['default_account_payable'].copy()
+        payable_account.write({'name': f'Account payable - {self.test_accounts[0].name}'})
+
+        # There is no prior result, we take the default account, but we don't post
+        self._create_bill(self.test_partners[0], self.test_partners[0].name, default_account, post=False)
+
+        # There is no prior result, we take the default account
+        self._create_bill(self.test_partners[0], "Drinks", default_account, account_to_set=self.test_accounts[0])
+
+        # There is only one prior account for the partner, we take that one
+        self._create_bill(self.test_partners[0], "Desert", self.test_accounts[0], account_to_set=self.test_accounts[1])
+
+        # We find something close enough, take that one
+        self._create_bill(self.test_partners[0], "Drinks too", self.test_accounts[0])
+
+        # There is no clear preference for any account (both previous accounts have the same rank)
+        # don't make any prediction and let the default behavior fill the account
+        invoice = self._create_bill(self.test_partners[0], "Main course", default_account)
+        invoice.button_draft()
+
+        with Form(invoice) as move_form:
+            with move_form.invoice_line_ids.edit(0) as line_form:
+                # There isn't any account clearly better than the manually set one, we keep the current one
+                line_form.account_id = self.test_accounts[2]
+                line_form.name = "Apple"
+                self.assertEqual(line_form.account_id, self.test_accounts[2])
+
+                # There is an account that looks clearly better, use it
+                line_form.name = "Second desert"
+                self.assertEqual(line_form.account_id, self.test_accounts[1])
+
+    def test_account_prediction_with_product(self):
+        product = self.env['product.product'].create({
+            'name': 'product_a',
+            'lst_price': 1000.0,
+            'standard_price': 800.0,
+            'property_account_income_id': self.company_data['default_account_revenue'].id,
+            'property_account_expense_id': self.company_data['default_account_expense'].id,
+        })
+
+        invoice_form = Form(self.env['account.move'].with_context(default_move_type='in_invoice'))
+        invoice_form.partner_id = self.test_partners[0]
+        invoice_form.invoice_date = self.frozen_today
+        with invoice_form.invoice_line_ids.new() as invoice_line_form:
+            invoice_line_form.product_id = product
+            invoice_line_form.name = "Maintenance and repair"
+        invoice = invoice_form.save()
+
+        self.assertRecordValues(invoice.invoice_line_ids, [{
+            'name': "Maintenance and repair",
+            'product_id': product.id,
+            'account_id': self.company_data['default_account_expense'].id,
+        }])
+
+    def test_product_prediction_price_subtotal_computation(self):
+        invoice_form = Form(self.env['account.move'].with_context(default_move_type='in_invoice'))
+        invoice_form.partner_id = self.test_partners[0]
+        invoice_form.invoice_date = self.frozen_today
+        with invoice_form.invoice_line_ids.new() as invoice_line_form:
+            invoice_line_form.product_id = self.product_a
+        invoice = invoice_form.save()
+        invoice.action_post()
+
+        self.product_a.supplier_taxes_id = [Command.set(self.tax_purchase_b.ids)]
+
+        invoice_form = Form(self.env['account.move'].with_context(default_move_type='in_invoice'))
+        invoice_form.partner_id = self.test_partners[0]
+        invoice_form.invoice_date = self.frozen_today
+        with invoice_form.invoice_line_ids.new() as invoice_line_form:
+            invoice_line_form.name = 'product_a'
+        invoice = invoice_form.save()
+
+        self.assertRecordValues(invoice.invoice_line_ids, [{
+            'quantity': 1.0,
+            'price_unit': 800.0,
+            'price_subtotal': 800.0,
+            'balance': 800.0,
+            'tax_ids': self.tax_purchase_b.ids,
+        }])
+
+        # In case a unit price is already set we do not update the unit price
+        invoice_form = Form(self.env['account.move'].with_context(default_move_type='in_invoice'))
+        invoice_form.partner_id = self.test_partners[0]
+        invoice_form.invoice_date = self.frozen_today
+        with invoice_form.invoice_line_ids.new() as invoice_line_form:
+            invoice_line_form.price_unit = 42.0
+            invoice_line_form.name = 'product_a'
+        invoice = invoice_form.save()
+
+        self.assertRecordValues(invoice.invoice_line_ids, [{
+            'quantity': 1.0,
+            'price_unit': 42.0,
+            'price_subtotal': 42.0,
+            'balance': 42.0,
+            'tax_ids': self.tax_purchase_b.ids,
+        }])
+
+        # In case a tax is already set we do not update the taxes
+        invoice_form = Form(self.env['account.move'].with_context(default_move_type='in_invoice'))
+        invoice_form.partner_id = self.test_partners[0]
+        invoice_form.invoice_date = self.frozen_today
+        with invoice_form.invoice_line_ids.new() as invoice_line_form:
+            invoice_line_form.tax_ids = self.tax_purchase_a
+            invoice_line_form.name = 'product_a'
+        invoice = invoice_form.save()
+
+        self.assertRecordValues(invoice.invoice_line_ids, [{
+            'quantity': 1.0,
+            'price_unit': 800.0,
+            'price_subtotal': 800.0,
+            'balance': 800.0,
+            'tax_ids': self.tax_purchase_a.ids,
+        }])
diff --git a/dev_odex30_accounting/odex30_account_accountant/tests/test_reconciliation_matching_rules.py b/dev_odex30_accounting/odex30_account_accountant/tests/test_reconciliation_matching_rules.py
new file mode 100644
index 0000000..4fb5a0b
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_accountant/tests/test_reconciliation_matching_rules.py
@@ -0,0 +1,1351 @@
+# -*- coding: utf-8 -*-
+from freezegun import freeze_time
+from contextlib import closing
+
+from odoo.addons.account.tests.common import AccountTestInvoicingCommon
+from odoo.tests import Form, tagged
+from odoo import Command
+
+
+@tagged('post_install', '-at_install')
+class TestReconciliationMatchingRules(AccountTestInvoicingCommon):
+
+    @classmethod
+    def setUpClass(cls):
+        super().setUpClass()
+
+        #################
+        # Company setup #
+        #################
+        cls.other_currency = cls.setup_other_currency('EUR')
+        cls.other_currency_2 = cls.setup_other_currency('CAD', rates=[('2016-01-01', 10.0), ('2017-01-01', 20.0)])
+
+        cls.account_pay = cls.company_data['default_account_payable']
+        cls.current_assets_account = cls.env['account.account'].search([
+            ('account_type', '=', 'asset_current'),
+            ('company_ids', '=', cls.company.id)], limit=1)
+
+        cls.bank_journal = cls.env['account.journal'].search([('type', '=', 'bank'), ('company_id', '=', cls.company.id)], limit=1)
+        cls.cash_journal = cls.env['account.journal'].search([('type', '=', 'cash'), ('company_id', '=', cls.company.id)], limit=1)
+
+        cls.tax21 = cls.env['account.tax'].create({
+            'name': '21%',
+            'type_tax_use': 'purchase',
+            'amount': 21,
+        })
+
+        cls.tax12 = cls.env['account.tax'].create({
+            'name': '12%',
+            'type_tax_use': 'purchase',
+            'amount': 12,
+        })
+
+        cls.partner_1 = cls.env['res.partner'].create({'name': 'partner_1', 'company_id': cls.company.id})
+        cls.partner_2 = cls.env['res.partner'].create({'name': 'partner_2', 'company_id': cls.company.id})
+        cls.partner_3 = cls.env['res.partner'].create({'name': 'partner_3', 'company_id': cls.company.id})
+
+        ###############
+        # Rules setup #
+        ###############
+        cls.rule_1 = cls.env['account.reconcile.model'].create({
+            'name': 'Invoices Matching Rule',
+            'sequence': '1',
+            'rule_type': 'invoice_matching',
+            'auto_reconcile': False,
+            'match_nature': 'both',
+            'match_same_currency': True,
+            'allow_payment_tolerance': True,
+            'payment_tolerance_type': 'percentage',
+            'payment_tolerance_param': 0.0,
+            'match_partner': True,
+            'match_partner_ids': [(6, 0, (cls.partner_1 + cls.partner_2 + cls.partner_3).ids)],
+            'company_id': cls.company.id,
+            'line_ids': [(0, 0, {'account_id': cls.current_assets_account.id})],
+        })
+        cls.rule_2 = cls.env['account.reconcile.model'].create({
+            'name': 'write-off model',
+            'rule_type': 'writeoff_suggestion',
+            'match_partner': True,
+            'match_partner_ids': [],
+            'line_ids': [(0, 0, {'account_id': cls.current_assets_account.id})],
+        })
+
+        ##################
+        # Invoices setup #
+        ##################
+        cls.invoice_line_1 = cls._create_invoice_line(100, cls.partner_1, 'out_invoice')
+        cls.invoice_line_2 = cls._create_invoice_line(200, cls.partner_1, 'out_invoice')
+        cls.invoice_line_3 = cls._create_invoice_line(300, cls.partner_1, 'in_refund', name="RBILL/2019/09/0013")
+        cls.invoice_line_4 = cls._create_invoice_line(1000, cls.partner_2, 'in_invoice')
+        cls.invoice_line_5 = cls._create_invoice_line(600, cls.partner_3, 'out_invoice')
+        cls.invoice_line_6 = cls._create_invoice_line(600, cls.partner_3, 'out_invoice', ref="RF12 3456")
+        cls.invoice_line_7 = cls._create_invoice_line(200, cls.partner_3, 'out_invoice')
+
+        ####################
+        # Statements setup #
+        ####################
+        # TODO : account_number, partner_name, transaction_type, narration
+        invoice_number = cls.invoice_line_1.move_id.name
+        cls.bank_line_1, cls.bank_line_2,\
+        cls.bank_line_3, cls.bank_line_4,\
+        cls.bank_line_5, cls.cash_line_1 = cls.env['account.bank.statement.line'].create([
+            {
+                'journal_id': cls.bank_journal.id,
+                'date': '2020-01-01',
+                'payment_ref': 'invoice %s-%s' % tuple(invoice_number.split('/')[1:]),
+                'partner_id': cls.partner_1.id,
+                'amount': 100,
+                'sequence': 1,
+            },
+            {
+                'journal_id': cls.bank_journal.id,
+                'date': '2020-01-01',
+                'payment_ref': 'xxxxx',
+                'partner_id': cls.partner_1.id,
+                'amount': 600,
+                'sequence': 2,
+            },
+            {
+                'journal_id': cls.bank_journal.id,
+                'date': '2020-01-01',
+                'payment_ref': 'nawak',
+                'narration': 'Communication: RF12 3456',
+                'partner_id': cls.partner_3.id,
+                'amount': 600,
+                'sequence': 1,
+            },
+            {
+                'journal_id': cls.bank_journal.id,
+                'date': '2020-01-01',
+                'payment_ref': 'RF12 3456',
+                'partner_id': cls.partner_3.id,
+                'amount': 600,
+                'sequence': 2,
+            },
+            {
+                'journal_id': cls.bank_journal.id,
+                'date': '2020-01-01',
+                'payment_ref': 'baaaaah',
+                'ref': 'RF12 3456',
+                'partner_id': cls.partner_3.id,
+                'amount': 600,
+                'sequence': 2,
+            },
+            {
+                'journal_id': cls.cash_journal.id,
+                'date': '2020-01-01',
+                'payment_ref': 'yyyyy',
+                'partner_id': cls.partner_2.id,
+                'amount': -1000,
+                'sequence': 1,
+            },
+        ])
+
+    @classmethod
+    def _create_invoice_line(cls, amount, partner, move_type, currency=None, ref=None, name=None, inv_date='2019-09-01'):
+        ''' Create an invoice on the fly.'''
+        invoice_form = Form(cls.env['account.move'].with_context(default_move_type=move_type, default_invoice_date=inv_date, default_date=inv_date))
+        invoice_form.partner_id = partner
+        if currency:
+            invoice_form.currency_id = currency
+        if ref:
+            invoice_form.ref = ref
+        if name:
+            invoice_form.name = name
+        with invoice_form.invoice_line_ids.new() as invoice_line_form:
+            invoice_line_form.name = 'xxxx'
+            invoice_line_form.quantity = 1
+            invoice_line_form.price_unit = amount
+            invoice_line_form.tax_ids.clear()
+        invoice = invoice_form.save()
+        invoice.action_post()
+        lines = invoice.line_ids
+        return lines.filtered(lambda l: l.account_id.account_type in ('asset_receivable', 'liability_payable'))
+
+    @classmethod
+    def _create_st_line(cls, amount=1000.0, date='2019-01-01', payment_ref='turlututu', **kwargs):
+        st_line = cls.env['account.bank.statement.line'].create({
+            'journal_id': kwargs.get('journal_id', cls.bank_journal.id),
+            'amount': amount,
+            'date': date,
+            'payment_ref': payment_ref,
+            'partner_id': cls.partner_a.id,
+            **kwargs,
+        })
+        return st_line
+
+    @classmethod
+    def _create_reconcile_model(cls, **kwargs):
+        return cls.env['account.reconcile.model'].create({
+            'name': "test",
+            'rule_type': 'invoice_matching',
+            'allow_payment_tolerance': True,
+            'payment_tolerance_type': 'percentage',
+            'payment_tolerance_param': 0.0,
+            **kwargs,
+            'line_ids': [
+                Command.create({
+                    'account_id': cls.company_data['default_account_revenue'].id,
+                    'amount_type': 'percentage',
+                    'label': f"test {i}",
+                    **line_vals,
+                })
+                for i, line_vals in enumerate(kwargs.get('line_ids', []))
+            ],
+            'partner_mapping_line_ids': [
+                Command.create(line_vals)
+                for i, line_vals in enumerate(kwargs.get('partner_mapping_line_ids', []))
+            ],
+        })
+
+    @freeze_time('2020-01-01')
+    def _check_statement_matching(self, rules, expected_values_list):
+        for statement_line, expected_values in expected_values_list.items():
+            res = rules._apply_rules(statement_line, statement_line._retrieve_partner())
+            self.assertDictEqual(res, expected_values)
+
+    def test_matching_fields(self):
+        # Check without restriction.
+        self.rule_1.match_text_location_label = False
+        self._check_statement_matching(self.rule_1, {
+            self.bank_line_1: {'amls': self.invoice_line_1, 'model': self.rule_1},
+            self.bank_line_2: {'amls': self.invoice_line_1 + self.invoice_line_2 + self.invoice_line_3, 'model': self.rule_1},
+            self.cash_line_1: {'amls': self.invoice_line_4, 'model': self.rule_1},
+        })
+
+    @freeze_time('2020-01-01')
+    def test_matching_fields_match_text_location(self):
+        st_line = self._create_st_line(payment_ref="1111", ref="2222 3333", narration="4444 5555 6666")
+
+        inv1 = self._create_invoice_line(1000, self.partner_a, 'out_invoice', ref="bernard 1111 gagnant")
+        inv2 = self._create_invoice_line(1000, self.partner_a, 'out_invoice', ref="2222 turlututu 3333")
+        inv3 = self._create_invoice_line(1000, self.partner_a, 'out_invoice', ref="4444 tsoin 5555 tsoin 6666")
+
+        rule = self._create_reconcile_model(
+            allow_payment_tolerance=False,
+            match_text_location_label=True,
+            match_text_location_reference=False,
+            match_text_location_note=False,
+        )
+        self.assertDictEqual(
+            rule._apply_rules(st_line, st_line._retrieve_partner()),
+            {'amls': inv1, 'model': rule},
+        )
+
+        rule.match_text_location_reference = True
+        self.assertDictEqual(
+            rule._apply_rules(st_line, st_line._retrieve_partner()),
+            {'amls': inv2, 'model': rule},
+        )
+
+        rule.match_text_location_note = True
+        self.assertDictEqual(
+            rule._apply_rules(st_line, st_line._retrieve_partner()),
+            {'amls': inv3, 'model': rule},
+        )
+
+    def test_matching_fields_match_text_location_no_partner(self):
+        self.bank_line_2.unlink() # One line is enough for this test
+        self.bank_line_1.partner_id = None
+
+        self.partner_1.name = "Bernard Gagnant"
+
+        self.rule_1.write({
+            'match_partner': False,
+            'match_partner_ids': [(5, 0, 0)],
+            'line_ids': [(5, 0, 0)],
+        })
+
+        st_line_initial_vals = {'ref': None, 'payment_ref': 'nothing', 'narration': None}
+        recmod_initial_vals = {'match_text_location_label': False, 'match_text_location_note': False, 'match_text_location_reference': False}
+
+        rec_mod_options_to_fields = {
+            'match_text_location_label': 'payment_ref',
+            'match_text_location_note': 'narration',
+            'match_text_location_reference': 'ref',
+        }
+
+        for rec_mod_field, st_line_field in rec_mod_options_to_fields.items():
+            self.rule_1.write({**recmod_initial_vals, rec_mod_field: True})
+            # Fully reinitialize the statement line
+            self.bank_line_1.write(st_line_initial_vals)
+
+            # Test matching with the invoice ref
+            self.bank_line_1.write({st_line_field: self.invoice_line_1.move_id.payment_reference})
+
+            self._check_statement_matching(self.rule_1, {
+                self.bank_line_1: {'amls': self.invoice_line_1, 'model': self.rule_1},
+            })
+
+    def test_matching_fields_match_journal_ids(self):
+        self.rule_1.match_text_location_label = False
+        self.rule_1.match_journal_ids |= self.cash_line_1.journal_id
+        self._check_statement_matching(self.rule_1, {
+            self.bank_line_1: {},
+            self.bank_line_2: {},
+            self.cash_line_1: {'amls': self.invoice_line_4, 'model': self.rule_1},
+        })
+
+    def test_matching_fields_match_nature(self):
+        self.rule_1.match_text_location_label = False
+        self.rule_1.match_nature = 'amount_received'
+        self._check_statement_matching(self.rule_1, {
+            self.bank_line_1: {'amls': self.invoice_line_1, 'model': self.rule_1},
+            self.bank_line_2: {
+                'amls': self.invoice_line_2 + self.invoice_line_3 + self.invoice_line_1,
+                'model': self.rule_1,
+            },
+            self.cash_line_1: {},
+        })
+        self.rule_1.match_nature = 'amount_paid'
+        self._check_statement_matching(self.rule_1, {
+            self.bank_line_1: {},
+            self.bank_line_2: {},
+            self.cash_line_1: {'amls': self.invoice_line_4, 'model': self.rule_1},
+        })
+
+    def test_matching_fields_match_amount(self):
+        self.rule_1.match_text_location_label = False
+        self.rule_1.match_amount = 'lower'
+        self.rule_1.match_amount_max = 150
+        self._check_statement_matching(self.rule_1, {
+            self.bank_line_1: {'amls': self.invoice_line_1, 'model': self.rule_1},
+            self.bank_line_2: {},
+            self.cash_line_1: {},
+        })
+        self.rule_1.match_amount = 'greater'
+        self.rule_1.match_amount_min = 200
+        self._check_statement_matching(self.rule_1, {
+            self.bank_line_1: {},
+            self.bank_line_2: {'amls': self.invoice_line_1 + self.invoice_line_2 + self.invoice_line_3, 'model': self.rule_1},
+            self.cash_line_1: {'amls': self.invoice_line_4, 'model': self.rule_1},
+        })
+        self.rule_1.match_amount = 'between'
+        self.rule_1.match_amount_min = 200
+        self.rule_1.match_amount_max = 800
+        self._check_statement_matching(self.rule_1, {
+            self.bank_line_1: {},
+            self.bank_line_2: {'amls': self.invoice_line_1 + self.invoice_line_2 + self.invoice_line_3, 'model': self.rule_1},
+            self.cash_line_1: {},
+        })
+
+    def test_matching_fields_match_label(self):
+        self.rule_1.match_text_location_label = False
+        self.rule_1.match_label = 'contains'
+        self.rule_1.match_label_param = 'yyyyy'
+        self._check_statement_matching(self.rule_1, {
+            self.bank_line_1: {},
+            self.bank_line_2: {},
+            self.cash_line_1: {'amls': self.invoice_line_4, 'model': self.rule_1},
+        })
+        self.rule_1.match_label = 'not_contains'
+        self.rule_1.match_label_param = 'xxxxx'
+        self._check_statement_matching(self.rule_1, {
+            self.bank_line_1: {'amls': self.invoice_line_1, 'model': self.rule_1},
+            self.bank_line_2: {},
+            self.cash_line_1: {'amls': self.invoice_line_4, 'model': self.rule_1},
+        })
+        self.rule_1.match_label = 'match_regex'
+        self.rule_1.match_label_param = 'xxxxx|yyyyy'
+        self._check_statement_matching(self.rule_1, {
+            self.bank_line_1: {},
+            self.bank_line_2: {'amls': self.invoice_line_1 + self.invoice_line_2 + self.invoice_line_3, 'model': self.rule_1},
+            self.cash_line_1: {'amls': self.invoice_line_4, 'model': self.rule_1},
+        })
+
+    @freeze_time('2019-01-01')
+    def test_zero_payment_tolerance(self):
+        rule = self._create_reconcile_model(line_ids=[{}])
+
+        for inv_type, bsl_sign in (('out_invoice', 1), ('in_invoice', -1)):
+
+            invl = self._create_invoice_line(1000.0, self.partner_a, inv_type, inv_date='2019-01-01')
+
+            # Exact matching.
+            st_line = self._create_st_line(amount=bsl_sign * 1000.0, payment_ref=invl.name)
+            self._check_statement_matching(
+                rule,
+                {st_line: {'amls': invl, 'model': rule}},
+            )
+
+            # No matching because there is no tolerance.
+            st_line = self._create_st_line(amount=bsl_sign * 990.0, payment_ref=invl.name)
+            self._check_statement_matching(
+                rule,
+                {st_line: {}},
+            )
+
+            # The payment amount is higher than the invoice one.
+            st_line = self._create_st_line(amount=bsl_sign * 1010.0, payment_ref=invl.name)
+            self._check_statement_matching(
+                rule,
+                {st_line: {'amls': invl, 'model': rule}},
+            )
+
+    @freeze_time('2019-01-01')
+    def test_zero_payment_tolerance_auto_reconcile(self):
+        rule = self._create_reconcile_model(
+            auto_reconcile=True,
+            match_text_location_label = False,
+            line_ids=[{}],
+        )
+
+        for inv_type, bsl_sign in (('out_invoice', 1), ('in_invoice', -1)):
+
+            invl = self._create_invoice_line(1000.0, self.partner_a, inv_type, inv_date='2019-01-01')
+
+            # No matching because there is no tolerance.
+            st_line = self._create_st_line(amount=bsl_sign * 990.0, payment_ref='123456')
+            self._check_statement_matching(
+                rule,
+                {st_line: {}},
+            )
+
+            # The payment amount is higher than the invoice one.
+            st_line = self._create_st_line(amount=bsl_sign * 1010.0, payment_ref='123456')
+            self._check_statement_matching(
+                rule,
+                {st_line: {'amls': invl, 'model': rule}},
+            )
+
+    @freeze_time('2019-01-01')
+    def test_not_enough_payment_tolerance(self):
+        rule = self._create_reconcile_model(
+            payment_tolerance_param=0.5,
+            line_ids=[{}],
+        )
+
+        for inv_type, bsl_sign in (('out_invoice', 1), ('in_invoice', -1)):
+            with self.subTest(inv_type=inv_type, bsl_sign=bsl_sign):
+
+                invl = self._create_invoice_line(1000.0, self.partner_a, inv_type, inv_date='2019-01-01')
+
+                # No matching because there is no enough tolerance.
+                st_line = self._create_st_line(amount=bsl_sign * 990.0, payment_ref=invl.name)
+                self._check_statement_matching(
+                    rule,
+                    {st_line: {}},
+                )
+
+                # The payment amount is higher than the invoice one.
+                # However, since the invoice amount is lower than the payment amount,
+                # the tolerance is not checked and the invoice line is matched.
+                st_line = self._create_st_line(amount=bsl_sign * 1010.0, payment_ref=invl.name)
+                self._check_statement_matching(
+                    rule,
+                    {st_line: {'amls': invl, 'model': rule}},
+                )
+
+    @freeze_time('2019-01-01')
+    def test_enough_payment_tolerance(self):
+        rule = self._create_reconcile_model(
+            payment_tolerance_param=2.0,
+            line_ids=[{}],
+        )
+
+        for inv_type, bsl_sign in (('out_invoice', 1), ('in_invoice', -1)):
+
+            invl = self._create_invoice_line(1210.0, self.partner_a, inv_type, inv_date='2019-01-01')
+
+            # Enough tolerance to match the invoice line.
+            st_line = self._create_st_line(amount=bsl_sign * 1185.80, payment_ref=invl.name)
+            self._check_statement_matching(
+                rule,
+                {st_line: {'amls': invl, 'model': rule, 'status': 'write_off'}},
+            )
+
+            # The payment amount is higher than the invoice one.
+            # However, since the invoice amount is lower than the payment amount,
+            # the tolerance is not checked and the invoice line is matched.
+            st_line = self._create_st_line(amount=bsl_sign * 1234.20, payment_ref=invl.name)
+            self._check_statement_matching(
+                rule,
+                {st_line: {'amls': invl, 'model': rule}},
+            )
+
+    @freeze_time('2019-01-01')
+    def test_enough_payment_tolerance_auto_reconcile_not_full(self):
+        rule = self._create_reconcile_model(
+            payment_tolerance_param=1.0,
+            auto_reconcile=True,
+            match_text_location_label = False,
+            line_ids=[{'amount_type': 'percentage_st_line', 'amount_string': '200.0'}],
+        )
+
+        for inv_type, bsl_sign in (('out_invoice', 1), ('in_invoice', -1)):
+
+            invl = self._create_invoice_line(1000.0, self.partner_a, inv_type, inv_date='2019-01-01')
+
+            # Enough tolerance to match the invoice line.
+            st_line = self._create_st_line(amount=bsl_sign * 990.0, payment_ref='123456')
+            self._check_statement_matching(
+                rule,
+                {st_line: {'amls': invl, 'model': rule, 'status': 'write_off'}},
+            )
+
+    @freeze_time('2019-01-01')
+    def test_allow_payment_tolerance_lower_amount(self):
+        rule = self._create_reconcile_model(line_ids=[{'amount_type': 'percentage_st_line'}])
+
+        for inv_type, bsl_sign in (('out_invoice', 1), ('in_invoice', -1)):
+
+            invl = self._create_invoice_line(990.0, self.partner_a, inv_type, inv_date='2019-01-01')
+            st_line = self._create_st_line(amount=bsl_sign * 1000, payment_ref=invl.name)
+
+            # Partial reconciliation.
+            self._check_statement_matching(
+                rule,
+                {st_line: {'amls': invl, 'model': rule}},
+            )
+
+    @freeze_time('2019-01-01')
+    def test_enough_payment_tolerance_auto_reconcile(self):
+        rule = self._create_reconcile_model(
+            payment_tolerance_param=1.0,
+            auto_reconcile=True,
+            match_text_location_label = False,
+            line_ids=[{}],
+        )
+
+        for inv_type, bsl_sign in (('out_invoice', 1), ('in_invoice', -1)):
+
+            invl = self._create_invoice_line(1000.0, self.partner_a, inv_type, inv_date='2019-01-01')
+
+            # Enough tolerance to match the invoice line.
+            st_line = self._create_st_line(amount=bsl_sign * 990.0, payment_ref='123456')
+            self._check_statement_matching(
+                rule,
+                {st_line: {
+                    'amls': invl,
+                    'model': rule,
+                    'status': 'write_off',
+                }},
+            )
+
+    @freeze_time('2019-01-01')
+    def test_percentage_st_line_auto_reconcile(self):
+        rule = self._create_reconcile_model(
+            payment_tolerance_param=1.0,
+            rule_type='writeoff_suggestion',
+            auto_reconcile=True,
+            line_ids=[
+                {'amount_type': 'percentage_st_line', 'amount_string': '100.0', 'label': 'A'},
+                {'amount_type': 'percentage_st_line', 'amount_string': '-100.0', 'label': 'B'},
+                {'amount_type': 'percentage_st_line', 'amount_string': '100.0', 'label': 'C'},
+            ],
+        )
+
+        for bsl_sign in (1, -1):
+            st_line = self._create_st_line(amount=bsl_sign * 1000.0)
+            self._check_statement_matching(
+                rule,
+                {st_line: {
+                    'model': rule,
+                    'status': 'write_off',
+                    'auto_reconcile': True,
+                }},
+            )
+
+    def test_matching_fields_match_partner_category_ids(self):
+        self.rule_1.match_text_location_label = False
+        test_category = self.env['res.partner.category'].create({'name': 'Consulting Services'})
+        test_category2 = self.env['res.partner.category'].create({'name': 'Consulting Services2'})
+
+        self.partner_2.category_id = test_category + test_category2
+        self.rule_1.match_partner_category_ids |= test_category
+        self._check_statement_matching(self.rule_1, {
+            self.bank_line_1: {},
+            self.bank_line_2: {},
+            self.cash_line_1: {'amls': self.invoice_line_4, 'model': self.rule_1},
+        })
+        self.rule_1.match_partner_category_ids = False
+
+    def test_mixin_rules(self):
+        ''' Test usage of rules together.'''
+        self.rule_1.match_text_location_label = False
+        # rule_1 is used before rule_2.
+        self.rule_1.sequence = 1
+        self.rule_2.sequence = 2
+
+        self._check_statement_matching(self.rule_1 + self.rule_2, {
+            self.bank_line_1: {
+                'amls': self.invoice_line_1,
+                'model': self.rule_1,
+            },
+            self.bank_line_2: {
+                'amls': self.invoice_line_2 + self.invoice_line_3 + self.invoice_line_1,
+                'model': self.rule_1,
+            },
+            self.cash_line_1: {'amls': self.invoice_line_4, 'model': self.rule_1},
+        })
+
+        # rule_2 is used before rule_1.
+        self.rule_1.sequence = 2
+        self.rule_2.sequence = 1
+
+        self._check_statement_matching(self.rule_1 + self.rule_2, {
+            self.bank_line_1: {'model': self.rule_2, 'auto_reconcile': False, 'status': 'write_off'},
+            self.bank_line_2: {'model': self.rule_2, 'auto_reconcile': False, 'status': 'write_off'},
+            self.cash_line_1: {'model': self.rule_2, 'auto_reconcile': False, 'status': 'write_off'},
+        })
+
+        # rule_2 is used before rule_1 but only on partner_1.
+        self.rule_2.match_partner_ids |= self.partner_1
+
+        self._check_statement_matching(self.rule_1 + self.rule_2, {
+            self.bank_line_1: {'model': self.rule_2, 'auto_reconcile': False, 'status': 'write_off'},
+            self.bank_line_2: {'model': self.rule_2, 'auto_reconcile': False, 'status': 'write_off'},
+            self.cash_line_1: {'amls': self.invoice_line_4, 'model': self.rule_1},
+        })
+
+    def test_auto_reconcile(self):
+        ''' Test auto reconciliation.'''
+        self.bank_line_1.amount += 5
+
+        self.rule_1.sequence = 2
+        self.rule_1.auto_reconcile = True
+        self.rule_1.payment_tolerance_param = 10.0
+        self.rule_1.match_text_location_label = False
+        self.rule_2.sequence = 1
+        self.rule_2.match_partner_ids |= self.partner_2
+        self.rule_2.auto_reconcile = True
+
+        self._check_statement_matching(self.rule_1 + self.rule_2, {
+            self.bank_line_1: {
+                'amls': self.invoice_line_1,
+                'model': self.rule_1,
+                'auto_reconcile': True,
+            },
+            self.bank_line_2: {
+                'amls': self.invoice_line_1 + self.invoice_line_2 + self.invoice_line_3,
+                'model': self.rule_1,
+            },
+            self.cash_line_1: {
+                'model': self.rule_2,
+                'status': 'write_off',
+                'auto_reconcile': True,
+            },
+        })
+
+    def test_auto_reconcile_ref_with_spaces(self):
+        space_in_ref_invoice_line = self._create_invoice_line(600, self.partner_3, 'out_invoice', ref="This ref has spaces")
+        space_in_ref_bank_line = self._create_st_line(
+            amount=600.0,
+            date='2020-01-01',
+            payment_ref="This ref has spaces",
+            partner_id= self.partner_3.id,
+        )
+        self.rule_1.auto_reconcile = True
+
+        self._check_statement_matching(self.rule_1, {
+            space_in_ref_bank_line: {
+                'model': self.rule_1,
+                'auto_reconcile': True,
+                'amls': space_in_ref_invoice_line
+            }
+        })
+
+    def test_larger_invoice_auto_reconcile(self):
+        ''' Test auto reconciliation with an invoice with larger amount than the
+        statement line's, for rules without write-offs.'''
+        self.bank_line_1.amount = 40
+        self.invoice_line_1.move_id.payment_reference = self.bank_line_1.payment_ref
+
+        self.rule_1.sequence = 2
+        self.rule_1.allow_payment_tolerance = False
+        self.rule_1.auto_reconcile = True
+        self.rule_1.line_ids = [(5, 0, 0)]
+        self.rule_1.match_text_location_label = False
+
+        self._check_statement_matching(self.rule_1, {
+            self.bank_line_1: {
+                'amls': self.invoice_line_1,
+                'model': self.rule_1,
+                'auto_reconcile': True,
+            },
+            self.bank_line_2: {
+                'amls': self.invoice_line_1 + self.invoice_line_2 + self.invoice_line_3,
+                'model': self.rule_1,
+            },
+        })
+
+    def test_auto_reconcile_with_tax(self):
+        ''' Test auto reconciliation with a tax amount included in the bank statement line'''
+        self.rule_1.write({
+            'auto_reconcile': True,
+            'rule_type': 'writeoff_suggestion',
+            'line_ids': [(1, self.rule_1.line_ids.id, {
+                'amount': 50,
+                'force_tax_included': True,
+                'tax_ids': [(6, 0, self.tax21.ids)],
+            }), (0, 0, {
+                'amount': 100,
+                'force_tax_included': False,
+                'tax_ids': [(6, 0, self.tax12.ids)],
+                'account_id': self.current_assets_account.id,
+            })]
+        })
+
+        self.bank_line_1.amount = -121
+
+        self._check_statement_matching(self.rule_1, {
+            self.bank_line_1: {'model': self.rule_1, 'status': 'write_off', 'auto_reconcile': True},
+            self.bank_line_2: {'model': self.rule_1, 'status': 'write_off', 'auto_reconcile': True},
+        })
+
+    def test_auto_reconcile_with_tax_fpos(self):
+        """ Test the fiscal positions are applied by reconcile models when using taxes.
+        """
+        self.rule_1.write({
+            'auto_reconcile': True,
+            'rule_type': 'writeoff_suggestion',
+            'line_ids': [(1, self.rule_1.line_ids.id, {
+                'amount': 100,
+                'force_tax_included': True,
+                'tax_ids': [(6, 0, self.tax21.ids)],
+            })]
+        })
+
+        self.partner_1.country_id = self.env.ref('base.lu')
+        belgium = self.env.ref('base.be')
+        self.partner_2.country_id = belgium
+
+        self.bank_line_2.partner_id = self.partner_2
+
+        self.bank_line_1.amount = -121
+        self.bank_line_2.amount = -112
+
+        self.env['account.fiscal.position'].create({
+            'name': "Test",
+            'country_id': belgium.id,
+            'auto_apply': True,
+            'tax_ids': [
+                Command.create({
+                    'tax_src_id': self.tax21.id,
+                    'tax_dest_id': self.tax12.id,
+                }),
+            ]
+        })
+
+        self._check_statement_matching(self.rule_1, {
+            self.bank_line_1: {'model': self.rule_1, 'status': 'write_off', 'auto_reconcile': True},
+            self.bank_line_2: {'model': self.rule_1, 'status': 'write_off', 'auto_reconcile': True},
+        })
+
+    def test_reverted_move_matching(self):
+        partner = self.partner_1
+        AccountMove = self.env['account.move']
+        move = AccountMove.create({
+            'journal_id': self.bank_journal.id,
+            'line_ids': [
+                (0, 0, {
+                    'account_id': self.account_pay.id,
+                    'partner_id': partner.id,
+                    'name': 'One of these days',
+                    'debit': 10,
+                }),
+                (0, 0, {
+                    'account_id': self.inbound_payment_method_line.payment_account_id.id,
+                    'partner_id': partner.id,
+                    'name': 'I\'m gonna cut you into little pieces',
+                    'credit': 10,
+                })
+            ],
+        })
+
+        payment_bnk_line = move.line_ids.filtered(lambda l: l.account_id == self.inbound_payment_method_line.payment_account_id)
+
+        move.action_post()
+        move_reversed = move._reverse_moves()
+        self.assertTrue(move_reversed.exists())
+
+        self.rule_1.match_text_location_label = False
+        self.bank_line_1.write({
+            'payment_ref': '8',
+            'partner_id': partner.id,
+            'amount': -10,
+        })
+        self._check_statement_matching(self.rule_1, {
+            self.bank_line_1: {'amls': payment_bnk_line, 'model': self.rule_1},
+            self.bank_line_2: {
+                'amls': self.invoice_line_1 + self.invoice_line_2 + self.invoice_line_3,
+                'model': self.rule_1,
+            },
+        })
+
+    def test_match_different_currencies(self):
+        partner = self.env['res.partner'].create({'name': 'Bernard Gagnant'})
+        self.rule_1.write({'match_partner_ids': [(6, 0, partner.ids)], 'match_same_currency': False})
+
+        currency_inv = self.env.ref('base.EUR')
+        currency_inv.active = True
+        currency_statement = self.env.ref('base.JPY')
+
+        currency_statement.active = True
+
+        invoice_line = self._create_invoice_line(100, partner, 'out_invoice', currency=currency_inv)
+
+        self.bank_line_1.write({'partner_id': partner.id, 'foreign_currency_id': currency_statement.id, 'amount_currency': 100, 'payment_ref': invoice_line.name})
+        self._check_statement_matching(self.rule_1, {
+            self.bank_line_1: {'amls': invoice_line, 'model': self.rule_1},
+            self.bank_line_2: {},
+        })
+
+    def test_invoice_matching_rule_no_partner(self):
+        """ Tests that a statement line without any partner can be matched to the
+        right invoice if they have the same payment reference.
+        """
+        self.invoice_line_1.move_id.write({'payment_reference': 'Tournicoti66'})
+        self.rule_1.allow_payment_tolerance = False
+
+        self.bank_line_1.write({
+            'payment_ref': 'Tournicoti66',
+            'partner_id': None,
+            'amount': 95,
+        })
+
+        self.rule_1.write({
+            'line_ids': [(5, 0, 0)],
+            'match_partner': False,
+            'match_label': 'contains',
+            'match_label_param': 'Tournicoti',  # So that we only match what we want to test
+        })
+
+        # TODO: 'invoice_line_1' has no reason to match 'bank_line_1' here... to check
+        # self._check_statement_matching(self.rule_1, {
+        #     self.bank_line_1: {'amls': self.invoice_line_1, 'model': self.rule_1},
+        #     self.bank_line_2: {'amls': []},
+        # }, self.bank_st)
+
+    def test_inv_matching_rule_auto_rec_no_partner_with_writeoff(self):
+        self.invoice_line_1.move_id.ref = "doudlidou3555"
+
+        self.bank_line_1.write({
+            'payment_ref': 'doudlidou3555',
+            'partner_id': None,
+            'amount': 95,
+        })
+
+        self.rule_1.write({
+            'match_partner': False,
+            'match_label': 'contains',
+            'match_label_param': 'doudlidou',  # So that we only match what we want to test
+            'payment_tolerance_param': 10.0,
+            'auto_reconcile': True,
+        })
+
+        # Check bank reconciliation
+
+        self._check_statement_matching(self.rule_1, {
+            self.bank_line_1: {
+                'amls': self.invoice_line_1,
+                'model': self.rule_1,
+                'status': 'write_off',
+                'auto_reconcile': True,
+            },
+            self.bank_line_2: {},
+        })
+
+    def test_partner_mapping_rule(self):
+        st_line = self._create_st_line(partner_id=None, payment_ref=None)
+
+        rule = self._create_reconcile_model(
+            partner_mapping_line_ids=[{
+                'partner_id': self.partner_1.id,
+                'payment_ref_regex': 'toto.*',
+            }],
+        )
+
+        # No match because the reference is not matching the regex.
+        self.assertEqual(st_line._retrieve_partner(), self.env['res.partner'])
+
+        st_line.payment_ref = "toto42"
+
+        # Matching using the regex on payment_ref.
+        self.assertEqual(st_line._retrieve_partner(), self.partner_1)
+
+        rule.partner_mapping_line_ids.narration_regex = ".*coincoin"
+
+        # No match because the narration is not matching the regex.
+        self.assertEqual(st_line._retrieve_partner(), self.env['res.partner'])
+
+        st_line.narration = "42coincoin"
+
+        # Matching is back thanks to "coincoin".
+        self.assertEqual(st_line._retrieve_partner(), self.partner_1)
+
+        # More complex matching to match something from bank sync data.
+        # Note: the indentation is done with multiple \n to mimic the bank sync behavior. Keep them for this test!
+        rule.partner_mapping_line_ids.narration_regex = ".*coincoin.*"
+        st_line.narration = """
+            {
+                "informations": "coincoin turlututu tsoin tsoin",
+            }
+        """
+
+        # Same check with json data into the narration field.
+        self.assertEqual(st_line._retrieve_partner(), self.partner_1)
+
+    def test_move_name_caba_tax_account(self):
+        self.env.company.tax_exigibility = True
+        tax_account = self.company_data['default_account_tax_sale']
+        tax_account.reconcile = True
+        self.rule_1.write({
+            'match_partner': False,
+            'payment_tolerance_param': 20.0,
+            'auto_reconcile': True,
+        })
+
+        caba_tax = self.env['account.tax'].create({
+            'name': "CABA",
+            'amount_type': 'percent',
+            'amount': 20.0,
+            'tax_exigibility': 'on_payment',
+            'cash_basis_transition_account_id': self.safe_copy(tax_account).id,
+            'invoice_repartition_line_ids': [
+                Command.create({
+                    'repartition_type': 'base',
+                }),
+                Command.create({
+                    'repartition_type': 'tax',
+                    'account_id': tax_account.id,
+                }),
+            ],
+        })
+
+        invoice = self.env['account.move'].create({
+            'move_type': 'out_invoice',
+            'partner_id': self.partner_a.id,
+            'invoice_date': '2021-07-01',
+            'invoice_line_ids': [
+                Command.create({
+                    'name': "test",
+                    'price_unit': 100,
+                    'tax_ids': [Command.set(caba_tax.ids)],
+                }),
+            ]
+        })
+        invoice.action_post()
+        self.env['account.bank.statement.line'].create({
+            'amount': 100.0,
+            'date': '2019-01-01',
+            'payment_ref': invoice.name,
+            'journal_id': self.company_data['default_journal_bank'].id,
+            })
+        with freeze_time('2019-01-01'):
+            self.env['account.bank.statement.line']._cron_try_auto_reconcile_statement_lines()
+        caba_move = invoice.tax_cash_basis_created_move_ids
+        self.assertEqual(caba_move.line_ids[0].move_name, caba_move.name)
+
+    def test_match_multi_currencies(self):
+        ''' Ensure the matching of candidates is made using the right statement line currency.
+
+        In this test, the value of the statement line is 100 USD = 300 GOL = 900 DAR and we want to match two journal
+        items of:
+        - 100 USD = 200 GOL (= 600 DAR from the statement line point of view)
+        - 14 USD = 280 DAR
+
+        Both journal items should be suggested to the user because they represents 98% of the statement line amount
+        (DAR).
+        '''
+        partner = self.env['res.partner'].create({'name': 'Bernard Perdant'})
+
+        journal = self.env['account.journal'].create({
+            'name': 'test_match_multi_currencies',
+            'code': 'xxxx',
+            'type': 'bank',
+            'currency_id': self.other_currency.id,
+        })
+
+        matching_rule = self.env['account.reconcile.model'].create({
+            'name': 'test_match_multi_currencies',
+            'rule_type': 'invoice_matching',
+            'match_partner': True,
+            'match_partner_ids': [(6, 0, partner.ids)],
+            'allow_payment_tolerance': True,
+            'payment_tolerance_type': 'percentage',
+            'payment_tolerance_param': 5.0,
+            'match_same_currency': False,
+            'company_id': self.company_data['company'].id,
+            'past_months_limit': False,
+            'match_text_location_label': False,
+        })
+
+        statement_line = self.env['account.bank.statement.line'].create({
+            'journal_id': journal.id,
+            'date': '2016-01-01',
+            'payment_ref': 'line',
+            'partner_id': partner.id,
+            'foreign_currency_id': self.other_currency_2.id,
+            'amount': 300.0,  # Rate is 3 GOL = 1 USD in 2016.
+            'amount_currency': 900.0,  # Rate is 10 DAR = 1 USD in 2016 but the rate used by the bank is 9:1.
+        })
+
+        move = self.env['account.move'].create({
+            'move_type': 'entry',
+            'date': '2017-01-01',
+            'journal_id': self.company_data['default_journal_misc'].id,
+            'line_ids': [
+                # Rate is 2 GOL = 1 USD in 2017.
+                # The statement line will consider this line equivalent to 600 DAR.
+                (0, 0, {
+                    'account_id': self.company_data['default_account_receivable'].id,
+                    'partner_id': partner.id,
+                    'currency_id': self.other_currency.id,
+                    'debit': 100.0,
+                    'credit': 0.0,
+                    'amount_currency': 200.0,
+                }),
+                # Rate is 20 GOL = 1 USD in 2017.
+                (0, 0, {
+                    'account_id': self.company_data['default_account_receivable'].id,
+                    'partner_id': partner.id,
+                    'currency_id': self.other_currency_2.id,
+                    'debit': 14.0,
+                    'credit': 0.0,
+                    'amount_currency': 280.0,
+                }),
+                # Line to balance the journal entry:
+                (0, 0, {
+                    'account_id': self.company_data['default_account_revenue'].id,
+                    'debit': 0.0,
+                    'credit': 114.0,
+                }),
+            ],
+        })
+        move.action_post()
+
+        move_line_1 = move.line_ids.filtered(lambda line: line.debit == 100.0)
+        move_line_2 = move.line_ids.filtered(lambda line: line.debit == 14.0)
+
+        self._check_statement_matching(matching_rule, {
+            statement_line: {'amls': move_line_1 + move_line_2, 'model': matching_rule}
+        })
+
+    @freeze_time('2020-01-01')
+    def test_matching_with_write_off_foreign_currency(self):
+        journal_foreign_curr = self.company_data['default_journal_bank'].copy()
+        journal_foreign_curr.currency_id = self.other_currency
+
+        reco_model = self._create_reconcile_model(
+            auto_reconcile=True,
+            rule_type='writeoff_suggestion',
+            line_ids=[{
+                'amount_type': 'percentage',
+                'amount': 100.0,
+                'account_id': self.company_data['default_account_revenue'].id,
+            }],
+        )
+
+        st_line = self._create_st_line(amount=100.0, payment_ref='123456', journal_id=journal_foreign_curr.id)
+        self._check_statement_matching(reco_model, {
+            st_line: {
+                'model': reco_model,
+                'status': 'write_off',
+                'auto_reconcile': True,
+            },
+        })
+
+    def test_payment_similar_communications(self):
+        def create_payment_line(amount, memo, partner):
+            payment = self.env['account.payment'].create({
+                'amount': amount,
+                'payment_type': 'inbound',
+                'partner_type': 'customer',
+                'partner_id': partner.id,
+                'memo': memo,
+                'destination_account_id': self.company_data['default_account_receivable'].id,
+            })
+            payment.action_post()
+
+            return payment.move_id.line_ids.filtered(lambda x: x.account_id.account_type not in {'asset_receivable', 'liability_payable'})
+
+        payment_partner = self.env['res.partner'].create({
+            'name': "Bernard Gagnant",
+        })
+
+        self.rule_1.match_partner_ids = [(6, 0, payment_partner.ids)]
+
+        pmt_line_1 = create_payment_line(500, 'a1b2c3', payment_partner)
+        pmt_line_2 = create_payment_line(500, 'a1b2c3', payment_partner)
+        create_payment_line(500, 'd1e2f3', payment_partner)
+
+        self.bank_line_1.write({
+            'amount': 1000,
+            'payment_ref': 'a1b2c3',
+            'partner_id': payment_partner.id,
+        })
+        self.bank_line_2.unlink()
+        self.rule_1.allow_payment_tolerance = False
+
+        self._check_statement_matching(self.rule_1, {
+            self.bank_line_1: {'amls': pmt_line_1 + pmt_line_2, 'model': self.rule_1, 'status': 'write_off'},
+        })
+
+    def test_no_amount_check_keep_first(self):
+        """ In case the reconciliation model doesn't check the total amount of the candidates,
+        we still don't want to suggest more than are necessary to match the statement.
+        For example, if a statement line amounts to 250 and is to be matched with three invoices
+        of 100, 200 and 300 (retrieved in this order), only 100 and 200 should be proposed.
+        """
+        self.rule_1.allow_payment_tolerance = False
+        self.rule_1.match_text_location_label = False
+        self.bank_line_2.amount = 250
+        self.bank_line_1.partner_id = None
+
+        self._check_statement_matching(self.rule_1, {
+            self.bank_line_1: {},
+            self.bank_line_2: {
+                'amls': self.invoice_line_1 + self.invoice_line_2,
+                'model': self.rule_1,
+                'status': 'write_off',
+            },
+        })
+
+    def test_no_amount_check_exact_match(self):
+        """ If a reconciliation model finds enough candidates for a full reconciliation,
+        it should still check the following candidates, in case one of them exactly
+        matches the amount of the statement line. If such a candidate exist, all the
+        other ones are disregarded.
+        """
+        self.rule_1.allow_payment_tolerance = False
+        self.rule_1.match_text_location_label = False
+        self.bank_line_2.amount = 300
+        self.bank_line_1.partner_id = None
+
+        self._check_statement_matching(self.rule_1, {
+            self.bank_line_1: {},
+            self.bank_line_2: {
+                'amls': self.invoice_line_3,
+                'model': self.rule_1,
+                'status': 'write_off',
+            },
+        })
+
+    @freeze_time('2019-01-01')
+    def test_invoice_matching_using_match_text_location(self):
+        rule = self._create_reconcile_model(
+            match_partner=False,
+            allow_payment_tolerance=False,
+            match_text_location_label=False,
+            match_text_location_reference=False,
+            match_text_location_note=False,
+        )
+        st_line = self._create_st_line(amount=1000, partner_id=False)
+        invoice = self.env['account.move'].create({
+            'move_type': 'out_invoice',
+            'partner_id': self.partner_a.id,
+            'invoice_date': '2019-01-01',
+            'invoice_line_ids': [Command.create({
+                'product_id': self.product_a.id,
+                'price_unit': 100,
+            })],
+        })
+        invoice.action_post()
+        term_line = invoice.line_ids.filtered(lambda x: x.display_type == 'payment_term')
+
+        # No match at all.
+        self.assertDictEqual(
+            rule._apply_rules(st_line, None),
+            {},
+        )
+
+        with closing(self.cr.savepoint()):
+            term_line.name = "1234"
+            st_line.payment_ref = "1234"
+
+            # Matching if no checkbox checked.
+            self.assertDictEqual(
+                rule._apply_rules(st_line, None),
+                {'amls': term_line, 'model': rule},
+            )
+
+            # No matching if other checkbox is checked.
+            rule.match_text_location_note = True
+            self.assertDictEqual(
+                rule._apply_rules(st_line, None),
+                {},
+            )
+
+        with closing(self.cr.savepoint()):
+            # Test Matching on exact_token.
+            term_line.name = "PAY-123"
+            st_line.payment_ref = "PAY-123"
+
+            # Matching if no checkbox checked.
+            self.assertDictEqual(
+                rule._apply_rules(st_line, None),
+                {'amls': term_line, 'model': rule},
+            )
+
+        with self.subTest(rule_field='match_text_location_label', st_line_field='payment_ref'):
+            with closing(self.cr.savepoint()):
+                term_line.name = ''
+                st_line.payment_ref = '/?'
+
+                # No exact matching when the term line name is an empty string
+                self.assertDictEqual(
+                    rule._apply_rules(st_line, None),
+                    {},
+                )
+
+        for rule_field, st_line_field in (
+            ('match_text_location_label', 'payment_ref'),
+            ('match_text_location_reference', 'ref'),
+            ('match_text_location_note', 'narration'),
+        ):
+            with self.subTest(rule_field=rule_field, st_line_field=st_line_field):
+
+                with closing(self.cr.savepoint()):
+                    rule[rule_field] = True
+                    st_line[st_line_field] = "123456"
+                    term_line.name = "123456"
+
+                    # Matching if the corresponding flag is enabled.
+                    self.assertDictEqual(
+                        rule._apply_rules(st_line, None),
+                        {'amls': term_line, 'model': rule},
+                    )
+
+                    # It works also if the statement line contains the word.
+                    st_line[st_line_field] = "payment for 123456 urgent!"
+                    self.assertDictEqual(
+                        rule._apply_rules(st_line, None),
+                        {'amls': term_line, 'model': rule},
+                    )
+
+                    # Not if the invoice has nothing in common even if numerical.
+                    term_line.name = "78910"
+                    self.assertDictEqual(
+                        rule._apply_rules(st_line, None),
+                        {},
+                    )
+
+                    # Exact matching on a single word.
+                    st_line[st_line_field] = "TURLUTUTU21"
+                    term_line.name = "TURLUTUTU21"
+                    self.assertDictEqual(
+                        rule._apply_rules(st_line, None),
+                        {'amls': term_line, 'model': rule},
+                    )
+
+                    # No matching if not enough numerical values.
+                    st_line[st_line_field] = "12"
+                    term_line.name = "selling 3 apples, 2 tomatoes and 12kg of potatoes"
+                    self.assertDictEqual(
+                        rule._apply_rules(st_line, None),
+                        {},
+                    )
+
+        invoice2 = self.env['account.move'].create({
+            'move_type': 'out_invoice',
+            'partner_id': self.partner_a.id,
+            'invoice_date': '2019-01-01',
+            'invoice_line_ids': [Command.create({
+                'product_id': self.product_a.id,
+                'price_unit': 100,
+            })],
+        })
+        invoice2.action_post()
+        term_lines = (invoice + invoice2).line_ids.filtered(lambda x: x.display_type == 'payment_term')
+
+        # Matching multiple invoices.
+        rule.match_text_location_label = True
+        st_line.payment_ref = "paying invoices 1234 & 5678"
+        term_lines[0].name = "INV/1234"
+        term_lines[1].name = "INV/5678"
+        self.assertDictEqual(
+            rule._apply_rules(st_line, None),
+            {'amls': term_lines, 'model': rule},
+        )
+
+        # Matching multiple invoices sharing the same reference.
+        term_lines[1].name = "INV/1234"
+        self.assertDictEqual(
+            rule._apply_rules(st_line, None),
+            {'amls': term_lines, 'model': rule},
+        )
+
+    def test_amount_check_amount_last(self):
+        """ In case the reconciliation model can't match via text or partner matching
+        we do a last check to find amls with the exact amount
+        """
+        self.rule_1.write({
+            'match_text_location_label': False,
+            'match_partner': False,
+            'match_partner_ids': [Command.clear()],
+        })
+        self.bank_line_1.partner_id = None
+        self.bank_line_1.payment_ref = False
+
+        self._check_statement_matching(self.rule_1, {
+            self.bank_line_1: {
+                'amls': self.invoice_line_1,
+                'model': self.rule_1,
+            },
+        })
+
+        # Create bank statement in foreign currency
+        partner = self.env['res.partner'].create({'name': 'Bernard Gagnant'})
+        invoice_line = self._create_invoice_line(300, partner, 'out_invoice', currency=self.other_currency_2)
+        bank_line_2 = self.env['account.bank.statement.line'].create({
+            'journal_id': self.bank_journal.id,
+            'partner_id': False,
+            'payment_ref': False,
+            'foreign_currency_id': self.other_currency_2.id,
+            'amount': 15.0,
+            'amount_currency': 300.0,
+        })
+        self._check_statement_matching(self.rule_1, {
+            bank_line_2: {
+                'amls': invoice_line,
+                'model': self.rule_1,
+            },
+        })
+
+    @freeze_time('2019-01-01')
+    def test_matching_exact_amount_no_partner(self):
+        """ In case the reconciliation model can't match via text or partner matching
+        we do a last check to find amls with the exact amount.
+        """
+        self.rule_1.write({
+            'match_text_location_label': False,
+            'match_partner': False,
+            'match_partner_ids': [Command.clear()],
+        })
+        self.bank_line_1.partner_id = None
+        self.bank_line_1.payment_ref = False
+
+        with self.subTest(test='single_currency'):
+            st_line = self._create_st_line(amount=100, payment_ref=None, partner_id=None)
+            invl = self._create_invoice_line(100, self.partner_1, 'out_invoice')
+            self._check_statement_matching(self.rule_1, {
+                st_line: {
+                    'amls': invl,
+                    'model': self.rule_1,
+                },
+            })
+
+        with self.subTest(test='rounding'):
+            st_line = self._create_st_line(amount=-208.73, payment_ref=None, partner_id=None)
+            invl = self._create_invoice_line(208.73, self.partner_1, 'in_invoice')
+            self._check_statement_matching(self.rule_1, {
+                st_line: {
+                    'amls': invl,
+                    'model': self.rule_1,
+                },
+            })
+
+        with self.subTest(test='multi_currencies'):
+            foreign_curr = self.other_currency_2
+            invl = self._create_invoice_line(300, self.partner_1, 'out_invoice', currency=foreign_curr)
+            st_line = self._create_st_line(
+                amount=15.0, foreign_currency_id=foreign_curr.id, amount_currency=300.0,
+                payment_ref=None, partner_id=None,
+            )
+            self._check_statement_matching(self.rule_1, {
+                st_line: {
+                    'amls': invl,
+                    'model': self.rule_1,
+                },
+            })
diff --git a/dev_odex30_accounting/odex30_account_accountant/tests/test_signature.py b/dev_odex30_accounting/odex30_account_accountant/tests/test_signature.py
new file mode 100644
index 0000000..2099d9c
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_accountant/tests/test_signature.py
@@ -0,0 +1,88 @@
+import base64
+
+from odoo import Command
+from odoo.tests import tagged
+from odoo.addons.account.tests.common import AccountTestInvoicingCommon
+
+
+@tagged('post_install', '-at_install')
+class TestInvoiceSignature(AccountTestInvoicingCommon):
+    @classmethod
+    def setUpClass(cls):
+        super().setUpClass()
+        if cls.env.ref('base.module_sign').state != 'installed':
+            cls.skipTest(cls, "`sign` module not installed")
+
+        cls.env.company.sign_invoice = True
+
+        cls.signature_fake_1 = base64.b64encode(b"fake_signature_1")
+        cls.signature_fake_2 = base64.b64encode(b"fake_signature_2")
+
+        cls.user.sign_signature = cls.signature_fake_1
+        cls.another_user = cls.env['res.users'].create({
+            'name': 'another accountant',
+            'login': 'another_accountant',
+            'password': 'another_accountant',
+            'groups_id': [
+                Command.set(cls.env.ref('account.group_account_user').ids),
+            ],
+            'sign_signature': cls.signature_fake_2,
+        })
+
+        cls.invoice = cls.env['account.move'].create({
+            'move_type': 'out_invoice',
+            'partner_id': cls.partner_a.id,
+            'journal_id': cls.company_data['default_journal_sale'].id,
+            'invoice_line_ids': [
+                Command.create({
+                    'product_id': cls.product_a.id,
+                    'quantity': 1,
+                    'price_unit': 1,
+                })
+            ]
+        })
+
+    def test_draft_invoice_shouldnt_have_signature(self):
+        self.assertEqual(self.invoice.state, 'draft')
+        self.assertFalse(self.invoice.show_signature_area, "the signature area shouldn't appear on a draft invoice")
+
+    def test_posted_invoice_should_have_signature(self):
+        self.invoice.action_post()
+        self.assertTrue(self.invoice.show_signature_area,
+                        "the signature area should appear on posted invoice when the `sign_invoice` settings is True")
+
+    def test_invoice_from_company_without_signature_settings_shouldnt_have_signature(self):
+        self.env.company.sign_invoice = False
+        self.invoice.action_post()
+        self.assertFalse(self.invoice.show_signature_area,
+                         "the signature area shouldn't appear when the `sign_invoice` settings is False")
+
+    def test_invoice_signing_user_should_be_the_user_that_posted_it(self):
+        self.assertFalse(self.invoice.signing_user,
+                         "invoice that weren't created by automated action shouldn't have a signing user")
+        self.assertEqual(self.invoice.signature, False, "There shouldn't be any signature if there isn't a signing user")
+        self.invoice.action_post()
+        self.assertEqual(self.invoice.signing_user, self.user, "The signing user should be the user that posted the invoice")
+        self.assertEqual(self.invoice.signature, self.signature_fake_1, "The signature should be from `self.user`")
+
+        self.invoice.button_draft()
+        self.invoice.with_user(self.another_user).action_post()
+        self.assertEqual(self.invoice.signing_user, self.another_user,
+                         "The signing user should be the user that posted the invoice")
+        self.assertEqual(self.invoice.signature, self.signature_fake_2, "The signature should be from `self.another_user`")
+
+    def test_invoice_signing_user_should_be_reprensative_user_if_there_is_one(self):
+        self.env.company.signing_user = self.user  # set the representative user of the company
+        invoice = self.invoice.with_user(self.another_user)
+        invoice.action_post()
+        self.assertEqual(invoice.signing_user, self.user, "The signing user should be the representative person set in the settings")
+        self.assertEqual(invoice.signature, self.signature_fake_1, "The signature should be from `self.another_user`, the representative user")
+
+    def test_setting_representative_user_shouldnt_change_signer_of_already_posted_invoice(self):
+        # Note: Changing this behavior might not be a good idea as having all account.move updated at once
+        # would be very costly
+        self.invoice.action_post()
+        self.env.company.signing_user = self.another_user  # set the representative user of the company
+        self.assertEqual(self.invoice.signing_user, self.user,
+                         "The signing user should be the one that posted the invoice even if a representative has been added later on")
+        self.assertEqual(self.invoice.signature, self.signature_fake_1, "The signature should be from `self.user`")
diff --git a/dev_odex30_accounting/odex30_account_accountant/tests/test_ui.py b/dev_odex30_accounting/odex30_account_accountant/tests/test_ui.py
new file mode 100644
index 0000000..93e7c36
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_accountant/tests/test_ui.py
@@ -0,0 +1,64 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+import logging
+
+from odoo import Command, fields
+from odoo.addons.account.tests.common import AccountTestMockOnlineSyncCommon
+import odoo.tests
+
+_logger = logging.getLogger(__name__)
+
+
+@odoo.tests.tagged('-at_install', 'post_install')
+class TestUi(AccountTestMockOnlineSyncCommon):
+    def test_accountant_tour(self):
+        # Reset country and fiscal country, so that fields added by localizations are
+        # hidden and non-required, and don't make the tour crash.
+        # Also remove default taxes from the company and its accounts, to avoid inconsistencies
+        # with empty fiscal country.
+        self.env.company.write({
+            'country_id': None,  # Also resets account_fiscal_country_id
+            'account_sale_tax_id': None,
+            'account_purchase_tax_id': None,
+        })
+
+        # An unconfigured bank journal is required for the connect bank step
+        self.env['account.journal'].create({
+            'type': 'bank',
+            'name': 'Empty Bank',
+            'code': 'EBJ',
+        })
+
+        account_with_taxes = self.env['account.account'].search([('tax_ids', '!=', False), ('company_ids', '=', self.env.company.id)])
+        account_with_taxes.write({
+            'tax_ids': [Command.clear()],
+        })
+        # This tour doesn't work with demo data on runbot
+        all_moves = self.env['account.move'].search([('company_id', '=', self.env.company.id), ('move_type', '!=', 'entry')])
+        all_moves.filtered(lambda m: not m.inalterable_hash and not m.deferred_move_ids and m.state != 'draft').button_draft()
+        all_moves.with_context(force_delete=True).unlink()
+        # We need at least two bank statement lines to reconcile for the tour.
+        bnk = self.env['account.account'].create({
+            'code': 'X1014',
+            'name': 'Bank Current Account - (test)',
+            'account_type': 'asset_cash',
+        })
+        journal = self.env['account.journal'].create({
+            'name': 'Bank - Test',
+            'code': 'TBNK',
+            'type': 'bank',
+            'default_account_id': bnk.id,
+        })
+        self.env['account.bank.statement.line'].create([{
+            'journal_id': journal.id,
+            'amount': 100,
+            'date': fields.Date.today(),
+            'payment_ref': 'stl_0001',
+        }, {
+            'journal_id': journal.id,
+            'amount': 200,
+            'date': fields.Date.today(),
+            'payment_ref': 'stl_0002',
+        }])
+        self.start_tour("/odoo", 'odex30_account_accountant_tour', login="admin")
diff --git a/dev_odex30_accounting/odex30_account_accountant/views/account_fiscal_year_view.xml b/dev_odex30_accounting/odex30_account_accountant/views/account_fiscal_year_view.xml
new file mode 100644
index 0000000..d41d4bf
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_accountant/views/account_fiscal_year_view.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<odoo>
+    <record id="actions_account_fiscal_year" model="ir.actions.act_window">
+        <field name="name">Fiscal Years</field>
+        <field name="res_model">account.fiscal.year</field>
+        <field name="view_mode">list,form</field>
+        <field name="help" type="html">
+            <p class="oe_view_nocontent_create">
+                Click here to create a new fiscal year.
+            </p>
+        </field>
+    </record>
+
+    <record id="action_account_fiscal_year_form" model="ir.ui.view">
+        <field name="name">account.fiscal.year.form</field>
+        <field name="model">account.fiscal.year</field>
+        <field name="arch" type="xml">
+            <form>
+                <sheet>
+                    <group>
+                        <field name="name" placeholder="Fiscal Year 2018"/>
+                        <field name="date_from"/>
+                        <field name="date_to"/>
+                        <field name="company_id" groups="base.group_multi_company"/>
+                    </group>
+                </sheet>
+            </form>
+        </field>
+    </record>
+
+    <record id="action_account_fiscal_year_search" model="ir.ui.view">
+        <field name="name">account.fiscal.year.search</field>
+        <field name="model">account.fiscal.year</field>
+        <field name="arch" type="xml">
+            <search>
+                <field name="name"/>
+            </search>
+        </field>
+    </record>
+
+    <record id="action_account_fiscal_year_tree" model="ir.ui.view">
+        <field name="name">account.fiscal.year.list</field>
+        <field name="model">account.fiscal.year</field>
+        <field name="arch" type="xml">
+            <list>
+                <field name="name"/>
+                <field name="date_from"/>
+                <field name="date_to"/>
+                <field name="company_id" groups="base.group_multi_company"/>
+            </list>
+        </field>
+    </record>
+</odoo>
diff --git a/dev_odex30_accounting/odex30_account_accountant/views/account_journal_dashboard_views.xml b/dev_odex30_accounting/odex30_account_accountant/views/account_journal_dashboard_views.xml
new file mode 100644
index 0000000..0af6058
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_accountant/views/account_journal_dashboard_views.xml
@@ -0,0 +1,44 @@
+<odoo>
+    <record id="account_journal_dashboard_kanban_view" model="ir.ui.view">
+        <field name="name">account.journal.dashboard.kanban</field>
+        <field name="model">account.journal</field>
+        <field name="inherit_id" ref="account.account_journal_dashboard_kanban_view"/>
+        <field name="arch" type="xml">
+            <xpath expr="//div[@id='sale_purchase_refund']" position="after">
+                <div>
+                    <a type="object" name="action_open_reconcile" groups="account.group_account_user">Payments Matching</a>
+                </div>
+            </xpath>
+            <xpath expr="//div[@name='bank_cash_buttons']" position="inside">
+                <button t-if="dashboard.number_to_reconcile > 0" type="object" name="action_open_reconcile" class="btn btn-secondary d-block text-nowrap" groups="account.group_account_basic"><t t-out="dashboard.number_to_reconcile"/> to reconcile</button>
+            </xpath>
+
+            <xpath expr="//div[@name='latest_statement']//span" position="replace">
+                <a type="object"
+                   name="action_open_reconcile_statement"
+                   title="Latest Statement"
+                   t-att-context="{'statement_id': dashboard.last_statement_id}">
+                    Last Statement
+                </a>
+            </xpath>
+
+            <xpath expr="//div[@id='dashboard_bank_cash_right']" position="inside">
+                <t t-if="dashboard.number_to_check > 0">
+                    <div class="row" groups="account.group_account_readonly">
+                        <div class="col overflow-hidden text-start">
+                            <a type="object" name="action_open_to_check"><t t-out="dashboard.number_to_check"/> to check</a>
+                        </div>
+                        <div class="col-auto text-end">
+                            <span dir="ltr"><t t-out="dashboard.to_check_balance"/></span>
+                        </div>
+                    </div>
+                </t>
+            </xpath>
+            <xpath expr="//h5[@id='card_action_view_menus']" position="after">
+                <div>
+                    <a role="menuitem" type="object" name="action_open_bank_transactions">Transactions</a>
+                </div>
+            </xpath>
+        </field>
+    </record>
+</odoo>
diff --git a/dev_odex30_accounting/odex30_account_accountant/views/account_move_views.xml b/dev_odex30_accounting/odex30_account_accountant/views/account_move_views.xml
new file mode 100644
index 0000000..a7b3508
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_accountant/views/account_move_views.xml
@@ -0,0 +1,145 @@
+<?xml version='1.0' encoding='utf-8'?>
+<odoo>
+    <record id="view_move_line_tree" model="ir.ui.view">
+        <field name="name">account.move.line.list</field>
+        <field name="model">account.move.line</field>
+        <field name="inherit_id" ref="account.view_move_line_tree"/>
+        <field name="mode">extension</field>
+        <field name="arch" type="xml">
+            <xpath expr="//list" position="attributes">
+                <attribute name="js_class">account_move_line_list</attribute>
+            </xpath>
+            <xpath expr="//list" position="inside">
+               <header>
+                    <button name="action_reconcile" type="object" string="Reconcile" groups="account.group_account_user" data-hotkey="r"/>
+                </header>
+                <field name="is_account_reconcile" column_invisible="True"/>
+                <field name="has_deferred_moves" column_invisible="True"/>
+            </xpath>
+            <xpath expr="//list/field[@name='name']" position="after">
+                <field name="deferred_start_date" optional="hide" readonly="has_deferred_moves"/>
+                <field name="deferred_end_date" optional="hide" readonly="has_deferred_moves"/>
+            </xpath>
+            <xpath expr="//list/field[@name='matching_number']" position="attributes">
+                <attribute name="widget">matching_link_widget</attribute>
+            </xpath>
+        </field>
+    </record>
+
+    <record id="view_move_line_payment_tree" model="ir.ui.view">
+        <field name="name">account.move.line.payment.list</field>
+        <field name="model">account.move.line</field>
+        <field name="inherit_id" ref="account.view_move_line_payment_tree"/>
+        <field name="mode">extension</field>
+        <field name="arch" type="xml">
+            <xpath expr="//button[@name='action_payment_items_register_payment']" position="after">
+                <button name="action_reconcile" type="object" string="Reconcile" groups="account.group_account_user"/>
+            </xpath>
+        </field>
+    </record>
+
+    <record id="view_move_form_inherit" model="ir.ui.view">
+        <field name="name">account.move.form.inherit</field>
+        <field name="model">account.move</field>
+        <field name="inherit_id" ref="account.view_move_form"/>
+        <field name="arch" type="xml">
+            <xpath expr="//page[@id='other_tab']//field[@name='fiscal_position_id']" position="after">
+                <field name="inalterable_hash" groups="base.group_no_one"/>
+            </xpath>
+            <xpath expr="//page[@id='other_tab_entry']//field[@name='company_id']" position="after">
+                <field name="inalterable_hash" groups="base.group_no_one"/>
+            </xpath>
+            <xpath expr="//list/field[@name='analytic_distribution']" position="after">
+                <field name="has_abnormal_deferred_dates" column_invisible="1"/>
+                <field name="deferred_start_date" optional="hide" decoration-warning="has_abnormal_deferred_dates"/>
+                <field name="deferred_end_date" optional="hide" decoration-warning="has_abnormal_deferred_dates"/>
+            </xpath>
+            <xpath expr="//div[@name='button_box']" position="inside">
+                <button name="action_open_bank_reconciliation_widget_statement"
+                        class="oe_stat_button"
+                        icon="fa-bars"
+                        type="object"
+                        invisible="not statement_id or state == 'cancel'">
+                        <div class="o_stat_info">
+                            <span class="o_stat_text">Bank Statement</span>
+                        </div>
+                </button>
+                <button name="action_open_bank_reconciliation_widget"
+                        class="oe_stat_button"
+                        icon="fa-bars"
+                        type="object"
+                        invisible="move_type != 'entry' or not id or not statement_line_id or state == 'cancel'">
+                        <div class="o_stat_info">
+                            <span class="o_stat_text">1 Bank Transaction</span>
+                        </div>
+                </button>
+                <field name="deferred_move_ids" invisible="1"/>
+                <field name="deferred_original_move_ids" invisible="1"/>
+                <field name="deferred_entry_type" invisible="1"/>
+                <button name="open_deferred_entries"
+                        class="oe_stat_button"
+                        icon="fa-bars"
+                        type="object"
+                        invisible="not deferred_move_ids"
+                        string="Deferred Entries">
+                </button>
+                <button name="open_deferred_original_entry"
+                        class="oe_stat_button"
+                        icon="fa-bars"
+                        type="object"
+                        invisible="deferred_entry_type == 'revenue' or not deferred_original_move_ids"
+                        string="Related Purchase(s)">
+                </button>
+                <button name="open_deferred_original_entry"
+                        class="oe_stat_button"
+                        icon="fa-bars"
+                        type="object"
+                        invisible="deferred_entry_type == 'expense' or not deferred_original_move_ids"
+                        string="Related Sale(s)">
+                </button>
+            </xpath>
+        </field>
+    </record>
+
+    <record id="view_deferred_entries_tree" model="ir.ui.view">
+        <field name="name">account.move.line.deferral.entries.list</field>
+        <field name="model">account.move.line</field>
+        <field name="inherit_id" ref="account.view_move_line_tree"/>
+        <field name="mode">primary</field>
+        <field name="arch" type="xml">
+            <xpath expr="//list" position="attributes">
+                <attribute name="default_order">date</attribute>
+            </xpath>
+            <xpath expr="//field[@name='partner_id']" position="attributes">
+                <attribute name="optional">hide</attribute>
+            </xpath>
+            <xpath expr="//field[@name='tax_ids']" position="attributes">
+                <attribute name="optional">hide</attribute>
+            </xpath>
+            <xpath expr="//field[@name='amount_currency']" position="attributes">
+                <attribute name="optional">hide</attribute>
+            </xpath>
+            <xpath expr="//field[@name='analytic_distribution']" position="attributes">
+                <attribute name="optional">hide</attribute>
+            </xpath>
+            <xpath expr="//field[@name='matching_number']" position="attributes">
+                <attribute name="optional">hide</attribute>
+            </xpath>
+            <xpath expr="//field[@name='discount_date']" position="attributes">
+                <attribute name="column_invisible">1</attribute>
+            </xpath>
+            <xpath expr="//field[@name='discount_amount_currency']" position="attributes">
+                <attribute name="column_invisible">1</attribute>
+            </xpath>
+            <xpath expr="//field[@name='date_maturity']" position="attributes">
+                <attribute name="column_invisible">1</attribute>
+            </xpath>
+            <xpath expr="//field[@name='amount_residual']" position="attributes">
+                <attribute name="column_invisible">1</attribute>
+            </xpath>
+            <xpath expr="//field[@name='amount_residual_currency']" position="attributes">
+                <attribute name="column_invisible">1</attribute>
+            </xpath>
+        </field>
+    </record>
+</odoo>
diff --git a/dev_odex30_accounting/odex30_account_accountant/views/account_payment_views.xml b/dev_odex30_accounting/odex30_account_accountant/views/account_payment_views.xml
new file mode 100644
index 0000000..d1e2415
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_accountant/views/account_payment_views.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <record id="view_account_payment_form_inherit_account_accountant" model="ir.ui.view">
+        <field name="name">account.payment.form.inherit.odex30_account_accountant</field>
+        <field name="model">account.payment</field>
+        <field name="inherit_id" ref="account.view_account_payment_form"/>
+        <field name="arch" type="xml">
+            <xpath expr="//button[@name='button_open_journal_entry']" position="attributes">
+                <attribute name="groups">account.group_account_user</attribute>
+            </xpath>
+
+            <!-- Stat button to open the manual reconciliation widget -->
+            <xpath expr="//div[@name='button_box']" position="inside">
+                <button name="action_open_manual_reconciliation_widget" type="object"
+                        string="Payment Matching" class="oe_stat_button" icon="fa-dollar"
+                        groups="account.group_account_user"
+                        invisible="is_reconciled or not move_id or state not in ('in_process', 'paid')"/>
+            </xpath>
+        </field>
+    </record>
+</odoo>
diff --git a/dev_odex30_accounting/odex30_account_accountant/views/account_reconcile_model_views.xml b/dev_odex30_accounting/odex30_account_accountant/views/account_reconcile_model_views.xml
new file mode 100644
index 0000000..9e50789
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_accountant/views/account_reconcile_model_views.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <data>
+        <record id="account_reconcile_model_form_inherit_account_accountant" model="ir.ui.view">
+            <field name="name">account.reconcile.model.form.inherit.odex30_account_accountant</field>
+            <field name="model">account.reconcile.model</field>
+            <field name="inherit_id" ref="account.view_account_reconcile_model_form"/>
+            <field name="arch" type="xml">
+                <xpath expr="//field[@name='auto_reconcile']" position="replace">
+                    <label for="auto_reconcile" invisible="rule_type == 'writeoff_button'"/>
+                    <div class="o_row" invisible="rule_type == 'writeoff_button'">
+                        <field name="auto_reconcile"/>
+                        <button name="run_auto_reconciliation" invisible="not auto_reconcile" type="object" class="btn-link">
+                            <i title="Run manually" role="img" aria-label="Run manually" class="fa fa-refresh"/>
+                            Run manually
+                        </button>
+                    </div>
+                </xpath>
+            </field>
+        </record>
+    </data>
+</odoo>
diff --git a/dev_odex30_accounting/odex30_account_accountant/views/bank_rec_widget_views.xml b/dev_odex30_accounting/odex30_account_accountant/views/bank_rec_widget_views.xml
new file mode 100644
index 0000000..51afa7a
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_accountant/views/bank_rec_widget_views.xml
@@ -0,0 +1,469 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <data>
+        <record id="view_bank_statement_form_bank_rec_widget" model="ir.ui.view">
+            <field name="name">account.bank.statement.form.bank_rec_widget</field>
+            <field name="model">account.bank.statement</field>
+            <field name="priority">10</field>
+            <field name="arch" type="xml">
+                <form string="Bank Statement">
+                    <div class="alert alert-warning text-center" role="alert" invisible="is_valid and is_complete">
+                        <field name="problem_description"/>
+                    </div>
+                    <sheet>
+                        <div class="oe_button_box" name="button_box">
+                            <button name="action_open_bank_reconcile_widget" type="object"
+                                class="oe_stat_button" invisible="not line_ids">
+                            <field name="line_ids" widget="statinfo" />
+                        </button>
+                        </div>
+                        <group>
+                            <field name="create_date" invisible="1"/>
+                            <field name="is_valid" invisible="1"/>
+                            <field name="is_complete" invisible="1"/>
+                            <field name="currency_id" invisible="1"/>
+                            <field name="journal_id" invisible="1"/>
+                            <field name="name" required="1" />
+                            <field name="balance_start"/>
+                            <field name="balance_end_real"/>
+                            <field name="attachment_ids" widget="many2many_binary"/>
+                        </group>
+                    </sheet>
+                    <div class="o_attachment_preview"/>
+                    <chatter/>
+                </form>
+            </field>
+        </record>
+
+        <record id="action_bank_statement_form_bank_rec_widget" model="ir.actions.act_window">
+            <!-- Binding removed since the same can be achieved with multi-edit -->
+            <field name="name">Create Statement</field>
+            <field name="res_model">account.bank.statement</field>
+            <field name="view_mode">form</field>
+            <field name="view_id" ref="view_bank_statement_form_bank_rec_widget"/>
+            <field name="target">new</field>
+            <field name="context">{'dialog_size': 'medium', 'show_running_balance_latest': True}</field>
+        </record>
+
+        <!-- Search view on aml to be injected inside the form (view_bank_rec_widget_form) -->
+        <record id="view_bank_statement_line_search_bank_rec_widget" model="ir.ui.view">
+            <field name="name">account.bank.statement.line.search.bank_rec_widget</field>
+            <field name="model">account.bank.statement.line</field>
+            <field name="priority">999</field>
+            <field name="arch" type="xml">
+                <search>
+                    <field name="name"
+                           string="Transaction"
+                           filter_domain="['|', '|', '|', '|', '|', '|', ('payment_ref', 'ilike', self), ('narration', 'ilike', self), ('partner_id', 'ilike', self), ('partner_name', 'ilike', self), ('partner_bank_id', 'ilike', self), ('account_number', 'ilike', self), ('amount', 'ilike', self)]"/>
+                    <field name="id" invisible="1"/>
+                    <field name="payment_ref"/>
+                    <field name="date"/>
+                    <field name="statement_id"/>
+                    <field name="partner_id"/>
+                    <field name="journal_id"
+                           domain="[('type', 'in', ('bank', 'cash'))]"
+                           invisible="context.get('default_journal_id')"/>
+                    <field name="narration" string="Notes"/>
+                    <field name="transaction_type"/>
+                    <field name="amount"/>
+                    <field name="is_reconciled"/>
+                    <field name="move_id"
+                           string="Journal Entry"
+                           filter_domain="['|', ('move_id.name', 'ilike', self), ('move_id.ref', 'ilike', self)]"/>
+                    <field name="statement_line_id" string="Statement Line"/>
+                    <separator/>
+                    <filter name="deposits" string="Deposits" domain="[('amount', '>', 0.0)]"/>
+                    <filter name="payments" string="Payments" domain="[('amount', '&lt;', 0.0)]"/>
+                    <separator/>
+                    <filter name="no_statement" string="No statement" domain="[('statement_id', '=', False)]"/>
+                    <filter name="invalid_statement" string="Invalid statements"
+                            domain="['|',('statement_complete', '=', False), ('statement_valid', '=', False)]"/>
+                    <separator/>
+                    <filter name="matched" string="Matched" domain="[('is_reconciled', '=', True)]"/>
+                    <filter name="not_matched" string="Not Matched"
+                            domain="[('is_reconciled', '=', False), ('checked', '=', True)]"/>
+                    <filter name="to_check" string="To Check" domain="[('checked', '=', False)]"/>
+                    <separator/>
+                    <filter name="date" string="Date" date="date"/>
+                    <separator/>
+                    <filter name="statement_group" string="Statement" context="{'group_by': 'statement_id'}"/>
+                    <filter name="journal_group" string="Journal" context="{'group_by': 'journal_id'}"/>
+                    <filter name="date_group" string="Date" context="{'group_by': 'date'}"/>
+                    <filter name="invoice_date_group" string="Invoice Date" domain="[]" context="{'group_by': 'invoice_date'}"/>
+                </search>
+            </field>
+        </record>
+
+        <!-- Kanban view on statement line injected inside the form (view_bank_rec_widget) -->
+        <record id="view_bank_statement_line_kanban_bank_rec_widget" model="ir.ui.view">
+            <field name="name">account.bank.statement.line.kanban.bank_rec_widget</field>
+            <field name="model">account.bank.statement.line</field>
+            <field name="arch" type="xml">
+                <kanban js_class="bank_rec_widget_kanban"
+                        on_create="quick_create"
+                        quick_create_view="odex30_account_accountant.view_bank_statement_line_quick_create_form_bank_rec_widget">
+                    <field name="id"/>
+                    <field name="state"/>
+                    <field name="statement_complete"/>
+                    <field name="statement_valid"/>
+                    <field name="statement_balance_end_real"/>
+                    <field name="statement_name"/>
+                    <field name="journal_id"/>
+                    <field name="statement_id"/>
+                    <field name="is_reconciled"/>
+                    <field name="checked"/>
+                    <field name="currency_id"/>
+                    <templates>
+                        <t t-name="card">
+                            <div t-if="!record.statement_id.raw_value"
+                                 class="statement_separator text-center">
+                                <a role="button" class="btn btn-secondary btn-sm"
+                                   context="{'split_line_id': id, 'default_journal_id': journal_id}"
+                                   tabindex="-1"
+                                   type="action" name="%(odex30_account_accountant.action_bank_statement_form_bank_rec_widget)d">
+                                    Statement
+                                </a>
+                            </div>
+
+                            <div t-att-st-line-id="record.id.raw_value"
+                                 t-att-st-line-todo="!record.is_reconciled.raw_value || !record.checked.raw_value"
+                                 style="width:100%">
+
+                                <t t-set="text_amount_class"
+                                   t-value="record.amount.raw_value &lt; 0.0 and 'text-danger'"/>
+
+                                <div class="d-flex">
+                                    <!-- Row 1 -->
+                                    <field name="date" class="fw-bolder text-nowrap" readonly="state in ['cancel', 'posted']"/>
+                                    <field name="partner_id" class="flex-fill text-truncate ms-1 fst-italic ps-2"/>
+                                    <div t-att-class="text_amount_class">
+                                        <field name="amount" class="fw-bolder text-nowrap"/>
+                                    </div>
+                                </div>
+
+                                    <!-- Row 2 -->
+                                <div class="d-flex">
+                                    <field name="payment_ref" class="text-truncate flex-fill"/>
+                                    <div class="m-1 d-flex flex-row flex-nowrap">
+                                        <span t-if="!record.checked.raw_value" class="badge text-bg-warning fw-normal">To check</span>
+                                        <div t-if="record.is_reconciled.raw_value" class="badge text-bg-success fw-normal" title="Matched">
+                                            <i class="fa fa-check"/>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                        </t>
+                    </templates>
+                </kanban>
+            </field>
+        </record>
+
+        <record id="view_bank_statement_line_tree_bank_rec_widget" model="ir.ui.view">
+            <field name="name">account.bank.statement.line.list.bank_rec_widget</field>
+            <field name="model">account.bank.statement.line</field>
+            <field name="arch" type="xml">
+                <list editable="top"
+                      multi_edit="1"
+                      js_class="bank_rec_list"
+                      decoration-muted="state == 'draft'"
+                      default_order="internal_index desc">
+                    <!--Invisible fields-->
+                    <field name="statement_complete" column_invisible="True"/>
+                    <field name="statement_valid" column_invisible="True"/>
+                    <field name="state" column_invisible="True"/>
+                    <field name="is_reconciled" column_invisible="True"/>
+                    <field name="checked" column_invisible="True"/>
+                    <field name="country_code" column_invisible="True"/>
+                    <field name="currency_id" column_invisible="True"/>
+                    <field name="company_id" column_invisible="True"/>
+
+                    <!--Visible fields-->
+                    <field name="sequence" widget="handle" column_invisible="True"/> <!--Until we add the JS class-->
+                    <field name="date" readonly="is_reconciled and amount != 0"
+                           options="{'warn_future': true}"/>
+                    <field name="move_id" optional="hidden" required="0"/>
+                    <field name="payment_ref" required="1" readonly="is_reconciled and amount != 0"/>
+                    <field name="partner_id" readonly="is_reconciled and amount != 0"/>
+                    <field name="account_number" optional="hidden"/>
+                    <field name="narration"
+                           string="Notes"
+                           readonly="is_reconciled and amount != 0"
+                           optional="hidden"/>
+                    <field name="ref" readonly="is_reconciled and amount != 0" optional="hidden"/>
+                    <field name="transaction_type" optional="hidden"/>
+                    <field name="foreign_currency_id"
+                           optional="hidden"
+                           groups="base.group_multi_currency"
+                           domain="[('id', '!=', currency_id)]"
+                           options="{'no_open': True, 'no_create': True}"
+                           readonly="is_reconciled and amount != 0"/>
+                    <field name="amount_currency"
+                           optional="hidden"
+                           groups="base.group_multi_currency"
+                           invisible="not foreign_currency_id"
+                           readonly="is_reconciled and amount != 0"/>
+                    <field name="amount" readonly="is_reconciled and amount != 0" />
+                    <field name="journal_id"
+                           domain="[('type', 'in', ['bank','cash'])]"
+                           column_invisible="bool(context.get('default_journal_id'))"
+                           readonly="(statement_id or is_reconciled) and amount != 0"/>
+                    <field name="running_balance" class="oe_read_only"/>
+                    <field name="statement_id"
+                           optional="show"
+                           options="{'no_quick_create': True}"
+                           domain="['|',('journal_id', '=', journal_id),('journal_id', '=', False)]"
+                           context="{
+                                'default_journal_id':journal_id,
+                                'form_view_ref': 'odex30_account_accountant.view_bank_statement_form_bank_rec_widget',
+                                'st_line_id':id,
+                            }"
+                           decoration-danger="statement_complete == False or statement_valid == False"
+                           widget="bank_rec_list_many2one_multi_id"
+                           readonly="not id"/>
+                    <field name="id"
+                           widget="bank_rec_list_view_switcher"
+                           invisible="not id"/>
+                </list>
+            </field>
+        </record>
+
+        <!-- Form view for adding statement lines on the fly in a popup-->
+        <record id="view_bank_statement_line_form_bank_rec_widget" model="ir.ui.view">
+            <field name="name">account.bank.statement.line.form.bank_rec_widget</field>
+            <field name="model">account.bank.statement.line</field>
+            <field name="arch" type="xml">
+                <form string="New Transaction">
+                    <field name="state" invisible="1"/>
+                    <field name="statement_complete" invisible="1"/>
+                    <field name="statement_valid" invisible="1"/>
+                    <field name="is_reconciled" invisible="1"/>
+                    <field name="suitable_journal_ids" invisible="1"/>
+                    <field name="currency_id" invisible="1"/>
+                    <field name="company_id" invisible="1"/>
+                    <group>
+                        <group>
+                            <field name="date" readonly="is_reconciled and amount != 0"/>
+                            <field name="payment_ref"
+                                   required="1"
+                                   readonly="is_reconciled and amount != 0"/>
+                            <field name="partner_id"
+                                   readonly="is_reconciled and amount != 0"/>
+                        </group>
+                        <group>
+                            <field name="amount" readonly="is_reconciled and amount != 0"/>
+                            <field name="foreign_currency_id"
+                                   groups="base.group_multi_currency"
+                                   domain="[('id', '!=', currency_id)]"
+                                   options="{'no_open': True, 'no_create': True}"
+                                   readonly="is_reconciled and amount != 0"/>
+                            <field name="amount_currency"
+                                   groups="base.group_multi_currency"
+                                   invisible="not foreign_currency_id"
+                                   readonly="is_reconciled and amount != 0"/>
+                            <field name="journal_id"
+                                   domain="[('type', 'in', ['bank', 'cash'])]"
+                                   readonly="context.get('default_journal_id') or (is_reconciled and amount != 0)"/>
+                        </group>
+                    </group>
+                    <footer>
+                        <button string="Save &amp; Close" type="object"
+                                name="action_save_close" class="btn btn-primary"
+                                data-hotkey="q"/>
+                        <button string="Save &amp; New" type="object"
+                                name="action_save_new" class="btn btn-primary"
+                                data-hotkey="n"/>
+                        <button string="Cancel" class="btn-secondary"
+                                special="cancel" data-hotkey="x"/>
+                    </footer>
+                </form>
+            </field>
+        </record>
+
+        <!-- Form view for quick creating statement lines -->
+        <record id="view_bank_statement_line_quick_create_form_bank_rec_widget" model="ir.ui.view">
+            <field name="name">account.bank.statement.line.form.bank_rec_widget</field>
+            <field name="model">account.bank.statement.line</field>
+            <field name="arch" type="xml">
+                <form string="New Transaction">
+                    <field name="journal_id" invisible="1"/>
+                    <field name="currency_id" invisible="1"/>
+                    <group>
+                        <field name="date" readonly="is_reconciled and amount != 0" nolabel="1"/>
+                        <field name="partner_id"
+                            readonly="is_reconciled and amount != 0"
+                            nolabel="1"
+                            placeholder="Partner"/>
+                        <field name="amount" readonly="is_reconciled and amount != 0" nolabel="1"/>
+                    </group>
+                    <field name="payment_ref"
+                        required="1"
+                        readonly="is_reconciled and amount != 0"
+                        nolabel="1"
+                        placeholder="Memo"/>
+                </form>
+            </field>
+        </record>
+
+        <record id="action_bank_statement_line_form_bank_rec_widget" model="ir.actions.act_window">
+            <field name="name">New Transaction</field>
+            <field name="res_model">account.bank.statement.line</field>
+            <field name="view_mode">form</field>
+            <field name="view_id" ref="view_bank_statement_line_form_bank_rec_widget"/>
+            <field name="target">new</field>
+        </record>
+
+        <!--
+            The action record of Bank Reconciliation has a duplicate one below it with different view_mode (and path).
+            This was needed because the function "_action_open_bank_reconciliation_widget" was expected to return 2 
+            different view_modes namely list,kanban and kanban,list depending on the boolean "kanban_first".
+            The solution of changing the action dict was not useful because the dict view_mode would be erased on page refresh.
+        -->
+        <record id="action_bank_statement_line_transactions" model="ir.actions.act_window">
+            <field name="name">Bank Reconciliation</field>
+            <field name="res_model">account.bank.statement.line</field>
+            <field name="view_mode">list,kanban</field>
+            <field name="search_view_id" ref="view_bank_statement_line_search_bank_rec_widget"/>
+            <field name="view_id" ref="view_bank_statement_line_tree_bank_rec_widget"/>
+            <field name="path">reconciliation_list</field>
+            <field name="domain">[('state', '!=', 'cancel')]</field>
+            <field name="context">{'default_journal_id': active_id, 'search_default_journal_id': active_id}</field>
+            <field name="help" type="html">
+                <p class='o_view_nocontent_smiling_face'>Nothing to do here!</p>
+                <p>No transactions matching your filters were found.</p>
+            </field>
+        </record>
+
+        <record id="action_bank_statement_line_transactions_kanban" model="ir.actions.act_window">
+            <field name="name">Bank Reconciliation</field>
+            <field name="res_model">account.bank.statement.line</field>
+            <field name="view_mode">kanban,list</field>
+            <field name="search_view_id" ref="view_bank_statement_line_search_bank_rec_widget"/>
+            <field name="view_id" ref="view_bank_statement_line_kanban_bank_rec_widget"/>
+            <field name="path">reconciliation</field>
+            <field name="domain">[('state', '!=', 'cancel')]</field>
+            <field name="context">{'default_journal_id': active_id, 'search_default_journal_id': active_id}</field>
+            <field name="help" type="html">
+                <p class='o_view_nocontent_smiling_face'>Nothing to do here!</p>
+                <p>No transactions matching your filters were found.</p>
+            </field>
+        </record>
+
+        <record id="view_move_form_bank_rec_widget" model="ir.ui.view">
+            <field name="name">account.move.form.bank_rec_widget</field>
+            <field name="model">account.move</field>
+            <field name="priority">999</field>
+            <field name="arch" type="xml">
+                <form>
+                    <chatter/>
+                </form>
+            </field>
+        </record>
+
+        <!-- Search view on aml to be injected inside the form (view_bank_rec_widget_form) -->
+        <record id="view_account_move_line_search_bank_rec_widget" model="ir.ui.view">
+            <field name="name">account.move.line.search.bank_rec_widget</field>
+            <field name="model">account.move.line</field>
+            <field name="priority">999</field>
+            <field name="arch" type="xml">
+                <search>
+                    <field name="name"
+                           string="Journal Item"
+                           filter_domain="['|', '|', '|', '|', '|', ('name', 'ilike', self), ('ref', 'ilike', self), ('partner_id', 'ilike', self), ('amount_residual', 'ilike', self), ('amount_residual_currency', 'ilike', self), ('discount_amount_currency', 'ilike', self)]"/>
+                    <field name="invoice_date"/>
+                    <field name="date"/>
+                    <field name="account_id"/>
+                    <field name="partner_id"/>
+                    <field name="journal_id"/>
+                    <field name="currency_id" groups="base.group_multi_currency"/>
+                    <field name="move_id"
+                           string="Journal Entry"
+                           filter_domain="['|', ('move_id.name', 'ilike', self), ('move_id.ref', 'ilike', self)]"/>
+                    <separator/>
+                    <filter name="amount_received" string="Incoming" domain="[('balance', '>', 0.0)]"/>
+                    <filter name="amount_paid" string="Outgoing" domain="[('balance', '&lt;', 0.0)]"/>
+                    <separator name="inject_after"/>
+                    <filter name="date" string="Date" date="date"/>
+                    <filter name="invoice_date" string="Invoice Date" date="invoice_date"/>
+                </search>
+            </field>
+        </record>
+
+        <!-- List view on aml to be injected inside the form (view_bank_rec_widget_form) -->
+        <record id="view_account_move_line_list_bank_rec_widget" model="ir.ui.view">
+            <field name="name">account.move.line.list.bank_rec_widget</field>
+            <field name="model">account.move.line</field>
+            <field name="priority">999</field>
+            <field name="arch" type="xml">
+                <list string="Suggestions"
+                      create="false"
+                      edit="false"
+                      limit="40"
+                      count_limit="40"
+                      js_class="bank_rec_amls_list_view">
+                    <!-- Invisible fields -->
+                    <field name="company_id" column_invisible="True"/>
+                    <field name="payment_id" column_invisible="True"/>
+                    <field name="currency_id" column_invisible="True"/>
+                    <field name="company_currency_id" column_invisible="True"/>
+
+                    <field name="account_id"
+                           options="{'no_open': True, 'no_create': True}"
+                           groups="account.group_account_readonly"
+                           optional="show"/>
+                    <field name="journal_id"
+                           optional="hidden"/>
+                    <field name="partner_id"
+                           optional="show"/>
+                    <field name="invoice_date" string="Invoice Date" optional="hide"/>
+                    <field name="date"/>
+                    <field name="move_id" string="Document" groups="!account.group_account_readonly"/>
+                    <field name="move_id" groups="account.group_account_readonly"/>
+                    <field name="name"/>
+                    <field name="date_maturity" optional="hidden"/>
+                    <field name="ref"
+                           optional="hidden"/>
+                    <field name="analytic_distribution" widget="analytic_distribution"
+                           groups="analytic.group_analytic_accounting"
+                           optional="hidden"
+                           options="{'account_field': 'account_id', 'business_domain': 'general'}"/>
+                    <field name="amount_residual_currency"
+                           decoration-danger="amount_residual_currency &lt; 0"
+                           groups="base.group_multi_currency"
+                           string="Amount Due (in currency)"/>
+                    <field name="amount_residual"
+                           decoration-danger="amount_residual &lt; 0"
+                           string="Amount Due"/>
+
+                    <button name="action_open_business_doc"
+                            type="object"
+                            string="View"
+                            class="btn btn-sm btn-secondary"/>
+                </list>
+            </field>
+        </record>
+
+        <!-- Add bank recon widget to the statements list view -->
+        <record id="view_bank_statement_tree" model="ir.ui.view">
+            <field name="name">account.bank.statement.list</field>
+            <field name="model">account.bank.statement</field>
+            <field name="inherit_id" ref="account.view_bank_statement_tree"/>
+            <field name="arch" type="xml">
+                <list position="inside">
+                    <button name="action_open_bank_reconcile_widget" string="Transactions" type="object"/>
+                </list>
+            </field>
+        </record>
+
+        <record model="ir.actions.server" id="action_bank_statement_attachment">
+            <field name="name">Statement</field>
+            <field name="model_id" ref="model_account_bank_statement"/>
+            <field name="binding_model_id" ref="model_account_bank_statement" />
+            <field name="binding_type">report</field>
+            <field name="state">code</field>
+            <field name="code">
+if records:
+    action = records.action_generate_attachment()
+            </field>
+        </record>
+    </data>
+</odoo>
diff --git a/dev_odex30_accounting/odex30_account_accountant/views/digest_views.xml b/dev_odex30_accounting/odex30_account_accountant/views/digest_views.xml
new file mode 100644
index 0000000..af69a40
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_accountant/views/digest_views.xml
@@ -0,0 +1,14 @@
+<?xml version='1.0' encoding='utf-8'?>
+<odoo>
+    <record id="digest_digest_view_form" model="ir.ui.view">
+        <field name="name">digest.digest.view.form.inherit.account.accountant</field>
+        <field name="model">digest.digest</field>
+        <field name="priority">35</field>
+        <field name="inherit_id" ref="digest.digest_digest_view_form"/>
+        <field name="arch" type="xml">
+            <xpath expr="//field[@name='kpi_account_total_revenue']" position="after">
+                <field name="kpi_account_bank_cash"/>
+            </xpath>
+        </field>
+    </record>
+</odoo>
diff --git a/dev_odex30_accounting/odex30_account_accountant/views/odex30_account_account_views.xml b/dev_odex30_accounting/odex30_account_accountant/views/odex30_account_account_views.xml
new file mode 100644
index 0000000..8b063c4
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_accountant/views/odex30_account_account_views.xml
@@ -0,0 +1,41 @@
+<?xml version='1.0' encoding='utf-8'?>
+<odoo>
+    <record id="account_tag_action" model="ir.actions.act_window">
+        <field name="name">Account Tags</field>
+        <field name="res_model">account.account.tag</field>
+        <field name="search_view_id" ref="account.account_tag_view_search"/>
+        <field name="help" type="html">
+          <p class="o_view_nocontent_smiling_face">
+            Add a new tag
+          </p>
+        </field>
+    </record>
+
+    <record id="action_account_group_tree" model="ir.actions.act_window">
+        <field name="name">Account Groups</field>
+        <field name="res_model">account.group</field>
+        <field name="view_mode">list,form</field>
+        <field name="search_view_id" ref="account.view_account_group_search"/>
+        <field name="help" type="html">
+            <p class="o_view_nocontent_smiling_face">
+                Create a new account group
+            </p>
+        </field>
+    </record>
+
+    <record id="view_account_form" model="ir.ui.view">
+        <field name="name">account.account.form</field>
+        <field name="model">account.account</field>
+        <field name="inherit_id" ref="account.view_account_form"/>
+        <field name="arch" type="xml">
+            <field name="currency_id" position="after">
+                <label for="reconcile" invisible="account_type in ('asset_cash', 'liability_credit_card', 'off_balance')"/>
+                <div invisible="account_type in ('asset_cash', 'liability_credit_card', 'off_balance')">
+                   <field name="reconcile"/>
+                   <button name="action_open_reconcile" class="oe_link" type="object" string=" -> Reconcile" invisible="not reconcile"/>
+                </div>
+            </field>
+        </field>
+    </record>
+
+</odoo>
diff --git a/dev_odex30_accounting/odex30_account_accountant/views/odex30_account_accountant_menuitems.xml b/dev_odex30_accounting/odex30_account_accountant/views/odex30_account_accountant_menuitems.xml
new file mode 100644
index 0000000..9826c54
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_accountant/views/odex30_account_accountant_menuitems.xml
@@ -0,0 +1,36 @@
+<?xml version='1.0' encoding='utf-8'?>
+<odoo>
+    <menuitem id="menu_account_reconcile" name="Reconcile" parent="account.menu_finance_entries" action="action_move_line_posted_unreconciled" sequence="65" groups="account.group_account_user"/>
+    <menuitem id="account_tag_menu" parent="account.account_account_menu" action="account_tag_action" groups="base.group_no_one"/>
+    <menuitem id="menu_account_group" parent="account.account_account_menu" action="action_account_group_tree" groups="base.group_no_one"/>
+    <menuitem id="menu_account_fiscal_year" parent="account.account_account_menu" action="actions_account_fiscal_year" groups="odex30_account_accountant.group_fiscal_year"/>
+
+    <!-- Top menu item -->
+    <menuitem name="Accounting"
+        id="menu_accounting"
+        groups="account.group_account_readonly,account.group_account_invoice"
+        web_icon="odex30_account_accountant,static/description/icon.png"
+        sequence="40"/>
+    <!-- move existing submenus to point to the new parent -->
+    <record id="account.menu_finance_receivables" model="ir.ui.menu">
+        <field name="parent_id" ref="menu_accounting"/>
+    </record>
+    <record id="account.menu_finance_payables" model="ir.ui.menu">
+        <field name="parent_id" ref="menu_accounting"/>
+    </record>
+    <record id="account.menu_finance_entries" model="ir.ui.menu">
+        <field name="parent_id" ref="menu_accounting"/>
+    </record>
+    <record id="account.menu_finance_reports" model="ir.ui.menu">
+        <field name="parent_id" ref="menu_accounting"/>
+    </record>
+    <record id="account.menu_finance_configuration" model="ir.ui.menu">
+        <field name="parent_id" ref="menu_accounting"/>
+    </record>
+    <record id="account.menu_board_journal_1" model="ir.ui.menu">
+        <field name="parent_id" ref="menu_accounting"/>
+    </record>
+
+    <menuitem id="account.menu_account_config" name="Settings" parent="account.menu_finance_configuration" sequence="0" groups="base.group_system"/>
+
+</odoo>
diff --git a/dev_odex30_accounting/odex30_account_accountant/views/odex30_account_reconcile_views.xml b/dev_odex30_accounting/odex30_account_accountant/views/odex30_account_reconcile_views.xml
new file mode 100644
index 0000000..dd6f4f6
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_accountant/views/odex30_account_reconcile_views.xml
@@ -0,0 +1,122 @@
+<?xml version='1.0' encoding='utf-8'?>
+<odoo>
+    <record id="view_account_move_line_reconcile_search" model="ir.ui.view">
+        <field name="name">account.move.line.reconcile.search</field>
+        <field name="model">account.move.line</field>
+        <field name="priority" eval="300"/>
+        <field name="arch" type="xml">
+            <search string="Search Journal Items to Reconcile">
+                <field name="name"
+                       string="Journal Item"
+                       filter_domain="['|', '|', '|', ('name', 'ilike', self), ('ref', 'ilike', self), ('account_id', 'ilike', self), ('partner_id', 'ilike', self)]"/>
+                <field name="name"/>
+                <field name="ref"/>
+                <field name="invoice_date"/>
+                <field name="date"/>
+                <field name="balance" string="Amount" filter_domain="['|', ('credit', '=', self), ('debit', '=', self)]"/>
+                <field name="account_id"/>
+                <field name="account_type"/>
+                <field name="partner_id"/>
+                <field name="journal_id"/>
+                <field name="move_id"
+                       string="Journal Entry"
+                       filter_domain="['|', '|', ('move_id.name', 'ilike', self), ('move_id.ref', 'ilike', self), ('move_id.partner_id', 'ilike', self)]"/>
+                <field name="tax_ids" />
+                <field name="tax_line_id" string="Originator Tax"/>
+                <field name="reconcile_model_id"/>
+                <separator/>
+                <filter string="Unreconciled"
+                        domain="[('account_id.reconcile', '=', True), '|', ('matching_number', '=', False), ('matching_number', '=like', 'P%')]"
+                        name="reconcilable_account"
+                        help="Journal items where the account allows reconciliation no matter the residual amount"
+                />
+                <filter string="With residual" domain="[('amount_residual', '!=', 0), ('account_id.reconcile', '=', True)]" help="Journal items where matching number isn't set" name="unreconciled"/>
+                <separator/>
+                <filter string="Payable" domain="[('account_id.account_type', '=', 'liability_payable'), ('account_id.non_trade', '=', False)]" help="From Trade Payable accounts" name="trade_payable"/>
+                <filter string="Receivable" domain="[('account_id.account_type', '=', 'asset_receivable'), ('account_id.non_trade', '=', False)]" help="From Trade Receivable accounts" name="trade_receivable"/>
+                <separator/>
+                <filter string="Date" name="date" date="date"/>
+                <filter string="Invoice Date" name="invoice_date" date="invoice_date"/>
+                <separator/>
+                <group expand="0" string="Group By">
+                    <filter string="Journal Entry" name="group_by_move" domain="[]" context="{'group_by': 'move_name'}"/>
+                    <filter string="Account" name="group_by_account" domain="[]" context="{'group_by': 'account_id'}"/>
+                    <filter string="Partner" name="group_by_partner" domain="[]" context="{'group_by': 'partner_id'}"/>
+                    <filter string="Journal" name="journal" domain="[]" context="{'group_by': 'journal_id'}"/>
+                    <filter string="Date" name="groupby_date" domain="[]" context="{'group_by': 'date'}"/>
+                    <filter string="Invoice Date" name="groupby_invoice_date" domain="[]" context="{'group_by': 'invoice_date'}"/>
+                </group>
+            </search>
+        </field>
+    </record>
+
+    <record id="view_move_line_reconcile_tree" model="ir.ui.view">
+        <field name="name">account.move.line.list.reconcile</field>
+        <field name="model">account.move.line</field>
+        <field name="arch" type="xml">
+            <list string="Journal Items" js_class="account_move_line_reconcile_list" create="false" edit="true" expand="context.get('expand', False)" multi_edit="1" sample="1">
+                <header>
+                    <button name="action_reconcile" type="object" string="Reconcile" groups="account.group_account_user"/>
+                </header>
+                <field name="move_id" column_invisible="True"/>
+                <field name="invoice_date" string="Invoice Date" optional="hide"/>
+                <field name="date" readonly="1"/>
+                <field name="company_id" column_invisible="True"/>
+                <field name="company_id" groups="base.group_multi_company" readonly="1" optional="hide"/>
+                <field name="journal_id" readonly="1" options='{"no_open":True}' optional="hide"/>
+                <field name="move_name" string="Journal Entry" widget="open_move_widget"/>
+                <field name="account_id" options="{'no_open': True, 'no_create': True}" domain="[('company_ids', 'parent_of', company_id), ('deprecated', '=', False)]" groups="account.group_account_readonly" optional="hide"/>
+                <field name="partner_id" optional="hide" readonly="move_type != 'entry'"/>
+                <field name="ref" optional="hide" readonly="False"/>
+                <field name="product_id" readonly="1" optional="hide"/>
+                <field name="name" optional="show"/>
+                <field name="analytic_distribution" widget="analytic_distribution"
+                       groups="analytic.group_analytic_accounting"
+                       optional="show"
+                       options="{'product_field': 'product_id', 'account_field': 'account_id', 'force_applicability': 'optional'}"/>
+                <field name="tax_ids" widget="many2many_tags" optional="hide" readonly="1"/>
+                <field name="amount_currency" string="In Currency" groups="base.group_multi_currency" optional="show" readonly="1" invisible="is_same_currency"/>
+                <field name="currency_id" groups="base.group_multi_currency" optional="hide" string="Currency" readonly="1" invisible="is_same_currency"/>
+                <field name="debit" sum="Total Debit" readonly="1"/>
+                <field name="credit" sum="Total Credit" readonly="1"/>
+                <field name="tax_tag_ids" string="Tax Grids" options="{'no_create': True, 'no_create_edit': True}" widget="many2many_tags" optional="hide"/>
+                <field name="discount_date" string="Discount Date" optional="hide" />
+                <field name="discount_amount_currency" string="Discount Amount" optional="hide" />
+                <field name="tax_line_id" string="Originator Tax" optional="hide" readonly="1"/>
+                <field name="date_maturity" readonly="1" optional="hide"/>
+                <field name="balance" sum="Total Balance" optional="hide" readonly="1"/>
+                <field name="matching_number" string="Matching" readonly="1" optional="show" widget="matching_link_widget"/>
+                <field name="amount_residual" sum="Total Residual" string="Residual" optional="show" readonly="1" invisible="not is_account_reconcile"/>
+                <field name="amount_residual_currency" sum="Total Residual in Currency" string="Residual in Currency" optional="hide" readonly="1" invisible="is_same_currency or not is_account_reconcile" groups="base.group_multi_currency"/>
+                <field name="move_type" column_invisible="True"/>
+                <field name="parent_state" column_invisible="True"/>
+                <field name="account_type" column_invisible="True"/>
+                <field name="statement_line_id" column_invisible="True"/>
+                <field name="company_currency_id" column_invisible="True"/>
+                <field name="is_same_currency" column_invisible="True"/>
+                <field name="is_account_reconcile" column_invisible="True"/>
+                <field name="sequence" column_invisible="True"/>
+            </list>
+        </field>
+    </record>
+
+    <!-- Open the auto-reconcile wizard in modal -->
+    <record id="action_open_auto_reconcile_wizard" model="ir.actions.act_window">
+        <field name="name">Reconcile automatically</field>
+        <field name="res_model">account.auto.reconcile.wizard</field>
+        <field name="view_mode">form</field>
+        <field name="target">new</field>
+    </record>
+
+    <!-- Open amls to reconcile in a view dedicated for reconciliation -->
+    <record id="action_move_line_posted_unreconciled" model="ir.actions.act_window">
+        <field name="name">Journal Items to reconcile</field>
+        <field name="res_model">account.move.line</field>
+        <field name="path">reconcile</field>
+        <field name="view_mode">list</field>
+        <field name="search_view_id" ref="view_account_move_line_reconcile_search"/>
+        <field name="view_id" ref="view_move_line_reconcile_tree"/>
+        <field name="domain">[('display_type', 'not in', ('line_section', 'line_note')), ('account_id.reconcile', '=', True), ('parent_state', '=', 'posted'), ('full_reconcile_id', '=', False)]</field>
+        <field name="context">{'journal_type': 'general', 'search_default_unreconciled': True, 'search_default_group_by_account': True, 'search_default_group_by_partner': True}</field>
+    </record>
+</odoo>
diff --git a/dev_odex30_accounting/odex30_account_accountant/views/product_views.xml b/dev_odex30_accounting/odex30_account_accountant/views/product_views.xml
new file mode 100644
index 0000000..5343473
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_accountant/views/product_views.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+        <record id="res_partner_view_form" model="ir.ui.view">
+            <field name="name">res.partner.form</field>
+            <field name="model">res.partner</field>
+            <field name="inherit_id" ref="account.view_partner_property_form"/>
+            <field name="arch" type="xml">
+                <xpath expr="//group[@name='accounting_entries']" position="attributes">
+                    <attribute name="groups">account.group_account_user</attribute>
+                </xpath>
+            </field>
+        </record>
+
+        <!-- To-Do: Remove me in master -->
+        <record id="product_template_form_view" model="ir.ui.view">
+            <field name="name">product.template.form.inherit</field>
+            <field name="model">product.template</field>
+            <field name="priority">5</field>
+            <field name="inherit_id" ref="account.product_template_form_view"/>
+            <field name="arch" type="xml">
+                <page name="invoicing" position="attributes">
+                    <attribute name="groups">account.group_account_readonly</attribute>
+                </page>
+            </field>
+        </record>
+</odoo>
diff --git a/dev_odex30_accounting/odex30_account_accountant/views/report_invoice.xml b/dev_odex30_accounting/odex30_account_accountant/views/report_invoice.xml
new file mode 100644
index 0000000..8949cdc
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_accountant/views/report_invoice.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <template id="report_invoice_document" inherit_id="account.report_invoice_document">
+        <div id="right-elements" position="inside">
+            <div t-if="o.show_signature_area" t-attf-class="#{'col-12' if report_type != 'html' else 'col-lg-5 offset-lg-7 col-md-12'}">
+                <t t-if="o.signature">
+                    <img t-if="o.signature" t-att-src="image_data_uri(o.signature)" class="img-fluid mx-auto" style="max-height: 6rem;"/>
+                </t>
+                <t t-else="">
+                    <!-- leave an empty space allowing to sign the invoice manually -->
+                    <div class="col-12" style="min-height: 10rem"/>
+                </t>
+                <!-- wkhtmltopdf doesn't render a simple `border-top border-dark` -->
+                <p class="mx-auto text-center" style="border-top: thin solid;">Authorized signatory</p>
+            </div>
+        </div>
+    </template>
+</odoo>
diff --git a/dev_odex30_accounting/odex30_account_accountant/views/res_config_settings_views.xml b/dev_odex30_accounting/odex30_account_accountant/views/res_config_settings_views.xml
new file mode 100644
index 0000000..505d82b
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_accountant/views/res_config_settings_views.xml
@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <record id="res_config_settings_view_form" model="ir.ui.view">
+        <field name="name">res.config.settings.view.form.inherit.account.accountant</field>
+        <field name="model">res.config.settings</field>
+        <field name="inherit_id" ref="account.res_config_settings_view_form"/>
+        <field name="arch" type="xml">
+            <setting id="fiscalyear" position="replace">
+                <setting id="fiscalyear" string="Fiscal Year">
+                    <div class="content-group">
+                        <div class="d-flex mt16 align-items-baseline">
+                            <label for="fiscalyear_last_month" string="Last Day" class="col-lg-3 o_light_label pe-2 pe-lg-0"/>
+                            <div class="col-lg-9">
+                                <field name="fiscalyear_last_month" class="pe-2"/>
+                                <field name="fiscalyear_last_day"/>
+                            </div>
+                        </div>
+                    </div>
+                </setting>
+                <setting groups="account.group_account_manager" help="The invoices before this date will not be taken into account as accounting entries">
+                    <field name="invoicing_switch_threshold"/>
+                </setting>
+                <setting help="Define fiscal years of more or less than one year">
+                    <field name="group_fiscal_year"/>
+                    <div class="mt16">
+                        <button name="%(odex30_account_accountant.actions_account_fiscal_year)d" icon="oi-arrow-right"
+                                type="action" string="Fiscal Years" class="btn-link"
+                                invisible="not group_fiscal_year"/>
+                    </div>
+                </setting>
+            </setting>
+            <setting id="dynamic_report" position="attributes">
+                <attribute name="invisible">0</attribute>
+            </setting>
+            <block id="bank_cash" position="inside">
+                <setting groups="base.group_no_one" company_dependent="1" help="Record cost of goods sold in your journal entries">
+                    <field name="use_anglo_saxon"/>
+                </setting>
+            </block>
+            <block id="invoicing_settings" position="inside">
+                <setting company_dependent="1" help="To enhance authenticity, add a signature to your invoices">
+                    <field name="sign_invoice"/>
+                    <label for="signing_user" string="Legal signatory" class="col-lg-5 o_light_label" invisible="not sign_invoice"/>
+                    <field name="signing_user" invisible="not sign_invoice"/>
+                </setting>
+            </block>
+            <xpath expr="//block[@id='account_vendor_bills']" position="inside">
+                <setting string="Predict vendor bill product" help="The system will try to predict the product on vendor bill lines based on the label of the line">
+                    <field name="predict_bill_product"/>
+                </setting>
+            </xpath>
+
+            <setting id="post_bank_transactions_and_payments_setting" position="after">
+                <setting string="Deferred expense entries:" company_dependent="1">
+                    <div class="content-group">
+                        <div class="row mt8">
+                            <label for="deferred_expense_journal_id" class="col-lg-5 o_light_label" string="Journal"/>
+                            <field name="deferred_expense_journal_id" domain="[('type', '=', 'general'), ('active', '=', True)]"/>
+                        </div>
+                        <div class="row mt8">
+                            <label for="deferred_expense_account_id" class="col-lg-5 o_light_label" string="Deferred expense"/>
+                            <field name="deferred_expense_account_id" domain="[('account_type', '=', 'asset_current'), ('deprecated', '=', False)]"/>
+                        </div>
+                        <div class="row mt8">
+                            <label for="generate_deferred_expense_entries_method" class="col-lg-5 o_light_label" string="Generate Entries"/>
+                            <field name="generate_deferred_expense_entries_method"/>
+                        </div>
+                        <div class="row mt8">
+                            <label for="deferred_expense_amount_computation_method" class="col-lg-5 o_light_label" string="Based on"/>
+                            <field name="deferred_expense_amount_computation_method"/>
+                        </div>
+                    </div>
+                </setting>
+                <setting string="Deferred revenue entries:" company_dependent="1">
+                    <div class="content-group">
+                        <div class="row mt8">
+                            <label for="deferred_revenue_journal_id" class="col-lg-5 o_light_label" string="Journal"/>
+                            <field name="deferred_revenue_journal_id" domain="[('type', '=', 'general'), ('active', '=', True)]"/>
+                        </div>
+                        <div class="row mt8">
+                            <label for="deferred_revenue_account_id" class="col-lg-5 o_light_label" string="Deferred revenue"/>
+                            <field name="deferred_revenue_account_id" domain="[('account_type', '=', 'liability_current'), ('deprecated', '=', False)]"/>
+                        </div>
+                        <div class="row mt8">
+                            <label for="generate_deferred_revenue_entries_method" class="col-lg-5 o_light_label" string="Generate Entries"/>
+                            <field name="generate_deferred_revenue_entries_method"/>
+                        </div>
+                        <div class="row mt8">
+                            <label for="deferred_revenue_amount_computation_method" class="col-lg-5 o_light_label" string="Based on"/>
+                            <field name="deferred_revenue_amount_computation_method"/>
+                        </div>
+                    </div>
+                </setting>
+            </setting>
+
+        </field>
+    </record>
+</odoo>
diff --git a/dev_odex30_accounting/odex30_account_accountant/wizard/__init__.py b/dev_odex30_accounting/odex30_account_accountant/wizard/__init__.py
new file mode 100644
index 0000000..31b7ccd
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_accountant/wizard/__init__.py
@@ -0,0 +1,6 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+from . import account_change_lock_date
+from . import account_auto_reconcile_wizard
+from . import account_reconcile_wizard
diff --git a/dev_odex30_accounting/odex30_account_accountant/wizard/__pycache__/__init__.cpython-311.pyc b/dev_odex30_accounting/odex30_account_accountant/wizard/__pycache__/__init__.cpython-311.pyc
new file mode 100644
index 0000000..521c77d
Binary files /dev/null and b/dev_odex30_accounting/odex30_account_accountant/wizard/__pycache__/__init__.cpython-311.pyc differ
diff --git a/dev_odex30_accounting/odex30_account_accountant/wizard/__pycache__/account_auto_reconcile_wizard.cpython-311.pyc b/dev_odex30_accounting/odex30_account_accountant/wizard/__pycache__/account_auto_reconcile_wizard.cpython-311.pyc
new file mode 100644
index 0000000..779c5e9
Binary files /dev/null and b/dev_odex30_accounting/odex30_account_accountant/wizard/__pycache__/account_auto_reconcile_wizard.cpython-311.pyc differ
diff --git a/dev_odex30_accounting/odex30_account_accountant/wizard/__pycache__/account_change_lock_date.cpython-311.pyc b/dev_odex30_accounting/odex30_account_accountant/wizard/__pycache__/account_change_lock_date.cpython-311.pyc
new file mode 100644
index 0000000..87e5dd3
Binary files /dev/null and b/dev_odex30_accounting/odex30_account_accountant/wizard/__pycache__/account_change_lock_date.cpython-311.pyc differ
diff --git a/dev_odex30_accounting/odex30_account_accountant/wizard/__pycache__/account_reconcile_wizard.cpython-311.pyc b/dev_odex30_accounting/odex30_account_accountant/wizard/__pycache__/account_reconcile_wizard.cpython-311.pyc
new file mode 100644
index 0000000..e65aab3
Binary files /dev/null and b/dev_odex30_accounting/odex30_account_accountant/wizard/__pycache__/account_reconcile_wizard.cpython-311.pyc differ
diff --git a/dev_odex30_accounting/odex30_account_accountant/wizard/account_auto_reconcile_wizard.py b/dev_odex30_accounting/odex30_account_accountant/wizard/account_auto_reconcile_wizard.py
new file mode 100644
index 0000000..bdf1253
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_accountant/wizard/account_auto_reconcile_wizard.py
@@ -0,0 +1,176 @@
+from datetime import date
+
+from odoo import api, Command, fields, models, _
+from odoo.exceptions import UserError
+
+
+class AccountAutoReconcileWizard(models.TransientModel):
+    """ This wizard is used to automatically reconcile account.move.line.
+    It is accessible trough Accounting > Accounting tab > Actions > Auto-reconcile menuitem.
+    """
+    _name = 'account.auto.reconcile.wizard'
+    _description = 'Account automatic reconciliation wizard'
+    _check_company_auto = True
+
+    company_id = fields.Many2one(
+        comodel_name='res.company',
+        required=True,
+        readonly=True,
+        default=lambda self: self.env.company,
+    )
+    line_ids = fields.Many2many(comodel_name='account.move.line')  # Amls from which we derive a preset for the wizard
+    from_date = fields.Date(string='From')
+    to_date = fields.Date(string='To', default=fields.Date.context_today, required=True)
+    account_ids = fields.Many2many(
+        comodel_name='account.account',
+        string='Accounts',
+        check_company=True,
+        domain="[('reconcile', '=', True), ('deprecated', '=', False), ('account_type', '!=', 'off_balance')]",
+    )
+    partner_ids = fields.Many2many(
+        comodel_name='res.partner',
+        string='Partners',
+        check_company=True,
+        domain="[('company_id', 'in', (False, company_id)), '|', ('parent_id', '=', False), ('is_company', '=', True)]",
+    )
+    search_mode = fields.Selection(
+        selection=[
+            ('one_to_one', "Perfect Match"),
+            ('zero_balance', "Clear Account"),
+        ],
+        string='Reconcile',
+        required=True,
+        default='one_to_one',
+        help="Reconcile journal items with opposite balance or clear accounts with a zero balance",
+    )
+
+    @api.model
+    def default_get(self, fields_list):
+        res = super().default_get(fields_list)
+        domain = self.env.context.get('domain')
+        if 'line_ids' in fields_list and 'line_ids' not in res and domain:
+            amls = self.env['account.move.line'].search(domain)
+            if amls:
+                # pre-configure the wizard
+                res.update(self._get_default_wizard_values(amls))
+                res['line_ids'] = [Command.set(amls.ids)]
+        return res
+
+    @api.model
+    def _get_default_wizard_values(self, amls):
+        """ Derive a preset configuration based on amls.
+        For example if all amls have the same account_id we will set it in the wizard.
+        :param amls: account move lines from which we will derive a preset
+        :return: a dict with preset values
+        """
+        return {
+            'account_ids': [Command.set(amls[0].account_id.ids)] if all(aml.account_id == amls[0].account_id for aml in amls) else [],
+            'partner_ids': [Command.set(amls[0].partner_id.ids)] if all(aml.partner_id == amls[0].partner_id for aml in amls) else [],
+            'search_mode': 'zero_balance' if amls.company_currency_id.is_zero(sum(amls.mapped('balance'))) else 'one_to_one',
+            'from_date': min(amls.mapped('date')),
+            'to_date': max(amls.mapped('date')),
+        }
+
+    def _get_wizard_values(self):
+        """ Get the current configuration of the wizard as a dict of values.
+        :return: a dict with the current configuration of the wizard.
+        """
+        self.ensure_one()
+        return {
+            'account_ids': [Command.set(self.account_ids.ids)] if self.account_ids else [],
+            'partner_ids': [Command.set(self.partner_ids.ids)] if self.partner_ids else [],
+            'search_mode': self.search_mode,
+            'from_date': self.from_date,
+            'to_date': self.to_date,
+        }
+
+    # ==== Business methods ====
+    def _get_amls_domain(self):
+        """ Get the domain of amls to be auto-reconciled. """
+        self.ensure_one()
+        if self.line_ids and self._get_wizard_values() == self._get_default_wizard_values(self.line_ids):
+            domain = [('id', 'in', self.line_ids.ids)]
+        else:
+            domain = [
+                ('company_id', '=', self.company_id.id),
+                ('parent_state', '=', 'posted'),
+                ('display_type', 'not in', ('line_section', 'line_note')),
+                ('date', '>=', self.from_date or date.min),
+                ('date', '<=', self.to_date),
+                ('reconciled', '=', False),
+                ('account_id.reconcile', '=', True),
+                ('amount_residual_currency', '!=', 0.0),
+                ('amount_residual', '!=', 0.0),  # excludes exchange difference lines
+            ]
+            if self.account_ids:
+                domain.append(('account_id', 'in', self.account_ids.ids))
+                if self.partner_ids:
+                    domain.append(('partner_id', 'in', self.partner_ids.ids))
+        return domain
+
+    def _auto_reconcile_one_to_one(self):
+        """ Auto-reconcile with one-to-one strategy:
+        We will reconcile 2 amls together if their combined balance is zero.
+        :return: a recordset of reconciled amls
+        """
+        grouped_amls_data = self.env['account.move.line']._read_group(
+            self._get_amls_domain(),
+            ['account_id', 'partner_id', 'currency_id', 'amount_residual_currency:abs_rounded'],
+            ['id:recordset'],
+        )
+        all_reconciled_amls = self.env['account.move.line']
+        amls_grouped_by_2 = []  # we need to group amls with right format for _reconcile_plan
+        for *__, grouped_aml_ids in grouped_amls_data:
+            positive_amls = grouped_aml_ids.filtered(lambda aml: aml.amount_residual_currency >= 0).sorted('date')
+            negative_amls = (grouped_aml_ids - positive_amls).sorted('date')
+            min_len = min(len(positive_amls), len(negative_amls))
+            positive_amls = positive_amls[:min_len]
+            negative_amls = negative_amls[:min_len]
+            all_reconciled_amls += positive_amls + negative_amls
+            amls_grouped_by_2 += [pos_aml + neg_aml for (pos_aml, neg_aml) in zip(positive_amls, negative_amls)]
+        self.env['account.move.line']._reconcile_plan(amls_grouped_by_2)
+        return all_reconciled_amls
+
+    def _auto_reconcile_zero_balance(self):
+        """ Auto-reconcile with zero balance strategy:
+        We will reconcile all amls grouped by currency/account/partner that have a total balance of zero.
+        :return: a recordset of reconciled amls
+        """
+        grouped_amls_data = self.env['account.move.line']._read_group(
+            self._get_amls_domain(),
+            groupby=['account_id', 'partner_id', 'currency_id'],
+            aggregates=['id:recordset'],
+            having=[('amount_residual_currency:sum_rounded', '=', 0)],
+        )
+        all_reconciled_amls = self.env['account.move.line']
+        amls_grouped_together = []  # we need to group amls with right format for _reconcile_plan
+        for aml_data in grouped_amls_data:
+            all_reconciled_amls += aml_data[-1]
+            amls_grouped_together += [aml_data[-1]]
+        self.env['account.move.line']._reconcile_plan(amls_grouped_together)
+        return all_reconciled_amls
+
+    def auto_reconcile(self):
+        """ Automatically reconcile amls given wizard's parameters.
+        :return: an action that opens all reconciled items and related amls (exchange diff, etc)
+        """
+        self.ensure_one()
+        if self.search_mode == 'zero_balance':
+            reconciled_amls = self._auto_reconcile_zero_balance()
+        else:
+            # search_mode == 'one_to_one'
+            reconciled_amls = self._auto_reconcile_one_to_one()
+        reconciled_amls_and_related = self.env['account.move.line'].search([
+            ('full_reconcile_id', 'in', reconciled_amls.full_reconcile_id.ids)
+        ])
+        if reconciled_amls_and_related:
+            return {
+                'name': _("Automatically Reconciled Entries"),
+                'type': 'ir.actions.act_window',
+                'res_model': 'account.move.line',
+                'context': "{'search_default_group_by_matching': True}",
+                'view_mode': 'list',
+                'domain': [('id', 'in', reconciled_amls_and_related.ids)],
+            }
+        else:
+            raise UserError("Nothing to reconcile.")
diff --git a/dev_odex30_accounting/odex30_account_accountant/wizard/account_auto_reconcile_wizard.xml b/dev_odex30_accounting/odex30_account_accountant/wizard/account_auto_reconcile_wizard.xml
new file mode 100644
index 0000000..ff0e1c1
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_accountant/wizard/account_auto_reconcile_wizard.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <record id="view_account_auto_reconcile_wizard" model="ir.ui.view">
+        <field name="name">account.auto.reconcile.wizard.form</field>
+        <field name="model">account.auto.reconcile.wizard</field>
+        <field name="arch" type="xml">
+            <form string="Reconcile automatically">
+                <field name="company_id" invisible="1"/>
+                <field name="line_ids" invisible="1"/>
+                <group>
+                    <field name="search_mode" widget="radio" options="{'horizontal': true}"/>
+                    <field name="account_ids" widget="many2many_tags" options="{'no_create': True, 'no_edit':True}"/>
+                    <field name="partner_ids" widget="many2many_tags" options="{'no_create': True, 'no_edit':True}" invisible="not account_ids"/>
+                    <field name="from_date" invisible="search_mode == 'zero_balance'"/>
+                    <field name="to_date"/>
+                </group>
+                <footer>
+                    <button string="Reconcile" class="btn-primary" name="auto_reconcile" type="object" data-hotkey="v"/>
+                    <button string="Discard" special="cancel" data-hotkey="z"/>
+                </footer>
+            </form>
+        </field>
+    </record>
+</odoo>
diff --git a/dev_odex30_accounting/odex30_account_accountant/wizard/account_change_lock_date.py b/dev_odex30_accounting/odex30_account_accountant/wizard/account_change_lock_date.py
new file mode 100644
index 0000000..760100a
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_accountant/wizard/account_change_lock_date.py
@@ -0,0 +1,416 @@
+from odoo import api, models, fields, _
+from odoo.exceptions import UserError
+from odoo.osv import expression
+from odoo.tools import date_utils
+
+from odoo.addons.account.models.company import SOFT_LOCK_DATE_FIELDS, LOCK_DATE_FIELDS
+
+from datetime import date, timedelta
+
+
+class AccountChangeLockDate(models.TransientModel):
+    """
+    This wizard is used to change the lock date
+    """
+    _name = 'account.change.lock.date'
+    _description = 'Change Lock Date'
+
+    company_id = fields.Many2one(
+        comodel_name='res.company',
+        required=True,
+        readonly=True,
+        default=lambda self: self.env.company,
+    )
+
+    fiscalyear_lock_date = fields.Date(
+        string='Lock Everything',
+        default=lambda self: self.env.company.fiscalyear_lock_date,
+        help="Any entry up to and including that date will be postponed to a later time, in accordance with its journal's sequence.",
+    )
+    fiscalyear_lock_date_for_me = fields.Date(
+        string='Lock Everything For Me',
+        compute='_compute_lock_date_exceptions',
+    )
+    fiscalyear_lock_date_for_everyone = fields.Date(
+        string='Lock Everything For Everyone',
+        compute='_compute_lock_date_exceptions',
+    )
+    min_fiscalyear_lock_date_exception_for_me_id = fields.Many2one(
+        comodel_name='account.lock_exception',
+        compute='_compute_lock_date_exceptions',
+    )
+    min_fiscalyear_lock_date_exception_for_everyone_id = fields.Many2one(
+        comodel_name='account.lock_exception',
+        compute='_compute_lock_date_exceptions',
+    )
+
+    tax_lock_date = fields.Date(
+        string="Lock Tax Return",
+        default=lambda self: self.env.company.tax_lock_date,
+        help="Any entry with taxes up to and including that date will be postponed to a later time, in accordance with its journal's sequence. "
+             "The tax lock date is automatically set when the tax closing entry is posted.",
+    )
+    tax_lock_date_for_me = fields.Date(
+        string='Lock Tax Return For Me',
+        compute='_compute_lock_date_exceptions',
+    )
+    tax_lock_date_for_everyone = fields.Date(
+        string='Lock Tax Return For Everyone',
+        compute='_compute_lock_date_exceptions',
+    )
+    min_tax_lock_date_exception_for_me_id = fields.Many2one(
+        comodel_name='account.lock_exception',
+        compute='_compute_lock_date_exceptions',
+    )
+    min_tax_lock_date_exception_for_everyone_id = fields.Many2one(
+        comodel_name='account.lock_exception',
+        compute='_compute_lock_date_exceptions',
+    )
+
+    sale_lock_date = fields.Date(
+        string='Lock Sales',
+        default=lambda self: self.env.company.sale_lock_date,
+        help="Any sales entry prior to and including this date will be postponed to a later date, in accordance with its journal's sequence.",
+    )
+    sale_lock_date_for_me = fields.Date(
+        string='Lock Sales For Me',
+        compute='_compute_lock_date_exceptions',
+    )
+    sale_lock_date_for_everyone = fields.Date(
+        string='Lock Sales For Everyone',
+        compute='_compute_lock_date_exceptions',
+    )
+    min_sale_lock_date_exception_for_me_id = fields.Many2one(
+        comodel_name='account.lock_exception',
+        compute='_compute_lock_date_exceptions',
+    )
+    min_sale_lock_date_exception_for_everyone_id = fields.Many2one(
+        comodel_name='account.lock_exception',
+        compute='_compute_lock_date_exceptions',
+    )
+
+    purchase_lock_date = fields.Date(
+        string='Lock Purchases',
+        default=lambda self: self.env.company.purchase_lock_date,
+        help="Any purchase entry prior to and including this date will be postponed to a later date, in accordance with its journal's sequence.",
+    )
+    purchase_lock_date_for_me = fields.Date(
+        string='Lock Purchases For Me',
+        compute='_compute_lock_date_exceptions',
+    )
+    purchase_lock_date_for_everyone = fields.Date(
+        string='Lock Purchases For Everyone',
+        compute='_compute_lock_date_exceptions',
+    )
+    min_purchase_lock_date_exception_for_me_id = fields.Many2one(
+        comodel_name='account.lock_exception',
+        compute='_compute_lock_date_exceptions',
+    )
+    min_purchase_lock_date_exception_for_everyone_id = fields.Many2one(
+        comodel_name='account.lock_exception',
+        compute='_compute_lock_date_exceptions',
+    )
+
+    hard_lock_date = fields.Date(
+        string='Hard Lock',
+        default=lambda self: self.env.company.hard_lock_date,
+        help="Any entry up to and including that date will be postponed to a later time, in accordance with its journal sequence. "
+             "This lock date is irreversible and does not allow any exception.",
+    )
+    current_hard_lock_date = fields.Date(
+        string='Current Hard Lock',
+        related='company_id.hard_lock_date',
+        readonly=True,
+    )
+
+    exception_needed = fields.Boolean(  # TODO: remove in master (18.1)
+        string='Exception needed',
+        compute='_compute_exception_needed',
+    )
+    exception_needed_fields = fields.Char(
+        # String of comma separated values of the field(s) the exception applies to
+        compute='_compute_exception_needed_fields',
+    )
+    exception_applies_to = fields.Selection(
+        string='Exception applies',
+        selection=[
+            ('me', "for me"),
+            ('everyone', "for everyone"),
+        ],
+        default='me',
+        required=True,
+    )
+    exception_duration = fields.Selection(
+        string='Exception Duration',
+        selection=[
+            ('5min', "for 5 minutes"),
+            ('15min', "for 15 minutes"),
+            ('1h', "for 1 hour"),
+            ('24h', "for 24 hours"),
+            ('forever', "forever"),
+        ],
+        default='5min',
+        required=True,
+    )
+    exception_reason = fields.Char(
+        string='Exception Reason',
+    )
+
+    show_draft_entries_warning = fields.Boolean(
+        string="Show Draft Entries Warning",
+        compute='_compute_show_draft_entries_warning',
+    )
+
+    @api.depends('company_id')
+    @api.depends_context('user', 'company')
+    def _compute_lock_date_exceptions(self):
+        for wizard in self:
+            exceptions = self.env['account.lock_exception'].search(
+                self.env['account.lock_exception']._get_active_exceptions_domain(wizard.company_id, SOFT_LOCK_DATE_FIELDS)
+            )
+            for field in SOFT_LOCK_DATE_FIELDS:
+                field_exceptions = exceptions.filtered(lambda e: e.lock_date_field == field)
+                field_exceptions_for_me = field_exceptions.filtered(lambda e: e.user_id.id == self.env.user.id)
+                field_exceptions_for_everyone = field_exceptions.filtered(lambda e: not e.user_id.id)
+                min_exception_for_me = min(field_exceptions_for_me, key=lambda e: e[field] or date.min) if field_exceptions_for_me else False
+                min_exception_for_everyone = min(field_exceptions_for_everyone, key=lambda e: e[field] or date.min) if field_exceptions_for_everyone else False
+                wizard[f"min_{field}_exception_for_me_id"] = min_exception_for_me
+                wizard[f"min_{field}_exception_for_everyone_id"] = min_exception_for_everyone
+                wizard[f"{field}_for_me"] = min_exception_for_me.lock_date if min_exception_for_me else False
+                wizard[f"{field}_for_everyone"] = min_exception_for_everyone.lock_date if min_exception_for_everyone else False
+
+    def _get_draft_moves_in_locked_period_domain(self):
+        self.ensure_one()
+        lock_date_domains = []
+        if self.hard_lock_date:
+            lock_date_domains.append([('date', '<=', self.hard_lock_date)])
+        if self.fiscalyear_lock_date:
+            lock_date_domains.append([('date', '<=', self.fiscalyear_lock_date)])
+        if self.sale_lock_date:
+            lock_date_domains.append([
+                ('date', '<=', self.sale_lock_date),
+                ('journal_id.type', '=', 'sale')])
+        if self.purchase_lock_date:
+            lock_date_domains.append([
+                ('date', '<=', self.purchase_lock_date),
+                ('journal_id.type', '=', 'purchase')])
+        return [
+            ('company_id', 'child_of', self.env.company.id),
+            ('state', '=', 'draft'),
+            *expression.OR(lock_date_domains),
+        ]
+
+    @api.depends('fiscalyear_lock_date', 'tax_lock_date', 'sale_lock_date', 'purchase_lock_date', 'hard_lock_date')
+    def _compute_show_draft_entries_warning(self):
+        for wizard in self:
+            draft_entries = self.env['account.move'].search(self._get_draft_moves_in_locked_period_domain(), limit=1)
+            wizard.show_draft_entries_warning = bool(draft_entries)
+
+    def _get_changes_needing_exception(self):
+        self.ensure_one()
+        return {
+            field: self[field]
+            for field in SOFT_LOCK_DATE_FIELDS
+            if self.env.company[field] and (not self[field] or self[field] < self.env.company[field])
+        }
+
+    @api.depends(*SOFT_LOCK_DATE_FIELDS)
+    def _compute_exception_needed(self):
+        # TODO: remove in master (18.1)
+        for wizard in self:
+            wizard.exception_needed = bool(wizard._get_changes_needing_exception())
+
+    @api.depends(*SOFT_LOCK_DATE_FIELDS)
+    def _compute_exception_needed_fields(self):
+        for wizard in self:
+            changes_needing_exception = wizard._get_changes_needing_exception()
+            wizard.exception_needed_fields = ','.join(changes_needing_exception)
+
+    def _prepare_lock_date_values(self, exception_vals_list=None):
+        """
+        Return a dictionary (lock date field -> field value)
+        It only contains lock dates which are changed and for which no exception is added
+        """
+        self.ensure_one()
+        if self.env.company.hard_lock_date and (not self.hard_lock_date or self.hard_lock_date < self.env.company.hard_lock_date):
+            raise UserError(_('It is not possible to decrease or remove the Hard Lock Date.'))
+
+        lock_date_values = {
+            field: self[field]
+            for field in LOCK_DATE_FIELDS
+            if self[field] != self.env.company[field]
+        }
+
+        for field, lock_date in lock_date_values.items():
+            if lock_date and lock_date > fields.Date.context_today(self):
+                raise UserError(_('You cannot set a Lock Date in the future.'))
+
+        # We do not change fields for which we add an exception
+        if exception_vals_list:
+            for exception_vals in exception_vals_list:
+                for field in LOCK_DATE_FIELDS:
+                    if field in exception_vals:
+                        lock_date_values.pop(field, None)
+
+        return lock_date_values
+
+    def _prepare_exception_values(self):
+        self.ensure_one()
+        changes_needing_exception = self._get_changes_needing_exception()
+
+        if not changes_needing_exception:
+            return False
+
+        # Exceptions for everyone and forever are just "normal" changes to the lock date.
+        if self.exception_applies_to == 'everyone' and self.exception_duration == 'forever':
+            return False
+
+        exception_errors = []
+        if not self.exception_applies_to:
+            exception_errors.append(_('You need to select who the exception applies to.'))
+        if not self.exception_duration:
+            exception_errors.append(_('You need to select a duration for the exception.'))
+        if exception_errors:
+            raise UserError('\n'.join(exception_errors))
+
+        exception_base_values = {
+            'company_id': self.env.company.id,
+        }
+
+        exception_base_values['user_id'] = {
+            'me': self.env.user.id,
+            'everyone': False,
+        }[self.exception_applies_to]
+
+        exception_timedelta = {
+            '5min': timedelta(minutes=5),
+            '15min': timedelta(minutes=15),
+            '1h': timedelta(hours=1),
+            '24h': timedelta(hours=24),
+            'forever': False,
+        }[self.exception_duration]
+        if exception_timedelta:
+            exception_base_values['end_datetime'] = self.env.cr.now() + exception_timedelta
+
+        if self.exception_reason:
+            exception_base_values['reason'] = self.exception_reason
+
+        exception_vals_list = [
+            {
+                **exception_base_values,
+                field: value,
+             }
+            for field, value in changes_needing_exception.items()
+        ]
+
+        return exception_vals_list
+
+    def _get_current_period_dates(self, lock_date_field):
+        """ Gets the date_from - either the previous lock date or the start of the fiscal year.
+        """
+        self.ensure_one()
+        company_lock_date = self.env.company[lock_date_field]
+        if company_lock_date:
+            date_from = company_lock_date + timedelta(days=1)
+        else:
+            date_from = date_utils.get_fiscal_year(self[lock_date_field])[0]
+        return date_from, self[lock_date_field]
+
+    def _create_default_report_external_values(self, lock_date_field):
+        # to be overriden
+        pass
+
+    def _change_lock_date(self, lock_date_values=None):
+        self.ensure_one()
+        if lock_date_values is None:
+            lock_date_values = self._prepare_lock_date_values()
+
+        # Possibly create default report external values for tax
+        tax_lock_date = lock_date_values.get('tax_lock_date', None)
+        if tax_lock_date and tax_lock_date != self.env.company['tax_lock_date']:
+            self._create_default_report_external_values('tax_lock_date')
+
+        # Possibly create default report external values for fiscal year
+        fiscalyear_lock_date = lock_date_values.get('fiscalyear_lock_date', None)
+        hard_lock_date = lock_date_values.get('hard_lock_date', None)
+        if fiscalyear_lock_date or hard_lock_date:
+            fiscal_lock_date, field = max([
+                (fiscalyear_lock_date, 'fiscalyear_lock_date'),
+                (hard_lock_date, 'hard_lock_date'),
+            ], key=lambda t: t[0] or date.min)
+            company_fiscal_lock_date = max(
+                self.env.company.fiscalyear_lock_date or date.min,
+                self.env.company.hard_lock_date or date.min,
+            )
+            if fiscal_lock_date != company_fiscal_lock_date:
+                self._create_default_report_external_values(field)
+
+        self.env.company.sudo().write(lock_date_values)
+
+    def change_lock_date(self):
+        self.ensure_one()
+        if self.env.user.has_group('account.group_account_manager'):
+            exception_vals_list = self._prepare_exception_values()
+            changed_lock_date_values = self._prepare_lock_date_values(exception_vals_list=exception_vals_list)
+
+            if exception_vals_list:
+                self.env['account.lock_exception'].create(exception_vals_list)
+
+            self._change_lock_date(changed_lock_date_values)
+        else:
+            raise UserError(_('Only Billing Administrators are allowed to change lock dates!'))
+        return {'type': 'ir.actions.act_window_close'}
+
+    def action_show_draft_moves_in_locked_period(self):
+        self.ensure_one()
+        return {
+            'view_mode': 'list',
+            'name': _('Draft Entries'),
+            'res_model': 'account.move',
+            'type': 'ir.actions.act_window',
+            'domain': self._get_draft_moves_in_locked_period_domain(),
+            'search_view_id': [self.env.ref('account.view_account_move_filter').id, 'search'],
+            'views': [[self.env.ref('account.view_move_tree_multi_edit').id, 'list'], [self.env.ref('account.view_move_form').id, 'form']],
+        }
+
+    def action_reopen_wizard(self):
+        # This action can be used to keep the wizard open after doing something else
+        return {
+            'type': 'ir.actions.act_window',
+            'res_model': self._name,
+            'res_id': self.id,
+            'view_mode': 'form',
+            'target': 'new',
+        }
+
+    def _action_revoke_min_exception(self, exception_field):
+        self.ensure_one()
+        exception = self[exception_field]
+        if exception:
+            exception.action_revoke()
+            self._compute_lock_date_exceptions()
+        return self.action_reopen_wizard()
+
+    def action_revoke_min_sale_lock_date_exception_for_me(self):
+        return self._action_revoke_min_exception('min_sale_lock_date_exception_for_me_id')
+
+    def action_revoke_min_purchase_lock_date_exception_for_me(self):
+        return self._action_revoke_min_exception('min_purchase_lock_date_exception_for_me_id')
+
+    def action_revoke_min_tax_lock_date_exception_for_me(self):
+        return self._action_revoke_min_exception('min_tax_lock_date_exception_for_me_id')
+
+    def action_revoke_min_fiscalyear_lock_date_exception_for_me(self):
+        return self._action_revoke_min_exception('min_fiscalyear_lock_date_exception_for_me_id')
+
+    def action_revoke_min_sale_lock_date_exception_for_everyone(self):
+        return self._action_revoke_min_exception('min_sale_lock_date_exception_for_everyone_id')
+
+    def action_revoke_min_purchase_lock_date_exception_for_everyone(self):
+        return self._action_revoke_min_exception('min_purchase_lock_date_exception_for_everyone_id')
+
+    def action_revoke_min_tax_lock_date_exception_for_everyone(self):
+        return self._action_revoke_min_exception('min_tax_lock_date_exception_for_everyone_id')
+
+    def action_revoke_min_fiscalyear_lock_date_exception_for_everyone(self):
+        return self._action_revoke_min_exception('min_fiscalyear_lock_date_exception_for_everyone_id')
diff --git a/dev_odex30_accounting/odex30_account_accountant/wizard/account_change_lock_date.xml b/dev_odex30_accounting/odex30_account_accountant/wizard/account_change_lock_date.xml
new file mode 100644
index 0000000..80fd256
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_accountant/wizard/account_change_lock_date.xml
@@ -0,0 +1,236 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <data>
+
+        <record id="view_account_change_lock_date" model="ir.ui.view">
+            <field name="name">account.change.lock.date.form</field>
+            <field name="model">account.change.lock.date</field>
+            <field name="arch" type="xml">
+                <form>
+                    <sheet>
+                        <group>
+                            <field name="show_draft_entries_warning" invisible="True"/>
+                            <div class="alert alert-warning mb-0 d-flex" role="alert"
+                                 colspan="2"
+                                 invisible="not show_draft_entries_warning">
+                                There are still draft entries in the period you want to lock.
+                                You should either post or delete them.
+                                <a type="object"
+                                   class="oe_link fw-bold"
+                                   name="action_show_draft_moves_in_locked_period"
+                                   icon="oi-arrow-right">
+                                    Review
+                                </a>
+                            </div>
+                            <div class="text-muted mb-1" colspan="2">
+                                <i>Lock transactions up to specific dates, inclusive</i>
+                            </div>
+                            <field name="company_id" invisible="True"/>
+                            <field name="min_sale_lock_date_exception_for_me_id" invisible="True"/>
+                            <field name="min_purchase_lock_date_exception_for_me_id" invisible="True"/>
+                            <field name="min_tax_lock_date_exception_for_me_id" invisible="True"/>
+                            <field name="min_fiscalyear_lock_date_exception_for_me_id" invisible="True"/>
+                            <field name="min_sale_lock_date_exception_for_everyone_id" invisible="True"/>
+                            <field name="min_purchase_lock_date_exception_for_everyone_id" invisible="True"/>
+                            <field name="min_tax_lock_date_exception_for_everyone_id" invisible="True"/>
+                            <field name="min_fiscalyear_lock_date_exception_for_everyone_id" invisible="True"/>
+                            <label for="sale_lock_date"/>
+                            <div class="d-flex">
+                                <field name="sale_lock_date" placeholder="Not locked"
+                                       class="oe_inline"
+                                       decoration-info="exception_needed_fields and 'sale_lock_date' in exception_needed_fields"
+                                       options="{'warn_future': true}"/>
+                                <span class="text-muted o_form_label"
+                                      invisible="not min_sale_lock_date_exception_for_me_id">
+                                    For me:
+                                    <field name="sale_lock_date_for_me" nolabel="1" class="oe_inline"
+                                           invisible="not sale_lock_date_for_me"/>
+                                    <a type="object"
+                                       class="oe_link fw-bold"
+                                       name="action_revoke_min_sale_lock_date_exception_for_me">
+                                        Revoke
+                                    </a>
+                                </span>
+                                <span class="text-muted o_form_label"
+                                      invisible="not min_sale_lock_date_exception_for_me_id
+                                                 or not min_sale_lock_date_exception_for_everyone_id">
+                                      <span style="white-space: pre">; </span>
+                                </span>
+                                <span class="text-muted o_form_label"
+                                      invisible="not min_sale_lock_date_exception_for_everyone_id">
+                                    For everyone:
+                                    <field name="sale_lock_date_for_everyone" nolabel="1" class="oe_inline"
+                                           invisible="not sale_lock_date_for_everyone"/>
+                                    <a type="object"
+                                       class="oe_link fw-bold"
+                                       name="action_revoke_min_sale_lock_date_exception_for_everyone">
+                                        Revoke
+                                    </a>
+                                </span>
+                            </div>
+                            <label for="purchase_lock_date"/>
+                            <div class="d-flex">
+                                <field name="purchase_lock_date" placeholder="Not locked"
+                                       class="oe_inline"
+                                       decoration-info="exception_needed_fields and 'purchase_lock_date' in exception_needed_fields"
+                                       options="{'warn_future': true}"/>
+                                <span class="text-muted o_form_label"
+                                      invisible="not min_purchase_lock_date_exception_for_me_id">
+                                    For me:
+                                    <field name="purchase_lock_date_for_me" nolabel="1" class="oe_inline"
+                                           invisible="not purchase_lock_date_for_me"/>
+                                    <a type="object"
+                                       class="oe_link fw-bold"
+                                       name="action_revoke_min_purchase_lock_date_exception_for_me">
+                                        Revoke
+                                    </a>
+                                </span>
+                                <span class="text-muted o_form_label"
+                                      invisible="not min_purchase_lock_date_exception_for_me_id
+                                                 or not min_purchase_lock_date_exception_for_everyone_id">
+                                      <span style="white-space: pre">; </span>
+                                </span>
+                                <span class="text-muted o_form_label"
+                                      invisible="not min_purchase_lock_date_exception_for_everyone_id">
+                                    For everyone:
+                                    <field name="purchase_lock_date_for_everyone" nolabel="1" class="oe_inline"
+                                           invisible="not purchase_lock_date_for_everyone"/>
+                                    <a type="object"
+                                       class="oe_link fw-bold"
+                                       name="action_revoke_min_purchase_lock_date_exception_for_everyone">
+                                        Revoke
+                                    </a>
+                                </span>
+                            </div>
+                            <label for="tax_lock_date"/>
+                            <div class="d-flex">
+                                <field name="tax_lock_date" placeholder="Not locked"
+                                       class="oe_inline"
+                                       decoration-info="exception_needed_fields and 'tax_lock_date' in exception_needed_fields"
+                                       options="{'warn_future': true}"/>
+                                <span class="text-muted"
+                                      invisible="min_tax_lock_date_exception_for_me_id or min_tax_lock_date_exception_for_everyone_id">
+                                    <i>after a tax closing</i>
+                                </span>
+                                <span class="text-muted o_form_label"
+                                      invisible="not min_tax_lock_date_exception_for_me_id">
+                                    For me:
+                                    <field name="tax_lock_date_for_me" nolabel="1" class="oe_inline"
+                                           invisible="not tax_lock_date_for_me"/>
+                                    <a type="object"
+                                       class="oe_link fw-bold"
+                                       name="action_revoke_min_tax_lock_date_exception_for_me">
+                                        Revoke
+                                    </a>
+                                </span>
+                                <span class="text-muted o_form_label"
+                                      invisible="not min_tax_lock_date_exception_for_me_id
+                                                 or not min_tax_lock_date_exception_for_everyone_id">
+                                      <span style="white-space: pre">; </span>
+                                </span>
+                                <span class="text-muted o_form_label"
+                                      invisible="not min_tax_lock_date_exception_for_everyone_id">
+                                    For everyone:
+                                    <field name="tax_lock_date_for_everyone" nolabel="1" class="oe_inline"
+                                           invisible="not tax_lock_date_for_everyone"/>
+                                    <a type="object"
+                                       class="oe_link fw-bold"
+                                       name="action_revoke_min_tax_lock_date_exception_for_everyone">
+                                        Revoke
+                                    </a>
+                                </span>
+                            </div>
+                            <label for="fiscalyear_lock_date"/>
+                            <div class="d-flex">
+                                <field name="fiscalyear_lock_date" placeholder="Not locked"
+                                       class="oe_inline"
+                                       decoration-info="exception_needed_fields and 'fiscalyear_lock_date' in exception_needed_fields"
+                                       options="{'warn_future': true}"/>
+                                <span class="text-muted"
+                                      invisible="min_fiscalyear_lock_date_exception_for_me_id or min_fiscalyear_lock_date_exception_for_everyone_id">
+                                    <i>but allow exceptions</i>
+                                </span>
+                                <span class="text-muted o_form_label"
+                                      invisible="not min_fiscalyear_lock_date_exception_for_me_id">
+                                    For me:
+                                    <field name="fiscalyear_lock_date_for_me" nolabel="1" class="oe_inline"
+                                           invisible="not fiscalyear_lock_date_for_me"/>
+                                    <a type="object"
+                                       class="oe_link fw-bold"
+                                       name="action_revoke_min_fiscalyear_lock_date_exception_for_me">
+                                        Revoke
+                                    </a>
+                                </span>
+                                <span class="text-muted o_form_label"
+                                      invisible="not min_fiscalyear_lock_date_exception_for_me_id
+                                                 or not min_fiscalyear_lock_date_exception_for_everyone_id">
+                                      <span style="white-space: pre">; </span>
+                                </span>
+                                <span class="text-muted o_form_label"
+                                      invisible="not min_fiscalyear_lock_date_exception_for_everyone_id">
+                                    For everyone:
+                                    <field name="fiscalyear_lock_date_for_everyone" nolabel="1" class="oe_inline"
+                                           invisible="not fiscalyear_lock_date_for_everyone"/>
+                                    <a type="object"
+                                       class="oe_link fw-bold"
+                                       name="action_revoke_min_fiscalyear_lock_date_exception_for_everyone">
+                                        Revoke
+                                    </a>
+                                </span>
+                            </div>
+                            <div class="alert alert-info ps-3 mt-2 mb-0 d-flex flex-wrap" role="alert"
+                                 colspan="2"
+                                 style="white-space: pre;"
+                                 invisible="not exception_needed_fields">
+                                <span>Exception</span>
+                                <field name="exception_applies_to" class="oe_inline mx-3"/>
+                                <field name="exception_duration" class="oe_inline"/>
+                                <field name="exception_reason"
+                                       placeholder="Reason..."
+                                       class="oe_inline mx-3 flex-grow-1"
+                                       widget="text"
+                                       options="{'line_breaks': False}"
+                                       invisible="exception_applies_to == 'everyone' and exception_duration == 'forever'"/>
+                            </div>
+                            <div class="d-flex justify-content-start">
+                                <div class="alert alert-danger ps-3 mb-3" role="alert">
+                                    <div>Need an irreversible lock to ensure inalterability, for all users?</div>
+                                    <div class="d-flex">
+                                        <label for="hard_lock_date"/>
+                                        <field name="hard_lock_date" placeholder="Not locked"
+                                               class="oe_inline mx-3"
+                                               decoration-info="exception_needed_fields and 'hard_lock_date' in exception_needed_fields"
+                                               options="{'warn_future': true}"/>
+                                        <span class="text-danger o_form_label" invisible="hard_lock_date == current_hard_lock_date">
+                                            <i>This change is irreversible</i>
+                                        </span>
+                                    </div>
+                                </div>
+                            </div>
+                        </group>
+                    </sheet>
+                    <footer>
+                        <button string="Save" name="change_lock_date" type="object" class="btn-primary" data-hotkey="q"/>
+                        <button string="Discard" class="btn-secondary" special="cancel" data-hotkey="x"/>
+                    </footer>
+               </form>
+            </field>
+        </record>
+
+        <record id="action_view_account_change_lock_date" model="ir.actions.act_window">
+            <field name="name">Lock Journal Entries</field>
+            <field name="res_model">account.change.lock.date</field>
+            <field name="view_mode">form</field>
+            <field name="view_id" ref="view_account_change_lock_date"/>
+            <field name="target">new</field>
+        </record>
+
+        <menuitem
+            id="menu_action_change_lock_date"
+            name="Lock Dates"
+            action="action_view_account_change_lock_date"
+            parent="account.menu_finance_entries"
+            sequence="70"
+            groups="account.group_account_manager"/>
+    </data>
+</odoo>
diff --git a/dev_odex30_accounting/odex30_account_accountant/wizard/account_reconcile_wizard.py b/dev_odex30_accounting/odex30_account_accountant/wizard/account_reconcile_wizard.py
new file mode 100644
index 0000000..9605d77
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_accountant/wizard/account_reconcile_wizard.py
@@ -0,0 +1,772 @@
+from collections import defaultdict
+from datetime import timedelta
+
+from odoo import api, Command, fields, models, _
+from odoo.exceptions import UserError
+from odoo.tools import groupby, SQL
+from odoo.tools.misc import formatLang
+
+
+class AccountReconcileWizard(models.TransientModel):
+    """ This wizard is used to reconcile selected account.move.line. """
+    _name = 'account.reconcile.wizard'
+    _description = 'Account reconciliation wizard'
+    _check_company_auto = True
+
+    @api.model
+    def default_get(self, fields_list):
+        res = super().default_get(fields_list)
+        if 'move_line_ids' not in fields_list:
+            return res
+        if self.env.context.get('active_model') != 'account.move.line' or not self.env.context.get('active_ids'):
+            raise UserError(_('This can only be used on journal items'))
+        move_line_ids = self.env['account.move.line'].browse(self.env.context['active_ids'])
+        accounts = move_line_ids.account_id
+        if len(accounts) > 2:
+            raise UserError(_(
+                'You can only reconcile entries with up to two different accounts: %s',
+                ', '.join(accounts.mapped('display_name')),
+            ))
+        shadowed_aml_values = None
+        if len(accounts) == 2:
+            shadowed_aml_values = {
+                aml: {'account_id': move_line_ids[0].account_id}
+                for aml in move_line_ids.filtered(lambda line: line.account_id != move_line_ids[0].account_id)
+            }
+        move_line_ids._check_amls_exigibility_for_reconciliation(shadowed_aml_values=shadowed_aml_values)
+        res['move_line_ids'] = [Command.set(move_line_ids.ids)]
+        return res
+
+    company_id = fields.Many2one(comodel_name='res.company', required=True, readonly=True, compute='_compute_company_id')
+    move_line_ids = fields.Many2many(
+        comodel_name='account.move.line',
+        string='Move lines to reconcile',
+        required=True)
+    reco_account_id = fields.Many2one(
+        comodel_name='account.account',
+        string='Reconcile Account',
+        compute='_compute_reco_wizard_data')
+    amount = fields.Monetary(
+        string='Amount in company currency',
+        currency_field='company_currency_id',
+        compute='_compute_reco_wizard_data')
+    company_currency_id = fields.Many2one(comodel_name='res.currency', string='Company currency', related='company_id.currency_id')
+    amount_currency = fields.Monetary(
+        string='Amount',
+        currency_field='reco_currency_id',
+        compute='_compute_reco_wizard_data')
+    reco_currency_id = fields.Many2one(
+        comodel_name='res.currency',
+        string='Currency to use for reconciliation',
+        compute='_compute_reco_wizard_data')
+    edit_mode_amount = fields.Monetary(
+        currency_field='company_currency_id',
+        compute='_compute_edit_mode_amount',
+    )
+    edit_mode_amount_currency = fields.Monetary(
+        string='Edit mode amount',
+        currency_field='edit_mode_reco_currency_id',
+        compute='_compute_edit_mode_amount_currency',
+        store=True,
+        readonly=False,
+    )
+    edit_mode_reco_currency_id = fields.Many2one(
+        comodel_name='res.currency',
+        compute='_compute_edit_mode_reco_currency',
+    )
+    edit_mode = fields.Boolean(
+        compute='_compute_edit_mode',
+    )
+    single_currency_mode = fields.Boolean(compute='_compute_single_currency_mode')
+    allow_partials = fields.Boolean(string="Allow partials", compute='_compute_allow_partials', store=True, readonly=False)
+    force_partials = fields.Boolean(compute='_compute_reco_wizard_data')
+    display_allow_partials = fields.Boolean(compute='_compute_display_allow_partials')
+    date = fields.Date(string='Date', compute='_compute_date', store=True, readonly=False)
+    journal_id = fields.Many2one(
+        comodel_name='account.journal',
+        string='Journal',
+        check_company=True,
+        domain="[('type', '=', 'general')]",
+        compute='_compute_journal_id',
+        store=True,
+        readonly=False,
+        required=True,
+        precompute=True)
+    account_id = fields.Many2one(
+        comodel_name='account.account',
+        string='Account',
+        check_company=True,
+        domain="[('deprecated', '=', False), ('account_type', '!=', 'off_balance')]")
+    is_rec_pay_account = fields.Boolean(compute='_compute_is_rec_pay_account')
+    to_partner_id = fields.Many2one(
+        comodel_name='res.partner',
+        string='Partner',
+        check_company=True,
+        compute='_compute_to_partner_id',
+        store=True,
+        readonly=False,
+    )
+    label = fields.Char(string='Label', default='Write-Off')
+    tax_id = fields.Many2one(
+        comodel_name='account.tax',
+        string='Tax',
+        default=False,
+        check_company=True)
+    to_check = fields.Boolean(
+        string='To Check',
+        default=False,
+        help='Check if you are not certain of all the information of the counterpart.')
+    is_write_off_required = fields.Boolean(
+        string='Is a write-off move required to reconcile',
+        compute='_compute_is_write_off_required')
+    is_transfer_required = fields.Boolean(
+        string='Is an account transfer required',
+        compute='_compute_reco_wizard_data')
+    transfer_warning_message = fields.Char(
+        string='Is an account transfer required to reconcile',
+        compute='_compute_reco_wizard_data')
+    transfer_from_account_id = fields.Many2one(
+        comodel_name='account.account',
+        string='Account Transfer From',
+        compute='_compute_reco_wizard_data')
+    lock_date_violated_warning_message = fields.Char(
+        string='Is the date violating the lock date of moves',
+        compute='_compute_lock_date_violated_warning_message')
+    reco_model_id = fields.Many2one(
+        comodel_name='account.reconcile.model',
+        string='Reconciliation model',
+        store=False,
+        check_company=True)
+    reco_model_autocomplete_ids = fields.Many2many(
+        comodel_name='account.reconcile.model',
+        string='All reconciliation models',
+        compute='_compute_reco_model_autocomplete_ids')
+
+    # ==== Compute methods ====
+    @api.depends('move_line_ids.company_id')
+    def _compute_company_id(self):
+        for wizard in self:
+            wizard.company_id = wizard.move_line_ids[0].company_id
+
+    @api.depends('move_line_ids')
+    def _compute_single_currency_mode(self):
+        for wizard in self:
+            wizard.single_currency_mode = len(wizard.move_line_ids.currency_id - wizard.company_currency_id) <= 1
+
+    @api.depends('force_partials')
+    def _compute_allow_partials(self):
+        for wizard in self:
+            wizard.allow_partials = wizard.display_allow_partials and wizard.force_partials
+
+    @api.depends('move_line_ids')
+    def _compute_display_allow_partials(self):
+        """ We only display the allow partial checkbox if there is both credit and debit lines involved. """
+        for wizard in self:
+            wizard.display_allow_partials = has_debit_line = has_credit_line = False
+            for aml in wizard.move_line_ids:
+                if aml.balance > 0.0 or aml.amount_currency > 0.0:
+                    has_debit_line = True
+                elif aml.balance < 0.0 or aml.amount_currency < 0.0:
+                    has_credit_line = True
+                if has_debit_line and has_credit_line:
+                    wizard.display_allow_partials = True
+                    break
+
+    @api.depends('move_line_ids', 'journal_id', 'tax_id')
+    def _compute_date(self):
+        for wizard in self:
+            highest_date = max(aml.date for aml in wizard.move_line_ids)
+            temp_move = self.env['account.move'].new({'journal_id': wizard.journal_id.id})
+            wizard.date = temp_move._get_accounting_date(highest_date, bool(wizard.tax_id))
+
+    @api.depends('company_id')
+    def _compute_journal_id(self):
+        for wizard in self:
+            wizard.journal_id = self.env['account.journal'].search([
+                *self.env['account.journal']._check_company_domain(wizard.company_id),
+                ('type', '=', 'general')
+            ], limit=1)
+
+    @api.depends('account_id')
+    def _compute_is_rec_pay_account(self):
+        for wizard in self:
+            wizard.is_rec_pay_account = wizard.account_id.account_type in ('asset_receivable', 'liability_payable')
+
+    @api.depends('is_rec_pay_account')
+    def _compute_to_partner_id(self):
+        for wizard in self:
+            if wizard.is_rec_pay_account:
+                partners = wizard.move_line_ids.partner_id
+                wizard.to_partner_id = partners if len(partners) == 1 else None
+            else:
+                wizard.to_partner_id = None
+
+    @api.depends('amount', 'amount_currency')
+    def _compute_is_write_off_required(self):
+        """ We need a write-off if the balance is not 0 and if we don't allow partial reconciliation."""
+        for wizard in self:
+            wizard.is_write_off_required = not wizard.company_currency_id.is_zero(wizard.amount) \
+                or (wizard.reco_currency_id and not wizard.reco_currency_id.is_zero(wizard.amount_currency))
+
+    @api.depends('move_line_ids')
+    def _compute_reco_wizard_data(self):
+        """ Compute various data needed for the reco wizard.
+        1. The currency to use for the reconciliation:
+            - if only one foreign currency is present in move lines we use it, unless the reco_account is not
+             payable nor receivable,
+            - if no foreign currency or more than 1 are used we use the company's default currency.
+        2. The account the reconciliation will happen on.
+        3. Transfer data.
+        4. Write-off amounts.
+        """
+
+        def get_transfer_data(move_lines):
+            amounts_per_account = defaultdict(float)
+            for line in move_lines:
+                amounts_per_account[line.account_id] += line.amount_residual
+            if abs(amounts_per_account[accounts[0]]) < abs(amounts_per_account[accounts[1]]):
+                transfer_from_account, transfer_to_account = accounts[0], accounts[1]
+            else:
+                transfer_from_account, transfer_to_account = accounts[1], accounts[0]
+
+            amls_to_transfer = amls.filtered(lambda aml: aml.account_id == transfer_from_account)
+            transfer_foreign_curr = amls.currency_id - amls.company_currency_id
+            if len(transfer_foreign_curr) == 1:
+                transfer_currency = transfer_foreign_curr
+                transfer_amount_currency = sum(aml.amount_currency for aml in amls_to_transfer)
+            else:
+                transfer_currency = amls.company_currency_id
+                transfer_amount_currency = sum(aml.balance for aml in amls_to_transfer)
+
+            if transfer_amount_currency == 0.0 and transfer_currency != amls.company_currency_id:
+                # handle the transfer of exchange diff
+                transfer_currency = amls.company_currency_id
+                transfer_amount_currency = sum(aml.balance for aml in amls_to_transfer)
+
+            amount_formatted = formatLang(self.env, abs(transfer_amount_currency), currency_obj=transfer_currency)
+            transfer_warning_message = _(
+                'An entry will transfer %(amount)s from %(from_account)s to %(to_account)s.',
+                amount=amount_formatted,
+                from_account=transfer_from_account.display_name if transfer_amount_currency < 0 else transfer_to_account.display_name,
+                to_account=transfer_to_account.display_name if transfer_amount_currency < 0 else transfer_from_account.display_name,
+            )
+            return {
+                'transfer_from_account_id': transfer_from_account,
+                'reco_account_id': transfer_to_account,
+                'transfer_warning_message': transfer_warning_message,
+            }
+
+        def get_reco_currency(amls, aml_values_map):
+            company_currency = amls.company_currency_id
+            foreign_currencies = amls.currency_id - company_currency
+            if len(foreign_currencies) == 0:
+                return company_currency
+            elif len(foreign_currencies) == 1:
+                return foreign_currencies
+            else:
+                lines_with_residuals = self.env['account.move.line']
+                for residual, residual_values in aml_values_map.items():
+                    if residual_values['amount_residual'] or residual_values['amount_residual_currency']:
+                        lines_with_residuals += residual
+                        if lines_with_residuals and len(lines_with_residuals.currency_id - company_currency) > 1:
+                            # there is more than one residual and more than one currency in them
+                            return False
+                return (lines_with_residuals.currency_id - company_currency) or company_currency
+
+        for wizard in self:
+            amls = wizard.move_line_ids._origin
+            accounts = amls.account_id  # there is only 1 or 2 possible accounts
+
+            wizard.reco_currency_id = False
+            wizard.amount_currency = wizard.amount = 0.0
+            wizard.force_partials = True
+            wizard.transfer_from_account_id = wizard.transfer_warning_message = False
+            wizard.is_transfer_required = len(accounts) == 2
+            if wizard.is_transfer_required:
+                wizard.update(get_transfer_data(amls))
+            else:
+                wizard.reco_account_id = accounts
+
+            # Compute the residual amounts for each account.
+            shadowed_aml_values = {
+                aml: {'account_id': wizard.reco_account_id}
+                for aml in amls
+            }
+
+            # Batch the amls all together to know what should be reconciled and when.
+            plan_list, all_amls = amls._optimize_reconciliation_plan([amls], shadowed_aml_values=shadowed_aml_values)
+
+            # Prefetch data
+            all_amls.move_id
+            all_amls.matched_debit_ids
+            all_amls.matched_credit_ids
+
+            # All residual amounts are collected and updated until the creation of partials in batch.
+            # This is done that way to minimize the orm time for fields invalidation/mark as recompute and
+            # re-computation.
+            aml_values_map = {
+                aml: {
+                    'aml': aml,
+                    'amount_residual': aml.amount_residual,
+                    'amount_residual_currency': aml.amount_residual_currency,
+                }
+                for aml in all_amls
+            }
+
+            disable_partial_exchange_diff = bool(self.env['ir.config_parameter'].sudo().get_param('account.disable_partial_exchange_diff'))
+            plan = plan_list[0]
+            # residuals are subtracted from aml_values_map
+            amls\
+                .with_context(no_exchange_difference=self._context.get('no_exchange_difference') or disable_partial_exchange_diff) \
+                ._prepare_reconciliation_plan(plan, aml_values_map, shadowed_aml_values=shadowed_aml_values)
+
+            reco_currency = get_reco_currency(amls, aml_values_map)
+            if not reco_currency:
+                continue  # stop the computation, no possible write-off => force partials
+
+            residual_amounts = {
+                aml: aml._prepare_move_line_residual_amounts(aml_values, reco_currency, shadowed_aml_values=shadowed_aml_values)
+                for aml, aml_values in aml_values_map.items()
+            }
+
+            if all(reco_currency in residual_values for residual_values in residual_amounts.values() if residual_values):
+                wizard.reco_currency_id = reco_currency
+            elif all(amls.company_currency_id in residual_values for residual_values in residual_amounts.values() if residual_values):
+                wizard.reco_currency_id = amls.company_currency_id
+                reco_currency = wizard.reco_currency_id
+            else:
+                continue  # stop the computation, no possible write-off => force partials
+
+            # Compute write-off amounts
+            most_recent_line = max(amls, key=lambda aml: aml.date)
+            if not most_recent_line.amount_currency:
+                rate = rate_lower_bound = rate_upper_bound = 0.0
+            elif most_recent_line.currency_id == reco_currency:
+                rate = abs(most_recent_line.balance / most_recent_line.amount_currency)
+                # By estimating the rate from the most recent line, we are exposing ourselves to an estimation error because
+                # balance is amount_currency * rate, rounded to the nearest precision of the company currency. We now compute
+                # the lower/upper bounds of the estimated rate in order to determine which other AMLs share the same rate.
+                # For AMLs that share the same rate, we will use the existing amount_residual instead of recomputing it
+                # based on the amount_residual_currency and the rate.
+                rate_tolerance = amls.company_currency_id.rounding / 2 / abs(most_recent_line.amount_currency)
+                rate_lower_bound = rate - rate_tolerance
+                rate_upper_bound = rate + rate_tolerance
+            else:
+                rate = self.env['res.currency']._get_conversion_rate(reco_currency, amls.company_currency_id, amls.company_id, most_recent_line.date)
+                rate_lower_bound = rate_upper_bound = rate
+
+            # If an AML's rate is close enough to the reconciliation rate that it could be the same,
+            # use the `amount_residual` instead of computing `amount_residual_currency / rate` and rounding.
+            # We do this for the case where a single rate is used for all reconciled AMLs so we want to avoid
+            # creating an exchange diff because that would be weird.
+            amls_where_amounts_at_correct_rate = {
+                aml
+                for aml, residual_values in residual_amounts.items()
+                if (
+                    aml.currency_id == reco_currency
+                    and abs(aml.balance) >= aml.company_currency_id.round(abs(aml.amount_currency) * rate_lower_bound)
+                    and abs(aml.balance) <= aml.company_currency_id.round(abs(aml.amount_currency) * rate_upper_bound)
+                )
+            }
+
+            wizard.amount_currency = sum(
+                residual_values[wizard.reco_currency_id]['residual']
+                for residual_values in residual_amounts.values()
+                if residual_values
+            )
+            amount_raw = sum(
+                (
+                    residual_values[amls.company_currency_id]['residual']
+                    if aml in amls_where_amounts_at_correct_rate and amls.company_currency_id in residual_values else
+                    residual_values[wizard.reco_currency_id]['residual'] * rate
+                )
+                for aml, residual_values in residual_amounts.items()
+                if residual_values
+            )
+            wizard.amount = amls.company_currency_id.round(amount_raw)
+            wizard.force_partials = False
+
+    @api.depends('move_line_ids')
+    def _compute_edit_mode_amount_currency(self):
+        for wizard in self:
+            if wizard.edit_mode:
+                wizard.edit_mode_amount_currency = wizard.amount_currency
+            else:
+                wizard.edit_mode_amount_currency = 0.0
+
+    @api.depends('edit_mode_amount_currency')
+    def _compute_edit_mode_amount(self):
+        for wizard in self:
+            if wizard.edit_mode:
+                single_line = wizard.move_line_ids
+                rate = abs(single_line.amount_currency / single_line.balance) if single_line.balance else 0.0
+                wizard.edit_mode_amount = single_line.company_currency_id.round(wizard.edit_mode_amount_currency / rate) if rate else 0.0
+            else:
+                wizard.edit_mode_amount = 0.0
+
+    @api.depends('move_line_ids')
+    def _compute_edit_mode_reco_currency(self):
+        for wizard in self:
+            if wizard.edit_mode:
+                wizard.edit_mode_reco_currency_id = wizard.move_line_ids.currency_id
+            else:
+                wizard.edit_mode_reco_currency_id = False
+
+    @api.depends('move_line_ids')
+    def _compute_edit_mode(self):
+        for wizard in self:
+            wizard.edit_mode = len(wizard.move_line_ids) == 1
+
+    @api.depends('move_line_ids.move_id', 'date')
+    def _compute_lock_date_violated_warning_message(self):
+        for wizard in self:
+            date_after_lock = wizard._get_date_after_lock_date()
+            lock_date_violated_warning_message = None
+            if date_after_lock:
+                lock_date_violated_warning_message = _(
+                    'The date you set violates the lock date of one of your entry. It will be overriden by the following date : %(replacement_date)s',
+                    replacement_date=date_after_lock,
+                )
+            wizard.lock_date_violated_warning_message = lock_date_violated_warning_message
+
+    @api.depends('company_id')
+    def _compute_reco_model_autocomplete_ids(self):
+        """ Computes available reconcile models, we only take models that are of type 'writeoff_button'
+        and that have one (and only one) line.
+        """
+        for wizard in self:
+            domain = [
+                ('rule_type', '=', 'writeoff_button'),
+                ('company_id', '=', wizard.company_id.id),
+                ('counterpart_type', 'not in', ('sale', 'purchase')),
+            ]
+            query = self.env['account.reconcile.model']._where_calc(domain)
+            reco_model_ids = [r[0] for r in self.env.execute_query(SQL("""
+                SELECT account_reconcile_model.id
+                FROM %s
+                JOIN account_reconcile_model_line line ON line.model_id = account_reconcile_model.id
+                WHERE %s
+                GROUP BY account_reconcile_model.id
+                HAVING COUNT(account_reconcile_model.id) = 1
+            """, query.from_clause, query.where_clause or SQL("TRUE")))]
+            wizard.reco_model_autocomplete_ids = self.env['account.reconcile.model'].browse(reco_model_ids)
+
+    # ==== Onchange methods ====
+    @api.onchange('reco_model_id')
+    def _onchange_reco_model_id(self):
+        """ We prefill the write-off data with the reconcile model selected. """
+        if self.reco_model_id:
+            self.to_check = self.reco_model_id.to_check
+            self.label = self.reco_model_id.line_ids.label
+            self.tax_id = self.reco_model_id.line_ids.tax_ids[0] if self.reco_model_id.line_ids[0].tax_ids else None
+            self.journal_id = self.reco_model_id.line_ids.journal_id  # we limited models to those with one and only one line
+            self.account_id = self.reco_model_id.line_ids.account_id
+
+    # ==== Python constrains ====
+    @api.constrains('edit_mode_amount_currency')
+    def _check_min_max_edit_mode_amount_currency(self):
+        for wizard in self:
+            if wizard.edit_mode:
+                if wizard.edit_mode_amount_currency == 0.0:
+                    raise UserError(_('The amount of the write-off of a single line cannot be 0.'))
+                is_debit_line = wizard.move_line_ids.balance > 0.0 or wizard.move_line_ids.amount_currency > 0.0
+                if is_debit_line and wizard.edit_mode_amount_currency < 0.0:
+                    raise UserError(_('The amount of the write-off of a single debit line should be strictly positive.'))
+                elif not is_debit_line and wizard.edit_mode_amount_currency > 0.0:
+                    raise UserError(_('The amount of the write-off of a single credit line should be strictly negative.'))
+
+    # ==== Actions methods ====
+    def _action_open_wizard(self):
+        self.ensure_one()
+        return {
+            'name': _('Write-Off Entry'),
+            'type': 'ir.actions.act_window',
+            'view_type': 'form',
+            'view_mode': 'form',
+            'res_model': 'account.reconcile.wizard',
+            'target': 'new',
+        }
+
+    # ==== Business methods ====
+
+    def _get_date_after_lock_date(self):
+        self.ensure_one()
+        lock_dates = self.company_id._get_violated_lock_dates(self.date, bool(self.tax_id), self.journal_id)
+        if lock_dates:
+            return lock_dates[-1][0] + timedelta(days=1)
+
+    def _compute_write_off_taxes_data(self, partner):
+        """ Computes the data needed to fill the write-off lines related to taxes.
+        :return: a dict of the form {
+            'base_amount': 100.0,
+            'base_amount_currency': 200.0,
+            'tax_lines_data': [{
+                'tax_amount': 21.0,
+                'tax_amount_currency': 42.0,
+                'tax_tag_ids': [tax_tags],
+                'tax_account_id': id_of_account,
+                } * nr of repartition lines of the self.tax_id ],
+        }
+        """
+        AccountTax = self.env['account.tax']
+        amount_currency = self.edit_mode_amount_currency or self.amount_currency
+        amount = self.edit_mode_amount or self.amount
+        rate = abs(amount_currency / amount)
+        tax_type = self.tax_id.type_tax_use if self.tax_id else None
+        is_refund = (tax_type == 'sale' and amount_currency > 0.0) or (tax_type == 'purchase' and amount_currency < 0.0)
+        base_line = AccountTax._prepare_base_line_for_taxes_computation(
+            self,
+            partner_id=partner,
+            currency_id=self.reco_currency_id,
+            tax_ids=self.tax_id,
+            price_unit=amount_currency,
+            quantity=1.0,
+            account_id=self.account_id,
+            is_refund=is_refund,
+            rate=rate,
+            special_mode='total_included',
+        )
+        base_lines = [base_line]
+        AccountTax._add_tax_details_in_base_lines(base_lines, self.company_id)
+        AccountTax._round_base_lines_tax_details(base_lines, self.company_id)
+        AccountTax._add_accounting_data_in_base_lines_tax_details(base_lines, self.company_id, include_caba_tags=True)
+        tax_results = AccountTax._prepare_tax_lines(base_lines, self.company_id)
+        _base_line, base_to_update = tax_results['base_lines_to_update'][0]  # we can only have one baseline
+        tax_lines_data = []
+        for tax_line_vals in tax_results['tax_lines_to_add']:
+            tax_lines_data.append({
+                'tax_amount': tax_line_vals['balance'],
+                'tax_amount_currency': tax_line_vals['amount_currency'],
+                'tax_tag_ids': tax_line_vals['tax_tag_ids'],
+                'tax_account_id': tax_line_vals['account_id'],
+            })
+        base_amount_currency = base_to_update['amount_currency']
+        base_amount = amount - sum(entry['tax_amount'] for entry in tax_lines_data)
+
+        return {
+            'base_amount': base_amount,
+            'base_amount_currency': base_amount_currency,
+            'base_tax_tag_ids': base_to_update['tax_tag_ids'],
+            'tax_lines_data': tax_lines_data,
+        }
+
+    def _create_write_off_lines(self, partner=None):
+        if not partner:
+            partner = self.env['res.partner']
+        to_partner = self.to_partner_id if self.is_rec_pay_account else partner
+        tax_data = self._compute_write_off_taxes_data(to_partner) if self.tax_id else None
+        amount_currency = self.edit_mode_amount_currency or self.amount_currency
+        amount = self.edit_mode_amount or self.amount
+        line_ids_commands = [
+            Command.create({
+                'name': self.label or _('Write-Off'),
+                'account_id': self.reco_account_id.id,
+                'partner_id': partner.id,
+                'currency_id': self.reco_currency_id.id,
+                'amount_currency': -amount_currency,
+                'balance': -amount,
+            }),
+            Command.create({
+                'name': self.label,
+                'account_id': self.account_id.id,
+                'partner_id': to_partner.id,
+                'currency_id': self.reco_currency_id.id,
+                'tax_ids': self.tax_id.ids,
+                'tax_tag_ids': None if not tax_data else tax_data['base_tax_tag_ids'],
+                'amount_currency': amount_currency if not tax_data else tax_data['base_amount_currency'],
+                'balance': amount if not tax_data else tax_data['base_amount'],
+            }),
+        ]
+        # Add taxes lines to the write-off lines, one per repartition line
+        if tax_data:
+            for tax_datum in tax_data['tax_lines_data']:
+                line_ids_commands.append(Command.create({
+                    'name': self.tax_id.name,
+                    'account_id': tax_datum['tax_account_id'],
+                    'partner_id': to_partner.id,
+                    'currency_id': self.reco_currency_id.id,
+                    'tax_tag_ids': tax_datum['tax_tag_ids'],
+                    'amount_currency': tax_datum['tax_amount_currency'],
+                    'balance': tax_datum['tax_amount'],
+                }))
+        return line_ids_commands
+
+    def create_write_off(self):
+        """ Create write-off move lines with the data provided in the wizard. """
+        self.ensure_one()
+        partners = self.move_line_ids.partner_id
+        partner = partners if len(partners) == 1 else None
+        write_off_vals = {
+            'journal_id': self.journal_id.id,
+            'company_id': self.company_id.id,
+            'date': self._get_date_after_lock_date() or self.date,
+            'move_type': 'entry',
+            'checked': not self.to_check,
+            'line_ids': self._create_write_off_lines(partner=partner)
+        }
+        write_off_move = self.env['account.move'].with_context(
+            skip_invoice_sync=True,
+            skip_invoice_line_sync=True,
+        ).create(write_off_vals)
+        write_off_move.action_post()
+        return write_off_move
+
+    def create_transfer(self):
+        """ Create transfer move.
+        We transfer lines squashed by partner and by currency to keep the partner ledger correct.
+        By default, the source line and the destination line of each transfer are linked to the same partner.
+        However, it can happen that the moves that are being reconciled together come from different partners
+        (e.g. reconciling an invoice of Partner X with a bill of Parnter Y).
+        In that case, one of the transfer lines should be set to the other partner.
+        Otherwise, the partner ledger will be wrong for both users.
+        """
+        self.ensure_one()
+        line_ids = []
+        lines_to_transfer = self.move_line_ids.filtered(lambda line: line.account_id == self.transfer_from_account_id)
+        # The lines that are not transferred will be used to determine the partners of the destination lines
+        other_lines = self.move_line_ids.filtered(lambda line: line.account_id == self.reco_account_id)
+        # Default dict for the destination lines. It contains the inverse of the source lines
+        # {(partner, currency, sign): {'balance': float, 'amount_currency': float}}
+        default_destination_data = dict()
+        # Dict generated from the lines linked to the reconcile model.
+        # It is splitted by partner and represents the possible partners and the amount max that can be used
+        # for the destination lines.
+        # {(currency, sign): {(partner): {'balance': float, 'amount_currency': float}}}
+        amounts_by_partner = defaultdict(lambda: defaultdict(lambda: defaultdict(float)))
+        # Final dict containing the data from which the destination lines will be created
+        # {(partner, currency, sign): {'balance': float, 'amount_currency': float}}
+        destination_data = defaultdict(lambda: defaultdict(float))
+
+        for (partner, currency), lines_to_transfer_partner in groupby(lines_to_transfer, lambda l: (l.partner_id, l.currency_id)):
+            amount = sum(line.amount_residual for line in lines_to_transfer_partner)
+            amount_currency = sum(line.amount_residual_currency for line in lines_to_transfer_partner)
+            line_ids += [
+                Command.create({
+                    'name': _('Transfer to %s', self.reco_account_id.display_name),
+                    'account_id': self.transfer_from_account_id.id,
+                    'partner_id': partner.id,
+                    'currency_id': currency.id,
+                    'amount_currency': -amount_currency,
+                    'balance': -amount,
+                }),
+            ]
+            sign = -1 if amount < 0 else 1
+            # By default, the partner of the destination line will be the same than the one of the source line.
+            # As the transfer move should be balanced, the amounts defined here represent the total amount that
+            # will be in the destination lines.
+            # They may be split between several partners though.
+            default_destination_data[partner, currency, sign] = {
+                'balance': amount,
+                'amount_currency': amount_currency,
+            }
+        # Run through the lines linked to the reconcile account to determine the possible partners and amounts for the destination
+        # lines of the transfer
+        for (partner, currency), lines_to_transfer_partner in groupby(other_lines, lambda l: (l.partner_id, l.currency_id)):
+            amount = -sum(line.amount_residual for line in lines_to_transfer_partner)
+            amount_currency = -sum(line.amount_residual_currency for line in lines_to_transfer_partner)
+            sign = -1 if amount < 0 else 1
+            # If the partner, currency and sign of the amounts match one of the default data, it is kept for the destination lines.
+            # The amounts will be adapted with the remaining amounts.
+            if (partner, currency, sign) in default_destination_data:
+                default_amount = default_destination_data[partner, currency, sign]['balance']
+                default_amount_currency = default_destination_data[partner, currency, sign]['amount_currency']
+                amount_to_transfer = min(abs(amount), abs(default_amount)) * sign
+                amount_currency_to_transfer = min(abs(amount_currency), abs(default_amount_currency)) * sign
+                destination_data[partner, currency, sign] = {
+                    'balance': amount_to_transfer,
+                    'amount_currency': amount_currency_to_transfer,
+                }
+                default_amount -= amount_to_transfer
+                default_amount_currency -= amount_currency_to_transfer
+                amount -= amount_to_transfer
+                amount_currency -= amount_currency_to_transfer
+                if not currency.is_zero(abs(default_amount)):
+                    # Update the default amounts with the remaining amounts that have not been kept
+                    default_destination_data[partner, currency, sign] = {
+                        'balance': default_amount,
+                        'amount_currency': default_amount_currency,
+                    }
+                else:
+                    # Delete the key if there is no remaining amount
+                    del default_destination_data[partner, currency, sign]
+            if not currency.is_zero(abs(amount)):
+                amounts_by_partner[currency, sign][partner] = {
+                    'balance': amount,
+                    'amount_currency': amount_currency,
+                }
+        # Run through what's left of the default data and try to find a partner that matches the currency and sign.
+        # If none is found, the partner from the source line is used.
+        for (partner, currency, sign) in default_destination_data:
+            amount = default_destination_data[partner, currency, sign]['balance']
+            amount_currency = default_destination_data[partner, currency, sign]['amount_currency']
+            # Loop on all the partners with the same currency and sign
+            for p in amounts_by_partner[currency, sign]:
+                if amount == 0:
+                    break
+                amount_to_transfer = min(abs(amount), abs(amounts_by_partner[currency, sign][p]['balance'])) * sign
+                amount_currency_to_transfer = min(abs(amount_currency), abs(amounts_by_partner[currency, sign][p]['amount_currency'])) * sign
+                amount -= amount_to_transfer
+                amount_currency -= amount_currency_to_transfer
+
+                destination_data[p, currency, sign]['balance'] += amount_to_transfer
+                destination_data[p, currency, sign]['amount_currency'] += amount_currency_to_transfer
+                amounts_by_partner[currency, sign][p]['balance'] -= amount_to_transfer
+                amounts_by_partner[currency, sign][p]['amount_currency'] -= amount_currency_to_transfer
+            # Residual amount that couldn't be associated to another partner keeps the partner from the source line
+            if not currency.is_zero(abs(amount)):
+                destination_data[partner, currency, sign]['balance'] += amount
+                destination_data[partner, currency, sign]['amount_currency'] += amount_currency
+        # Create the destination lines
+        for (partner, currency, sign) in destination_data:
+            line_ids += [
+                Command.create({
+                    'name': _('Transfer from %s', self.transfer_from_account_id.display_name),
+                    'account_id': self.reco_account_id.id,
+                    'partner_id': partner.id,
+                    'currency_id': currency.id,
+                    'amount_currency': destination_data[partner, currency, sign]['amount_currency'],
+                    'balance': destination_data[partner, currency, sign]['balance'],
+                }),
+            ]
+        transfer_vals = {
+            'journal_id': self.journal_id.id,
+            'company_id': self.company_id.id,
+            'date': self._get_date_after_lock_date() or self.date,
+            'line_ids': line_ids,
+        }
+        transfer_move = self.env['account.move'].create(transfer_vals)
+        transfer_move.action_post()
+        return transfer_move
+
+    def reconcile(self):
+        """ Reconcile selected moves, with a transfer and/or write-off move if necessary."""
+        self.ensure_one()
+        move_lines_to_reconcile = self.move_line_ids._origin
+        do_transfer = self.is_transfer_required
+        do_write_off = self.edit_mode or (self.is_write_off_required and not self.allow_partials)
+        if do_transfer:
+            transfer_move = self.create_transfer()
+            lines_to_transfer = move_lines_to_reconcile \
+                .filtered(lambda line: line.account_id == self.transfer_from_account_id)
+            transfer_line_from = transfer_move.line_ids \
+                .filtered(lambda line: line.account_id == self.transfer_from_account_id)
+            transfer_line_to = transfer_move.line_ids \
+                .filtered(lambda line: line.account_id == self.reco_account_id)
+            (lines_to_transfer + transfer_line_from).reconcile()
+            move_lines_to_reconcile = move_lines_to_reconcile - lines_to_transfer + transfer_line_to
+
+        if do_write_off:
+            write_off_move = self.create_write_off()
+            write_off_line_to_reconcile = write_off_move.line_ids[0]
+            move_lines_to_reconcile += write_off_line_to_reconcile
+            amls_plan = [[move_lines_to_reconcile, write_off_line_to_reconcile]]
+        else:
+            amls_plan = [move_lines_to_reconcile]
+
+        self.env['account.move.line']._reconcile_plan(amls_plan)
+        return move_lines_to_reconcile if not do_transfer else (move_lines_to_reconcile + transfer_move.line_ids)
+
+    def reconcile_open(self):
+        """ Reconcile selected move lines and open them in dedicated view. """
+        self.ensure_one()
+        return self.reconcile().open_reconcile_view()
diff --git a/dev_odex30_accounting/odex30_account_accountant/wizard/account_reconcile_wizard.xml b/dev_odex30_accounting/odex30_account_accountant/wizard/account_reconcile_wizard.xml
new file mode 100644
index 0000000..f9f751b
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_accountant/wizard/account_reconcile_wizard.xml
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <record id="view_account_reconcile_wizard" model="ir.ui.view">
+        <field name="name">account.reconcile.wizard.form</field>
+        <field name="model">account.reconcile.wizard</field>
+        <field name="arch" type="xml">
+            <form>
+                <field name="company_id" invisible="1"/>
+                <field name="move_line_ids" invisible="1"/>
+                <field name="company_currency_id" invisible="1"/>
+                <field name="single_currency_mode" invisible="1"/>
+                <field name="is_write_off_required" invisible="1"/>
+                <field name="is_transfer_required" invisible="1"/>
+                <field name="display_allow_partials" invisible="1"/>
+                <field name="force_partials" invisible="1"/>
+                <field name="is_rec_pay_account" invisible="1"/>
+                <field name="edit_mode" invisible="1"/>
+                <field name="reco_model_autocomplete_ids" invisible="1"/>
+
+                <!-- Warnings -->
+                <div class="alert alert-warning" role="alert" invisible="not is_transfer_required">
+                    <field name="transfer_warning_message"/>
+                </div>
+                <div class="alert alert-warning" role="alert" invisible="not lock_date_violated_warning_message">
+                    <field name="lock_date_violated_warning_message"/>
+                </div>
+                <div class="alert alert-warning" role="alert" invisible="not force_partials">
+                    <p>Only partial reconciliation is possible. Proceed in multiple steps if you want to full reconcile.</p>
+                </div>
+
+                <!-- Reco models -->
+                <field name="reco_model_id" nolabel="1"
+                       domain="[['id', 'in', reco_model_autocomplete_ids]]"
+                       widget="selection_badge"
+                       options="{'horizontal': true}"
+                       invisible="not reco_model_autocomplete_ids and not reco_model_id"/>
+
+                <group>
+                    <!-- Left side of the form -->
+                    <group>
+                        <field name="allow_partials" invisible="not display_allow_partials" readonly="force_partials"/>
+                        <field name="account_id"
+                               required="not allow_partials or edit_mode"
+                               invisible="allow_partials and not edit_mode"/>
+                        <field name="to_partner_id"
+                               required="not allow_partials or edit_mode"
+                               invisible="not is_rec_pay_account or (allow_partials and not edit_mode)"/>
+                        <field name="tax_id"
+                               context="{'append_type_to_tax_name': True}"
+                               invisible="allow_partials and not edit_mode"/>
+                        <field name="journal_id"
+                               required="not allow_partials or edit_mode"
+                               invisible="allow_partials and not edit_mode"/>
+                        <field name="label"
+                               required="not allow_partials or edit_mode"
+                               invisible="allow_partials and not edit_mode"/>
+                    </group>
+                    <!-- Right side of the form-->
+                    <group invisible="allow_partials and not edit_mode">
+                        <div class="o_td_label">
+                            <label for="amount_currency"
+                                   string="Amount"
+                                   class="o_form_label"
+                                   invisible="edit_mode"/>
+                            <label for="edit_mode_amount_currency"
+                                   string="Amount"
+                                   class="o_form_label"
+                                   invisible="not edit_mode"/>
+                        </div>
+                        <div class="d-flex">
+                            <div name="regular_mode_amounts" invisible="edit_mode">
+                                <div name="amount_div" class="d-flex o-row" style="white-space: pre;">
+                                    <div name="amount_currency_div" class="d-flex o-row">
+                                        <field name="amount_currency"
+                                               required="not allow_partials and not edit_mode"
+                                               options="{'no_symbol': True}"
+                                               class="oe_inline"/>
+                                        <span class="oe_inline o_form_label mx-3"
+                                              invisible="reco_currency_id == company_currency_id"> in </span>
+                                        <field name="reco_currency_id"
+                                               invisible="reco_currency_id == company_currency_id"
+                                               class="oe_inline"/>
+                                    </div>
+                                    <div name="amount_company_div"
+                                         class="d-flex o-row"
+                                         invisible="reco_currency_id == company_currency_id">
+                                        <span> (</span>
+                                        <field name="amount" widget="float"/>
+                                        <span> </span>
+                                        <field name="company_currency_id" nolabel="1"/>
+                                        <span>)</span>
+                                    </div>
+                                </div>
+                            </div>
+                            <div name="edit_mode_amounts" invisible="not edit_mode">
+                                <field name="edit_mode_amount_currency"
+                                       required="edit_mode"
+                                       options="{'no_symbol': True}"
+                                       class="oe_inline"/>
+                                <span class="oe_inline o_form_label mx-3"
+                                      invisible="single_currency_mode"> in </span>
+                                <field name="reco_currency_id"
+                                       invisible="single_currency_mode"
+                                       class="oe_inline"/>
+                            </div>
+                        </div>
+                        <field name="date" required="not allow_partials or edit_mode"/>
+                        <field name="to_check"/>
+                    </group>
+                </group>
+
+                <footer>
+                    <button string="Reconcile" class="btn-primary" name="reconcile" type="object" data-hotkey="q"/>
+                    <button string="Reconcile &amp; open" class="btn-primary" name="reconcile_open" type="object" data-hotkey="o"/>
+                    <button string="Discard" special="cancel" data-hotkey="x"/>
+                </footer>
+            </form>
+        </field>
+    </record>
+</odoo>
diff --git a/dev_odex30_accounting/odex30_account_accountant/wizard/reconcile_model_wizard.xml b/dev_odex30_accounting/odex30_account_accountant/wizard/reconcile_model_wizard.xml
new file mode 100644
index 0000000..30858ca
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_accountant/wizard/reconcile_model_wizard.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<odoo>
+    <record id="view_account_reconcile_model_widget_wizard" model="ir.ui.view">
+        <field name="name">account.reconcile.model.form</field>
+        <field name="model">account.reconcile.model</field>
+        <field name="arch" type="xml">
+            <form>
+                <div class="oe_title">
+                    <label for="name"/>
+                    <h1><field name="name" placeholder="e.g. Bank Fees"/></h1>
+                </div>
+
+                <group>
+                    <group>
+                        <field name="to_check"/>
+                    </group>
+                </group>
+
+                <group string="Counterpart Values">
+                    <field name="line_ids" nolabel="1">
+                        <list editable="bottom">
+                            <field name="account_id"/>
+                            <field name="amount_type"/>
+                            <field name="amount_string"/>
+                            <field name="tax_ids" widget="many2many_tags"/>
+                            <field name="analytic_distribution" widget="analytic_distribution"
+                                   groups="analytic.group_analytic_accounting"
+                                   options="{'account_field': 'account_id', 'business_domain': 'general'}"/>
+                            <field name="show_force_tax_included" column_invisible="True"/>
+                            <field name="force_tax_included" invisible="not show_force_tax_included" widget="boolean_toggle"/>
+                            <field name="company_id" column_invisible="True"/>
+                            <field name="label"/>
+                        </list>
+                    </field>
+                </group>
+
+                <footer>
+                    <button string="Validate" class="btn-primary" special="save" data-hotkey="q"/>
+                    <button string="Cancel" special="cancel" data-hotkey="x"/>
+                </footer>
+            </form>
+        </field>
+    </record>
+</odoo>
diff --git a/dev_odex30_accounting/odex30_account_asset/__init__.py b/dev_odex30_accounting/odex30_account_asset/__init__.py
new file mode 100644
index 0000000..35e7c96
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_asset/__init__.py
@@ -0,0 +1,4 @@
+# -*- coding: utf-8 -*-
+
+from . import models
+from . import wizard
diff --git a/dev_odex30_accounting/odex30_account_asset/__manifest__.py b/dev_odex30_accounting/odex30_account_asset/__manifest__.py
new file mode 100644
index 0000000..f53d21c
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_asset/__manifest__.py
@@ -0,0 +1,46 @@
+# -*- coding: utf-8 -*-
+
+{
+    'name': 'Assets Management',
+    'description': """
+Assets management
+=================
+Manage assets owned by a company or a person.
+Keeps track of depreciations, and creates corresponding journal entries.
+
+    """,
+    'category': 'Odex30-Accounting/Odex30-Accounting',
+    'author': 'Expert Co. Ltd.',
+    'website': 'http://www.exp-sa.com',    'sequence': 32,
+    'depends': ['odex30_account_reports'],
+    'data': [
+        'security/account_asset_security.xml',
+        'security/ir.model.access.csv',
+        'wizard/asset_modify_views.xml',
+        'views/account_account_views.xml',
+        'views/account_asset_views.xml',
+        'views/account_asset_group_views.xml',
+        'views/account_move_views.xml',
+        'data/assets_report.xml',
+        'data/account_report_actions.xml',
+        'data/menuitems.xml',
+    ],
+    'demo': [
+        'demo/odex30_account_asset_demo.xml',
+    ],
+    'auto_install': True,
+    'assets': {
+        'odex30_account_reports.assets_financial_report': [
+            'odex30_odex30_account_asset/static/src/scss/account_asset.scss',
+        ],
+        'web.assets_backend': [
+            'odex30_account_asset/static/src/scss/account_asset.scss',
+            'odex30_account_asset/static/src/components/**/*',
+            'odex30_account_asset/static/src/views/**/*',
+            'odex30_account_asset/static/src/web/**/*',
+        ],
+        'web.assets_web_dark': [
+            'odex30_account_asset/static/src/scss/*.dark.scss',
+        ],
+    }
+}
diff --git a/dev_odex30_accounting/odex30_account_asset/__pycache__/__init__.cpython-311.pyc b/dev_odex30_accounting/odex30_account_asset/__pycache__/__init__.cpython-311.pyc
new file mode 100644
index 0000000..e2a3e96
Binary files /dev/null and b/dev_odex30_accounting/odex30_account_asset/__pycache__/__init__.cpython-311.pyc differ
diff --git a/dev_odex30_accounting/odex30_account_asset/data/account_report_actions.xml b/dev_odex30_accounting/odex30_account_asset/data/account_report_actions.xml
new file mode 100644
index 0000000..d85377d
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_asset/data/account_report_actions.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <record id="action_account_report_assets" model="ir.actions.client">
+        <field name="name">Depreciation Schedule</field>
+        <field name="tag">account_report</field>
+        <field name="context" eval="{'report_id': ref('odex30_account_asset.assets_report')}"/>
+    </record>
+</odoo>
diff --git a/dev_odex30_accounting/odex30_account_asset/data/assets_report.xml b/dev_odex30_accounting/odex30_account_asset/data/assets_report.xml
new file mode 100644
index 0000000..cc8f6b3
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_asset/data/assets_report.xml
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <record id="assets_report" model="account.report">
+        <field name="name">Depreciation Schedule</field>
+        <field name="filter_hierarchy">optional</field>
+        <field name="filter_unfold_all" eval="True"/>
+        <field name="filter_period_comparison" eval="False"/>
+        <field name="filter_journals" eval="True"/>
+        <field name="custom_handler_model_id" ref="model_account_asset_report_handler"/>
+        <field name="load_more_limit" eval="80"/>
+        <field name="column_ids">
+            <record id="assets_report_acquisition_date" model="account.report.column">
+                <field name="name">Acquisition Date</field>
+                <field name="expression_label">acquisition_date</field>
+                <field name="figure_type">date</field>
+            </record>
+            <record id="assets_report_first_depreciation" model="account.report.column">
+                <field name="name">First Depreciation</field>
+                <field name="expression_label">first_depreciation</field>
+                <field name="figure_type">date</field>
+            </record>
+            <record id="assets_report_first_method" model="account.report.column">
+                <field name="name">Method</field>
+                <field name="expression_label">method</field>
+                <field name="figure_type">string</field>
+            </record>
+            <record id="assets_report_duration_rate" model="account.report.column">
+                <field name="name">Duration / Rate</field>
+                <field name="expression_label">duration_rate</field>
+                <field name="figure_type">string</field>
+            </record>
+            <record id="assets_report_date_from" model="account.report.column">
+                <field name="name">date from</field>
+                <field name="expression_label">assets_date_from</field>
+            </record>
+            <record id="assets_report_assets_plus" model="account.report.column">
+                <field name="name">+</field>
+                <field name="expression_label">assets_plus</field>
+            </record>
+            <record id="assets_report_assets_minus" model="account.report.column">
+                <field name="name">-</field>
+                <field name="expression_label">assets_minus</field>
+            </record>
+            <record id="assets_report_assets_date_to" model="account.report.column">
+                <field name="name">date to</field>
+                <field name="expression_label">assets_date_to</field>
+            </record>
+            <record id="assets_report_depre_date_from" model="account.report.column">
+                <field name="name">date from</field>
+                <field name="expression_label">depre_date_from</field>
+            </record>
+            <record id="assets_report_depre_plus" model="account.report.column">
+                <field name="name">+</field>
+                <field name="expression_label">depre_plus</field>
+            </record>
+            <record id="assets_report_depre_minus" model="account.report.column">
+                <field name="name">-</field>
+                <field name="expression_label">depre_minus</field>
+            </record>
+            <record id="assets_report_depre_date_to" model="account.report.column">
+                <field name="name">date to</field>
+                <field name="expression_label">depre_date_to</field>
+            </record>
+            <record id="assets_report_balance" model="account.report.column">
+                <field name="name">book_value</field>
+                <field name="expression_label">balance</field>
+            </record>
+      </field>
+    </record>
+</odoo>
diff --git a/dev_odex30_accounting/odex30_account_asset/data/menuitems.xml b/dev_odex30_accounting/odex30_account_asset/data/menuitems.xml
new file mode 100644
index 0000000..88ffc1e
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_asset/data/menuitems.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <menuitem id="menu_action_account_report_assets"
+              name="Depreciation Schedule"
+              action="action_account_report_assets"
+              parent="account.account_reports_management_menu"
+              groups="account.group_account_readonly"/>
+</odoo>
diff --git a/dev_odex30_accounting/odex30_account_asset/demo/account_asset_demo.xml b/dev_odex30_accounting/odex30_account_asset/demo/account_asset_demo.xml
new file mode 100644
index 0000000..d18d5b8
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_asset/demo/account_asset_demo.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<odoo>
+    <data noupdate="1">
+        <record id="account_asset_group_demo" model="account.asset.group">
+            <field name="name">Odoo Office</field>
+        </record>
+
+        <record id="account_asset_model_demo" model="account.asset">
+            <field name="name">Asset - 5 Years</field>
+            <field name="prorata_computation_type">none</field>
+            <field name="original_value">1000</field>
+            <field name="journal_id" model="account.journal" search="[
+                ('type', '=', 'general'),
+                ('id', '!=', obj().env.user.company_id.currency_exchange_journal_id.id)]"/>
+            <field name="account_asset_id" model="account.account" search="[
+                ('account_type', '=', 'asset_fixed'),
+                ('company_ids', '=', ref('base.main_company'))]"/>
+            <field name="account_depreciation_id" model="account.account" search="[
+                ('account_type', '=', 'asset_fixed'),
+                ('company_ids', '=', ref('base.main_company'))]"/>
+            <field name="account_depreciation_expense_id" model="account.account" search="[
+                ('account_type', '=', 'expense'),
+                ('tag_ids', 'in', [ref('account.account_tag_operating')]),
+                ('company_ids', '=', ref('base.main_company'))]"/>
+            <field name="state">open</field>
+            <field name="asset_group_id" ref="odex30_account_asset.account_asset_group_demo"/>
+        </record>
+    </data>
+</odoo>
diff --git a/dev_odex30_accounting/odex30_account_asset/i18n/ar.po b/dev_odex30_accounting/odex30_account_asset/i18n/ar.po
new file mode 100644
index 0000000..b41c9cc
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_asset/i18n/ar.po
@@ -0,0 +1,1960 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# 	* odex30_account_asset
+# 
+# Translators:
+# Wil Odoo, 2024
+# Malaz Abuidris <msea@odoo.com>, 2025
+# 
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 18.0+e\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2025-06-20 18:52+0000\n"
+"PO-Revision-Date: 2024-09-25 09:43+0000\n"
+"Last-Translator: Malaz Abuidris <msea@odoo.com>, 2025\n"
+"Language-Team: Arabic (https://app.transifex.com/odoo/teams/41243/ar/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Language: ar\n"
+"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
+
+#. module: odex30_account_asset
+#: model:ir.model.fields,field_description:odex30_account_asset.field_account_asset__total_depreciation_entries_count
+msgid "# Depreciation Entries"
+msgstr "عدد قيود الإهلاك"
+
+#. module: odex30_account_asset
+#: model:ir.model.fields,field_description:odex30_account_asset.field_account_asset__gross_increase_count
+msgid "# Gross Increases"
+msgstr "عدد الزيادات الإجمالية"
+
+#. module: odex30_account_asset
+#: model:ir.model.fields,field_description:odex30_account_asset.field_account_asset__depreciation_entries_count
+msgid "# Posted Depreciation Entries"
+msgstr "عدد قيود الإهلاك المُرحلة"
+
+#. module: odex30_account_asset
+#. odoo-python
+#: code:addons/odex30_account_asset/models/account_asset.py:0
+msgid "%(asset)s: Disposal"
+msgstr "%(asset)s: التصرف "
+
+#. module: odex30_account_asset
+#. odoo-python
+#: code:addons/odex30_account_asset/models/account_asset.py:0
+msgid "%(asset)s: Sale"
+msgstr "%(asset)s: البيع "
+
+#. module: odex30_account_asset
+#. odoo-python
+#: code:addons/odex30_account_asset/models/account_assets_report.py:0
+msgid "%(months)s m"
+msgstr "%(months)s شهور "
+
+#. module: odex30_account_asset
+#. odoo-python
+#: code:addons/odex30_account_asset/models/account_move.py:0
+msgid "%(move_line)s (%(current)s of %(total)s)"
+msgstr "%(move_line)s (%(current)s من %(total)s) "
+
+#. module: odex30_account_asset
+#. odoo-python
+#: code:addons/odex30_account_asset/models/account_assets_report.py:0
+msgid "%(years)s y"
+msgstr "%(years)s سنوات "
+
+#. module: odex30_account_asset
+#. odoo-python
+#: code:addons/odex30_account_asset/models/account_asset.py:0
+msgid "%s (copy)"
+msgstr "%s (نسخة)"
+
+#. module: odex30_account_asset
+#. odoo-python
+#: code:addons/odex30_account_asset/wizard/asset_modify.py:0
+msgid ""
+"%s Future entries will be recomputed to depreciate the asset following the "
+"changes."
+msgstr "%s سيتم احتساب القيود المستقبلية لإهلاك الأصل الذي يتبع التغييرات. "
+
+#. module: odex30_account_asset
+#. odoo-python
+#: code:addons/odex30_account_asset/models/account_move.py:0
+msgid "%s: Depreciation"
+msgstr "%s: الإهلاك"
+
+#. module: odex30_account_asset
+#. odoo-python
+#: code:addons/odex30_account_asset/models/account_assets_report.py:0
+msgid "(No %s)"
+msgstr "(لا %s) "
+
+#. module: odex30_account_asset
+#: model_terms:ir.ui.view,arch_db:odex30_account_asset.view_account_asset_form
+msgid "(incl."
+msgstr "(شاملة "
+
+#. module: odex30_account_asset
+#. odoo-python
+#: code:addons/odex30_account_asset/wizard/asset_modify.py:0
+msgid ""
+"A depreciation entry will be posted on and including the date %(date)s. "
+"<br/> %(extra_text)s Future entries will be recomputed to depreciate the "
+"asset following the changes."
+msgstr ""
+"سيتم ترحيل إحدى قيود الإهلاك بتاريخ %(date)s. <br/> %(extra_text)s سيتم "
+"احتساب القيود المستقبلية لإهلاك الأصل الذي يتبع التغييرات. "
+
+#. module: odex30_account_asset
+#. odoo-python
+#: code:addons/odex30_account_asset/wizard/asset_modify.py:0
+msgid ""
+"A depreciation entry will be posted on and including the date %(date)s.<br/>"
+" A disposal entry will be posted on the %(account_type)s account "
+"<b>%(account)s</b>."
+msgstr ""
+"سيتم ترحيل قيد الإهلاك بتاريخ %(date)s.<br/> سيتم ترحيل قيد التصرف في "
+"%(account_type)s الحساب <b>%(account)s</b>. "
+
+#. module: odex30_account_asset
+#. odoo-python
+#: code:addons/odex30_account_asset/wizard/asset_modify.py:0
+msgid ""
+"A depreciation entry will be posted on and including the date %(date)s.<br/>"
+" A second entry will neutralize the original income and post the  outcome of"
+" this sale on account <b>%(account)s</b>."
+msgstr ""
+"سيتم ترحيل قيد الإهلاك بتاريخ %(date)s.<br/> سيقوم القيد الثاني بتعطيل الدخل"
+" الأصلي وترحيل ناتج عملية البيع هذه في الحساب <b>%(account)s</b>. "
+
+#. module: odex30_account_asset
+#. odoo-python
+#: code:addons/odex30_account_asset/wizard/asset_modify.py:0
+msgid "A depreciation entry will be posted on and including the date %s."
+msgstr "سيتم ترحيل قيد الإهلاك في التاريخ المتضمن %s."
+
+#. module: odex30_account_asset
+#. odoo-python
+#: code:addons/odex30_account_asset/models/account_asset.py:0
+msgid "A document linked to %(move_line_name)s has been deleted: %(link)s"
+msgstr "تم حذف مستند مرتبط بالحركة %(move_line_name)s: %(link)s "
+
+#. module: odex30_account_asset
+#. odoo-python
+#: code:addons/odex30_account_asset/models/account_asset.py:0
+msgid "A document linked to this move has been deleted: %s"
+msgstr "تم حذف مستند مرتبط بهذه الحركة: %s "
+
+#. module: odex30_account_asset
+#. odoo-python
+#: code:addons/odex30_account_asset/wizard/asset_modify.py:0
+msgid "A gross increase has been created: %(link)s"
+msgstr "تم إنشاء زيادة إجمالية: %(link)s "
+
+#. module: odex30_account_asset
+#. odoo-python
+#: code:addons/odex30_account_asset/models/account_asset.py:0
+msgid ""
+"A non deductible tax value of %(tax_value)s was added to %(name)s's initial "
+"value of %(purchase_value)s"
+msgstr ""
+"تمت إضافة قيمة ضريبة غير قابلة للخصم %(tax_value)s إلى قيمة %(name)s "
+"المبدئية، وهي %(purchase_value)s "
+
+#. module: odex30_account_asset
+#: model:ir.model,name:odex30_account_asset.model_account_account
+msgid "Account"
+msgstr "الحساب "
+
+#. module: odex30_account_asset
+#: model:ir.model.fields,help:odex30_account_asset.field_account_asset__account_type
+msgid ""
+"Account Type is used for information purpose, to generate country-specific "
+"legal reports, and set the rules to close a fiscal year and generate opening"
+" entries."
+msgstr ""
+"يُستخدم نوع الحساب في إنشاء التقارير  القانونية المخصصة لكل دولة، وتضع "
+"القواعد اللازمة لإقفال السنة المالية وإنشاء القيود الافتتاحية للسنة المالية "
+"اللاحقة. "
+
+#. module: odex30_account_asset
+#: model:ir.model.fields,help:odex30_account_asset.field_account_asset__account_depreciation_id
+msgid "Account used in the depreciation entries, to decrease the asset value."
+msgstr "الحساب المُستخدَم لقيود الإهلاك، لتخفيض قيمة الأصل. "
+
+#. module: odex30_account_asset
+#: model:ir.model.fields,help:odex30_account_asset.field_account_asset__account_depreciation_expense_id
+msgid ""
+"Account used in the periodical entries, to record a part of the asset as "
+"expense."
+msgstr "الحساب المستخدم للقيود الدورية لتسجيل جزء من الأصل كنفقة. "
+
+#. module: odex30_account_asset
+#: model:ir.model.fields,help:odex30_account_asset.field_account_asset__account_asset_id
+msgid ""
+"Account used to record the purchase of the asset at its original price."
+msgstr "الحساب المُستخدَم لتسجيل شراء الأصل بسعره الأصلي. "
+
+#. module: odex30_account_asset
+#: model:ir.model.fields,help:odex30_account_asset.field_asset_modify__gain_account_id
+msgid "Account used to write the journal item in case of gain"
+msgstr "الحساب المُستخدَم لكتابة عنصر اليومية في حالة الربح "
+
+#. module: odex30_account_asset
+#: model:ir.model.fields,help:odex30_account_asset.field_res_company__gain_account_id
+msgid ""
+"Account used to write the journal item in case of gain while selling an "
+"asset"
+msgstr ""
+"الحساب المُستخدَم لكتابة عنصر اليومية في حال الربح عند بيع أحد الأصول "
+
+#. module: odex30_account_asset
+#: model:ir.model.fields,help:odex30_account_asset.field_asset_modify__loss_account_id
+msgid "Account used to write the journal item in case of loss"
+msgstr "الحساب المُستخدَم لكتابة عنصر اليومية في حال الخسارة "
+
+#. module: odex30_account_asset
+#: model:ir.model.fields,help:odex30_account_asset.field_res_company__loss_account_id
+msgid ""
+"Account used to write the journal item in case of loss while selling an "
+"asset"
+msgstr ""
+"الحساب المُستخدَم لكتابة عنصر اليومية في حال الخسارة عند بيع أحد الأصول "
+
+#. module: odex30_account_asset
+#: model_terms:ir.ui.view,arch_db:odex30_account_asset.view_account_asset_form
+msgid "Accounting"
+msgstr "المحاسبة "
+
+#. module: odex30_account_asset
+#: model:ir.model,name:odex30_account_asset.model_account_report
+msgid "Accounting Report"
+msgstr "تقرير المحاسبة "
+
+#. module: odex30_account_asset
+#: model:account.report.column,name:odex30_account_asset.assets_report_acquisition_date
+#: model:ir.model.fields,field_description:odex30_account_asset.field_account_asset__acquisition_date
+#: model_terms:ir.ui.view,arch_db:odex30_account_asset.view_account_asset_kanban
+msgid "Acquisition Date"
+msgstr "تاريخ الاستحواذ"
+
+#. module: odex30_account_asset
+#: model:ir.model.fields,field_description:odex30_account_asset.field_asset_modify__modify_action
+msgid "Action"
+msgstr "إجراء"
+
+#. module: odex30_account_asset
+#: model:ir.model.fields,field_description:odex30_account_asset.field_account_asset__message_needaction
+msgid "Action Needed"
+msgstr "إجراء مطلوب"
+
+#. module: odex30_account_asset
+#: model:ir.model.fields,field_description:odex30_account_asset.field_account_asset__active
+msgid "Active"
+msgstr "نشط"
+
+#. module: odex30_account_asset
+#: model:ir.model.fields,field_description:odex30_account_asset.field_account_asset__activity_ids
+msgid "Activities"
+msgstr "الأنشطة"
+
+#. module: odex30_account_asset
+#: model:ir.model.fields,field_description:odex30_account_asset.field_account_asset__activity_exception_decoration
+msgid "Activity Exception Decoration"
+msgstr "زخرفة استثناء النشاط"
+
+#. module: odex30_account_asset
+#: model:ir.model.fields,field_description:odex30_account_asset.field_account_asset__activity_state
+msgid "Activity State"
+msgstr "حالة النشاط"
+
+#. module: odex30_account_asset
+#: model:ir.model.fields,field_description:odex30_account_asset.field_account_asset__activity_type_icon
+msgid "Activity Type Icon"
+msgstr "أيقونة نوع النشاط"
+
+#. module: odex30_account_asset
+#: model_terms:ir.ui.view,arch_db:odex30_account_asset.asset_modify_form
+msgid "Add an internal note"
+msgstr "إضافة ملاحظة داخلية "
+
+#. module: odex30_account_asset
+#. odoo-python
+#: code:addons/odex30_account_asset/models/account_asset.py:0
+#: code:addons/odex30_account_asset/models/account_move.py:0
+msgid "All the lines should be from the same account"
+msgstr "يجب أن تكون كافة البنود من نفس الحساب "
+
+#. module: odex30_account_asset
+#. odoo-python
+#: code:addons/odex30_account_asset/models/account_move.py:0
+msgid "All the lines should be from the same company"
+msgstr "يجب أن تكون كافة البنود من نفس الشركة "
+
+#. module: odex30_account_asset
+#. odoo-python
+#: code:addons/odex30_account_asset/models/account_asset.py:0
+#: code:addons/odex30_account_asset/models/account_move.py:0
+msgid "All the lines should be posted"
+msgstr "يجب أن تكون كافة البنود مُرحّلة "
+
+#. module: odex30_account_asset
+#: model:ir.model.fields,field_description:odex30_account_asset.field_account_asset__already_depreciated_amount_import
+msgid "Already Depreciated Amount Import"
+msgstr "استيراد المبلغ الذي تم إهلاكه بالفعل "
+
+#. module: odex30_account_asset
+#: model:ir.model.fields,help:odex30_account_asset.field_account_asset__parent_id
+msgid "An asset has a parent when it is the result of gaining value"
+msgstr "يكون للأصل أصل رئيسي عندما يكون نتيجة لزيادة القيمة "
+
+#. module: odex30_account_asset
+#. odoo-python
+#: code:addons/odex30_account_asset/models/account_asset.py:0
+msgid "An asset has been created for this move:"
+msgstr "تم إنشاء أصل لهذه الحركة: "
+
+#. module: odex30_account_asset
+#: model:ir.model.fields,help:odex30_account_asset.field_account_account__asset_model_ids
+msgid ""
+"An asset wil be created for each asset model when this account is used on a "
+"vendor bill or a refund"
+msgstr ""
+"سيتم إنشاء أصل لكل نموذج من الأصول عند استخدام هذا الحساب في فاتورة المورّد "
+"أو عند استرداد الأموال "
+
+#. module: odex30_account_asset
+#. odoo-python
+#: code:addons/odex30_account_asset/wizard/asset_modify.py:0
+msgid "An asset will be created for the value increase of the asset. <br/>"
+msgstr "سيتم إنشاء أصل لزيادة قيمة الأصل. <br/> "
+
+#. module: odex30_account_asset
+#: model:ir.model.fields,field_description:odex30_account_asset.field_account_asset__analytic_distribution
+msgid "Analytic Distribution"
+msgstr "التوزيع التحليلي"
+
+#. module: odex30_account_asset
+#: model:ir.model.fields,field_description:odex30_account_asset.field_account_asset__analytic_precision
+msgid "Analytic Precision"
+msgstr "الدقة التحليلية "
+
+#. module: odex30_account_asset
+#: model_terms:ir.ui.view,arch_db:odex30_account_asset.view_account_asset_form
+#: model_terms:ir.ui.view,arch_db:odex30_account_asset.view_account_asset_model_search
+#: model_terms:ir.ui.view,arch_db:odex30_account_asset.view_account_asset_search
+msgid "Archived"
+msgstr "مؤرشف"
+
+#. module: odex30_account_asset
+#. odoo-python
+#: code:addons/odex30_account_asset/models/account_asset.py:0
+#: code:addons/odex30_account_asset/models/account_move.py:0
+#: model:ir.model.fields,field_description:odex30_account_asset.field_account_bank_statement_line__asset_id
+#: model:ir.model.fields,field_description:odex30_account_asset.field_account_move__asset_id
+#: model:ir.model.fields,field_description:odex30_account_asset.field_asset_modify__asset_id
+#: model_terms:ir.ui.view,arch_db:odex30_account_asset.view_account_asset_form
+#: model_terms:ir.ui.view,arch_db:odex30_account_asset.view_account_asset_search
+msgid "Asset"
+msgstr "أصل "
+
+#. module: odex30_account_asset
+#: model_terms:ir.ui.view,arch_db:odex30_account_asset.view_account_asset_search
+msgid "Asset Account"
+msgstr "حساب الأصل"
+
+#. module: odex30_account_asset
+#. odoo-python
+#: code:addons/odex30_account_asset/models/account_asset.py:0
+msgid "Asset Cancelled"
+msgstr "تم إلغاء الأصل"
+
+#. module: odex30_account_asset
+#: model:ir.model.fields,field_description:odex30_account_asset.field_asset_modify__account_asset_counterpart_id
+msgid "Asset Counterpart Account"
+msgstr "حساب القيد المناظر للأصل "
+
+#. module: odex30_account_asset
+#: model:ir.model,name:odex30_account_asset.model_account_asset_group
+#: model:ir.model.fields,field_description:odex30_account_asset.field_account_asset__asset_group_id
+#: model_terms:ir.ui.view,arch_db:odex30_account_asset.asset_group_form_view
+#: model_terms:ir.ui.view,arch_db:odex30_account_asset.asset_group_list_view
+msgid "Asset Group"
+msgstr "مجموعة الأصول "
+
+#. module: odex30_account_asset
+#: model:ir.model.fields,field_description:odex30_account_asset.field_account_bank_statement_line__asset_id_display_name
+#: model:ir.model.fields,field_description:odex30_account_asset.field_account_move__asset_id_display_name
+msgid "Asset Id Display Name"
+msgstr "اسم عرض مُعرِّف الأصل "
+
+#. module: odex30_account_asset
+#: model:ir.model.fields,field_description:odex30_account_asset.field_account_asset__asset_lifetime_days
+msgid "Asset Lifetime Days"
+msgstr "أيام عمر الأصل"
+
+#. module: odex30_account_asset
+#: model:ir.model.fields,field_description:odex30_account_asset.field_account_account__asset_model_ids
+#: model_terms:ir.ui.view,arch_db:odex30_account_asset.view_account_asset_form
+#: model_terms:ir.ui.view,arch_db:odex30_account_asset.view_account_asset_model_search
+#: model_terms:ir.ui.view,arch_db:odex30_account_asset.view_account_asset_search
+#: model_terms:ir.ui.view,arch_db:odex30_account_asset.view_account_form_asset_inherit
+msgid "Asset Model"
+msgstr "نموذج الأصل "
+
+#. module: odex30_account_asset
+#: model_terms:ir.ui.view,arch_db:odex30_account_asset.view_account_asset_form
+msgid "Asset Model name"
+msgstr "اسم نموذج الأصل "
+
+#. module: odex30_account_asset
+#: model:ir.actions.act_window,name:odex30_account_asset.action_account_asset_model_form
+#: model:ir.ui.menu,name:odex30_account_asset.menu_action_account_asset_model_form
+#: model_terms:ir.ui.view,arch_db:odex30_account_asset.view_account_asset_model_tree
+msgid "Asset Models"
+msgstr "نماذج الأصل "
+
+#. module: odex30_account_asset
+#: model:ir.model.fields,field_description:odex30_account_asset.field_account_bank_statement_line__asset_move_type
+#: model:ir.model.fields,field_description:odex30_account_asset.field_account_move__asset_move_type
+msgid "Asset Move Type"
+msgstr "نوع حركة الأصل "
+
+#. module: odex30_account_asset
+#: model:ir.model.fields,field_description:odex30_account_asset.field_account_asset__name
+msgid "Asset Name"
+msgstr "اسم الأصل"
+
+#. module: odex30_account_asset
+#: model:ir.model.fields,field_description:odex30_account_asset.field_account_asset__asset_paused_days
+msgid "Asset Paused Days"
+msgstr "أيام توقف الأصل مؤقتاً"
+
+#. module: odex30_account_asset
+#: model:ir.model.fields,field_description:odex30_account_asset.field_account_bank_statement_line__asset_value_change
+#: model:ir.model.fields,field_description:odex30_account_asset.field_account_move__asset_value_change
+msgid "Asset Value Change"
+msgstr "تغير قيمة الأصل "
+
+#. module: odex30_account_asset
+#: model_terms:ir.ui.view,arch_db:odex30_account_asset.view_account_asset_form
+msgid "Asset Values"
+msgstr "قيم الأصول "
+
+#. module: odex30_account_asset
+#. odoo-python
+#: code:addons/odex30_account_asset/models/account_asset.py:0
+msgid "Asset created"
+msgstr "تم إنشاء الأصل"
+
+#. module: odex30_account_asset
+#. odoo-python
+#: code:addons/odex30_account_asset/models/account_move.py:0
+msgid "Asset created from invoice: %s"
+msgstr "الأصل الذي تم إنشاؤه من الفاتورة: %s "
+
+#. module: odex30_account_asset
+#. odoo-python
+#: code:addons/odex30_account_asset/models/account_asset.py:0
+msgid "Asset disposed. %s"
+msgstr "تم التخلص من الأصل. %s "
+
+#. module: odex30_account_asset
+#. odoo-python
+#: code:addons/odex30_account_asset/models/account_asset.py:0
+msgid "Asset paused. %s"
+msgstr "تم إيقاف الأصل مؤقتاً. %s "
+
+#. module: odex30_account_asset
+#. odoo-python
+#: code:addons/odex30_account_asset/models/account_asset.py:0
+msgid "Asset sold. %s"
+msgstr "بيع الأصل. %s"
+
+#. module: odex30_account_asset
+#. odoo-python
+#: code:addons/odex30_account_asset/wizard/asset_modify.py:0
+msgid "Asset unpaused. %s"
+msgstr "تم تعطيل الإيقاف المؤقت للأصل %s"
+
+#. module: odex30_account_asset
+#: model_terms:ir.ui.view,arch_db:odex30_account_asset.asset_group_form_view
+#: model_terms:ir.ui.view,arch_db:odex30_account_asset.view_account_asset_form
+#: model_terms:ir.ui.view,arch_db:odex30_account_asset.view_move_form_asset_inherit
+msgid "Asset(s)"
+msgstr "الأصل (الأصول) "
+
+#. module: odex30_account_asset
+#: model:ir.model,name:odex30_account_asset.model_account_asset
+msgid "Asset/Revenue Recognition"
+msgstr "إثبات الأصل/الإيرادات "
+
+#. module: odex30_account_asset
+#. odoo-python
+#: code:addons/odex30_account_asset/models/account_assets_report.py:0
+#: model:ir.actions.act_window,name:odex30_account_asset.action_account_asset_form
+#: model:ir.model.fields,field_description:odex30_account_asset.field_account_bank_statement_line__asset_ids
+#: model:ir.model.fields,field_description:odex30_account_asset.field_account_move__asset_ids
+#: model:ir.ui.menu,name:odex30_account_asset.menu_action_account_asset_form
+#: model_terms:ir.ui.view,arch_db:odex30_account_asset.view_account_asset_tree
+msgid "Assets"
+msgstr "أصول "
+
+#. module: odex30_account_asset
+#: model:ir.model,name:odex30_account_asset.model_account_asset_report_handler
+msgid "Assets Report Custom Handler"
+msgstr "المعالج المخصص لتقارير الأصل "
+
+#. module: odex30_account_asset
+#: model:ir.ui.menu,name:odex30_account_asset.menu_finance_config_assets
+msgid "Assets and Revenues"
+msgstr "الأصول والإيرادات"
+
+#. module: odex30_account_asset
+#: model_terms:ir.ui.view,arch_db:odex30_account_asset.view_account_asset_search
+msgid "Assets in closed state"
+msgstr "الأصول المُقفلة"
+
+#. module: odex30_account_asset
+#: model_terms:ir.ui.view,arch_db:odex30_account_asset.view_account_asset_search
+msgid "Assets in draft and open states"
+msgstr "الأصول المسودة والجارية"
+
+#. module: odex30_account_asset
+#. odoo-python
+#: code:addons/odex30_account_asset/models/account_asset.py:0
+msgid ""
+"Atleast one asset (%s) couldn't be set as running because it lacks any "
+"required information"
+msgstr ""
+"هناك أصل واحد على الأقل (%s) لم نتمكن من تعيينه كجارٍ لعدم توافر أي من "
+"المعلومات المطلوبة "
+
+#. module: odex30_account_asset
+#: model:ir.model.fields,field_description:odex30_account_asset.field_account_asset__message_attachment_count
+msgid "Attachment Count"
+msgstr "عدد المرفقات"
+
+#. module: odex30_account_asset
+#: model_terms:ir.ui.view,arch_db:odex30_account_asset.view_account_form_asset_inherit
+msgid "Automate Asset"
+msgstr "أتمتة الأصل "
+
+#. module: odex30_account_asset
+#: model_terms:ir.ui.view,arch_db:odex30_account_asset.view_account_form_asset_inherit
+msgid "Automation"
+msgstr "تشغيل تلقائي"
+
+#. module: odex30_account_asset
+#: model:ir.model.fields.selection,name:odex30_account_asset.selection__account_asset__prorata_computation_type__daily_computation
+msgid "Based on days per period"
+msgstr "بناءً على الأيام لكل فترة "
+
+#. module: odex30_account_asset
+#: model_terms:ir.ui.view,arch_db:odex30_account_asset.view_account_asset_form
+msgid "Bills"
+msgstr "الفواتير"
+
+#. module: odex30_account_asset
+#. odoo-python
+#: code:addons/odex30_account_asset/models/account_assets_report.py:0
+#: model:ir.model.fields,field_description:odex30_account_asset.field_account_asset__book_value
+msgid "Book Value"
+msgstr "القيمة الدفترية "
+
+#. module: odex30_account_asset
+#: model:ir.model.fields,field_description:odex30_account_asset.field_account_account__can_create_asset
+msgid "Can Create Asset"
+msgstr "يمكن إنشاء الأصل "
+
+#. module: odex30_account_asset
+#: model_terms:ir.ui.view,arch_db:odex30_account_asset.asset_modify_form
+msgid "Cancel"
+msgstr "إلغاء"
+
+#. module: odex30_account_asset
+#: model_terms:ir.ui.view,arch_db:odex30_account_asset.view_account_asset_form
+msgid "Cancel Asset"
+msgstr "إلغاء الأصل "
+
+#. module: odex30_account_asset
+#: model:ir.model.fields.selection,name:odex30_account_asset.selection__account_asset__state__cancelled
+msgid "Cancelled"
+msgstr "تم الإلغاء "
+
+#. module: odex30_account_asset
+#. odoo-python
+#: code:addons/odex30_account_asset/models/account_assets_report.py:0
+msgid "Characteristics"
+msgstr "الصفات "
+
+#. module: odex30_account_asset
+#: model:ir.model.fields,field_description:odex30_account_asset.field_account_asset__children_ids
+msgid "Children"
+msgstr "الفروع"
+
+#. module: odex30_account_asset
+#: model:ir.model.fields,help:odex30_account_asset.field_account_asset__method
+msgid ""
+"Choose the method to use to compute the amount of depreciation lines.\n"
+"  * Straight Line: Calculated on basis of: Gross Value / Duration\n"
+"  * Declining: Calculated on basis of: Residual Value * Declining Factor\n"
+"  * Declining then Straight Line: Like Declining but with a minimum depreciation value equal to the straight line value."
+msgstr ""
+"اختر الطريقة لاستخدامها لاحتساب عدد بنود الإهلاك.\n"
+"  * القيمة الثابتة: يتم احتسابها على أساس: القيمة الكلية / المدة\n"
+"  * المنخفضة: يتم احتسابها على أساس: القيمة المتبقية * عامل الانخفاض\n"
+"  * الانخفاض ثم قيمة ثابتة: مثل القيمة المنخفضة ولكن مع قيمة إهلاك دنيا تساوي القيمة الثابتة. "
+
+#. module: odex30_account_asset
+#: model:ir.model.fields.selection,name:odex30_account_asset.selection__account_asset__state__close
+#: model_terms:ir.ui.view,arch_db:odex30_account_asset.view_account_asset_search
+msgid "Closed"
+msgstr "مغلق"
+
+#. module: odex30_account_asset
+#: model:ir.model,name:odex30_account_asset.model_res_company
+msgid "Companies"
+msgstr "الشركات"
+
+#. module: odex30_account_asset
+#: model:ir.model.fields,field_description:odex30_account_asset.field_account_asset__company_id
+#: model:ir.model.fields,field_description:odex30_account_asset.field_account_asset_group__company_id
+#: model:ir.model.fields,field_description:odex30_account_asset.field_asset_modify__company_id
+msgid "Company"
+msgstr "الشركة "
+
+#. module: odex30_account_asset
+#: model:ir.model.fields,field_description:odex30_account_asset.field_account_asset__prorata_computation_type
+msgid "Computation"
+msgstr "احتساب"
+
+#. module: odex30_account_asset
+#: model:ir.actions.server,name:odex30_account_asset.action_account_asset_compute_depreciations
+#: model_terms:ir.ui.view,arch_db:odex30_account_asset.view_account_asset_form
+msgid "Compute Depreciation"
+msgstr "احتساب الإهلاك "
+
+#. module: odex30_account_asset
+#: model:ir.actions.server,name:odex30_account_asset.action_account_asset_run
+#: model_terms:ir.ui.view,arch_db:odex30_account_asset.view_account_asset_form
+msgid "Confirm"
+msgstr "تأكيد"
+
+#. module: odex30_account_asset
+#: model:ir.model.fields.selection,name:odex30_account_asset.selection__account_asset__prorata_computation_type__constant_periods
+msgid "Constant Periods"
+msgstr "فترات ثابتة"
+
+#. module: odex30_account_asset
+#: model:ir.model.fields,field_description:odex30_account_asset.field_account_bank_statement_line__count_asset
+#: model:ir.model.fields,field_description:odex30_account_asset.field_account_move__count_asset
+msgid "Count Asset"
+msgstr "احتساب الأصل "
+
+#. module: odex30_account_asset
+#: model:ir.model.fields,field_description:odex30_account_asset.field_account_asset__count_linked_asset
+msgid "Count Linked Asset"
+msgstr "عدد الأصول المرتبطة "
+
+#. module: odex30_account_asset
+#: model:ir.model.fields,field_description:odex30_account_asset.field_account_asset_group__count_linked_assets
+msgid "Count Linked Assets"
+msgstr "عدّ الأصول المرتبطة "
+
+#. module: odex30_account_asset
+#: model:ir.model.fields,field_description:odex30_account_asset.field_account_asset__country_code
+msgid "Country Code"
+msgstr "رمز الدولة"
+
+#. module: odex30_account_asset
+#: model:ir.actions.server,name:odex30_account_asset.action_account_aml_to_asset
+#: model:ir.model.fields,field_description:odex30_account_asset.field_account_account__create_asset
+#: model_terms:ir.ui.view,arch_db:odex30_account_asset.view_move_line_tree
+msgid "Create Asset"
+msgstr "إنشاء الأصل "
+
+#. module: odex30_account_asset
+#: model:ir.model.fields.selection,name:odex30_account_asset.selection__account_account__create_asset__validate
+msgid "Create and validate"
+msgstr "إنشاء وتصديق "
+
+#. module: odex30_account_asset
+#: model:ir.model.fields.selection,name:odex30_account_asset.selection__account_account__create_asset__draft
+msgid "Create in draft"
+msgstr "إنشاء في مسودة "
+
+#. module: odex30_account_asset
+#: model_terms:ir.actions.act_window,help:odex30_account_asset.action_account_asset_form
+msgid "Create new asset"
+msgstr "إنشاء أصل جديد "
+
+#. module: odex30_account_asset
+#: model_terms:ir.actions.act_window,help:odex30_account_asset.action_account_asset_model_form
+msgid "Create new asset model"
+msgstr "إنشاء نموذج أصل جديد "
+
+#. module: odex30_account_asset
+#: model:ir.model.fields,field_description:odex30_account_asset.field_account_asset__create_uid
+#: model:ir.model.fields,field_description:odex30_account_asset.field_account_asset_group__create_uid
+#: model:ir.model.fields,field_description:odex30_account_asset.field_asset_modify__create_uid
+msgid "Created by"
+msgstr "أنشئ بواسطة"
+
+#. module: odex30_account_asset
+#: model:ir.model.fields,field_description:odex30_account_asset.field_account_asset__create_date
+#: model:ir.model.fields,field_description:odex30_account_asset.field_account_asset_group__create_date
+#: model:ir.model.fields,field_description:odex30_account_asset.field_asset_modify__create_date
+msgid "Created on"
+msgstr "أنشئ في"
+
+#. module: odex30_account_asset
+#: model:ir.model.fields,field_description:odex30_account_asset.field_account_bank_statement_line__asset_depreciated_value
+#: model:ir.model.fields,field_description:odex30_account_asset.field_account_move__asset_depreciated_value
+msgid "Cumulative Depreciation"
+msgstr "الإهلاك التراكمي "
+
+#. module: odex30_account_asset
+#: model:ir.model.fields,field_description:odex30_account_asset.field_account_asset__currency_id
+#: model:ir.model.fields,field_description:odex30_account_asset.field_asset_modify__currency_id
+msgid "Currency"
+msgstr "العملة"
+
+#. module: odex30_account_asset
+#: model_terms:ir.ui.view,arch_db:odex30_account_asset.view_account_asset_search
+msgid "Current"
+msgstr "الحالي "
+
+#. module: odex30_account_asset
+#: model_terms:ir.ui.view,arch_db:odex30_account_asset.view_account_asset_form
+msgid "Current Values"
+msgstr "القيم الحالية "
+
+#. module: odex30_account_asset
+#: model:ir.model.fields,field_description:odex30_account_asset.field_asset_modify__invoice_ids
+msgid "Customer Invoice"
+msgstr "فاتورة العميل"
+
+#. module: odex30_account_asset
+#: model:ir.model.fields,field_description:odex30_account_asset.field_asset_modify__date
+#: model_terms:ir.ui.view,arch_db:odex30_account_asset.view_account_asset_search
+msgid "Date"
+msgstr "التاريخ"
+
+#. module: odex30_account_asset
+#: model:ir.model.fields,field_description:odex30_account_asset.field_account_bank_statement_line__asset_depreciation_beginning_date
+#: model:ir.model.fields,field_description:odex30_account_asset.field_account_move__asset_depreciation_beginning_date
+msgid "Date of the beginning of the depreciation"
+msgstr "تاريخ بداية الإهلاك "
+
+#. module: odex30_account_asset
+#. odoo-python
+#: code:addons/odex30_account_asset/models/account_assets_report.py:0
+msgid "Dec. then Straight"
+msgstr "انخفاض ثم ثبات "
+
+#. module: odex30_account_asset
+#. odoo-python
+#: code:addons/odex30_account_asset/models/account_assets_report.py:0
+#: model:ir.model.fields.selection,name:odex30_account_asset.selection__account_asset__method__degressive
+msgid "Declining"
+msgstr "منخفض "
+
+#. module: odex30_account_asset
+#: model:ir.model.fields,field_description:odex30_account_asset.field_account_asset__method_progress_factor
+msgid "Declining Factor"
+msgstr "عامل الانخفاض "
+
+#. module: odex30_account_asset
+#: model:ir.model.fields.selection,name:odex30_account_asset.selection__account_asset__method__degressive_then_linear
+msgid "Declining then Straight Line"
+msgstr "الانخفاض ثم الثبات في خط مستقيم "
+
+#. module: odex30_account_asset
+#: model:ir.model.fields,field_description:odex30_account_asset.field_asset_modify__value_residual
+msgid "Depreciable Amount"
+msgstr "المبلغ القابل للإهلاك "
+
+#. module: odex30_account_asset
+#: model:ir.model.fields,field_description:odex30_account_asset.field_account_asset__value_residual
+#: model:ir.model.fields,field_description:odex30_account_asset.field_account_bank_statement_line__asset_remaining_value
+#: model:ir.model.fields,field_description:odex30_account_asset.field_account_move__asset_remaining_value
+msgid "Depreciable Value"
+msgstr "القيمة القابلة للإهلاك "
+
+#. module: odex30_account_asset
+#: model_terms:ir.ui.view,arch_db:odex30_account_asset.view_account_asset_form
+msgid "Depreciated Amount"
+msgstr "المبلغ المُهلَك "
+
+#. module: odex30_account_asset
+#. odoo-python
+#: code:addons/odex30_account_asset/models/account_assets_report.py:0
+#: model:ir.model.fields,field_description:odex30_account_asset.field_account_bank_statement_line__depreciation_value
+#: model:ir.model.fields,field_description:odex30_account_asset.field_account_move__depreciation_value
+#: model:ir.model.fields.selection,name:odex30_account_asset.selection__account_move__asset_move_type__depreciation
+#: model_terms:ir.ui.view,arch_db:odex30_account_asset.view_account_asset_form
+msgid "Depreciation"
+msgstr "إهلاك"
+
+#. module: odex30_account_asset
+#: model:ir.model.fields,field_description:odex30_account_asset.field_account_asset__account_depreciation_id
+#: model:ir.model.fields,field_description:odex30_account_asset.field_asset_modify__account_depreciation_id
+#: model_terms:ir.ui.view,arch_db:odex30_account_asset.view_account_asset_model_search
+msgid "Depreciation Account"
+msgstr "حساب الإهلاك"
+
+#. module: odex30_account_asset
+#: model_terms:ir.ui.view,arch_db:odex30_account_asset.view_account_asset_form
+msgid "Depreciation Board"
+msgstr "اللائحة الاستهلاكية "
+
+#. module: odex30_account_asset
+#: model_terms:ir.ui.view,arch_db:odex30_account_asset.view_account_asset_form
+msgid "Depreciation Date"
+msgstr "تاريخ الإهلاك"
+
+#. module: odex30_account_asset
+#: model:ir.model.fields,field_description:odex30_account_asset.field_account_asset__depreciation_move_ids
+#: model_terms:ir.ui.view,arch_db:odex30_account_asset.view_account_asset_form
+msgid "Depreciation Lines"
+msgstr "بنود الإهلاك"
+
+#. module: odex30_account_asset
+#: model_terms:ir.ui.view,arch_db:odex30_account_asset.view_account_asset_form
+msgid "Depreciation Method"
+msgstr "طريقة الإهلاك"
+
+#. module: odex30_account_asset
+#: model:account.report,name:odex30_account_asset.assets_report
+#: model:ir.actions.client,name:odex30_account_asset.action_account_report_assets
+#: model:ir.ui.menu,name:odex30_account_asset.menu_action_account_report_assets
+msgid "Depreciation Schedule"
+msgstr "جدول الإهلاك "
+
+#. module: odex30_account_asset
+#. odoo-python
+#: code:addons/odex30_account_asset/wizard/asset_modify.py:0
+msgid "Depreciation board modified %s"
+msgstr "تم تعديل لوح الإهلاك %s "
+
+#. module: odex30_account_asset
+#. odoo-python
+#: code:addons/odex30_account_asset/models/account_move.py:0
+msgid "Depreciation entry %(name)s posted (%(value)s)"
+msgstr "قيد الإهلاك %(name)s تم ترحيله (%(value)s) "
+
+#. module: odex30_account_asset
+#. odoo-python
+#: code:addons/odex30_account_asset/models/account_move.py:0
+msgid "Depreciation entry %(name)s reversed (%(value)s)"
+msgstr "قيد الإهلاك %(name)s تم عكسه (%(value)s) "
+
+#. module: odex30_account_asset
+#: model:ir.model.fields,field_description:odex30_account_asset.field_account_asset__display_account_asset_id
+msgid "Display Account Asset"
+msgstr "أصل حساب العرض "
+
+#. module: odex30_account_asset
+#: model:ir.model.fields,field_description:odex30_account_asset.field_account_asset__display_name
+#: model:ir.model.fields,field_description:odex30_account_asset.field_account_asset_group__display_name
+#: model:ir.model.fields,field_description:odex30_account_asset.field_asset_modify__display_name
+msgid "Display Name"
+msgstr "اسم العرض "
+
+#. module: odex30_account_asset
+#: model:ir.model.fields.selection,name:odex30_account_asset.selection__account_move__asset_move_type__disposal
+msgid "Disposal"
+msgstr "التصرف "
+
+#. module: odex30_account_asset
+#: model:ir.model.fields,field_description:odex30_account_asset.field_account_asset__disposal_date
+msgid "Disposal Date"
+msgstr "تاريخ التصرف "
+
+#. module: odex30_account_asset
+#. odoo-python
+#: code:addons/odex30_account_asset/models/account_asset.py:0
+msgid "Disposal Move"
+msgstr "حركة التصرف "
+
+#. module: odex30_account_asset
+#. odoo-python
+#: code:addons/odex30_account_asset/models/account_asset.py:0
+msgid "Disposal Moves"
+msgstr "حركات التصرف "
+
+#. module: odex30_account_asset
+#. odoo-python
+#: code:addons/odex30_account_asset/wizard/asset_modify.py:0
+#: model_terms:ir.ui.view,arch_db:odex30_account_asset.asset_modify_form
+msgid "Dispose"
+msgstr "تصرف "
+
+#. module: odex30_account_asset
+#: model:ir.model.fields,field_description:odex30_account_asset.field_account_asset__distribution_analytic_account_ids
+msgid "Distribution Analytic Account"
+msgstr "حساب التوزيع التحليلي "
+
+#. module: odex30_account_asset
+#: model:ir.model.fields.selection,name:odex30_account_asset.selection__account_asset__state__draft
+msgid "Draft"
+msgstr "مسودة"
+
+#. module: odex30_account_asset
+#: model:ir.model.fields,field_description:odex30_account_asset.field_account_bank_statement_line__draft_asset_exists
+#: model:ir.model.fields,field_description:odex30_account_asset.field_account_move__draft_asset_exists
+msgid "Draft Asset Exists"
+msgstr "مسودة الأصل موجودة بالفعل "
+
+#. module: odex30_account_asset
+#: model:ir.model.fields,field_description:odex30_account_asset.field_account_asset__method_number
+#: model:ir.model.fields,field_description:odex30_account_asset.field_asset_modify__method_number
+#: model_terms:ir.ui.view,arch_db:odex30_account_asset.view_account_asset_form
+#: model_terms:ir.ui.view,arch_db:odex30_account_asset.view_account_asset_kanban
+msgid "Duration"
+msgstr "المدة"
+
+#. module: odex30_account_asset
+#: model:account.report.column,name:odex30_account_asset.assets_report_duration_rate
+msgid "Duration / Rate"
+msgstr "المدة / المعدل "
+
+#. module: odex30_account_asset
+#: model:ir.model.fields,field_description:odex30_account_asset.field_account_asset__account_depreciation_expense_id
+#: model:ir.model.fields,field_description:odex30_account_asset.field_asset_modify__account_depreciation_expense_id
+#: model_terms:ir.ui.view,arch_db:odex30_account_asset.view_account_asset_model_search
+msgid "Expense Account"
+msgstr "حساب النفقات "
+
+#. module: odex30_account_asset
+#: model:account.report.column,name:odex30_account_asset.assets_report_first_depreciation
+msgid "First Depreciation"
+msgstr "الإهلاك الأول "
+
+#. module: odex30_account_asset
+#: model:ir.model.fields,field_description:odex30_account_asset.field_account_asset__account_asset_id
+#: model_terms:ir.ui.view,arch_db:odex30_account_asset.view_account_asset_model_search
+msgid "Fixed Asset Account"
+msgstr "حساب الأصل الثابت "
+
+#. module: odex30_account_asset
+#: model:ir.model.fields,field_description:odex30_account_asset.field_account_asset__message_follower_ids
+msgid "Followers"
+msgstr "المتابعين"
+
+#. module: odex30_account_asset
+#: model:ir.model.fields,field_description:odex30_account_asset.field_account_asset__message_partner_ids
+msgid "Followers (Partners)"
+msgstr "المتابعين (الشركاء) "
+
+#. module: odex30_account_asset
+#: model:ir.model.fields,help:odex30_account_asset.field_account_asset__activity_type_icon
+msgid "Font awesome icon e.g. fa-tasks"
+msgstr "أيقونة من Font awesome مثال: fa-tasks "
+
+#. module: odex30_account_asset
+#: model:ir.model.fields,field_description:odex30_account_asset.field_account_account__form_view_ref
+msgid "Form View Ref"
+msgstr "مرجع عرض الاستمارة "
+
+#. module: odex30_account_asset
+#: model_terms:ir.ui.view,arch_db:odex30_account_asset.view_account_asset_search
+msgid "Future Activities"
+msgstr "الأنشطة المستقبلية"
+
+#. module: odex30_account_asset
+#: model:ir.model.fields.selection,name:odex30_account_asset.selection__asset_modify__gain_or_loss__gain
+msgid "Gain"
+msgstr "الربح "
+
+#. module: odex30_account_asset
+#: model:ir.model.fields,field_description:odex30_account_asset.field_asset_modify__gain_account_id
+#: model:ir.model.fields,field_description:odex30_account_asset.field_res_company__gain_account_id
+msgid "Gain Account"
+msgstr "حساب الربح "
+
+#. module: odex30_account_asset
+#: model:ir.model.fields,field_description:odex30_account_asset.field_asset_modify__gain_or_loss
+msgid "Gain Or Loss"
+msgstr "الربح أو الخسارة "
+
+#. module: odex30_account_asset
+#: model:ir.model.fields,field_description:odex30_account_asset.field_asset_modify__gain_value
+msgid "Gain Value"
+msgstr "قيمة الربح "
+
+#. module: odex30_account_asset
+#. odoo-python
+#: code:addons/odex30_account_asset/models/account_asset.py:0
+#: model_terms:ir.ui.view,arch_db:odex30_account_asset.view_account_asset_form
+msgid "Gross Increase"
+msgstr "الزيادة الإجمالية "
+
+#. module: odex30_account_asset
+#: model:ir.model.fields,field_description:odex30_account_asset.field_asset_modify__account_asset_id
+msgid "Gross Increase Account"
+msgstr "حساب الزيادة الإجمالية"
+
+#. module: odex30_account_asset
+#: model:ir.model.fields,field_description:odex30_account_asset.field_account_asset__gross_increase_value
+msgid "Gross Increase Value"
+msgstr "قيمة الزيادة الإجمالية "
+
+#. module: odex30_account_asset
+#. odoo-javascript
+#: code:addons/odex30_account_asset/static/src/components/depreciation_schedule/groupby.xml:0
+msgid "Group By Account"
+msgstr "تجميع حسب حساب"
+
+#. module: odex30_account_asset
+#. odoo-javascript
+#: code:addons/odex30_account_asset/static/src/components/depreciation_schedule/groupby.xml:0
+msgid "Group By Asset Group"
+msgstr "تجميع حسب مجموعة الأصول "
+
+#. module: odex30_account_asset
+#: model_terms:ir.ui.view,arch_db:odex30_account_asset.view_account_asset_model_search
+#: model_terms:ir.ui.view,arch_db:odex30_account_asset.view_account_asset_search
+msgid "Group By..."
+msgstr "تجميع حسب.."
+
+#. module: odex30_account_asset
+#. odoo-javascript
+#: code:addons/odex30_account_asset/static/src/components/depreciation_schedule/groupby.xml:0
+msgid "Group by Account"
+msgstr "تجميع حسب الحساب "
+
+#. module: odex30_account_asset
+#. odoo-javascript
+#: code:addons/odex30_account_asset/static/src/components/depreciation_schedule/groupby.xml:0
+msgid "Group by Asset Group"
+msgstr "تجميع حسب مجموعة الأصول "
+
+#. module: odex30_account_asset
+#: model:ir.model.fields,field_description:odex30_account_asset.field_account_asset__has_message
+msgid "Has Message"
+msgstr "يحتوي على رسالة "
+
+#. module: odex30_account_asset
+#: model:ir.model.fields,field_description:odex30_account_asset.field_account_asset__id
+#: model:ir.model.fields,field_description:odex30_account_asset.field_account_asset_group__id
+#: model:ir.model.fields,field_description:odex30_account_asset.field_asset_modify__id
+msgid "ID"
+msgstr "المُعرف"
+
+#. module: odex30_account_asset
+#: model:ir.model.fields,field_description:odex30_account_asset.field_account_asset__activity_exception_icon
+msgid "Icon"
+msgstr "الأيقونة"
+
+#. module: odex30_account_asset
+#: model:ir.model.fields,help:odex30_account_asset.field_account_asset__activity_exception_icon
+msgid "Icon to indicate an exception activity."
+msgstr "الأيقونة للإشارة إلى النشاط المستثنى. "
+
+#. module: odex30_account_asset
+#: model:ir.model.fields,help:odex30_account_asset.field_account_asset__message_needaction
+msgid "If checked, new messages require your attention."
+msgstr "إذا كان محددًا، فهناك رسائل جديدة عليك رؤيتها. "
+
+#. module: odex30_account_asset
+#: model:ir.model.fields,help:odex30_account_asset.field_account_asset__message_has_error
+#: model:ir.model.fields,help:odex30_account_asset.field_account_asset__message_has_sms_error
+msgid "If checked, some messages have a delivery error."
+msgstr "إذا كان محددًا، فقد حدث خطأ في تسليم بعض الرسائل."
+
+#. module: odex30_account_asset
+#: model:ir.model.fields,help:odex30_account_asset.field_account_asset__already_depreciated_amount_import
+msgid ""
+"In case of an import from another software, you might need to use this field"
+" to have the right depreciation table report. This is the value that was "
+"already depreciated with entries not computed from this model"
+msgstr ""
+"في حال الاستيراد من برنامج آخر، قد تحتاج إلى استخدام هذا الحقل حتى يكون لديك"
+" تقرير جدول الإهلاك المناسب. هذه هي القيمة التي تم استهلاكها بالفعل مع كون "
+"القيود غير محسوبة لهذا النموذج "
+
+#. module: odex30_account_asset
+#: model:ir.model.fields,field_description:odex30_account_asset.field_asset_modify__informational_text
+msgid "Informational Text"
+msgstr "نص معلوماتي "
+
+#. module: odex30_account_asset
+#: model:ir.model.fields,field_description:odex30_account_asset.field_asset_modify__invoice_line_ids
+msgid "Invoice Line"
+msgstr "بند الفاتورة"
+
+#. module: odex30_account_asset
+#: model:ir.model.fields,field_description:odex30_account_asset.field_account_asset__message_is_follower
+msgid "Is Follower"
+msgstr "متابع"
+
+#. module: odex30_account_asset
+#: model:ir.model.fields,help:odex30_account_asset.field_account_asset__salvage_value
+#: model:ir.model.fields,help:odex30_account_asset.field_account_asset__salvage_value_pct
+msgid "It is the amount you plan to have that you cannot depreciate."
+msgstr "لا يمكنك إهلاك المبلغ الذي تخطط للحصول عليه. "
+
+#. module: odex30_account_asset
+#: model:ir.model.fields,field_description:odex30_account_asset.field_account_asset__journal_id
+#: model_terms:ir.ui.view,arch_db:odex30_account_asset.view_account_asset_model_search
+msgid "Journal"
+msgstr "دفتر اليومية"
+
+#. module: odex30_account_asset
+#. odoo-python
+#: code:addons/odex30_account_asset/models/account_asset.py:0
+msgid "Journal Entries"
+msgstr "قيود اليومية "
+
+#. module: odex30_account_asset
+#: model:ir.model,name:odex30_account_asset.model_account_move
+#: model_terms:ir.ui.view,arch_db:odex30_account_asset.view_account_asset_form
+msgid "Journal Entry"
+msgstr "قيد اليومية"
+
+#. module: odex30_account_asset
+#: model:ir.model,name:odex30_account_asset.model_account_move_line
+msgid "Journal Item"
+msgstr "عنصر اليومية"
+
+#. module: odex30_account_asset
+#. odoo-python
+#: code:addons/odex30_account_asset/models/account_asset.py:0
+#: model:ir.model.fields,field_description:odex30_account_asset.field_account_asset__original_move_line_ids
+msgid "Journal Items"
+msgstr "عناصر اليومية"
+
+#. module: odex30_account_asset
+#. odoo-python
+#: code:addons/odex30_account_asset/models/account_move.py:0
+msgid ""
+"Journal Items of %(account)s should have a label in order to generate an "
+"asset"
+msgstr ""
+"يجب أن يكون لعناصر يومية %(account)s علامة تصنيف حتى تتمكن من إنشاء أصل "
+
+#. module: odex30_account_asset
+#: model:ir.model.fields,field_description:odex30_account_asset.field_account_asset__write_uid
+#: model:ir.model.fields,field_description:odex30_account_asset.field_account_asset_group__write_uid
+#: model:ir.model.fields,field_description:odex30_account_asset.field_asset_modify__write_uid
+msgid "Last Updated by"
+msgstr "آخر تحديث بواسطة"
+
+#. module: odex30_account_asset
+#: model:ir.model.fields,field_description:odex30_account_asset.field_account_asset__write_date
+#: model:ir.model.fields,field_description:odex30_account_asset.field_account_asset_group__write_date
+#: model:ir.model.fields,field_description:odex30_account_asset.field_asset_modify__write_date
+msgid "Last Updated on"
+msgstr "آخر تحديث في"
+
+#. module: odex30_account_asset
+#: model_terms:ir.ui.view,arch_db:odex30_account_asset.view_account_asset_search
+msgid "Late Activities"
+msgstr "الأنشطة المتأخرة"
+
+#. module: odex30_account_asset
+#. odoo-python
+#: code:addons/odex30_account_asset/models/account_assets_report.py:0
+msgid "Linear"
+msgstr "خطي "
+
+#. module: odex30_account_asset
+#: model:ir.model.fields,field_description:odex30_account_asset.field_account_asset__linked_assets_ids
+msgid "Linked Assets"
+msgstr "الأصول المرتبطة "
+
+#. module: odex30_account_asset
+#: model:ir.model.fields.selection,name:odex30_account_asset.selection__asset_modify__gain_or_loss__loss
+msgid "Loss"
+msgstr "خسارة"
+
+#. module: odex30_account_asset
+#: model:ir.model.fields,field_description:odex30_account_asset.field_asset_modify__loss_account_id
+#: model:ir.model.fields,field_description:odex30_account_asset.field_res_company__loss_account_id
+msgid "Loss Account"
+msgstr "حساب الخسائر "
+
+#. module: odex30_account_asset
+#: model_terms:ir.ui.view,arch_db:odex30_account_asset.view_account_form_asset_inherit
+msgid "Manage Items"
+msgstr "إدارة العناصر "
+
+#. module: odex30_account_asset
+#: model:ir.model.fields,field_description:odex30_account_asset.field_account_asset__message_has_error
+msgid "Message Delivery error"
+msgstr "خطأ في تسليم الرسائل"
+
+#. module: odex30_account_asset
+#: model:ir.model.fields,field_description:odex30_account_asset.field_account_asset__message_ids
+msgid "Messages"
+msgstr "الرسائل"
+
+#. module: odex30_account_asset
+#: model:account.report.column,name:odex30_account_asset.assets_report_first_method
+#: model:ir.model.fields,field_description:odex30_account_asset.field_account_asset__method
+msgid "Method"
+msgstr "الطريقة "
+
+#. module: odex30_account_asset
+#: model:ir.model.fields,field_description:odex30_account_asset.field_account_asset__model_id
+#: model:ir.model.fields.selection,name:odex30_account_asset.selection__account_asset__state__model
+#: model_terms:ir.ui.view,arch_db:odex30_account_asset.view_account_asset_kanban
+msgid "Model"
+msgstr "النموذج "
+
+#. module: odex30_account_asset
+#: model:ir.model.fields,field_description:odex30_account_asset.field_account_asset__asset_properties_definition
+msgid "Model Properties"
+msgstr "خصائص النموذج "
+
+#. module: odex30_account_asset
+#: model_terms:ir.ui.view,arch_db:odex30_account_asset.asset_modify_form
+msgid "Modify"
+msgstr "تعديل"
+
+#. module: odex30_account_asset
+#. odoo-python
+#: code:addons/odex30_account_asset/models/account_asset.py:0
+#: model:ir.model,name:odex30_account_asset.model_asset_modify
+#: model_terms:ir.ui.view,arch_db:odex30_account_asset.asset_modify_form
+msgid "Modify Asset"
+msgstr "تعديل الأصل"
+
+#. module: odex30_account_asset
+#: model_terms:ir.ui.view,arch_db:odex30_account_asset.view_account_asset_form
+msgid "Modify Depreciation"
+msgstr "تعديل الإهلاكات"
+
+#. module: odex30_account_asset
+#: model:ir.model.fields.selection,name:odex30_account_asset.selection__account_asset__method_period__1
+#: model:ir.model.fields.selection,name:odex30_account_asset.selection__asset_modify__method_period__1
+msgid "Months"
+msgstr "شهور"
+
+#. module: odex30_account_asset
+#: model:ir.model.fields,field_description:odex30_account_asset.field_account_account__multiple_assets_per_line
+msgid "Multiple Assets per Line"
+msgstr "أصول متعددة لكل بند "
+
+#. module: odex30_account_asset
+#: model:ir.model.fields,help:odex30_account_asset.field_account_account__multiple_assets_per_line
+msgid ""
+"Multiple asset items will be generated depending on the bill line quantity "
+"instead of 1 global asset."
+msgstr ""
+"سوف يتم إنشاء عدة عناصر أصول بناء على كمية بنود الفاتورة عوضاً عن أصل شامل "
+"واحد. "
+
+#. module: odex30_account_asset
+#: model:ir.model.fields,field_description:odex30_account_asset.field_account_asset__my_activity_date_deadline
+msgid "My Activity Deadline"
+msgstr "الموعد النهائي لنشاطاتي "
+
+#. module: odex30_account_asset
+#: model:ir.model.fields,field_description:odex30_account_asset.field_account_asset_group__name
+msgid "Name"
+msgstr "الاسم"
+
+#. module: odex30_account_asset
+#: model:ir.model.fields.selection,name:odex30_account_asset.selection__account_move__asset_move_type__negative_revaluation
+msgid "Negative revaluation"
+msgstr "التقييم السالب "
+
+#. module: odex30_account_asset
+#: model:ir.model.fields,field_description:odex30_account_asset.field_account_asset__net_gain_on_sale
+msgid "Net gain on sale"
+msgstr "صافي أرباح المبيعات "
+
+#. module: odex30_account_asset
+#: model:ir.model.fields,help:odex30_account_asset.field_account_asset__net_gain_on_sale
+msgid "Net value of gain or loss on sale of an asset"
+msgstr "صافي الأرباح أو الخسائر عند بيع الأصل "
+
+#. module: odex30_account_asset
+#: model:ir.model.fields,help:odex30_account_asset.field_asset_modify__value_residual
+msgid "New residual amount for the asset"
+msgstr "مبلغ متبقي جديد للأصل "
+
+#. module: odex30_account_asset
+#: model:ir.model.fields,help:odex30_account_asset.field_asset_modify__salvage_value
+msgid "New salvage amount for the asset"
+msgstr "مبلغ مسترد جديد للأصل "
+
+#. module: odex30_account_asset
+#: model:ir.model.fields,field_description:odex30_account_asset.field_account_asset__activity_calendar_event_id
+msgid "Next Activity Calendar Event"
+msgstr "الفعالية التالية في تقويم الأنشطة "
+
+#. module: odex30_account_asset
+#: model:ir.model.fields,field_description:odex30_account_asset.field_account_asset__activity_date_deadline
+msgid "Next Activity Deadline"
+msgstr "الموعد النهائي للنشاط التالي"
+
+#. module: odex30_account_asset
+#: model:ir.model.fields,field_description:odex30_account_asset.field_account_asset__activity_summary
+msgid "Next Activity Summary"
+msgstr "ملخص النشاط التالي"
+
+#. module: odex30_account_asset
+#: model:ir.model.fields,field_description:odex30_account_asset.field_account_asset__activity_type_id
+msgid "Next Activity Type"
+msgstr "نوع النشاط التالي"
+
+#. module: odex30_account_asset
+#: model:ir.model.fields.selection,name:odex30_account_asset.selection__account_account__create_asset__no
+#: model:ir.model.fields.selection,name:odex30_account_asset.selection__asset_modify__gain_or_loss__no
+msgid "No"
+msgstr "لا"
+
+#. module: odex30_account_asset
+#. odoo-javascript
+#: code:addons/odex30_account_asset/static/src/components/depreciation_schedule/groupby.xml:0
+msgid "No Grouping"
+msgstr "بلا تجميع "
+
+#. module: odex30_account_asset
+#: model:ir.model.fields.selection,name:odex30_account_asset.selection__account_asset__prorata_computation_type__none
+msgid "No Prorata"
+msgstr "بلاتناسب "
+
+#. module: odex30_account_asset
+#: model:ir.model.fields,field_description:odex30_account_asset.field_account_asset__non_deductible_tax_value
+#: model:ir.model.fields,field_description:odex30_account_asset.field_account_move_line__non_deductible_tax_value
+msgid "Non Deductible Tax Value"
+msgstr "قيمة الضريبة غير القابلة للخصم"
+
+#. module: odex30_account_asset
+#: model:ir.model.fields,field_description:odex30_account_asset.field_asset_modify__salvage_value
+msgid "Not Depreciable Amount"
+msgstr "ليس مبلغاً قابلاً للإهلاك "
+
+#. module: odex30_account_asset
+#: model:ir.model.fields,field_description:odex30_account_asset.field_account_asset__salvage_value
+msgid "Not Depreciable Value"
+msgstr "ليست قيمة قابلة للإهلاك "
+
+#. module: odex30_account_asset
+#: model:ir.model.fields,field_description:odex30_account_asset.field_account_asset__salvage_value_pct
+msgid "Not Depreciable Value Percent"
+msgstr "ليست نسبة قيمة قابلة للإهلاك "
+
+#. module: odex30_account_asset
+#: model:ir.model.fields,field_description:odex30_account_asset.field_asset_modify__name
+msgid "Note"
+msgstr "الملاحظات"
+
+#. module: odex30_account_asset
+#: model:ir.model.fields,field_description:odex30_account_asset.field_account_asset__message_needaction_counter
+msgid "Number of Actions"
+msgstr "عدد الإجراءات"
+
+#. module: odex30_account_asset
+#: model_terms:ir.ui.view,arch_db:odex30_account_asset.view_account_asset_model_tree
+msgid "Number of Depreciations"
+msgstr "عدد الإهلاكات"
+
+#. module: odex30_account_asset
+#: model:ir.model.fields,field_description:odex30_account_asset.field_account_asset__method_period
+#: model:ir.model.fields,field_description:odex30_account_asset.field_asset_modify__method_period
+msgid "Number of Months in a Period"
+msgstr "عدد الشهور في الفترة"
+
+#. module: odex30_account_asset
+#: model:ir.model.fields,help:odex30_account_asset.field_account_asset__gross_increase_count
+msgid "Number of assets made to increase the value of the asset"
+msgstr "عدد الأصول التي تم إنشاؤها لزيادة قيمة الأصل "
+
+#. module: odex30_account_asset
+#: model:ir.model.fields,field_description:odex30_account_asset.field_account_bank_statement_line__asset_number_days
+#: model:ir.model.fields,field_description:odex30_account_asset.field_account_move__asset_number_days
+msgid "Number of days"
+msgstr "عدد الأيام"
+
+#. module: odex30_account_asset
+#: model:ir.model.fields,help:odex30_account_asset.field_account_asset__total_depreciation_entries_count
+msgid "Number of depreciation entries (posted or not)"
+msgstr "عدد قيود الإهلاك (مُرحّلة أو غير مُرحّلة) "
+
+#. module: odex30_account_asset
+#: model:ir.model.fields,field_description:odex30_account_asset.field_account_asset__message_has_error_counter
+msgid "Number of errors"
+msgstr "عدد الأخطاء "
+
+#. module: odex30_account_asset
+#: model:ir.model.fields,help:odex30_account_asset.field_account_asset__message_needaction_counter
+msgid "Number of messages requiring action"
+msgstr "عدد الرسائل التي تتطلب اتخاذ إجراء"
+
+#. module: odex30_account_asset
+#: model:ir.model.fields,help:odex30_account_asset.field_account_asset__message_has_error_counter
+msgid "Number of messages with delivery error"
+msgstr "عدد الرسائل الحادث بها خطأ في التسليم"
+
+#. module: odex30_account_asset
+#: model:ir.model.fields.selection,name:odex30_account_asset.selection__account_asset__state__paused
+msgid "On Hold"
+msgstr "قيد الانتظار "
+
+#. module: odex30_account_asset
+#. odoo-python
+#: code:addons/odex30_account_asset/models/account_assets_report.py:0
+msgid "Open Asset"
+msgstr "أصل مفتوح "
+
+#. module: odex30_account_asset
+#: model:ir.model.fields,field_description:odex30_account_asset.field_account_asset__original_value
+#: model_terms:ir.ui.view,arch_db:odex30_account_asset.view_account_asset_kanban
+msgid "Original Value"
+msgstr "القيمة الأصلية "
+
+#. module: odex30_account_asset
+#: model:ir.model.fields,field_description:odex30_account_asset.field_account_asset__parent_id
+msgid "Parent"
+msgstr "الأصل"
+
+#. module: odex30_account_asset
+#. odoo-python
+#: code:addons/odex30_account_asset/models/account_asset.py:0
+#: model_terms:ir.ui.view,arch_db:odex30_account_asset.view_account_asset_form
+msgid "Parent Asset"
+msgstr "الأصل الرئيسي  "
+
+#. module: odex30_account_asset
+#. odoo-python
+#: code:addons/odex30_account_asset/wizard/asset_modify.py:0
+#: model_terms:ir.ui.view,arch_db:odex30_account_asset.asset_modify_form
+msgid "Pause"
+msgstr "إيقاف مؤقت "
+
+#. module: odex30_account_asset
+#: model:ir.model.fields,field_description:odex30_account_asset.field_account_asset__paused_prorata_date
+msgid "Paused Prorata Date"
+msgstr "إيقاف التاريخ النسبي مؤقتاً "
+
+#. module: odex30_account_asset
+#: model_terms:ir.ui.view,arch_db:odex30_account_asset.view_account_asset_model_tree
+msgid "Period length"
+msgstr "طول المدة "
+
+#. module: odex30_account_asset
+#: model:ir.model.fields.selection,name:odex30_account_asset.selection__account_move__asset_move_type__positive_revaluation
+msgid "Positive revaluation"
+msgstr "التقييم الموجب "
+
+#. module: odex30_account_asset
+#: model_terms:ir.ui.view,arch_db:odex30_account_asset.view_account_asset_form
+msgid "Posted Entries"
+msgstr "القيود المُرحّلة "
+
+#. module: odex30_account_asset
+#: model:ir.model.fields,field_description:odex30_account_asset.field_account_asset__asset_properties
+#: model_terms:ir.ui.view,arch_db:odex30_account_asset.view_account_asset_search
+msgid "Properties"
+msgstr "الخصائص "
+
+#. module: odex30_account_asset
+#: model:ir.model.fields,field_description:odex30_account_asset.field_account_asset__prorata_date
+msgid "Prorata Date"
+msgstr "التاريخ النسبي "
+
+#. module: odex30_account_asset
+#: model:ir.model.fields.selection,name:odex30_account_asset.selection__account_move__asset_move_type__purchase
+msgid "Purchase"
+msgstr "الشراء"
+
+#. module: odex30_account_asset
+#: model:ir.model.fields,field_description:odex30_account_asset.field_account_asset__rating_ids
+msgid "Ratings"
+msgstr "التقييمات "
+
+#. module: odex30_account_asset
+#. odoo-python
+#: code:addons/odex30_account_asset/wizard/asset_modify.py:0
+msgid "Re-evaluate"
+msgstr "إعادة التقييم"
+
+#. module: odex30_account_asset
+#: model:ir.model.fields,field_description:odex30_account_asset.field_account_asset_group__linked_asset_ids
+#: model:ir.model.fields,field_description:odex30_account_asset.field_account_move_line__asset_ids
+#: model_terms:ir.ui.view,arch_db:odex30_account_asset.view_move_line_form_asset_inherit
+msgid "Related Assets"
+msgstr "الأصول ذات الصلة "
+
+#. module: odex30_account_asset
+#: model:ir.model.fields,field_description:odex30_account_asset.field_account_asset__related_purchase_value
+msgid "Related Purchase Value"
+msgstr "قيمة الشراء ذات الصلة"
+
+#. module: odex30_account_asset
+#. odoo-python
+#: code:addons/odex30_account_asset/models/account_asset.py:0
+msgid "Reset to running"
+msgstr "إعادة التعيين كجارٍ "
+
+#. module: odex30_account_asset
+#: model:ir.model.fields,field_description:odex30_account_asset.field_account_asset__activity_user_id
+msgid "Responsible User"
+msgstr "المستخدم المسؤول"
+
+#. module: odex30_account_asset
+#. odoo-python
+#: code:addons/odex30_account_asset/wizard/asset_modify.py:0
+#: model_terms:ir.ui.view,arch_db:odex30_account_asset.asset_modify_form
+msgid "Resume"
+msgstr "المتابعة "
+
+#. module: odex30_account_asset
+#: model_terms:ir.ui.view,arch_db:odex30_account_asset.view_account_asset_form
+msgid "Resume Depreciation"
+msgstr "متابعة الإهلاك "
+
+#. module: odex30_account_asset
+#. odoo-python
+#: code:addons/odex30_account_asset/wizard/asset_modify.py:0
+msgid ""
+"Reverse the depreciation entries posted in the future in order to modify the"
+" depreciation"
+msgstr ""
+"قم بعكس قيود الإهلاك المُرحّلة إلى المستقبل حتى تتمكن من تعديل الإهلاك "
+
+#. module: odex30_account_asset
+#: model:ir.model.fields.selection,name:odex30_account_asset.selection__account_asset__state__open
+msgid "Running"
+msgstr "جاري"
+
+#. module: odex30_account_asset
+#: model:ir.model.fields,field_description:odex30_account_asset.field_account_asset__message_has_sms_error
+msgid "SMS Delivery error"
+msgstr "خطأ في تسليم الرسائل النصية القصيرة "
+
+#. module: odex30_account_asset
+#: model:ir.model.fields.selection,name:odex30_account_asset.selection__account_move__asset_move_type__sale
+msgid "Sale"
+msgstr "بيع "
+
+#. module: odex30_account_asset
+#: model_terms:ir.ui.view,arch_db:odex30_account_asset.view_account_asset_form
+msgid "Save as Model"
+msgstr "حفظ كنموذج"
+
+#. module: odex30_account_asset
+#. odoo-python
+#: code:addons/odex30_account_asset/models/account_asset.py:0
+msgid "Save model"
+msgstr "حفظ النموذج "
+
+#. module: odex30_account_asset
+#: model:ir.model.fields,field_description:odex30_account_asset.field_asset_modify__select_invoice_line_id
+msgid "Select Invoice Line"
+msgstr "تحديد بند الفاتورة "
+
+#. module: odex30_account_asset
+#. odoo-python
+#: code:addons/odex30_account_asset/wizard/asset_modify.py:0
+#: model_terms:ir.ui.view,arch_db:odex30_account_asset.asset_modify_form
+msgid "Sell"
+msgstr "بيع "
+
+#. module: odex30_account_asset
+#: model_terms:ir.ui.view,arch_db:odex30_account_asset.view_account_asset_form
+msgid "Set to Draft"
+msgstr "تعيين كمسودة"
+
+#. module: odex30_account_asset
+#: model_terms:ir.ui.view,arch_db:odex30_account_asset.view_account_asset_form
+msgid "Set to Running"
+msgstr "التعيين كجارٍ "
+
+#. module: odex30_account_asset
+#: model_terms:ir.ui.view,arch_db:odex30_account_asset.view_account_asset_search
+msgid "Show all records which has next action date is before today"
+msgstr ""
+"عرض كافة السجلات التي يسبق تاريخ الإجراء التالي فيها تاريخ اليوم الجاري "
+
+#. module: odex30_account_asset
+#. odoo-python
+#: code:addons/odex30_account_asset/models/account_move.py:0
+msgid "Some fields are missing %s"
+msgstr "بعض الحقول مفقودة %s "
+
+#. module: odex30_account_asset
+#. odoo-python
+#: code:addons/odex30_account_asset/models/account_asset.py:0
+msgid "Some required values are missing"
+msgstr "بعض القيم المطلوبة مفقودة "
+
+#. module: odex30_account_asset
+#: model:ir.model.fields,help:odex30_account_asset.field_account_asset__prorata_date
+msgid ""
+"Starting date of the period used in the prorata calculation of the first "
+"depreciation"
+msgstr "تاريخ بداية الفترة المستخدمة في الحساب التناسبي للإهلاك الأول "
+
+#. module: odex30_account_asset
+#: model:ir.model.fields,field_description:odex30_account_asset.field_account_asset__state
+msgid "Status"
+msgstr "الحالة"
+
+#. module: odex30_account_asset
+#: model:ir.model.fields,help:odex30_account_asset.field_account_asset__activity_state
+msgid ""
+"Status based on activities\n"
+"Overdue: Due date is already passed\n"
+"Today: Activity date is today\n"
+"Planned: Future activities."
+msgstr ""
+"الأنشطة المعتمدة على الحالة\n"
+"المتأخرة: تاريخ الاستحقاق مر\n"
+"اليوم: تاريخ النشاط هو اليوم\n"
+"المخطط: الأنشطة المستقبلية."
+
+#. module: odex30_account_asset
+#: model:ir.model.fields.selection,name:odex30_account_asset.selection__account_asset__method__linear
+msgid "Straight Line"
+msgstr "خط مستقيم "
+
+#. module: odex30_account_asset
+#: model:ir.model.fields,help:odex30_account_asset.field_account_asset__book_value
+msgid ""
+"Sum of the depreciable value, the salvage value and the book value of all "
+"value increase items"
+msgstr ""
+"إجمالي قيمة الإهلاك، القيمة المستردة والقيمة الدفترية لكافة عناصر زيادة "
+"القيمة "
+
+#. module: odex30_account_asset
+#: model:ir.model.fields,help:odex30_account_asset.field_account_asset__country_code
+msgid ""
+"The ISO country code in two chars. \n"
+"You can use this field for quick search."
+msgstr ""
+"كود الدولة حسب المعيار الدولي أيزو المكون من حرفين.\n"
+"يمكنك استخدام هذا الحقل لإجراء بحث سريع."
+
+#. module: odex30_account_asset
+#. odoo-python
+#: code:addons/odex30_account_asset/models/account_asset.py:0
+msgid ""
+"The account %(exp_acc)s has been credited by %(exp_delta)s, while the "
+"account %(dep_acc)s has been debited by %(dep_delta)s. This corresponds to "
+"%(move_count)s cancelled %(word)s:"
+msgstr ""
+"الحساب %(exp_acc)s تم الإيداع فيه من قِبَل %(exp_delta)s، بينما الحساب "
+"%(dep_acc)s تم الخصم منه من قِبَل %(dep_delta)s. يتوافق ذلك مع "
+"%(move_count)s الملغية %(word)s: "
+
+#. module: odex30_account_asset
+#: model:ir.model.fields,help:odex30_account_asset.field_account_asset__method_period
+#: model:ir.model.fields,help:odex30_account_asset.field_asset_modify__method_period
+msgid "The amount of time between two depreciations"
+msgstr "المدة الزمنية بين عمليتي إهلاك "
+
+#. module: odex30_account_asset
+#. odoo-python
+#: code:addons/odex30_account_asset/models/account_asset.py:0
+msgid ""
+"The amount you have entered (%(entered_amount)s) does not match the Related "
+"Purchase's value (%(purchase_value)s). Please make sure this is what you "
+"want."
+msgstr ""
+"لا يطابق المبلغ الذي أدخلته (%(entered_amount)s) قيمة الشراء ذات الصلة "
+"(%(purchase_value)s). يرجى التأكد من أن ذلك هو ما تريده. "
+
+#. module: odex30_account_asset
+#: model:ir.model.fields,help:odex30_account_asset.field_asset_modify__asset_id
+msgid "The asset to be modified by this wizard"
+msgstr "الأصل بانتظار التعديل من قِبَل مُعالج الربط "
+
+#. module: odex30_account_asset
+#: model:ir.model.fields,help:odex30_account_asset.field_account_asset__children_ids
+msgid "The children are the gains in value of this asset"
+msgstr "الفروع هي الأرباح بالقيمة لهذا الأصل "
+
+#. module: odex30_account_asset
+#: model:ir.model.fields,help:odex30_account_asset.field_asset_modify__invoice_ids
+msgid ""
+"The disposal invoice is needed in order to generate the closing journal "
+"entry."
+msgstr "فاتورة التصرف ضرورية حتى يتم إنشاء قيد إقفال اليومية "
+
+#. module: odex30_account_asset
+#: model:ir.model.fields,help:odex30_account_asset.field_account_asset__method_number
+msgid "The number of depreciations needed to depreciate your asset"
+msgstr "عدد الإهلاكات المطلوبة لإهلاك الأصل "
+
+#. module: odex30_account_asset
+#. odoo-python
+#: code:addons/odex30_account_asset/models/account_asset.py:0
+msgid "The remaining value on the last depreciation line must be 0"
+msgstr "يجب أن تكون القيمة المتبقية في آخر بند إهلاك تساوي 0 "
+
+#. module: odex30_account_asset
+#: model:ir.model.fields,help:odex30_account_asset.field_asset_modify__invoice_line_ids
+msgid "There are multiple lines that could be the related to this asset"
+msgstr "توجد العديد من البنود التي يمكن أن تكون ذات صلة بهذا الأصل "
+
+#. module: odex30_account_asset
+#. odoo-python
+#: code:addons/odex30_account_asset/wizard/asset_modify.py:0
+msgid ""
+"There are unposted depreciations prior to the selected operation date, "
+"please deal with them first."
+msgstr ""
+"توجد عمليات إهلاك غير مُرحّلة قبل تاريخ التشغيل المحدد. يرجى التعامل معها "
+"أولاً. "
+
+#. module: odex30_account_asset
+#. odoo-javascript
+#: code:addons/odex30_account_asset/static/src/components/move_reversed/move_reversed.xml:0
+msgid "This move has been reversed"
+msgstr "لقد تم عكس هذه الحركة "
+
+#. module: odex30_account_asset
+#: model_terms:ir.ui.view,arch_db:odex30_account_asset.view_account_asset_search
+msgid "Today Activities"
+msgstr "أنشطة اليوم "
+
+#. module: odex30_account_asset
+#. odoo-python
+#: code:addons/odex30_account_asset/models/account_assets_report.py:0
+msgid "Total"
+msgstr "الإجمالي"
+
+#. module: odex30_account_asset
+#: model:ir.model.fields,field_description:odex30_account_asset.field_account_asset__total_depreciable_value
+msgid "Total Depreciable Value"
+msgstr "إجمالي القيمة القابلة للاستهلاك"
+
+#. module: odex30_account_asset
+#. odoo-python
+#: code:addons/odex30_account_asset/models/account_move.py:0
+msgid "Turn as an asset"
+msgstr "التحويل كأصل "
+
+#. module: odex30_account_asset
+#: model:ir.model.fields,field_description:odex30_account_asset.field_account_asset__account_type
+msgid "Type of the account"
+msgstr "نوع الحساب "
+
+#. module: odex30_account_asset
+#: model:ir.model.fields,help:odex30_account_asset.field_account_asset__activity_exception_decoration
+msgid "Type of the exception activity on record."
+msgstr "نوع النشاط المستثنى في السجل. "
+
+#. module: odex30_account_asset
+#: model_terms:ir.ui.view,arch_db:odex30_account_asset.view_account_asset_form
+msgid "Value at Import"
+msgstr "القيمة عند الاستيراد"
+
+#. module: odex30_account_asset
+#. odoo-python
+#: code:addons/odex30_account_asset/wizard/asset_modify.py:0
+msgid "Value decrease for: %(asset)s"
+msgstr "نقصان القيمة لـ : %(asset)s"
+
+#. module: odex30_account_asset
+#. odoo-python
+#: code:addons/odex30_account_asset/wizard/asset_modify.py:0
+msgid "Value increase for: %(asset)s"
+msgstr "زيادة القيمة لـ : %(asset)s"
+
+#. module: odex30_account_asset
+#: model:ir.model.fields,field_description:odex30_account_asset.field_account_asset__warning_count_assets
+msgid "Warning Count Assets"
+msgstr "تحذير عدد الأصول "
+
+#. module: odex30_account_asset
+#. odoo-python
+#: code:addons/odex30_account_asset/models/account_asset.py:0
+msgid "Warning for the Original Value of %s"
+msgstr "تحذير للقيمة الأصلية %s "
+
+#. module: odex30_account_asset
+#: model:ir.model.fields,field_description:odex30_account_asset.field_account_asset__website_message_ids
+msgid "Website Messages"
+msgstr "رسائل الموقع الإلكتروني "
+
+#. module: odex30_account_asset
+#: model:ir.model.fields,help:odex30_account_asset.field_account_asset__website_message_ids
+msgid "Website communication history"
+msgstr "سجل تواصل الموقع الإلكتروني "
+
+#. module: odex30_account_asset
+#: model:ir.model.fields,help:odex30_account_asset.field_account_asset__state
+msgid ""
+"When an asset is created, the status is 'Draft'.\n"
+"If the asset is confirmed, the status goes in 'Running' and the depreciation lines can be posted in the accounting.\n"
+"The 'On Hold' status can be set manually when you want to pause the depreciation of an asset for some time.\n"
+"You can manually close an asset when the depreciation is over.\n"
+"By cancelling an asset, all depreciation entries will be reversed"
+msgstr ""
+"عندما يتم إنشاء أصل، يكون في وضع 'المسودة'.\n"
+"إذا تم تأكيد الأصل، تتغير الحالة إلى 'جاري' ويمكن ترحيل بنود الإهلاك في المحاسبة.\n"
+"يمكن تعيين الحالة 'قيد الانتظار' يدوياً عندما ترغب في إيقاف إهلاك أصل من الأصول بشكل مؤقت لفترة من الزمن.\n"
+"يمكنك إقفال الأصل يدوياً عند انتهاء الإهلاك.\n"
+"عند إلغائك للأصل، سيتم عكس كافة قيود الإهلاك "
+
+#. module: odex30_account_asset
+#: model:ir.model.fields.selection,name:odex30_account_asset.selection__account_asset__method_period__12
+#: model:ir.model.fields.selection,name:odex30_account_asset.selection__asset_modify__method_period__12
+msgid "Years"
+msgstr "سنوات"
+
+#. module: odex30_account_asset
+#. odoo-javascript
+#: code:addons/odex30_account_asset/static/src/views/fields/properties/properties_field.js:0
+msgid "You can add Property fields only on Assets with an Asset Model set."
+msgstr ""
+"لا يمكنك إضافة حقول الخصائص إلا في الأصول التي تحتوي على مجموعة لنموذج "
+"الأصول. "
+
+#. module: odex30_account_asset
+#. odoo-python
+#: code:addons/odex30_account_asset/models/account_move.py:0
+msgid ""
+"You can't post an entry related to a draft asset. Please post the asset "
+"before."
+msgstr ""
+"لا يمكنك ترحيل قيد متعلق بأصل في حالة المسودة. يرحى ترحيل الأصل أولاً. "
+
+#. module: odex30_account_asset
+#. odoo-python
+#: code:addons/odex30_account_asset/wizard/asset_modify.py:0
+msgid "You can't re-evaluate the asset before the lock date."
+msgstr "لا يمكنك إعادة تقييم الأصل قبل تاريخ الإقفال. "
+
+#. module: odex30_account_asset
+#. odoo-python
+#: code:addons/odex30_account_asset/models/account_asset.py:0
+msgid ""
+"You cannot add or remove bills when the asset is already running or closed."
+msgstr ""
+"لا يمكنك إضافة أو إزالة الفواتير عندما يكون الأصل جارياً أو مغلقاً بالفعل. "
+
+#. module: odex30_account_asset
+#. odoo-python
+#: code:addons/odex30_account_asset/models/account_asset.py:0
+msgid "You cannot archive a record that is not closed"
+msgstr "لا يمكنك أرشفة سجل غير مقفل "
+
+#. module: odex30_account_asset
+#. odoo-python
+#: code:addons/odex30_account_asset/models/account_asset.py:0
+#: code:addons/odex30_account_asset/wizard/asset_modify.py:0
+msgid ""
+"You cannot automate the journal entry for an asset that has a running gross "
+"increase. Please use 'Dispose' on the increase(s)."
+msgstr ""
+"لا يمكنك أتمتة قيد اليومية لأصل ذي زيادة إجمالية جارية. الرجاء استخدام "
+"'التصرف' في الزيادة (الزيادات). "
+
+#. module: odex30_account_asset
+#. odoo-python
+#: code:addons/odex30_account_asset/models/account_asset.py:0
+msgid ""
+"You cannot create an asset from lines containing credit and debit on the "
+"account or with a null amount"
+msgstr ""
+"لا يمكنك إنشاء أصل من البنود التي تحتوي على رصيد وخصم في الحساب أو بقيمة "
+"فارغة "
+
+#. module: odex30_account_asset
+#. odoo-python
+#: code:addons/odex30_account_asset/models/account_asset.py:0
+msgid "You cannot delete a document that is in %s state."
+msgstr "لا يمكنك حذف ملف في حالة %s."
+
+#. module: odex30_account_asset
+#. odoo-python
+#: code:addons/odex30_account_asset/models/account_asset.py:0
+msgid ""
+"You cannot delete an asset linked to posted entries.\n"
+"You should either confirm the asset, then, sell or dispose of it, or cancel the linked journal entries."
+msgstr ""
+"لا يمكنك حذف أصل مرتبط بقيود مُرحّلة. \n"
+"عليك إما تأكيد الأصل ثم بيعه أو التخلص منه أو إلغاء قيود اليومية المرتبطة. "
+
+#. module: odex30_account_asset
+#. odoo-python
+#: code:addons/odex30_account_asset/models/account_asset.py:0
+msgid "You cannot dispose of an asset before the lock date."
+msgstr "لا يمكنك التخلص من أصل قبل تاريخ الإقفال. "
+
+#. module: odex30_account_asset
+#. odoo-python
+#: code:addons/odex30_account_asset/models/account_move.py:0
+msgid "You cannot reset to draft an entry related to a posted asset"
+msgstr "لا يمكنك إعادة تعيين قيد مرتبط بأصل مُرحّل إلى حالة المسودة "
+
+#. module: odex30_account_asset
+#. odoo-python
+#: code:addons/odex30_account_asset/wizard/asset_modify.py:0
+msgid "You cannot resume at a date equal to or before the pause date"
+msgstr "لا يمكنك الاستئناف في تاريخ يساوي أو قبل تاريخ الإيقاف المؤقت"
+
+#. module: odex30_account_asset
+#. odoo-python
+#: code:addons/odex30_account_asset/wizard/asset_modify.py:0
+msgid "You cannot select the same account as the Depreciation Account"
+msgstr "لا يمكنك تحديد نفس الحساب كحساب الإهلاك "
+
+#. module: odex30_account_asset
+#: model:account.report.column,name:odex30_account_asset.assets_report_balance
+msgid "book_value"
+msgstr "book_value"
+
+#. module: odex30_account_asset
+#: model:account.report.column,name:odex30_account_asset.assets_report_date_from
+#: model:account.report.column,name:odex30_account_asset.assets_report_depre_date_from
+msgid "date from"
+msgstr "التاريخ من"
+
+#. module: odex30_account_asset
+#: model:account.report.column,name:odex30_account_asset.assets_report_assets_date_to
+#: model:account.report.column,name:odex30_account_asset.assets_report_depre_date_to
+msgid "date to"
+msgstr "التاريخ إلى"
+
+#. module: odex30_account_asset
+#: model_terms:ir.ui.view,arch_db:odex30_account_asset.view_account_asset_form
+msgid "depreciable)"
+msgstr "قابل للإهلاك)"
+
+#. module: odex30_account_asset
+#: model_terms:ir.ui.view,arch_db:odex30_account_asset.view_account_asset_form
+msgid "e.g. Laptop iBook"
+msgstr "مثال: كمبيوتر محمول"
+
+#. module: odex30_account_asset
+#. odoo-python
+#: code:addons/odex30_account_asset/models/account_asset.py:0
+msgid "entries"
+msgstr "القيود"
+
+#. module: odex30_account_asset
+#. odoo-python
+#: code:addons/odex30_account_asset/models/account_asset.py:0
+msgid "entry"
+msgstr "دخول"
+
+#. module: odex30_account_asset
+#. odoo-python
+#: code:addons/odex30_account_asset/wizard/asset_modify.py:0
+msgid "gain"
+msgstr "الأرباح "
+
+#. module: odex30_account_asset
+#. odoo-python
+#: code:addons/odex30_account_asset/wizard/asset_modify.py:0
+msgid "gain/loss"
+msgstr "الأرباح/الخسائر "
+
+#. module: odex30_account_asset
+#. odoo-python
+#: code:addons/odex30_account_asset/wizard/asset_modify.py:0
+msgid "loss"
+msgstr "الخسائر "
diff --git a/dev_odex30_accounting/odex30_account_asset/models/__init__.py b/dev_odex30_accounting/odex30_account_asset/models/__init__.py
new file mode 100644
index 0000000..39358d2
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_asset/models/__init__.py
@@ -0,0 +1,8 @@
+# -*- coding: utf-8 -*-
+
+from . import account
+from . import account_asset
+from . import account_asset_group
+from . import account_assets_report
+from . import account_move
+from . import res_company
diff --git a/dev_odex30_accounting/odex30_account_asset/models/__pycache__/__init__.cpython-311.pyc b/dev_odex30_accounting/odex30_account_asset/models/__pycache__/__init__.cpython-311.pyc
new file mode 100644
index 0000000..252000f
Binary files /dev/null and b/dev_odex30_accounting/odex30_account_asset/models/__pycache__/__init__.cpython-311.pyc differ
diff --git a/dev_odex30_accounting/odex30_account_asset/models/__pycache__/account.cpython-311.pyc b/dev_odex30_accounting/odex30_account_asset/models/__pycache__/account.cpython-311.pyc
new file mode 100644
index 0000000..ca2023e
Binary files /dev/null and b/dev_odex30_accounting/odex30_account_asset/models/__pycache__/account.cpython-311.pyc differ
diff --git a/dev_odex30_accounting/odex30_account_asset/models/__pycache__/account_asset.cpython-311.pyc b/dev_odex30_accounting/odex30_account_asset/models/__pycache__/account_asset.cpython-311.pyc
new file mode 100644
index 0000000..d3a747a
Binary files /dev/null and b/dev_odex30_accounting/odex30_account_asset/models/__pycache__/account_asset.cpython-311.pyc differ
diff --git a/dev_odex30_accounting/odex30_account_asset/models/__pycache__/account_asset_group.cpython-311.pyc b/dev_odex30_accounting/odex30_account_asset/models/__pycache__/account_asset_group.cpython-311.pyc
new file mode 100644
index 0000000..fc49a83
Binary files /dev/null and b/dev_odex30_accounting/odex30_account_asset/models/__pycache__/account_asset_group.cpython-311.pyc differ
diff --git a/dev_odex30_accounting/odex30_account_asset/models/__pycache__/account_assets_report.cpython-311.pyc b/dev_odex30_accounting/odex30_account_asset/models/__pycache__/account_assets_report.cpython-311.pyc
new file mode 100644
index 0000000..f16422f
Binary files /dev/null and b/dev_odex30_accounting/odex30_account_asset/models/__pycache__/account_assets_report.cpython-311.pyc differ
diff --git a/dev_odex30_accounting/odex30_account_asset/models/__pycache__/account_move.cpython-311.pyc b/dev_odex30_accounting/odex30_account_asset/models/__pycache__/account_move.cpython-311.pyc
new file mode 100644
index 0000000..dd1d3af
Binary files /dev/null and b/dev_odex30_accounting/odex30_account_asset/models/__pycache__/account_move.cpython-311.pyc differ
diff --git a/dev_odex30_accounting/odex30_account_asset/models/__pycache__/res_company.cpython-311.pyc b/dev_odex30_accounting/odex30_account_asset/models/__pycache__/res_company.cpython-311.pyc
new file mode 100644
index 0000000..0da5f6b
Binary files /dev/null and b/dev_odex30_accounting/odex30_account_asset/models/__pycache__/res_company.cpython-311.pyc differ
diff --git a/dev_odex30_accounting/odex30_account_asset/models/account.py b/dev_odex30_accounting/odex30_account_asset/models/account.py
new file mode 100644
index 0000000..213d29a
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_asset/models/account.py
@@ -0,0 +1,34 @@
+# -*- coding: utf-8 -*-
+
+from odoo import api, fields, models, _
+
+
+class AccountAccount(models.Model):
+    _inherit = 'account.account'
+
+    asset_model_ids = fields.Many2many(
+        'account.asset',
+        domain=[('state', '=', 'model')],
+        help="An asset wil be created for each asset model when this account is used on a vendor bill or a refund",
+        tracking=True,
+    )
+    create_asset = fields.Selection([('no', 'No'), ('draft', 'Create in draft'), ('validate', 'Create and validate')],
+                                    required=True, default='no', tracking=True)
+    # specify if the account can generate asset depending on it's type. It is used in the account form view
+    can_create_asset = fields.Boolean(compute="_compute_can_create_asset")
+    form_view_ref = fields.Char(compute='_compute_can_create_asset')
+    # decimal quantities are not supported, quantities are rounded to the lower int
+    multiple_assets_per_line = fields.Boolean(string='Multiple Assets per Line', default=False, tracking=True,
+        help="Multiple asset items will be generated depending on the bill line quantity instead of 1 global asset.")
+
+    @api.depends('account_type')
+    def _compute_can_create_asset(self):
+        for record in self:
+            record.can_create_asset = record.account_type in ('asset_fixed', 'asset_non_current')
+            record.form_view_ref = 'odex30_account_asset.view_account_asset_form'
+
+    @api.onchange('create_asset')
+    def _onchange_multiple_assets_per_line(self):
+        for record in self:
+            if record.create_asset == 'no':
+                record.multiple_assets_per_line = False
diff --git a/dev_odex30_accounting/odex30_account_asset/models/account_asset.py b/dev_odex30_accounting/odex30_account_asset/models/account_asset.py
new file mode 100644
index 0000000..8eeff98
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_asset/models/account_asset.py
@@ -0,0 +1,1242 @@
+# -*- coding: utf-8 -*-
+
+import psycopg2
+import datetime
+from dateutil.relativedelta import relativedelta
+from markupsafe import Markup
+from math import copysign
+
+from odoo import api, Command, fields, models, _
+from odoo.exceptions import UserError, ValidationError
+from odoo.tools import float_compare, float_is_zero, formatLang
+from odoo.tools.date_utils import end_of
+
+DAYS_PER_MONTH = 30
+DAYS_PER_YEAR = DAYS_PER_MONTH * 12
+
+class AccountAsset(models.Model):
+    _name = 'account.asset'
+    _description = 'Asset/Revenue Recognition'
+    _inherit = ['mail.thread', 'mail.activity.mixin', 'analytic.mixin']
+
+    depreciation_entries_count = fields.Integer(compute='_compute_counts', string='# Posted Depreciation Entries')
+    gross_increase_count = fields.Integer(compute='_compute_counts', string='# Gross Increases', help="Number of assets made to increase the value of the asset")
+    total_depreciation_entries_count = fields.Integer(compute='_compute_counts', string='# Depreciation Entries', help="Number of depreciation entries (posted or not)")
+
+    name = fields.Char(string='Asset Name', compute='_compute_name', store=True, required=True, readonly=False, tracking=True)
+    company_id = fields.Many2one('res.company', string='Company', required=True, default=lambda self: self.env.company)
+    country_code = fields.Char(related='company_id.account_fiscal_country_id.code')
+    currency_id = fields.Many2one('res.currency', related='company_id.currency_id', store=True)
+    state = fields.Selection(
+        selection=[('model', 'Model'),
+            ('draft', 'Draft'),
+            ('open', 'Running'),
+            ('paused', 'On Hold'),
+            ('close', 'Closed'),
+            ('cancelled', 'Cancelled')],
+        string='Status',
+        copy=False,
+        default='draft',
+        readonly=True,
+        help="When an asset is created, the status is 'Draft'.\n"
+            "If the asset is confirmed, the status goes in 'Running' and the depreciation lines can be posted in the accounting.\n"
+            "The 'On Hold' status can be set manually when you want to pause the depreciation of an asset for some time.\n"
+            "You can manually close an asset when the depreciation is over.\n"
+            "By cancelling an asset, all depreciation entries will be reversed")
+    active = fields.Boolean(default=True)
+
+    # Depreciation params
+    method = fields.Selection(
+        selection=[
+            ('linear', 'Straight Line'),
+            ('degressive', 'Declining'),
+            ('degressive_then_linear', 'Declining then Straight Line')
+        ],
+        string='Method',
+        default='linear',
+        help="Choose the method to use to compute the amount of depreciation lines.\n"
+             "  * Straight Line: Calculated on basis of: Gross Value / Duration\n"
+             "  * Declining: Calculated on basis of: Residual Value * Declining Factor\n"
+             "  * Declining then Straight Line: Like Declining but with a minimum depreciation value equal to the straight line value."
+    )
+    method_number = fields.Integer(string='Duration', default=5, help="The number of depreciations needed to depreciate your asset")
+    method_period = fields.Selection([('1', 'Months'), ('12', 'Years')], string='Number of Months in a Period', default='12',
+        help="The amount of time between two depreciations")
+    method_progress_factor = fields.Float(string='Declining Factor', default=0.3)
+    prorata_computation_type = fields.Selection(
+        selection=[
+            ('none', 'No Prorata'),
+            ('constant_periods', 'Constant Periods'),
+            ('daily_computation', 'Based on days per period'),
+        ],
+        string="Computation",
+        required=True, default='constant_periods',
+    )
+    prorata_date = fields.Date(
+        string='Prorata Date',
+        compute='_compute_prorata_date', store=True, readonly=False,
+        help='Starting date of the period used in the prorata calculation of the first depreciation',
+        required=True, precompute=True,
+        copy=True,
+    )
+    paused_prorata_date = fields.Date(compute='_compute_paused_prorata_date')  # number of days to shift the computation of future deprecations
+    account_asset_id = fields.Many2one(
+        'account.account',
+        string='Fixed Asset Account',
+        compute='_compute_account_asset_id',
+        help="Account used to record the purchase of the asset at its original price.",
+        store=True, readonly=False,
+        check_company=True,
+        domain="[('account_type', '!=', 'off_balance')]",
+    )
+    asset_group_id = fields.Many2one('account.asset.group', string='Asset Group', tracking=True, index=True)
+    account_depreciation_id = fields.Many2one(
+        comodel_name='account.account',
+        string='Depreciation Account',
+        check_company=True,
+        domain="[('account_type', 'not in', ('asset_receivable', 'liability_payable', 'asset_cash', 'liability_credit_card', 'off_balance')), ('deprecated', '=', False)]",
+        help="Account used in the depreciation entries, to decrease the asset value."
+    )
+    account_depreciation_expense_id = fields.Many2one(
+        comodel_name='account.account',
+        string='Expense Account',
+        check_company=True,
+        domain="[('account_type', 'not in', ('asset_receivable', 'liability_payable', 'asset_cash', 'liability_credit_card', 'off_balance')), ('deprecated', '=', False)]",
+        help="Account used in the periodical entries, to record a part of the asset as expense.",
+    )
+    asset_type = fields.Selection(
+        [('sale', 'Sale: Revenue Recognition'), ('purchase', 'Purchase: Asset'), ('expense', 'Deferred Expense')],
+        compute='_compute_asset_type', store=True, index=True)
+
+    @api.depends('original_move_line_ids')
+    @api.depends_context('asset_type')
+    def _compute_asset_type(self):
+        for record in self:
+            if not record.asset_type and 'asset_type' in self.env.context:
+                record.asset_type = self.env.context['asset_type']
+            if not record.asset_type and record.original_move_line_ids:
+                account = record.original_move_line_ids.account_id
+                record.asset_type = account.asset_type
+
+    journal_id = fields.Many2one(
+        'account.journal',
+        string='Journal',
+        check_company=True,
+        domain="[('type', '=', 'general')]",
+        compute='_compute_journal_id', store=True, readonly=False,
+    )
+
+    # Values
+    original_value = fields.Monetary(string="Original Value", compute='_compute_value', store=True, readonly=False)
+    book_value = fields.Monetary(string='Book Value', readonly=True, compute='_compute_book_value', recursive=True, store=True, help="Sum of the depreciable value, the salvage value and the book value of all value increase items")
+    value_residual = fields.Monetary(string='Depreciable Value', compute='_compute_value_residual')
+    salvage_value = fields.Monetary(string='Not Depreciable Value',
+                                    help="It is the amount you plan to have that you cannot depreciate.",
+                                    compute="_compute_salvage_value",
+                                    store=True, readonly=False)
+    salvage_value_pct = fields.Float(string='Not Depreciable Value Percent',
+                                    help="It is the amount you plan to have that you cannot depreciate.")
+    total_depreciable_value = fields.Monetary(compute='_compute_total_depreciable_value')
+    gross_increase_value = fields.Monetary(string="Gross Increase Value", compute="_compute_gross_increase_value", compute_sudo=True)
+    non_deductible_tax_value = fields.Monetary(string="Non Deductible Tax Value", compute="_compute_non_deductible_tax_value", store=True, readonly=True)
+    related_purchase_value = fields.Monetary(compute='_compute_related_purchase_value')
+
+    # Links with entries
+    depreciation_move_ids = fields.One2many('account.move', 'asset_id', string='Depreciation Lines')
+    original_move_line_ids = fields.Many2many('account.move.line', 'asset_move_line_rel', 'asset_id', 'line_id', string='Journal Items', copy=False)
+
+    asset_properties_definition = fields.PropertiesDefinition('Model Properties')
+    asset_properties = fields.Properties('Properties', definition='model_id.asset_properties_definition', copy=True)
+
+    # Dates
+    acquisition_date = fields.Date(
+        compute='_compute_acquisition_date', store=True, precompute=True,
+        readonly=False,
+        copy=True,
+    )
+    disposal_date = fields.Date(readonly=False, compute="_compute_disposal_date", store=True)
+
+    # model-related fields
+    model_id = fields.Many2one('account.asset', string='Model', change_default=True, domain="[('company_id', '=', company_id)]")
+    account_type = fields.Selection(string="Type of the account", related='account_asset_id.account_type')
+    display_account_asset_id = fields.Boolean(compute="_compute_display_account_asset_id")
+
+    # Capital gain
+    parent_id = fields.Many2one('account.asset', help="An asset has a parent when it is the result of gaining value")
+    children_ids = fields.One2many('account.asset', 'parent_id', help="The children are the gains in value of this asset")
+
+    # Adapt for import fields
+    already_depreciated_amount_import = fields.Monetary(
+        help="In case of an import from another software, you might need to use this field to have the right "
+             "depreciation table report. This is the value that was already depreciated with entries not computed from this model",
+    )
+
+    asset_lifetime_days = fields.Float(compute="_compute_lifetime_days", recursive=True)  # total number of days to consider for the computation of an asset depreciation board
+    asset_paused_days = fields.Float(copy=False)
+
+    net_gain_on_sale = fields.Monetary(string="Net gain on sale", help="Net value of gain or loss on sale of an asset", copy=False)
+
+    linked_assets_ids = fields.One2many(
+        comodel_name='account.asset',
+        string="Linked Assets",
+        compute='_compute_linked_assets',
+    )
+    count_linked_asset = fields.Integer(compute="_compute_linked_assets")
+    warning_count_assets = fields.Boolean(compute="_compute_linked_assets")
+
+    # -------------------------------------------------------------------------
+    # COMPUTE METHODS
+    # -------------------------------------------------------------------------
+    @api.depends('company_id')
+    def _compute_journal_id(self):
+        for asset in self:
+            if asset.journal_id and asset.journal_id.company_id == asset.company_id:
+                asset.journal_id = asset.journal_id
+            else:
+                asset.journal_id = self.env['account.journal'].search([
+                    *self.env['account.journal']._check_company_domain(asset.company_id),
+                    ('type', '=', 'general'),
+                ], limit=1)
+
+    @api.depends('salvage_value', 'original_value')
+    def _compute_total_depreciable_value(self):
+        for asset in self:
+            asset.total_depreciable_value = asset.original_value - asset.salvage_value
+
+    @api.depends('original_value', 'model_id')
+    def _compute_salvage_value(self):
+        for asset in self:
+            if asset.model_id.salvage_value_pct != 0.0:
+                asset.salvage_value = asset.original_value * asset.model_id.salvage_value_pct
+
+    @api.depends('depreciation_move_ids.date', 'state')
+    def _compute_disposal_date(self):
+        for asset in self:
+            if asset.state == 'close':
+                dates = asset.depreciation_move_ids.filtered(lambda m: m.date).mapped('date')
+                asset.disposal_date = dates and max(dates)
+            else:
+                asset.disposal_date = False
+
+    @api.depends('original_move_line_ids', 'original_move_line_ids.account_id', 'non_deductible_tax_value')
+    def _compute_value(self):
+        for record in self:
+            if not record.original_move_line_ids:
+                record.original_value = record.original_value or False
+                continue
+            if any(line.move_id.state == 'draft' for line in record.original_move_line_ids):
+                raise UserError(_("All the lines should be posted"))
+            record.original_value = record.related_purchase_value
+            if record.non_deductible_tax_value:
+                record.original_value += record.non_deductible_tax_value
+
+    @api.depends('original_move_line_ids')
+    @api.depends_context('form_view_ref')
+    def _compute_display_account_asset_id(self):
+        for record in self:
+            # Hide the field when creating an asset model from the CoA. (form_view_ref is set from there)
+            model_from_coa = self.env.context.get('form_view_ref') and record.state == 'model'
+            record.display_account_asset_id = not record.original_move_line_ids and not model_from_coa
+
+    @api.depends('account_depreciation_id', 'account_depreciation_expense_id', 'original_move_line_ids')
+    def _compute_account_asset_id(self):
+        for record in self:
+            if record.original_move_line_ids:
+                if len(record.original_move_line_ids.account_id) > 1:
+                    raise UserError(_("All the lines should be from the same account"))
+                record.account_asset_id = record.original_move_line_ids.account_id
+            if not record.account_asset_id:
+                # Only set a default value, do not erase user inputs
+                record._onchange_account_depreciation_id()
+
+    @api.depends('original_move_line_ids')
+    def _compute_analytic_distribution(self):
+        for asset in self:
+            distribution_asset = {}
+            amount_total = sum(asset.original_move_line_ids.mapped("balance"))
+            if not float_is_zero(amount_total, precision_rounding=asset.currency_id.rounding):
+                for line in asset.original_move_line_ids._origin:
+                    if line.analytic_distribution:
+                        for account, distribution in line.analytic_distribution.items():
+                            distribution_asset[account] = distribution_asset.get(account, 0) + distribution * line.balance
+                for account, distribution_amount in distribution_asset.items():
+                    distribution_asset[account] = distribution_amount / amount_total
+            asset.analytic_distribution = distribution_asset if distribution_asset else asset.analytic_distribution
+
+    @api.depends('method_number', 'method_period', 'prorata_computation_type')
+    def _compute_lifetime_days(self):
+        for asset in self:
+            if not asset.parent_id:
+                if asset.prorata_computation_type == 'daily_computation':
+                    asset.asset_lifetime_days = (asset.prorata_date + relativedelta(months=int(asset.method_period) * asset.method_number) - asset.prorata_date).days
+                else:
+                    asset.asset_lifetime_days = int(asset.method_period) * asset.method_number * DAYS_PER_MONTH
+            else:
+                # if it has a parent, we want the asset to only depreciate on the remaining days left of the parent
+                if asset.prorata_computation_type == 'daily_computation':
+                    parent_end_date = asset.parent_id.paused_prorata_date + relativedelta(days=int(asset.parent_id.asset_lifetime_days - 1))
+                else:
+                    parent_end_date = asset.parent_id.paused_prorata_date + relativedelta(
+                        months=int(asset.parent_id.asset_lifetime_days / DAYS_PER_MONTH),
+                        days=int(asset.parent_id.asset_lifetime_days % DAYS_PER_MONTH) - 1
+                    )
+                asset.asset_lifetime_days = asset._get_delta_days(asset.prorata_date, parent_end_date)
+
+    @api.depends('acquisition_date', 'company_id', 'prorata_computation_type')
+    def _compute_prorata_date(self):
+        for asset in self:
+            if asset.prorata_computation_type == 'none' and asset.acquisition_date:
+                fiscalyear_date = asset.company_id.compute_fiscalyear_dates(asset.acquisition_date).get('date_from')
+                asset.prorata_date = fiscalyear_date
+            else:
+                asset.prorata_date = asset.acquisition_date
+
+    @api.depends('prorata_date', 'prorata_computation_type', 'asset_paused_days')
+    def _compute_paused_prorata_date(self):
+        for asset in self:
+            if asset.prorata_computation_type == 'daily_computation':
+                asset.paused_prorata_date = asset.prorata_date + relativedelta(days=asset.asset_paused_days)
+            else:
+                asset.paused_prorata_date = asset.prorata_date + relativedelta(
+                    months=int(asset.asset_paused_days / DAYS_PER_MONTH),
+                    days=asset.asset_paused_days % DAYS_PER_MONTH
+                )
+
+    @api.depends('original_move_line_ids')
+    def _compute_related_purchase_value(self):
+        for asset in self:
+            related_purchase_value = sum(asset.original_move_line_ids.mapped('balance'))
+            if asset.account_asset_id.multiple_assets_per_line and len(asset.original_move_line_ids) == 1:
+                related_purchase_value /= max(1, int(asset.original_move_line_ids.quantity))
+            asset.related_purchase_value = related_purchase_value
+
+    @api.depends('original_move_line_ids')
+    def _compute_acquisition_date(self):
+        for asset in self:
+            asset.acquisition_date = asset.acquisition_date or min(
+                [(aml.invoice_date or aml.date) for aml in asset.original_move_line_ids] + [fields.Date.today()]
+            )
+
+    @api.depends('original_move_line_ids')
+    def _compute_name(self):
+        for record in self:
+            record.name = record.name or (record.original_move_line_ids and record.original_move_line_ids[0].name or '')
+
+    @api.depends(
+        'original_value', 'salvage_value', 'already_depreciated_amount_import',
+        'depreciation_move_ids.state',
+        'depreciation_move_ids.depreciation_value',
+        'depreciation_move_ids.reversal_move_ids'
+    )
+    def _compute_value_residual(self):
+        for record in self:
+            posted_depreciation_moves = record.depreciation_move_ids.filtered(lambda mv: mv.state == 'posted')
+            record.value_residual = (
+                record.original_value
+                - record.salvage_value
+                - record.already_depreciated_amount_import
+                - sum(posted_depreciation_moves.mapped('depreciation_value'))
+            )
+
+    @api.depends('value_residual', 'salvage_value', 'children_ids.book_value')
+    def _compute_book_value(self):
+        for record in self:
+            record.book_value = record.value_residual + record.salvage_value + sum(record.children_ids.mapped('book_value'))
+            if record.state == 'close' and all(move.state == 'posted' for move in record.depreciation_move_ids):
+                record.book_value -= record.salvage_value
+
+    @api.depends('children_ids.original_value')
+    def _compute_gross_increase_value(self):
+        for record in self:
+            record.gross_increase_value = sum(record.children_ids.mapped('original_value'))
+
+    @api.depends('original_move_line_ids')
+    def _compute_non_deductible_tax_value(self):
+        for record in self:
+            record.non_deductible_tax_value = 0.0
+            for line in record.original_move_line_ids:
+                if line.non_deductible_tax_value:
+                    account = line.account_id
+                    auto_create_multi = account.create_asset != 'no' and account.multiple_assets_per_line
+                    quantity = line.quantity if auto_create_multi else 1
+                    converted_non_deductible_tax_value = line.currency_id._convert(line.non_deductible_tax_value / quantity, record.currency_id, record.company_id, line.date)
+                    record.non_deductible_tax_value += record.currency_id.round(converted_non_deductible_tax_value)
+
+    @api.depends('depreciation_move_ids.state', 'parent_id')
+    def _compute_counts(self):
+        depreciation_per_asset = {
+            group.id: count
+            for group, count in self.env['account.move']._read_group(
+                domain=[
+                    ('asset_id', 'in', self.ids),
+                    ('state', '=', 'posted'),
+                ],
+                groupby=['asset_id'],
+                aggregates=['__count'],
+            )
+        }
+        for asset in self:
+            asset.depreciation_entries_count = depreciation_per_asset.get(asset.id, 0)
+            asset.total_depreciation_entries_count = len(asset.depreciation_move_ids)
+            asset.gross_increase_count = len(asset.children_ids)
+
+    @api.depends('original_move_line_ids.asset_ids')
+    def _compute_linked_assets(self):
+        for asset in self:
+            asset.linked_assets_ids = asset.original_move_line_ids.asset_ids - self
+            asset.count_linked_asset = len(asset.linked_assets_ids)
+            confirmed_assets = asset.linked_assets_ids.filtered(lambda x: x.state == "open")
+            # The warning_count_assets is useful to put the smart button in red, in case at least one asset has been confirmed
+            asset.warning_count_assets = len(confirmed_assets) > 0
+
+    # -------------------------------------------------------------------------
+    # ONCHANGE METHODS
+    # -------------------------------------------------------------------------
+    @api.onchange('account_depreciation_id')
+    def _onchange_account_depreciation_id(self):
+        if not self.original_move_line_ids:
+            if not self.account_asset_id and self.state != 'model':
+                # Only set a default value since it is visible in the form
+                self.account_asset_id = self.account_depreciation_id
+
+    @api.onchange('original_value', 'original_move_line_ids')
+    def _display_original_value_warning(self):
+        if self.original_move_line_ids:
+            computed_original_value = self.related_purchase_value + self.non_deductible_tax_value
+            if self.original_value != computed_original_value:
+                warning = {
+                    'title': _("Warning for the Original Value of %s", self.name),
+                    'message': _("The amount you have entered (%(entered_amount)s) does not match the Related Purchase's value (%(purchase_value)s). "
+                                 "Please make sure this is what you want.",
+                                 entered_amount=formatLang(self.env, self.original_value, currency_obj=self.currency_id),
+                                 purchase_value=formatLang(self.env, computed_original_value, currency_obj=self.currency_id))
+                }
+                return {'warning': warning}
+
+    @api.onchange('original_move_line_ids')
+    def _onchange_original_move_line_ids(self):
+        # Force the recompute
+        self.acquisition_date = False
+        self._compute_acquisition_date()
+
+    @api.onchange('account_asset_id')
+    def _onchange_account_asset_id(self):
+        self.account_depreciation_id = self.account_depreciation_id or self.account_asset_id
+
+    @api.onchange('model_id')
+    def _onchange_model_id(self):
+        model = self.model_id
+        if model:
+            self.method = model.method
+            self.method_number = model.method_number
+            self.method_period = model.method_period
+            self.method_progress_factor = model.method_progress_factor
+            self.prorata_computation_type = model.prorata_computation_type
+            self.analytic_distribution = model.analytic_distribution or self.analytic_distribution
+            self.account_asset_id = model.account_asset_id
+            self.account_depreciation_id = model.account_depreciation_id
+            self.account_depreciation_expense_id = model.account_depreciation_expense_id
+            self.journal_id = model.journal_id
+
+    @api.onchange('original_value', 'salvage_value', 'acquisition_date', 'method', 'method_progress_factor', 'method_period',
+                 'method_number', 'prorata_computation_type', 'already_depreciated_amount_import', 'prorata_date',)
+    def onchange_consistent_board(self):
+        """ When changing the fields that should change the values of the entries, we unlink the entries, so the
+         depreciation board is not inconsistent with the values of the asset"""
+        self.write(
+            {'depreciation_move_ids': [Command.set([])]}
+        )
+
+    # -------------------------------------------------------------------------
+    # CONSTRAINT METHODS
+    # -------------------------------------------------------------------------
+    @api.constrains('active', 'state')
+    def _check_active(self):
+        for record in self:
+            if not record.active and record.state not in ('close', 'model'):
+                raise UserError(_('You cannot archive a record that is not closed'))
+
+    @api.constrains('depreciation_move_ids')
+    def _check_depreciations(self):
+        for asset in self:
+            if (
+                asset.state == 'open'
+                and asset.depreciation_move_ids
+                and not asset.currency_id.is_zero(
+                    asset.depreciation_move_ids.sorted(lambda x: (x.date, x.id))[-1].asset_remaining_value
+                )
+            ):
+                raise UserError(_("The remaining value on the last depreciation line must be 0"))
+
+    @api.constrains('original_move_line_ids')
+    def _check_related_purchase(self):
+        for asset in self:
+            if asset.original_move_line_ids and asset.related_purchase_value == 0:
+                raise UserError(_("You cannot create an asset from lines containing credit and debit on the account or with a null amount"))
+            if asset.state not in ('model', 'draft'):
+                raise UserError(_("You cannot add or remove bills when the asset is already running or closed."))
+
+    # -------------------------------------------------------------------------
+    # LOW-LEVEL METHODS
+    # -------------------------------------------------------------------------
+    @api.ondelete(at_uninstall=True)
+    def _unlink_if_model_or_draft(self):
+        for asset in self:
+            if asset.state in ['open', 'paused', 'close']:
+                raise UserError(_(
+                    'You cannot delete a document that is in %s state.',
+                    dict(self._fields['state']._description_selection(self.env)).get(asset.state)
+                ))
+
+            posted_amount = len(asset.depreciation_move_ids.filtered(lambda x: x.state == 'posted'))
+            if posted_amount > 0:
+                raise UserError(_('You cannot delete an asset linked to posted entries.'
+                                  '\nYou should either confirm the asset, then, sell or dispose of it,'
+                                  ' or cancel the linked journal entries.'))
+
+    def unlink(self):
+        for asset in self:
+            for line in asset.original_move_line_ids:
+                if line.name:
+                    body = _('A document linked to %(move_line_name)s has been deleted: %(link)s',
+                        move_line_name=line.name,
+                        link=asset._get_html_link(),
+                    )
+                else:
+                    body = _('A document linked to this move has been deleted: %s',
+                        asset._get_html_link())
+                line.move_id.message_post(body=body)
+                if len(line.move_id.asset_ids) == 1:
+                    line.move_id.asset_move_type = False
+        return super(AccountAsset, self).unlink()
+
+    def copy_data(self, default=None):
+        vals_list = super().copy_data(default)
+        for asset, vals in zip(self, vals_list):
+            if asset.state == 'model':
+                vals['state'] = 'model'
+            vals['name'] = _('%s (copy)', asset.name)
+            vals['account_asset_id'] = asset.account_asset_id.id
+        return vals_list
+
+    @api.model_create_multi
+    def create(self, vals_list):
+        for vals in vals_list:
+            if 'state' in vals and vals['state'] != 'draft' and not (set(vals) - set({'account_depreciation_id', 'account_depreciation_expense_id', 'journal_id'})):
+                raise UserError(_("Some required values are missing"))
+            if self._context.get('default_state') != 'model' and vals.get('state') != 'model':
+                vals['state'] = 'draft'
+        new_recs = super(AccountAsset, self.with_context(mail_create_nolog=True)).create(vals_list)
+        # if original_value is passed in vals, make sure the right value is set (as a different original_value may have been computed by _compute_value())
+        for i, vals in enumerate(vals_list):
+            if 'original_value' in vals:
+                new_recs[i].original_value = vals['original_value']
+        if self.env.context.get('original_asset'):
+            # When original_asset is set, only one asset is created since its from the form view
+            original_asset = self.env['account.asset'].browse(self.env.context.get('original_asset'))
+            original_asset.model_id = new_recs
+        return new_recs
+
+    def write(self, vals):
+        result = super().write(vals)
+        for asset in self:
+            for move in asset.depreciation_move_ids:
+                if move.state == 'draft' and 'analytic_distribution' in vals:
+                    # Only draft entries to avoid recreating all the analytic items
+                    move.line_ids.analytic_distribution = vals['analytic_distribution']
+                lock_date = move.company_id._get_user_fiscal_lock_date(asset.journal_id)
+                if move.date > lock_date:
+                    if 'account_depreciation_id' in vals:
+                        # ::2 (0, 2, 4, ...) because we want all first lines of the depreciation entries, which corresponds to the
+                        # lines with account_depreciation_id as account
+                        move.line_ids[::2].account_id = vals['account_depreciation_id']
+                    if 'account_depreciation_expense_id' in vals:
+                        # 1::2 (1, 3, 5, ...) because we want all second lines of the depreciation entries, which corresponds to the
+                        # lines with account_depreciation_expense_id as account
+                        move.line_ids[1::2].account_id = vals['account_depreciation_expense_id']
+                    if 'journal_id' in vals:
+                        move.journal_id = vals['journal_id']
+        return result
+
+    # -------------------------------------------------------------------------
+    # BOARD COMPUTATION
+    # -------------------------------------------------------------------------
+    def _get_linear_amount(self, days_before_period, days_until_period_end, total_depreciable_value):
+
+        amount_expected_previous_period = total_depreciable_value * days_before_period / self.asset_lifetime_days
+        amount_after_expected = total_depreciable_value * days_until_period_end / self.asset_lifetime_days
+        number_days_for_period = days_until_period_end - days_before_period
+        # In case of a decrease, we need to lower the amount of the depreciation with the amount of the decrease
+        # spread over the remaining lifetime
+        amount_of_decrease_spread_over_period = [
+            number_days_for_period * mv.depreciation_value / (self.asset_lifetime_days - self._get_delta_days(self.paused_prorata_date, mv.asset_depreciation_beginning_date))
+            for mv in self.depreciation_move_ids.filtered(lambda mv: mv.asset_value_change)
+        ]
+        computed_linear_amount = self.currency_id.round(amount_after_expected - self.currency_id.round(amount_expected_previous_period) - sum(amount_of_decrease_spread_over_period))
+        return computed_linear_amount
+
+    def _compute_board_amount(self, residual_amount, period_start_date, period_end_date, days_already_depreciated,
+                              days_left_to_depreciated, residual_declining, start_yearly_period=None, total_lifetime_left=None,
+                              residual_at_compute=None, start_recompute_date=None):
+
+        def _get_max_between_linear_and_degressive(linear_amount, effective_start_date=start_yearly_period):
+            """
+            Compute the degressive amount that could be depreciated and returns the biggest between it and linear_amount
+            The degressive amount corresponds to the difference between what should have been depreciated at the end of
+            the period and the residual_amount (to deal with rounding issues at the end of each month)
+            """
+            fiscalyear_dates = self.company_id.compute_fiscalyear_dates(period_end_date)
+            days_in_fiscalyear = self._get_delta_days(fiscalyear_dates['date_from'], fiscalyear_dates['date_to'])
+
+            degressive_total_value = residual_declining * (1 - self.method_progress_factor * self._get_delta_days(effective_start_date, period_end_date) / days_in_fiscalyear)
+            degressive_amount = residual_amount - degressive_total_value
+            return self._degressive_linear_amount(residual_amount, degressive_amount, linear_amount)
+
+        if float_is_zero(self.asset_lifetime_days, 2) or float_is_zero(residual_amount, 2):
+            return 0, 0
+
+        days_until_period_end = self._get_delta_days(self.paused_prorata_date, period_end_date)
+        days_before_period = self._get_delta_days(self.paused_prorata_date, period_start_date + relativedelta(days=-1))
+        days_before_period = max(days_before_period, 0)  # if disposed before the beginning of the asset for example
+        number_days = days_until_period_end - days_before_period
+
+        # The amount to depreciate are computed by computing how much the asset should be depreciated at the end of the
+        # period minus how much difference it is actually depreciated. It is done that way to avoid having the last move to take
+        # every single small difference that could appear over the time with the classic computation method.
+        if self.method == 'linear':
+            if total_lifetime_left and float_compare(total_lifetime_left, 0, 2) > 0:
+                computed_linear_amount = residual_amount - residual_at_compute * (1 - self._get_delta_days(start_recompute_date, period_end_date) / total_lifetime_left)
+            else:
+                computed_linear_amount = self._get_linear_amount(days_before_period, days_until_period_end, self.total_depreciable_value)
+            amount = min(computed_linear_amount, residual_amount, key=abs)
+        elif self.method == 'degressive':
+            # Linear amount
+            # We first calculate the total linear amount for the period left from the beginning of the year
+            # to get the linear amount for the period in order to avoid big delta at the end of the period
+            effective_start_date = max(start_yearly_period, self.paused_prorata_date) if start_yearly_period else self.paused_prorata_date
+            days_left_from_beginning_of_year = self._get_delta_days(effective_start_date, period_start_date - relativedelta(days=1)) + days_left_to_depreciated
+            expected_remaining_value_with_linear = residual_declining - residual_declining * self._get_delta_days(effective_start_date, period_end_date) / days_left_from_beginning_of_year
+            linear_amount = residual_amount - expected_remaining_value_with_linear
+
+            amount = _get_max_between_linear_and_degressive(linear_amount, effective_start_date)
+        elif self.method == 'degressive_then_linear':
+            if not self.parent_id:
+                linear_amount = self._get_linear_amount(days_before_period, days_until_period_end, self.total_depreciable_value)
+            else:
+                # we want to know the amount before the reeval for the parent so the child can follow the same curve,
+                # so it transitions from degressive to linear at the same moment
+                parent_moves = self.parent_id.depreciation_move_ids.filtered(lambda mv: mv.date <= self.prorata_date).sorted(key=lambda mv: (mv.date, mv.id))
+                parent_cumulative_depreciation = parent_moves[-1].asset_depreciated_value if parent_moves else self.parent_id.already_depreciated_amount_import
+                parent_depreciable_value = parent_moves[-1].asset_remaining_value if parent_moves else self.parent_id.total_depreciable_value
+                if self.currency_id.is_zero(parent_depreciable_value):
+                    linear_amount = self._get_linear_amount(days_before_period, days_until_period_end, self.total_depreciable_value)
+                else:
+                    # To have the same curve as the parent, we need to have the equivalent amount before the reeval.
+                    # The child's depreciable value corresponds to the amount that is left to depreciate for the parent.
+                    # So, we use the proportion between them to compute the equivalent child's total to depreciate.
+                    # We use it then with the duration of the parent to compute the depreciation amount
+                    depreciable_value = self.total_depreciable_value * (1 + parent_cumulative_depreciation/parent_depreciable_value)
+                    linear_amount = self._get_linear_amount(days_before_period, days_until_period_end, depreciable_value) * self.asset_lifetime_days / self.parent_id.asset_lifetime_days
+
+            amount = _get_max_between_linear_and_degressive(linear_amount)
+
+        amount = max(amount, 0) if self.currency_id.compare_amounts(residual_amount, 0) > 0 else min(amount, 0)
+        amount = self._get_depreciation_amount_end_of_lifetime(residual_amount, amount, days_until_period_end)
+
+        return number_days, self.currency_id.round(amount)
+
+    def compute_depreciation_board(self, date=False):
+        # Need to unlink draft moves before adding new ones because if we create new moves before, it will cause an error
+        self.depreciation_move_ids.filtered(lambda mv: mv.state == 'draft' and (mv.date >= date if date else True)).unlink()
+
+        new_depreciation_moves_data = []
+        for asset in self:
+            new_depreciation_moves_data.extend(asset._recompute_board(date))
+
+        new_depreciation_moves = self.env['account.move'].create(new_depreciation_moves_data)
+        new_depreciation_moves_to_post = new_depreciation_moves.filtered(lambda move: move.asset_id.state == 'open')
+        # In case of the asset is in running mode, we post in the past and set to auto post move in the future
+        new_depreciation_moves_to_post._post()
+
+    def _recompute_board(self, start_depreciation_date=False):
+        self.ensure_one()
+        # All depreciation moves that are posted
+        posted_depreciation_move_ids = self.depreciation_move_ids.filtered(
+            lambda mv: mv.state == 'posted' and not mv.asset_value_change
+        ).sorted(key=lambda mv: (mv.date, mv.id))
+
+        imported_amount = self.already_depreciated_amount_import
+        residual_amount = self.value_residual - sum(self.depreciation_move_ids.filtered(lambda mv: mv.state == 'draft').mapped('depreciation_value'))
+        if not posted_depreciation_move_ids:
+            residual_amount += imported_amount
+        residual_declining = residual_at_compute = residual_amount
+        # start_yearly_period is needed in the 'degressive' and 'degressive_then_linear' methods to compute the amount when the period is monthly
+        start_recompute_date = start_depreciation_date = start_yearly_period = start_depreciation_date or self.paused_prorata_date
+
+        last_day_asset = self._get_last_day_asset()
+        final_depreciation_date = self._get_end_period_date(last_day_asset)
+        total_lifetime_left = self._get_delta_days(start_depreciation_date, last_day_asset)
+
+        depreciation_move_values = []
+        if not float_is_zero(self.value_residual, precision_rounding=self.currency_id.rounding):
+            while not self.currency_id.is_zero(residual_amount) and start_depreciation_date < final_depreciation_date:
+                period_end_depreciation_date = self._get_end_period_date(start_depreciation_date)
+                period_end_fiscalyear_date = self.company_id.compute_fiscalyear_dates(period_end_depreciation_date).get('date_to')
+                lifetime_left = self._get_delta_days(start_depreciation_date, last_day_asset)
+
+                days, amount = self._compute_board_amount(residual_amount, start_depreciation_date, period_end_depreciation_date, False, lifetime_left, residual_declining, start_yearly_period, total_lifetime_left, residual_at_compute, start_recompute_date)
+                residual_amount -= amount
+
+                if not posted_depreciation_move_ids:
+                    # self.already_depreciated_amount_import management.
+                    # Subtracts the imported amount from the first depreciation moves until we reach it
+                    # (might skip several depreciation entries)
+                    if abs(imported_amount) <= abs(amount):
+                        amount -= imported_amount
+                        imported_amount = 0
+                    else:
+                        imported_amount -= amount
+                        amount = 0
+
+                if self.method == 'degressive_then_linear' and final_depreciation_date < period_end_depreciation_date:
+                    period_end_depreciation_date = final_depreciation_date
+
+                if not float_is_zero(amount, precision_rounding=self.currency_id.rounding):
+                    # For deferred revenues, we should invert the amounts.
+                    depreciation_move_values.append(self.env['account.move']._prepare_move_for_asset_depreciation({
+                        'amount': amount,
+                        'asset_id': self,
+                        'depreciation_beginning_date': start_depreciation_date,
+                        'date': period_end_depreciation_date,
+                        'asset_number_days': days,
+                    }))
+
+                if period_end_depreciation_date == period_end_fiscalyear_date:
+                    start_yearly_period = self.company_id.compute_fiscalyear_dates(period_end_depreciation_date).get('date_from') + relativedelta(years=1)
+                    residual_declining = residual_amount
+
+                start_depreciation_date = period_end_depreciation_date + relativedelta(days=1)
+
+        return depreciation_move_values
+
+    def _get_end_period_date(self, start_depreciation_date):
+        """Get the end of the period in which the depreciation is posted.
+
+        Can be the end of the month if the asset is depreciated monthly, or the end of the fiscal year is it is depreciated yearly.
+        """
+        self.ensure_one()
+        fiscalyear_date = self.company_id.compute_fiscalyear_dates(start_depreciation_date).get('date_to')
+        period_end_depreciation_date = fiscalyear_date if start_depreciation_date <= fiscalyear_date else fiscalyear_date + relativedelta(years=1)
+
+        if self.method_period == '1':  # If method period is set to monthly computation
+            max_day_in_month = end_of(datetime.date(start_depreciation_date.year, start_depreciation_date.month, 1), 'month').day
+            period_end_depreciation_date = min(start_depreciation_date.replace(day=max_day_in_month), period_end_depreciation_date)
+        return period_end_depreciation_date
+
+    def _get_delta_days(self, start_date, end_date):
+        """Compute how many days there are between 2 dates.
+
+        The computation is different if the asset is in daily_computation or not.
+        """
+        self.ensure_one()
+        if self.prorata_computation_type == 'daily_computation':
+            # Compute how many days there are between 2 dates using a daily_computation method
+            return (end_date - start_date).days + 1
+        else:
+            # Compute how many days there are between 2 dates counting 30 days per month
+            # Get how many days there are in the start date month
+            start_date_days_month = end_of(start_date, 'month').day
+            # Get how many days there are in the start date month (e.g: June 20th: (30 * (30 - 20 + 1)) / 30 = 11)
+            start_prorata = (start_date_days_month - start_date.day + 1) / start_date_days_month
+            # Get how many days there are in the end date month (e.g: You're the August 14th: (14 * 30) / 31 = 13.548387096774194)
+            end_prorata = end_date.day / end_of(end_date, 'month').day
+            # Compute how many days there are between these 2 dates
+            # e.g: 13.548387096774194 + 11 + 360 * (2020 - 2020) + 30 * (8 - 6 - 1) = 24.548387096774194 + 360 * 0 + 30 * 1 = 54.548387096774194 day
+            return sum((
+                start_prorata * DAYS_PER_MONTH,
+                end_prorata * DAYS_PER_MONTH,
+                (end_date.year - start_date.year) * DAYS_PER_YEAR,
+                (end_date.month - start_date.month - 1) * DAYS_PER_MONTH
+            ))
+
+    def _get_last_day_asset(self):
+        this = self.parent_id if self.parent_id else self
+        return this.paused_prorata_date + relativedelta(months=int(this.method_period) * this.method_number, days=-1)
+
+    # -------------------------------------------------------------------------
+    # PUBLIC ACTIONS
+    # -------------------------------------------------------------------------
+
+    def action_open_linked_assets(self):
+        action = self.linked_assets_ids.open_asset(['list', 'form'])
+        action.get('context', {}).update({
+            'from_linked_assets': 0,
+        })
+        return action
+
+    def action_asset_modify(self):
+        """ Returns an action opening the asset modification wizard.
+        """
+        self.ensure_one()
+        new_wizard = self.env['asset.modify'].create({
+            'asset_id': self.id,
+            'modify_action': 'resume' if self.env.context.get('resume_after_pause') else 'dispose',
+        })
+        return {
+            'name': _('Modify Asset'),
+            'view_mode': 'form',
+            'res_model': 'asset.modify',
+            'type': 'ir.actions.act_window',
+            'target': 'new',
+            'res_id': new_wizard.id,
+            'context': self.env.context,
+        }
+
+    def action_save_model(self):
+        return {
+            'name': _('Save model'),
+            'views': [[self.env.ref('odex30_account_asset.view_account_asset_form').id, "form"]],
+            'res_model': 'account.asset',
+            'type': 'ir.actions.act_window',
+            'context': {
+                'default_state': 'model',
+                'default_account_asset_id': self.account_asset_id.id,
+                'default_account_depreciation_id': self.account_depreciation_id.id,
+                'default_account_depreciation_expense_id': self.account_depreciation_expense_id.id,
+                'default_journal_id': self.journal_id.id,
+                'default_method': self.method,
+                'default_method_number': self.method_number,
+                'default_method_period': self.method_period,
+                'default_method_progress_factor': self.method_progress_factor,
+                'default_prorata_date': self.prorata_date,
+                'default_prorata_computation_type': self.prorata_computation_type,
+                'default_analytic_distribution': self.analytic_distribution,
+                'original_asset': self.id,
+            }
+        }
+
+    def open_entries(self):
+        return {
+            'name': _('Journal Entries'),
+            'view_mode': 'list,form',
+            'res_model': 'account.move',
+            'search_view_id': [self.env.ref('account.view_account_move_filter').id, 'search'],
+            'views': [(self.env.ref('account.view_move_tree').id, 'list'), (False, 'form')],
+            'type': 'ir.actions.act_window',
+            'domain': [('id', 'in', self.depreciation_move_ids.ids)],
+            'context': dict(self._context, create=False),
+        }
+
+    def open_related_entries(self):
+        return {
+            'name': _('Journal Items'),
+            'view_mode': 'list,form',
+            'res_model': 'account.move.line',
+            'view_id': False,
+            'type': 'ir.actions.act_window',
+            'domain': [('id', 'in', self.original_move_line_ids.ids)],
+        }
+
+    def open_increase(self):
+        result = {
+            'name': _('Gross Increase'),
+            'view_mode': 'list,form',
+            'res_model': 'account.asset',
+            'context': {**self.env.context, 'create': False},
+            'view_id': False,
+            'type': 'ir.actions.act_window',
+            'domain': [('id', 'in', self.children_ids.ids)],
+            'views': [(False, 'list'), (False, 'form')],
+        }
+        if len(self.children_ids) == 1:
+            result['views'] = [(False, 'form')]
+            result['res_id'] = self.children_ids.id
+        return result
+
+    def open_parent_id(self):
+        result = {
+            'name': _('Parent Asset'),
+            'view_mode': 'form',
+            'res_model': 'account.asset',
+            'type': 'ir.actions.act_window',
+            'res_id': self.parent_id.id,
+            'views': [(False, 'form')],
+        }
+        return result
+
+    def validate(self):
+        fields = [
+            'method',
+            'method_number',
+            'method_period',
+            'method_progress_factor',
+            'salvage_value',
+            'original_move_line_ids',
+        ]
+        ref_tracked_fields = self.env['account.asset'].fields_get(fields)
+        self.write({'state': 'open'})
+        for asset in self:
+            tracked_fields = ref_tracked_fields.copy()
+            if asset.method == 'linear':
+                del tracked_fields['method_progress_factor']
+            dummy, tracking_value_ids = asset._mail_track(tracked_fields, dict.fromkeys(fields))
+            asset_name = (_('Asset created'), _('An asset has been created for this move:'))
+            msg = asset_name[1] + ' ' + asset._get_html_link()
+            asset.message_post(body=asset_name[0], tracking_value_ids=tracking_value_ids)
+            for move_id in asset.original_move_line_ids.mapped('move_id'):
+                move_id.message_post(body=msg)
+            try:
+                if not asset.depreciation_move_ids:
+                    asset.compute_depreciation_board()
+                asset._check_depreciations()
+                asset.depreciation_move_ids.filtered(lambda move: move.state != 'posted')._post()
+            except psycopg2.errors.CheckViolation:
+                raise ValidationError(_("Atleast one asset (%s) couldn't be set as running because it lacks any required information", asset.name))
+
+            if asset.account_asset_id.create_asset == 'no':
+                asset._post_non_deductible_tax_value()
+
+    def set_to_close(self, invoice_line_ids, date=None, message=None):
+        self.ensure_one()
+        disposal_date = date or fields.Date.today()
+        if disposal_date <= self.company_id._get_user_fiscal_lock_date(self.journal_id):
+            raise UserError(_("You cannot dispose of an asset before the lock date."))
+        if invoice_line_ids and self.children_ids.filtered(lambda a: a.state in ('draft', 'open') or a.value_residual > 0):
+            raise UserError(_("You cannot automate the journal entry for an asset that has a running gross increase. Please use 'Dispose' on the increase(s)."))
+        full_asset = self + self.children_ids
+        full_asset.state = 'close'
+        move_ids = full_asset._get_disposal_moves([invoice_line_ids] * len(full_asset), disposal_date)
+        for asset in full_asset:
+            asset.message_post(body=
+                _('Asset sold. %s', message if message else "")
+                if invoice_line_ids else
+                _('Asset disposed. %s', message if message else "")
+            )
+
+        selling_price = abs(sum(invoice_line.balance for invoice_line in invoice_line_ids))
+        self.net_gain_on_sale = self.currency_id.round(selling_price - self.book_value)
+
+        if move_ids:
+            name = _('Disposal Move')
+            view_mode = 'form'
+            if len(move_ids) > 1:
+                name = _('Disposal Moves')
+                view_mode = 'list,form'
+            return {
+                'name': name,
+                'view_mode': view_mode,
+                'res_model': 'account.move',
+                'type': 'ir.actions.act_window',
+                'target': 'current',
+                'res_id': move_ids[0],
+                'domain': [('id', 'in', move_ids)]
+            }
+
+    def set_to_cancelled(self):
+        for asset in self:
+            posted_moves = asset.depreciation_move_ids.filtered(lambda m: (
+                not m.reversal_move_ids
+                and not m.reversed_entry_id
+                and m.state == 'posted'
+            ))
+            if posted_moves:
+                depreciation_change = sum(posted_moves.line_ids.mapped(
+                    lambda l: l.debit if l.account_id == asset.account_depreciation_expense_id else 0.0
+                ))
+                acc_depreciation_change = sum(posted_moves.line_ids.mapped(
+                    lambda l: l.credit if l.account_id == asset.account_depreciation_id else 0.0
+                ))
+                entries = Markup('<br>').join(posted_moves.sorted('date').mapped(lambda m:
+                    f'{m.ref} - {m.date} - '
+                    f'{formatLang(self.env, m.depreciation_value, currency_obj=m.currency_id)} - '
+                    f'{m.name}'
+                ))
+                asset._cancel_future_moves(datetime.date.min)
+                msg = _('Asset Cancelled') + Markup('<br>') + \
+                      _('The account %(exp_acc)s has been credited by %(exp_delta)s, '
+                        'while the account %(dep_acc)s has been debited by %(dep_delta)s. '
+                        'This corresponds to %(move_count)s cancelled %(word)s:',
+                        exp_acc=asset.account_depreciation_expense_id.display_name,
+                        exp_delta=formatLang(self.env, depreciation_change, currency_obj=asset.currency_id),
+                        dep_acc=asset.account_depreciation_id.display_name,
+                        dep_delta=formatLang(self.env, acc_depreciation_change, currency_obj=asset.currency_id),
+                        move_count=len(posted_moves),
+                        word=_('entries') if len(posted_moves) > 1 else _('entry'),
+                    ) + Markup('<br>') + entries
+                asset._message_log(body=msg)
+            else:
+                asset._message_log(body=_('Asset Cancelled'))
+            asset.depreciation_move_ids.filtered(lambda m: m.state == 'draft').with_context(force_delete=True).unlink()
+            asset.asset_paused_days = 0
+            asset.write({'state': 'cancelled'})
+
+    def set_to_draft(self):
+        self.write({'state': 'draft'})
+
+    def set_to_running(self):
+        if self.depreciation_move_ids and not max(self.depreciation_move_ids, key=lambda m: (m.date, m.id)).asset_remaining_value == 0:
+            self.env['asset.modify'].create({'asset_id': self.id, 'name': _('Reset to running')}).modify()
+        self.write({
+            'state': 'open',
+            'net_gain_on_sale': 0
+        })
+
+    def resume_after_pause(self):
+        """ Sets an asset in 'paused' state back to 'open'.
+        A Depreciation line is created automatically to remove  from the
+        depreciation amount the proportion of time spent
+        in pause in the current period.
+        """
+        self.ensure_one()
+        return self.with_context(resume_after_pause=True).action_asset_modify()
+
+    def pause(self, pause_date, message=None):
+        """ Sets an 'open' asset in 'paused' state, generating first a depreciation
+        line corresponding to the ratio of time spent within the current depreciation
+        period before putting the asset in pause. This line and all the previous
+        unposted ones are then posted.
+        """
+        self.ensure_one()
+        self._create_move_before_date(pause_date)
+        self.write({'state': 'paused'})
+        self.message_post(body=_("Asset paused. %s", message if message else ""))
+
+    def open_asset(self, view_mode):
+        if len(self) == 1:
+            view_mode = ['form']
+        views = [v for v in [(False, 'list'), (False, 'form')] if v[1] in view_mode]
+        ctx = dict(self._context)
+        ctx.pop('default_move_type', None)
+        action = {
+            'name': _('Asset'),
+            'view_mode': ','.join(view_mode),
+            'type': 'ir.actions.act_window',
+            'res_id': self.id if 'list' not in view_mode else False,
+            'res_model': 'account.asset',
+            'views': views,
+            'domain': [('id', 'in', self.ids)],
+            'context': ctx
+        }
+        return action
+
+    # -------------------------------------------------------------------------
+    # HELPER METHODS
+    # -------------------------------------------------------------------------
+    def _insert_depreciation_line(self, amount, beginning_depreciation_date, depreciation_date, days_depreciated):
+        """ Inserts a new line in the depreciation board, shifting the sequence of
+        all the following lines from one unit.
+        :param amount:          The depreciation amount of the new line.
+        :param label:           The name to give to the new line.
+        :param date:            The date to give to the new line.
+        """
+        self.ensure_one()
+        AccountMove = self.env['account.move']
+
+        return AccountMove.create(AccountMove._prepare_move_for_asset_depreciation({
+            'amount': amount,
+            'asset_id': self,
+            'depreciation_beginning_date': beginning_depreciation_date,
+            'date': depreciation_date,
+            'asset_number_days': days_depreciated,
+        }))
+
+    def _post_non_deductible_tax_value(self):
+        # If the asset has a non-deductible tax, the value is posted in the chatter to explain why
+        # the original value does not match the related purchase(s).
+        if self.non_deductible_tax_value:
+            currency = self.env.company.currency_id
+            msg = _('A non deductible tax value of %(tax_value)s was added to %(name)s\'s initial value of %(purchase_value)s',
+                    tax_value=formatLang(self.env, self.non_deductible_tax_value, currency_obj=currency),
+                    name=self.name,
+                    purchase_value=formatLang(self.env, self.related_purchase_value, currency_obj=currency))
+            self.message_post(body=msg)
+
+    def _create_move_before_date(self, date):
+        """Cancel all the moves after the given date and replace them by a new one.
+
+        The new depreciation/move is depreciating the residual value.
+        """
+        all_move_dates_before_date = (self.depreciation_move_ids.filtered(
+            lambda x:
+            x.date <= date
+            and not x.reversal_move_ids
+            and not x.reversed_entry_id
+            and x.state == 'posted'
+        ).sorted('date')).mapped('date')
+
+        beginning_fiscal_year = self.company_id.compute_fiscalyear_dates(date).get('date_from') if self.method != 'linear' else False
+        first_fiscalyear_move = self.env['account.move']
+        if all_move_dates_before_date:
+            last_move_date_not_reversed = max(all_move_dates_before_date)
+            # We don't know when begins the period that the move is supposed to cover
+            # So, we use the earliest beginning of a move that comes after the last move not cancelled
+            future_moves_beginning_date = self.depreciation_move_ids.filtered(
+                lambda m: m.date > last_move_date_not_reversed and (
+                    not m.reversal_move_ids and not m.reversed_entry_id and m.state == 'posted'
+                    or m.state == 'draft'
+                )
+            ).mapped('asset_depreciation_beginning_date')
+            beginning_depreciation_date = min(future_moves_beginning_date) if future_moves_beginning_date else self.paused_prorata_date
+
+            if self.method != 'linear':
+                # In degressive and degressive_then_linear, we need to find the first move of the fiscal year that comes after the last move not cancelled
+                # in order to correctly compute the moves just before and after the pause date
+                first_moves = self.depreciation_move_ids.filtered(
+                    lambda m: m.asset_depreciation_beginning_date >= beginning_fiscal_year and (
+                        not m.reversal_move_ids and not m.reversed_entry_id and m.state == 'posted'
+                        or m.state == 'draft'
+                    )
+                ).sorted(lambda m: (m.asset_depreciation_beginning_date, m.id))
+                first_fiscalyear_move = next(iter(first_moves), first_fiscalyear_move)
+        else:
+            beginning_depreciation_date = self.paused_prorata_date
+
+        residual_declining = first_fiscalyear_move.asset_remaining_value + first_fiscalyear_move.depreciation_value
+        self._cancel_future_moves(date)
+
+        imported_amount = self.already_depreciated_amount_import if not all_move_dates_before_date else 0
+        value_residual = self.value_residual + self.already_depreciated_amount_import if not all_move_dates_before_date else self.value_residual
+        residual_declining = residual_declining or value_residual
+
+        last_day_asset = self._get_last_day_asset()
+        lifetime_left = self._get_delta_days(beginning_depreciation_date, last_day_asset)
+        days_depreciated, amount = self._compute_board_amount(self.value_residual, beginning_depreciation_date, date, False, lifetime_left, residual_declining, beginning_fiscal_year, lifetime_left, value_residual, beginning_depreciation_date)
+
+        if abs(imported_amount) <= abs(amount):
+            amount -= imported_amount
+        if not float_is_zero(amount, precision_rounding=self.currency_id.rounding):
+            new_line = self._insert_depreciation_line(amount, beginning_depreciation_date, date, days_depreciated)
+            new_line._post()
+
+    def _cancel_future_moves(self, date):
+        """Cancel all the depreciation entries after the date given as parameter.
+
+        When possible, it will reset those to draft before unlinking them, reverse them otherwise.
+
+        :param date: date after which the moves are deleted/reversed
+        """
+        for asset in self:
+            obsolete_moves = asset.depreciation_move_ids.filtered(lambda m: m.state == 'draft' or (
+                not m.reversal_move_ids
+                and not m.reversed_entry_id
+                and m.state == 'posted'
+                and m.date > date
+            ))
+            obsolete_moves._unlink_or_reverse()
+
+    def _get_disposal_moves(self, invoice_lines_list, disposal_date):
+        """Create the move for the disposal of an asset.
+
+        :param invoice_lines_list: list of recordset of `account.move.line`
+            Each element of the list corresponds to one record of `self`
+            These lines are used to generate the disposal move
+        :param disposal_date: the date of the disposal
+        """
+        def get_line(name, asset, amount, account):
+            return (0, 0, {
+                'name': name,
+                'account_id': account.id,
+                'balance': -amount,
+                'analytic_distribution': analytic_distribution,
+                'currency_id': asset.currency_id.id,
+                'amount_currency': -asset.company_id.currency_id._convert(
+                    from_amount=amount,
+                    to_currency=asset.currency_id,
+                    company=asset.company_id,
+                    date=disposal_date,
+                )
+            })
+
+        move_ids = []
+        assert len(self) == len(invoice_lines_list)
+        for asset, invoice_line_ids in zip(self, invoice_lines_list):
+            asset._create_move_before_date(disposal_date)
+
+            analytic_distribution = asset.analytic_distribution
+
+            dict_invoice = {}
+            invoice_amount = 0
+
+            initial_amount = asset.original_value
+            initial_account = asset.original_move_line_ids.account_id if len(asset.original_move_line_ids.account_id) == 1 else asset.account_asset_id
+
+            all_lines_before_disposal = asset.depreciation_move_ids.filtered(lambda x: x.date <= disposal_date)
+            depreciated_amount = asset.currency_id.round(copysign(
+                sum(all_lines_before_disposal.mapped('depreciation_value')) + asset.already_depreciated_amount_import,
+                -initial_amount,
+            ))
+            depreciation_account = asset.account_depreciation_id
+            for invoice_line in invoice_line_ids:
+                dict_invoice[invoice_line.account_id] = copysign(invoice_line.balance, -initial_amount) + dict_invoice.get(invoice_line.account_id, 0)
+                invoice_amount += copysign(invoice_line.balance, -initial_amount)
+            list_accounts = [(amount, account) for account, amount in dict_invoice.items()]
+            difference = -initial_amount - depreciated_amount - invoice_amount
+            difference_account = asset.company_id.gain_account_id if difference > 0 else asset.company_id.loss_account_id
+            line_datas = [(initial_amount, initial_account), (depreciated_amount, depreciation_account)] + list_accounts + [(difference, difference_account)]
+            name = _("%(asset)s: Disposal", asset=asset.name) if not invoice_line_ids else _("%(asset)s: Sale", asset=asset.name)
+            vals = {
+                'asset_id': asset.id,
+                'ref': name,
+                'asset_depreciation_beginning_date': disposal_date,
+                'date': disposal_date,
+                'journal_id': asset.journal_id.id,
+                'move_type': 'entry',
+                'asset_move_type': 'disposal' if not invoice_line_ids else 'sale',
+                'line_ids': [get_line(name, asset, amount, account) for amount, account in line_datas if account],
+            }
+            asset.write({'depreciation_move_ids': [(0, 0, vals)]})
+            move_ids += self.env['account.move'].search([('asset_id', '=', asset.id), ('state', '=', 'draft')]).ids
+
+        return move_ids
+
+    def _degressive_linear_amount(self, residual_amount, degressive_amount, linear_amount):
+        if self.currency_id.compare_amounts(residual_amount, 0) > 0:
+            return max(degressive_amount, linear_amount)
+        else:
+            return min(degressive_amount, linear_amount)
+
+    def _get_depreciation_amount_end_of_lifetime(self, residual_amount, amount, days_until_period_end):
+        if abs(residual_amount) < abs(amount) or days_until_period_end >= self.asset_lifetime_days:
+            # If the residual amount is less than the computed amount, we keep the residual amount
+            # If total_days is greater or equals to asset lifetime days, it should mean that
+            # the asset will finish in this period and the value for this period is equal to the residual amount.
+            amount = residual_amount
+        return amount
+
+    def _get_own_book_value(self, date=None):
+        self.ensure_one()
+        return (self._get_residual_value_at_date(date) if date else self.value_residual) + self.salvage_value
+
+    def _get_residual_value_at_date(self, date):
+        """ Computes the theoretical value of the asset at a specific date.
+
+            :param date: the date at which we want the asset's value
+            :return: the value at date of the asset without taking reverse entries into account (as it should be in a "normal" flow of the asset)
+        """
+        current_and_previous_depreciation = self.depreciation_move_ids.filtered(
+            lambda mv:
+            mv.asset_depreciation_beginning_date < date
+            and not mv.reversed_entry_id
+        ).sorted('asset_depreciation_beginning_date', reverse=True)
+        if not current_and_previous_depreciation:
+            return 0
+
+        if len(current_and_previous_depreciation) > 1:
+            previous_value_residual = current_and_previous_depreciation[1].asset_remaining_value
+        else:
+            # If there is only one depreciation, we take the original depreciation value
+            previous_value_residual = self.original_value - self.salvage_value - self.already_depreciated_amount_import
+
+        # We compare the amount_residuals of the depreciations before and during the given date.
+        # It applies the ratio of the period (to-given-date / total-days-of-the-period) to the amount of the depreciation.
+        cur_depr_end_date = self._get_end_period_date(date)
+        current_depreciation = current_and_previous_depreciation[0]
+        cur_depr_beg_date = current_depreciation.asset_depreciation_beginning_date
+
+        rate = self._get_delta_days(cur_depr_beg_date, date) / self._get_delta_days(cur_depr_beg_date, cur_depr_end_date)
+        lost_value_at_date = (previous_value_residual - current_depreciation.asset_remaining_value) * rate
+        residual_value_at_date = self.currency_id.round(previous_value_residual - lost_value_at_date)
+        if self.currency_id.compare_amounts(self.original_value, 0) > 0:
+            return max(residual_value_at_date, 0)
+        else:
+            return min(residual_value_at_date, 0)
diff --git a/dev_odex30_accounting/odex30_account_asset/models/account_asset_group.py b/dev_odex30_accounting/odex30_account_asset/models/account_asset_group.py
new file mode 100644
index 0000000..71dc28b
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_asset/models/account_asset_group.py
@@ -0,0 +1,37 @@
+from odoo import fields, models, api
+
+
+class AccountAssetGroup(models.Model):
+    _name = 'account.asset.group'
+    _description = 'Asset Group'
+    _order = 'name'
+
+    name = fields.Char("Name", index="trigram")
+    company_id = fields.Many2one('res.company', string='Company', default=lambda self: self.env.company)
+    linked_asset_ids = fields.One2many('account.asset', 'asset_group_id', string='Related Assets')
+    count_linked_assets = fields.Integer(compute='_compute_count_linked_asset')
+
+    @api.depends('linked_asset_ids')
+    def _compute_count_linked_asset(self):
+        count_per_asset_group = {
+            asset_group.id: count
+            for asset_group, count in self.env['account.asset']._read_group(
+                domain=[
+                    ('asset_group_id', 'in', self.ids),
+                ],
+                groupby=['asset_group_id'],
+                aggregates=['__count'],
+            )
+        }
+        for asset_group in self:
+            asset_group.count_linked_assets = count_per_asset_group.get(asset_group.id, 0)
+
+    def action_open_linked_assets(self):
+        self.ensure_one()
+        return {
+            'name': self.name,
+            'view_mode': 'list,form',
+            'res_model': 'account.asset',
+            'type': 'ir.actions.act_window',
+            'domain': [('id', 'in', self.linked_asset_ids.ids)],
+        }
diff --git a/dev_odex30_accounting/odex30_account_asset/models/account_assets_report.py b/dev_odex30_accounting/odex30_account_asset/models/account_assets_report.py
new file mode 100644
index 0000000..1316b14
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_asset/models/account_assets_report.py
@@ -0,0 +1,468 @@
+# -*- coding: utf-8 -*-
+
+from odoo import fields, models, _
+from odoo.tools import format_date, SQL, Query
+from collections import defaultdict
+
+MAX_NAME_LENGTH = 50
+
+
+class AssetsReportCustomHandler(models.AbstractModel):
+    _name = 'account.asset.report.handler'
+    _inherit = 'account.report.custom.handler'
+    _description = 'Assets Report Custom Handler'
+
+    def _get_custom_display_config(self):
+        return {
+            'client_css_custom_class': 'depreciation_schedule',
+            'templates': {
+                'AccountReportFilters': 'odex30_account_asset.DepreciationScheduleFilters',
+            }
+        }
+
+    def _dynamic_lines_generator(self, report, options, all_column_groups_expression_totals, warnings=None):
+        lines, totals_by_column_group = self._generate_report_lines_without_grouping(report, options)
+        # add the groups by grouping_field
+        if options['assets_grouping_field'] != 'none':
+            lines = self._group_by_field(report, lines, options)
+        else:
+            lines = report._regroup_lines_by_name_prefix(options, lines, '_report_expand_unfoldable_line_assets_report_prefix_group', 0)
+
+        # add the total line
+        total_columns = []
+        for column_data in options['columns']:
+            col_value = totals_by_column_group[column_data['column_group_key']].get(column_data['expression_label'])
+            col_value = col_value if column_data.get('figure_type') == 'monetary' else ''
+
+            total_columns.append(report._build_column_dict(col_value, column_data, options=options))
+
+        if lines:
+            lines.append({
+                'id': report._get_generic_line_id(None, None, markup='total'),
+                'level': 1,
+                'name': _('Total'),
+                'columns': total_columns,
+                'unfoldable': False,
+                'unfolded': False,
+            })
+
+        return [(0, line) for line in lines]
+
+    def _generate_report_lines_without_grouping(self, report, options, prefix_to_match=None, parent_id=None, forced_account_id=None):
+        # construct a dictionary:
+        #   {(account_id, asset_id, asset_group_id): {col_group_key: {expression_label_1: value, expression_label_2: value, ...}}}
+        all_asset_ids = set()
+        all_lines_data = {}
+        for column_group_key, column_group_options in report._split_options_per_column_group(options).items():
+            # the lines returned are already sorted by account_id!
+            lines_query_results = self._query_lines(column_group_options, prefix_to_match=prefix_to_match, forced_account_id=forced_account_id)
+            for account_id, asset_id, asset_group_id, cols_by_expr_label in lines_query_results:
+                line_id = (account_id, asset_id, asset_group_id)
+                all_asset_ids.add(asset_id)
+                if line_id not in all_lines_data:
+                    all_lines_data[line_id] = {column_group_key: []}
+                all_lines_data[line_id][column_group_key] = cols_by_expr_label
+
+        column_names = [
+            'assets_date_from', 'assets_plus', 'assets_minus', 'assets_date_to', 'depre_date_from',
+            'depre_plus', 'depre_minus', 'depre_date_to', 'balance'
+        ]
+        totals_by_column_group = defaultdict(lambda: dict.fromkeys(column_names, 0.0))
+
+        # Browse all the necessary assets in one go, to minimize the number of queries
+        assets_cache = {asset.id: asset for asset in self.env['account.asset'].browse(all_asset_ids)}
+
+        # construct the lines, 1 at a time
+        lines = []
+        company_currency = self.env.company.currency_id
+        column_expression = self.env['account.report.expression']
+        for (account_id, asset_id, asset_group_id), col_group_totals in all_lines_data.items():
+            all_columns = []
+            for column_data in options['columns']:
+                col_group_key = column_data['column_group_key']
+                expr_label = column_data['expression_label']
+                if col_group_key not in col_group_totals or expr_label not in col_group_totals[col_group_key]:
+                    all_columns.append(report._build_column_dict(None, None))
+                    continue
+
+                col_value = col_group_totals[col_group_key][expr_label]
+                col_data = None if col_value is None else column_data
+
+                all_columns.append(report._build_column_dict(col_value, col_data, options=options, column_expression=column_expression, currency=company_currency))
+
+                # add to the total line
+                if column_data['figure_type'] == 'monetary':
+                    totals_by_column_group[column_data['column_group_key']][column_data['expression_label']] += col_value
+
+            name = assets_cache[asset_id].name
+            line = {
+                'id': report._get_generic_line_id('account.asset', asset_id, parent_line_id=parent_id),
+                'level': 2,
+                'name': name,
+                'columns': all_columns,
+                'unfoldable': False,
+                'unfolded': False,
+                'caret_options': 'account_asset_line',
+                'assets_account_id': account_id,
+                'assets_asset_group_id': asset_group_id,
+            }
+            if parent_id:
+                line['parent_id'] = parent_id
+            if len(name) >= MAX_NAME_LENGTH:
+                line['title_hover'] = name
+            lines.append(line)
+
+        return lines, totals_by_column_group
+
+    def _caret_options_initializer(self):
+        # Use 'caret_option_open_record_form' defined in account_reports rather than a custom function
+        return {
+            'account_asset_line': [
+                {'name': _("Open Asset"), 'action': 'caret_option_open_record_form'},
+            ]
+        }
+
+    def _custom_options_initializer(self, report, options, previous_options):
+        super()._custom_options_initializer(report, options, previous_options=previous_options)
+        column_group_options_map = report._split_options_per_column_group(options)
+
+        for col in options['columns']:
+            column_group_options = column_group_options_map[col['column_group_key']]
+            # Dynamic naming of columns containing dates
+            if col['expression_label'] == 'balance':
+                col['name'] = '' # The column label will be displayed in the subheader
+            if col['expression_label'] in ['assets_date_from', 'depre_date_from']:
+                col['name'] = format_date(self.env, column_group_options['date']['date_from'])
+            elif col['expression_label'] in ['assets_date_to', 'depre_date_to']:
+                col['name'] = format_date(self.env, column_group_options['date']['date_to'])
+
+        options['custom_columns_subheaders'] = [
+            {"name": _("Characteristics"), "colspan": 4},
+            {"name": _("Assets"), "colspan": 4},
+            {"name": _("Depreciation"), "colspan": 4},
+            {"name": _("Book Value"), "colspan": 1}
+        ]
+
+        # Group by account by default
+        options['assets_grouping_field'] = previous_options.get('assets_grouping_field') or 'account_id'
+        # If group by account is activated, activate the hierarchy (which will group by account group as well) if
+        # the company has at least one account group, otherwise only group by account
+        has_account_group = self.env['account.group'].search_count([('company_id', '=', self.env.company.id)], limit=1)
+        hierarchy_activated = previous_options.get('hierarchy', True)
+        options['hierarchy'] = has_account_group and hierarchy_activated or False
+
+    def _query_lines(self, options, prefix_to_match=None, forced_account_id=None):
+        """
+        Returns a list of tuples: [(asset_id, account_id, asset_group_id, [{expression_label: value}])]
+        """
+        lines = []
+        asset_lines = self._query_values(options, prefix_to_match=prefix_to_match, forced_account_id=forced_account_id)
+
+        # Assign the gross increases sub assets to their main asset (parent)
+        parent_lines = []
+        children_lines = defaultdict(list)
+        for al in asset_lines:
+            if al['parent_id']:
+                children_lines[al['parent_id']] += [al]
+            else:
+                parent_lines += [al]
+
+        for al in parent_lines:
+
+            asset_children_lines = children_lines[al['asset_id']]
+            asset_parent_values = self._get_parent_asset_values(options, al, asset_children_lines)
+
+            # Format the data
+            columns_by_expr_label = {
+                "acquisition_date": al["asset_acquisition_date"] and format_date(self.env, al["asset_acquisition_date"]) or "",  # Characteristics
+                "first_depreciation": al["asset_date"] and format_date(self.env, al["asset_date"]) or "",
+                "method": (al["asset_method"] == "linear" and _("Linear")) or (al["asset_method"] == "degressive" and _("Declining")) or _("Dec. then Straight"),
+                **asset_parent_values
+            }
+
+            lines.append((al['account_id'], al['asset_id'], al['asset_group_id'], columns_by_expr_label))
+        return lines
+
+    def _get_parent_asset_values(self, options, asset_line, asset_children_lines):
+        """ Compute the values needed for the depreciation schedule for each parent asset
+        Overridden in l10n_ro_saft.account_general_ledger"""
+
+        # Compute the depreciation rate string
+        if asset_line['asset_method'] == 'linear' and asset_line['asset_method_number']:  # some assets might have 0 depreciation because they don't lose value
+            total_months = int(asset_line['asset_method_number']) * int(asset_line['asset_method_period'])
+            months = total_months % 12
+            years = total_months // 12
+            asset_depreciation_rate = " ".join(part for part in [
+                years and _("%(years)s y", years=years),
+                months and _("%(months)s m", months=months),
+            ] if part)
+        elif asset_line['asset_method'] == 'linear':
+            asset_depreciation_rate = '0.00 %'
+        else:
+            asset_depreciation_rate = ('{:.2f} %').format(float(asset_line['asset_method_progress_factor']) * 100)
+
+        # Manage the opening of the asset
+        opening = (asset_line['asset_acquisition_date'] or asset_line['asset_date']) < fields.Date.to_date(options['date']['date_from'])
+
+        # Get the main values of the board for the asset
+        depreciation_opening = asset_line['depreciated_before']
+        depreciation_add = asset_line['depreciated_during']
+        depreciation_minus = 0.0
+
+        asset_disposal_value = (
+            asset_line['asset_disposal_value']
+            if (
+                asset_line['asset_disposal_date']
+                and asset_line['asset_disposal_date'] <= fields.Date.to_date(options['date']['date_to'])
+            )
+            else 0.0
+        )
+
+        asset_opening = asset_line['asset_original_value'] if opening else 0.0
+        asset_add = 0.0 if opening else asset_line['asset_original_value']
+        asset_minus = 0.0
+        asset_salvage_value = asset_line.get('asset_salvage_value', 0.0)
+
+        # Add the main values of the board for all the sub assets (gross increases)
+        for child in asset_children_lines:
+            depreciation_opening += child['depreciated_before']
+            depreciation_add += child['depreciated_during']
+
+            opening = (child['asset_acquisition_date'] or child['asset_date']) < fields.Date.to_date(options['date']['date_from'])
+            asset_opening += child['asset_original_value'] if opening else 0.0
+            asset_add += 0.0 if opening else child['asset_original_value']
+
+        # Compute the closing values
+        asset_closing = asset_opening + asset_add - asset_minus
+        depreciation_closing = depreciation_opening + depreciation_add - depreciation_minus
+        asset_currency = self.env['res.currency'].browse(asset_line['asset_currency_id'])
+
+        # Manage the closing of the asset
+        if (
+            asset_line['asset_state'] == 'close'
+            and asset_line['asset_disposal_date']
+            and asset_line['asset_disposal_date'] <= fields.Date.to_date(options['date']['date_to'])
+            and asset_currency.compare_amounts(depreciation_closing, asset_closing - asset_salvage_value) == 0
+        ):
+            depreciation_add -= asset_disposal_value
+            depreciation_minus += depreciation_closing - asset_disposal_value
+            depreciation_closing = 0.0
+            asset_minus += asset_closing
+            asset_closing = 0.0
+
+        # Manage negative assets (credit notes)
+        if asset_currency.compare_amounts(asset_line['asset_original_value'], 0) < 0:
+            asset_add, asset_minus = -asset_minus, -asset_add
+            depreciation_add, depreciation_minus = -depreciation_minus, -depreciation_add
+
+        return {
+            'duration_rate': asset_depreciation_rate,
+            'asset_disposal_value': asset_disposal_value,
+            'assets_date_from': asset_opening,
+            'assets_plus': asset_add,
+            'assets_minus': asset_minus,
+            'assets_date_to': asset_closing,
+            'depre_date_from': depreciation_opening,
+            'depre_plus': depreciation_add,
+            'depre_minus': depreciation_minus,
+            'depre_date_to': depreciation_closing,
+            'balance': asset_closing - depreciation_closing,
+        }
+
+    def _group_by_field(self, report, lines, options):
+        """
+        This function adds the grouping lines on top of each group of account.asset
+        It iterates over the lines, change the line_id of each line to include the account.account.id and the
+        account.asset.id.
+        """
+        if not lines:
+            return lines
+
+        line_vals_per_grouping_field_id = {}
+        parent_model = 'account.account' if options['assets_grouping_field'] == 'account_id' else 'account.asset.group'
+        for line in lines:
+            parent_id = line.get('assets_account_id') if options['assets_grouping_field'] == 'account_id' else line.get('assets_asset_group_id')
+
+            model, res_id = report._get_model_info_from_id(line['id'])
+
+            # replace the line['id'] to add the parent id
+            line['id'] = report._build_line_id([
+                (None, parent_model, parent_id),
+                (None, 'account.asset', res_id)
+            ])
+
+            is_parent_in_unfolded_lines = any(
+                report._get_model_info_from_id(unfolded_line_id) == (parent_model, parent_id)
+                for unfolded_line_id in options.get('unfolded_lines')
+            )
+            line_vals_per_grouping_field_id.setdefault(parent_id, {
+                # We don't assign a name to the line yet, so that we can batch the browsing of the parent objects
+                'id': report._build_line_id([(None, parent_model, parent_id)]),
+                'columns': [], # Filled later
+                'unfoldable': True,
+                'unfolded': is_parent_in_unfolded_lines or options.get('unfold_all'),
+                'level': 1,
+
+                # This value is stored here for convenience; it will be removed from the result
+                'group_lines': [],
+            })['group_lines'].append(line)
+
+        # Generate the result
+        rslt_lines = []
+        idx_monetary_columns = [idx_col for idx_col, col in enumerate(options['columns']) if col['figure_type'] == 'monetary']
+        parent_recordset = self.env[parent_model].browse(line_vals_per_grouping_field_id.keys())
+
+        for parent_field in parent_recordset:
+            parent_line_vals = line_vals_per_grouping_field_id[parent_field.id]
+            if options['assets_grouping_field'] == 'account_id':
+                parent_line_vals['name'] = f"{parent_field.code} {parent_field.name}"
+            else:
+                parent_line_vals['name'] = parent_field.name or _('(No %s)', parent_field._description)
+
+            rslt_lines.append(parent_line_vals)
+
+            group_totals = {column_index: 0 for column_index in idx_monetary_columns}
+            group_lines = report._regroup_lines_by_name_prefix(
+                options,
+                parent_line_vals.pop('group_lines'),
+                '_report_expand_unfoldable_line_assets_report_prefix_group',
+                parent_line_vals['level'],
+                parent_line_dict_id=parent_line_vals['id'],
+            )
+
+            for parent_subline in group_lines:
+                # Add this line to the group totals
+                for column_index in idx_monetary_columns:
+                    group_totals[column_index] += parent_subline['columns'][column_index].get('no_format', 0)
+
+                # Setup the parent and add the line to the result
+                parent_subline['parent_id'] = parent_line_vals['id']
+                rslt_lines.append(parent_subline)
+
+            # Add totals (columns) to the parent line
+            for column_index in range(len(options['columns'])):
+                parent_line_vals['columns'].append(report._build_column_dict(
+                    group_totals.get(column_index, ''),
+                    options['columns'][column_index],
+                    options=options,
+                ))
+
+        return rslt_lines
+
+    def _query_values(self, options, prefix_to_match=None, forced_account_id=None):
+        "Get the data from the database"
+
+        self.env['account.move.line'].check_access('read')
+        self.env['account.asset'].check_access('read')
+
+        query = Query(self.env, alias='asset', table=SQL.identifier('account_asset'))
+        account_alias = query.join(lhs_alias='asset', lhs_column='account_asset_id', rhs_table='account_account', rhs_column='id', link='account_asset_id')
+        query.add_join('LEFT JOIN', alias='move', table='account_move', condition=SQL(f"""
+            move.asset_id = asset.id AND move.state {"!= 'cancel'" if options.get('all_entries') else "= 'posted'"}
+        """))
+
+        account_code = self.env['account.account']._field_to_sql(account_alias, 'code', query)
+        account_name = self.env['account.account']._field_to_sql(account_alias, 'name')
+        account_id = SQL.identifier(account_alias, 'id')
+
+        if prefix_to_match:
+            query.add_where(SQL("asset.name ILIKE %s", f"{prefix_to_match}%"))
+        if forced_account_id:
+            query.add_where(SQL("%s = %s", account_id, forced_account_id))
+
+        analytic_account_ids = []
+        if options.get('analytic_accounts') and not any(x in options.get('analytic_accounts_list', []) for x in options['analytic_accounts']):
+            analytic_account_ids += [[str(account_id) for account_id in options['analytic_accounts']]]
+        if options.get('analytic_accounts_list'):
+            analytic_account_ids += [[str(account_id) for account_id in options.get('analytic_accounts_list')]]
+        if analytic_account_ids:
+            query.add_where(SQL('%s && %s', analytic_account_ids, self.env['account.asset']._query_analytic_accounts('asset')))
+
+        selected_journals = tuple(journal['id'] for journal in options.get('journals', []) if journal['model'] == 'account.journal' and journal['selected'])
+        if selected_journals:
+            query.add_where(SQL("asset.journal_id in %s", selected_journals))
+
+        sql = SQL(
+            """
+            SELECT asset.id AS asset_id,
+                   asset.parent_id AS parent_id,
+                   asset.name AS asset_name,
+                   asset.asset_group_id AS asset_group_id,
+                   asset.original_value AS asset_original_value,
+                   asset.currency_id AS asset_currency_id,
+                   COALESCE(asset.salvage_value, 0) as asset_salvage_value,
+                   MIN(move.date) AS asset_date,
+                   asset.disposal_date AS asset_disposal_date,
+                   asset.acquisition_date AS asset_acquisition_date,
+                   asset.method AS asset_method,
+                   asset.method_number AS asset_method_number,
+                   asset.method_period AS asset_method_period,
+                   asset.method_progress_factor AS asset_method_progress_factor,
+                   asset.state AS asset_state,
+                   asset.company_id AS company_id,
+                   %(account_code)s AS account_code,
+                   %(account_name)s AS account_name,
+                   %(account_id)s AS account_id,
+                   COALESCE(SUM(move.depreciation_value) FILTER (WHERE move.date < %(date_from)s), 0) + COALESCE(asset.already_depreciated_amount_import, 0) AS depreciated_before,
+                   COALESCE(SUM(move.depreciation_value) FILTER (WHERE move.date BETWEEN %(date_from)s AND %(date_to)s), 0) AS depreciated_during,
+                   COALESCE(SUM(move.depreciation_value) FILTER (WHERE move.date BETWEEN %(date_from)s AND %(date_to)s AND move.asset_number_days IS NULL), 0) AS asset_disposal_value
+              FROM %(from_clause)s
+             WHERE %(where_clause)s
+               AND asset.company_id in %(company_ids)s
+               AND (asset.acquisition_date <= %(date_to)s OR move.date <= %(date_to)s)
+               AND (asset.disposal_date >= %(date_from)s OR asset.disposal_date IS NULL)
+               AND (asset.state not in ('model', 'draft', 'cancelled') OR (asset.state = 'draft' AND %(include_draft)s))
+               AND asset.active = 't'
+          GROUP BY asset.id, account_id, account_code, account_name
+          ORDER BY account_code, asset.acquisition_date, asset.id;
+            """,
+            account_code=account_code,
+            account_name=account_name,
+            account_id=account_id,
+            date_from=options['date']['date_from'],
+            date_to=options['date']['date_to'],
+            from_clause=query.from_clause,
+            where_clause=query.where_clause or SQL('TRUE'),
+            company_ids=tuple(self.env['account.report'].get_report_company_ids(options)),
+            include_draft=options.get('all_entries', False),
+        )
+
+        self._cr.execute(sql)
+        results = self._cr.dictfetchall()
+        return results
+
+    def _report_expand_unfoldable_line_assets_report_prefix_group(self, line_dict_id, groupby, options, progress, offset, unfold_all_batch_data=None):
+        matched_prefix = self.env['account.report']._get_prefix_groups_matched_prefix_from_line_id(line_dict_id)
+        report = self.env['account.report'].browse(options['report_id'])
+
+        lines, _totals_by_column_group = self._generate_report_lines_without_grouping(
+            report,
+            options,
+            prefix_to_match=matched_prefix,
+            parent_id=line_dict_id,
+            forced_account_id=self.env['account.report']._get_res_id_from_line_id(line_dict_id, 'account.account'),
+        )
+
+        lines = report._regroup_lines_by_name_prefix(
+            options,
+            lines,
+            '_report_expand_unfoldable_line_assets_report_prefix_group',
+            len(matched_prefix),
+            matched_prefix=matched_prefix,
+            parent_line_dict_id=line_dict_id,
+        )
+
+        return {
+            'lines': lines,
+            'offset_increment': len(lines),
+            'has_more': False,
+        }
+
+
+class AssetsReport(models.Model):
+    _inherit = 'account.report'
+
+    def _get_caret_option_view_map(self):
+        view_map = super()._get_caret_option_view_map()
+        view_map['account.asset.line'] = 'odex30_account_asset.view_account_asset_expense_form'
+        return view_map
diff --git a/dev_odex30_accounting/odex30_account_asset/models/account_move.py b/dev_odex30_accounting/odex30_account_asset/models/account_move.py
new file mode 100644
index 0000000..78f5f44
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_asset/models/account_move.py
@@ -0,0 +1,397 @@
+# -*- coding: utf-8 -*-
+
+from odoo import api, fields, models, Command
+from odoo.exceptions import UserError, ValidationError
+from odoo.tools import float_compare, _, SQL
+from odoo.tools.misc import formatLang
+from dateutil.relativedelta import relativedelta
+
+
+class AccountMove(models.Model):
+    _inherit = 'account.move'
+
+    asset_id = fields.Many2one('account.asset', string='Asset', index=True, ondelete='cascade', copy=False, domain="[('company_id', '=', company_id)]")
+    asset_remaining_value = fields.Monetary(string='Depreciable Value', compute='_compute_depreciation_cumulative_value' ,store=True)
+    asset_depreciated_value = fields.Monetary(string='Cumulative Depreciation', compute='_compute_depreciation_cumulative_value',store=True)
+    # true when this move is the result of the changing of value of an asset
+    asset_value_change = fields.Boolean()
+    #  how many days of depreciation this entry corresponds to
+    asset_number_days = fields.Integer(string="Number of days", copy=False) # deprecated
+    asset_depreciation_beginning_date = fields.Date(string="Date of the beginning of the depreciation", copy=False) # technical field stating when the depreciation associated with this entry has begun
+    depreciation_value = fields.Monetary(
+        string="Depreciation",
+        compute="_compute_depreciation_value", inverse="_inverse_depreciation_value", store=True,
+    )
+
+    asset_ids = fields.One2many('account.asset', string='Assets', compute="_compute_asset_ids")
+    asset_id_display_name = fields.Char(compute="_compute_asset_ids")   # just a button label. That's to avoid a plethora of different buttons defined in xml
+    count_asset = fields.Integer(compute="_compute_asset_ids")
+    draft_asset_exists = fields.Boolean(compute="_compute_asset_ids")
+    asset_move_type = fields.Selection(
+        selection=[
+            ('depreciation', 'Depreciation'),
+            ('sale', 'Sale'),
+            ('purchase', 'Purchase'),
+            ('disposal', 'Disposal'),
+            ('negative_revaluation', 'Negative revaluation'),
+            ('positive_revaluation', 'Positive revaluation'),
+        ],
+        string='Asset Move Type',
+        compute='_compute_asset_move_type', store=True,
+        copy=False,
+    )
+
+    # -------------------------------------------------------------------------
+    # COMPUTE METHODS
+    # -------------------------------------------------------------------------
+    @api.depends('asset_id', 'depreciation_value', 'asset_id.total_depreciable_value', 'asset_id.already_depreciated_amount_import', 'state')
+    def _compute_depreciation_cumulative_value(self):
+        self.asset_depreciated_value = 0
+        self.asset_remaining_value = 0
+
+        # make sure to protect all the records being assigned, because the
+        # assignments invoke method write() on non-protected records, which may
+        # cause an infinite recursion in case method write() needs to read one
+        # of these fields (like in case of a base automation)
+        fields = [self._fields['asset_remaining_value'], self._fields['asset_depreciated_value']]
+        with self.env.protecting(fields, self.asset_id.depreciation_move_ids):
+            for asset in self.asset_id:
+                depreciated = asset.already_depreciated_amount_import
+                remaining = asset.total_depreciable_value - asset.already_depreciated_amount_import
+                for move in asset.depreciation_move_ids.sorted(lambda mv: (mv.date, mv._origin.id)):
+                    if move.state != 'cancel':
+                        remaining -= move.depreciation_value
+                        depreciated += move.depreciation_value
+                    move.asset_remaining_value = remaining
+                    move.asset_depreciated_value = depreciated
+
+    @api.depends('line_ids.balance')
+    def _compute_depreciation_value(self):
+        for move in self:
+            asset = move.asset_id or move.reversed_entry_id.asset_id  # reversed moves are created before being assigned to the asset
+            if asset:
+                depreciation_lines = move._get_asset_depreciation_line()
+                asset_depreciation = sum(depreciation_lines.mapped('balance'))
+                # Special case of closing entry - only disposed assets of type 'purchase' should match this condition
+                # The condition on len(move.line_ids) is to avoid the case where there is only one depreciation move, and it is not a disposal move
+                # The condition will be matched because a disposal move from a disposal move will always have more than 2 lines, unlike a normal depreciation move
+                if any(
+                    line.account_id == asset.account_asset_id
+                    and float_compare(-line.balance, asset.original_value, precision_rounding=asset.currency_id.rounding) == 0
+                    for line in move.line_ids
+                ) and len(move.line_ids) > 2:
+                    asset_depreciation = (
+                        asset.original_value
+                        - asset.salvage_value
+                        - (
+                            move.line_ids[1].debit if asset.original_value > 0 else move.line_ids[1].credit
+                        ) * (-1 if asset.original_value < 0 else 1)
+                    )
+            else:
+                asset_depreciation = 0
+            move.depreciation_value = asset_depreciation
+
+    @api.depends('asset_id', 'asset_ids')
+    def _compute_asset_move_type(self):
+        for move in self:
+            if move.asset_ids:
+                move.asset_move_type = 'positive_revaluation' if move.asset_ids.parent_id else 'purchase'
+            elif not move.asset_move_type or not move.asset_id:
+                move.asset_move_type = False
+
+    # -------------------------------------------------------------------------
+    # INVERSE METHODS
+    # -------------------------------------------------------------------------
+    def _inverse_depreciation_value(self):
+        for move in self:
+            depreciation_lines = set(move._get_asset_depreciation_line())
+            move.write({'line_ids': [
+                Command.update(line.id, {
+                    'balance': move.depreciation_value * (1 if line in depreciation_lines else -1),
+                })
+                for line in move.line_ids
+            ]})
+
+    # -------------------------------------------------------------------------
+    # CONSTRAINT METHODS
+    # -------------------------------------------------------------------------
+    @api.constrains('state', 'asset_id')
+    def _constrains_check_asset_state(self):
+        for move in self.filtered(lambda mv: mv.asset_id):
+            asset_id = move.asset_id
+            if asset_id.state == 'draft' and move.state == 'posted':
+                raise ValidationError(_("You can't post an entry related to a draft asset. Please post the asset before."))
+
+    def _post(self, soft=True):
+        # OVERRIDE
+        posted = super()._post(soft)
+
+        # log the post of a depreciation
+        posted._log_depreciation_asset()
+
+        # look for any asset to create, in case we just posted a bill on an account
+        # configured to automatically create assets
+        posted.sudo()._auto_create_asset()
+
+        return posted
+
+    def _reverse_moves(self, default_values_list=None, cancel=False):
+        if default_values_list is None:
+            default_values_list = [{} for _i in self]
+        for move, default_values in zip(self, default_values_list):
+            # Report the value of this move to the next draft move or create a new one
+            if move.asset_id:
+                # Recompute the status of the asset for all depreciations posted after the reversed entry
+
+                first_draft = min(move.asset_id.depreciation_move_ids.filtered(lambda m: m.state == 'draft'), key=lambda m: m.date, default=None)
+                if first_draft:
+                    # If there is a draft, simply move/add the depreciation amount here
+                    first_draft.depreciation_value += move.depreciation_value
+                elif move.asset_id.state != 'close':
+                    # If there was no draft move left, create one.
+                    # Unless the asset is being closed, then the closing move
+                    # takes care of balancing the asset.
+                    last_date = max(move.asset_id.depreciation_move_ids.mapped('date'))
+                    method_period = move.asset_id.method_period
+
+                    self.create(self._prepare_move_for_asset_depreciation({
+                        'asset_id': move.asset_id,
+                        'amount': move.depreciation_value,
+                        'depreciation_beginning_date': last_date + (relativedelta(months=1) if method_period == "1" else relativedelta(years=1)),
+                        'date': last_date + (relativedelta(months=1) if method_period == "1" else relativedelta(years=1)),
+                        'asset_number_days': 0
+                    }))
+
+                msg = _('Depreciation entry %(name)s reversed (%(value)s)', name=move.name, value=formatLang(self.env, move.depreciation_value, currency_obj=move.company_id.currency_id))
+                move.asset_id.message_post(body=msg)
+                default_values['asset_id'] = move.asset_id.id
+                default_values['asset_number_days'] = -move.asset_number_days
+                default_values['asset_depreciation_beginning_date'] = default_values.get('date', move.date)
+
+        return super(AccountMove, self)._reverse_moves(default_values_list, cancel)
+
+    def button_cancel(self):
+        # OVERRIDE
+        res = super(AccountMove, self).button_cancel()
+        self.env['account.asset'].sudo().search([('original_move_line_ids.move_id', 'in', self.ids)]).write({'active': False})
+        return res
+
+    def button_draft(self):
+        for move in self:
+            if any(asset_id.state != 'draft' for asset_id in move.asset_ids):
+                raise UserError(_('You cannot reset to draft an entry related to a posted asset'))
+            # Remove any draft asset that could be linked to the account move being reset to draft
+            move.asset_ids.filtered(lambda x: x.state == 'draft').unlink()
+        return super(AccountMove, self).button_draft()
+
+    def _log_depreciation_asset(self):
+        for move in self.filtered(lambda m: m.asset_id):
+            asset = move.asset_id
+            msg = _('Depreciation entry %(name)s posted (%(value)s)', name=move.name, value=formatLang(self.env, move.depreciation_value, currency_obj=move.company_id.currency_id))
+            asset.message_post(body=msg)
+
+    def _auto_create_asset(self):
+        create_list = []
+        invoice_list = []
+        auto_validate = []
+        for move in self:
+            if not move.is_invoice():
+                continue
+
+            for move_line in move.line_ids:
+                if (
+                    move_line.account_id
+                    and (move_line.account_id.can_create_asset)
+                    and move_line.account_id.create_asset != "no"
+                    and not (move_line.currency_id or move.currency_id).is_zero(move_line.price_total)
+                    and not move_line.asset_ids
+                    and not move_line.tax_line_id
+                    and move_line.price_total > 0
+                    and not (move.move_type in ('out_invoice', 'out_refund') and move_line.account_id.internal_group == 'asset')
+                ):
+                    if not move_line.name:
+                        if move_line.product_id:
+                            move_line.name = move_line.product_id.display_name
+                        else:
+                            raise UserError(_('Journal Items of %(account)s should have a label in order to generate an asset', account=move_line.account_id.display_name))
+                    if move_line.account_id.multiple_assets_per_line:
+                        # decimal quantities are not supported, quantities are rounded to the lower int
+                        units_quantity = max(1, int(move_line.quantity))
+                    else:
+                        units_quantity = 1
+
+                    model_ids = move_line.account_id.asset_model_ids.filtered(lambda model: model.company_id in move_line.company_id.parent_ids)
+                    vals = {
+                        'name': move_line.name,
+                        'company_id': move_line.company_id.id,
+                        'currency_id': move_line.company_currency_id.id,
+                        'analytic_distribution': move_line.analytic_distribution,
+                        'original_move_line_ids': [(6, False, move_line.ids)],
+                        'state': 'draft',
+                        'acquisition_date': move.invoice_date if not move.reversed_entry_id else move.reversed_entry_id.invoice_date,
+                    }
+                    for model_id in model_ids or [None]:
+                        if model_id:
+                            vals['model_id'] = model_id.id
+
+                        auto_validate.extend([move_line.account_id.create_asset == 'validate'] * units_quantity)
+                        invoice_list.extend([move] * units_quantity)
+                        for i in range(1, units_quantity + 1):
+                            if units_quantity > 1:
+                                vals['name'] = _("%(move_line)s (%(current)s of %(total)s)", move_line=move_line.name, current=i, total=units_quantity)
+                            create_list.extend([vals.copy()])
+
+        assets = self.env['account.asset'].with_context({}).create(create_list)
+        for asset, vals, invoice, validate in zip(assets, create_list, invoice_list, auto_validate):
+            if 'model_id' in vals:
+                asset._onchange_model_id()
+                if validate:
+                    asset.validate()
+            if invoice:
+                asset.message_post(body=_('Asset created from invoice: %s', invoice._get_html_link()))
+                asset._post_non_deductible_tax_value()
+        return assets
+
+    @api.model
+    def _prepare_move_for_asset_depreciation(self, vals):
+        missing_fields = {'asset_id', 'amount', 'depreciation_beginning_date', 'date', 'asset_number_days'} - set(vals)
+        if missing_fields:
+            raise UserError(_('Some fields are missing %s', ', '.join(missing_fields)))
+        asset = vals['asset_id']
+        analytic_distribution = asset.analytic_distribution
+        depreciation_date = vals.get('date', fields.Date.context_today(self))
+        company_currency = asset.company_id.currency_id
+        current_currency = asset.currency_id
+        prec = company_currency.decimal_places
+        amount_currency = vals['amount']
+        amount = current_currency._convert(amount_currency, company_currency, asset.company_id, depreciation_date)
+        # Keep the partner on the original invoice if there is only one
+        partner = asset.original_move_line_ids.mapped('partner_id')
+        partner = partner[:1] if len(partner) <= 1 else self.env['res.partner']
+        name = _("%s: Depreciation", asset.name)
+        move_line_1 = {
+            'name': name,
+            'partner_id': partner.id,
+            'account_id': asset.account_depreciation_id.id,
+            'debit': 0.0 if float_compare(amount, 0.0, precision_digits=prec) > 0 else -amount,
+            'credit': amount if float_compare(amount, 0.0, precision_digits=prec) > 0 else 0.0,
+            'currency_id': current_currency.id,
+            'amount_currency': -amount_currency,
+        }
+        move_line_2 = {
+            'name': name,
+            'partner_id': partner.id,
+            'account_id': asset.account_depreciation_expense_id.id,
+            'credit': 0.0 if float_compare(amount, 0.0, precision_digits=prec) > 0 else -amount,
+            'debit': amount if float_compare(amount, 0.0, precision_digits=prec) > 0 else 0.0,
+            'currency_id': current_currency.id,
+            'amount_currency': amount_currency,
+        }
+        # Only set the 'analytic_distribution' key if there is an analytic distribution on the asset.
+        # Otherwise, it prevents the computation of the analytic distribution.
+        if analytic_distribution:
+            move_line_1['analytic_distribution'] = analytic_distribution
+            move_line_2['analytic_distribution'] = analytic_distribution
+        move_vals = {
+            'partner_id': partner.id,
+            'date': depreciation_date,
+            'journal_id': asset.journal_id.id,
+            'line_ids': [(0, 0, move_line_1), (0, 0, move_line_2)],
+            'asset_id': asset.id,
+            'ref': name,
+            'asset_depreciation_beginning_date': vals['depreciation_beginning_date'],
+            'asset_number_days': vals['asset_number_days'],
+            'asset_value_change': vals.get('asset_value_change', False),
+            'move_type': 'entry',
+            'currency_id': current_currency.id,
+            'asset_move_type': vals.get('asset_move_type', 'depreciation'),
+            'company_id': asset.company_id.id,
+        }
+        return move_vals
+
+    def _get_asset_depreciation_line(self):
+        asset = self.asset_id
+        return self.line_ids.filtered(lambda line: line.account_id.internal_group == 'expense' or line.account_id == asset.account_depreciation_expense_id)
+
+    @api.depends('line_ids.asset_ids')
+    def _compute_asset_ids(self):
+        for record in self:
+            record.asset_ids = record.line_ids.asset_ids
+            record.count_asset = len(record.asset_ids)
+            record.asset_id_display_name = _('Asset')
+            record.draft_asset_exists = bool(record.asset_ids.filtered(lambda x: x.state == "draft"))
+
+    def open_asset_view(self):
+        return self.asset_id.open_asset(['form'])
+
+    def action_open_asset_ids(self):
+        return self.asset_ids.open_asset(['list', 'form'])
+
+
+class AccountMoveLine(models.Model):
+    _inherit = 'account.move.line'
+
+    asset_ids = fields.Many2many('account.asset', 'asset_move_line_rel', 'line_id', 'asset_id', string='Related Assets', copy=False)
+    non_deductible_tax_value = fields.Monetary(compute='_compute_non_deductible_tax_value', currency_field='company_currency_id')
+
+    def _get_computed_taxes(self):
+        if self.move_id.asset_id:
+            return self.tax_ids
+        return super()._get_computed_taxes()
+
+    def turn_as_asset(self):
+        if len(self.company_id) != 1:
+            raise UserError(_("All the lines should be from the same company"))
+        if any(line.move_id.state == 'draft' for line in self):
+            raise UserError(_("All the lines should be posted"))
+        if any(account != self[0].account_id for account in self.mapped('account_id')):
+            raise UserError(_("All the lines should be from the same account"))
+        ctx = self.env.context.copy()
+        ctx.update({
+            'default_original_move_line_ids': [(6, False, self.env.context['active_ids'])],
+            'default_company_id': self.company_id.id,
+        })
+        return {
+            "name": _("Turn as an asset"),
+            "type": "ir.actions.act_window",
+            "res_model": "account.asset",
+            "views": [[False, "form"]],
+            "target": "current",
+            "context": ctx,
+        }
+
+    @api.depends('tax_ids.invoice_repartition_line_ids')
+    def _compute_non_deductible_tax_value(self):
+        """ Handle the specific case of non deductible taxes,
+        such as "50% Non Déductible - Frais de voiture (Prix Excl.)" in Belgium.
+        """
+        non_deductible_tax_ids = self.tax_ids.invoice_repartition_line_ids.filtered(
+            lambda line: line.repartition_type == 'tax' and not line.use_in_tax_closing
+        ).tax_id
+
+        res = {}
+        if non_deductible_tax_ids:
+            domain = [('move_id', 'in', self.move_id.ids)]
+            tax_details_query = self._get_query_tax_details_from_domain(domain)
+
+            self.flush_model()
+            self._cr.execute(SQL(
+                '''
+                SELECT
+                    tdq.base_line_id,
+                    SUM(tdq.tax_amount_currency)
+                FROM (%(tax_details_query)s) AS tdq
+                JOIN account_move_line aml ON aml.id = tdq.tax_line_id
+                JOIN account_tax_repartition_line trl ON trl.id = tdq.tax_repartition_line_id
+                WHERE tdq.base_line_id IN %(base_line_ids)s
+                AND trl.use_in_tax_closing IS FALSE
+                GROUP BY tdq.base_line_id
+                ''',
+                tax_details_query=tax_details_query,
+                base_line_ids=tuple(self.ids),
+            ))
+
+            res = {row['base_line_id']: row['sum'] for row in self._cr.dictfetchall()}
+
+        for record in self:
+            record.non_deductible_tax_value = res.get(record._origin.id, 0.0)
diff --git a/dev_odex30_accounting/odex30_account_asset/models/res_company.py b/dev_odex30_accounting/odex30_account_asset/models/res_company.py
new file mode 100644
index 0000000..53c3bff
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_asset/models/res_company.py
@@ -0,0 +1,19 @@
+# -*- coding: utf-8 -*-
+
+from odoo import api, fields, models, _
+
+class ResCompany(models.Model):
+    _inherit = "res.company"
+
+    gain_account_id = fields.Many2one(
+        'account.account',
+        domain="[('deprecated', '=', False)]",
+        check_company=True,
+        help="Account used to write the journal item in case of gain while selling an asset",
+    )
+    loss_account_id = fields.Many2one(
+        'account.account',
+        domain="[('deprecated', '=', False)]",
+        check_company=True,
+        help="Account used to write the journal item in case of loss while selling an asset",
+    )
diff --git a/dev_odex30_accounting/odex30_account_asset/security/account_asset_security.xml b/dev_odex30_accounting/odex30_account_asset/security/account_asset_security.xml
new file mode 100644
index 0000000..2e736fa
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_asset/security/account_asset_security.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo noupdate="1">
+
+        <record id="account_asset_multi_company_rule" model="ir.rule">
+            <field name="name">Account Asset multi-company</field>
+            <field ref="model_account_asset" name="model_id"/>
+            <field eval="True" name="global"/>
+            <field name="domain_force">[('company_id', 'parent_of', company_ids)]</field>
+        </record>
+
+        <record id="account_asset_group_multi_company_rule" model="ir.rule">
+            <field name="name">Account Asset Group multi-company</field>
+            <field name="model_id" ref="model_account_asset_group"/>
+            <field eval="True" name="global"/>
+            <field name="domain_force">[('company_id', 'parent_of', company_ids)]</field>
+        </record>
+
+</odoo>
diff --git a/dev_odex30_accounting/odex30_account_asset/security/ir.model.access.csv b/dev_odex30_accounting/odex30_account_asset/security/ir.model.access.csv
new file mode 100644
index 0000000..0c6f796
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_asset/security/ir.model.access.csv
@@ -0,0 +1,7 @@
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_account_asset,account.asset,model_account_asset,account.group_account_readonly,1,0,0,0
+access_account_asset_manager,account.asset,model_account_asset,account.group_account_user,1,1,1,1
+access_account_asset_invoicing_payment,account.asset,model_account_asset,account.group_account_invoice,1,0,1,0
+access_asset_modify,access.asset.modify,model_asset_modify,account.group_account_user,1,1,1,0
+access_account_asset_group,account.asset.group,model_account_asset_group,account.group_account_readonly,1,0,0,0
+access_account_asset_group_manager,account.asset.group,model_account_asset_group,account.group_account_manager,1,1,1,1
diff --git a/dev_odex30_accounting/odex30_account_asset/static/description/icon.png b/dev_odex30_accounting/odex30_account_asset/static/description/icon.png
new file mode 100644
index 0000000..575fa15
Binary files /dev/null and b/dev_odex30_accounting/odex30_account_asset/static/description/icon.png differ
diff --git a/dev_odex30_accounting/odex30_account_asset/static/description/icon.svg b/dev_odex30_accounting/odex30_account_asset/static/description/icon.svg
new file mode 100644
index 0000000..83b8e79
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_asset/static/description/icon.svg
@@ -0,0 +1 @@
+<svg width="50" height="50" viewBox="0 0 50 50" xmlns="http://www.w3.org/2000/svg"><path d="M37 17h11v13H37V17Z" fill="#088BF5"/><path d="M0 34h4v4H0v-4Z" fill="#2EBCFA"/><path d="M44 33h4v5h-4v-5Z" fill="#144496"/><path d="M0 38a4 4 0 0 1 4-4h44v4a4 4 0 0 1-4 4H4a4 4 0 0 1-4-4Z" fill="#144496"/><path d="M4.421 8C1.979 8 0 9.959 0 12.375V34h46c2.442 0 4-1.584 4-4v-4a2 2 0 0 0-2-2h-6c-1.831 0-3-1.188-3-3s1.169-3 3-3h6a2 2 0 0 0 2-2v-3.625C50 9.959 48.02 8 45.579 8H4.42Z" fill="#2EBCFA"/></svg>
\ No newline at end of file
diff --git a/dev_odex30_accounting/odex30_account_asset/static/src/components/depreciation_schedule/depreciation_schedule.scss b/dev_odex30_accounting/odex30_account_asset/static/src/components/depreciation_schedule/depreciation_schedule.scss
new file mode 100644
index 0000000..a1c16d1
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_asset/static/src/components/depreciation_schedule/depreciation_schedule.scss
@@ -0,0 +1,37 @@
+.account_report.depreciation_schedule {
+    table.striped {
+        > thead > tr:not(:first-child) {
+            > th:nth-child(2n+3) { background: inherit }
+            > th[data-expression_label='assets_date_from'],
+            > th[data-expression_label='assets_plus'],
+            > th[data-expression_label='assets_minus'],
+            > th[data-expression_label='assets_date_to'],
+            > th[data-expression_label='balance'] {
+                background: $o-gray-100
+            }
+        }
+        > tbody {
+            > tr:not(.line_level_0):not(.empty) {
+                > td:nth-child(2n+3) { background: inherit }
+                > td[data-expression_label='assets_date_from'],
+                > td[data-expression_label='assets_plus'],
+                > td[data-expression_label='assets_minus'],
+                > td[data-expression_label='assets_date_to'],
+                > td[data-expression_label='balance'] {
+                    background: $o-gray-100
+                }
+            }
+            > tr.line_level_0
+            {
+                > td:nth-child(2n+3) { background: inherit }
+                > td[data-expression_label='assets_date_from'],
+                > td[data-expression_label='assets_plus'],
+                > td[data-expression_label='assets_minus'],
+                > td[data-expression_label='assets_date_to'],
+                > td[data-expression_label='balance'] {
+                    background: $o-gray-300
+                }
+            }
+        }
+    }
+}
diff --git a/dev_odex30_accounting/odex30_account_asset/static/src/components/depreciation_schedule/filters.xml b/dev_odex30_accounting/odex30_account_asset/static/src/components/depreciation_schedule/filters.xml
new file mode 100644
index 0000000..9c3f76b
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_asset/static/src/components/depreciation_schedule/filters.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<templates>
+    <t t-name="odex30_account_asset.DepreciationScheduleFilters" t-inherit="odex30_account_reports.AccountReportFiltersCustomizable">
+        <xpath expr="//div[@id='filter_extra_options']" position="before">
+            <t t-call="odex30_account_asset.DepreciationScheduleGroupBy"/>
+        </xpath>
+    </t>
+</templates>
diff --git a/dev_odex30_accounting/odex30_account_asset/static/src/components/depreciation_schedule/groupby.xml b/dev_odex30_accounting/odex30_account_asset/static/src/components/depreciation_schedule/groupby.xml
new file mode 100644
index 0000000..7460c98
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_asset/static/src/components/depreciation_schedule/groupby.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<templates>
+    <t t-name="odex30_account_asset.DepreciationScheduleGroupBy">
+        <Dropdown>
+            <button class="btn btn-secondary">
+                <i class="fa fa-list me-1"/>
+                <t t-if="controller.options.assets_grouping_field === 'account_id'">
+                    Group by Account
+                </t>
+                <t t-elif="controller.options.assets_grouping_field === 'asset_group_id'">
+                    Group by Asset Group
+                </t>
+                <t t-elif="controller.options.assets_grouping_field === 'none'">
+                    No Grouping
+                </t>
+            </button>
+
+            <t t-set-slot="content">
+                <DropdownItem
+                    class="{ 'selected': controller.options.assets_grouping_field === 'account_id' }"
+                    onSelected="() => this.filterClicked({ optionKey: 'assets_grouping_field', optionValue: 'account_id', reload: true})"
+                >
+                    Group By Account
+                </DropdownItem>
+
+                <DropdownItem
+                    class="{ 'selected': controller.options.assets_grouping_field === 'asset_group_id' }"
+                    onSelected="() => this.filterClicked({ optionKey: 'assets_grouping_field', optionValue: 'asset_group_id', reload: true})"
+                >
+                    Group By Asset Group
+                </DropdownItem>
+
+                <DropdownItem
+                    class="{ 'selected': controller.options.assets_grouping_field === 'none'}"
+                    onSelected="() => this.filterClicked({ optionKey: 'assets_grouping_field', optionValue: 'none', reload: true})"
+                >
+                    No Grouping
+                </DropdownItem>
+            </t>
+        </Dropdown>
+    </t>
+</templates>
diff --git a/dev_odex30_accounting/odex30_account_asset/static/src/components/move_reversed/move_reversed.js b/dev_odex30_accounting/odex30_account_asset/static/src/components/move_reversed/move_reversed.js
new file mode 100644
index 0000000..6fdd866
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_asset/static/src/components/move_reversed/move_reversed.js
@@ -0,0 +1,16 @@
+/** @odoo-module **/
+
+import { registry } from "@web/core/registry";
+import { Component } from "@odoo/owl";
+import { standardFieldProps } from "@web/views/fields/standard_field_props";
+
+export class MoveReversed extends Component {
+    static template = "odex30_account_asset.moveReversed";
+    static props = {...standardFieldProps};
+}
+
+export const moveReversed = {
+    component: MoveReversed,
+};
+
+registry.category("fields").add("deprec_lines_reversed", moveReversed);
diff --git a/dev_odex30_accounting/odex30_account_asset/static/src/components/move_reversed/move_reversed.xml b/dev_odex30_accounting/odex30_account_asset/static/src/components/move_reversed/move_reversed.xml
new file mode 100644
index 0000000..3d5e1c9
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_asset/static/src/components/move_reversed/move_reversed.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<templates id="template" xml:space="preserve">
+    <t t-name="odex30_account_asset.moveReversed">
+        <i t-if="props.record.data[props.name].records.length" class="fa fa-exclamation-circle" title="This move has been reversed"/>
+    </t>
+</templates>
diff --git a/dev_odex30_accounting/odex30_account_asset/static/src/scss/account_asset.dark.scss b/dev_odex30_accounting/odex30_account_asset/static/src/scss/account_asset.dark.scss
new file mode 100644
index 0000000..4fc1b1b
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_asset/static/src/scss/account_asset.dark.scss
@@ -0,0 +1,8 @@
+// = ACCOUNT ASSET
+// ============================================================================
+// No CSS hacks, variables overrides only
+
+.o_account_reports_page.o_account_assets_report {
+    --DepreciationSchedule-background-color: #{$o-gray-300};
+    --DepreciationSchedule-border-color: #{$o-gray-600};
+}
diff --git a/dev_odex30_accounting/odex30_account_asset/static/src/scss/account_asset.scss b/dev_odex30_accounting/odex30_account_asset/static/src/scss/account_asset.scss
new file mode 100644
index 0000000..bee20cd
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_asset/static/src/scss/account_asset.scss
@@ -0,0 +1,77 @@
+.o_account_reports_page.o_account_assets_report .o_account_reports_table {
+
+     .o_account_reports_header_hierarchy {
+
+        white-space: nowrap;
+
+        .o_account_asset_report_top_header_row th:not(:first-child) {
+            border: 1px solid var(--DepreciationSchedule-border-color, #{$o-gray-200});
+            padding-top: 8px;
+            padding-bottom: 8px;
+        }
+
+        .o_account_report_column_header{
+            padding-top: 8px;
+            padding-bottom: 8px;
+        }
+
+        & > tr:first-child th{
+            text-align: right !important;
+        }
+    }
+
+    .o_account_reports_header_hierarchy tr:nth-child(3) th:nth-child(2n+6),
+    .o_account_asset_column_contrast{
+        background-color: var(--DepreciationSchedule-background-color, #{$o-gray-100});
+        background-clip: padding-box;
+    }
+
+    .o_account_asset_contrast_inner{
+        font-weight: normal;
+    }
+
+    .o_asset_blank_if_zero_value{
+        opacity: 0.3;
+    }
+}
+
+.o_account_asset_kanban_title {
+    text-overflow: ellipsis;
+    overflow: hidden;
+    white-space: nowrap;
+}
+
+.o_account_reports_body_print .o_account_assets_report{
+
+    .o_account_asset_contrast_inner{
+        font-weight: normal;
+    }
+
+    td.o_foldable_total {
+        font-weight: bold;
+    }
+
+    .o_account_reports_header_hierarchy {
+        white-space: nowrap;
+        .o_account_asset_report_top_header_row th:not(:first-child) {
+            border: 1px solid lightgrey;
+            padding-top: 8px;
+            padding-bottom: 8px;
+
+            font-weight: bold;
+            font-size: 0.8rem;
+        }
+
+        tr:nth-child(3) {
+            th:nth-child(2), th:nth-child(3), th:nth-child(4), th:nth-child(5) {
+                table > tbody > tr > td{
+                    text-align: center !important;
+                }
+            }
+            th > table > tbody > tr > td {
+                font-weight: normal;
+                font-size: 0.8rem;
+            }
+        }
+    }
+}
diff --git a/dev_odex30_accounting/odex30_account_asset/static/src/views/fields/properties/properties_field.js b/dev_odex30_accounting/odex30_account_asset/static/src/views/fields/properties/properties_field.js
new file mode 100644
index 0000000..6fe1814
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_asset/static/src/views/fields/properties/properties_field.js
@@ -0,0 +1,21 @@
+/** @odoo-module **/
+
+import { PropertiesField } from "@web/views/fields/properties/properties_field";
+import { patch } from "@web/core/utils/patch";
+import { _t } from "@web/core/l10n/translation";
+
+patch(PropertiesField.prototype, {
+    async onPropertyCreate() {
+        if (
+            this.props.record.resModel === 'account.asset'
+            && (!this.state.canChangeDefinition || !(await this.checkDefinitionWriteAccess()))
+        ) {
+            this.notification.add(
+                _t("You can add Property fields only on Assets with an Asset Model set."),
+                { type: "warning" }
+            );
+            return;
+        }
+        super.onPropertyCreate();
+    }
+});
diff --git a/dev_odex30_accounting/odex30_account_asset/static/src/web/form_controller_patch.js b/dev_odex30_accounting/odex30_account_asset/static/src/web/form_controller_patch.js
new file mode 100644
index 0000000..1ff60fd
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_asset/static/src/web/form_controller_patch.js
@@ -0,0 +1,15 @@
+/** @odoo-module */
+
+import { FormController } from "@web/views/form/form_controller";
+import { patch } from "@web/core/utils/patch";
+
+patch(FormController.prototype, {
+    getStaticActionMenuItems() {
+        const menuItems = super.getStaticActionMenuItems();
+        if (this.props.resModel === 'account.asset' && this.model.root.data.state === 'model') {
+            menuItems.addPropertyFieldValue.isAvailable = () => false;
+        }
+        return menuItems;
+    },
+});
+
diff --git a/dev_odex30_accounting/odex30_account_asset/tests/__init__.py b/dev_odex30_accounting/odex30_account_asset/tests/__init__.py
new file mode 100644
index 0000000..c889a0c
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_asset/tests/__init__.py
@@ -0,0 +1,7 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+from . import common
+from . import test_account_asset
+from . import test_board_compute
+from . import test_reevaluation_asset
diff --git a/dev_odex30_accounting/odex30_account_asset/tests/common.py b/dev_odex30_accounting/odex30_account_asset/tests/common.py
new file mode 100644
index 0000000..d750f00
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_asset/tests/common.py
@@ -0,0 +1,36 @@
+from odoo import fields
+from odoo.addons.account.tests.common import AccountTestInvoicingCommon
+
+
+class TestAccountAssetCommon(AccountTestInvoicingCommon):
+
+    @classmethod
+    def create_asset(cls, value, periodicity, periods, degressive_factor=None, import_depreciation=0, **kwargs):
+        if degressive_factor is not None:
+            kwargs["method_progress_factor"] = degressive_factor
+        return cls.env['account.asset'].create({
+            'name': 'nice asset',
+            'account_asset_id': cls.company_data['default_account_assets'].id,
+            'account_depreciation_id': cls.company_data['default_account_assets'].copy().id,
+            'account_depreciation_expense_id': cls.company_data['default_account_expense'].id,
+            'journal_id': cls.company_data['default_journal_misc'].id,
+            'acquisition_date': "2020-02-01",
+            'prorata_computation_type': 'none',
+            'original_value': value,
+            'salvage_value': 0,
+            'method_number': periods,
+            'method_period': '12' if periodicity == "yearly" else '1',
+            'method': "linear",
+            'already_depreciated_amount_import': import_depreciation,
+            **kwargs,
+        })
+
+    @classmethod
+    def _get_depreciation_move_values(cls, date, depreciation_value, remaining_value, depreciated_value, state):
+        return {
+            'date': fields.Date.from_string(date),
+            'depreciation_value': depreciation_value,
+            'asset_remaining_value': remaining_value,
+            'asset_depreciated_value': depreciated_value,
+            'state': state,
+        }
diff --git a/dev_odex30_accounting/odex30_account_asset/tests/test_account_asset.py b/dev_odex30_accounting/odex30_account_asset/tests/test_account_asset.py
new file mode 100644
index 0000000..418bb2e
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_asset/tests/test_account_asset.py
@@ -0,0 +1,3172 @@
+# -*- coding: utf-8 -*-
+
+import time
+
+from dateutil.relativedelta import relativedelta
+from odoo import fields, Command
+from odoo.exceptions import UserError, MissingError
+from odoo.tests import Form, tagged, freeze_time
+from odoo.addons.account_reports.tests.common import TestAccountReportsCommon
+
+
+@freeze_time('2021-07-01')
+@tagged('post_install', '-at_install')
+class TestAccountAsset(TestAccountReportsCommon):
+
+    @classmethod
+    def setUpClass(cls):
+        super(TestAccountAsset, cls).setUpClass()
+        today = fields.Date.today()
+        cls.truck = cls.env['account.asset'].create({
+            'account_asset_id': cls.company_data['default_account_assets'].id,
+            'account_depreciation_id': cls.company_data['default_account_assets'].copy().id,
+            'account_depreciation_expense_id': cls.company_data['default_account_expense'].id,
+            'journal_id': cls.company_data['default_journal_misc'].id,
+            'name': 'truck',
+            'acquisition_date': today + relativedelta(years=-6, months=-6),
+            'original_value': 10000,
+            'salvage_value': 2500,
+            'method_number': 10,
+            'method_period': '12',
+            'method': 'linear',
+        })
+        cls.truck.validate()
+        cls.env['account.move']._autopost_draft_entries()
+
+        cls.account_asset_model_fixedassets = cls.env['account.asset'].create({
+            'account_depreciation_id': cls.company_data['default_account_assets'].copy().id,
+            'account_depreciation_expense_id': cls.company_data['default_account_expense'].id,
+            'account_asset_id': cls.company_data['default_account_assets'].id,
+            'journal_id': cls.company_data['default_journal_purchase'].id,
+            'name': 'Hardware - 3 Years',
+            'method_number': 3,
+            'method_period': '12',
+            'state': 'model',
+        })
+
+
+        cls.closing_invoice = cls.env['account.move'].create({
+            'move_type': 'out_invoice',
+            'invoice_line_ids': [(0, 0, {'price_unit': 100})]
+        })
+
+        cls.env.company.loss_account_id = cls.company_data['default_account_expense'].copy()
+        cls.env.company.gain_account_id = cls.company_data['default_account_revenue'].copy()
+        cls.assert_counterpart_account_id = cls.company_data['default_account_expense'].copy().id
+
+        cls.env.user.groups_id += cls.env.ref('analytic.group_analytic_accounting')
+        analytic_plan = cls.env['account.analytic.plan'].create({
+            'name': "Default Plan",
+        })
+        cls.analytic_account = cls.env['account.analytic.account'].create({
+            'name': "Test Account",
+            'plan_id': analytic_plan.id,
+        })
+
+    def update_form_values(self, asset_form):
+        for i in range(len(asset_form.depreciation_move_ids)):
+            with asset_form.depreciation_move_ids.edit(i) as line_edit:
+                line_edit.asset_remaining_value
+
+    def test_account_asset_no_tax(self):
+        self.account_asset_model_fixedassets.account_depreciation_expense_id.tax_ids = self.tax_purchase_a
+        CEO_car = self.env['account.asset'].create({
+            'salvage_value': 2000.0,
+            'state': 'open',
+            'method_period': '12',
+            'method_number': 5,
+            'name': "CEO's Car",
+            'original_value': 12000.0,
+            'model_id': self.account_asset_model_fixedassets.id,
+        })
+        CEO_car._onchange_model_id()
+        CEO_car.prorata_computation_type = 'constant_periods'
+        CEO_car.method_number = 5
+
+        # In order to test the process of Account Asset, I perform a action to confirm Account Asset.
+        CEO_car.validate()
+
+        self.assertFalse(any(CEO_car.depreciation_move_ids.line_ids.mapped('tax_line_id')))
+
+    def test_00_account_asset(self):
+        """Test the lifecycle of an asset"""
+        CEO_car = self.env['account.asset'].create({
+            'salvage_value': 2000.0,
+            'state': 'open',
+            'method_period': '12',
+            'method_number': 5,
+            'name': "CEO's Car",
+            'original_value': 12000.0,
+            'model_id': self.account_asset_model_fixedassets.id,
+        })
+        CEO_car._onchange_model_id()
+        CEO_car.prorata_computation_type = 'constant_periods'
+        CEO_car.method_number = 5
+
+        # In order to test the process of Account Asset, I perform a action to confirm Account Asset.
+        CEO_car.validate()
+
+        # TOFIX: the method validate() makes the field account.asset.asset_type
+        # dirty, but this field has to be flushed in CEO_car's environment.
+        # This is because the field 'asset_type' is stored, computed and
+        # context-dependent, which explains why its value must be retrieved
+        # from the right environment.
+        CEO_car.flush_recordset()
+
+        # I check Asset is now in Open state.
+        self.assertEqual(CEO_car.state, 'open',
+                         'Asset should be in Open state')
+
+        # I compute depreciation lines for asset of CEOs Car.
+        self.assertEqual(CEO_car.method_number + 1, len(CEO_car.depreciation_move_ids),
+                         'Depreciation lines not created correctly')
+
+        # Check that auto_post is set on the entries, in the future, and we cannot post them.
+        self.assertTrue(all(CEO_car.depreciation_move_ids.mapped(lambda m: m.auto_post != 'no')))
+        with self.assertRaises(UserError):
+            CEO_car.depreciation_move_ids.action_post()
+
+        # I Check that After creating all the moves of depreciation lines the state "Running".
+        CEO_car.depreciation_move_ids.write({'auto_post': 'no'})
+        CEO_car.depreciation_move_ids.action_post()
+        self.assertEqual(CEO_car.state, 'open',
+                         'State of asset should be runing')
+        self.assertRecordValues(CEO_car, [{
+            'original_value': 12000,
+            'book_value': 2000,
+            'value_residual': 0,
+            'salvage_value': 2000,
+        }])
+
+        self.assertRecordValues(CEO_car.depreciation_move_ids.sorted(lambda l: l.date), [{
+            'amount_total': 1000,
+            'asset_remaining_value': 9000,
+        }, {
+            'amount_total': 2000,
+            'asset_remaining_value': 7000,
+        }, {
+            'amount_total': 2000,
+            'asset_remaining_value': 5000,
+        }, {
+            'amount_total': 2000,
+            'asset_remaining_value': 3000,
+        }, {
+            'amount_total': 2000,
+            'asset_remaining_value': 1000,
+        }, {
+            'amount_total': 1000,
+            'asset_remaining_value': 0,
+        }])
+
+        # Revert posted entries in order to be able to close
+        CEO_car.depreciation_move_ids._reverse_moves(cancel=True)
+        self.assertRecordValues(CEO_car, [{
+            'original_value': 12000,
+            'book_value': 12000,
+            'value_residual': 10000,
+            'salvage_value': 2000,
+        }])
+        reversed_moves_values = [{
+            'amount_total': 1000,
+            'asset_remaining_value': 11000,
+            'state': 'posted',
+        }, {
+            'amount_total': 2000,
+            'asset_remaining_value': 13000,
+            'state': 'posted',
+        }, {
+            'amount_total': 2000,
+            'asset_remaining_value': 15000,
+            'state': 'posted',
+        }, {
+            'amount_total': 2000,
+            'asset_remaining_value': 17000,
+            'state': 'posted',
+        }, {
+            'amount_total': 2000,
+            'asset_remaining_value': 19000,
+            'state': 'posted',
+        }, {
+            'amount_total': 1000,
+            'asset_remaining_value': 20000,
+            'state': 'posted',
+        }, {
+            'amount_total': 1000,
+            'asset_remaining_value': 19000,
+            'state': 'posted',
+        }, {
+            'amount_total': 2000,
+            'asset_remaining_value': 17000,
+            'state': 'posted',
+        }, {
+            'amount_total': 2000,
+            'asset_remaining_value': 15000,
+            'state': 'posted',
+        }, {
+            'amount_total': 2000,
+            'asset_remaining_value': 13000,
+            'state': 'posted',
+        }, {
+            'amount_total': 2000,
+            'asset_remaining_value': 11000,
+            'state': 'posted',
+        }, {
+            'amount_total': 1000,
+            'asset_remaining_value': 10000,
+            'state': 'posted',
+        }, {
+            'amount_total': 10000,
+            'asset_remaining_value': 0,
+            'state': 'draft',
+        }]
+
+        self.assertRecordValues(CEO_car.depreciation_move_ids.sorted(lambda l: l.date), reversed_moves_values)
+        self.assertRecordValues(CEO_car.depreciation_move_ids.filtered(lambda l: l.state == 'draft').line_ids, [{
+            'debit': 0,
+            'credit': 10000,
+            'account_id': CEO_car.account_depreciation_id.id,
+        }, {
+            'debit': 10000,
+            'credit': 0,
+            'account_id': CEO_car.account_depreciation_expense_id.id,
+        }])
+
+        # Close
+        CEO_car.set_to_close(self.closing_invoice.invoice_line_ids, date=fields.Date.today() + relativedelta(days=-1))
+        self.assertRecordValues(CEO_car, [{
+            'original_value': 12000,
+            'book_value': 12000,
+            'value_residual': 10000,
+            'salvage_value': 2000,
+        }])
+        self.assertRecordValues(CEO_car.depreciation_move_ids.sorted(lambda l: (l.date, l.id)), [{
+            'amount_total': 12000,
+            'asset_remaining_value': 0,
+            'state': 'draft',
+        }, {
+            'amount_total': 1000,
+            'asset_remaining_value': 1000,
+            'state': 'posted',
+        }, {
+            'amount_total': 2000,
+            'asset_remaining_value': 3000,
+            'state': 'posted',
+        }, {
+            'amount_total': 2000,
+            'asset_remaining_value': 5000,
+            'state': 'posted',
+        }, {
+            'amount_total': 2000,
+            'asset_remaining_value': 7000,
+            'state': 'posted',
+        }, {
+            'amount_total': 2000,
+            'asset_remaining_value': 9000,
+            'state': 'posted',
+        }, {
+            'amount_total': 1000,
+            'asset_remaining_value': 10000,
+            'state': 'posted',
+        }, {
+            'amount_total': 1000,
+            'asset_remaining_value': 9000,
+            'state': 'posted',
+        }, {
+            'amount_total': 2000,
+            'asset_remaining_value': 7000,
+            'state': 'posted',
+        }, {
+            'amount_total': 2000,
+            'asset_remaining_value': 5000,
+            'state': 'posted',
+        }, {
+            'amount_total': 2000,
+            'asset_remaining_value': 3000,
+            'state': 'posted',
+        }, {
+            'amount_total': 2000,
+            'asset_remaining_value': 1000,
+            'state': 'posted',
+        }, {
+            'amount_total': 1000,
+            'asset_remaining_value': 0,
+            'state': 'posted',
+        }])
+        closing_move = CEO_car.depreciation_move_ids.filtered(lambda l: l.state == 'draft')
+        self.assertRecordValues(closing_move.line_ids, [{
+            'debit': 0,
+            'credit': 12000,
+            'account_id': CEO_car.account_asset_id.id,
+        }, {
+            'debit': 0,
+            'credit': 0,
+            'account_id': CEO_car.account_depreciation_id.id,
+        }, {
+            'debit': 100,
+            'credit': 0,
+            'account_id': self.closing_invoice.invoice_line_ids.account_id.id,
+        }, {
+            'debit': 11900,
+            'credit': 0,
+            'account_id': self.env.company.loss_account_id.id,
+        }])
+        closing_move.action_post()
+        self.assertRecordValues(CEO_car, [{
+            'original_value': 12000,
+            'book_value': 0,
+            'value_residual': 0,
+            'salvage_value': 2000,
+        }])
+
+    def test_00_account_asset_new(self):
+        """Test the lifecycle of an asset"""
+        CEO_car = self.env['account.asset'].create({
+            'salvage_value': 2000.0,
+            'state': 'open',
+            'method_period': '12',
+            'method_number': 5,
+            'name': "CEO's Car",
+            'original_value': 12000.0,
+            'model_id': self.account_asset_model_fixedassets.id,
+        })
+        CEO_car._onchange_model_id()
+        CEO_car.prorata_computation_type = 'constant_periods'
+        CEO_car.method_number = 5
+
+        # In order to test the process of Account Asset, I perform a action to confirm Account Asset.
+        CEO_car.validate()
+
+        # I Check that After creating all the moves of depreciation lines the state of the asset is "Running".
+        CEO_car.depreciation_move_ids.write({'auto_post': 'no'})
+        CEO_car.depreciation_move_ids.action_post()
+        self.assertEqual(CEO_car.state, 'open',
+                         'State of the asset should be running')
+        self.assertRecordValues(CEO_car, [{
+            'original_value': 12000,
+            'book_value': 2000,
+            'value_residual': 0,
+            'salvage_value': 2000,
+        }])
+        self.assertRecordValues(CEO_car.depreciation_move_ids.sorted(lambda l: l.date), [{
+            'amount_total': 1000,
+            'asset_remaining_value': 9000,
+        }, {
+            'amount_total': 2000,
+            'asset_remaining_value': 7000,
+        }, {
+            'amount_total': 2000,
+            'asset_remaining_value': 5000,
+        }, {
+            'amount_total': 2000,
+            'asset_remaining_value': 3000,
+        }, {
+            'amount_total': 2000,
+            'asset_remaining_value': 1000,
+        }, {
+            'amount_total': 1000,
+            'asset_remaining_value': 0,
+        }])
+
+        # Close
+        CEO_car.set_to_close(self.closing_invoice.invoice_line_ids, date=fields.Date.today() + relativedelta(days=30))
+        self.assertRecordValues(CEO_car, [{
+            'original_value': 12000,
+            'book_value': 12000,
+            'value_residual': 10000,
+            'salvage_value': 2000,
+        }])
+        self.assertRecordValues(CEO_car.depreciation_move_ids.sorted(lambda l: (l.date, l.id)), [{
+            'amount_total': 166.67,
+            'asset_remaining_value': 9833.33,
+            'state': 'draft',
+        }, {
+            'amount_total': 12000,
+            'asset_remaining_value': 0,
+            'state': 'draft',
+        }])
+        closing_move = max(CEO_car.depreciation_move_ids, key=lambda m: (m.date, m.id))
+        self.assertRecordValues(closing_move, [{
+            'date': fields.Date.today() + relativedelta(days=30),
+        }])
+        self.assertRecordValues(closing_move.line_ids, [{
+            'debit': 0,
+            'credit': 12000,
+            'account_id': CEO_car.account_asset_id.id,
+        }, {
+            'debit': 166.67,
+            'credit': 0,
+            'account_id': CEO_car.account_depreciation_id.id,
+        }, {
+            'debit': 100,
+            'credit': 0,
+            'account_id': self.closing_invoice.invoice_line_ids.account_id.id,
+        }, {
+            'debit': 11733.33,
+            'credit': 0,
+            'account_id': self.env.company.loss_account_id.id,
+        }])
+        CEO_car.depreciation_move_ids.auto_post = 'no'
+        CEO_car.depreciation_move_ids.action_post()
+        self.assertRecordValues(CEO_car, [{
+            'original_value': 12000,
+            'book_value': 0,
+            'value_residual': 0,
+            'salvage_value': 2000,
+            'state': 'close',
+        }])
+
+    def test_01_account_asset(self):
+        """ Test if an an asset is created when an invoice is validated with an
+        item on an account for generating entries.
+        """
+        account_asset_model = self.env['account.asset'].create({
+            'account_depreciation_id': self.company_data['default_account_assets'].id,
+            'account_depreciation_expense_id': self.company_data['default_account_expense'].id,
+            'journal_id': self.company_data['default_journal_misc'].id,
+            'name': 'Typical car - 3 Years',
+            'method_number': 3,
+            'method_period': '12',
+            'prorata_computation_type': 'daily_computation',
+            'state': 'model',
+        })
+
+        # The account needs a default model for the invoice to validate the revenue
+        self.company_data['default_account_assets'].create_asset = 'validate'
+        self.company_data['default_account_assets'].asset_model_ids = account_asset_model
+
+        invoice = self.env['account.move'].create({
+            'move_type': 'in_invoice',
+            'partner_id': self.env['res.partner'].create({'name': 'Res Partner 12'}).id,
+            'invoice_date': '2020-12-31',
+            'invoice_line_ids': [(0, 0, {
+                'name': 'Very little red car',
+                'account_id': self.company_data['default_account_assets'].id,
+                'price_unit': 450,
+                'quantity': 1,
+            })],
+        })
+        invoice.action_post()
+
+        asset = invoice.asset_ids
+        self.assertEqual(len(asset), 1, 'One and only one asset should have been created from invoice.')
+
+        self.assertTrue(asset.state == 'open',
+                        'Asset should be in Open state')
+        first_invoice_line = invoice.invoice_line_ids[0]
+        self.assertEqual(asset.original_value, first_invoice_line.price_subtotal,
+                         'Asset value is not same as invoice line.')
+
+        # I check data in move line and depreciation line.
+        first_depreciation_line = asset.depreciation_move_ids.sorted(lambda r: r.id)[0]
+        self.assertAlmostEqual(first_depreciation_line.asset_remaining_value, asset.original_value - first_depreciation_line.amount_total,
+                               msg='Remaining value is incorrect.')
+        self.assertAlmostEqual(first_depreciation_line.asset_depreciated_value, first_depreciation_line.amount_total,
+                               msg='Depreciated value is incorrect.')
+
+        # I check next installment date.
+        last_depreciation_date = first_depreciation_line.date
+        installment_date = last_depreciation_date + relativedelta(months=+int(asset.method_period))
+        self.assertEqual(asset.depreciation_move_ids.sorted(lambda r: r.id)[1].date, installment_date,
+                         'Installment date is incorrect.')
+
+    def test_02_account_asset(self):
+        """Test the lifecycle of an asset"""
+        CEO_car = self.env['account.asset'].create({
+            'salvage_value': 2000.0,
+            'state': 'open',
+            'method_period': '12',
+            'method_number': 5,
+            'name': "CEO's Car",
+            'original_value': 12000.0,
+            'model_id': self.account_asset_model_fixedassets.id,
+            'acquisition_date': '2010-01-31',
+            'already_depreciated_amount_import': 10000.0,
+        })
+        CEO_car._onchange_model_id()
+
+        CEO_car.validate()
+        self.assertRecordValues(CEO_car, [{
+            'original_value': 12000,
+            'book_value': 2000,
+            'value_residual': 0,
+            'salvage_value': 2000,
+        }])
+        self.assertFalse(CEO_car.depreciation_move_ids)
+        CEO_car.set_to_close(self.closing_invoice.invoice_line_ids)
+        self.assertRecordValues(CEO_car, [{
+            'original_value': 12000,
+            'book_value': 2000,
+            'value_residual': 0,
+            'salvage_value': 2000,
+        }])
+        closing_move = CEO_car.depreciation_move_ids.filtered(lambda l: l.state == 'draft')
+        self.assertRecordValues(closing_move.line_ids, [{
+            'debit': 0,
+            'credit': 12000,
+            'account_id': CEO_car.account_asset_id.id,
+        }, {
+            'debit': 10000,
+            'credit': 0,
+            'account_id': CEO_car.account_depreciation_id.id,
+        }, {
+            'debit': 100,
+            'credit': 0,
+            'account_id': self.closing_invoice.invoice_line_ids.account_id.id,
+        }, {
+            'debit': 1900,
+            'credit': 0,
+            'account_id': CEO_car.company_id.loss_account_id.id,
+        }])
+        closing_move.action_post()
+        self.assertRecordValues(CEO_car, [{
+            'original_value': 12000,
+            'book_value': 0,
+            'value_residual': 0,
+            'salvage_value': 2000,
+        }])
+
+    def test_03_account_asset(self):
+        """Test the salvage of an asset with gain"""
+        CEO_car = self.env['account.asset'].create({
+            'salvage_value': 0,
+            'state': 'open',
+            'method_period': '12',
+            'method_number': 5,
+            'name': "CEO's Car",
+            'original_value': 12000.0,
+            'model_id': self.account_asset_model_fixedassets.id,
+            'acquisition_date': '2010-01-31',
+            'already_depreciated_amount_import': 12000.0,
+        })
+        CEO_car._onchange_model_id()
+
+        CEO_car.validate()
+        self.assertRecordValues(CEO_car, [{
+            'original_value': 12000,
+            'book_value': 0,
+            'value_residual': 0,
+            'salvage_value': 0,
+        }])
+        self.assertFalse(CEO_car.depreciation_move_ids)
+        CEO_car.set_to_close(self.closing_invoice.invoice_line_ids)
+        self.assertRecordValues(CEO_car, [{
+            'original_value': 12000,
+            'book_value': 0,
+            'value_residual': 0,
+            'salvage_value': 0,
+        }])
+        closing_move = CEO_car.depreciation_move_ids.filtered(lambda l: l.state == 'draft')
+        self.assertRecordValues(closing_move.line_ids, [{
+            'debit': 0,
+            'credit': 12000,
+            'account_id': CEO_car.account_asset_id.id,
+        }, {
+            'debit': 12000,
+            'credit': 0,
+            'account_id': CEO_car.account_depreciation_id.id,
+        }, {
+            'debit': 100,
+            'credit': 0,
+            'account_id': self.closing_invoice.invoice_line_ids.account_id.id,
+        }, {
+            'debit': 0,
+            'credit': 100,
+            'account_id': CEO_car.company_id.gain_account_id.id,
+        }])
+        closing_move.action_post()
+        self.assertRecordValues(CEO_car, [{
+            'original_value': 12000,
+            'book_value': 0,
+            'value_residual': 0,
+            'salvage_value': 0,
+        }])
+
+    def test_04_account_asset(self):
+        """Test the salvage of an asset with gain"""
+        CEO_car = self.env['account.asset'].create({
+            'salvage_value': 0,
+            'state': 'open',
+            'method_period': '12',
+            'method_number': 5,
+            'name': "CEO's Car",
+            'original_value': 800.0,
+            'model_id': self.account_asset_model_fixedassets.id,
+            'acquisition_date': '2021-01-01',
+            'already_depreciated_amount_import': 300.0,
+        })
+        CEO_car._onchange_model_id()
+        CEO_car.method_number = 5
+
+        CEO_car.validate()
+        self.assertRecordValues(CEO_car, [{
+            'original_value': 800,
+            'book_value': 500,
+            'value_residual': 500,
+            'salvage_value': 0,
+        }])
+        self.assertEqual(len(CEO_car.depreciation_move_ids), 4)
+        CEO_car.set_to_close(self.closing_invoice.invoice_line_ids, date=fields.Date.today() + relativedelta(months=-6, days=-1))
+        self.assertRecordValues(CEO_car, [{
+            'original_value': 800,
+            'book_value': 500,
+            'value_residual': 500,
+            'salvage_value': 0,
+        }])
+        closing_move = CEO_car.depreciation_move_ids.filtered(lambda l: l.state == 'draft')
+        self.assertRecordValues(closing_move.line_ids, [{
+            'debit': 0,
+            'credit': 800,
+            'account_id': CEO_car.account_asset_id.id,
+        }, {
+            'debit': 300,
+            'credit': 0,
+            'account_id': CEO_car.account_depreciation_id.id,
+        }, {
+            'debit': 100,
+            'credit': 0,
+            'account_id': self.closing_invoice.invoice_line_ids.account_id.id,
+        }, {
+            'debit': 400,
+            'credit': 0,
+            'account_id': CEO_car.company_id.loss_account_id.id,
+        }])
+        closing_move.action_post()
+        self.assertRecordValues(CEO_car, [{
+            'original_value': 800,
+            'book_value': 0,
+            'value_residual': 0,
+            'salvage_value': 0,
+        }])
+
+    def test_05_account_asset(self):
+        """Test the salvage of an asset with gain"""
+        CEO_car = self.env['account.asset'].create({
+            'salvage_value': 0,
+            'state': 'open',
+            'method_period': '12',
+            'method_number': 5,
+            'name': "CEO's Car",
+            'original_value': 1000.0,
+            'model_id': self.account_asset_model_fixedassets.id,
+            'acquisition_date': '2020-01-01',
+        })
+        CEO_car._onchange_model_id()
+        CEO_car.method_number = 5
+        CEO_car.account_depreciation_id = CEO_car.account_asset_id
+
+        CEO_car.validate()
+        self.assertRecordValues(CEO_car, [{
+            'original_value': 1000,
+            'book_value': 800,
+            'value_residual': 800,
+            'salvage_value': 0,
+        }])
+        self.assertEqual(len(CEO_car.depreciation_move_ids), 5)
+        CEO_car.set_to_close(self.env['account.move.line'], date=fields.Date.today() + relativedelta(days=-1))
+        self.assertRecordValues(CEO_car, [{
+            'original_value': 1000,
+            'book_value': 700,
+            'value_residual': 700,
+            'salvage_value': 0,
+        }])
+        closing_move = CEO_car.depreciation_move_ids.filtered(lambda l: l.state == 'draft')
+        self.assertRecordValues(closing_move.line_ids, [{
+            'debit': 0,
+            'credit': 1000,
+            'account_id': CEO_car.account_asset_id.id,
+        }, {
+            'debit': 300,
+            'credit': 0,
+            'account_id': CEO_car.account_depreciation_id.id,
+        }, {
+            'debit': 700,
+            'credit': 0,
+            'account_id': CEO_car.company_id.loss_account_id.id,
+        }])
+        closing_move.action_post()
+        self.assertRecordValues(CEO_car, [{
+            'original_value': 1000,
+            'book_value': 0,
+            'value_residual': 0,
+            'salvage_value': 0,
+        }])
+
+    def test_06_account_asset(self):
+        """Test the correct computation of asset amounts"""
+        asset_account = self.env['account.account'].create({
+            "name": "test_06_account_asset",
+            "code": "test.06.account.asset",
+            "account_type": 'asset_non_current',
+            "create_asset": "no",
+            "multiple_assets_per_line": True,
+        })
+
+        CEO_car = self.env['account.asset'].create({
+            'salvage_value': 0,
+            'state': 'draft',
+            'method_period': '12',
+            'method_number': 4,
+            'name': "CEO's Car",
+            'original_value': 1000.0,
+            'acquisition_date': fields.Date.today() - relativedelta(years=3),
+            'account_asset_id': asset_account.id,
+            'account_depreciation_id': self.company_data['default_account_assets'].copy().id,
+            'account_depreciation_expense_id': asset_account.id,
+            'journal_id': self.company_data['default_journal_misc'].id,
+            'prorata_computation_type': 'none',
+        })
+
+        CEO_car.validate()
+        posted_entries = len(CEO_car.depreciation_move_ids.filtered(lambda x: x.state == 'posted'))
+        self.assertEqual(posted_entries, 3)
+
+        self.assertRecordValues(CEO_car, [{
+            'original_value': 1000,
+            'book_value': 250,
+            'value_residual': 250,
+            'salvage_value': 0,
+        }])
+
+    def test_account_asset_cancel(self):
+        """Test the cancellation of an asset"""
+        today = fields.Date.today()
+        CEO_car = self.env['account.asset'].create({
+            'salvage_value': 2000.0,
+            'state': 'open',
+            'method_period': '12',
+            'method_number': 5,
+            'name': "CEO's Car",
+            'original_value': 12000.0,
+            'model_id': self.account_asset_model_fixedassets.id,
+            'acquisition_date': today + relativedelta(years=-3, month=1, day=1),
+        })
+        CEO_car._onchange_model_id()
+        CEO_car.method_number = 5
+        CEO_car.validate()
+
+        self.assertRecordValues(CEO_car, [{
+            'original_value': 12000,
+            'book_value': 6000,
+            'value_residual': 4000,
+            'salvage_value': 2000,
+        }])
+        CEO_car.set_to_cancelled()
+
+        self.assertEqual(CEO_car.state, 'cancelled')
+        self.assertFalse(CEO_car.depreciation_move_ids)
+
+        # Hashed journals should reverse entries instead of deleting
+        Hashed_car = CEO_car.copy()
+        Hashed_car.write({
+            'original_value': 12000.0,
+            'method_number': 5,
+            'name': "Hashed Car",
+            'journal_id': CEO_car.journal_id.copy().id,
+            'acquisition_date': today + relativedelta(years=-3, month=1, day=1),
+        })
+        Hashed_car.journal_id.restrict_mode_hash_table = True
+        Hashed_car.validate()
+        self.assertTrue(False not in Hashed_car.depreciation_move_ids[:3].mapped('inalterable_hash'))
+
+        for i in range(0, 4):
+            self.assertFalse(Hashed_car.depreciation_move_ids[i].reversal_move_ids)
+
+        Hashed_car.set_to_cancelled()
+
+        self.assertEqual(Hashed_car.state, 'cancelled')
+        for i in range(0, 2):
+            self.assertTrue(Hashed_car.depreciation_move_ids[i].reversal_move_ids.id > 0 or Hashed_car.depreciation_move_ids[i].reversed_entry_id.id > 0)
+
+        # The depreciation schedule report should not contain cancelled assets
+        report = self.env.ref('odex30_account_asset.assets_report')
+        options = self._generate_options(report, today + relativedelta(years=-6, month=1, day=1), today + relativedelta(years=+4, month=12, day=31))
+        lines = report._get_lines({**options, **{'unfold_all': False, 'all_entries': True}})
+        assets_in_report = [x['name'] for x in lines[:-1]]
+
+        self.assertNotIn(CEO_car.name, assets_in_report)
+        self.assertNotIn(Hashed_car.name, assets_in_report)
+
+        # When a lock date is applied, only the moves before the date are reversed, others are deleted
+        Locked_car = CEO_car.copy()
+        Locked_car.write({
+            'original_value': 12000.0,
+            'method_number': 10,
+            'name': "Locked Car",
+            'acquisition_date': today + relativedelta(years=-3, month=1, day=1),
+        })
+        Locked_car.validate()
+        Locked_car.company_id.fiscalyear_lock_date = today + relativedelta(years=-1)
+
+        self.assertEqual(len(Locked_car.depreciation_move_ids), 10)
+        Locked_car.set_to_cancelled()
+        self.assertRecordValues(Locked_car, [{
+            'state': 'cancelled',
+            'book_value': 12000.0,
+            'value_residual': 10000,
+            'salvage_value': 2000,
+        }])
+        self.assertEqual(len(Locked_car.depreciation_move_ids), 4)
+        for depreciation in Locked_car.depreciation_move_ids:
+            self.assertTrue(depreciation.reversal_move_ids or depreciation.reversed_entry_id)
+
+
+    def test_asset_form(self):
+        """Test the form view of assets"""
+        asset_form = Form(self.env['account.asset'])
+        asset_form.name = "Test Asset"
+        asset_form.original_value = 10000
+        asset_form.account_depreciation_id = self.company_data['default_account_assets']
+        asset_form.account_depreciation_expense_id = self.company_data['default_account_expense']
+        asset_form.journal_id = self.company_data['default_journal_misc']
+        asset_form.prorata_computation_type = 'none'
+        asset = asset_form.save()
+        asset.validate()
+
+        # Test that the depreciations are created upon validation of the asset according to the default values
+        self.assertEqual(len(asset.depreciation_move_ids), 5)
+        for move in asset.depreciation_move_ids:
+            self.assertEqual(move.amount_total, 2000)
+
+        # Test that we cannot validate an asset with non zero remaining value of the last depreciation line
+        asset_form = Form(asset)
+        with self.assertRaises(UserError):
+            with self.cr.savepoint():
+                with asset_form.depreciation_move_ids.edit(4) as line_edit:
+                    line_edit.depreciation_value = 1000.0
+                asset_form.save()
+
+        # ... but we can with a zero remaining value on the last line.
+        asset_form = Form(asset)
+        with asset_form.depreciation_move_ids.edit(4) as line_edit:
+            line_edit.depreciation_value = 1000.0
+        with asset_form.depreciation_move_ids.edit(3) as line_edit:
+            line_edit.depreciation_value = 3000.0
+        self.update_form_values(asset_form)
+        asset_form.save()
+
+    def test_negative_asset_balance_inversion(self):
+        """
+        Test that an asset with a negative original value generates depreciation moves
+        with inverted balances (i.e., credit instead of debit) compared to a positive asset.
+        Also check that manual adjustments to depreciation values correctly reflect in invoice lines.
+        """
+        asset_account = self.company_data['default_account_assets'].id
+        expense_account = self.company_data['default_account_expense'].id
+        asset = self.env['account.asset'].create({
+            'name': "Test Asset",
+            'original_value': -10000,
+            'account_depreciation_id': asset_account,
+            'account_depreciation_expense_id': expense_account,
+            'journal_id': self.company_data['default_journal_misc'].id,
+            'prorata_computation_type': 'none',
+        })
+        asset.compute_depreciation_board()
+
+        # Test that the depreciations are created upon validation of the asset according to the default values
+        self.assertEqual(len(asset.depreciation_move_ids), 5)
+        for move in asset.depreciation_move_ids:
+            self.assertEqual(move.depreciation_value, -2000)
+
+        with Form(asset) as asset_form:
+            with asset_form.depreciation_move_ids.edit(4) as line_edit:
+                line_edit.depreciation_value = -1000.0
+            with asset_form.depreciation_move_ids.edit(3) as line_edit:
+                line_edit.depreciation_value = -3000.0
+        self.update_form_values(asset_form)
+
+        self.assertRecordValues(asset.depreciation_move_ids[0].line_ids, [
+            {'account_id': asset_account, 'balance': 1000.0},
+            {'account_id': expense_account, 'balance': -1000.0},
+        ])
+
+        self.assertRecordValues(asset.depreciation_move_ids[1].line_ids, [
+            {'account_id': asset_account, 'balance': 3000.0},
+            {'account_id': expense_account, 'balance': -3000.0},
+        ])
+
+    def test_asset_change_depreciation_expense_account(self):
+        """Check computation of depreciation_value is correct even when expense account was changed"""
+        self.env['account.move'].search([('state', '=', 'draft')]).unlink()  # allow setting the lock date below
+        asset = self.env['account.asset'].create({
+            'name': 'Test asset',
+            'acquisition_date': '2011-07-01',
+            'original_value': 1000.0,
+            'account_asset_id': self.company_data['default_account_assets'].id,
+            'account_depreciation_id': self.company_data['default_account_assets'].id,
+            'account_depreciation_expense_id': self.company_data['default_account_expense'].id,
+        })
+        asset.validate()
+
+        sorted_depreciation_moves = asset.depreciation_move_ids.sorted(lambda l: l.date)
+        td = fields.Date.to_date
+        self.assertRecordValues(sorted_depreciation_moves, [
+            {'date': td('2011-12-31'), 'depreciation_value': 100},
+            {'date': td('2012-12-31'), 'depreciation_value': 200},
+            {'date': td('2013-12-31'), 'depreciation_value': 200},
+            {'date': td('2014-12-31'), 'depreciation_value': 200},
+            {'date': td('2015-12-31'), 'depreciation_value': 200},
+            {'date': td('2016-12-31'), 'depreciation_value': 100},
+        ])
+
+        # Simulate life cycle of the asset by doing the following:
+        # - Auto posting of depreciation move at their planned date
+        # - Change the depreciation expense account after depreciation entry for 3rd period is posted
+        # - Set a lock date after each period so that changing the depreciation expense account
+        #   does not modify the account from expense line on existing posted depreciation entries
+        new_depreciation_expense_account = asset.account_depreciation_expense_id.copy()
+        for period, depreciation_move in enumerate(sorted_depreciation_moves):
+            with self.subTest(period=period, depreciation_date=depreciation_move.date), freeze_time(depreciation_move.date):
+
+                self.env["account.move"]._autopost_draft_entries()
+
+                if period == 3:
+                    asset.account_depreciation_expense_id = new_depreciation_expense_account
+
+                # Ensure expense line of depreciation entry use the right account
+                expense_line = depreciation_move.line_ids.filtered(lambda line: line.account_id.internal_group == "expense")
+                if period > 2:
+                    self.assertEqual(expense_line.account_id, new_depreciation_expense_account)
+                else:
+                    self.assertEqual(expense_line.account_id, self.company_data['default_account_expense'])
+
+                lock_wiz = self.env["account.change.lock.date"].create({"fiscalyear_lock_date": depreciation_move.date})
+                with freeze_time('9999-12-31'):
+                    lock_wiz.change_lock_date()
+
+        # Force recomputation of depreciation_value (this would fail due to unbalanced entry in case
+        #   we consider only the asset's expense account in the inverse function)
+        depreciation_field = self.env['account.move']._fields['depreciation_value']
+        self.env.add_to_compute(depreciation_field, sorted_depreciation_moves)
+
+        self.assertRecordValues(sorted_depreciation_moves, [
+            {'date': td('2011-12-31'), 'depreciation_value': 100},
+            {'date': td('2012-12-31'), 'depreciation_value': 200},
+            {'date': td('2013-12-31'), 'depreciation_value': 200},
+            {'date': td('2014-12-31'), 'depreciation_value': 200},
+            {'date': td('2015-12-31'), 'depreciation_value': 200},
+            {'date': td('2016-12-31'), 'depreciation_value': 100},
+        ])
+
+    def test_asset_from_entry_line_form(self):
+        """Test that the asset is correcly created from a move line"""
+
+        move_ids = self.env['account.move'].create([{
+            'ref': 'line1',
+            'line_ids': [
+                (0, 0, {
+                    'account_id': self.company_data['default_account_expense'].id,
+                    'debit': 300,
+                    'name': 'Furniture',
+                }),
+                (0, 0, {
+                    'account_id': self.company_data['default_account_assets'].id,
+                    'credit': 300,
+                }),
+            ]
+        }, {
+            'ref': 'line2',
+            'line_ids': [
+                (0, 0, {
+                    'account_id': self.company_data['default_account_expense'].id,
+                    'debit': 600,
+                    'name': 'Furniture too',
+                }),
+                (0, 0, {
+                    'account_id': self.company_data['default_account_assets'].id,
+                    'credit': 600,
+                }),
+            ]
+        },
+        ])
+        move_ids.action_post()
+        move_line_ids = move_ids.mapped('line_ids').filtered(lambda x: x.debit)
+
+        asset_form = Form(self.env['account.asset'].with_context(default_original_move_line_ids=move_line_ids.ids))
+        asset_form.original_move_line_ids = move_line_ids
+        asset_form.account_depreciation_expense_id = self.company_data['default_account_expense']
+
+        asset = asset_form.save()
+        self.assertEqual(asset.value_residual, 900.0)
+        self.assertIn(asset.name, ['Furniture', 'Furniture too'])
+        self.assertEqual(asset.journal_id.type, 'general')
+        self.assertEqual(asset.account_asset_id, self.company_data['default_account_expense'])
+        self.assertEqual(asset.account_depreciation_id, self.company_data['default_account_expense'])
+        self.assertEqual(asset.account_depreciation_expense_id, self.company_data['default_account_expense'])
+        self.assertEqual(asset.acquisition_date, min(move_ids.mapped('date')))
+
+    def test_asset_from_bill_move_line_form(self):
+        """Test that the asset is correcly created from a move line"""
+
+        move_ids = self.env['account.move'].create([{
+            'move_type': 'in_invoice',
+            'partner_id': self.partner_a.id,
+            'ref': 'line1',
+            'date': '2020-06-01',
+            'invoice_date': '2020-06-15',
+            'invoice_line_ids': [
+                Command.create({
+                    'account_id': self.company_data['default_account_expense'].id,
+                    'price_unit': 300,
+                    'name': 'Furniture',
+                    'tax_ids': [],
+                }),
+            ]
+        }, {
+            'move_type': 'in_invoice',
+            'partner_id': self.partner_a.id,
+            'ref': 'line2',
+            'date': '2020-06-01',
+            'invoice_date': '2020-06-14',
+            'invoice_line_ids': [
+                Command.create({
+                    'account_id': self.company_data['default_account_expense'].id,
+                    'price_unit': 600,
+                    'name': 'Furniture too',
+                    'tax_ids': [],
+                }),
+            ]
+        },
+        ])
+        move_ids.action_post()
+        move_line_ids = move_ids.mapped('line_ids').filtered(lambda x: x.debit)
+
+        asset_form = Form(self.env['account.asset'].with_context(default_original_move_line_ids=move_line_ids.ids))
+        asset_form.original_move_line_ids = move_line_ids
+        asset_form.account_depreciation_expense_id = self.company_data['default_account_expense']
+
+        asset = asset_form.save()
+        self.assertEqual(asset.value_residual, 900.0)
+        self.assertRecordValues(asset, [{
+            'name': 'Furniture',
+            'account_asset_id': self.company_data['default_account_expense'].id,
+            'account_depreciation_id': self.company_data['default_account_expense'].id,
+            'account_depreciation_expense_id': self.company_data['default_account_expense'].id,
+            'acquisition_date': min(move_ids.mapped('invoice_date')),
+        }])
+
+    def test_asset_from_bill_move_line_form_multicurrency(self):
+        """Test that the asset is correcly created from a move line using a foreign currency"""
+
+        asset_account = self.company_data['default_account_assets']
+        non_deductible_tax = self.env['account.tax'].create({
+            'name': 'Non-deductible Tax',
+            'amount': 21,
+            'amount_type': 'percent',
+            'type_tax_use': 'purchase',
+            'invoice_repartition_line_ids': [
+                Command.create({'repartition_type': 'base'}),
+                Command.create({
+                    'factor_percent': 50,
+                    'repartition_type': 'tax',
+                    'use_in_tax_closing': False
+                }),
+                Command.create({
+                    'factor_percent': 50,
+                    'repartition_type': 'tax',
+                    'use_in_tax_closing': True
+                }),
+            ],
+            'refund_repartition_line_ids': [
+                Command.create({'repartition_type': 'base'}),
+                Command.create({
+                    'factor_percent': 50,
+                    'repartition_type': 'tax',
+                    'use_in_tax_closing': False
+                }),
+                Command.create({
+                    'factor_percent': 50,
+                    'repartition_type': 'tax',
+                    'use_in_tax_closing': True
+                }),
+            ],
+        })
+        asset_account.tax_ids = non_deductible_tax
+
+        asset_account.create_asset = 'no'
+        asset_account.multiple_assets_per_line = False
+
+        vendor_bill = self.env['account.move'].create({
+            'move_type': 'in_invoice',
+            'currency_id': self.other_currency.id,
+            'invoice_date': '2020-01-01',
+            'partner_id': self.partner_a.id,
+            'invoice_line_ids': [
+                Command.create({
+                    'account_id': asset_account.id,
+                    'currency_id': self.other_currency.id,
+                    'name': 'Asus Laptop',
+                    'price_unit': 1000.0,
+                    'quantity': 1,
+                    'tax_ids': [Command.set(non_deductible_tax.ids)]
+                }),
+                Command.create({
+                    'account_id': asset_account.id,
+                    'currency_id': self.other_currency.id,
+                    'name': 'Lenovo Laptop',
+                    'price_unit': 500.0,
+                    'quantity': 1,
+                    'tax_ids': [Command.set(non_deductible_tax.ids)]
+                }),
+            ],
+        })
+        vendor_bill.action_post()
+        self.env.flush_all()
+
+        move_line_ids = vendor_bill.mapped('line_ids').filtered(lambda x: x.name and 'Laptop' in x.name)
+        asset_form = Form(self.env['account.asset'].with_context(
+            default_original_move_line_ids=move_line_ids.ids,
+            asset_type='purchase'
+        ))
+        asset_form.original_move_line_ids = move_line_ids
+        asset_form.account_depreciation_expense_id = self.company_data['default_account_expense']
+
+        new_assets = asset_form.save()
+        self.assertEqual(len(new_assets), 1)
+        self.assertEqual(new_assets.original_value, 828.75)
+        self.assertEqual(new_assets.non_deductible_tax_value, 78.75)
+
+    def test_asset_modify_value_00(self):
+        """Test the values of the asset and value increase 'assets' after a
+        modification of residual and/or salvage values.
+        Increase the residual value, increase the salvage value"""
+        self.assertEqual(self.truck.value_residual, 3000)
+        self.assertEqual(self.truck.salvage_value, 2500)
+
+        self.env['asset.modify'].create({
+            'name': 'New beautiful sticker :D',
+            'asset_id': self.truck.id,
+            'value_residual': 4000,
+            'salvage_value': 3000,
+            'date':  fields.Date.today() + relativedelta(months=-6, days=-1),
+            "account_asset_counterpart_id": self.assert_counterpart_account_id,
+            "account_depreciation_id": self.company_data['default_account_assets'].id,
+        }).modify()
+        self.assertEqual(self.truck.value_residual, 3000)
+        self.assertEqual(self.truck.salvage_value, 2500)
+        self.assertEqual(self.truck.children_ids.value_residual, 1000)
+        self.assertEqual(self.truck.children_ids.salvage_value, 500)
+        self.assertEqual(self.truck.account_depreciation_id.id, self.company_data['default_account_assets'].id)
+
+    def test_asset_modify_value_01(self):
+        "Decrease the residual value, decrease the salvage value"
+        self.env['asset.modify'].create({
+            'name': "Accident :'(",
+            'date':  fields.Date.today() + relativedelta(months=-6, days=-1),
+            'asset_id': self.truck.id,
+            'value_residual': 1000,
+            'salvage_value': 2000,
+            "account_asset_counterpart_id": self.assert_counterpart_account_id,
+        }).modify()
+        self.assertEqual(self.truck.value_residual, 1000)
+        self.assertEqual(self.truck.salvage_value, 2000)
+        self.assertEqual(self.truck.children_ids.value_residual, 0)
+        self.assertEqual(self.truck.children_ids.salvage_value, 0)
+        self.assertEqual(max(self.truck.depreciation_move_ids.filtered(lambda m: m.state == 'posted'), key=lambda m: (m.date, m.id)).amount_total, 2500)
+
+    def test_asset_modify_value_02(self):
+        "Decrease the residual value, increase the salvage value; same book value"
+        self.env['asset.modify'].create({
+            'name': "Don't wanna depreciate all of it",
+            'asset_id': self.truck.id,
+            'date':  fields.Date.today() + relativedelta(months=-6, days=-1),
+            'value_residual': 1000,
+            'salvage_value': 4500,
+            "account_asset_counterpart_id": self.assert_counterpart_account_id,
+        }).modify()
+        self.assertEqual(self.truck.value_residual, 1000)
+        self.assertEqual(self.truck.salvage_value, 4500)
+        self.assertEqual(self.truck.children_ids.value_residual, 0)
+        self.assertEqual(self.truck.children_ids.salvage_value, 0)
+
+    def test_asset_modify_value_03(self):
+        "Decrease the residual value, increase the salvage value; increase of book value"
+        self.env['asset.modify'].create({
+            'name': "Some aliens did something to my truck",
+            'asset_id': self.truck.id,
+            'date':  fields.Date.today() + relativedelta(months=-6, days=-1),
+            'value_residual': 1000,
+            'salvage_value': 6000,
+            "account_asset_counterpart_id": self.assert_counterpart_account_id,
+        }).modify()
+        self.assertEqual(self.truck.value_residual, 1000)
+        self.assertEqual(self.truck.salvage_value, 4500)
+        self.assertEqual(self.truck.children_ids.value_residual, 0)
+        self.assertEqual(self.truck.children_ids.salvage_value, 1500)
+
+    def test_asset_modify_value_04(self):
+        "Increase the residual value, decrease the salvage value; increase of book value"
+        self.env['asset.modify'].create({
+            'name': 'GODZILA IS REAL!',
+            'asset_id': self.truck.id,
+            'date':  fields.Date.today() + relativedelta(months=-6, days=-1),
+            'value_residual': 4000,
+            'salvage_value': 2000,
+            "account_asset_counterpart_id": self.assert_counterpart_account_id,
+        }).modify()
+        self.assertEqual(self.truck.value_residual, 3500)
+        self.assertEqual(self.truck.salvage_value, 2000)
+        self.assertEqual(self.truck.children_ids.value_residual, 500)
+        self.assertEqual(self.truck.children_ids.salvage_value, 0)
+
+    def test_asset_modify_report(self):
+        """Test the asset value modification flows"""
+        #           PY      +   -  Final    PY     +    - Final Bookvalue
+        #   -6       0  10000   0  10000     0   750    0   750      9250
+        #   -5   10000      0   0  10000   750   750    0  1500      8500
+        #   -4   10000      0   0  10000  1500   750    0  2250      7750
+        #   -3   10000      0   0  10000  2250   750    0  3000      7000
+        #   -2   10000      0   0  10000  3000   750    0  3750      6250
+        #   -1   10000      0   0  10000  3750   750    0  4500      5500
+        #    0   10000      0   0  10000  4500   750    0  5250      4750  <-- today
+        #    1   10000      0   0  10000  5250   750    0  6000      4000
+        #    2   10000      0   0  10000  6000   750    0  6750      3250
+        #    3   10000      0   0  10000  6750   750    0  7500      2500
+
+        today = fields.Date.today()
+
+        report = self.env.ref('odex30_account_asset.assets_report')
+        # TEST REPORT
+        # look at all period, with unposted entries
+        options = self._generate_options(report, today + relativedelta(years=-6, month=1, day=1), today + relativedelta(years=+4, month=12, day=31))
+        lines = report._get_lines({**options, **{'unfold_all': False, 'all_entries': True}})
+        self.assertListEqual([    0.0, 10000.0,     0.0, 10000.0,     0.0,  7500.0,     0.0,  7500.0,  2500.0],
+                             [x['no_format'] for x in lines[0]['columns'][4:]])
+
+        # look at all period, without unposted entries
+        options = self._generate_options(report, today + relativedelta(years=-6, month=1, day=1), today + relativedelta(years=+4, month=12, day=31))
+        lines = report._get_lines({**options, **{'unfold_all': False, 'all_entries': False}})
+        self.assertListEqual([    0.0, 10000.0,     0.0, 10000.0,     0.0,  4500.0,     0.0,  4500.0,  5500.0],
+                             [x['no_format'] for x in lines[0]['columns'][4:]])
+
+        # look only at this period
+        options = self._generate_options(report, today + relativedelta(years=0, month=1, day=1), today + relativedelta(years=0, month=12, day=31))
+        lines = report._get_lines({**options, **{'unfold_all': False, 'all_entries': True}})
+        self.assertListEqual([10000.0,     0.0,     0.0, 10000.0,  4500.0,   750.0,     0.0,  5250.0,  4750.0],
+                             [x['no_format'] for x in lines[0]['columns'][4:]])
+
+        # test value increase
+        #           PY     +   -  Final    PY     +    - Final Bookvalue
+        #   -6       0 10000   0  10000         750    0   750      9250
+        #   -5   10000     0   0  10000   750   750    0  1500      8500
+        #   -4   10000     0   0  10000  1500   750    0  2250      7750
+        #   -3   10000     0   0  10000  2250   750    0  3000      7000
+        #   -2   10000     0   0  10000  3000   750    0  3750      6250
+        #   -1   10000  1500   0  10000  3750   950    0  4700      6800
+        #    0   10000     0   0  11500  4700   950    0  5650      5850  <--  today
+        #    1   11500     0   0  11500  5650   950    0  6600      4900
+        #    2   11500     0   0  11500  6600   950    0  7550      3950
+        #    3   11500     0   0  11500  7550   950    0  8500      3000
+        self.assertEqual(self.truck.value_residual, 3000)
+        self.assertEqual(self.truck.salvage_value, 2500)
+        self.env['asset.modify'].create({
+            'name': 'New beautiful sticker :D',
+            'asset_id': self.truck.id,
+            'date': fields.Date.today() + relativedelta(years=-1, months=-6, days=-1),
+            'value_residual': 4750,
+            'salvage_value': 3000,
+            "account_asset_counterpart_id": self.assert_counterpart_account_id,
+        }).modify()
+
+        self.assertEqual(self.truck.value_residual + sum(self.truck.children_ids.mapped('value_residual')), 3800)
+        self.assertEqual(self.truck.salvage_value + sum(self.truck.children_ids.mapped('salvage_value')), 3000)
+
+        # look at all period, with unposted entries
+        options = self._generate_options(report, today + relativedelta(years=-6, months=-6), today + relativedelta(years=+4, month=12, day=31))
+        lines = report._get_lines({**options, **{'unfold_all': False, 'all_entries': True}})
+        self.assertListEqual([0.0, 11500.0, 0.0, 11500.0, 0.0, 8500.0, 0.0, 8500.0, 3000.0],
+                             [x['no_format'] for x in lines[0]['columns'][4:]])
+        self.assertEqual('10 y', lines[1]['columns'][3]['name'], 'Depreciation Rate = 10%')
+
+        # look only at this period
+        options = self._generate_options(report, today + relativedelta(years=0, month=1, day=1), today + relativedelta(years=0, month=12, day=31))
+        lines = report._get_lines({**options, **{'unfold_all': False, 'all_entries': True}})
+        self.assertListEqual([11500.0, 0.0, 0.0, 11500.0, 4700.0, 950.0, 0.0, 5650.0, 5850.0],
+                             [x['no_format'] for x in lines[0]['columns'][4:]])
+
+        # test value decrease
+        self.env['asset.modify'].create({
+            'name': "Huge scratch on beautiful sticker :'( It is ruined",
+            'date': fields.Date.today() + relativedelta(months=-6, days=-1),
+            'asset_id': self.truck.children_ids.id,
+            'value_residual': 0,
+            'salvage_value': 500,
+            "account_asset_counterpart_id": self.assert_counterpart_account_id,
+        }).modify()
+        self.env['asset.modify'].create({
+            'name': "Huge scratch on beautiful sticker :'( It went through...",
+            'date': fields.Date.today() + relativedelta(months=-6, days=-1),
+            'asset_id': self.truck.id,
+            'value_residual': 1000,
+            'salvage_value': 2500,
+            "account_asset_counterpart_id": self.assert_counterpart_account_id,
+        }).modify()
+        self.assertEqual(self.truck.value_residual + sum(self.truck.children_ids.mapped('value_residual')), 1000)
+        self.assertEqual(self.truck.salvage_value + sum(self.truck.children_ids.mapped('salvage_value')), 3000)
+
+        # look at all period, with unposted entries
+        options = self._generate_options(report, today + relativedelta(years=-6, month=1, day=1), today + relativedelta(years=+4, month=12, day=31))
+        lines = report._get_lines({**options, **{'unfold_all': False, 'all_entries': True}})
+        self.assertListEqual([0.0, 11500.0, 0.0, 11500.0, 0.0, 8500.0, 0.0, 8500.0, 3000.0],
+                             [x['no_format'] for x in lines[0]['columns'][4:]])
+
+        # look only at previous period
+        options = self._generate_options(report, today + relativedelta(years=-1, month=1, day=1), today + relativedelta(years=-1, month=12, day=31))
+        lines = report._get_lines({**options, **{'unfold_all': False, 'all_entries': True}})
+        self.assertListEqual([10000.0, 1500.0, 0.0, 11500.0, 3750.0, 3750.0, 0.0, 7500.0, 4000.0],
+                             [x['no_format'] for x in lines[0]['columns'][4:]])
+
+    def test_asset_pause_resume(self):
+        """Test that depreciation remains the same after a pause and resume at a later date"""
+        today = fields.Date.today()
+        self.assertEqual(len(self.truck.depreciation_move_ids.filtered(lambda e: e.state == 'draft')), 4)
+        self.env['asset.modify'].create({
+            'date': fields.Date.today() + relativedelta(days=-1),
+            'asset_id': self.truck.id,
+        }).pause()
+        self.assertEqual(len(self.truck.depreciation_move_ids.filtered(lambda e: e.state == 'draft')), 0)
+        with freeze_time(today) as frozen_time:
+            frozen_time.move_to(today + relativedelta(years=1))
+            self.env['asset.modify'].with_context(resume_after_pause=True).create({
+                'asset_id': self.truck.id,
+            }).modify()
+            self.assertEqual(len(self.truck.depreciation_move_ids.filtered(lambda e: e.state == 'posted')), 7)
+            self.assertEqual(
+                self.truck.depreciation_move_ids.filtered(lambda e: e.state == 'draft').mapped('amount_total'),
+                [375.0, 750.0, 750.0, 750.0])
+
+    def test_asset_modify_sell_profit(self):
+        """Test that a credit is realised in the gain account when selling an asset for a sum greater than book value"""
+        closing_invoice = self.env['account.move'].create({
+            'move_type': 'out_invoice',
+            'invoice_line_ids': [(0, 0, {'price_unit': self.truck.book_value + 100})]
+        })
+        self.env['asset.modify'].create({
+            'asset_id': self.truck.id,
+            'invoice_line_ids': closing_invoice.invoice_line_ids,
+            'date': fields.Date.today() + relativedelta(months=-6, days=-1),
+            'modify_action': 'sell',
+        }).sell_dispose()
+
+        closing_move = self.truck.depreciation_move_ids.filtered(lambda l: l.state == 'draft')
+        self.assertRecordValues(closing_move.line_ids, [{
+            'ref': 'truck: Sale',
+            'debit': 0,
+            'credit': 10000,
+            'account_id': self.truck.account_asset_id.id,
+        }, {
+            'ref': 'truck: Sale',
+            'debit': 4500,
+            'credit': 0,
+            'account_id': self.truck.account_depreciation_id.id,
+        }, {
+            'ref': 'truck: Sale',
+            'debit': 5600,
+            'credit': 0,
+            'account_id': closing_invoice.invoice_line_ids.account_id.id,
+        }, {
+            'ref': 'truck: Sale',
+            'debit': 0,
+            'credit': 100,
+            'account_id': self.env.company.gain_account_id.id,
+        }])
+
+    def test_asset_modify_sell_loss(self):
+        """Test that a debit is realised in the loss account when selling an asset for a sum less than book value"""
+        closing_invoice = self.env['account.move'].create({
+            'move_type': 'out_invoice',
+            'invoice_line_ids': [(0, 0, {'price_unit': self.truck.book_value - 100})]
+        })
+        self.env['asset.modify'].create({
+            'asset_id': self.truck.id,
+            'invoice_line_ids': closing_invoice.invoice_line_ids,
+            'date': fields.Date.today() + relativedelta(months=-6, days=-1),
+            'modify_action': 'sell',
+        }).sell_dispose()
+        closing_move = self.truck.depreciation_move_ids.filtered(lambda l: l.state == 'draft')
+
+        self.assertRecordValues(closing_move.line_ids, [{
+            'ref': 'truck: Sale',
+            'debit': 0,
+            'credit': 10000,
+            'account_id': self.truck.account_asset_id.id,
+        }, {
+            'ref': 'truck: Sale',
+            'debit': 4500,
+            'credit': 0,
+            'account_id': self.truck.account_depreciation_id.id,
+        }, {
+            'ref': 'truck: Sale',
+            'debit': 5400,
+            'credit': 0,
+            'account_id': closing_invoice.invoice_line_ids.account_id.id,
+        }, {
+            'ref': 'truck: Sale',
+            'debit': 100,
+            'credit': 0,
+            'account_id': self.env.company.loss_account_id.id,
+        }])
+
+    def test_asset_sale_same_account_as_invoice(self):
+        """Test the sale of an asset with an invoice that has the same account as the Depreciation Account"""
+        closing_invoice = self.env['account.move'].create({
+            'move_type': 'out_invoice',
+            'invoice_line_ids': [
+                Command.create({
+                    'account_id': self.truck.account_depreciation_id.id,
+                    'price_unit': self.truck.book_value - 100
+                })
+            ]
+        })
+        self.env['asset.modify'].create({
+            'asset_id': self.truck.id,
+            'invoice_line_ids': closing_invoice.invoice_line_ids,
+            'date': fields.Date.today() + relativedelta(months=-6, days=-1),
+            'modify_action': 'sell',
+        }).sell_dispose()
+        closing_move = self.truck.depreciation_move_ids.filtered(lambda l: l.state == 'draft')
+        self.assertRecordValues(closing_move.line_ids, [{
+            'ref': 'truck: Sale',
+            'debit': 0,
+            'credit': 10000,
+            'account_id': self.truck.account_asset_id.id,
+        }, {
+            'ref': 'truck: Sale',
+            'debit': 4500,
+            'credit': 0,
+            'account_id': self.truck.account_depreciation_id.id,
+        }, {
+            'ref': 'truck: Sale',
+            'debit': 5400,
+            'credit': 0,
+            'account_id': closing_invoice.invoice_line_ids.account_id.id,
+        }, {
+            'ref': 'truck: Sale',
+            'debit': 100,
+            'credit': 0,
+            'account_id': self.env.company.loss_account_id.id,
+        }])
+
+        self.assertEqual(closing_move.depreciation_value, 3000, "Should be the remaining amount before the sale")
+
+    def test_asset_modify_dispose(self):
+        """Test the loss of the remaining book_value when an asset is disposed using the wizard"""
+        self.env['asset.modify'].create({
+            'asset_id': self.truck.id,
+            'date': fields.Date.today() + relativedelta(months=-6, days=-1),
+            'modify_action': 'dispose',
+        }).sell_dispose()
+        closing_move = self.truck.depreciation_move_ids.filtered(lambda l: l.state == 'draft')
+        self.assertRecordValues(closing_move.line_ids, [{
+            'ref': 'truck: Disposal',
+            'debit': 0,
+            'credit': 10000,
+            'account_id': self.truck.account_asset_id.id,
+        }, {
+            'ref': 'truck: Disposal',
+            'debit': 4500,
+            'credit': 0,
+            'account_id': self.truck.account_depreciation_id.id,
+        }, {
+            'ref': 'truck: Disposal',
+            'debit': 5500,
+            'credit': 0,
+            'account_id': self.env.company.loss_account_id.id,
+        }])
+
+    def test_asset_reverse_depreciation(self):
+        """Test the reversal of a depreciation move"""
+
+        self.assertEqual(sum(self.truck.depreciation_move_ids.filtered(lambda m: m.state == 'posted').mapped('depreciation_value')), 4500)
+        self.assertEqual(sum(self.truck.depreciation_move_ids.filtered(lambda m: m.state == 'draft').mapped('depreciation_value')), 3000)
+        self.assertEqual(max(self.truck.depreciation_move_ids.filtered(lambda m: m.state == 'posted'), key=lambda m: m.date).asset_remaining_value, 3000)
+
+        report = self.env.ref('odex30_account_asset.assets_report')
+        today = fields.Date.today()
+
+        move_to_reverse = self.truck.depreciation_move_ids.filtered(lambda m: m.state == 'posted').sorted(lambda m: m.date)[-1]
+        reversed_move = move_to_reverse._reverse_moves()
+
+        # Check that the depreciation has been reported on the next move
+        min_date_draft = min(self.truck.depreciation_move_ids.filtered(lambda m: m.state == 'draft' and m.date > reversed_move.date), key=lambda m: m.date)
+        self.assertEqual(move_to_reverse.asset_remaining_value - min_date_draft.depreciation_value - reversed_move.depreciation_value, min_date_draft.asset_remaining_value)
+        self.assertEqual(move_to_reverse.asset_depreciated_value + min_date_draft.depreciation_value + reversed_move.depreciation_value, min_date_draft.asset_depreciated_value)
+
+        # The amount is still there, it only has been reversed. But it has been added on the next draft move to complete the depreciation table
+        self.assertEqual(sum(self.truck.depreciation_move_ids.filtered(lambda m: m.state == 'posted').mapped('depreciation_value')), 4500)
+        self.assertEqual(sum(self.truck.depreciation_move_ids.filtered(lambda m: m.state == 'draft').mapped('depreciation_value')), 3000)
+
+        # Check that the table shows fully depreciated at the end
+        self.assertEqual(max(self.truck.depreciation_move_ids, key=lambda m: m.date).asset_remaining_value, 0)
+        self.assertEqual(max(self.truck.depreciation_move_ids, key=lambda m: m.date).asset_depreciated_value, 7500)
+
+        reversed_move.action_post()
+
+        options = self._generate_options(report, today + relativedelta(years=0, month=7, day=1), today + relativedelta(years=0, month=7, day=31))
+        lines = report._get_lines({**options, 'unfold_all': False, 'all_entries': True})
+        # We take the reversal entry into account
+        self.assertListEqual([10000.0,     0.0,     0.0, 10000.0,  4500.0,   -750.0,     0.0,  3750.0,  6250.0],
+                             [x['no_format'] for x in lines[0]['columns'][4:]])
+
+        options = self._generate_options(report, today + relativedelta(years=0, month=1, day=1), today + relativedelta(years=0, month=12, day=31))
+        lines = report._get_lines({**options, 'unfold_all': False, 'all_entries': True})
+        # With the report on the next entry, we get a normal depreciation amount for the year
+        self.assertListEqual([10000.0,     0.0,     0.0, 10000.0,  4500.0,   750.0,     0.0,  5250.0,  4750.0],
+                             [x['no_format'] for x in lines[0]['columns'][4:]])
+
+    def test_ref_asset_depreciation(self):
+        """Test that the reference used in depreciation moves is correct"""
+
+        for ref in self.truck.depreciation_move_ids.mapped('ref'):
+            self.assertEqual(ref, 'truck: Depreciation')
+
+    def test_credit_note_out_refund(self):
+        """
+        Test the behaviour of the asset creation when a credit note is created.
+        The asset created from the credit note should be the same as the one created from the invoice
+        with a negative value.
+        """
+        depreciation_account = self.company_data['default_account_assets'].copy()
+        revenue_model = self.env['account.asset'].create({
+            'account_depreciation_id': depreciation_account.id,
+            'account_depreciation_expense_id': self.company_data['default_account_revenue'].id,
+            'journal_id': self.company_data['default_journal_misc'].id,
+            'name': 'Hardware - 5 Years',
+            'method_number': 5,
+            'method_period': '12',
+            'state': 'model',
+        })
+
+        depreciation_account.write({'create_asset': 'draft', 'asset_model_ids': revenue_model})
+
+        invoice = self.env['account.move'].create({
+            'invoice_date': '2019-07-01',
+            'move_type': 'in_invoice',
+            'partner_id': self.partner_a.id,
+            'invoice_line_ids': [(0, 0, {
+                'name': 'Hardware',
+                'account_id': depreciation_account.id,
+                'price_unit': 5000,
+                'quantity': 1,
+                'tax_ids': False,
+            })],
+        })
+
+        invoice.action_post()
+        self.assertTrue(invoice.asset_ids)
+
+        credit_note = invoice._reverse_moves([{'invoice_date': fields.Date.today()}])
+        credit_note.action_post()
+
+        invoice_asset = invoice.asset_ids
+        credit_note_asset = credit_note.asset_ids
+
+        # check if invoice_asset still exists after validate the credit note
+        self.assertTrue(invoice_asset)
+        self.assertTrue(credit_note_asset)
+
+        (invoice_asset + credit_note_asset).validate()
+
+        self.assertRecordValues(credit_note_asset, [
+            {
+                'acquisition_date': invoice_asset.acquisition_date,
+                'book_value': -invoice_asset.book_value,
+                'value_residual': -invoice_asset.value_residual,
+            }
+        ])
+
+        for invoice_asset_move, credit_note_asset_move in zip(invoice_asset.depreciation_move_ids.sorted('date'), credit_note_asset.depreciation_move_ids.sorted('date')):
+            self.assertRecordValues(credit_note_asset_move, [
+                {
+                    'date': invoice_asset_move.date,
+                    'state': invoice_asset_move.state,
+                    'depreciation_value': -invoice_asset_move.depreciation_value,
+                }
+            ])
+
+    def test_asset_multiple_assets_from_one_move_line_00(self):
+        """ Test the creation of a as many assets as the value of
+        the quantity property of a move line. """
+
+        account = self.env['account.account'].create({
+            "name": "test account",
+            "code": "TEST",
+            "account_type": 'asset_non_current',
+            "create_asset": "draft",
+            "multiple_assets_per_line": True,
+        })
+        move = self.env['account.move'].create({
+            "partner_id": self.env['res.partner'].create({'name': 'Johny'}).id,
+            "ref": "line1",
+            "move_type": "in_invoice",
+            "invoice_date": "2020-12-31",
+            "invoice_line_ids": [
+                (0, 0, {
+                    "account_id": account.id,
+                    "price_unit": 400.0,
+                    "name": "stuff",
+                    "quantity": 2,
+                    "product_uom_id": self.env.ref('uom.product_uom_unit').id,
+                    "tax_ids": [],
+                }),
+            ]
+        })
+        move.action_post()
+        assets = move.asset_ids
+        assets = sorted(assets, key=lambda i: i['original_value'], reverse=True)
+        self.assertEqual(len(assets), 2, '3 assets should have been created')
+        self.assertEqual(assets[0].original_value, 400.0)
+        self.assertEqual(assets[1].original_value, 400.0)
+
+    def test_asset_multiple_assets_from_one_move_line_01(self):
+        """ Test the creation of a as many assets as the value of
+        the quantity property of a move line. """
+
+        account = self.env['account.account'].create({
+            "name": "test account",
+            "code": "TEST",
+            "account_type": 'asset_non_current',
+            "create_asset": "draft",
+            "multiple_assets_per_line": True,
+        })
+        move = self.env['account.move'].create({
+            "partner_id": self.env['res.partner'].create({'name': 'Johny'}).id,
+            "ref": "line1",
+            "move_type": "in_invoice",
+            "invoice_date": "2020-12-31",
+            "invoice_line_ids": [
+                (0, 0, {
+                    "account_id": account.id,
+                    "name": "stuff",
+                    "quantity": 3.0,
+                    "price_unit": 1000.0,
+                    "product_uom_id": self.env.ref('uom.product_uom_categ_unit').id,
+                }),
+                (0, 0, {
+                    'account_id': self.company_data['default_account_assets'].id,
+                    "name": "stuff",
+                    'quantity': 1.0,
+                    'price_unit': -500.0,
+                }),
+            ]
+        })
+        move.action_post()
+        self.assertEqual(sum(asset.original_value for asset in move.asset_ids), move.line_ids[0].debit)
+
+    def test_asset_credit_note(self):
+        """Test the generated entries created from an in_refund invoice with asset"""
+        asset_model = self.env['account.asset'].create({
+            'account_depreciation_id': self.company_data['default_account_assets'].id,
+            'account_depreciation_expense_id': self.company_data['default_account_expense'].id,
+            'account_asset_id': self.company_data['default_account_assets'].id,
+            'journal_id': self.company_data['default_journal_purchase'].id,
+            'name': 'Small car - 3 Years',
+            'method_number': 3,
+            'method_period': '12',
+            'state': 'model',
+        })
+
+        self.company_data['default_account_assets'].create_asset = "validate"
+        self.company_data['default_account_assets'].asset_model_ids = asset_model
+
+        invoice = self.env['account.move'].create({
+            'move_type': 'in_refund',
+            'invoice_date': '2020-01-01',
+            'date': '2020-01-01',
+            'partner_id': self.partner_a.id,
+            'invoice_line_ids': [(0, 0, {
+                'name': 'Very little red car',
+                'account_id': self.company_data['default_account_assets'].id,
+                'price_unit': 450,
+                'quantity': 1,
+            })],
+        })
+        invoice.action_post()
+        depreciation_lines = self.env['account.move.line'].search([
+            ('account_id', '=', asset_model.account_depreciation_id.id),
+            ('move_id.asset_id', '=', invoice.asset_ids.id),
+            ('debit', '=', 150),
+        ])
+        self.assertEqual(
+            len(depreciation_lines), 3,
+            'Three entries with a debit of 150 must be created on the Deferred Expense Account'
+        )
+
+    def test_asset_partial_credit_note(self):
+        """Test partial credit note on an in invoice that has generated draft assets.
+
+        Test case:
+        - Create in invoice with the following lines:
+
+            Product  |  Unit Price  |  Quantity  |  Multiple assets
+          ---------------------------------------------------------
+           Product B |     200      |      4     |       TRUE
+           Product A |     100      |      7     |       FALSE
+           Product A |     100      |      5     |       TRUE
+           Product A |     150      |      6     |       TRUE
+           Product A |     100      |      7     |       FALSE
+
+        - Add a credit note with the following lines:
+
+            Product  |  Unit Price  |  Quantity
+          ---------------------------------------
+           Product A |     100      |      1
+           Product A |     150      |      2
+           Product A |     100      |      7
+        """
+        asset_model = self.env['account.asset'].create({
+            'account_depreciation_id': self.company_data['default_account_assets'].id,
+            'account_depreciation_expense_id': self.company_data['default_account_expense'].id,
+            'journal_id': self.company_data['default_journal_sale'].id,
+            'name': 'Maintenance Contract - 3 Years',
+            'method_number': 3,
+            'method_period': '12',
+            'prorata_computation_type': 'none',
+            'state': 'model',
+        })
+        self.company_data['default_account_assets'].create_asset = 'draft'
+        self.company_data['default_account_assets'].asset_model_ids = asset_model
+        account_assets_multiple = self.company_data['default_account_assets'].copy()
+        account_assets_multiple.multiple_assets_per_line = True
+
+        product_a = self.env['product.product'].create({
+            'name': 'Product A',
+            'default_code': 'PA',
+            'lst_price': 100.0,
+            'standard_price': 100.0,
+        })
+        product_b = self.env['product.product'].create({
+            'name': 'Product B',
+            'default_code': 'PB',
+            'lst_price': 200.0,
+            'standard_price': 200.0,
+        })
+        invoice = self.env['account.move'].create({
+            'move_type': 'in_invoice',
+            'invoice_date': '2020-01-01',
+            'partner_id': self.partner_a.id,
+            'invoice_line_ids': [
+                (0, 0, {
+                    'product_id': product_b.id,
+                    'name': 'Product B',
+                    'account_id': account_assets_multiple.id,
+                    'price_unit': 200.0,
+                    'quantity': 4,
+                }),
+                (0, 0, {
+                    'product_id': product_a.id,
+                    'name': 'Product A',
+                    'account_id': self.company_data['default_account_assets'].id,
+                    'price_unit': 100.0,
+                    'quantity': 7,
+                }),
+                (0, 0, {
+                    'product_id': product_a.id,
+                    'name': 'Product A',
+                    'account_id': account_assets_multiple.id,
+                    'price_unit': 100.0,
+                    'quantity': 5,
+                }),
+                (0, 0, {
+                    'product_id': product_a.id,
+                    'name': 'Product A',
+                    'account_id': account_assets_multiple.id,
+                    'price_unit': 150.0,
+                    'quantity': 6,
+                }),
+                (0, 0, {
+                    'product_id': product_a.id,
+                    'name': 'Product A',
+                    'account_id': self.company_data['default_account_assets'].id,
+                    'price_unit': 100.0,
+                    'quantity': 7,
+                }),
+            ],
+        })
+        invoice.action_post()
+        product_a_100_lines = invoice.line_ids.filtered(lambda l: l.product_id == product_a and l.price_unit == 100.0)
+        product_a_150_lines = invoice.line_ids.filtered(lambda l: l.product_id == product_a and l.price_unit == 150.0)
+        product_b_lines = invoice.line_ids.filtered(lambda l: l.product_id == product_b)
+        self.assertEqual(len(invoice.line_ids.mapped(lambda l: l.asset_ids)), 17)
+        self.assertEqual(len(product_b_lines.asset_ids), 4)
+        self.assertEqual(len(product_a_100_lines.asset_ids), 7)
+        self.assertEqual(len(product_a_150_lines.asset_ids), 6)
+        credit_note = invoice._reverse_moves()
+        with Form(credit_note) as move_form:
+            move_form.invoice_date = move_form.date
+            move_form.invoice_line_ids.remove(0)
+            move_form.invoice_line_ids.remove(0)
+            with move_form.invoice_line_ids.edit(0) as line_form:
+                line_form.quantity = 1
+            with move_form.invoice_line_ids.edit(1) as line_form:
+                line_form.quantity = 2
+        credit_note.action_post()
+        self.assertEqual(len(invoice.line_ids.mapped(lambda l: l.asset_ids)), 17)
+        self.assertEqual(len(product_b_lines.asset_ids), 4)
+        self.assertEqual(len(product_a_100_lines.asset_ids), 7)
+        self.assertEqual(len(product_a_150_lines.asset_ids), 6)
+
+    def test_asset_with_non_deductible_tax(self):
+        """Test that the assets' original_value and non_deductible_tax_value are correctly computed
+        from a move line with a non-deductible tax."""
+
+        asset_account = self.company_data['default_account_assets']
+        non_deductible_tax = self.env['account.tax'].create({
+            'name': 'Non-deductible Tax',
+            'amount': 21,
+            'amount_type': 'percent',
+            'type_tax_use': 'purchase',
+            'invoice_repartition_line_ids': [
+                Command.create({'repartition_type': 'base'}),
+                Command.create({
+                    'factor_percent': 50,
+                    'repartition_type': 'tax',
+                    'use_in_tax_closing': False
+                }),
+                Command.create({
+                    'factor_percent': 50,
+                    'repartition_type': 'tax',
+                    'use_in_tax_closing': True
+                }),
+            ],
+            'refund_repartition_line_ids': [
+                Command.create({'repartition_type': 'base'}),
+                Command.create({
+                    'factor_percent': 50,
+                    'repartition_type': 'tax',
+                    'use_in_tax_closing': False
+                }),
+                Command.create({
+                    'factor_percent': 50,
+                    'repartition_type': 'tax',
+                    'use_in_tax_closing': True
+                }),
+            ],
+        })
+        asset_account.tax_ids = non_deductible_tax
+
+        # 1. Automatic creation
+        asset_account.create_asset = 'draft'
+        asset_account.asset_model_ids = self.account_asset_model_fixedassets
+        asset_account.multiple_assets_per_line = True
+
+        vendor_bill_auto = self.env['account.move'].create({
+            'move_type': 'in_invoice',
+            'invoice_date': '2020-01-01',
+            'partner_id': self.partner_a.id,
+            'invoice_line_ids': [Command.create({
+                'account_id': asset_account.id,
+                'name': 'Asus Laptop',
+                'price_unit': 1000.0,
+                'quantity': 2,
+                'tax_ids': [Command.set(non_deductible_tax.ids)],
+            })],
+        })
+        vendor_bill_auto.action_post()
+
+        new_assets_auto = vendor_bill_auto.asset_ids
+        self.assertEqual(len(new_assets_auto), 2)
+        self.assertEqual(new_assets_auto.mapped('original_value'), [1105.0, 1105.0])
+        self.assertEqual(new_assets_auto.mapped('non_deductible_tax_value'), [105.0, 105.0])
+
+        # 2. Manual creation
+        asset_account.create_asset = 'no'
+        asset_account.asset_model_ids = None
+        asset_account.multiple_assets_per_line = False
+
+        vendor_bill_manu = self.env['account.move'].create({
+            'move_type': 'in_invoice',
+            'invoice_date': '2020-01-01',
+            'partner_id': self.partner_a.id,
+            'invoice_line_ids': [
+                Command.create({
+                    'account_id': asset_account.id,
+                    'name': 'Asus Laptop',
+                    'price_unit': 1000.0,
+                    'quantity': 2,
+                    'tax_ids': [Command.set(non_deductible_tax.ids)]
+                }),
+                Command.create({
+                    'account_id': asset_account.id,
+                    'name': 'Lenovo Laptop',
+                    'price_unit': 500.0,
+                    'quantity': 3,
+                    'tax_ids': [Command.set(non_deductible_tax.ids)]
+                }),
+            ],
+        })
+        vendor_bill_manu.action_post()
+
+        # TOFIX: somewhere above this the field account.asset.asset_type is made
+        # dirty, but this field has to be flushed in a specific environment.
+        # This is because the field 'asset_type' is stored, computed and
+        # context-dependent, which explains why its value must be retrieved
+        # from the right environment.
+        self.env.flush_all()
+
+        move_line_ids = vendor_bill_manu.mapped('line_ids').filtered(lambda x: x.name and 'Laptop' in x.name)
+        asset_form = Form(self.env['account.asset'].with_context(
+            default_original_move_line_ids=move_line_ids.ids,
+        ))
+        asset_form.original_move_line_ids = move_line_ids
+        asset_form.account_depreciation_expense_id = self.company_data['default_account_expense']
+
+        new_assets_manu = asset_form.save()
+        self.assertEqual(len(new_assets_manu), 1)
+        self.assertEqual(new_assets_manu.original_value, 3867.5)
+        self.assertEqual(new_assets_manu.non_deductible_tax_value, 367.5)
+
+    def test_asset_degressive_01(self):
+        """ Check the computation of an asset with degressive method,
+            start at middle of the year
+        """
+        asset = self.env['account.asset'].create({
+            'account_asset_id': self.company_data['default_account_assets'].id,
+            'account_depreciation_id': self.company_data['default_account_assets'].id,
+            'account_depreciation_expense_id': self.company_data['default_account_expense'].id,
+            'journal_id': self.company_data['default_journal_misc'].id,
+            'name': 'Degressive',
+            'acquisition_date': '2021-07-01',
+            'prorata_computation_type': 'constant_periods',
+            'original_value': 10000,
+            'method_number': 5,
+            'method_period': '12',
+            'method': 'degressive',
+            'method_progress_factor': 0.5,
+        })
+
+        asset.validate()
+
+        self.assertEqual(asset.method_number + 1, len(asset.depreciation_move_ids))
+
+        self.assertRecordValues(asset.depreciation_move_ids.sorted(lambda l: (l.date, l.id)), [{
+            'amount_total': 2500,
+            'asset_remaining_value': 7500,
+        }, {
+            'amount_total': 3750,
+            'asset_remaining_value': 3750,
+        }, {
+            'amount_total': 1875,
+            'asset_remaining_value': 1875,
+        }, {
+            'amount_total': 937.5,
+            'asset_remaining_value': 937.5,
+        }, {
+            'amount_total': 625.00,
+            'asset_remaining_value': 312.50,
+        }, {
+            'amount_total': 312.50,
+            'asset_remaining_value': 0,
+        }])
+
+    def test_asset_degressive_02(self):
+        """ Check the computation of an asset with degressive method,
+            start at beginning of the year.
+        """
+        asset = self.env['account.asset'].create({
+            'account_asset_id': self.company_data['default_account_assets'].id,
+            'account_depreciation_id': self.company_data['default_account_assets'].id,
+            'account_depreciation_expense_id': self.company_data['default_account_expense'].id,
+            'journal_id': self.company_data['default_journal_misc'].id,
+            'name': 'Degressive',
+            'acquisition_date': '2021-01-01',
+            'original_value': 10000,
+            'method_number': 5,
+            'method_period': '12',
+            'method': 'degressive',
+            'method_progress_factor': 0.5,
+        })
+
+        asset.validate()
+
+        self.assertEqual(asset.method_number, len(asset.depreciation_move_ids))
+
+        self.assertRecordValues(asset.depreciation_move_ids.sorted(lambda l: (l.date, l.id)), [{
+            'amount_total': 5000,
+            'asset_remaining_value': 5000,
+        }, {
+            'amount_total': 2500,
+            'asset_remaining_value': 2500,
+        }, {
+            'amount_total': 1250,
+            'asset_remaining_value': 1250,
+        }, {
+            'amount_total': 625,
+            'asset_remaining_value': 625,
+        }, {
+            'amount_total': 625,
+            'asset_remaining_value': 0,
+        }])
+
+    def test_asset_negative_01(self):
+        """ Check the computation of an asset with negative value. """
+        asset = self.env['account.asset'].create({
+            'account_asset_id': self.company_data['default_account_assets'].id,
+            'account_depreciation_id': self.company_data['default_account_assets'].id,
+            'account_depreciation_expense_id': self.company_data['default_account_expense'].id,
+            'journal_id': self.company_data['default_journal_misc'].id,
+            'name': 'Degressive Linear',
+            'acquisition_date': '2021-07-01',
+            'original_value': -10000,
+            'method_number': 5,
+            'method_period': '12',
+            'method': 'linear',
+        })
+        asset.prorata_computation_type = 'constant_periods'
+
+        asset.validate()
+
+        self.assertRecordValues(asset.depreciation_move_ids.sorted(lambda l: (l.date, l.id)), [{
+            'amount_total': 1000,
+            'asset_remaining_value': -9000,
+        }, {
+            'amount_total': 2000,
+            'asset_remaining_value': -7000,
+        }, {
+            'amount_total': 2000,
+            'asset_remaining_value': -5000,
+        }, {
+            'amount_total': 2000,
+            'asset_remaining_value': -3000,
+        }, {
+            'amount_total': 2000,
+            'asset_remaining_value': -1000,
+        }, {
+            'amount_total': 1000,
+            'asset_remaining_value': 0,
+        }])
+
+    def test_asset_daily_computation_01(self):
+        """ Check the computation of an asset with daily_computation. """
+        asset = self.env['account.asset'].create({
+            'account_asset_id': self.company_data['default_account_assets'].id,
+            'account_depreciation_id': self.company_data['default_account_assets'].id,
+            'account_depreciation_expense_id': self.company_data['default_account_expense'].id,
+            'journal_id': self.company_data['default_journal_misc'].id,
+            'name': 'Degressive Linear',
+            'acquisition_date': '2021-07-01',
+            'prorata_computation_type': 'daily_computation',
+            'original_value': 10000,
+            'method_number': 5,
+            'method_period': '12',
+            'method': 'linear',
+        })
+
+        asset.validate()
+
+        self.assertRecordValues(asset.depreciation_move_ids.sorted(lambda l: (l.date, l.id)), [{
+            'amount_total': 1007.67,
+            'asset_remaining_value': 8992.33,
+        }, {
+            'amount_total': 1998.90,
+            'asset_remaining_value': 6993.43,
+        }, {
+            'amount_total': 1998.91,
+            'asset_remaining_value': 4994.52,
+        }, {
+            'amount_total': 2004.38,
+            'asset_remaining_value': 2990.14,
+        }, {
+            'amount_total': 1998.90,
+            'asset_remaining_value': 991.24,
+        }, {
+            'amount_total': 991.24,
+            'asset_remaining_value': 0,
+        }])
+
+    def test_decrement_book_value_with_negative_asset(self):
+        """
+        Test the computation of book value and remaining value
+        when posting a depreciation move related with a negative asset
+        """
+        depreciation_account = self.company_data['default_account_assets'].copy()
+        asset_model = self.env['account.asset'].create({
+            'name': 'test',
+            'state': 'model',
+            'active': True,
+            'method': 'linear',
+            'method_number': 5,
+            'method_period': '1',
+            'prorata_computation_type': 'constant_periods',
+            'account_asset_id': self.company_data['default_account_assets'].id,
+            'account_depreciation_id': depreciation_account.id,
+            'account_depreciation_expense_id': self.company_data['default_account_expense'].id,
+            'journal_id': self.company_data['default_journal_purchase'].id,
+        })
+
+        depreciation_account.can_create_asset = True
+        depreciation_account.create_asset = 'draft'
+        depreciation_account.asset_model_ids = asset_model
+
+        refund = self.env['account.move'].create({
+            'move_type': 'in_refund',
+            'partner_id': self.partner_a.id,
+            'invoice_date': '2021-06-01',
+            'invoice_line_ids': [Command.create({'name': 'refund', 'account_id': depreciation_account.id, 'price_unit': 500, 'tax_ids': False})],
+        })
+        refund.action_post()
+
+        self.assertTrue(refund.asset_ids)
+
+        asset = refund.asset_ids
+
+        self.assertEqual(asset.book_value, -refund.amount_total)
+        self.assertEqual(asset.value_residual, -refund.amount_total)
+
+        asset.validate()
+
+        self.assertEqual(len(asset.depreciation_move_ids.filtered(lambda m: m.state == 'posted')), 1)
+        self.assertEqual(asset.book_value, -400.0)
+        self.assertEqual(asset.value_residual, -400.0)
+
+    def test_depreciation_schedule_report_with_negative_asset(self):
+        """
+        Test the computation of depreciation schedule with negative asset
+        """
+        asset = self.env['account.asset'].create({
+            'name': 'test',
+            'original_value': -500,
+            'method': 'linear',
+            'method_number': 5,
+            'method_period': '1',
+            'acquisition_date': fields.Date.today() + relativedelta(months=-1),
+            'prorata_computation_type': 'none',
+            'account_asset_id': self.company_data['default_account_assets'].id,
+            'account_depreciation_id': self.company_data['default_account_assets'].id,
+            'account_depreciation_expense_id': self.company_data['default_account_expense'].id,
+            'journal_id': self.company_data['default_journal_misc'].id,
+        })
+
+        asset.validate()
+
+        report = self.env.ref('odex30_account_asset.assets_report')
+
+        options = self._generate_options(report, fields.Date.today() + relativedelta(months=-7, day=1), fields.Date.today() + relativedelta(months=-6, day=31))
+
+        expected_values_open_asset = [
+            ("test", 0, 0, 500.0, -500.0, 0, 0, 100.0, -100.0, -400.0),
+        ]
+
+        self.assertLinesValues(report._get_lines(options)[2:3], [0, 5, 6, 7, 8, 9, 10, 11, 12, 13], expected_values_open_asset, options)
+
+        expense_account_copy = self.company_data['default_account_expense'].copy()
+
+        disposal_action_view = self.env['asset.modify'].create({
+            'asset_id': asset.id,
+            'modify_action': 'dispose',
+            'loss_account_id': expense_account_copy.id,
+            'date': fields.Date.today()
+        }).sell_dispose()
+
+        self.env['account.move'].browse(disposal_action_view['res_id']).action_post()
+
+        expected_values_closed_asset = [
+            ("test", 0, 500.0, 500.0, 0, 0, 500.0, 500.0, 0, 0),
+        ]
+        options = self._generate_options(report, fields.Date.today() + relativedelta(months=-7, day=1), fields.Date.today())
+        self.assertLinesValues(report._get_lines(options)[2:3], [0, 5, 6, 7, 8, 9, 10, 11, 12, 13], expected_values_closed_asset, options)
+
+    def test_depreciation_schedule_hierarchy(self):
+        # Remove previously existing assets.
+        assets = self.env['account.asset'].search([
+            ('company_id', '=', self.env.company.id),
+            ('state', '!=', 'model'),
+        ])
+        assets.state = 'draft'
+        assets.mapped('depreciation_move_ids').state = 'draft'
+        assets.unlink()
+
+        # Create the account groups.
+        self.env['account.group'].create([
+            {'name': 'Group 1', 'code_prefix_start': '1', 'code_prefix_end': '1'},
+            {'name': 'Group 11', 'code_prefix_start': '11', 'code_prefix_end': '11'},
+            {'name': 'Group 12', 'code_prefix_start': '12', 'code_prefix_end': '12'},
+        ])
+
+        # Create the accounts.
+        account_a, account_a1, account_b, account_c, account_d, account_e = self.env['account.account'].create([
+            {'code': '1100', 'name': 'Account A', 'account_type': 'asset_non_current'},
+            {'code': '1110', 'name': 'Account A1', 'account_type': 'asset_non_current'},
+            {'code': '1200', 'name': 'Account B', 'account_type': 'asset_non_current'},
+            {'code': '1300', 'name': 'Account C', 'account_type': 'asset_non_current'},
+            {'code': '1400', 'name': 'Account D', 'account_type': 'asset_non_current'},
+            {'code': '9999', 'name': 'Account E', 'account_type': 'asset_non_current'},
+        ])
+
+        # Create and validate the assets, and post the depreciation entries.
+        self.env['account.asset'].create([
+            {
+                'account_asset_id': account_id,
+                'account_depreciation_id': account_id,
+                'account_depreciation_expense_id': self.company_data['default_account_expense'].id,
+                'journal_id': self.company_data['default_journal_misc'].id,
+                'name': name,
+                'acquisition_date': fields.Date.to_date('2020-07-01'),
+                'original_value': original_value,
+                'method': 'linear',
+                'prorata_computation_type': 'none',
+            }
+            for account_id, name, original_value in [
+                (account_a.id, 'ZenBook', 1250),
+                (account_a.id, 'ThinkBook', 1500),
+                (account_a1.id, 'XPS', 1750),
+                (account_b.id, 'MacBook', 2000),
+                (account_c.id, 'Aspire', 1600),
+                (account_d.id, 'Playstation', 550),
+                (account_e.id, 'Xbox', 500),
+            ]
+        ]).validate()
+
+        # Configure the depreciation schedule report.
+        report = self.env.ref('odex30_account_asset.assets_report')
+        options = self._generate_options(report, '2022-01-01', '2022-12-31')
+        options['hierarchy'] = True
+        self.env.company.totals_below_sections = True
+
+        # Generate and compare actual VS expected values.
+        lines = [
+            {
+                'name': line['name'],
+                'level': line['level'],
+                'book_value': line['columns'][-1]['name']
+            }
+            for line in (report._get_lines(options))
+        ]
+
+        expected_values = [
+            # pylint: disable=C0326
+            {'name': '1 Group 1',                           'level': 1,     'book_value': '$\xa06,920.00'},
+              {'name': '11 Group 11',                       'level': 2,     'book_value': '$\xa03,600.00'},
+                {'name': '1100 Account A',                  'level': 3,     'book_value': '$\xa02,200.00'},
+                  {'name': 'ZenBook',                       'level': 4,     'book_value': '$\xa01,000.00'},
+                  {'name': 'ThinkBook',                     'level': 4,     'book_value': '$\xa01,200.00'},
+                {'name': 'Total 1100 Account A',            'level': 3,     'book_value': '$\xa02,200.00'},
+                {'name': '1110 Account A1',                 'level': 3,     'book_value': '$\xa01,400.00'},
+                  {'name': 'XPS',                           'level': 4,     'book_value': '$\xa01,400.00'},
+                {'name': 'Total 1110 Account A1',           'level': 3,     'book_value': '$\xa01,400.00'},
+              {'name': 'Total 11 Group 11',                 'level': 2,     'book_value': '$\xa03,600.00'},
+              {'name': '12 Group 12',                       'level': 2,     'book_value': '$\xa01,600.00'},
+                {'name': '1200 Account B',                  'level': 3,     'book_value': '$\xa01,600.00'},
+                  {'name': 'MacBook',                       'level': 4,     'book_value': '$\xa01,600.00'},
+                {'name': 'Total 1200 Account B',            'level': 3,     'book_value': '$\xa01,600.00'},
+              {'name': 'Total 12 Group 12',                 'level': 2,     'book_value': '$\xa01,600.00'},
+              {'name': '1300 Account C',                    'level': 2,     'book_value': '$\xa01,280.00'},
+                {'name': 'Aspire',                          'level': 3,     'book_value': '$\xa01,280.00'},
+              {'name': 'Total 1300 Account C',              'level': 2,     'book_value': '$\xa01,280.00'},
+              {'name': '1400 Account D',                    'level': 2,     'book_value': '$\xa0440.00'},
+                {'name': 'Playstation',                     'level': 3,     'book_value': '$\xa0440.00'},
+              {'name': 'Total 1400 Account D',              'level': 2,     'book_value': '$\xa0440.00'},
+            {'name': 'Total 1 Group 1',                     'level': 1,     'book_value': '$\xa06,920.00'},
+            {'name': '(No Group)',                          'level': 1,     'book_value': '$\xa0400.00'},
+              {'name': '9999 Account E',                    'level': 2,     'book_value': '$\xa0400.00'},
+                {'name': 'Xbox',                            'level': 3,     'book_value': '$\xa0400.00'},
+              {'name': 'Total 9999 Account E',              'level': 2,     'book_value': '$\xa0400.00'},
+            {'name': 'Total (No Group)',                    'level': 1,     'book_value': '$\xa0400.00'},
+            {'name': 'Total',                               'level': 1,     'book_value': '$\xa07,320.00'},
+        ]
+
+        self.assertEqual(len(lines), len(expected_values))
+        self.assertEqual(lines, expected_values)
+
+    def test_depreciation_schedule_disposal_move_unposted(self):
+        """
+        Test the computation of values when disposing an asset, and the difference if the disposal move is posted
+        """
+        asset = self.env['account.asset'].create({
+            'name': 'test asset',
+            'method': 'linear',
+            'original_value': 1000,
+            'method_number': 5,
+            'method_period': '12',
+            'acquisition_date': fields.Date.today() + relativedelta(years=-2, month=1, day=1),
+            'account_asset_id': self.company_data['default_account_assets'].id,
+            'account_depreciation_id': self.company_data['default_account_assets'].id,
+            'account_depreciation_expense_id': self.company_data['default_account_expense'].id,
+            'journal_id': self.company_data['default_journal_misc'].id,
+        })
+        asset.validate()
+
+        expense_account_copy = self.company_data['default_account_expense'].copy()
+
+        disposal_action_view = self.env['asset.modify'].create({
+            'asset_id': asset.id,
+            'modify_action': 'dispose',
+            'loss_account_id': expense_account_copy.id,
+            'date': fields.Date.today() + relativedelta(days=-1)
+        }).sell_dispose()
+
+        report = self.env.ref('odex30_account_asset.assets_report')
+        options = self._generate_options(report, '2021-01-01', '2021-12-31')
+
+        # The disposal move is in draft and should not be considered (depreciation and book value)
+        # Values are: name, assets_before, assets+, assets-, assets_after, depreciation_before, depreciation+, depreciation-, depreciation_after, book_value
+        expected_values_asset_disposal_unposted = [
+            ("test asset", 1000.0, 0.0, 0, 1000.0, 400.0, 100.0, 0.0, 500.0, 500.0),
+        ]
+
+        self.assertLinesValues(report._get_lines(options)[2:3], [0, 5, 6, 7, 8, 9, 10, 11, 12, 13], expected_values_asset_disposal_unposted, options)
+
+        self.env['account.move'].browse(disposal_action_view.get('res_id')).action_post()
+
+        expected_values_asset_disposal_posted = [
+            ("test asset", 1000.0, 0.0, 1000.0, 0.0, 400.0, 100.0, 500.0, 0.0, 0.0),
+        ]
+
+        self.assertLinesValues(report._get_lines(options)[2:3], [0, 5, 6, 7, 8, 9, 10, 11, 12, 13], expected_values_asset_disposal_posted, options)
+
+    def test_depreciation_schedule_disposal_move_unposted_with_non_depreciable_value(self):
+        """
+        Test the computation of values when disposing an asset with non-depreciable value, and the difference if the disposal move is posted
+        """
+        asset = self.env['account.asset'].create({
+            'name': 'test asset',
+            'method': 'linear',
+            'original_value': 10000,
+            'salvage_value': 8000,
+            'method_number': 24,
+            'method_period': '1',
+            'acquisition_date': fields.Date.today() + relativedelta(months=-1, day=1),
+            'account_asset_id': self.company_data['default_account_assets'].id,
+            'account_depreciation_id': self.company_data['default_account_assets'].id,
+            'account_depreciation_expense_id': self.company_data['default_account_expense'].id,
+            'journal_id': self.company_data['default_journal_misc'].id,
+        })
+        asset.validate()
+
+        report = self.env.ref('odex30_account_asset.assets_report')
+
+        options = self._generate_options(report, '2021-07-01', '2021-07-31')
+
+        expected_values_asset_disposal_unposted = [
+            ("test asset", 10000.0, 0.0, 0.0, 10000.0, 83.33, 0.0, 0.0, 83.33, 9916.67),
+        ]
+
+        self.assertLinesValues(report._get_lines(options)[2:3], [0, 5, 6, 7, 8, 9, 10, 11, 12, 13], expected_values_asset_disposal_unposted, options)
+
+        expense_account_copy = self.company_data['default_account_expense'].copy()
+
+        disposal_action_view = self.env['asset.modify'].create({
+            'asset_id': asset.id,
+            'modify_action': 'dispose',
+            'loss_account_id': expense_account_copy.id,
+            'date': fields.Date.today()
+        }).sell_dispose()
+
+        expected_values_asset_disposal_unposted = [
+            ("test asset", 10000.0, 0.0, 0.0, 10000.0, 83.33, 2.69, 0.0, 86.02, 9913.98),
+        ]
+
+        self.assertLinesValues(report._get_lines(options)[2:3], [0, 5, 6, 7, 8, 9, 10, 11, 12, 13], expected_values_asset_disposal_unposted, options)
+
+        self.env['account.move'].browse(disposal_action_view['res_id']).action_post()
+
+        expected_values_asset_disposal_posted = [
+            ("test asset", 10000.0, 0.0, 10000.0, 0.0, 83.33, 2.69, 86.02, 0.0, 0.0),
+        ]
+
+        self.assertLinesValues(report._get_lines(options)[2:3], [0, 5, 6, 7, 8, 9, 10, 11, 12, 13], expected_values_asset_disposal_posted, options)
+
+    def test_asset_analytic_on_lines(self):
+        CEO_car = self.env['account.asset'].create({
+            'salvage_value': 2000.0,
+            'state': 'open',
+            'method_period': '12',
+            'method_number': 5,
+            'name': "CEO's Car",
+            'original_value': 12000.0,
+            'model_id': self.account_asset_model_fixedassets.id,
+            'acquisition_date': '2020-01-01',
+        })
+        CEO_car._onchange_model_id()
+        CEO_car.method_number = 5
+        CEO_car.analytic_distribution = {self.analytic_account.id: 100}
+
+        # In order to test the process of Account Asset, I perform a action to confirm Account Asset.
+        CEO_car.validate()
+
+        for move in CEO_car.depreciation_move_ids:
+            self.assertRecordValues(move.line_ids, [
+                {
+                    'analytic_distribution': {str(self.analytic_account.id): 100},
+                },
+                {
+                    'analytic_distribution': {str(self.analytic_account.id): 100},
+                },
+            ])
+
+        CEO_car.analytic_distribution = {str(self.analytic_account.id): 200}
+
+        # Only draft moves should have a changed analytic distribution
+        for move in CEO_car.depreciation_move_ids.filtered(lambda m: m.state == 'posted'):
+            self.assertRecordValues(move.line_ids, [
+                {
+                    'analytic_distribution': {str(self.analytic_account.id): 100},
+                },
+                {
+                    'analytic_distribution': {str(self.analytic_account.id): 100},
+                },
+            ])
+
+        for move in CEO_car.depreciation_move_ids.filtered(lambda m: m.state == 'draft'):
+            self.assertRecordValues(move.line_ids, [
+                {
+                    'analytic_distribution': {str(self.analytic_account.id): 200},
+                },
+                {
+                    'analytic_distribution': {str(self.analytic_account.id): 200},
+                },
+            ])
+
+
+    def test_asset_analytic_filter(self):
+        """
+        Test that the analytic filter works correctly.
+        """
+        truck_b = self.truck.copy()
+        truck_b.acquisition_date = self.truck.acquisition_date
+        truck_b.validate()
+        self.truck.analytic_distribution = {self.analytic_account.id: 100}
+        self.env['account.move']._autopost_draft_entries()
+
+        self.env.company.totals_below_sections = False
+        report = self.env.ref('odex30_account_asset.assets_report')
+
+        # No prefix group, no group by account
+        options = self._generate_options(report, '2021-01-01', '2021-12-31', default_options={'assets_grouping_field': 'none', 'unfold_all': False})
+
+        # without Analytic Filter
+        self.assertLinesValues(
+            # pylint: disable=C0326
+            report._get_lines(options),
+            #    Name                       Assets/start  Assets/+  Assets/- Assets/end  Depreciation/start  Depreciation/+  Depreciation/- Depreciation/end  Book Value
+            [    0,                             5,        6,        7,           8,          9,              10,             11,               12,               13],
+            [
+                ('truck',                   10000,        0,        0,       10000,       4500,               0,              0,             4500,             5500,),
+                ('truck (copy)',            10000,        0,        0,       10000,       4500,               0,              0,             4500,             5500,),
+                ('Total',                   20000,        0,        0,       20000,       9000,               0,              0,             9000,            11000,),
+            ],
+            options
+        )
+        # with Analytic Filter
+        options['analytic_accounts'] = [self.analytic_account.id]
+        self.assertLinesValues(
+            # pylint: disable=C0326
+            report._get_lines(options),
+            #    Name                       Assets/start  Assets/+  Assets/- Assets/end  Depreciation/start  Depreciation/+  Depreciation/- Depreciation/end  Book Value
+            [    0,                             5,        6,        7,           8,          9,              10,             11,               12,               13],
+            [
+                ('truck',                   10000,        0,        0,       10000,       4500,               0,              0,             4500,             5500,),
+                ('Total',                   10000,        0,        0,       10000,       4500,               0,              0,             4500,             5500,),
+            ],
+            options
+        )
+
+    def test_asset_analytic_groupby(self):
+        """
+        Test that the analytic groupby works correctly.
+        """
+        truck_b = self.truck.copy()
+        truck_b.acquisition_date = self.truck.acquisition_date
+        truck_b.validate()
+        self.truck.analytic_distribution = {self.analytic_account.id: 100}
+        self.env['account.move']._autopost_draft_entries()
+
+        self.env.company.totals_below_sections = False
+        report = self.env.ref('odex30_account_asset.assets_report')
+        report.filter_analytic_groupby = True
+
+        # No prefix group, no group by account
+        options = self._generate_options(report, '2021-01-01', '2021-12-31', default_options={'assets_grouping_field': 'none', 'unfold_all': False})
+
+        # without Analytic Groupby
+        self.assertLinesValues(
+            # pylint: disable=C0326
+            report._get_lines(options),
+            #    Name                       Assets/start  Assets/+  Assets/- Assets/end  Depreciation/start  Depreciation/+  Depreciation/- Depreciation/end  Book Value
+            [    0,                             5,        6,        7,           8,          9,              10,             11,               12,               13],
+            [
+                ('truck',                   10000,        0,        0,       10000,       4500,               0,              0,             4500,             5500,),
+                ('truck (copy)',            10000,        0,        0,       10000,       4500,               0,              0,             4500,             5500,),
+                ('Total',                   20000,        0,        0,       20000,       9000,               0,              0,             9000,            11000,),
+            ],
+            options
+        )
+        # with Analytic Groupby
+        options = self._generate_options(report, '2021-01-01', '2021-12-31', default_options={
+            'assets_grouping_field': 'none',
+            'unfold_all': False,
+            'analytic_accounts_groupby': [self.analytic_account.id],
+        })
+        self.assertLinesValues(
+            # pylint: disable=C0326
+            report._get_lines(options),
+            #    Group                      |                                            ANALYTIC                                                                       |  |                                                    ALL                                                                               |
+            #    Name                       Assets/start  Assets/+  Assets/- Assets/end  Depreciation/start  Depreciation/+  Depreciation/- Depreciation/end  Book Value    Assets/start    Assets/+    Assets/-    Assets/end  Depreciation/start  Depreciation/+  Depreciation/-  Depreciation/end    Book Value
+            [    0,                             5,        6,        7,           8,          9,              10,             11,               12,               13,            18,         19,         20,             21,         22,             23,             24,             25,                 26],
+            [
+                ('truck',                   10000,        0,        0,       10000,       4500,               0,              0,             4500,             5500,         10000,         0,          0,          10000,        4500,              0,             0,            4500,               5500),
+                ('truck (copy)',               '',       '',       '',          '',         '',              '',             '',               '',               '',         10000,         0,          0,          10000,        4500,              0,             0,            4500,               5500),
+                ('Total',                   10000,        0,        0,       10000,       4500,               0,              0,             4500,             5500,         20000,         0,          0,          20000,        9000,              0,             0,            9000,              11000),
+            ],
+            options
+        )
+
+    def test_depreciation_schedule_report_first_depreciation(self):
+        """Test that the depreciation schedule report displays the correct first depreciation date."""
+        # check that the truck's first depreciation date is correct:
+        # the truck has a yearly linear depreciation and it's prorate_date is 2015-01-01
+        # therefore we expect it's first depreciation date to be the last day of 2015
+
+        today = fields.Date.today()
+        report = self.env.ref('odex30_account_asset.assets_report')
+        options = self._generate_options(report, today + relativedelta(years=-6, month=1, day=1), today + relativedelta(years=+4, month=12, day=31))
+        lines = report._get_lines({**options, **{'unfold_all': False, 'all_entries': True}})
+
+        self.assertEqual(lines[1]['columns'][1]['name'], '12/31/2015')
+
+    def test_asset_modify_sell_multicurrency(self):
+        """ Test that the closing invoice's currency is taken into account when selling an asset. """
+        closing_invoice = self.env['account.move'].create({
+            'move_type': 'out_invoice',
+            'currency_id': self.other_currency.id,
+            'invoice_line_ids': [Command.create({'price_unit': 5000})]
+        })
+        self.env['asset.modify'].create({
+            'asset_id': self.truck.id,
+            'invoice_line_ids': closing_invoice.invoice_line_ids,
+            'date': fields.Date.today() + relativedelta(months=-6, days=-1),
+            'modify_action': 'sell',
+        }).sell_dispose()
+
+        closing_move = self.truck.depreciation_move_ids.filtered(lambda l: l.state == 'draft')
+
+        self.assertRecordValues(closing_move.line_ids, [{
+            'debit': 0,
+            'credit': 10000,
+            'account_id': self.truck.account_asset_id.id,
+        }, {
+            'debit': 4500,
+            'credit': 0,
+            'account_id': self.truck.account_depreciation_id.id,
+        }, {
+            'debit': 2500,
+            'credit': 0,
+            'account_id': closing_invoice.invoice_line_ids.account_id.id,
+        }, {
+            'debit': 3000,
+            'credit': 0,
+            'account_id': self.env.company.loss_account_id.id,
+        }])
+
+    def test_depreciation_schedule_prefix_groups(self):
+        asset_group = self.env['account.asset.group'].create({'name': 'Odoo Office'})
+        for i in range(1, 3):
+            asset = self.env['account.asset'].create({
+                'method_period': '12',
+                'method_number': 4,
+                'name': f"Asset {i}",
+                'original_value': i * 100.0,
+                'acquisition_date': fields.Date.today() - relativedelta(years=3),
+                'account_asset_id': self.company_data['default_account_assets'].id,
+                'asset_group_id': asset_group.id,
+                'account_depreciation_id': self.company_data['default_account_assets'].copy().id,
+                'account_depreciation_expense_id': self.company_data['default_account_expense'].id,
+                'journal_id': self.company_data['default_journal_misc'].id,
+                'prorata_computation_type': 'none',
+            })
+            asset.validate()
+
+        self.env['account.move']._autopost_draft_entries()
+
+        self.env.company.totals_below_sections = False
+        report = self.env.ref('odex30_account_asset.assets_report')
+
+        # No prefix group, no group by account
+        options = self._generate_options(report, '2021-01-01', '2021-12-31', default_options={'assets_grouping_field': 'none'})
+        self.assertLinesValues(
+            # pylint: disable=C0326
+            report._get_lines(options),
+            #    Name                       Assets/start  Assets/+  Assets/- Assets/end  Depreciation/start  Depreciation/+  Depreciation/- Depreciation/end  Book Value
+            [    0,                         5,            6,        7,       8,          9,                  10,             11,            12,               13],
+            [
+                ('truck',                   10000,       0,       0,       10000,      4500,               0,             0,            4500,             5500,),
+                ('Asset 1',                   100,       0,       0,         100,        75,               0,             0,              75,               25,),
+                ('Asset 2',                   200,       0,       0,         200,       150,               0,             0,             150,               50,),
+                ('Total',                   10300,       0,       0,       10300,      4725,               0,             0,            4725,             5575,),
+            ],
+            options,
+        )
+
+        # No prefix group, group by account
+        options = self._generate_options(report, '2021-01-01', '2021-12-31', default_options={'assets_grouping_field': 'account_id'})
+        options['unfold_all'] = True
+        self.assertLinesValues(
+            # pylint: disable=C0326
+            report._get_lines(options),
+            #    Name                       Assets/start  Assets/+  Assets/- Assets/end  Depreciation/start  Depreciation/+  Depreciation/- Depreciation/end  Book Value
+        [    0,                                 5,              6,        7,       8,          9,                  10,             11,            12,               13],
+            [
+                ('151000 Fixed Asset',          10300,          0,       0,       10300,      4725,               0,             0,            4725,             5575,),
+                ('truck',                       10000,          0,       0,       10000,      4500,               0,             0,            4500,             5500,),
+                ('Asset 1',                     100,            0,       0,         100,        75,               0,             0,              75,               25,),
+                ('Asset 2',                     200,            0,       0,         200,       150,               0,             0,             150,               50,),
+                ('Total',                       10300,          0,       0,       10300,      4725,               0,             0,            4725,             5575,),
+            ],
+            options,
+        )
+
+        report.prefix_groups_threshold = 3
+        # Prefix group, no group by account
+        options = self._generate_options(report, '2021-01-01', '2021-12-31', default_options={'assets_grouping_field': 'none', 'unfold_all': True})
+        options['unfold_all'] = True
+        self.assertLinesValues(
+            # pylint: disable=C0326
+            report._get_lines(options),
+            #    Name                       Assets/start  Assets/+  Assets/- Assets/end  Depreciation/start  Depreciation/+  Depreciation/- Depreciation/end  Book Value
+            [    0,                         5,            6,        7,       8,          9,                  10,             11,            12,               13],
+            [
+                ('A (2 lines)',               300,       0,       0,         300,       225,               0,             0,             225,               75,),
+                ('Asset 1',                   100,       0,       0,         100,        75,               0,             0,              75,               25,),
+                ('Asset 2',                   200,       0,       0,         200,       150,               0,             0,             150,               50,),
+                ('T (1 line)',              10000,       0,       0,       10000,      4500,               0,             0,            4500,             5500,),
+                ('truck',                   10000,       0,       0,       10000,      4500,               0,             0,            4500,             5500,),
+                ('Total',                   10300,       0,       0,       10300,      4725,               0,             0,            4725,             5575,),
+            ],
+            options,
+        )
+
+        # Prefix group, group by account
+        options = self._generate_options(report, '2021-01-01', '2021-12-31', default_options={'assets_grouping_field': 'account_id', 'unfold_all': True})
+        options['unfold_all'] = True
+        self.assertLinesValues(
+            # pylint: disable=C0326
+            report._get_lines(options),
+            #    Name                       Assets/start  Assets/+  Assets/- Assets/end  Depreciation/start  Depreciation/+  Depreciation/- Depreciation/end  Book Value
+            [    0,                             5,              6,        7,       8,          9,                  10,             11,            12,               13],
+            [
+                ('151000 Fixed Asset',          10300,          0,       0,       10300,      4725,               0,             0,            4725,             5575,),
+                ('A (2 lines)',                 300,            0,       0,         300,       225,               0,             0,             225,               75,),
+                ('Asset 1',                     100,            0,       0,         100,        75,               0,             0,              75,               25,),
+                ('Asset 2',                     200,            0,       0,         200,       150,               0,             0,             150,               50,),
+                ('T (1 line)',                  10000,          0,       0,       10000,      4500,               0,             0,            4500,             5500,),
+                ('truck',                       10000,          0,       0,       10000,      4500,               0,             0,            4500,             5500,),
+                ('Total',                       10300,          0,       0,       10300,      4725,               0,             0,            4725,             5575,),
+            ],
+            options,
+        )
+
+        # No prefix group, group by asset group
+        options = self._generate_options(report, '2021-01-01', '2021-12-31', default_options={'assets_grouping_field': 'asset_group_id'})
+        options['unfold_all'] = True
+        self.assertLinesValues(
+            # pylint: disable=C0326
+            report._get_lines(options),
+            #    Name                       Assets/start  Assets/+  Assets/- Assets/end  Depreciation/start  Depreciation/+  Depreciation/- Depreciation/end  Book Value
+        [    0,                                 5,              6,        7,       8,          9,                  10,             11,            12,              13],
+            [
+                ('(No Asset Group)',            10000,          0,       0,       10000,      4500,               0,             0,            4500,             5500),
+                ('truck',                       10000,          0,       0,       10000,      4500,               0,             0,            4500,             5500),
+                ('Odoo Office',                 300,            0,       0,         300,       225,               0,             0,             225,               75),
+                ('Asset 1',                     100,            0,       0,         100,        75,               0,             0,              75,               25),
+                ('Asset 2',                     200,            0,       0,         200,       150,               0,             0,             150,               50),
+                ('Total',                       10300,          0,       0,       10300,      4725,               0,             0,            4725,             5575),
+            ],
+            options,
+        )
+
+    def test_archive_asset_model(self):
+        """ Test that we can archive an asset model. """
+        self.account_asset_model_fixedassets.active = False
+        self.assertFalse(self.account_asset_model_fixedassets.active)
+
+    def test_asset_increase_with_lock_year(self):
+        """ Test the dates at which the moves are posted even with increase, with lock date"""
+        self.company_data['company'].fiscalyear_lock_date = fields.Date.to_date('2021-03-01')
+
+        asset = self.env['account.asset'].create({
+            'account_asset_id': self.company_data['default_account_assets'].id,
+            'account_depreciation_id': self.company_data['default_account_assets'].copy().id,
+            'account_depreciation_expense_id': self.company_data['default_account_expense'].id,
+            'journal_id': self.company_data['default_journal_misc'].id,
+            'name': 'Car',
+            'acquisition_date': fields.Date.today() + relativedelta(months=-6),
+            'original_value': 12000,
+            'method_number': 12,
+            'method_period': '1',
+            'method': 'linear',
+        })
+
+        asset.validate()
+
+        self.assertRecordValues(
+            asset.depreciation_move_ids.sorted(lambda l: (l.date, l.id)),
+            [
+                {'date': fields.Date.to_date('2021-03-31')},
+                {'date': fields.Date.to_date('2021-03-31')},
+                {'date': fields.Date.to_date('2021-03-31')},
+                {'date': fields.Date.to_date('2021-04-30')},
+                {'date': fields.Date.to_date('2021-05-31')},
+                {'date': fields.Date.to_date('2021-06-30')},
+                {'date': fields.Date.to_date('2021-07-31')},
+                {'date': fields.Date.to_date('2021-08-31')},
+                {'date': fields.Date.to_date('2021-09-30')},
+                {'date': fields.Date.to_date('2021-10-31')},
+                {'date': fields.Date.to_date('2021-11-30')},
+                {'date': fields.Date.to_date('2021-12-31')}
+            ]
+        )
+
+        self.assertEqual(asset.book_value, 6000)
+
+        self.env['asset.modify'].create({
+            'asset_id': asset.id,
+            'name': 'Test increase with lock date',
+            'value_residual': 8000.0,
+            'date':  fields.Date.today() + relativedelta(days=-1),
+            "account_asset_counterpart_id": self.assert_counterpart_account_id,
+        }).modify()
+
+        self.assertEqual(asset.book_value, 8000)
+
+        self.assertRecordValues(
+            asset.children_ids.depreciation_move_ids.sorted(lambda dep: (dep.date, dep.id)),
+            [
+                {'date': fields.Date.to_date('2021-07-31'), 'depreciation_value': 333.33},
+                {'date': fields.Date.to_date('2021-08-31'), 'depreciation_value': 333.34},
+                {'date': fields.Date.to_date('2021-09-30'), 'depreciation_value': 333.33},
+                {'date': fields.Date.to_date('2021-10-31'), 'depreciation_value': 333.33},
+                {'date': fields.Date.to_date('2021-11-30'), 'depreciation_value': 333.34},
+                {'date': fields.Date.to_date('2021-12-31'), 'depreciation_value': 333.33}
+            ]
+        )
+
+    def test_asset_decrease_with_lock_year(self):
+        """ Test the dates and values for the moves that are posted with decrease and lock date"""
+        self.company_data['company'].fiscalyear_lock_date = fields.Date.to_date('2021-03-01')
+
+        asset = self.env['account.asset'].create({
+            'account_asset_id': self.company_data['default_account_assets'].id,
+            'account_depreciation_id': self.company_data['default_account_assets'].copy().id,
+            'account_depreciation_expense_id': self.company_data['default_account_expense'].id,
+            'journal_id': self.company_data['default_journal_misc'].id,
+            'name': 'Car',
+            'acquisition_date': fields.Date.today() + relativedelta(months=-6),
+            'original_value': 12000,
+            'method_number': 12,
+            'method_period': '1',
+            'method': 'linear',
+        })
+
+        asset.validate()
+
+        self.assertEqual(asset.book_value, 6000)
+
+        self.env['asset.modify'].create({
+            'asset_id': asset.id,
+            'name': 'Test decrease with lock date',
+            'value_residual': 4000.0,
+            'date':  fields.Date.today() + relativedelta(days=-1),
+            "account_asset_counterpart_id": self.assert_counterpart_account_id,
+        }).modify()
+
+        self.assertEqual(asset.book_value, 4000)
+
+        self.assertRecordValues(
+            asset.depreciation_move_ids.sorted(lambda dep: (dep.date, dep.id)),
+            [
+                {'date': fields.Date.to_date('2021-03-31'), 'depreciation_value': 1000},
+                {'date': fields.Date.to_date('2021-03-31'), 'depreciation_value': 1000},
+                {'date': fields.Date.to_date('2021-03-31'), 'depreciation_value': 1000},
+                {'date': fields.Date.to_date('2021-04-30'), 'depreciation_value': 1000},
+                {'date': fields.Date.to_date('2021-05-31'), 'depreciation_value': 1000},
+                {'date': fields.Date.to_date('2021-06-30'), 'depreciation_value': 1000},
+                {'date': fields.Date.to_date('2021-06-30'), 'depreciation_value': 2000},
+                {'date': fields.Date.to_date('2021-07-31'), 'depreciation_value': 666.67},
+                {'date': fields.Date.to_date('2021-08-31'), 'depreciation_value': 666.66},
+                {'date': fields.Date.to_date('2021-09-30'), 'depreciation_value': 666.67},
+                {'date': fields.Date.to_date('2021-10-31'), 'depreciation_value': 666.67},
+                {'date': fields.Date.to_date('2021-11-30'), 'depreciation_value': 666.66},
+                {'date': fields.Date.to_date('2021-12-31'), 'depreciation_value': 666.67}
+            ]
+        )
+
+    def test_asset_onchange_model(self):
+        """
+        Test the changes of account_asset_id when changing asset models
+        """
+        account_asset = self.company_data['default_account_assets'].copy()
+        asset_model = self.env['account.asset'].create({
+            'name': 'test model',
+            'state': 'model',
+            'active': True,
+            'method': 'linear',
+            'method_number': 5,
+            'method_period': '1',
+            'prorata_computation_type': 'none',
+            'account_depreciation_id': self.company_data['default_account_assets'].id,
+            'account_depreciation_expense_id': self.company_data['default_account_expense'].id,
+            'account_asset_id': account_asset.id,
+            'journal_id': self.company_data['default_journal_misc'].id,
+        })
+
+        asset_model_with_account = self.env['account.asset'].create({
+            'name': 'test model with account',
+            'state': 'model',
+            'active': True,
+            'method': 'linear',
+            'method_number': 5,
+            'method_period': '1',
+            'prorata_computation_type': 'none',
+            'account_depreciation_id': self.company_data['default_account_assets'].id,
+            'account_depreciation_expense_id': self.company_data['default_account_expense'].id,
+            'journal_id': self.company_data['default_journal_misc'].id,
+        })
+
+        asset_form = Form(self.env['account.asset'])
+        asset_form.name = "Test Asset"
+        asset_form.original_value = 10000
+        asset_form.model_id = asset_model
+
+        self.assertEqual(asset_form.account_asset_id, account_asset, "The account_asset_id should be the one from the model")
+
+        asset_form.model_id = asset_model_with_account
+        self.assertEqual(asset_form.account_asset_id, self.company_data['default_account_assets'], "The account_asset_id should be computed from the depreciation account from the model")
+
+        other_account_on_bill = self.company_data['default_account_assets'].copy()
+        other_account_on_bill.create_asset = 'draft'
+        other_account_on_bill.asset_model_ids = asset_model
+        invoice = self.env['account.move'].create({
+            'move_type': 'in_invoice',
+            'invoice_date': '2020-12-31',
+            'partner_id': self.partner_a.id,
+            'invoice_line_ids': [
+                (0, 0, {
+                    'name': 'A beautiful small bomb',
+                    'account_id': other_account_on_bill.id,
+                    'price_unit': 200.0,
+                    'quantity': 1,
+                }),
+            ],
+        })
+        invoice.action_post()
+
+        self.assertEqual(invoice.asset_ids.account_asset_id, other_account_on_bill,
+                         "The account should be the one from the bill, not the model")
+
+        asset_form = Form(invoice.asset_ids)
+        asset_form.model_id = asset_model
+
+        self.assertEqual(asset_form.account_asset_id, other_account_on_bill, "We keep the account from the bill")
+
+    def test_asset_reevaluation_degressive_linear(self):
+        """ Tests the reevaluation of an asset in degressive_then_linear with a gross increase"""
+        asset = self.env['account.asset'].create({
+            'method_period': '12',
+            'method_number': 5,
+            'name': "Car with purple sticker",
+            'original_value': 10000.0,
+            'acquisition_date': fields.Date.today() - relativedelta(years=2),
+            'account_asset_id': self.company_data['default_account_assets'].id,
+            'account_depreciation_id': self.company_data['default_account_assets'].copy().id,
+            'account_depreciation_expense_id': self.company_data['default_account_expense'].id,
+            'journal_id': self.company_data['default_journal_misc'].id,
+            'prorata_computation_type': 'none',
+            'method': 'degressive_then_linear',
+            'method_progress_factor': 0.4,
+        })
+        asset.validate()
+        self.assertRecordValues(asset.depreciation_move_ids, [{
+            'depreciation_value': 4000,
+            'asset_remaining_value': 6000,
+            'state': 'posted',
+        }, {
+            'depreciation_value': 2400,
+            'asset_remaining_value': 3600,
+            'state': 'posted',
+        }, {
+            'depreciation_value': 2000,
+            'asset_remaining_value': 1600,
+            'state': 'draft',
+        }, {
+            'depreciation_value': 1600,
+            'asset_remaining_value': 0,
+            'state': 'draft',
+        }])
+        self.env['asset.modify'].create({
+            'name': "Inflation made it take 20%!",
+            'date': fields.Date.today() + relativedelta(months=-6, days=-1),
+            'asset_id': asset.id,
+            'value_residual': 5600,
+            "account_asset_counterpart_id": self.assert_counterpart_account_id,
+        }).modify()
+        self.assertRecordValues(asset.children_ids[0].depreciation_move_ids.sorted(lambda mv: (mv.date, mv.id)), [{
+            # (2000 + 2000*6400/3600) / 5
+            'depreciation_value': 1111.11,
+            'asset_remaining_value': 888.89,
+            'state': 'draft',
+        }, {
+            'depreciation_value': 888.89,
+            'asset_remaining_value': 0,
+            'state': 'draft',
+        }])
+
+    def test_asset_move_type(self):
+        """ Test the field asset_move_type set on account.move describing the
+            relation that a move can have towards an asset
+        """
+        asset_account_id = self.company_data['default_account_assets'].id
+
+        bill = self.env['account.move'].create([
+            {
+                'move_type': 'in_invoice',
+                'invoice_date': fields.Date.today() + relativedelta(months=-6, days=-1),
+                'date': fields.Date.today() + relativedelta(months=-6, days=-1),
+                'partner_id': self.partner_a.id,
+                'invoice_line_ids': [Command.create({
+                    'name': 'Truck',
+                    'account_id': asset_account_id,
+                    'quantity': 1.0,
+                    'price_unit': 1000.0,
+                    'tax_ids': [Command.set(self.company_data['default_tax_sale'].ids)],
+                })],
+            },
+        ])
+        bill.action_post()
+        asset_line = bill.line_ids.filtered(lambda x: x.account_id.id == asset_account_id)
+        asset_form = Form(self.env['account.asset'].with_context(default_original_move_line_ids=asset_line.ids))
+        asset_form.original_move_line_ids = asset_line
+        asset_form.account_depreciation_expense_id = self.company_data['default_account_expense']
+        car = asset_form.save()
+        car.validate()
+
+        # All depreciation move must be defined as depreciation
+        self.assertTrue(all(car.depreciation_move_ids.mapped(lambda m: m.asset_move_type == 'depreciation')))
+
+        # Negative revaluation
+        self.env['asset.modify'].create({
+            'name': 'Little scratch :(',
+            'asset_id': car.id,
+            'value_residual': car.book_value - 150,
+            'date': fields.Date.today(),
+        }).modify()
+
+        # Ensure that the added depreciation moves are one 'depreciation' and the other is 'negative_revaluation'
+        added_move_on_revaluation = car.depreciation_move_ids.filtered(lambda m: m.date == fields.Date.today())
+        self.assertRecordValues(added_move_on_revaluation.sorted(lambda mv: mv.id), [
+            {'asset_move_type': 'depreciation'},
+            {'asset_move_type': 'negative_revaluation'}
+        ])
+
+        # Sell
+        closing_invoice = self.env['account.move'].create({
+            'move_type': 'out_invoice',
+            'invoice_line_ids': [Command.create(
+                {'price_unit': car.book_value + 100}  # selling price: 849.46, net_gain_on_sale: 100.45
+            )]
+        })
+
+        self.env['asset.modify'].create({
+            'asset_id': car.id,
+            'modify_action': 'sell',
+            'invoice_line_ids': closing_invoice.invoice_line_ids,
+            'date': fields.Date.today(),
+        }).sell_dispose()
+        selling_move = car.depreciation_move_ids.filtered(lambda l: l.state == 'draft')
+        selling_move.action_post()
+
+        # Ensure that the added depreciation moves are one 'depreciation' and the other is 'sale'
+        added_move_on_sale = car.depreciation_move_ids.filtered(lambda m: m.date == fields.Date.today()) - added_move_on_revaluation
+        self.assertTrue(added_move_on_sale.asset_move_type == 'sale')
+        self.assertEqual(car.net_gain_on_sale, 100)
+
+        # Create new asset to test positive revaluation and disposal
+        new_car = car.copy()
+        new_car.validate()
+
+        # Positive revaluation
+        self.env['asset.modify'].create({
+            'name': 'New beautiful sticker :D',
+            'asset_id': new_car.id,
+            'value_residual': new_car.book_value + 50,
+            'salvage_value': 0,
+            'date': fields.Date.today(),
+            "account_asset_counterpart_id": self.assert_counterpart_account_id,
+        }).modify()
+
+        self.assertEqual(
+            new_car.children_ids.original_move_line_ids.move_id.asset_move_type,
+            'positive_revaluation',
+            "the original move of the child asset is set as 'positive_revaluation'"
+        )
+
+        disposal_action_view = self.env['asset.modify'].create({
+            'asset_id': new_car.id,
+            'modify_action': 'dispose',
+            'date': fields.Date.today()
+        }).sell_dispose()
+
+        self.env['account.move'].browse(disposal_action_view['res_id']).action_post()
+        self.assertEqual(self.env['account.move'].browse(disposal_action_view['res_id']).asset_move_type, 'disposal')
+
+    def test_asset_already_depreciated(self):
+        asset = self.env['account.asset'].create({
+            'method_period': '12',
+            'method_number': 5,
+            'name': "Car with purple sticker",
+            'original_value': 10000.0,
+            'acquisition_date': fields.Date.today() - relativedelta(years=1),
+            'account_asset_id': self.company_data['default_account_assets'].id,
+            'account_depreciation_id': self.company_data['default_account_assets'].copy().id,
+            'account_depreciation_expense_id': self.company_data['default_account_expense'].id,
+            'journal_id': self.company_data['default_journal_misc'].id,
+            'prorata_computation_type': 'none',
+            'already_depreciated_amount_import': 3000,
+        })
+        asset.validate()
+
+        self.env['asset.modify'].create({
+            'asset_id': asset.id,
+            'date': fields.Date.today() - relativedelta(days=1),
+            'name': 'Test reason',
+        }).modify()
+
+        self.assertRecordValues(asset.depreciation_move_ids, [{
+            'depreciation_value': 1000,
+            'date': fields.Date.to_date('2021-12-31'),
+        }, {
+            'depreciation_value': 2000,
+            'date': fields.Date.to_date('2022-12-31'),
+        }, {
+            'depreciation_value': 2000,
+            'date': fields.Date.to_date('2023-12-31'),
+        }, {
+            'depreciation_value': 2000,
+            'date': fields.Date.to_date('2024-12-31'),
+        },
+        ])
+
+        fully_depreciated_asset = self.env['account.asset'].create({
+            'method_period': '12',
+            'method_number': 5,
+            'name': "Car with purple sticker",
+            'original_value': 10000.0,
+            'acquisition_date': fields.Date.today() - relativedelta(years=2),
+            'account_asset_id': self.company_data['default_account_assets'].id,
+            'account_depreciation_id': self.company_data['default_account_assets'].copy().id,
+            'account_depreciation_expense_id': self.company_data['default_account_expense'].id,
+            'journal_id': self.company_data['default_journal_misc'].id,
+            'prorata_computation_type': 'none',
+            'salvage_value': 4000,
+            'already_depreciated_amount_import': 6000,
+        })
+        fully_depreciated_asset.validate()
+
+        self.env['asset.modify'].create({
+            'asset_id': fully_depreciated_asset.id,
+            'date': fields.Date.today(),
+            'modify_action': 'dispose',
+        }).sell_dispose()
+        self.assertEqual(len(fully_depreciated_asset.depreciation_move_ids), 1, "Only the disposal should be created")
+
+    def test_asset_acquisition_date_from_bill(self):
+        """Test that the invoice date is used as acquisition date instead of date"""
+        self.company_data['default_account_assets'].create_asset = 'draft'
+        self.company_data['default_account_assets'].asset_model_ids = self.account_asset_model_fixedassets
+
+        bill = self.env['account.move'].with_context(asset_type='purchase').create({
+            'move_type': 'in_invoice',
+            'partner_id': self.partner_a.id,
+            'date': '2020-06-15',
+            'invoice_date': '2020-06-01',
+            'invoice_line_ids': [Command.create({
+                'name': 'Insurance claim',
+                'account_id': self.company_data['default_account_assets'].id,
+                'price_unit': 450,
+                'quantity': 1,
+            })],
+        })
+        bill.action_post()
+        asset = bill.asset_ids
+        self.assertEqual(asset.acquisition_date, bill.invoice_date)
+
+    def test_asset_write_multi_company(self):
+        assets = self.env['account.asset'].create([
+            {
+            'company_id': company_data['company'].id,
+            'name': 'test asset',
+            } for company_data in [self.company_data, self.company_data_2]
+        ])
+        self.assertEqual(assets[0].company_id, self.company_data['company'])
+        self.assertEqual(assets[1].company_id, self.company_data_2['company'])
+        assets.validate()
+
+    def test_depreciation_moves_company_with_sub_company(self):
+        """The depreciation moves should have the company of the asset, even in multicompany setup"""
+        company = self.env.company
+        branch_x = self.env['res.company'].create({
+            'name': 'Branch X',
+            'country_id': company.country_id.id,
+            'parent_id': company.id,
+        })
+
+        asset_vals = {
+            'method_period': '12',
+            'method_number': 5,
+            'name': "Car with purple sticker",
+            'original_value': 10000.0,
+            'acquisition_date': fields.Date.today() - relativedelta(years=1),
+            'account_asset_id': self.company_data['default_account_assets'].id,
+            'account_depreciation_id': self.company_data['default_account_assets'].copy().id,
+            'account_depreciation_expense_id': self.company_data['default_account_expense'].id,
+            'journal_id': self.company_data['default_journal_misc'].id,
+        }
+
+        setup_list = [
+            {'company_ids': (company + branch_x).ids, 'company_id': branch_x.id},
+            {'company_ids': branch_x.ids, 'company_id': branch_x.id},
+            {'company_ids': (company + branch_x).ids, 'company_id': company.id},
+            {'company_ids': company.ids, 'company_id': company.id},
+        ]
+
+        expected_vals_list = [branch_x, branch_x, company, company]
+
+        for setup, expected in zip(setup_list, expected_vals_list):
+            with self.subTest(setup=setup, expected_company=expected):
+                self.env.user.write({
+                    'company_ids': [Command.set(setup['company_ids'])],
+                    'company_id': setup['company_id'],
+                })
+                asset = self.env['account.asset'].create(asset_vals)
+                asset.compute_depreciation_board()
+                self.assertEqual(asset.depreciation_move_ids.mapped('company_id'), expected)
+
+    def test_multiple_asset_models_with_branches(self):
+        """Check that asset models are not shared between siblings, only with ancestors."""
+
+        branch_a = self.setup_other_company(name='Test Branch A', parent_id=self.company_data['company'].id)
+        asset_model_a = self.account_asset_model_fixedassets.copy()
+        asset_model_a.company_id = branch_a['company']
+
+        branch_b = self.setup_other_company(name='Test Branch B', parent_id=self.company_data['company'].id)
+        asset_model_b = self.account_asset_model_fixedassets.copy()
+        asset_model_b.company_id = branch_b['company']
+
+        # We need to set both branch's asset models on the parent company's asset account.
+        self.company_data['default_account_assets'].asset_model_ids = asset_model_a + asset_model_b
+        self.company_data['default_account_assets'].create_asset = 'draft'
+
+        vendor_bill = self.env['account.move'].with_company(branch_a['company']).create({
+            'move_type': 'in_invoice',
+            'partner_id': self.partner_a.id,
+            'invoice_date': fields.Date.today(),
+            'invoice_line_ids': [Command.create({
+                'name': 'Very little red car',
+                # Make sure the bill uses the asset account with both asset models.
+                'account_id': self.company_data['default_account_assets'].id,
+                'price_unit': 1000,
+                'quantity': 1,
+            })],
+        })
+        vendor_bill.action_post()
+
+        self.assertEqual(len(vendor_bill.asset_ids), 1, "Only one asset should have been created.")
+        self.assertEqual(vendor_bill.asset_ids.company_id, branch_a['company'], f"The asset should have been created on company: {branch_a['company'].name}")
diff --git a/dev_odex30_accounting/odex30_account_asset/tests/test_board_compute.py b/dev_odex30_accounting/odex30_account_asset/tests/test_board_compute.py
new file mode 100644
index 0000000..facffa9
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_asset/tests/test_board_compute.py
@@ -0,0 +1,1321 @@
+from odoo.tests.common import tagged, freeze_time
+from odoo.addons.odex30_account_asset.tests.common import TestAccountAssetCommon
+from odoo import fields
+
+
+@freeze_time('2022-07-01')
+@tagged('post_install', '-at_install')
+class TestAccountAssetComputation(TestAccountAssetCommon):
+
+    @classmethod
+    def setUpClass(cls):
+        super().setUpClass()
+        cls.car = cls.create_asset(value=60000, periodicity="yearly", periods=5, method="linear", salvage_value=0)
+
+    def test_linear_5_years_no_prorata_asset(self):
+        self.car.validate()
+
+        self.assertEqual(self.car.state, 'open')
+        self.assertEqual(self.car.book_value, 36000)
+        self.assertRecordValues(self.car.depreciation_move_ids, [
+            self._get_depreciation_move_values(date='2020-12-31', depreciation_value=12000, remaining_value=48000, depreciated_value=12000, state='posted'),
+            self._get_depreciation_move_values(date='2021-12-31', depreciation_value=12000, remaining_value=36000, depreciated_value=24000, state='posted'),
+            self._get_depreciation_move_values(date='2022-12-31', depreciation_value=12000, remaining_value=24000, depreciated_value=36000, state='draft'),
+            self._get_depreciation_move_values(date='2023-12-31', depreciation_value=12000, remaining_value=12000, depreciated_value=48000, state='draft'),
+            self._get_depreciation_move_values(date='2024-12-31', depreciation_value=12000, remaining_value=0, depreciated_value=60000, state='draft'),
+        ])
+
+    def test_linear_5_years_no_prorata_with_imported_amount_asset(self):
+        self.car.write({'already_depreciated_amount_import': 1000})
+        self.car.validate()
+
+        self.assertEqual(self.car.state, 'open')
+        self.assertEqual(self.car.book_value, 36000)
+        self.assertRecordValues(self.car.depreciation_move_ids, [
+            self._get_depreciation_move_values(date='2020-12-31', depreciation_value=11000, remaining_value=48000, depreciated_value=12000, state='posted'),
+            self._get_depreciation_move_values(date='2021-12-31', depreciation_value=12000, remaining_value=36000, depreciated_value=24000, state='posted'),
+            self._get_depreciation_move_values(date='2022-12-31', depreciation_value=12000, remaining_value=24000, depreciated_value=36000, state='draft'),
+            self._get_depreciation_move_values(date='2023-12-31', depreciation_value=12000, remaining_value=12000, depreciated_value=48000, state='draft'),
+            self._get_depreciation_move_values(date='2024-12-31', depreciation_value=12000, remaining_value=0, depreciated_value=60000, state='draft'),
+        ])
+
+    def test_linear_5_years_no_prorata_with_salvage_value_asset(self):
+        self.car.write({'salvage_value': 1000})
+        self.car.validate()
+
+        self.assertEqual(self.car.state, 'open')
+        self.assertEqual(self.car.book_value, 36400)
+        self.assertEqual(self.car.value_residual, 35400)
+        self.assertRecordValues(self.car.depreciation_move_ids, [
+            self._get_depreciation_move_values(date='2020-12-31', depreciation_value=11800, remaining_value=47200, depreciated_value=11800, state='posted'),
+            self._get_depreciation_move_values(date='2021-12-31', depreciation_value=11800, remaining_value=35400, depreciated_value=23600, state='posted'),
+            self._get_depreciation_move_values(date='2022-12-31', depreciation_value=11800, remaining_value=23600, depreciated_value=35400, state='draft'),
+            self._get_depreciation_move_values(date='2023-12-31', depreciation_value=11800, remaining_value=11800, depreciated_value=47200, state='draft'),
+            self._get_depreciation_move_values(date='2024-12-31', depreciation_value=11800, remaining_value=0, depreciated_value=59000, state='draft'),
+        ])
+
+    def test_linear_5_years_constant_periods_asset(self):
+        self.car.write({
+            'prorata_computation_type': 'constant_periods',
+            'prorata_date': '2020-07-01',
+        })
+        self.car.validate()
+
+        self.assertEqual(self.car.state, 'open')
+        self.assertEqual(self.car.book_value, 42000)
+        self.assertRecordValues(self.car.depreciation_move_ids, [
+            self._get_depreciation_move_values(date='2020-12-31', depreciation_value=6000, remaining_value=54000, depreciated_value=6000, state='posted'),
+            self._get_depreciation_move_values(date='2021-12-31', depreciation_value=12000, remaining_value=42000, depreciated_value=18000, state='posted'),
+            self._get_depreciation_move_values(date='2022-12-31', depreciation_value=12000, remaining_value=30000, depreciated_value=30000, state='draft'),
+            self._get_depreciation_move_values(date='2023-12-31', depreciation_value=12000, remaining_value=18000, depreciated_value=42000, state='draft'),
+            self._get_depreciation_move_values(date='2024-12-31', depreciation_value=12000, remaining_value=6000, depreciated_value=54000, state='draft'),
+            self._get_depreciation_move_values(date='2025-12-31', depreciation_value=6000, remaining_value=0, depreciated_value=60000, state='draft'),
+        ])
+
+    def test_linear_5_years_daily_computation_asset(self):
+        self.car.write({
+            'prorata_computation_type': 'daily_computation',
+            'prorata_date': '2020-07-01',
+        })
+        self.car.validate()
+
+        self.assertEqual(self.car.state, 'open')
+        self.assertEqual(self.car.book_value, 41960.57)
+        self.assertRecordValues(self.car.depreciation_move_ids, [
+            self._get_depreciation_move_values(date='2020-12-31', depreciation_value=6046, remaining_value=53954, depreciated_value=6046, state='posted'),
+            self._get_depreciation_move_values(date='2021-12-31', depreciation_value=11993.43, remaining_value=41960.57, depreciated_value=18039.43, state='posted'),
+            self._get_depreciation_move_values(date='2022-12-31', depreciation_value=11993.43, remaining_value=29967.14, depreciated_value=30032.86, state='draft'),
+            self._get_depreciation_move_values(date='2023-12-31', depreciation_value=11993.43, remaining_value=17973.71, depreciated_value=42026.29, state='draft'),
+            self._get_depreciation_move_values(date='2024-12-31', depreciation_value=12026.28, remaining_value=5947.43, depreciated_value=54052.57, state='draft'),
+            self._get_depreciation_move_values(date='2025-12-31', depreciation_value=5947.43, remaining_value=0, depreciated_value=60000, state='draft'),
+        ])
+
+    def test_degressive_5_years_no_prorata_asset(self):
+        self.car.write({
+            'method': 'degressive',
+            'method_progress_factor': 0.3,
+        })
+        self.car.validate()
+
+        self.assertEqual(self.car.state, 'open')
+        self.assertEqual(self.car.book_value, 29400)
+        self.assertRecordValues(self.car.depreciation_move_ids, [
+            self._get_depreciation_move_values(date='2020-12-31', depreciation_value=18000, remaining_value=42000, depreciated_value=18000, state='posted'),
+            self._get_depreciation_move_values(date='2021-12-31', depreciation_value=12600, remaining_value=29400, depreciated_value=30600, state='posted'),
+            self._get_depreciation_move_values(date='2022-12-31', depreciation_value=9800, remaining_value=19600, depreciated_value=40400, state='draft'),
+            self._get_depreciation_move_values(date='2023-12-31', depreciation_value=9800, remaining_value=9800, depreciated_value=50200, state='draft'),
+            self._get_depreciation_move_values(date='2024-12-31', depreciation_value=9800, remaining_value=0, depreciated_value=60000, state='draft'),
+        ])
+
+    def test_degressive_5_years_no_prorata_with_imported_amount_asset(self):
+        self.car.write({
+            'method': 'degressive',
+            'method_progress_factor': 0.3,
+            'already_depreciated_amount_import': 1000,
+        })
+        self.car.validate()
+
+        self.assertEqual(self.car.state, 'open')
+        self.assertEqual(self.car.book_value, 29400)
+        self.assertRecordValues(self.car.depreciation_move_ids, [
+            self._get_depreciation_move_values(date='2020-12-31', depreciation_value=17000, remaining_value=42000, depreciated_value=18000, state='posted'),
+            self._get_depreciation_move_values(date='2021-12-31', depreciation_value=12600, remaining_value=29400, depreciated_value=30600, state='posted'),
+            self._get_depreciation_move_values(date='2022-12-31', depreciation_value=9800, remaining_value=19600, depreciated_value=40400, state='draft'),
+            self._get_depreciation_move_values(date='2023-12-31', depreciation_value=9800, remaining_value=9800, depreciated_value=50200, state='draft'),
+            self._get_depreciation_move_values(date='2024-12-31', depreciation_value=9800, remaining_value=0, depreciated_value=60000, state='draft'),
+        ])
+
+    def test_degressive_5_years_no_prorata_with_salvage_value_asset(self):
+        self.car.write({
+            'method': 'degressive',
+            'method_progress_factor': 0.3,
+            'salvage_value': 1000,
+        })
+        self.car.validate()
+
+        self.assertEqual(self.car.state, 'open')
+        self.assertEqual(self.car.book_value, 29910)
+        self.assertEqual(self.car.value_residual, 28910)
+        self.assertRecordValues(self.car.depreciation_move_ids, [
+            self._get_depreciation_move_values(date='2020-12-31', depreciation_value=17700, remaining_value=41300, depreciated_value=17700, state='posted'),
+            self._get_depreciation_move_values(date='2021-12-31', depreciation_value=12390, remaining_value=28910, depreciated_value=30090, state='posted'),
+            self._get_depreciation_move_values(date='2022-12-31', depreciation_value=9636.67, remaining_value=19273.33, depreciated_value=39726.67, state='draft'),
+            self._get_depreciation_move_values(date='2023-12-31', depreciation_value=9636.67, remaining_value=9636.66, depreciated_value=49363.34, state='draft'),
+            self._get_depreciation_move_values(date='2024-12-31', depreciation_value=9636.66, remaining_value=0, depreciated_value=59000, state='draft'),
+        ])
+
+    def test_degressive_then_linear_5_years_no_prorata_asset(self):
+        asset = self.create_asset(value=60000, periodicity="yearly", periods=5, method="degressive_then_linear", degressive_factor=0.3)
+        asset.validate()
+        self.assertEqual(asset.state, 'open')
+        self.assertEqual(asset.book_value, 29400)
+        self.assertRecordValues(asset.depreciation_move_ids, [
+            self._get_depreciation_move_values(date='2020-12-31', depreciation_value=18000, remaining_value=42000, depreciated_value=18000, state='posted'),
+            self._get_depreciation_move_values(date='2021-12-31', depreciation_value=12600, remaining_value=29400, depreciated_value=30600, state='posted'),
+            self._get_depreciation_move_values(date='2022-12-31', depreciation_value=12000, remaining_value=17400, depreciated_value=42600, state='draft'),
+            self._get_depreciation_move_values(date='2023-12-31', depreciation_value=12000, remaining_value=5400, depreciated_value=54600, state='draft'),
+            self._get_depreciation_move_values(date='2024-12-31', depreciation_value=5400, remaining_value=0, depreciated_value=60000, state='draft'),
+        ])
+
+    def test_degressive_then_linear_5_years_no_prorata_negative_asset(self):
+        asset = self.create_asset(value=-60000, periodicity="yearly", periods=5, method="degressive_then_linear", degressive_factor=0.3)
+        asset.validate()
+        self.assertEqual(asset.state, 'open')
+        self.assertEqual(asset.book_value, -29400)
+        self.assertRecordValues(asset.depreciation_move_ids, [
+            self._get_depreciation_move_values(date='2020-12-31', depreciation_value=-18000, remaining_value=-42000, depreciated_value=-18000, state='posted'),
+            self._get_depreciation_move_values(date='2021-12-31', depreciation_value=-12600, remaining_value=-29400, depreciated_value=-30600, state='posted'),
+            self._get_depreciation_move_values(date='2022-12-31', depreciation_value=-12000, remaining_value=-17400, depreciated_value=-42600, state='draft'),
+            self._get_depreciation_move_values(date='2023-12-31', depreciation_value=-12000, remaining_value=-5400, depreciated_value=-54600, state='draft'),
+            self._get_depreciation_move_values(date='2024-12-31', depreciation_value=-5400, remaining_value=0, depreciated_value=-60000, state='draft'),
+        ])
+
+    def test_degressive_than_linear_5_years_no_prorata_with_imported_amount_asset(self):
+        asset = self.create_asset(value=60000, periodicity="yearly", periods=5, method="degressive_then_linear", degressive_factor=0.3, import_depreciation=1000)
+        asset.validate()
+        self.assertEqual(asset.state, 'open')
+        self.assertEqual(asset.book_value, 29400)
+        self.assertRecordValues(asset.depreciation_move_ids, [
+            self._get_depreciation_move_values(date='2020-12-31', depreciation_value=18000 - 1000, remaining_value=42000, depreciated_value=18000, state='posted'),
+            self._get_depreciation_move_values(date='2021-12-31', depreciation_value=12600, remaining_value=29400, depreciated_value=30600, state='posted'),
+            self._get_depreciation_move_values(date='2022-12-31', depreciation_value=12000, remaining_value=17400, depreciated_value=42600, state='draft'),
+            self._get_depreciation_move_values(date='2023-12-31', depreciation_value=12000, remaining_value=5400, depreciated_value=54600, state='draft'),
+            self._get_depreciation_move_values(date='2024-12-31', depreciation_value=5400, remaining_value=0, depreciated_value=60000, state='draft'),
+        ])
+
+    def test_degressive_than_linear_5_years_no_prorata_with_imported_amount_negative_asset(self):
+        asset = self.create_asset(value=-60000, periodicity="yearly", periods=5, method="degressive_then_linear", degressive_factor=0.3, import_depreciation=-1000)
+        asset.validate()
+        self.assertEqual(asset.state, 'open')
+        self.assertEqual(asset.book_value, -29400)
+        self.assertRecordValues(asset.depreciation_move_ids, [
+            self._get_depreciation_move_values(date='2020-12-31', depreciation_value=-18000 + 1000, remaining_value=-42000, depreciated_value=-18000, state='posted'),
+            self._get_depreciation_move_values(date='2021-12-31', depreciation_value=-12600, remaining_value=-29400, depreciated_value=-30600, state='posted'),
+            self._get_depreciation_move_values(date='2022-12-31', depreciation_value=-12000, remaining_value=-17400, depreciated_value=-42600, state='draft'),
+            self._get_depreciation_move_values(date='2023-12-31', depreciation_value=-12000, remaining_value=-5400, depreciated_value=-54600, state='draft'),
+            self._get_depreciation_move_values(date='2024-12-31', depreciation_value=-5400, remaining_value=0, depreciated_value=-60000, state='draft'),
+        ])
+
+    def test_degressive_than_linear_5_years_no_prorata_with_salvage_value_asset(self):
+        asset = self.create_asset(value=60000, periodicity="yearly", periods=5, salvage_value=1000, method="degressive_then_linear", degressive_factor=0.3)
+        asset.validate()
+        self.assertEqual(asset.state, 'open')
+        self.assertEqual(asset.value_residual, 28910)
+        self.assertEqual(asset.book_value, 28910 + 1000)
+        self.assertRecordValues(asset.depreciation_move_ids, [
+            self._get_depreciation_move_values(date='2020-12-31', depreciation_value=17700, remaining_value=41300, depreciated_value=17700, state='posted'),
+            self._get_depreciation_move_values(date='2021-12-31', depreciation_value=12390, remaining_value=28910, depreciated_value=30090, state='posted'),
+            self._get_depreciation_move_values(date='2022-12-31', depreciation_value=11800, remaining_value=17110, depreciated_value=41890, state='draft'),
+            self._get_depreciation_move_values(date='2023-12-31', depreciation_value=11800, remaining_value=5310, depreciated_value=53690, state='draft'),
+            self._get_depreciation_move_values(date='2024-12-31', depreciation_value=5310, remaining_value=0, depreciated_value=59000, state='draft'),
+        ])
+
+    def test_degressive_then_linear_36_month_constant_period_asset(self):
+        """
+        The depreciation amount is computed that way: Compute a degressive amount for each year and split it by month linearly.
+        The depreciation value could vary by one currency unit to absorb small differences that are created over time.
+        """
+        asset = self.create_asset(value=10000, periodicity="monthly", periods=36, method="degressive_then_linear", degressive_factor=0.4)
+        asset.validate()
+        self.assertEqual(asset.state, 'open')
+        self.assertRecordValues(asset.depreciation_move_ids, [
+            self._get_depreciation_move_values(date='2020-01-31', depreciation_value=333.33, remaining_value=9666.67, depreciated_value=333.33, state='posted'),
+            self._get_depreciation_move_values(date='2020-02-29', depreciation_value=333.34, remaining_value=9333.33, depreciated_value=666.67, state='posted'),
+            self._get_depreciation_move_values(date='2020-03-31', depreciation_value=333.33, remaining_value=9000.00, depreciated_value=1000.00, state='posted'),
+            self._get_depreciation_move_values(date='2020-04-30', depreciation_value=333.33, remaining_value=8666.67, depreciated_value=1333.33, state='posted'),
+            self._get_depreciation_move_values(date='2020-05-31', depreciation_value=333.34, remaining_value=8333.33, depreciated_value=1666.67, state='posted'),
+            self._get_depreciation_move_values(date='2020-06-30', depreciation_value=333.33, remaining_value=8000.00, depreciated_value=2000.00, state='posted'),
+            self._get_depreciation_move_values(date='2020-07-31', depreciation_value=333.33, remaining_value=7666.67, depreciated_value=2333.33, state='posted'),
+            self._get_depreciation_move_values(date='2020-08-31', depreciation_value=333.34, remaining_value=7333.33, depreciated_value=2666.67, state='posted'),
+            self._get_depreciation_move_values(date='2020-09-30', depreciation_value=333.33, remaining_value=7000.00, depreciated_value=3000.00, state='posted'),
+            self._get_depreciation_move_values(date='2020-10-31', depreciation_value=333.33, remaining_value=6666.67, depreciated_value=3333.33, state='posted'),
+            self._get_depreciation_move_values(date='2020-11-30', depreciation_value=333.34, remaining_value=6333.33, depreciated_value=3666.67, state='posted'),
+            self._get_depreciation_move_values(date='2020-12-31', depreciation_value=333.33, remaining_value=6000.00, depreciated_value=4000.00, state='posted'),
+            self._get_depreciation_move_values(date='2021-01-31', depreciation_value=277.78, remaining_value=5722.22, depreciated_value=4277.78, state='posted'),
+            self._get_depreciation_move_values(date='2021-02-28', depreciation_value=277.78, remaining_value=5444.44, depreciated_value=4555.56, state='posted'),
+            self._get_depreciation_move_values(date='2021-03-31', depreciation_value=277.78, remaining_value=5166.66, depreciated_value=4833.34, state='posted'),
+            self._get_depreciation_move_values(date='2021-04-30', depreciation_value=277.77, remaining_value=4888.89, depreciated_value=5111.11, state='posted'),
+            self._get_depreciation_move_values(date='2021-05-31', depreciation_value=277.78, remaining_value=4611.11, depreciated_value=5388.89, state='posted'),
+            self._get_depreciation_move_values(date='2021-06-30', depreciation_value=277.78, remaining_value=4333.33, depreciated_value=5666.67, state='posted'),
+            self._get_depreciation_move_values(date='2021-07-31', depreciation_value=277.78, remaining_value=4055.55, depreciated_value=5944.45, state='posted'),
+            self._get_depreciation_move_values(date='2021-08-31', depreciation_value=277.78, remaining_value=3777.77, depreciated_value=6222.23, state='posted'),
+            self._get_depreciation_move_values(date='2021-09-30', depreciation_value=277.77, remaining_value=3500.00, depreciated_value=6500.00, state='posted'),
+            self._get_depreciation_move_values(date='2021-10-31', depreciation_value=277.78, remaining_value=3222.22, depreciated_value=6777.78, state='posted'),
+            self._get_depreciation_move_values(date='2021-11-30', depreciation_value=277.78, remaining_value=2944.44, depreciated_value=7055.56, state='posted'),
+            self._get_depreciation_move_values(date='2021-12-31', depreciation_value=277.78, remaining_value=2666.66, depreciated_value=7333.34, state='posted'),
+            self._get_depreciation_move_values(date='2022-01-31', depreciation_value=277.77, remaining_value=2388.89, depreciated_value=7611.11, state='posted'),
+            self._get_depreciation_move_values(date='2022-02-28', depreciation_value=277.78, remaining_value=2111.11, depreciated_value=7888.89, state='posted'),
+            self._get_depreciation_move_values(date='2022-03-31', depreciation_value=277.78, remaining_value=1833.33, depreciated_value=8166.67, state='posted'),
+            self._get_depreciation_move_values(date='2022-04-30', depreciation_value=277.78, remaining_value=1555.55, depreciated_value=8444.45, state='posted'),
+            self._get_depreciation_move_values(date='2022-05-31', depreciation_value=277.78, remaining_value=1277.77, depreciated_value=8722.23, state='posted'),
+            self._get_depreciation_move_values(date='2022-06-30', depreciation_value=277.77, remaining_value=1000.00, depreciated_value=9000.00, state='posted'),
+            self._get_depreciation_move_values(date='2022-07-31', depreciation_value=277.78, remaining_value=722.22, depreciated_value=9277.78, state='draft'),
+            self._get_depreciation_move_values(date='2022-08-31', depreciation_value=277.78, remaining_value=444.44, depreciated_value=9555.56, state='draft'),
+            self._get_depreciation_move_values(date='2022-09-30', depreciation_value=277.78, remaining_value=166.66, depreciated_value=9833.34, state='draft'),
+            self._get_depreciation_move_values(date='2022-10-31', depreciation_value=166.66, remaining_value=0.00, depreciated_value=10000.00, state='draft'),
+        ])
+
+
+    @freeze_time('2022-06-15')
+    def test_asset_degressive_then_linear_prorata_start_middle_of_year(self):
+        """ Check the computation of an asset with degressive-linear method,
+            start at middle of the year
+        """
+        asset = self.create_asset(
+            value=10000,
+            periodicity="yearly",
+            periods=5,
+            method="degressive_then_linear",
+            degressive_factor=0.3,
+            acquisition_date="2021-07-01",
+            prorata_computation_type="constant_periods",
+        )
+        asset.validate()
+        self.assertRecordValues(asset.depreciation_move_ids, [
+            self._get_depreciation_move_values(date='2021-12-31', depreciation_value=1500.00, remaining_value=8500.00, depreciated_value=1500.0000, state='posted'),
+            self._get_depreciation_move_values(date='2022-12-31', depreciation_value=2550.00, remaining_value=5950.00, depreciated_value=4050.000, state='draft'),
+            self._get_depreciation_move_values(date='2023-12-31', depreciation_value=2000.00, remaining_value=3950.00, depreciated_value=6050.000, state='draft'),
+            self._get_depreciation_move_values(date='2024-12-31', depreciation_value=2000.00, remaining_value=1950.00, depreciated_value=8050.000, state='draft'),
+            self._get_depreciation_move_values(date='2025-12-31', depreciation_value=1950.00, remaining_value=0.00, depreciated_value=10000.000, state='draft'),
+        ])
+
+    def test_asset_degressive_then_linear_prorata_start_middle_of_year_monthly(self):
+        """ Check the computation of an asset with degressive-linear method,
+            start at middle of the year, monthly depreciations
+        """
+        asset = self.create_asset(
+            value=10000,
+            periodicity="monthly",
+            periods=36,
+            method="degressive_then_linear",
+            degressive_factor=0.6,
+            acquisition_date="2021-07-01",
+            prorata_computation_type="constant_periods",
+        )
+        asset.validate()
+        self.assertRecordValues(asset.depreciation_move_ids, [
+            self._get_depreciation_move_values(date='2021-07-31', depreciation_value=500.00, remaining_value=9500.00, depreciated_value=500.00, state='posted'),
+            self._get_depreciation_move_values(date='2021-08-31', depreciation_value=500.00, remaining_value=9000.00, depreciated_value=1000.00, state='posted'),
+            self._get_depreciation_move_values(date='2021-09-30', depreciation_value=500.00, remaining_value=8500.00, depreciated_value=1500.00, state='posted'),
+            self._get_depreciation_move_values(date='2021-10-31', depreciation_value=500.00, remaining_value=8000.00, depreciated_value=2000.00, state='posted'),
+            self._get_depreciation_move_values(date='2021-11-30', depreciation_value=500.00, remaining_value=7500.00, depreciated_value=2500.00, state='posted'),
+            self._get_depreciation_move_values(date='2021-12-31', depreciation_value=500.00, remaining_value=7000.00, depreciated_value=3000.00, state='posted'),
+
+            self._get_depreciation_move_values(date='2022-01-31', depreciation_value=350.00, remaining_value=6650.00, depreciated_value=3350.00, state='posted'),
+            self._get_depreciation_move_values(date='2022-02-28', depreciation_value=350.00, remaining_value=6300.00, depreciated_value=3700.00, state='posted'),
+            self._get_depreciation_move_values(date='2022-03-31', depreciation_value=350.00, remaining_value=5950.00, depreciated_value=4050.00, state='posted'),
+            self._get_depreciation_move_values(date='2022-04-30', depreciation_value=350.00, remaining_value=5600.00, depreciated_value=4400.00, state='posted'),
+            self._get_depreciation_move_values(date='2022-05-31', depreciation_value=350.00, remaining_value=5250.00, depreciated_value=4750.00, state='posted'),
+            self._get_depreciation_move_values(date='2022-06-30', depreciation_value=350.00, remaining_value=4900.00, depreciated_value=5100.00, state='posted'),
+            self._get_depreciation_move_values(date='2022-07-31', depreciation_value=350.00, remaining_value=4550.00, depreciated_value=5450.00, state='draft'),
+            self._get_depreciation_move_values(date='2022-08-31', depreciation_value=350.00, remaining_value=4200.00, depreciated_value=5800.00, state='draft'),
+            self._get_depreciation_move_values(date='2022-09-30', depreciation_value=350.00, remaining_value=3850.00, depreciated_value=6150.00, state='draft'),
+            self._get_depreciation_move_values(date='2022-10-31', depreciation_value=350.00, remaining_value=3500.00, depreciated_value=6500.00, state='draft'),
+            self._get_depreciation_move_values(date='2022-11-30', depreciation_value=350.00, remaining_value=3150.00, depreciated_value=6850.00, state='draft'),
+            self._get_depreciation_move_values(date='2022-12-31', depreciation_value=350.00, remaining_value=2800.00, depreciated_value=7200.00, state='draft'),
+
+            self._get_depreciation_move_values(date='2023-01-31', depreciation_value=277.78, remaining_value=2522.22, depreciated_value=7477.78, state='draft'),
+            self._get_depreciation_move_values(date='2023-02-28', depreciation_value=277.78, remaining_value=2244.44, depreciated_value=7755.56, state='draft'),
+            self._get_depreciation_move_values(date='2023-03-31', depreciation_value=277.77, remaining_value=1966.67, depreciated_value=8033.33, state='draft'),
+            self._get_depreciation_move_values(date='2023-04-30', depreciation_value=277.78, remaining_value=1688.89, depreciated_value=8311.11, state='draft'),
+            self._get_depreciation_move_values(date='2023-05-31', depreciation_value=277.78, remaining_value=1411.11, depreciated_value=8588.89, state='draft'),
+            self._get_depreciation_move_values(date='2023-06-30', depreciation_value=277.78, remaining_value=1133.33, depreciated_value=8866.67, state='draft'),
+            self._get_depreciation_move_values(date='2023-07-31', depreciation_value=277.77, remaining_value=855.56, depreciated_value=9144.44, state='draft'),
+            self._get_depreciation_move_values(date='2023-08-31', depreciation_value=277.78, remaining_value=577.78, depreciated_value=9422.22, state='draft'),
+            self._get_depreciation_move_values(date='2023-09-30', depreciation_value=277.78, remaining_value=300.00, depreciated_value=9700.00, state='draft'),
+            self._get_depreciation_move_values(date='2023-10-31', depreciation_value=277.78, remaining_value=22.22, depreciated_value=9977.78, state='draft'),
+            self._get_depreciation_move_values(date='2023-11-30', depreciation_value=22.22, remaining_value=0.00, depreciated_value=10000.00, state='draft'),
+        ])
+
+    def test_linear_60_months_no_prorata_asset(self):
+        self.car.write({
+            'method_number': 60,
+            'method_period': '1',
+        })
+        self.car.validate()
+        self.assertEqual(self.car.state, 'open')
+        self.assertEqual(self.car.book_value, 30000)
+        self.assertRecordValues(self.car.depreciation_move_ids, [
+            # 2020
+            self._get_depreciation_move_values(date='2020-01-31', depreciation_value=1000, remaining_value=59000, depreciated_value=1000, state='posted'),
+            self._get_depreciation_move_values(date='2020-02-29', depreciation_value=1000, remaining_value=58000, depreciated_value=2000, state='posted'),
+            self._get_depreciation_move_values(date='2020-03-31', depreciation_value=1000, remaining_value=57000, depreciated_value=3000, state='posted'),
+            self._get_depreciation_move_values(date='2020-04-30', depreciation_value=1000, remaining_value=56000, depreciated_value=4000, state='posted'),
+            self._get_depreciation_move_values(date='2020-05-31', depreciation_value=1000, remaining_value=55000, depreciated_value=5000, state='posted'),
+            self._get_depreciation_move_values(date='2020-06-30', depreciation_value=1000, remaining_value=54000, depreciated_value=6000, state='posted'),
+            self._get_depreciation_move_values(date='2020-07-31', depreciation_value=1000, remaining_value=53000, depreciated_value=7000, state='posted'),
+            self._get_depreciation_move_values(date='2020-08-31', depreciation_value=1000, remaining_value=52000, depreciated_value=8000, state='posted'),
+            self._get_depreciation_move_values(date='2020-09-30', depreciation_value=1000, remaining_value=51000, depreciated_value=9000, state='posted'),
+            self._get_depreciation_move_values(date='2020-10-31', depreciation_value=1000, remaining_value=50000, depreciated_value=10000, state='posted'),
+            self._get_depreciation_move_values(date='2020-11-30', depreciation_value=1000, remaining_value=49000, depreciated_value=11000, state='posted'),
+            self._get_depreciation_move_values(date='2020-12-31', depreciation_value=1000, remaining_value=48000, depreciated_value=12000, state='posted'),
+            # 2021
+            self._get_depreciation_move_values(date='2021-01-31', depreciation_value=1000, remaining_value=47000, depreciated_value=13000, state='posted'),
+            self._get_depreciation_move_values(date='2021-02-28', depreciation_value=1000, remaining_value=46000, depreciated_value=14000, state='posted'),
+            self._get_depreciation_move_values(date='2021-03-31', depreciation_value=1000, remaining_value=45000, depreciated_value=15000, state='posted'),
+            self._get_depreciation_move_values(date='2021-04-30', depreciation_value=1000, remaining_value=44000, depreciated_value=16000, state='posted'),
+            self._get_depreciation_move_values(date='2021-05-31', depreciation_value=1000, remaining_value=43000, depreciated_value=17000, state='posted'),
+            self._get_depreciation_move_values(date='2021-06-30', depreciation_value=1000, remaining_value=42000, depreciated_value=18000, state='posted'),
+            self._get_depreciation_move_values(date='2021-07-31', depreciation_value=1000, remaining_value=41000, depreciated_value=19000, state='posted'),
+            self._get_depreciation_move_values(date='2021-08-31', depreciation_value=1000, remaining_value=40000, depreciated_value=20000, state='posted'),
+            self._get_depreciation_move_values(date='2021-09-30', depreciation_value=1000, remaining_value=39000, depreciated_value=21000, state='posted'),
+            self._get_depreciation_move_values(date='2021-10-31', depreciation_value=1000, remaining_value=38000, depreciated_value=22000, state='posted'),
+            self._get_depreciation_move_values(date='2021-11-30', depreciation_value=1000, remaining_value=37000, depreciated_value=23000, state='posted'),
+            self._get_depreciation_move_values(date='2021-12-31', depreciation_value=1000, remaining_value=36000, depreciated_value=24000, state='posted'),
+            # 2022
+            self._get_depreciation_move_values(date='2022-01-31', depreciation_value=1000, remaining_value=35000, depreciated_value=25000, state='posted'),
+            self._get_depreciation_move_values(date='2022-02-28', depreciation_value=1000, remaining_value=34000, depreciated_value=26000, state='posted'),
+            self._get_depreciation_move_values(date='2022-03-31', depreciation_value=1000, remaining_value=33000, depreciated_value=27000, state='posted'),
+            self._get_depreciation_move_values(date='2022-04-30', depreciation_value=1000, remaining_value=32000, depreciated_value=28000, state='posted'),
+            self._get_depreciation_move_values(date='2022-05-31', depreciation_value=1000, remaining_value=31000, depreciated_value=29000, state='posted'),
+            self._get_depreciation_move_values(date='2022-06-30', depreciation_value=1000, remaining_value=30000, depreciated_value=30000, state='posted'),
+            self._get_depreciation_move_values(date='2022-07-31', depreciation_value=1000, remaining_value=29000, depreciated_value=31000, state='draft'),
+            self._get_depreciation_move_values(date='2022-08-31', depreciation_value=1000, remaining_value=28000, depreciated_value=32000, state='draft'),
+            self._get_depreciation_move_values(date='2022-09-30', depreciation_value=1000, remaining_value=27000, depreciated_value=33000, state='draft'),
+            self._get_depreciation_move_values(date='2022-10-31', depreciation_value=1000, remaining_value=26000, depreciated_value=34000, state='draft'),
+            self._get_depreciation_move_values(date='2022-11-30', depreciation_value=1000, remaining_value=25000, depreciated_value=35000, state='draft'),
+            self._get_depreciation_move_values(date='2022-12-31', depreciation_value=1000, remaining_value=24000, depreciated_value=36000, state='draft'),
+            # 2023
+            self._get_depreciation_move_values(date='2023-01-31', depreciation_value=1000, remaining_value=23000, depreciated_value=37000, state='draft'),
+            self._get_depreciation_move_values(date='2023-02-28', depreciation_value=1000, remaining_value=22000, depreciated_value=38000, state='draft'),
+            self._get_depreciation_move_values(date='2023-03-31', depreciation_value=1000, remaining_value=21000, depreciated_value=39000, state='draft'),
+            self._get_depreciation_move_values(date='2023-04-30', depreciation_value=1000, remaining_value=20000, depreciated_value=40000, state='draft'),
+            self._get_depreciation_move_values(date='2023-05-31', depreciation_value=1000, remaining_value=19000, depreciated_value=41000, state='draft'),
+            self._get_depreciation_move_values(date='2023-06-30', depreciation_value=1000, remaining_value=18000, depreciated_value=42000, state='draft'),
+            self._get_depreciation_move_values(date='2023-07-31', depreciation_value=1000, remaining_value=17000, depreciated_value=43000, state='draft'),
+            self._get_depreciation_move_values(date='2023-08-31', depreciation_value=1000, remaining_value=16000, depreciated_value=44000, state='draft'),
+            self._get_depreciation_move_values(date='2023-09-30', depreciation_value=1000, remaining_value=15000, depreciated_value=45000, state='draft'),
+            self._get_depreciation_move_values(date='2023-10-31', depreciation_value=1000, remaining_value=14000, depreciated_value=46000, state='draft'),
+            self._get_depreciation_move_values(date='2023-11-30', depreciation_value=1000, remaining_value=13000, depreciated_value=47000, state='draft'),
+            self._get_depreciation_move_values(date='2023-12-31', depreciation_value=1000, remaining_value=12000, depreciated_value=48000, state='draft'),
+            # 2024
+            self._get_depreciation_move_values(date='2024-01-31', depreciation_value=1000, remaining_value=11000, depreciated_value=49000, state='draft'),
+            self._get_depreciation_move_values(date='2024-02-29', depreciation_value=1000, remaining_value=10000, depreciated_value=50000, state='draft'),
+            self._get_depreciation_move_values(date='2024-03-31', depreciation_value=1000, remaining_value=9000, depreciated_value=51000, state='draft'),
+            self._get_depreciation_move_values(date='2024-04-30', depreciation_value=1000, remaining_value=8000, depreciated_value=52000, state='draft'),
+            self._get_depreciation_move_values(date='2024-05-31', depreciation_value=1000, remaining_value=7000, depreciated_value=53000, state='draft'),
+            self._get_depreciation_move_values(date='2024-06-30', depreciation_value=1000, remaining_value=6000, depreciated_value=54000, state='draft'),
+            self._get_depreciation_move_values(date='2024-07-31', depreciation_value=1000, remaining_value=5000, depreciated_value=55000, state='draft'),
+            self._get_depreciation_move_values(date='2024-08-31', depreciation_value=1000, remaining_value=4000, depreciated_value=56000, state='draft'),
+            self._get_depreciation_move_values(date='2024-09-30', depreciation_value=1000, remaining_value=3000, depreciated_value=57000, state='draft'),
+            self._get_depreciation_move_values(date='2024-10-31', depreciation_value=1000, remaining_value=2000, depreciated_value=58000, state='draft'),
+            self._get_depreciation_move_values(date='2024-11-30', depreciation_value=1000, remaining_value=1000, depreciated_value=59000, state='draft'),
+            self._get_depreciation_move_values(date='2024-12-31', depreciation_value=1000, remaining_value=0, depreciated_value=60000, state='draft'),
+        ])
+
+    def test_linear_60_months_no_prorata_with_imported_amount_asset(self):
+        self.car.write({
+            'method_number': 60,
+            'method_period': '1',
+            'already_depreciated_amount_import': 1500,
+        })
+        self.car.validate()
+        self.assertEqual(self.car.state, 'open')
+        self.assertEqual(self.car.book_value, 30000)
+        self.assertRecordValues(self.car.depreciation_move_ids, [
+            # 2020
+            self._get_depreciation_move_values(date='2020-02-29', depreciation_value=500.0, remaining_value=58000.0, depreciated_value=2000.0, state='posted'),
+            self._get_depreciation_move_values(date='2020-03-31', depreciation_value=1000.0, remaining_value=57000.0, depreciated_value=3000.0, state='posted'),
+            self._get_depreciation_move_values(date='2020-04-30', depreciation_value=1000.0, remaining_value=56000.0, depreciated_value=4000.0, state='posted'),
+            self._get_depreciation_move_values(date='2020-05-31', depreciation_value=1000.0, remaining_value=55000.0, depreciated_value=5000.0, state='posted'),
+            self._get_depreciation_move_values(date='2020-06-30', depreciation_value=1000.0, remaining_value=54000.0, depreciated_value=6000.0, state='posted'),
+            self._get_depreciation_move_values(date='2020-07-31', depreciation_value=1000.0, remaining_value=53000.0, depreciated_value=7000.0, state='posted'),
+            self._get_depreciation_move_values(date='2020-08-31', depreciation_value=1000.0, remaining_value=52000.0, depreciated_value=8000.0, state='posted'),
+            self._get_depreciation_move_values(date='2020-09-30', depreciation_value=1000.0, remaining_value=51000.0, depreciated_value=9000.0, state='posted'),
+            self._get_depreciation_move_values(date='2020-10-31', depreciation_value=1000.0, remaining_value=50000.0, depreciated_value=10000.0, state='posted'),
+            self._get_depreciation_move_values(date='2020-11-30', depreciation_value=1000.0, remaining_value=49000.0, depreciated_value=11000.0, state='posted'),
+            self._get_depreciation_move_values(date='2020-12-31', depreciation_value=1000.0, remaining_value=48000.0, depreciated_value=12000.0, state='posted'),
+            # 2021
+            self._get_depreciation_move_values(date='2021-01-31', depreciation_value=1000.0, remaining_value=47000.0, depreciated_value=13000.0, state='posted'),
+            self._get_depreciation_move_values(date='2021-02-28', depreciation_value=1000.0, remaining_value=46000.0, depreciated_value=14000.0, state='posted'),
+            self._get_depreciation_move_values(date='2021-03-31', depreciation_value=1000.0, remaining_value=45000.0, depreciated_value=15000.0, state='posted'),
+            self._get_depreciation_move_values(date='2021-04-30', depreciation_value=1000.0, remaining_value=44000.0, depreciated_value=16000.0, state='posted'),
+            self._get_depreciation_move_values(date='2021-05-31', depreciation_value=1000.0, remaining_value=43000.0, depreciated_value=17000.0, state='posted'),
+            self._get_depreciation_move_values(date='2021-06-30', depreciation_value=1000.0, remaining_value=42000.0, depreciated_value=18000.0, state='posted'),
+            self._get_depreciation_move_values(date='2021-07-31', depreciation_value=1000.0, remaining_value=41000.0, depreciated_value=19000.0, state='posted'),
+            self._get_depreciation_move_values(date='2021-08-31', depreciation_value=1000.0, remaining_value=40000.0, depreciated_value=20000.0, state='posted'),
+            self._get_depreciation_move_values(date='2021-09-30', depreciation_value=1000.0, remaining_value=39000.0, depreciated_value=21000.0, state='posted'),
+            self._get_depreciation_move_values(date='2021-10-31', depreciation_value=1000.0, remaining_value=38000.0, depreciated_value=22000.0, state='posted'),
+            self._get_depreciation_move_values(date='2021-11-30', depreciation_value=1000.0, remaining_value=37000.0, depreciated_value=23000.0, state='posted'),
+            self._get_depreciation_move_values(date='2021-12-31', depreciation_value=1000.0, remaining_value=36000.0, depreciated_value=24000.0, state='posted'),
+            # 2022
+            self._get_depreciation_move_values(date='2022-01-31', depreciation_value=1000.0, remaining_value=35000.0, depreciated_value=25000.0, state='posted'),
+            self._get_depreciation_move_values(date='2022-02-28', depreciation_value=1000.0, remaining_value=34000.0, depreciated_value=26000.0, state='posted'),
+            self._get_depreciation_move_values(date='2022-03-31', depreciation_value=1000.0, remaining_value=33000.0, depreciated_value=27000.0, state='posted'),
+            self._get_depreciation_move_values(date='2022-04-30', depreciation_value=1000.0, remaining_value=32000.0, depreciated_value=28000.0, state='posted'),
+            self._get_depreciation_move_values(date='2022-05-31', depreciation_value=1000.0, remaining_value=31000.0, depreciated_value=29000.0, state='posted'),
+            self._get_depreciation_move_values(date='2022-06-30', depreciation_value=1000.0, remaining_value=30000.0, depreciated_value=30000.0, state='posted'),
+            self._get_depreciation_move_values(date='2022-07-31', depreciation_value=1000.0, remaining_value=29000.0, depreciated_value=31000.0, state='draft'),
+            self._get_depreciation_move_values(date='2022-08-31', depreciation_value=1000.0, remaining_value=28000.0, depreciated_value=32000.0, state='draft'),
+            self._get_depreciation_move_values(date='2022-09-30', depreciation_value=1000.0, remaining_value=27000.0, depreciated_value=33000.0, state='draft'),
+            self._get_depreciation_move_values(date='2022-10-31', depreciation_value=1000.0, remaining_value=26000.0, depreciated_value=34000.0, state='draft'),
+            self._get_depreciation_move_values(date='2022-11-30', depreciation_value=1000.0, remaining_value=25000.0, depreciated_value=35000.0, state='draft'),
+            self._get_depreciation_move_values(date='2022-12-31', depreciation_value=1000.0, remaining_value=24000.0, depreciated_value=36000.0, state='draft'),
+            # 2023
+            self._get_depreciation_move_values(date='2023-01-31', depreciation_value=1000.0, remaining_value=23000.0, depreciated_value=37000.0, state='draft'),
+            self._get_depreciation_move_values(date='2023-02-28', depreciation_value=1000.0, remaining_value=22000.0, depreciated_value=38000.0, state='draft'),
+            self._get_depreciation_move_values(date='2023-03-31', depreciation_value=1000.0, remaining_value=21000.0, depreciated_value=39000.0, state='draft'),
+            self._get_depreciation_move_values(date='2023-04-30', depreciation_value=1000.0, remaining_value=20000.0, depreciated_value=40000.0, state='draft'),
+            self._get_depreciation_move_values(date='2023-05-31', depreciation_value=1000.0, remaining_value=19000.0, depreciated_value=41000.0, state='draft'),
+            self._get_depreciation_move_values(date='2023-06-30', depreciation_value=1000.0, remaining_value=18000.0, depreciated_value=42000.0, state='draft'),
+            self._get_depreciation_move_values(date='2023-07-31', depreciation_value=1000.0, remaining_value=17000.0, depreciated_value=43000.0, state='draft'),
+            self._get_depreciation_move_values(date='2023-08-31', depreciation_value=1000.0, remaining_value=16000.0, depreciated_value=44000.0, state='draft'),
+            self._get_depreciation_move_values(date='2023-09-30', depreciation_value=1000.0, remaining_value=15000.0, depreciated_value=45000.0, state='draft'),
+            self._get_depreciation_move_values(date='2023-10-31', depreciation_value=1000.0, remaining_value=14000.0, depreciated_value=46000.0, state='draft'),
+            self._get_depreciation_move_values(date='2023-11-30', depreciation_value=1000.0, remaining_value=13000.0, depreciated_value=47000.0, state='draft'),
+            self._get_depreciation_move_values(date='2023-12-31', depreciation_value=1000.0, remaining_value=12000.0, depreciated_value=48000.0, state='draft'),
+            # 2024
+            self._get_depreciation_move_values(date='2024-01-31', depreciation_value=1000.0, remaining_value=11000.0, depreciated_value=49000.0, state='draft'),
+            self._get_depreciation_move_values(date='2024-02-29', depreciation_value=1000.0, remaining_value=10000.0, depreciated_value=50000.0, state='draft'),
+            self._get_depreciation_move_values(date='2024-03-31', depreciation_value=1000.0, remaining_value=9000.0, depreciated_value=51000.0, state='draft'),
+            self._get_depreciation_move_values(date='2024-04-30', depreciation_value=1000.0, remaining_value=8000.0, depreciated_value=52000.0, state='draft'),
+            self._get_depreciation_move_values(date='2024-05-31', depreciation_value=1000.0, remaining_value=7000.0, depreciated_value=53000.0, state='draft'),
+            self._get_depreciation_move_values(date='2024-06-30', depreciation_value=1000.0, remaining_value=6000.0, depreciated_value=54000.0, state='draft'),
+            self._get_depreciation_move_values(date='2024-07-31', depreciation_value=1000.0, remaining_value=5000.0, depreciated_value=55000.0, state='draft'),
+            self._get_depreciation_move_values(date='2024-08-31', depreciation_value=1000.0, remaining_value=4000.0, depreciated_value=56000.0, state='draft'),
+            self._get_depreciation_move_values(date='2024-09-30', depreciation_value=1000.0, remaining_value=3000.0, depreciated_value=57000.0, state='draft'),
+            self._get_depreciation_move_values(date='2024-10-31', depreciation_value=1000.0, remaining_value=2000.0, depreciated_value=58000.0, state='draft'),
+            self._get_depreciation_move_values(date='2024-11-30', depreciation_value=1000.0, remaining_value=1000.0, depreciated_value=59000.0, state='draft'),
+            self._get_depreciation_move_values(date='2024-12-31', depreciation_value=1000.0, remaining_value=0.0, depreciated_value=60000.0, state='draft'),
+        ])
+
+    def test_linear_60_months_no_prorata_with_salvage_value_asset(self):
+        self.car.write({
+            'method_number': 60,
+            'method_period': '1',
+            'method_progress_factor': 0.3,
+            'salvage_value': 2000,
+        })
+        self.car.validate()
+        self.assertEqual(self.car.state, 'open')
+        self.assertEqual(self.car.book_value, 31000)
+        self.assertEqual(self.car.value_residual, 29000)
+        self.assertRecordValues(self.car.depreciation_move_ids, [
+            # 2020
+            self._get_depreciation_move_values(date='2020-01-31', depreciation_value=966.67, remaining_value=57033.33, depreciated_value=966.67, state='posted'),
+            self._get_depreciation_move_values(date='2020-02-29', depreciation_value=966.66, remaining_value=56066.67, depreciated_value=1933.33, state='posted'),
+            self._get_depreciation_move_values(date='2020-03-31', depreciation_value=966.67, remaining_value=55100.0, depreciated_value=2900.0, state='posted'),
+            self._get_depreciation_move_values(date='2020-04-30', depreciation_value=966.67, remaining_value=54133.33, depreciated_value=3866.67, state='posted'),
+            self._get_depreciation_move_values(date='2020-05-31', depreciation_value=966.66, remaining_value=53166.67, depreciated_value=4833.33, state='posted'),
+            self._get_depreciation_move_values(date='2020-06-30', depreciation_value=966.67, remaining_value=52200.0, depreciated_value=5800.0, state='posted'),
+            self._get_depreciation_move_values(date='2020-07-31', depreciation_value=966.67, remaining_value=51233.33, depreciated_value=6766.67, state='posted'),
+            self._get_depreciation_move_values(date='2020-08-31', depreciation_value=966.66, remaining_value=50266.67, depreciated_value=7733.33, state='posted'),
+            self._get_depreciation_move_values(date='2020-09-30', depreciation_value=966.67, remaining_value=49300.0, depreciated_value=8700.0, state='posted'),
+            self._get_depreciation_move_values(date='2020-10-31', depreciation_value=966.67, remaining_value=48333.33, depreciated_value=9666.67, state='posted'),
+            self._get_depreciation_move_values(date='2020-11-30', depreciation_value=966.66, remaining_value=47366.67, depreciated_value=10633.33, state='posted'),
+            self._get_depreciation_move_values(date='2020-12-31', depreciation_value=966.67, remaining_value=46400.0, depreciated_value=11600.0, state='posted'),
+            # 2021
+            self._get_depreciation_move_values(date='2021-01-31', depreciation_value=966.67, remaining_value=45433.33, depreciated_value=12566.67, state='posted'),
+            self._get_depreciation_move_values(date='2021-02-28', depreciation_value=966.66, remaining_value=44466.67, depreciated_value=13533.33, state='posted'),
+            self._get_depreciation_move_values(date='2021-03-31', depreciation_value=966.67, remaining_value=43500.0, depreciated_value=14500.0, state='posted'),
+            self._get_depreciation_move_values(date='2021-04-30', depreciation_value=966.67, remaining_value=42533.33, depreciated_value=15466.67, state='posted'),
+            self._get_depreciation_move_values(date='2021-05-31', depreciation_value=966.66, remaining_value=41566.67, depreciated_value=16433.33, state='posted'),
+            self._get_depreciation_move_values(date='2021-06-30', depreciation_value=966.67, remaining_value=40600.0, depreciated_value=17400.0, state='posted'),
+            self._get_depreciation_move_values(date='2021-07-31', depreciation_value=966.67, remaining_value=39633.33, depreciated_value=18366.67, state='posted'),
+            self._get_depreciation_move_values(date='2021-08-31', depreciation_value=966.66, remaining_value=38666.67, depreciated_value=19333.33, state='posted'),
+            self._get_depreciation_move_values(date='2021-09-30', depreciation_value=966.67, remaining_value=37700.0, depreciated_value=20300.0, state='posted'),
+            self._get_depreciation_move_values(date='2021-10-31', depreciation_value=966.67, remaining_value=36733.33, depreciated_value=21266.67, state='posted'),
+            self._get_depreciation_move_values(date='2021-11-30', depreciation_value=966.66, remaining_value=35766.67, depreciated_value=22233.33, state='posted'),
+            self._get_depreciation_move_values(date='2021-12-31', depreciation_value=966.67, remaining_value=34800.0, depreciated_value=23200.0, state='posted'),
+            # 2022
+            self._get_depreciation_move_values(date='2022-01-31', depreciation_value=966.67, remaining_value=33833.33, depreciated_value=24166.67, state='posted'),
+            self._get_depreciation_move_values(date='2022-02-28', depreciation_value=966.66, remaining_value=32866.67, depreciated_value=25133.33, state='posted'),
+            self._get_depreciation_move_values(date='2022-03-31', depreciation_value=966.67, remaining_value=31900.0, depreciated_value=26100.0, state='posted'),
+            self._get_depreciation_move_values(date='2022-04-30', depreciation_value=966.67, remaining_value=30933.33, depreciated_value=27066.67, state='posted'),
+            self._get_depreciation_move_values(date='2022-05-31', depreciation_value=966.66, remaining_value=29966.67, depreciated_value=28033.33, state='posted'),
+            self._get_depreciation_move_values(date='2022-06-30', depreciation_value=966.67, remaining_value=29000.0, depreciated_value=29000.0, state='posted'),
+            self._get_depreciation_move_values(date='2022-07-31', depreciation_value=966.67, remaining_value=28033.33, depreciated_value=29966.67, state='draft'),
+            self._get_depreciation_move_values(date='2022-08-31', depreciation_value=966.66, remaining_value=27066.67, depreciated_value=30933.33, state='draft'),
+            self._get_depreciation_move_values(date='2022-09-30', depreciation_value=966.67, remaining_value=26100.0, depreciated_value=31900.0, state='draft'),
+            self._get_depreciation_move_values(date='2022-10-31', depreciation_value=966.67, remaining_value=25133.33, depreciated_value=32866.67, state='draft'),
+            self._get_depreciation_move_values(date='2022-11-30', depreciation_value=966.66, remaining_value=24166.67, depreciated_value=33833.33, state='draft'),
+            self._get_depreciation_move_values(date='2022-12-31', depreciation_value=966.67, remaining_value=23200.0, depreciated_value=34800.0, state='draft'),
+            # 2023
+            self._get_depreciation_move_values(date='2023-01-31', depreciation_value=966.67, remaining_value=22233.33, depreciated_value=35766.67, state='draft'),
+            self._get_depreciation_move_values(date='2023-02-28', depreciation_value=966.66, remaining_value=21266.67, depreciated_value=36733.33, state='draft'),
+            self._get_depreciation_move_values(date='2023-03-31', depreciation_value=966.67, remaining_value=20300.0, depreciated_value=37700.0, state='draft'),
+            self._get_depreciation_move_values(date='2023-04-30', depreciation_value=966.67, remaining_value=19333.33, depreciated_value=38666.67, state='draft'),
+            self._get_depreciation_move_values(date='2023-05-31', depreciation_value=966.66, remaining_value=18366.67, depreciated_value=39633.33, state='draft'),
+            self._get_depreciation_move_values(date='2023-06-30', depreciation_value=966.67, remaining_value=17400.0, depreciated_value=40600.0, state='draft'),
+            self._get_depreciation_move_values(date='2023-07-31', depreciation_value=966.67, remaining_value=16433.33, depreciated_value=41566.67, state='draft'),
+            self._get_depreciation_move_values(date='2023-08-31', depreciation_value=966.66, remaining_value=15466.67, depreciated_value=42533.33, state='draft'),
+            self._get_depreciation_move_values(date='2023-09-30', depreciation_value=966.67, remaining_value=14500.0, depreciated_value=43500.0, state='draft'),
+            self._get_depreciation_move_values(date='2023-10-31', depreciation_value=966.67, remaining_value=13533.33, depreciated_value=44466.67, state='draft'),
+            self._get_depreciation_move_values(date='2023-11-30', depreciation_value=966.66, remaining_value=12566.67, depreciated_value=45433.33, state='draft'),
+            self._get_depreciation_move_values(date='2023-12-31', depreciation_value=966.67, remaining_value=11600.0, depreciated_value=46400.0, state='draft'),
+            # 2024
+            self._get_depreciation_move_values(date='2024-01-31', depreciation_value=966.67, remaining_value=10633.33, depreciated_value=47366.67, state='draft'),
+            self._get_depreciation_move_values(date='2024-02-29', depreciation_value=966.66, remaining_value=9666.67, depreciated_value=48333.33, state='draft'),
+            self._get_depreciation_move_values(date='2024-03-31', depreciation_value=966.67, remaining_value=8700.0, depreciated_value=49300.0, state='draft'),
+            self._get_depreciation_move_values(date='2024-04-30', depreciation_value=966.67, remaining_value=7733.33, depreciated_value=50266.67, state='draft'),
+            self._get_depreciation_move_values(date='2024-05-31', depreciation_value=966.66, remaining_value=6766.67, depreciated_value=51233.33, state='draft'),
+            self._get_depreciation_move_values(date='2024-06-30', depreciation_value=966.67, remaining_value=5800.0, depreciated_value=52200.0, state='draft'),
+            self._get_depreciation_move_values(date='2024-07-31', depreciation_value=966.67, remaining_value=4833.33, depreciated_value=53166.67, state='draft'),
+            self._get_depreciation_move_values(date='2024-08-31', depreciation_value=966.66, remaining_value=3866.67, depreciated_value=54133.33, state='draft'),
+            self._get_depreciation_move_values(date='2024-09-30', depreciation_value=966.67, remaining_value=2900.0, depreciated_value=55100.0, state='draft'),
+            self._get_depreciation_move_values(date='2024-10-31', depreciation_value=966.67, remaining_value=1933.33, depreciated_value=56066.67, state='draft'),
+            self._get_depreciation_move_values(date='2024-11-30', depreciation_value=966.66, remaining_value=966.67, depreciated_value=57033.33, state='draft'),
+            self._get_depreciation_move_values(date='2024-12-31', depreciation_value=966.67, remaining_value=0.0, depreciated_value=58000.0, state='draft'),
+        ])
+
+    def test_linear_60_months_constant_periods_asset(self):
+        self.car.write({
+            'method_number': 60,
+            'method_period': '1',
+            'prorata_computation_type': 'constant_periods',
+            'prorata_date': '2020-07-01',
+        })
+        self.car.validate()
+        self.assertEqual(self.car.state, 'open')
+        self.assertEqual(self.car.book_value, 36000)
+        self.assertRecordValues(self.car.depreciation_move_ids, [
+            # 2020
+            self._get_depreciation_move_values(date='2020-07-31', depreciation_value=1000, remaining_value=59000, depreciated_value=1000, state='posted'),
+            self._get_depreciation_move_values(date='2020-08-31', depreciation_value=1000, remaining_value=58000, depreciated_value=2000, state='posted'),
+            self._get_depreciation_move_values(date='2020-09-30', depreciation_value=1000, remaining_value=57000, depreciated_value=3000, state='posted'),
+            self._get_depreciation_move_values(date='2020-10-31', depreciation_value=1000, remaining_value=56000, depreciated_value=4000, state='posted'),
+            self._get_depreciation_move_values(date='2020-11-30', depreciation_value=1000, remaining_value=55000, depreciated_value=5000, state='posted'),
+            self._get_depreciation_move_values(date='2020-12-31', depreciation_value=1000, remaining_value=54000, depreciated_value=6000, state='posted'),
+            # 2021
+            self._get_depreciation_move_values(date='2021-01-31', depreciation_value=1000, remaining_value=53000, depreciated_value=7000, state='posted'),
+            self._get_depreciation_move_values(date='2021-02-28', depreciation_value=1000, remaining_value=52000, depreciated_value=8000, state='posted'),
+            self._get_depreciation_move_values(date='2021-03-31', depreciation_value=1000, remaining_value=51000, depreciated_value=9000, state='posted'),
+            self._get_depreciation_move_values(date='2021-04-30', depreciation_value=1000, remaining_value=50000, depreciated_value=10000, state='posted'),
+            self._get_depreciation_move_values(date='2021-05-31', depreciation_value=1000, remaining_value=49000, depreciated_value=11000, state='posted'),
+            self._get_depreciation_move_values(date='2021-06-30', depreciation_value=1000, remaining_value=48000, depreciated_value=12000, state='posted'),
+            self._get_depreciation_move_values(date='2021-07-31', depreciation_value=1000, remaining_value=47000, depreciated_value=13000, state='posted'),
+            self._get_depreciation_move_values(date='2021-08-31', depreciation_value=1000, remaining_value=46000, depreciated_value=14000, state='posted'),
+            self._get_depreciation_move_values(date='2021-09-30', depreciation_value=1000, remaining_value=45000, depreciated_value=15000, state='posted'),
+            self._get_depreciation_move_values(date='2021-10-31', depreciation_value=1000, remaining_value=44000, depreciated_value=16000, state='posted'),
+            self._get_depreciation_move_values(date='2021-11-30', depreciation_value=1000, remaining_value=43000, depreciated_value=17000, state='posted'),
+            self._get_depreciation_move_values(date='2021-12-31', depreciation_value=1000, remaining_value=42000, depreciated_value=18000, state='posted'),
+            # 2022
+            self._get_depreciation_move_values(date='2022-01-31', depreciation_value=1000, remaining_value=41000, depreciated_value=19000, state='posted'),
+            self._get_depreciation_move_values(date='2022-02-28', depreciation_value=1000, remaining_value=40000, depreciated_value=20000, state='posted'),
+            self._get_depreciation_move_values(date='2022-03-31', depreciation_value=1000, remaining_value=39000, depreciated_value=21000, state='posted'),
+            self._get_depreciation_move_values(date='2022-04-30', depreciation_value=1000, remaining_value=38000, depreciated_value=22000, state='posted'),
+            self._get_depreciation_move_values(date='2022-05-31', depreciation_value=1000, remaining_value=37000, depreciated_value=23000, state='posted'),
+            self._get_depreciation_move_values(date='2022-06-30', depreciation_value=1000, remaining_value=36000, depreciated_value=24000, state='posted'),
+            self._get_depreciation_move_values(date='2022-07-31', depreciation_value=1000, remaining_value=35000, depreciated_value=25000, state='draft'),
+            self._get_depreciation_move_values(date='2022-08-31', depreciation_value=1000, remaining_value=34000, depreciated_value=26000, state='draft'),
+            self._get_depreciation_move_values(date='2022-09-30', depreciation_value=1000, remaining_value=33000, depreciated_value=27000, state='draft'),
+            self._get_depreciation_move_values(date='2022-10-31', depreciation_value=1000, remaining_value=32000, depreciated_value=28000, state='draft'),
+            self._get_depreciation_move_values(date='2022-11-30', depreciation_value=1000, remaining_value=31000, depreciated_value=29000, state='draft'),
+            self._get_depreciation_move_values(date='2022-12-31', depreciation_value=1000, remaining_value=30000, depreciated_value=30000, state='draft'),
+            # 2023
+            self._get_depreciation_move_values(date='2023-01-31', depreciation_value=1000, remaining_value=29000, depreciated_value=31000, state='draft'),
+            self._get_depreciation_move_values(date='2023-02-28', depreciation_value=1000, remaining_value=28000, depreciated_value=32000, state='draft'),
+            self._get_depreciation_move_values(date='2023-03-31', depreciation_value=1000, remaining_value=27000, depreciated_value=33000, state='draft'),
+            self._get_depreciation_move_values(date='2023-04-30', depreciation_value=1000, remaining_value=26000, depreciated_value=34000, state='draft'),
+            self._get_depreciation_move_values(date='2023-05-31', depreciation_value=1000, remaining_value=25000, depreciated_value=35000, state='draft'),
+            self._get_depreciation_move_values(date='2023-06-30', depreciation_value=1000, remaining_value=24000, depreciated_value=36000, state='draft'),
+            self._get_depreciation_move_values(date='2023-07-31', depreciation_value=1000, remaining_value=23000, depreciated_value=37000, state='draft'),
+            self._get_depreciation_move_values(date='2023-08-31', depreciation_value=1000, remaining_value=22000, depreciated_value=38000, state='draft'),
+            self._get_depreciation_move_values(date='2023-09-30', depreciation_value=1000, remaining_value=21000, depreciated_value=39000, state='draft'),
+            self._get_depreciation_move_values(date='2023-10-31', depreciation_value=1000, remaining_value=20000, depreciated_value=40000, state='draft'),
+            self._get_depreciation_move_values(date='2023-11-30', depreciation_value=1000, remaining_value=19000, depreciated_value=41000, state='draft'),
+            self._get_depreciation_move_values(date='2023-12-31', depreciation_value=1000, remaining_value=18000, depreciated_value=42000, state='draft'),
+            # 2024
+            self._get_depreciation_move_values(date='2024-01-31', depreciation_value=1000, remaining_value=17000, depreciated_value=43000, state='draft'),
+            self._get_depreciation_move_values(date='2024-02-29', depreciation_value=1000, remaining_value=16000, depreciated_value=44000, state='draft'),
+            self._get_depreciation_move_values(date='2024-03-31', depreciation_value=1000, remaining_value=15000, depreciated_value=45000, state='draft'),
+            self._get_depreciation_move_values(date='2024-04-30', depreciation_value=1000, remaining_value=14000, depreciated_value=46000, state='draft'),
+            self._get_depreciation_move_values(date='2024-05-31', depreciation_value=1000, remaining_value=13000, depreciated_value=47000, state='draft'),
+            self._get_depreciation_move_values(date='2024-06-30', depreciation_value=1000, remaining_value=12000, depreciated_value=48000, state='draft'),
+            self._get_depreciation_move_values(date='2024-07-31', depreciation_value=1000, remaining_value=11000, depreciated_value=49000, state='draft'),
+            self._get_depreciation_move_values(date='2024-08-31', depreciation_value=1000, remaining_value=10000, depreciated_value=50000, state='draft'),
+            self._get_depreciation_move_values(date='2024-09-30', depreciation_value=1000, remaining_value=9000, depreciated_value=51000, state='draft'),
+            self._get_depreciation_move_values(date='2024-10-31', depreciation_value=1000, remaining_value=8000, depreciated_value=52000, state='draft'),
+            self._get_depreciation_move_values(date='2024-11-30', depreciation_value=1000, remaining_value=7000, depreciated_value=53000, state='draft'),
+            self._get_depreciation_move_values(date='2024-12-31', depreciation_value=1000, remaining_value=6000, depreciated_value=54000, state='draft'),
+            # 2025
+            self._get_depreciation_move_values(date='2025-01-31', depreciation_value=1000, remaining_value=5000, depreciated_value=55000, state='draft'),
+            self._get_depreciation_move_values(date='2025-02-28', depreciation_value=1000, remaining_value=4000, depreciated_value=56000, state='draft'),
+            self._get_depreciation_move_values(date='2025-03-31', depreciation_value=1000, remaining_value=3000, depreciated_value=57000, state='draft'),
+            self._get_depreciation_move_values(date='2025-04-30', depreciation_value=1000, remaining_value=2000, depreciated_value=58000, state='draft'),
+            self._get_depreciation_move_values(date='2025-05-31', depreciation_value=1000, remaining_value=1000, depreciated_value=59000, state='draft'),
+            self._get_depreciation_move_values(date='2025-06-30', depreciation_value=1000, remaining_value=0, depreciated_value=60000, state='draft'),
+        ])
+
+    def test_linear_60_months_daily_computation_asset(self):
+        self.car.write({
+            'method_number': 60,
+            'method_period': '1',
+            'prorata_computation_type': 'daily_computation',
+            'prorata_date': '2020-07-01',
+        })
+        self.car.validate()
+        self.assertEqual(self.car.state, 'open')
+        self.assertEqual(self.car.book_value, 36013.14)
+
+        self.assertRecordValues(self.car.depreciation_move_ids, [
+            # 2020
+            self._get_depreciation_move_values(date='2020-07-31', depreciation_value=1018.62, remaining_value=58981.38, depreciated_value=1018.62, state='posted'),
+            self._get_depreciation_move_values(date='2020-08-31', depreciation_value=1018.62, remaining_value=57962.76, depreciated_value=2037.24, state='posted'),
+            self._get_depreciation_move_values(date='2020-09-30', depreciation_value=985.76, remaining_value=56977.0, depreciated_value=3023.0, state='posted'),
+            self._get_depreciation_move_values(date='2020-10-31', depreciation_value=1018.62, remaining_value=55958.38, depreciated_value=4041.62, state='posted'),
+            self._get_depreciation_move_values(date='2020-11-30', depreciation_value=985.76, remaining_value=54972.62, depreciated_value=5027.38, state='posted'),
+            self._get_depreciation_move_values(date='2020-12-31', depreciation_value=1018.62, remaining_value=53954.0, depreciated_value=6046.0, state='posted'),
+            # 2021
+            self._get_depreciation_move_values(date='2021-01-31', depreciation_value=1018.62, remaining_value=52935.38, depreciated_value=7064.62, state='posted'),
+            self._get_depreciation_move_values(date='2021-02-28', depreciation_value=920.05, remaining_value=52015.33, depreciated_value=7984.67, state='posted'),
+            self._get_depreciation_move_values(date='2021-03-31', depreciation_value=1018.62, remaining_value=50996.71, depreciated_value=9003.29, state='posted'),
+            self._get_depreciation_move_values(date='2021-04-30', depreciation_value=985.76, remaining_value=50010.95, depreciated_value=9989.05, state='posted'),
+            self._get_depreciation_move_values(date='2021-05-31', depreciation_value=1018.62, remaining_value=48992.33, depreciated_value=11007.67, state='posted'),
+            self._get_depreciation_move_values(date='2021-06-30', depreciation_value=985.76, remaining_value=48006.57, depreciated_value=11993.43, state='posted'),
+            self._get_depreciation_move_values(date='2021-07-31', depreciation_value=1018.62, remaining_value=46987.95, depreciated_value=13012.05, state='posted'),
+            self._get_depreciation_move_values(date='2021-08-31', depreciation_value=1018.62, remaining_value=45969.33, depreciated_value=14030.67, state='posted'),
+            self._get_depreciation_move_values(date='2021-09-30', depreciation_value=985.76, remaining_value=44983.57, depreciated_value=15016.43, state='posted'),
+            self._get_depreciation_move_values(date='2021-10-31', depreciation_value=1018.62, remaining_value=43964.95, depreciated_value=16035.05, state='posted'),
+            self._get_depreciation_move_values(date='2021-11-30', depreciation_value=985.76, remaining_value=42979.19, depreciated_value=17020.81, state='posted'),
+            self._get_depreciation_move_values(date='2021-12-31', depreciation_value=1018.62, remaining_value=41960.57, depreciated_value=18039.43, state='posted'),
+            # 2022
+            self._get_depreciation_move_values(date='2022-01-31', depreciation_value=1018.62, remaining_value=40941.95, depreciated_value=19058.05, state='posted'),
+            self._get_depreciation_move_values(date='2022-02-28', depreciation_value=920.04, remaining_value=40021.91, depreciated_value=19978.09, state='posted'),
+            self._get_depreciation_move_values(date='2022-03-31', depreciation_value=1018.62, remaining_value=39003.29, depreciated_value=20996.71, state='posted'),
+            self._get_depreciation_move_values(date='2022-04-30', depreciation_value=985.77, remaining_value=38017.52, depreciated_value=21982.48, state='posted'),
+            self._get_depreciation_move_values(date='2022-05-31', depreciation_value=1018.62, remaining_value=36998.9, depreciated_value=23001.10, state='posted'),
+            self._get_depreciation_move_values(date='2022-06-30', depreciation_value=985.76, remaining_value=36013.14, depreciated_value=23986.86, state='posted'),
+            self._get_depreciation_move_values(date='2022-07-31', depreciation_value=1018.62, remaining_value=34994.52, depreciated_value=25005.48, state='draft'),
+            self._get_depreciation_move_values(date='2022-08-31', depreciation_value=1018.62, remaining_value=33975.9, depreciated_value=26024.10, state='draft'),
+            self._get_depreciation_move_values(date='2022-09-30', depreciation_value=985.76, remaining_value=32990.14, depreciated_value=27009.86, state='draft'),
+            self._get_depreciation_move_values(date='2022-10-31', depreciation_value=1018.62, remaining_value=31971.52, depreciated_value=28028.48, state='draft'),
+            self._get_depreciation_move_values(date='2022-11-30', depreciation_value=985.76, remaining_value=30985.76, depreciated_value=29014.24, state='draft'),
+            self._get_depreciation_move_values(date='2022-12-31', depreciation_value=1018.62, remaining_value=29967.14, depreciated_value=30032.86, state='draft'),
+            # 2023
+            self._get_depreciation_move_values(date='2023-01-31', depreciation_value=1018.62, remaining_value=28948.52, depreciated_value=31051.48, state='draft'),
+            self._get_depreciation_move_values(date='2023-02-28', depreciation_value=920.04, remaining_value=28028.48, depreciated_value=31971.52, state='draft'),
+            self._get_depreciation_move_values(date='2023-03-31', depreciation_value=1018.62, remaining_value=27009.86, depreciated_value=32990.14, state='draft'),
+            self._get_depreciation_move_values(date='2023-04-30', depreciation_value=985.76, remaining_value=26024.10, depreciated_value=33975.9, state='draft'),
+            self._get_depreciation_move_values(date='2023-05-31', depreciation_value=1018.62, remaining_value=25005.48, depreciated_value=34994.52, state='draft'),
+            self._get_depreciation_move_values(date='2023-06-30', depreciation_value=985.76, remaining_value=24019.72, depreciated_value=35980.28, state='draft'),
+            self._get_depreciation_move_values(date='2023-07-31', depreciation_value=1018.62, remaining_value=23001.10, depreciated_value=36998.9, state='draft'),
+            self._get_depreciation_move_values(date='2023-08-31', depreciation_value=1018.62, remaining_value=21982.48, depreciated_value=38017.52, state='draft'),
+            self._get_depreciation_move_values(date='2023-09-30', depreciation_value=985.77, remaining_value=20996.71, depreciated_value=39003.29, state='draft'),
+            self._get_depreciation_move_values(date='2023-10-31', depreciation_value=1018.62, remaining_value=19978.09, depreciated_value=40021.91, state='draft'),
+            self._get_depreciation_move_values(date='2023-11-30', depreciation_value=985.76, remaining_value=18992.33, depreciated_value=41007.67, state='draft'),
+            self._get_depreciation_move_values(date='2023-12-31', depreciation_value=1018.62, remaining_value=17973.71, depreciated_value=42026.29, state='draft'),
+            # 2024
+            self._get_depreciation_move_values(date='2024-01-31', depreciation_value=1018.62, remaining_value=16955.09, depreciated_value=43044.91, state='draft'),
+            self._get_depreciation_move_values(date='2024-02-29', depreciation_value=952.9, remaining_value=16002.19, depreciated_value=43997.81, state='draft'),
+            self._get_depreciation_move_values(date='2024-03-31', depreciation_value=1018.62, remaining_value=14983.57, depreciated_value=45016.43, state='draft'),
+            self._get_depreciation_move_values(date='2024-04-30', depreciation_value=985.76, remaining_value=13997.81, depreciated_value=46002.19, state='draft'),
+            self._get_depreciation_move_values(date='2024-05-31', depreciation_value=1018.62, remaining_value=12979.19, depreciated_value=47020.81, state='draft'),
+            self._get_depreciation_move_values(date='2024-06-30', depreciation_value=985.76, remaining_value=11993.43, depreciated_value=48006.57, state='draft'),
+            self._get_depreciation_move_values(date='2024-07-31', depreciation_value=1018.62, remaining_value=10974.81, depreciated_value=49025.19, state='draft'),
+            self._get_depreciation_move_values(date='2024-08-31', depreciation_value=1018.62, remaining_value=9956.19, depreciated_value=50043.81, state='draft'),
+            self._get_depreciation_move_values(date='2024-09-30', depreciation_value=985.76, remaining_value=8970.43, depreciated_value=51029.57, state='draft'),
+            self._get_depreciation_move_values(date='2024-10-31', depreciation_value=1018.62, remaining_value=7951.81, depreciated_value=52048.19, state='draft'),
+            self._get_depreciation_move_values(date='2024-11-30', depreciation_value=985.76, remaining_value=6966.05, depreciated_value=53033.95, state='draft'),
+            self._get_depreciation_move_values(date='2024-12-31', depreciation_value=1018.62, remaining_value=5947.43, depreciated_value=54052.57, state='draft'),
+            # 2025
+            self._get_depreciation_move_values(date='2025-01-31', depreciation_value=1018.62, remaining_value=4928.81, depreciated_value=55071.19, state='draft'),
+            self._get_depreciation_move_values(date='2025-02-28', depreciation_value=920.05, remaining_value=4008.76, depreciated_value=55991.24, state='draft'),
+            self._get_depreciation_move_values(date='2025-03-31', depreciation_value=1018.62, remaining_value=2990.14, depreciated_value=57009.86, state='draft'),
+            self._get_depreciation_move_values(date='2025-04-30', depreciation_value=985.76, remaining_value=2004.38, depreciated_value=57995.62, state='draft'),
+            self._get_depreciation_move_values(date='2025-05-31', depreciation_value=1018.62, remaining_value=985.76, depreciated_value=59014.24, state='draft'),
+            self._get_depreciation_move_values(date='2025-06-30', depreciation_value=985.76, remaining_value=0.0, depreciated_value=60000.0, state='draft'),
+        ])
+
+    def test_degressive_60_months_no_prorata_asset(self):
+        self.car.write({
+            'method_number': 60,
+            'method_period': '1',
+            'method': 'degressive',
+            'method_progress_factor': 0.3,
+        })
+        self.car.validate()
+        self.assertEqual(self.car.state, 'open')
+        self.assertEqual(self.car.book_value, 24500)
+        self.assertRecordValues(self.car.depreciation_move_ids, [
+            # 2020
+            self._get_depreciation_move_values(date='2020-01-31', depreciation_value=1500.0, remaining_value=58500.0, depreciated_value=1500.0, state='posted'),
+            self._get_depreciation_move_values(date='2020-02-29', depreciation_value=1500.0, remaining_value=57000.0, depreciated_value=3000.0, state='posted'),
+            self._get_depreciation_move_values(date='2020-03-31', depreciation_value=1500.0, remaining_value=55500.0, depreciated_value=4500.0, state='posted'),
+            self._get_depreciation_move_values(date='2020-04-30', depreciation_value=1500.0, remaining_value=54000.0, depreciated_value=6000.0, state='posted'),
+            self._get_depreciation_move_values(date='2020-05-31', depreciation_value=1500.0, remaining_value=52500.0, depreciated_value=7500.0, state='posted'),
+            self._get_depreciation_move_values(date='2020-06-30', depreciation_value=1500.0, remaining_value=51000.0, depreciated_value=9000.0, state='posted'),
+            self._get_depreciation_move_values(date='2020-07-31', depreciation_value=1500.0, remaining_value=49500.0, depreciated_value=10500.0, state='posted'),
+            self._get_depreciation_move_values(date='2020-08-31', depreciation_value=1500.0, remaining_value=48000.0, depreciated_value=12000.0, state='posted'),
+            self._get_depreciation_move_values(date='2020-09-30', depreciation_value=1500.0, remaining_value=46500.0, depreciated_value=13500.0, state='posted'),
+            self._get_depreciation_move_values(date='2020-10-31', depreciation_value=1500.0, remaining_value=45000.0, depreciated_value=15000.0, state='posted'),
+            self._get_depreciation_move_values(date='2020-11-30', depreciation_value=1500.0, remaining_value=43500.0, depreciated_value=16500.0, state='posted'),
+            self._get_depreciation_move_values(date='2020-12-31', depreciation_value=1500.0, remaining_value=42000.0, depreciated_value=18000.0, state='posted'),
+            # 2021
+            self._get_depreciation_move_values(date='2021-01-31', depreciation_value=1050.0, remaining_value=40950.0, depreciated_value=19050.0, state='posted'),
+            self._get_depreciation_move_values(date='2021-02-28', depreciation_value=1050.0, remaining_value=39900.0, depreciated_value=20100.0, state='posted'),
+            self._get_depreciation_move_values(date='2021-03-31', depreciation_value=1050.0, remaining_value=38850.0, depreciated_value=21150.0, state='posted'),
+            self._get_depreciation_move_values(date='2021-04-30', depreciation_value=1050.0, remaining_value=37800.0, depreciated_value=22200.0, state='posted'),
+            self._get_depreciation_move_values(date='2021-05-31', depreciation_value=1050.0, remaining_value=36750.0, depreciated_value=23250.0, state='posted'),
+            self._get_depreciation_move_values(date='2021-06-30', depreciation_value=1050.0, remaining_value=35700.0, depreciated_value=24300.0, state='posted'),
+            self._get_depreciation_move_values(date='2021-07-31', depreciation_value=1050.0, remaining_value=34650.0, depreciated_value=25350.0, state='posted'),
+            self._get_depreciation_move_values(date='2021-08-31', depreciation_value=1050.0, remaining_value=33600.0, depreciated_value=26400.0, state='posted'),
+            self._get_depreciation_move_values(date='2021-09-30', depreciation_value=1050.0, remaining_value=32550.0, depreciated_value=27450.0, state='posted'),
+            self._get_depreciation_move_values(date='2021-10-31', depreciation_value=1050.0, remaining_value=31500.0, depreciated_value=28500.0, state='posted'),
+            self._get_depreciation_move_values(date='2021-11-30', depreciation_value=1050.0, remaining_value=30450.0, depreciated_value=29550.0, state='posted'),
+            self._get_depreciation_move_values(date='2021-12-31', depreciation_value=1050.0, remaining_value=29400.0, depreciated_value=30600.0, state='posted'),
+            # 2022
+            self._get_depreciation_move_values(date='2022-01-31', depreciation_value=816.67, remaining_value=28583.33, depreciated_value=31416.67, state='posted'),
+            self._get_depreciation_move_values(date='2022-02-28', depreciation_value=816.66, remaining_value=27766.67, depreciated_value=32233.33, state='posted'),
+            self._get_depreciation_move_values(date='2022-03-31', depreciation_value=816.67, remaining_value=26950.0, depreciated_value=33050.0, state='posted'),
+            self._get_depreciation_move_values(date='2022-04-30', depreciation_value=816.67, remaining_value=26133.33, depreciated_value=33866.67, state='posted'),
+            self._get_depreciation_move_values(date='2022-05-31', depreciation_value=816.66, remaining_value=25316.67, depreciated_value=34683.33, state='posted'),
+            self._get_depreciation_move_values(date='2022-06-30', depreciation_value=816.67, remaining_value=24500.0, depreciated_value=35500.0, state='posted'),
+            self._get_depreciation_move_values(date='2022-07-31', depreciation_value=816.67, remaining_value=23683.33, depreciated_value=36316.67, state='draft'),
+            self._get_depreciation_move_values(date='2022-08-31', depreciation_value=816.66, remaining_value=22866.67, depreciated_value=37133.33, state='draft'),
+            self._get_depreciation_move_values(date='2022-09-30', depreciation_value=816.67, remaining_value=22050.0, depreciated_value=37950.0, state='draft'),
+            self._get_depreciation_move_values(date='2022-10-31', depreciation_value=816.67, remaining_value=21233.33, depreciated_value=38766.67, state='draft'),
+            self._get_depreciation_move_values(date='2022-11-30', depreciation_value=816.66, remaining_value=20416.67, depreciated_value=39583.33, state='draft'),
+            self._get_depreciation_move_values(date='2022-12-31', depreciation_value=816.67, remaining_value=19600.0, depreciated_value=40400.0, state='draft'),
+            # 2023
+            self._get_depreciation_move_values(date='2023-01-31', depreciation_value=816.67, remaining_value=18783.33, depreciated_value=41216.67, state='draft'),
+            self._get_depreciation_move_values(date='2023-02-28', depreciation_value=816.66, remaining_value=17966.67, depreciated_value=42033.33, state='draft'),
+            self._get_depreciation_move_values(date='2023-03-31', depreciation_value=816.67, remaining_value=17150.0, depreciated_value=42850.0, state='draft'),
+            self._get_depreciation_move_values(date='2023-04-30', depreciation_value=816.67, remaining_value=16333.33, depreciated_value=43666.67, state='draft'),
+            self._get_depreciation_move_values(date='2023-05-31', depreciation_value=816.66, remaining_value=15516.67, depreciated_value=44483.33, state='draft'),
+            self._get_depreciation_move_values(date='2023-06-30', depreciation_value=816.67, remaining_value=14700.0, depreciated_value=45300.0, state='draft'),
+            self._get_depreciation_move_values(date='2023-07-31', depreciation_value=816.67, remaining_value=13883.33, depreciated_value=46116.67, state='draft'),
+            self._get_depreciation_move_values(date='2023-08-31', depreciation_value=816.66, remaining_value=13066.67, depreciated_value=46933.33, state='draft'),
+            self._get_depreciation_move_values(date='2023-09-30', depreciation_value=816.67, remaining_value=12250.0, depreciated_value=47750.0, state='draft'),
+            self._get_depreciation_move_values(date='2023-10-31', depreciation_value=816.67, remaining_value=11433.33, depreciated_value=48566.67, state='draft'),
+            self._get_depreciation_move_values(date='2023-11-30', depreciation_value=816.66, remaining_value=10616.67, depreciated_value=49383.33, state='draft'),
+            self._get_depreciation_move_values(date='2023-12-31', depreciation_value=816.67, remaining_value=9800.0, depreciated_value=50200.0, state='draft'),
+            # 2024
+            self._get_depreciation_move_values(date='2024-01-31', depreciation_value=816.67, remaining_value=8983.33, depreciated_value=51016.67, state='draft'),
+            self._get_depreciation_move_values(date='2024-02-29', depreciation_value=816.66, remaining_value=8166.67, depreciated_value=51833.33, state='draft'),
+            self._get_depreciation_move_values(date='2024-03-31', depreciation_value=816.67, remaining_value=7350.0, depreciated_value=52650.0, state='draft'),
+            self._get_depreciation_move_values(date='2024-04-30', depreciation_value=816.67, remaining_value=6533.33, depreciated_value=53466.67, state='draft'),
+            self._get_depreciation_move_values(date='2024-05-31', depreciation_value=816.66, remaining_value=5716.67, depreciated_value=54283.33, state='draft'),
+            self._get_depreciation_move_values(date='2024-06-30', depreciation_value=816.67, remaining_value=4900.0, depreciated_value=55100.0, state='draft'),
+            self._get_depreciation_move_values(date='2024-07-31', depreciation_value=816.67, remaining_value=4083.33, depreciated_value=55916.67, state='draft'),
+            self._get_depreciation_move_values(date='2024-08-31', depreciation_value=816.66, remaining_value=3266.67, depreciated_value=56733.33, state='draft'),
+            self._get_depreciation_move_values(date='2024-09-30', depreciation_value=816.67, remaining_value=2450.0, depreciated_value=57550.0, state='draft'),
+            self._get_depreciation_move_values(date='2024-10-31', depreciation_value=816.67, remaining_value=1633.33, depreciated_value=58366.67, state='draft'),
+            self._get_depreciation_move_values(date='2024-11-30', depreciation_value=816.66, remaining_value=816.67, depreciated_value=59183.33, state='draft'),
+            self._get_depreciation_move_values(date='2024-12-31', depreciation_value=816.67, remaining_value=0.0, depreciated_value=60000.0, state='draft'),
+        ])
+
+    def test_degressive_60_months_from_middle_year(self):
+        asset = self.create_asset(
+            value=100000,
+            periodicity='monthly',
+            periods=60,
+            method='degressive',
+            method_progress_factor=0.35,
+            acquisition_date='2022-07-01',
+            prorata_computation_type='constant_periods'
+        )
+        asset.compute_depreciation_board()
+        self.assertEqual(asset.state, 'draft')
+        self.assertEqual(asset.book_value, 100000)
+        self.assertRecordValues(asset.depreciation_move_ids, [
+            self._get_depreciation_move_values(date='2022-07-31', depreciation_value=2916.67, remaining_value=97083.33, depreciated_value=2916.67, state='draft'),
+            self._get_depreciation_move_values(date='2022-08-31', depreciation_value=2916.66, remaining_value=94166.67, depreciated_value=5833.33, state='draft'),
+            self._get_depreciation_move_values(date='2022-09-30', depreciation_value=2916.67, remaining_value=91250.00, depreciated_value=8750.00, state='draft'),
+            self._get_depreciation_move_values(date='2022-10-31', depreciation_value=2916.67, remaining_value=88333.33, depreciated_value=11666.67, state='draft'),
+            self._get_depreciation_move_values(date='2022-11-30', depreciation_value=2916.66, remaining_value=85416.67, depreciated_value=14583.33, state='draft'),
+            self._get_depreciation_move_values(date='2022-12-31', depreciation_value=2916.67, remaining_value=82500.00, depreciated_value=17500.00, state='draft'),
+
+            self._get_depreciation_move_values(date='2023-01-31', depreciation_value=2406.25, remaining_value=80093.75, depreciated_value=19906.25, state='draft'),
+            self._get_depreciation_move_values(date='2023-02-28', depreciation_value=2406.25, remaining_value=77687.50, depreciated_value=22312.50, state='draft'),
+            self._get_depreciation_move_values(date='2023-03-31', depreciation_value=2406.25, remaining_value=75281.25, depreciated_value=24718.75, state='draft'),
+            self._get_depreciation_move_values(date='2023-04-30', depreciation_value=2406.25, remaining_value=72875.00, depreciated_value=27125.00, state='draft'),
+            self._get_depreciation_move_values(date='2023-05-31', depreciation_value=2406.25, remaining_value=70468.75, depreciated_value=29531.25, state='draft'),
+            self._get_depreciation_move_values(date='2023-06-30', depreciation_value=2406.25, remaining_value=68062.50, depreciated_value=31937.50, state='draft'),
+            self._get_depreciation_move_values(date='2023-07-31', depreciation_value=2406.25, remaining_value=65656.25, depreciated_value=34343.75, state='draft'),
+            self._get_depreciation_move_values(date='2023-08-31', depreciation_value=2406.25, remaining_value=63250.00, depreciated_value=36750.00, state='draft'),
+            self._get_depreciation_move_values(date='2023-09-30', depreciation_value=2406.25, remaining_value=60843.75, depreciated_value=39156.25, state='draft'),
+            self._get_depreciation_move_values(date='2023-10-31', depreciation_value=2406.25, remaining_value=58437.50, depreciated_value=41562.50, state='draft'),
+            self._get_depreciation_move_values(date='2023-11-30', depreciation_value=2406.25, remaining_value=56031.25, depreciated_value=43968.75, state='draft'),
+            self._get_depreciation_move_values(date='2023-12-31', depreciation_value=2406.25, remaining_value=53625.00, depreciated_value=46375.00, state='draft'),
+
+            self._get_depreciation_move_values(date='2024-01-31', depreciation_value=1564.06, remaining_value=52060.94, depreciated_value=47939.06, state='draft'),
+            self._get_depreciation_move_values(date='2024-02-29', depreciation_value=1564.07, remaining_value=50496.87, depreciated_value=49503.13, state='draft'),
+            self._get_depreciation_move_values(date='2024-03-31', depreciation_value=1564.06, remaining_value=48932.81, depreciated_value=51067.19, state='draft'),
+            self._get_depreciation_move_values(date='2024-04-30', depreciation_value=1564.06, remaining_value=47368.75, depreciated_value=52631.25, state='draft'),
+            self._get_depreciation_move_values(date='2024-05-31', depreciation_value=1564.06, remaining_value=45804.69, depreciated_value=54195.31, state='draft'),
+            self._get_depreciation_move_values(date='2024-06-30', depreciation_value=1564.07, remaining_value=44240.62, depreciated_value=55759.38, state='draft'),
+            self._get_depreciation_move_values(date='2024-07-31', depreciation_value=1564.06, remaining_value=42676.56, depreciated_value=57323.44, state='draft'),
+            self._get_depreciation_move_values(date='2024-08-31', depreciation_value=1564.06, remaining_value=41112.50, depreciated_value=58887.50, state='draft'),
+            self._get_depreciation_move_values(date='2024-09-30', depreciation_value=1564.06, remaining_value=39548.44, depreciated_value=60451.56, state='draft'),
+            self._get_depreciation_move_values(date='2024-10-31', depreciation_value=1564.07, remaining_value=37984.37, depreciated_value=62015.63, state='draft'),
+            self._get_depreciation_move_values(date='2024-11-30', depreciation_value=1564.06, remaining_value=36420.31, depreciated_value=63579.69, state='draft'),
+            self._get_depreciation_move_values(date='2024-12-31', depreciation_value=1564.06, remaining_value=34856.25, depreciated_value=65143.75, state='draft'),
+
+            self._get_depreciation_move_values(date='2025-01-31', depreciation_value=1161.88, remaining_value=33694.37, depreciated_value=66305.63, state='draft'),
+            self._get_depreciation_move_values(date='2025-02-28', depreciation_value=1161.87, remaining_value=32532.50, depreciated_value=67467.50, state='draft'),
+            self._get_depreciation_move_values(date='2025-03-31', depreciation_value=1161.88, remaining_value=31370.62, depreciated_value=68629.38, state='draft'),
+            self._get_depreciation_move_values(date='2025-04-30', depreciation_value=1161.87, remaining_value=30208.75, depreciated_value=69791.25, state='draft'),
+            self._get_depreciation_move_values(date='2025-05-31', depreciation_value=1161.88, remaining_value=29046.87, depreciated_value=70953.13, state='draft'),
+            self._get_depreciation_move_values(date='2025-06-30', depreciation_value=1161.87, remaining_value=27885.00, depreciated_value=72115.00, state='draft'),
+            self._get_depreciation_move_values(date='2025-07-31', depreciation_value=1161.88, remaining_value=26723.12, depreciated_value=73276.88, state='draft'),
+            self._get_depreciation_move_values(date='2025-08-31', depreciation_value=1161.87, remaining_value=25561.25, depreciated_value=74438.75, state='draft'),
+            self._get_depreciation_move_values(date='2025-09-30', depreciation_value=1161.88, remaining_value=24399.37, depreciated_value=75600.63, state='draft'),
+            self._get_depreciation_move_values(date='2025-10-31', depreciation_value=1161.87, remaining_value=23237.50, depreciated_value=76762.50, state='draft'),
+            self._get_depreciation_move_values(date='2025-11-30', depreciation_value=1161.88, remaining_value=22075.62, depreciated_value=77924.38, state='draft'),
+            self._get_depreciation_move_values(date='2025-12-31', depreciation_value=1161.87, remaining_value=20913.75, depreciated_value=79086.25, state='draft'),
+
+            self._get_depreciation_move_values(date='2026-01-31', depreciation_value=1161.88, remaining_value=19751.87, depreciated_value=80248.13, state='draft'),
+            self._get_depreciation_move_values(date='2026-02-28', depreciation_value=1161.87, remaining_value=18590.00, depreciated_value=81410.00, state='draft'),
+            self._get_depreciation_move_values(date='2026-03-31', depreciation_value=1161.88, remaining_value=17428.12, depreciated_value=82571.88, state='draft'),
+            self._get_depreciation_move_values(date='2026-04-30', depreciation_value=1161.87, remaining_value=16266.25, depreciated_value=83733.75, state='draft'),
+            self._get_depreciation_move_values(date='2026-05-31', depreciation_value=1161.88, remaining_value=15104.37, depreciated_value=84895.63, state='draft'),
+            self._get_depreciation_move_values(date='2026-06-30', depreciation_value=1161.87, remaining_value=13942.50, depreciated_value=86057.50, state='draft'),
+            self._get_depreciation_move_values(date='2026-07-31', depreciation_value=1161.88, remaining_value=12780.62, depreciated_value=87219.38, state='draft'),
+            self._get_depreciation_move_values(date='2026-08-31', depreciation_value=1161.87, remaining_value=11618.75, depreciated_value=88381.25, state='draft'),
+            self._get_depreciation_move_values(date='2026-09-30', depreciation_value=1161.88, remaining_value=10456.87, depreciated_value=89543.13, state='draft'),
+            self._get_depreciation_move_values(date='2026-10-31', depreciation_value=1161.87, remaining_value=9295.00, depreciated_value=90705.00, state='draft'),
+            self._get_depreciation_move_values(date='2026-11-30', depreciation_value=1161.88, remaining_value=8133.12, depreciated_value=91866.88, state='draft'),
+            self._get_depreciation_move_values(date='2026-12-31', depreciation_value=1161.87, remaining_value=6971.25, depreciated_value=93028.75, state='draft'),
+
+            self._get_depreciation_move_values(date='2027-01-31', depreciation_value=1161.88, remaining_value=5809.37, depreciated_value=94190.63, state='draft'),
+            self._get_depreciation_move_values(date='2027-02-28', depreciation_value=1161.87, remaining_value=4647.50, depreciated_value=95352.50, state='draft'),
+            self._get_depreciation_move_values(date='2027-03-31', depreciation_value=1161.88, remaining_value=3485.62, depreciated_value=96514.38, state='draft'),
+            self._get_depreciation_move_values(date='2027-04-30', depreciation_value=1161.87, remaining_value=2323.75, depreciated_value=97676.25, state='draft'),
+            self._get_depreciation_move_values(date='2027-05-31', depreciation_value=1161.88, remaining_value=1161.87, depreciated_value=98838.13, state='draft'),
+            self._get_depreciation_move_values(date='2027-06-30', depreciation_value=1161.87, remaining_value=0.00, depreciated_value=100000.00, state='draft'),
+        ])
+
+    def test_degressive_60_months_from_middle_sync_with_fiscalyear(self):
+        company = self.env.company
+        company.fiscalyear_last_day = 30
+        company.fiscalyear_last_month = '6'
+        asset = self.create_asset(
+            value=100000,
+            periodicity='monthly',
+            periods=60,
+            method='degressive',
+            method_progress_factor=0.35,
+            acquisition_date='2022-07-01',
+            prorata_computation_type='constant_periods'
+        )
+        asset.compute_depreciation_board()
+        self.assertEqual(asset.state, 'draft')
+        self.assertEqual(asset.book_value, 100000)
+        self.assertRecordValues(asset.depreciation_move_ids, [
+            self._get_depreciation_move_values(date='2022-07-31', depreciation_value=2916.67, remaining_value=97083.33, depreciated_value=2916.67, state='draft'),
+            self._get_depreciation_move_values(date='2022-08-31', depreciation_value=2916.66, remaining_value=94166.67, depreciated_value=5833.33, state='draft'),
+            self._get_depreciation_move_values(date='2022-09-30', depreciation_value=2916.67, remaining_value=91250.00, depreciated_value=8750.00, state='draft'),
+            self._get_depreciation_move_values(date='2022-10-31', depreciation_value=2916.67, remaining_value=88333.33, depreciated_value=11666.67, state='draft'),
+            self._get_depreciation_move_values(date='2022-11-30', depreciation_value=2916.66, remaining_value=85416.67, depreciated_value=14583.33, state='draft'),
+            self._get_depreciation_move_values(date='2022-12-31', depreciation_value=2916.67, remaining_value=82500.00, depreciated_value=17500.00, state='draft'),
+            self._get_depreciation_move_values(date='2023-01-31', depreciation_value=2916.67, remaining_value=79583.33, depreciated_value=20416.67, state='draft'),
+            self._get_depreciation_move_values(date='2023-02-28', depreciation_value=2916.66, remaining_value=76666.67, depreciated_value=23333.33, state='draft'),
+            self._get_depreciation_move_values(date='2023-03-31', depreciation_value=2916.67, remaining_value=73750.00, depreciated_value=26250.00, state='draft'),
+            self._get_depreciation_move_values(date='2023-04-30', depreciation_value=2916.67, remaining_value=70833.33, depreciated_value=29166.67, state='draft'),
+            self._get_depreciation_move_values(date='2023-05-31', depreciation_value=2916.66, remaining_value=67916.67, depreciated_value=32083.33, state='draft'),
+            self._get_depreciation_move_values(date='2023-06-30', depreciation_value=2916.67, remaining_value=65000.00, depreciated_value=35000.00, state='draft'),
+
+            self._get_depreciation_move_values(date='2023-07-31', depreciation_value=1895.83, remaining_value=63104.17, depreciated_value=36895.83, state='draft'),
+            self._get_depreciation_move_values(date='2023-08-31', depreciation_value=1895.84, remaining_value=61208.33, depreciated_value=38791.67, state='draft'),
+            self._get_depreciation_move_values(date='2023-09-30', depreciation_value=1895.83, remaining_value=59312.50, depreciated_value=40687.50, state='draft'),
+            self._get_depreciation_move_values(date='2023-10-31', depreciation_value=1895.83, remaining_value=57416.67, depreciated_value=42583.33, state='draft'),
+            self._get_depreciation_move_values(date='2023-11-30', depreciation_value=1895.84, remaining_value=55520.83, depreciated_value=44479.17, state='draft'),
+            self._get_depreciation_move_values(date='2023-12-31', depreciation_value=1895.83, remaining_value=53625.00, depreciated_value=46375.00, state='draft'),
+            self._get_depreciation_move_values(date='2024-01-31', depreciation_value=1895.83, remaining_value=51729.17, depreciated_value=48270.83, state='draft'),
+            self._get_depreciation_move_values(date='2024-02-29', depreciation_value=1895.84, remaining_value=49833.33, depreciated_value=50166.67, state='draft'),
+            self._get_depreciation_move_values(date='2024-03-31', depreciation_value=1895.83, remaining_value=47937.50, depreciated_value=52062.50, state='draft'),
+            self._get_depreciation_move_values(date='2024-04-30', depreciation_value=1895.83, remaining_value=46041.67, depreciated_value=53958.33, state='draft'),
+            self._get_depreciation_move_values(date='2024-05-31', depreciation_value=1895.84, remaining_value=44145.83, depreciated_value=55854.17, state='draft'),
+            self._get_depreciation_move_values(date='2024-06-30', depreciation_value=1895.83, remaining_value=42250.00, depreciated_value=57750.00, state='draft'),
+
+            self._get_depreciation_move_values(date='2024-07-31', depreciation_value=1232.29, remaining_value=41017.71, depreciated_value=58982.29, state='draft'),
+            self._get_depreciation_move_values(date='2024-08-31', depreciation_value=1232.29, remaining_value=39785.42, depreciated_value=60214.58, state='draft'),
+            self._get_depreciation_move_values(date='2024-09-30', depreciation_value=1232.29, remaining_value=38553.13, depreciated_value=61446.87, state='draft'),
+            self._get_depreciation_move_values(date='2024-10-31', depreciation_value=1232.30, remaining_value=37320.83, depreciated_value=62679.17, state='draft'),
+            self._get_depreciation_move_values(date='2024-11-30', depreciation_value=1232.29, remaining_value=36088.54, depreciated_value=63911.46, state='draft'),
+            self._get_depreciation_move_values(date='2024-12-31', depreciation_value=1232.29, remaining_value=34856.25, depreciated_value=65143.75, state='draft'),
+            self._get_depreciation_move_values(date='2025-01-31', depreciation_value=1232.29, remaining_value=33623.96, depreciated_value=66376.04, state='draft'),
+            self._get_depreciation_move_values(date='2025-02-28', depreciation_value=1232.29, remaining_value=32391.67, depreciated_value=67608.33, state='draft'),
+            self._get_depreciation_move_values(date='2025-03-31', depreciation_value=1232.29, remaining_value=31159.38, depreciated_value=68840.62, state='draft'),
+            self._get_depreciation_move_values(date='2025-04-30', depreciation_value=1232.30, remaining_value=29927.08, depreciated_value=70072.92, state='draft'),
+            self._get_depreciation_move_values(date='2025-05-31', depreciation_value=1232.29, remaining_value=28694.79, depreciated_value=71305.21, state='draft'),
+            self._get_depreciation_move_values(date='2025-06-30', depreciation_value=1232.29, remaining_value=27462.50, depreciated_value=72537.50, state='draft'),
+
+            self._get_depreciation_move_values(date='2025-07-31', depreciation_value=1144.27, remaining_value=26318.23, depreciated_value=73681.77, state='draft'),
+            self._get_depreciation_move_values(date='2025-08-31', depreciation_value=1144.27, remaining_value=25173.96, depreciated_value=74826.04, state='draft'),
+            self._get_depreciation_move_values(date='2025-09-30', depreciation_value=1144.27, remaining_value=24029.69, depreciated_value=75970.31, state='draft'),
+            self._get_depreciation_move_values(date='2025-10-31', depreciation_value=1144.27, remaining_value=22885.42, depreciated_value=77114.58, state='draft'),
+            self._get_depreciation_move_values(date='2025-11-30', depreciation_value=1144.27, remaining_value=21741.15, depreciated_value=78258.85, state='draft'),
+            self._get_depreciation_move_values(date='2025-12-31', depreciation_value=1144.27, remaining_value=20596.88, depreciated_value=79403.12, state='draft'),
+            self._get_depreciation_move_values(date='2026-01-31', depreciation_value=1144.28, remaining_value=19452.60, depreciated_value=80547.40, state='draft'),
+            self._get_depreciation_move_values(date='2026-02-28', depreciation_value=1144.27, remaining_value=18308.33, depreciated_value=81691.67, state='draft'),
+            self._get_depreciation_move_values(date='2026-03-31', depreciation_value=1144.27, remaining_value=17164.06, depreciated_value=82835.94, state='draft'),
+            self._get_depreciation_move_values(date='2026-04-30', depreciation_value=1144.27, remaining_value=16019.79, depreciated_value=83980.21, state='draft'),
+            self._get_depreciation_move_values(date='2026-05-31', depreciation_value=1144.27, remaining_value=14875.52, depreciated_value=85124.48, state='draft'),
+            self._get_depreciation_move_values(date='2026-06-30', depreciation_value=1144.27, remaining_value=13731.25, depreciated_value=86268.75, state='draft'),
+
+            self._get_depreciation_move_values(date='2026-07-31', depreciation_value=1144.27, remaining_value=12586.98, depreciated_value=87413.02, state='draft'),
+            self._get_depreciation_move_values(date='2026-08-31', depreciation_value=1144.27, remaining_value=11442.71, depreciated_value=88557.29, state='draft'),
+            self._get_depreciation_move_values(date='2026-09-30', depreciation_value=1144.27, remaining_value=10298.44, depreciated_value=89701.56, state='draft'),
+            self._get_depreciation_move_values(date='2026-10-31', depreciation_value=1144.27, remaining_value=9154.17, depreciated_value=90845.83, state='draft'),
+            self._get_depreciation_move_values(date='2026-11-30', depreciation_value=1144.27, remaining_value=8009.90, depreciated_value=91990.10, state='draft'),
+            self._get_depreciation_move_values(date='2026-12-31', depreciation_value=1144.27, remaining_value=6865.63, depreciated_value=93134.37, state='draft'),
+            self._get_depreciation_move_values(date='2027-01-31', depreciation_value=1144.28, remaining_value=5721.35, depreciated_value=94278.65, state='draft'),
+            self._get_depreciation_move_values(date='2027-02-28', depreciation_value=1144.27, remaining_value=4577.08, depreciated_value=95422.92, state='draft'),
+            self._get_depreciation_move_values(date='2027-03-31', depreciation_value=1144.27, remaining_value=3432.81, depreciated_value=96567.19, state='draft'),
+            self._get_depreciation_move_values(date='2027-04-30', depreciation_value=1144.27, remaining_value=2288.54, depreciated_value=97711.46, state='draft'),
+            self._get_depreciation_move_values(date='2027-05-31', depreciation_value=1144.27, remaining_value=1144.27, depreciated_value=98855.73, state='draft'),
+            self._get_depreciation_move_values(date='2027-06-30', depreciation_value=1144.27, remaining_value=0.00, depreciated_value=100000.00, state='draft'),
+        ])
+
+    def test_degressive_60_months_no_prorata_with_imported_amount_asset(self):
+        self.car.write({
+            'method_number': 60,
+            'method_period': '1',
+            'method': 'degressive',
+            'method_progress_factor': 0.3,
+            'already_depreciated_amount_import': 2000,
+        })
+        self.car.validate()
+        self.assertEqual(self.car.state, 'open')
+        self.assertEqual(self.car.book_value, 24500)
+        self.assertRecordValues(self.car.depreciation_move_ids, [
+            # 2020
+            self._get_depreciation_move_values(date='2020-02-29', depreciation_value=1000.0, remaining_value=57000.0, depreciated_value=3000.0, state='posted'),
+            self._get_depreciation_move_values(date='2020-03-31', depreciation_value=1500.0, remaining_value=55500.0, depreciated_value=4500.0, state='posted'),
+            self._get_depreciation_move_values(date='2020-04-30', depreciation_value=1500.0, remaining_value=54000.0, depreciated_value=6000.0, state='posted'),
+            self._get_depreciation_move_values(date='2020-05-31', depreciation_value=1500.0, remaining_value=52500.0, depreciated_value=7500.0, state='posted'),
+            self._get_depreciation_move_values(date='2020-06-30', depreciation_value=1500.0, remaining_value=51000.0, depreciated_value=9000.0, state='posted'),
+            self._get_depreciation_move_values(date='2020-07-31', depreciation_value=1500.0, remaining_value=49500.0, depreciated_value=10500.0, state='posted'),
+            self._get_depreciation_move_values(date='2020-08-31', depreciation_value=1500.0, remaining_value=48000.0, depreciated_value=12000.0, state='posted'),
+            self._get_depreciation_move_values(date='2020-09-30', depreciation_value=1500.0, remaining_value=46500.0, depreciated_value=13500.0, state='posted'),
+            self._get_depreciation_move_values(date='2020-10-31', depreciation_value=1500.0, remaining_value=45000.0, depreciated_value=15000.0, state='posted'),
+            self._get_depreciation_move_values(date='2020-11-30', depreciation_value=1500.0, remaining_value=43500.0, depreciated_value=16500.0, state='posted'),
+            self._get_depreciation_move_values(date='2020-12-31', depreciation_value=1500.0, remaining_value=42000.0, depreciated_value=18000.0, state='posted'),
+            # 2021
+            self._get_depreciation_move_values(date='2021-01-31', depreciation_value=1050.0, remaining_value=40950.0, depreciated_value=19050.0, state='posted'),
+            self._get_depreciation_move_values(date='2021-02-28', depreciation_value=1050.0, remaining_value=39900.0, depreciated_value=20100.0, state='posted'),
+            self._get_depreciation_move_values(date='2021-03-31', depreciation_value=1050.0, remaining_value=38850.0, depreciated_value=21150.0, state='posted'),
+            self._get_depreciation_move_values(date='2021-04-30', depreciation_value=1050.0, remaining_value=37800.0, depreciated_value=22200.0, state='posted'),
+            self._get_depreciation_move_values(date='2021-05-31', depreciation_value=1050.0, remaining_value=36750.0, depreciated_value=23250.0, state='posted'),
+            self._get_depreciation_move_values(date='2021-06-30', depreciation_value=1050.0, remaining_value=35700.0, depreciated_value=24300.0, state='posted'),
+            self._get_depreciation_move_values(date='2021-07-31', depreciation_value=1050.0, remaining_value=34650.0, depreciated_value=25350.0, state='posted'),
+            self._get_depreciation_move_values(date='2021-08-31', depreciation_value=1050.0, remaining_value=33600.0, depreciated_value=26400.0, state='posted'),
+            self._get_depreciation_move_values(date='2021-09-30', depreciation_value=1050.0, remaining_value=32550.0, depreciated_value=27450.0, state='posted'),
+            self._get_depreciation_move_values(date='2021-10-31', depreciation_value=1050.0, remaining_value=31500.0, depreciated_value=28500.0, state='posted'),
+            self._get_depreciation_move_values(date='2021-11-30', depreciation_value=1050.0, remaining_value=30450.0, depreciated_value=29550.0, state='posted'),
+            self._get_depreciation_move_values(date='2021-12-31', depreciation_value=1050.0, remaining_value=29400.0, depreciated_value=30600.0, state='posted'),
+            # 2022
+            self._get_depreciation_move_values(date='2022-01-31', depreciation_value=816.67, remaining_value=28583.33, depreciated_value=31416.67, state='posted'),
+            self._get_depreciation_move_values(date='2022-02-28', depreciation_value=816.66, remaining_value=27766.67, depreciated_value=32233.33, state='posted'),
+            self._get_depreciation_move_values(date='2022-03-31', depreciation_value=816.67, remaining_value=26950.0, depreciated_value=33050.0, state='posted'),
+            self._get_depreciation_move_values(date='2022-04-30', depreciation_value=816.67, remaining_value=26133.33, depreciated_value=33866.67, state='posted'),
+            self._get_depreciation_move_values(date='2022-05-31', depreciation_value=816.66, remaining_value=25316.67, depreciated_value=34683.33, state='posted'),
+            self._get_depreciation_move_values(date='2022-06-30', depreciation_value=816.67, remaining_value=24500.0, depreciated_value=35500.0, state='posted'),
+            self._get_depreciation_move_values(date='2022-07-31', depreciation_value=816.67, remaining_value=23683.33, depreciated_value=36316.67, state='draft'),
+            self._get_depreciation_move_values(date='2022-08-31', depreciation_value=816.66, remaining_value=22866.67, depreciated_value=37133.33, state='draft'),
+            self._get_depreciation_move_values(date='2022-09-30', depreciation_value=816.67, remaining_value=22050.0, depreciated_value=37950.0, state='draft'),
+            self._get_depreciation_move_values(date='2022-10-31', depreciation_value=816.67, remaining_value=21233.33, depreciated_value=38766.67, state='draft'),
+            self._get_depreciation_move_values(date='2022-11-30', depreciation_value=816.66, remaining_value=20416.67, depreciated_value=39583.33, state='draft'),
+            self._get_depreciation_move_values(date='2022-12-31', depreciation_value=816.67, remaining_value=19600.0, depreciated_value=40400.0, state='draft'),
+            # 2023
+            self._get_depreciation_move_values(date='2023-01-31', depreciation_value=816.67, remaining_value=18783.33, depreciated_value=41216.67, state='draft'),
+            self._get_depreciation_move_values(date='2023-02-28', depreciation_value=816.66, remaining_value=17966.67, depreciated_value=42033.33, state='draft'),
+            self._get_depreciation_move_values(date='2023-03-31', depreciation_value=816.67, remaining_value=17150.0, depreciated_value=42850.0, state='draft'),
+            self._get_depreciation_move_values(date='2023-04-30', depreciation_value=816.67, remaining_value=16333.33, depreciated_value=43666.67, state='draft'),
+            self._get_depreciation_move_values(date='2023-05-31', depreciation_value=816.66, remaining_value=15516.67, depreciated_value=44483.33, state='draft'),
+            self._get_depreciation_move_values(date='2023-06-30', depreciation_value=816.67, remaining_value=14700.0, depreciated_value=45300.0, state='draft'),
+            self._get_depreciation_move_values(date='2023-07-31', depreciation_value=816.67, remaining_value=13883.33, depreciated_value=46116.67, state='draft'),
+            self._get_depreciation_move_values(date='2023-08-31', depreciation_value=816.66, remaining_value=13066.67, depreciated_value=46933.33, state='draft'),
+            self._get_depreciation_move_values(date='2023-09-30', depreciation_value=816.67, remaining_value=12250.0, depreciated_value=47750.0, state='draft'),
+            self._get_depreciation_move_values(date='2023-10-31', depreciation_value=816.67, remaining_value=11433.33, depreciated_value=48566.67, state='draft'),
+            self._get_depreciation_move_values(date='2023-11-30', depreciation_value=816.66, remaining_value=10616.67, depreciated_value=49383.33, state='draft'),
+            self._get_depreciation_move_values(date='2023-12-31', depreciation_value=816.67, remaining_value=9800.0, depreciated_value=50200.0, state='draft'),
+            # 2024
+            self._get_depreciation_move_values(date='2024-01-31', depreciation_value=816.67, remaining_value=8983.33, depreciated_value=51016.67, state='draft'),
+            self._get_depreciation_move_values(date='2024-02-29', depreciation_value=816.66, remaining_value=8166.67, depreciated_value=51833.33, state='draft'),
+            self._get_depreciation_move_values(date='2024-03-31', depreciation_value=816.67, remaining_value=7350.0, depreciated_value=52650.0, state='draft'),
+            self._get_depreciation_move_values(date='2024-04-30', depreciation_value=816.67, remaining_value=6533.33, depreciated_value=53466.67, state='draft'),
+            self._get_depreciation_move_values(date='2024-05-31', depreciation_value=816.66, remaining_value=5716.67, depreciated_value=54283.33, state='draft'),
+            self._get_depreciation_move_values(date='2024-06-30', depreciation_value=816.67, remaining_value=4900.0, depreciated_value=55100.0, state='draft'),
+            self._get_depreciation_move_values(date='2024-07-31', depreciation_value=816.67, remaining_value=4083.33, depreciated_value=55916.67, state='draft'),
+            self._get_depreciation_move_values(date='2024-08-31', depreciation_value=816.66, remaining_value=3266.67, depreciated_value=56733.33, state='draft'),
+            self._get_depreciation_move_values(date='2024-09-30', depreciation_value=816.67, remaining_value=2450.0, depreciated_value=57550.0, state='draft'),
+            self._get_depreciation_move_values(date='2024-10-31', depreciation_value=816.67, remaining_value=1633.33, depreciated_value=58366.67, state='draft'),
+            self._get_depreciation_move_values(date='2024-11-30', depreciation_value=816.66, remaining_value=816.67, depreciated_value=59183.33, state='draft'),
+            self._get_depreciation_move_values(date='2024-12-31', depreciation_value=816.67, remaining_value=0.0, depreciated_value=60000.0, state='draft'),
+        ])
+
+    def test_degressive_60_months_no_prorata_with_salvage_value_asset(self):
+        self.car.write({
+            'method_number': 60,
+            'method_period': '1',
+            'method': 'degressive',
+            'method_progress_factor': 0.3,
+            'salvage_value': 2000,
+        })
+        self.car.validate()
+        self.assertEqual(self.car.state, 'open')
+        self.assertEqual(self.car.book_value, 25683.33)
+        self.assertEqual(self.car.value_residual, 23683.33)
+        self.assertRecordValues(self.car.depreciation_move_ids, [
+            # 2020
+            self._get_depreciation_move_values(date='2020-01-31', depreciation_value=1450.0, remaining_value=56550.0, depreciated_value=1450.0, state='posted'),
+            self._get_depreciation_move_values(date='2020-02-29', depreciation_value=1450.0, remaining_value=55100.0, depreciated_value=2900.0, state='posted'),
+            self._get_depreciation_move_values(date='2020-03-31', depreciation_value=1450.0, remaining_value=53650.0, depreciated_value=4350.0, state='posted'),
+            self._get_depreciation_move_values(date='2020-04-30', depreciation_value=1450.0, remaining_value=52200.0, depreciated_value=5800.0, state='posted'),
+            self._get_depreciation_move_values(date='2020-05-31', depreciation_value=1450.0, remaining_value=50750.0, depreciated_value=7250.0, state='posted'),
+            self._get_depreciation_move_values(date='2020-06-30', depreciation_value=1450.0, remaining_value=49300.0, depreciated_value=8700.0, state='posted'),
+            self._get_depreciation_move_values(date='2020-07-31', depreciation_value=1450.0, remaining_value=47850.0, depreciated_value=10150.0, state='posted'),
+            self._get_depreciation_move_values(date='2020-08-31', depreciation_value=1450.0, remaining_value=46400.0, depreciated_value=11600.0, state='posted'),
+            self._get_depreciation_move_values(date='2020-09-30', depreciation_value=1450.0, remaining_value=44950.0, depreciated_value=13050.0, state='posted'),
+            self._get_depreciation_move_values(date='2020-10-31', depreciation_value=1450.0, remaining_value=43500.0, depreciated_value=14500.0, state='posted'),
+            self._get_depreciation_move_values(date='2020-11-30', depreciation_value=1450.0, remaining_value=42050.0, depreciated_value=15950.0, state='posted'),
+            self._get_depreciation_move_values(date='2020-12-31', depreciation_value=1450.0, remaining_value=40600.0, depreciated_value=17400.0, state='posted'),
+            # 2021
+            self._get_depreciation_move_values(date='2021-01-31', depreciation_value=1015.0, remaining_value=39585.0, depreciated_value=18415.0, state='posted'),
+            self._get_depreciation_move_values(date='2021-02-28', depreciation_value=1015.0, remaining_value=38570.0, depreciated_value=19430.0, state='posted'),
+            self._get_depreciation_move_values(date='2021-03-31', depreciation_value=1015.0, remaining_value=37555.0, depreciated_value=20445.0, state='posted'),
+            self._get_depreciation_move_values(date='2021-04-30', depreciation_value=1015.0, remaining_value=36540.0, depreciated_value=21460.0, state='posted'),
+            self._get_depreciation_move_values(date='2021-05-31', depreciation_value=1015.0, remaining_value=35525.0, depreciated_value=22475.0, state='posted'),
+            self._get_depreciation_move_values(date='2021-06-30', depreciation_value=1015.0, remaining_value=34510.0, depreciated_value=23490.0, state='posted'),
+            self._get_depreciation_move_values(date='2021-07-31', depreciation_value=1015.0, remaining_value=33495.0, depreciated_value=24505.0, state='posted'),
+            self._get_depreciation_move_values(date='2021-08-31', depreciation_value=1015.0, remaining_value=32480.0, depreciated_value=25520.0, state='posted'),
+            self._get_depreciation_move_values(date='2021-09-30', depreciation_value=1015.0, remaining_value=31465.0, depreciated_value=26535.0, state='posted'),
+            self._get_depreciation_move_values(date='2021-10-31', depreciation_value=1015.0, remaining_value=30450.0, depreciated_value=27550.0, state='posted'),
+            self._get_depreciation_move_values(date='2021-11-30', depreciation_value=1015.0, remaining_value=29435.0, depreciated_value=28565.0, state='posted'),
+            self._get_depreciation_move_values(date='2021-12-31', depreciation_value=1015.0, remaining_value=28420.0, depreciated_value=29580.0, state='posted'),
+            # 2022
+            self._get_depreciation_move_values(date='2022-01-31', depreciation_value=789.44, remaining_value=27630.56, depreciated_value=30369.44, state='posted'),
+            self._get_depreciation_move_values(date='2022-02-28', depreciation_value=789.45, remaining_value=26841.11, depreciated_value=31158.89, state='posted'),
+            self._get_depreciation_move_values(date='2022-03-31', depreciation_value=789.44, remaining_value=26051.67, depreciated_value=31948.33, state='posted'),
+            self._get_depreciation_move_values(date='2022-04-30', depreciation_value=789.45, remaining_value=25262.22, depreciated_value=32737.78, state='posted'),
+            self._get_depreciation_move_values(date='2022-05-31', depreciation_value=789.44, remaining_value=24472.78, depreciated_value=33527.22, state='posted'),
+            self._get_depreciation_move_values(date='2022-06-30', depreciation_value=789.45, remaining_value=23683.33, depreciated_value=34316.67, state='posted'),
+            self._get_depreciation_move_values(date='2022-07-31', depreciation_value=789.44, remaining_value=22893.89, depreciated_value=35106.11, state='draft'),
+            self._get_depreciation_move_values(date='2022-08-31', depreciation_value=789.45, remaining_value=22104.44, depreciated_value=35895.56, state='draft'),
+            self._get_depreciation_move_values(date='2022-09-30', depreciation_value=789.44, remaining_value=21315.0, depreciated_value=36685.0, state='draft'),
+            self._get_depreciation_move_values(date='2022-10-31', depreciation_value=789.44, remaining_value=20525.56, depreciated_value=37474.44, state='draft'),
+            self._get_depreciation_move_values(date='2022-11-30', depreciation_value=789.45, remaining_value=19736.11, depreciated_value=38263.89, state='draft'),
+            self._get_depreciation_move_values(date='2022-12-31', depreciation_value=789.44, remaining_value=18946.67, depreciated_value=39053.33, state='draft'),
+            # 2023
+            self._get_depreciation_move_values(date='2023-01-31', depreciation_value=789.44, remaining_value=18157.23, depreciated_value=39842.77, state='draft'),
+            self._get_depreciation_move_values(date='2023-02-28', depreciation_value=789.45, remaining_value=17367.78, depreciated_value=40632.22, state='draft'),
+            self._get_depreciation_move_values(date='2023-03-31', depreciation_value=789.44, remaining_value=16578.34, depreciated_value=41421.66, state='draft'),
+            self._get_depreciation_move_values(date='2023-04-30', depreciation_value=789.45, remaining_value=15788.89, depreciated_value=42211.11, state='draft'),
+            self._get_depreciation_move_values(date='2023-05-31', depreciation_value=789.44, remaining_value=14999.45, depreciated_value=43000.55, state='draft'),
+            self._get_depreciation_move_values(date='2023-06-30', depreciation_value=789.45, remaining_value=14210.0, depreciated_value=43790.0, state='draft'),
+            self._get_depreciation_move_values(date='2023-07-31', depreciation_value=789.44, remaining_value=13420.56, depreciated_value=44579.44, state='draft'),
+            self._get_depreciation_move_values(date='2023-08-31', depreciation_value=789.45, remaining_value=12631.11, depreciated_value=45368.89, state='draft'),
+            self._get_depreciation_move_values(date='2023-09-30', depreciation_value=789.44, remaining_value=11841.67, depreciated_value=46158.33, state='draft'),
+            self._get_depreciation_move_values(date='2023-10-31', depreciation_value=789.45, remaining_value=11052.22, depreciated_value=46947.78, state='draft'),
+            self._get_depreciation_move_values(date='2023-11-30', depreciation_value=789.44, remaining_value=10262.78, depreciated_value=47737.22, state='draft'),
+            self._get_depreciation_move_values(date='2023-12-31', depreciation_value=789.45, remaining_value=9473.33, depreciated_value=48526.67, state='draft'),
+            # 2024
+            self._get_depreciation_move_values(date='2024-01-31', depreciation_value=789.44, remaining_value=8683.89, depreciated_value=49316.11, state='draft'),
+            self._get_depreciation_move_values(date='2024-02-29', depreciation_value=789.45, remaining_value=7894.44, depreciated_value=50105.56, state='draft'),
+            self._get_depreciation_move_values(date='2024-03-31', depreciation_value=789.44, remaining_value=7105.0, depreciated_value=50895.0, state='draft'),
+            self._get_depreciation_move_values(date='2024-04-30', depreciation_value=789.45, remaining_value=6315.55, depreciated_value=51684.45, state='draft'),
+            self._get_depreciation_move_values(date='2024-05-31', depreciation_value=789.44, remaining_value=5526.11, depreciated_value=52473.89, state='draft'),
+            self._get_depreciation_move_values(date='2024-06-30', depreciation_value=789.45, remaining_value=4736.66, depreciated_value=53263.34, state='draft'),
+            self._get_depreciation_move_values(date='2024-07-31', depreciation_value=789.44, remaining_value=3947.22, depreciated_value=54052.78, state='draft'),
+            self._get_depreciation_move_values(date='2024-08-31', depreciation_value=789.44, remaining_value=3157.78, depreciated_value=54842.22, state='draft'),
+            self._get_depreciation_move_values(date='2024-09-30', depreciation_value=789.45, remaining_value=2368.33, depreciated_value=55631.67, state='draft'),
+            self._get_depreciation_move_values(date='2024-10-31', depreciation_value=789.44, remaining_value=1578.89, depreciated_value=56421.11, state='draft'),
+            self._get_depreciation_move_values(date='2024-11-30', depreciation_value=789.45, remaining_value=789.44, depreciated_value=57210.56, state='draft'),
+            self._get_depreciation_move_values(date='2024-12-31', depreciation_value=789.44, remaining_value=0.0, depreciated_value=58000.0, state='draft'),
+        ])
+
+    def test_degressive_5_years_from_beggining_of_year(self):
+        asset = self.create_asset(
+            value=100000,
+            periodicity='yearly',
+            periods=5,
+            method='degressive',
+            method_progress_factor=0.35,
+            acquisition_date='2022-01-01',
+            prorata_computation_type='constant_periods'
+        )
+        asset.compute_depreciation_board()
+        self.assertEqual(asset.state, 'draft')
+        self.assertEqual(asset.book_value, 100000)
+        self.assertRecordValues(asset.depreciation_move_ids, [
+            self._get_depreciation_move_values(date='2022-12-31', depreciation_value=35000.00, remaining_value=65000.00, depreciated_value=35000.00, state='draft'),
+            self._get_depreciation_move_values(date='2023-12-31', depreciation_value=22750.00, remaining_value=42250.00, depreciated_value=57750.00, state='draft'),
+            self._get_depreciation_move_values(date='2024-12-31', depreciation_value=14787.50, remaining_value=27462.50, depreciated_value=72537.50, state='draft'),
+            self._get_depreciation_move_values(date='2025-12-31', depreciation_value=13731.25, remaining_value=13731.25, depreciated_value=86268.75, state='draft'),
+            self._get_depreciation_move_values(date='2026-12-31', depreciation_value=13731.25, remaining_value=0.00, depreciated_value=100000.00, state='draft'),
+        ])
+
+    def test_degressive_5_years_from_middle_of_year(self):
+        asset = self.create_asset(
+            value=100000,
+            periodicity='yearly',
+            periods=5,
+            method='degressive',
+            method_progress_factor=0.35,
+            acquisition_date='2022-07-01',
+            prorata_computation_type='constant_periods'
+        )
+        asset.compute_depreciation_board()
+        self.assertEqual(asset.state, 'draft')
+        self.assertEqual(asset.book_value, 100000)
+        self.assertRecordValues(asset.depreciation_move_ids, [
+            self._get_depreciation_move_values(date='2022-12-31', depreciation_value=17500.00, remaining_value=82500.00, depreciated_value=17500.00, state='draft'),
+            self._get_depreciation_move_values(date='2023-12-31', depreciation_value=28875.00, remaining_value=53625.00, depreciated_value=46375.00, state='draft'),
+            self._get_depreciation_move_values(date='2024-12-31', depreciation_value=18768.75, remaining_value=34856.25, depreciated_value=65143.75, state='draft'),
+            self._get_depreciation_move_values(date='2025-12-31', depreciation_value=13942.50, remaining_value=20913.75, depreciated_value=79086.25, state='draft'),
+            self._get_depreciation_move_values(date='2026-12-31', depreciation_value=13942.50, remaining_value=6971.25, depreciated_value=93028.75, state='draft'),
+            self._get_depreciation_move_values(date='2027-12-31', depreciation_value=6971.25, remaining_value=0.00, depreciated_value=100000.00, state='draft'),
+        ])
+
+    def test_compute_board_in_mass(self):
+        book = self.create_asset(value=35, periodicity="monthly", periods=2, method="linear", salvage_value=0)
+        shelf = self.create_asset(value=250, periodicity="monthly", periods=8, method="linear", salvage_value=0)
+        screw = self.create_asset(value=1, periodicity="monthly", periods=1, method="linear", salvage_value=0)
+
+        (book + screw).validate()
+        (book + shelf + screw).compute_depreciation_board()
+
+        self.assertRecordValues(book.depreciation_move_ids, [
+            self._get_depreciation_move_values(date='2020-01-31', depreciation_value=17.5, remaining_value=17.5, depreciated_value=17.5, state='posted'),
+            self._get_depreciation_move_values(date='2020-02-29', depreciation_value=17.5, remaining_value=0, depreciated_value=35, state='posted'),
+        ])
+
+        self.assertRecordValues(shelf.depreciation_move_ids, [
+            self._get_depreciation_move_values(date='2020-01-31', depreciation_value=31.25, remaining_value=218.75, depreciated_value=31.25, state='draft'),
+            self._get_depreciation_move_values(date='2020-02-29', depreciation_value=31.25, remaining_value=187.5, depreciated_value=62.5, state='draft'),
+            self._get_depreciation_move_values(date='2020-03-31', depreciation_value=31.25, remaining_value=156.25, depreciated_value=93.75, state='draft'),
+            self._get_depreciation_move_values(date='2020-04-30', depreciation_value=31.25, remaining_value=125, depreciated_value=125, state='draft'),
+            self._get_depreciation_move_values(date='2020-05-31', depreciation_value=31.25, remaining_value=93.75, depreciated_value=156.25, state='draft'),
+            self._get_depreciation_move_values(date='2020-06-30', depreciation_value=31.25, remaining_value=62.5, depreciated_value=187.5, state='draft'),
+            self._get_depreciation_move_values(date='2020-07-31', depreciation_value=31.25, remaining_value=31.25, depreciated_value=218.75, state='draft'),
+            self._get_depreciation_move_values(date='2020-08-31', depreciation_value=31.25, remaining_value=0, depreciated_value=250, state='draft'),
+        ])
+
+        self.assertRecordValues(screw.depreciation_move_ids, [
+            self._get_depreciation_move_values(date='2020-01-31', depreciation_value=1, remaining_value=0, depreciated_value=1, state='posted'),
+        ])
+    def test_copy_prorata_date(self):
+        """ Verifies that prorata date and acquisition date are copied when duplicate an asset
+            For this test, the prorata computation type is set to None.
+            The idea is of this test is to verify that we do copy prorata date.
+        """
+        old_car_asset = self.create_asset(
+            value=60000,
+            periodicity='yearly',
+            periods=5,
+            method='linear',
+            salvage_value=0,
+
+        )
+        old_car_asset.validate()
+
+        self.assertEqual(old_car_asset.state, 'open')
+        self.assertEqual(old_car_asset.book_value, 36000)
+        self.assertEqual(old_car_asset.acquisition_date, fields.Date.from_string('2020-02-01'))
+        self.assertEqual(old_car_asset.prorata_date, fields.Date.from_string('2020-01-01'))
+        self.assertRecordValues(old_car_asset.depreciation_move_ids, [
+            self._get_depreciation_move_values(date='2020-12-31', depreciation_value=12000, remaining_value=48000, depreciated_value=12000, state='posted'),
+            self._get_depreciation_move_values(date='2021-12-31', depreciation_value=12000, remaining_value=36000, depreciated_value=24000, state='posted'),
+            self._get_depreciation_move_values(date='2022-12-31', depreciation_value=12000, remaining_value=24000, depreciated_value=36000, state='draft'),
+            self._get_depreciation_move_values(date='2023-12-31', depreciation_value=12000, remaining_value=12000, depreciated_value=48000, state='draft'),
+            self._get_depreciation_move_values(date='2024-12-31', depreciation_value=12000, remaining_value=0, depreciated_value=60000, state='draft'),
+        ])
+
+        new_car_asset = old_car_asset.copy()
+        new_car_asset.original_value = 60000
+        new_car_asset.validate()
+
+        self.assertEqual(new_car_asset.state, 'open')
+        self.assertEqual(new_car_asset.book_value, 36000)
+        self.assertEqual(new_car_asset.acquisition_date, fields.Date.from_string('2020-02-01'))
+        self.assertEqual(new_car_asset.prorata_date, fields.Date.from_string('2020-01-01'))
+        self.assertRecordValues(new_car_asset.depreciation_move_ids, [
+            self._get_depreciation_move_values(date='2020-12-31', depreciation_value=12000, remaining_value=48000, depreciated_value=12000, state='posted'),
+            self._get_depreciation_move_values(date='2021-12-31', depreciation_value=12000, remaining_value=36000, depreciated_value=24000, state='posted'),
+            self._get_depreciation_move_values(date='2022-12-31', depreciation_value=12000, remaining_value=24000, depreciated_value=36000, state='draft'),
+            self._get_depreciation_move_values(date='2023-12-31', depreciation_value=12000, remaining_value=12000, depreciated_value=48000, state='draft'),
+            self._get_depreciation_move_values(date='2024-12-31', depreciation_value=12000, remaining_value=0, depreciated_value=60000, state='draft'),
+        ])
+
+    def test_change_computation_method_before_lock_date(self):
+        """Test that we can change the computation method when there are draft moves before the lock date.
+        """
+        self.car.company_id.fiscalyear_lock_date = '2022-06-30'
+        self.car.compute_depreciation_board()
+
+        self.assertEqual(self.car.state, 'draft')
+        self.assertEqual(self.car.book_value, 60000)
+        self.assertRecordValues(self.car.depreciation_move_ids, [
+            self._get_depreciation_move_values(date='2020-12-31', depreciation_value=12000, remaining_value=48000, depreciated_value=12000, state='draft'),
+            self._get_depreciation_move_values(date='2021-12-31', depreciation_value=12000, remaining_value=36000, depreciated_value=24000, state='draft'),
+            self._get_depreciation_move_values(date='2022-12-31', depreciation_value=12000, remaining_value=24000, depreciated_value=36000, state='draft'),
+            self._get_depreciation_move_values(date='2023-12-31', depreciation_value=12000, remaining_value=12000, depreciated_value=48000, state='draft'),
+            self._get_depreciation_move_values(date='2024-12-31', depreciation_value=12000, remaining_value=0, depreciated_value=60000, state='draft'),
+        ])
+
+        # Change the computation type
+        self.car.prorata_computation_type = 'constant_periods'
+        self.car.prorata_date = '2021-01-01'
+        self.car.compute_depreciation_board()
+
+        self.assertEqual(self.car.state, 'draft')
+        self.assertEqual(self.car.book_value, 60000)
+        self.assertRecordValues(self.car.depreciation_move_ids.sorted(lambda m: (m.date, m.id)), [
+            self._get_depreciation_move_values(date='2021-12-31', depreciation_value=12000, remaining_value=48000, depreciated_value=12000, state='draft'),
+            self._get_depreciation_move_values(date='2022-12-31', depreciation_value=12000, remaining_value=36000, depreciated_value=24000, state='draft'),
+            self._get_depreciation_move_values(date='2023-12-31', depreciation_value=12000, remaining_value=24000, depreciated_value=36000, state='draft'),
+            self._get_depreciation_move_values(date='2024-12-31', depreciation_value=12000, remaining_value=12000, depreciated_value=48000, state='draft'),
+            self._get_depreciation_move_values(date='2025-12-31', depreciation_value=12000, remaining_value=0, depreciated_value=60000, state='draft'),
+        ])
+
+    def test_post_moves_after_lock_date(self):
+        """Test that we can change the computation method when there are draft moves before the lock date.
+        """
+        self.car.company_id.fiscalyear_lock_date = '2021-06-30'
+        self.car.compute_depreciation_board()
+
+        self.assertEqual(self.car.state, 'draft')
+        self.assertEqual(self.car.book_value, 60000)
+        self.assertRecordValues(self.car.depreciation_move_ids, [
+            self._get_depreciation_move_values(date='2020-12-31', depreciation_value=12000, remaining_value=48000, depreciated_value=12000, state='draft'),
+            self._get_depreciation_move_values(date='2021-12-31', depreciation_value=12000, remaining_value=36000, depreciated_value=24000, state='draft'),
+            self._get_depreciation_move_values(date='2022-12-31', depreciation_value=12000, remaining_value=24000, depreciated_value=36000, state='draft'),
+            self._get_depreciation_move_values(date='2023-12-31', depreciation_value=12000, remaining_value=12000, depreciated_value=48000, state='draft'),
+            self._get_depreciation_move_values(date='2024-12-31', depreciation_value=12000, remaining_value=0, depreciated_value=60000, state='draft'),
+        ])
+
+        self.car.validate()
+
+        self.assertEqual(self.car.state, 'open')
+        self.assertEqual(self.car.book_value, 36000)
+        self.assertRecordValues(self.car.depreciation_move_ids, [
+            self._get_depreciation_move_values(date='2021-07-31', depreciation_value=12000, remaining_value=48000, depreciated_value=12000, state='posted'),
+            self._get_depreciation_move_values(date='2021-12-31', depreciation_value=12000, remaining_value=36000, depreciated_value=24000, state='posted'),
+            self._get_depreciation_move_values(date='2022-12-31', depreciation_value=12000, remaining_value=24000, depreciated_value=36000, state='draft'),
+            self._get_depreciation_move_values(date='2023-12-31', depreciation_value=12000, remaining_value=12000, depreciated_value=48000, state='draft'),
+            self._get_depreciation_move_values(date='2024-12-31', depreciation_value=12000, remaining_value=0, depreciated_value=60000, state='draft'),
+        ])
+
+    def test_assets_one_complete_period(self):
+        """Test the depreciation move value in case of having just one complete period (year or month) asset."""
+        datas = [
+            ('monthly', '2022-01-31', 'linear'),
+            ('monthly', '2022-01-31', 'degressive'),
+            ('monthly', '2022-01-31', 'degressive_then_linear'),
+            ('yearly', '2022-12-31', 'linear'),
+            ('yearly', '2022-12-31', 'degressive'),
+            ('yearly', '2022-12-31', 'degressive_then_linear'),
+        ]
+        for periodicity, end_depreciation_date, method in datas:
+            with self.subTest(period=periodicity, method=method, end_depreciation_date=end_depreciation_date):
+                asset = self.create_asset(
+                    value=1000,
+                    periodicity=periodicity,
+                    periods=1,
+                    method=method,
+                    acquisition_date='2022-01-01',
+                    prorata_date='2022-01-01',
+                    prorata_computation_type='constant_periods',
+                    account_depreciation_id=self.company_data['default_account_assets'].id,
+                )
+
+                asset.compute_depreciation_board()
+                self.assertEqual(asset.state, 'draft')
+                self.assertRecordValues(asset.depreciation_move_ids, [
+                    self._get_depreciation_move_values(date=end_depreciation_date, depreciation_value=1000.0, remaining_value=0.0, depreciated_value=1000.0, state='draft'),
+                ])
+                asset.validate()
+                self.assertEqual(asset.state, 'open')
diff --git a/dev_odex30_accounting/odex30_account_asset/tests/test_reevaluation_asset.py b/dev_odex30_accounting/odex30_account_asset/tests/test_reevaluation_asset.py
new file mode 100644
index 0000000..330dd77
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_asset/tests/test_reevaluation_asset.py
@@ -0,0 +1,1662 @@
+from unittest.mock import patch
+from odoo.tests.common import tagged, freeze_time
+from odoo.addons.odex30_account_asset.tests.common import TestAccountAssetCommon
+from odoo import fields
+
+
+@freeze_time('2022-06-30')
+@tagged('post_install', '-at_install')
+class TestAccountAssetReevaluation(TestAccountAssetCommon):
+
+    @classmethod
+    def setUpClass(cls):
+        super().setUpClass()
+        cls.account_depreciation_expense = cls.company_data['default_account_assets'].copy()
+        cls.asset_counterpart_account_id = cls.company_data['default_account_expense'].copy()
+        cls.degressive_asset = cls.create_asset(
+            value=7200,
+            periodicity="monthly",
+            periods=60,
+            method="degressive",
+            method_progress_factor=0.35,
+            acquisition_date="2020-07-01",
+            prorata_computation_type="constant_periods"
+        )
+        cls.degressive_then_linear_asset = cls.create_asset(
+            value=7200,
+            periodicity="monthly",
+            periods=60,
+            method="degressive_then_linear",
+            method_progress_factor=0.35,
+            acquisition_date="2020-07-01",
+            prorata_computation_type="constant_periods"
+        )
+
+    def test_linear_start_beginning_month_reevaluation_beginning_month(self):
+        asset = self.create_asset(value=7200, periodicity="monthly", periods=12, method="linear", acquisition_date="2022-02-01", prorata_computation_type="constant_periods")
+        asset.validate()
+
+        self.env['asset.modify'].create({
+            'asset_id': asset.id,
+            'name': 'Test reason',
+            'date':  fields.Date.to_date("2022-06-01"),
+        }).modify()
+
+        self.assertRecordValues(asset.depreciation_move_ids.sorted(lambda mv: (mv.date, mv.id)), [
+            self._get_depreciation_move_values(date='2022-02-28', depreciation_value=600, remaining_value=6600, depreciated_value=600, state='posted'),
+            self._get_depreciation_move_values(date='2022-03-31', depreciation_value=600, remaining_value=6000, depreciated_value=1200, state='posted'),
+            self._get_depreciation_move_values(date='2022-04-30', depreciation_value=600, remaining_value=5400, depreciated_value=1800, state='posted'),
+            self._get_depreciation_move_values(date='2022-05-31', depreciation_value=600, remaining_value=4800, depreciated_value=2400, state='posted'),
+            # 20 because we have 1 * 600 / 30 (1 day of a month of 30 days, with 600 per month)
+            self._get_depreciation_move_values(date='2022-06-01', depreciation_value=20, remaining_value=4780, depreciated_value=2420, state='posted'),
+            self._get_depreciation_move_values(date='2022-06-30', depreciation_value=580, remaining_value=4200, depreciated_value=3000, state='posted'),
+            self._get_depreciation_move_values(date='2022-07-31', depreciation_value=600, remaining_value=3600, depreciated_value=3600, state='draft'),
+            self._get_depreciation_move_values(date='2022-08-31', depreciation_value=600, remaining_value=3000, depreciated_value=4200, state='draft'),
+            self._get_depreciation_move_values(date='2022-09-30', depreciation_value=600, remaining_value=2400, depreciated_value=4800, state='draft'),
+            self._get_depreciation_move_values(date='2022-10-31', depreciation_value=600, remaining_value=1800, depreciated_value=5400, state='draft'),
+            self._get_depreciation_move_values(date='2022-11-30', depreciation_value=600, remaining_value=1200, depreciated_value=6000, state='draft'),
+            self._get_depreciation_move_values(date='2022-12-31', depreciation_value=600, remaining_value=600, depreciated_value=6600, state='draft'),
+            self._get_depreciation_move_values(date='2023-01-31', depreciation_value=600, remaining_value=0, depreciated_value=7200, state='draft'),
+        ])
+
+    def test_linear_start_beginning_month_reevaluation_middle_month(self):
+        asset = self.create_asset(value=7200, periodicity="monthly", periods=12, method="linear", acquisition_date="2022-02-01", prorata_computation_type="constant_periods")
+        asset.validate()
+
+        self.env['asset.modify'].create({
+            'asset_id': asset.id,
+            'name': 'Test reason',
+            'date':  fields.Date.to_date("2022-06-15")
+        }).modify()
+
+        self.assertRecordValues(asset.depreciation_move_ids.sorted(lambda mv: (mv.date, mv.id)), [
+            self._get_depreciation_move_values(date='2022-02-28', depreciation_value=600, remaining_value=6600, depreciated_value=600, state='posted'),
+            self._get_depreciation_move_values(date='2022-03-31', depreciation_value=600, remaining_value=6000, depreciated_value=1200, state='posted'),
+            self._get_depreciation_move_values(date='2022-04-30', depreciation_value=600, remaining_value=5400, depreciated_value=1800, state='posted'),
+            self._get_depreciation_move_values(date='2022-05-31', depreciation_value=600, remaining_value=4800, depreciated_value=2400, state='posted'),
+            # 300 because we have 15 * 600 / 30 (15 days of a month of 30 days, with 600 per month)
+            self._get_depreciation_move_values(date='2022-06-15', depreciation_value=300, remaining_value=4500, depreciated_value=2700, state='posted'),
+            self._get_depreciation_move_values(date='2022-06-30', depreciation_value=300, remaining_value=4200, depreciated_value=3000, state='posted'),
+            self._get_depreciation_move_values(date='2022-07-31', depreciation_value=600, remaining_value=3600, depreciated_value=3600, state='draft'),
+            self._get_depreciation_move_values(date='2022-08-31', depreciation_value=600, remaining_value=3000, depreciated_value=4200, state='draft'),
+            self._get_depreciation_move_values(date='2022-09-30', depreciation_value=600, remaining_value=2400, depreciated_value=4800, state='draft'),
+            self._get_depreciation_move_values(date='2022-10-31', depreciation_value=600, remaining_value=1800, depreciated_value=5400, state='draft'),
+            self._get_depreciation_move_values(date='2022-11-30', depreciation_value=600, remaining_value=1200, depreciated_value=6000, state='draft'),
+            self._get_depreciation_move_values(date='2022-12-31', depreciation_value=600, remaining_value=600, depreciated_value=6600, state='draft'),
+            self._get_depreciation_move_values(date='2023-01-31', depreciation_value=600, remaining_value=0, depreciated_value=7200, state='draft'),
+        ])
+
+    def test_linear_start_beginning_month_reevaluation_end_month(self):
+        asset = self.create_asset(value=7200, periodicity="monthly", periods=12, method="linear", acquisition_date="2022-02-01", prorata_computation_type="constant_periods")
+        asset.validate()
+
+        self.env['asset.modify'].create({
+            'asset_id': asset.id,
+            'name': 'Test reason',
+            'date':  fields.Date.to_date("2022-06-30")
+        }).modify()
+
+        self.assertRecordValues(asset.depreciation_move_ids.sorted(lambda mv: (mv.date, mv.id)), [
+            self._get_depreciation_move_values(date='2022-02-28', depreciation_value=600, remaining_value=6600, depreciated_value=600, state='posted'),
+            self._get_depreciation_move_values(date='2022-03-31', depreciation_value=600, remaining_value=6000, depreciated_value=1200, state='posted'),
+            self._get_depreciation_move_values(date='2022-04-30', depreciation_value=600, remaining_value=5400, depreciated_value=1800, state='posted'),
+            self._get_depreciation_move_values(date='2022-05-31', depreciation_value=600, remaining_value=4800, depreciated_value=2400, state='posted'),
+            self._get_depreciation_move_values(date='2022-06-30', depreciation_value=600, remaining_value=4200, depreciated_value=3000, state='posted'),
+            self._get_depreciation_move_values(date='2022-07-31', depreciation_value=600, remaining_value=3600, depreciated_value=3600, state='draft'),
+            self._get_depreciation_move_values(date='2022-08-31', depreciation_value=600, remaining_value=3000, depreciated_value=4200, state='draft'),
+            self._get_depreciation_move_values(date='2022-09-30', depreciation_value=600, remaining_value=2400, depreciated_value=4800, state='draft'),
+            self._get_depreciation_move_values(date='2022-10-31', depreciation_value=600, remaining_value=1800, depreciated_value=5400, state='draft'),
+            self._get_depreciation_move_values(date='2022-11-30', depreciation_value=600, remaining_value=1200, depreciated_value=6000, state='draft'),
+            self._get_depreciation_move_values(date='2022-12-31', depreciation_value=600, remaining_value=600, depreciated_value=6600, state='draft'),
+            self._get_depreciation_move_values(date='2023-01-31', depreciation_value=600, remaining_value=0, depreciated_value=7200, state='draft'),
+        ])
+
+    def test_linear_start_middle_month_reevaluation_beginning_month(self):
+        asset = self.create_asset(value=7200, periodicity="monthly", periods=12, method="linear", acquisition_date="2022-02-15", prorata_computation_type="constant_periods")
+        asset.validate()
+
+        self.env['asset.modify'].create({
+            'asset_id': asset.id,
+            'name': 'Test reason',
+            'date':  fields.Date.to_date("2022-06-01"),
+        }).modify()
+
+        self.assertRecordValues(asset.depreciation_move_ids.sorted(lambda mv: (mv.date, mv.id)), [
+            self._get_depreciation_move_values(date='2022-02-28', depreciation_value=300, remaining_value=6900, depreciated_value=300, state='posted'),
+            self._get_depreciation_move_values(date='2022-03-31', depreciation_value=600, remaining_value=6300, depreciated_value=900, state='posted'),
+            self._get_depreciation_move_values(date='2022-04-30', depreciation_value=600, remaining_value=5700, depreciated_value=1500, state='posted'),
+            self._get_depreciation_move_values(date='2022-05-31', depreciation_value=600, remaining_value=5100, depreciated_value=2100, state='posted'),
+            # 20 because we have 1 * 600 / 30 (1 day of a month of 30 days, with 600 per month)
+            self._get_depreciation_move_values(date='2022-06-01', depreciation_value=20, remaining_value=5080, depreciated_value=2120, state='posted'),
+            self._get_depreciation_move_values(date='2022-06-30', depreciation_value=580, remaining_value=4500, depreciated_value=2700, state='posted'),
+            self._get_depreciation_move_values(date='2022-07-31', depreciation_value=600, remaining_value=3900, depreciated_value=3300, state='draft'),
+            self._get_depreciation_move_values(date='2022-08-31', depreciation_value=600, remaining_value=3300, depreciated_value=3900, state='draft'),
+            self._get_depreciation_move_values(date='2022-09-30', depreciation_value=600, remaining_value=2700, depreciated_value=4500, state='draft'),
+            self._get_depreciation_move_values(date='2022-10-31', depreciation_value=600, remaining_value=2100, depreciated_value=5100, state='draft'),
+            self._get_depreciation_move_values(date='2022-11-30', depreciation_value=600, remaining_value=1500, depreciated_value=5700, state='draft'),
+            self._get_depreciation_move_values(date='2022-12-31', depreciation_value=600, remaining_value=900, depreciated_value=6300, state='draft'),
+            self._get_depreciation_move_values(date='2023-01-31', depreciation_value=600, remaining_value=300, depreciated_value=6900, state='draft'),
+            self._get_depreciation_move_values(date='2023-02-28', depreciation_value=300, remaining_value=0, depreciated_value=7200, state='draft'),
+        ])
+
+    def test_linear_start_middle_month_reevaluation_middle_month(self):
+        asset = self.create_asset(value=7200, periodicity="monthly", periods=12, method="linear", acquisition_date="2022-02-15", prorata_computation_type="constant_periods")
+        asset.validate()
+
+        self.env['asset.modify'].create({
+            'asset_id': asset.id,
+            'name': 'Test reason',
+            'date':  fields.Date.to_date("2022-06-15"),
+        }).modify()
+
+        self.assertRecordValues(asset.depreciation_move_ids.sorted(lambda mv: (mv.date, mv.id)), [
+            self._get_depreciation_move_values(date='2022-02-28', depreciation_value=300, remaining_value=6900, depreciated_value=300, state='posted'),
+            self._get_depreciation_move_values(date='2022-03-31', depreciation_value=600, remaining_value=6300, depreciated_value=900, state='posted'),
+            self._get_depreciation_move_values(date='2022-04-30', depreciation_value=600, remaining_value=5700, depreciated_value=1500, state='posted'),
+            self._get_depreciation_move_values(date='2022-05-31', depreciation_value=600, remaining_value=5100, depreciated_value=2100, state='posted'),
+            # 300 because we have 15 * 600 / 30 (15 days of a month of 30 days, with 600 per month)
+            self._get_depreciation_move_values(date='2022-06-15', depreciation_value=300, remaining_value=4800, depreciated_value=2400, state='posted'),
+            self._get_depreciation_move_values(date='2022-06-30', depreciation_value=300, remaining_value=4500, depreciated_value=2700, state='posted'),
+            self._get_depreciation_move_values(date='2022-07-31', depreciation_value=600, remaining_value=3900, depreciated_value=3300, state='draft'),
+            self._get_depreciation_move_values(date='2022-08-31', depreciation_value=600, remaining_value=3300, depreciated_value=3900, state='draft'),
+            self._get_depreciation_move_values(date='2022-09-30', depreciation_value=600, remaining_value=2700, depreciated_value=4500, state='draft'),
+            self._get_depreciation_move_values(date='2022-10-31', depreciation_value=600, remaining_value=2100, depreciated_value=5100, state='draft'),
+            self._get_depreciation_move_values(date='2022-11-30', depreciation_value=600, remaining_value=1500, depreciated_value=5700, state='draft'),
+            self._get_depreciation_move_values(date='2022-12-31', depreciation_value=600, remaining_value=900, depreciated_value=6300, state='draft'),
+            self._get_depreciation_move_values(date='2023-01-31', depreciation_value=600, remaining_value=300, depreciated_value=6900, state='draft'),
+            self._get_depreciation_move_values(date='2023-02-28', depreciation_value=300, remaining_value=0, depreciated_value=7200, state='draft'),
+        ])
+
+    def test_linear_start_middle_month_reevaluation_end_month(self):
+        asset = self.create_asset(value=7200, periodicity="monthly", periods=12, method="linear", acquisition_date="2022-02-15", prorata_computation_type="constant_periods")
+        asset.validate()
+
+        self.env['asset.modify'].create({
+            'asset_id': asset.id,
+            'name': 'Test reason',
+            'date':  fields.Date.to_date("2022-06-30"),
+        }).modify()
+
+        self.assertRecordValues(asset.depreciation_move_ids.sorted(lambda mv: (mv.date, mv.id)), [
+            self._get_depreciation_move_values(date='2022-02-28', depreciation_value=300, remaining_value=6900, depreciated_value=300, state='posted'),
+            self._get_depreciation_move_values(date='2022-03-31', depreciation_value=600, remaining_value=6300, depreciated_value=900, state='posted'),
+            self._get_depreciation_move_values(date='2022-04-30', depreciation_value=600, remaining_value=5700, depreciated_value=1500, state='posted'),
+            self._get_depreciation_move_values(date='2022-05-31', depreciation_value=600, remaining_value=5100, depreciated_value=2100, state='posted'),
+            self._get_depreciation_move_values(date='2022-06-30', depreciation_value=600, remaining_value=4500, depreciated_value=2700, state='posted'),
+            self._get_depreciation_move_values(date='2022-07-31', depreciation_value=600, remaining_value=3900, depreciated_value=3300, state='draft'),
+            self._get_depreciation_move_values(date='2022-08-31', depreciation_value=600, remaining_value=3300, depreciated_value=3900, state='draft'),
+            self._get_depreciation_move_values(date='2022-09-30', depreciation_value=600, remaining_value=2700, depreciated_value=4500, state='draft'),
+            self._get_depreciation_move_values(date='2022-10-31', depreciation_value=600, remaining_value=2100, depreciated_value=5100, state='draft'),
+            self._get_depreciation_move_values(date='2022-11-30', depreciation_value=600, remaining_value=1500, depreciated_value=5700, state='draft'),
+            self._get_depreciation_move_values(date='2022-12-31', depreciation_value=600, remaining_value=900, depreciated_value=6300, state='draft'),
+            self._get_depreciation_move_values(date='2023-01-31', depreciation_value=600, remaining_value=300, depreciated_value=6900, state='draft'),
+            self._get_depreciation_move_values(date='2023-02-28', depreciation_value=300, remaining_value=0, depreciated_value=7200, state='draft'),
+        ])
+
+    def test_linear_start_end_month_reevaluation_beginning_month(self):
+        asset = self.create_asset(value=7200, periodicity="monthly", periods=12, method="linear", acquisition_date="2022-02-28", prorata_computation_type="constant_periods")
+        asset.validate()
+
+        self.env['asset.modify'].create({
+            'asset_id': asset.id,
+            'name': 'Test reason',
+            'date':  fields.Date.to_date("2022-06-01"),
+        }).modify()
+
+        self.assertRecordValues(asset.depreciation_move_ids.sorted(lambda mv: (mv.date, mv.id)), [
+            self._get_depreciation_move_values(date='2022-02-28', depreciation_value=21.43, remaining_value=7178.57, depreciated_value=21.43, state='posted'),
+            self._get_depreciation_move_values(date='2022-03-31', depreciation_value=600, remaining_value=6578.57, depreciated_value=621.43, state='posted'),
+            self._get_depreciation_move_values(date='2022-04-30', depreciation_value=600, remaining_value=5978.57, depreciated_value=1221.43, state='posted'),
+            self._get_depreciation_move_values(date='2022-05-31', depreciation_value=600, remaining_value=5378.57, depreciated_value=1821.43, state='posted'),
+            # 20 because we have 1 * 600 / 30 (1 day of a month of 30 days, with 600 per month)
+            self._get_depreciation_move_values(date='2022-06-01', depreciation_value=20, remaining_value=5358.57, depreciated_value=1841.43, state='posted'),
+            self._get_depreciation_move_values(date='2022-06-30', depreciation_value=580, remaining_value=4778.57, depreciated_value=2421.43, state='posted'),
+            self._get_depreciation_move_values(date='2022-07-31', depreciation_value=600, remaining_value=4178.57, depreciated_value=3021.43, state='draft'),
+            self._get_depreciation_move_values(date='2022-08-31', depreciation_value=600, remaining_value=3578.57, depreciated_value=3621.43, state='draft'),
+            self._get_depreciation_move_values(date='2022-09-30', depreciation_value=600, remaining_value=2978.57, depreciated_value=4221.43, state='draft'),
+            self._get_depreciation_move_values(date='2022-10-31', depreciation_value=600, remaining_value=2378.57, depreciated_value=4821.43, state='draft'),
+            self._get_depreciation_move_values(date='2022-11-30', depreciation_value=600, remaining_value=1778.57, depreciated_value=5421.43, state='draft'),
+            self._get_depreciation_move_values(date='2022-12-31', depreciation_value=600, remaining_value=1178.57, depreciated_value=6021.43, state='draft'),
+            self._get_depreciation_move_values(date='2023-01-31', depreciation_value=600, remaining_value=578.57, depreciated_value=6621.43, state='draft'),
+            self._get_depreciation_move_values(date='2023-02-28', depreciation_value=578.57, remaining_value=0, depreciated_value=7200, state='draft'),
+        ])
+
+    def test_linear_start_end_month_reevaluation_middle_month(self):
+        asset = self.create_asset(value=7200, periodicity="monthly", periods=12, method="linear", acquisition_date="2022-02-28", prorata_computation_type="constant_periods")
+        asset.validate()
+
+        self.env['asset.modify'].create({
+            'asset_id': asset.id,
+            'name': 'Test reason',
+            'date':  fields.Date.to_date("2022-06-15"),
+        }).modify()
+
+        self.assertRecordValues(asset.depreciation_move_ids.sorted(lambda mv: (mv.date, mv.id)), [
+            self._get_depreciation_move_values(date='2022-02-28', depreciation_value=21.43, remaining_value=7178.57, depreciated_value=21.43, state='posted'),
+            self._get_depreciation_move_values(date='2022-03-31', depreciation_value=600, remaining_value=6578.57, depreciated_value=621.43, state='posted'),
+            self._get_depreciation_move_values(date='2022-04-30', depreciation_value=600, remaining_value=5978.57, depreciated_value=1221.43, state='posted'),
+            self._get_depreciation_move_values(date='2022-05-31', depreciation_value=600, remaining_value=5378.57, depreciated_value=1821.43, state='posted'),
+            # 300 because we have 15 * 600 / 30 (15 days of a month of 30 days, with 600 per month)
+            self._get_depreciation_move_values(date='2022-06-15', depreciation_value=300, remaining_value=5078.57, depreciated_value=2121.43, state='posted'),
+            self._get_depreciation_move_values(date='2022-06-30', depreciation_value=300, remaining_value=4778.57, depreciated_value=2421.43, state='posted'),
+            self._get_depreciation_move_values(date='2022-07-31', depreciation_value=600, remaining_value=4178.57, depreciated_value=3021.43, state='draft'),
+            self._get_depreciation_move_values(date='2022-08-31', depreciation_value=600, remaining_value=3578.57, depreciated_value=3621.43, state='draft'),
+            self._get_depreciation_move_values(date='2022-09-30', depreciation_value=600, remaining_value=2978.57, depreciated_value=4221.43, state='draft'),
+            self._get_depreciation_move_values(date='2022-10-31', depreciation_value=600, remaining_value=2378.57, depreciated_value=4821.43, state='draft'),
+            self._get_depreciation_move_values(date='2022-11-30', depreciation_value=600, remaining_value=1778.57, depreciated_value=5421.43, state='draft'),
+            self._get_depreciation_move_values(date='2022-12-31', depreciation_value=600, remaining_value=1178.57, depreciated_value=6021.43, state='draft'),
+            self._get_depreciation_move_values(date='2023-01-31', depreciation_value=600, remaining_value=578.57, depreciated_value=6621.43, state='draft'),
+            self._get_depreciation_move_values(date='2023-02-28', depreciation_value=578.57, remaining_value=0, depreciated_value=7200, state='draft'),
+        ])
+
+    def test_linear_start_end_month_reevaluation_end_month(self):
+        asset = self.create_asset(value=7200, periodicity="monthly", periods=12, method="linear", acquisition_date="2022-02-28", prorata_computation_type="constant_periods")
+        asset.validate()
+
+        self.env['asset.modify'].create({
+            'asset_id': asset.id,
+            'name': 'Test reason',
+            'date':  fields.Date.to_date("2022-06-30"),
+        }).modify()
+
+        self.assertRecordValues(asset.depreciation_move_ids.sorted(lambda mv: (mv.date, mv.id)), [
+            self._get_depreciation_move_values(date='2022-02-28', depreciation_value=21.43, remaining_value=7178.57, depreciated_value=21.43, state='posted'),
+            self._get_depreciation_move_values(date='2022-03-31', depreciation_value=600, remaining_value=6578.57, depreciated_value=621.43, state='posted'),
+            self._get_depreciation_move_values(date='2022-04-30', depreciation_value=600, remaining_value=5978.57, depreciated_value=1221.43, state='posted'),
+            self._get_depreciation_move_values(date='2022-05-31', depreciation_value=600, remaining_value=5378.57, depreciated_value=1821.43, state='posted'),
+            self._get_depreciation_move_values(date='2022-06-30', depreciation_value=600, remaining_value=4778.57, depreciated_value=2421.43, state='posted'),
+            self._get_depreciation_move_values(date='2022-07-31', depreciation_value=600, remaining_value=4178.57, depreciated_value=3021.43, state='draft'),
+            self._get_depreciation_move_values(date='2022-08-31', depreciation_value=600, remaining_value=3578.57, depreciated_value=3621.43, state='draft'),
+            self._get_depreciation_move_values(date='2022-09-30', depreciation_value=600, remaining_value=2978.57, depreciated_value=4221.43, state='draft'),
+            self._get_depreciation_move_values(date='2022-10-31', depreciation_value=600, remaining_value=2378.57, depreciated_value=4821.43, state='draft'),
+            self._get_depreciation_move_values(date='2022-11-30', depreciation_value=600, remaining_value=1778.57, depreciated_value=5421.43, state='draft'),
+            self._get_depreciation_move_values(date='2022-12-31', depreciation_value=600, remaining_value=1178.57, depreciated_value=6021.43, state='draft'),
+            self._get_depreciation_move_values(date='2023-01-31', depreciation_value=600, remaining_value=578.57, depreciated_value=6621.43, state='draft'),
+            self._get_depreciation_move_values(date='2023-02-28', depreciation_value=578.57, remaining_value=0, depreciated_value=7200, state='draft'),
+        ])
+
+    def test_linear_reevaluation_simple_decrease(self):
+        asset = self.create_asset(value=10000, periodicity="monthly", periods=12, method="linear", acquisition_date="2022-01-01", prorata_computation_type="constant_periods")
+        asset.validate()
+
+        self.env['asset.modify'].create({
+            'asset_id': asset.id,
+            'name': 'Test reason',
+            'date':  fields.Date.to_date("2022-06-30"),
+            'value_residual': 4000,  # -1000
+        }).modify()
+
+        self.assertRecordValues(asset.depreciation_move_ids.sorted(lambda mv: (mv.date, mv.id)), [
+            self._get_depreciation_move_values(date='2022-01-31', depreciation_value=833.33, remaining_value=9166.67, depreciated_value=833.33, state='posted'),
+            self._get_depreciation_move_values(date='2022-02-28', depreciation_value=833.34, remaining_value=8333.33, depreciated_value=1666.67, state='posted'),
+            self._get_depreciation_move_values(date='2022-03-31', depreciation_value=833.33, remaining_value=7500, depreciated_value=2500, state='posted'),
+            self._get_depreciation_move_values(date='2022-04-30', depreciation_value=833.33, remaining_value=6666.67, depreciated_value=3333.33, state='posted'),
+            self._get_depreciation_move_values(date='2022-05-31', depreciation_value=833.34, remaining_value=5833.33, depreciated_value=4166.67, state='posted'),
+            self._get_depreciation_move_values(date='2022-06-30', depreciation_value=833.33, remaining_value=5000, depreciated_value=5000, state='posted'),
+            # decrease move
+            self._get_depreciation_move_values(date='2022-06-30', depreciation_value=1000, remaining_value=4000, depreciated_value=6000, state='posted'),
+
+            self._get_depreciation_move_values(date='2022-07-31', depreciation_value=666.67, remaining_value=3333.33, depreciated_value=6666.67, state='draft'),
+            self._get_depreciation_move_values(date='2022-08-31', depreciation_value=666.66, remaining_value=2666.67, depreciated_value=7333.33, state='draft'),
+            self._get_depreciation_move_values(date='2022-09-30', depreciation_value=666.67, remaining_value=2000, depreciated_value=8000, state='draft'),
+            self._get_depreciation_move_values(date='2022-10-31', depreciation_value=666.67, remaining_value=1333.33, depreciated_value=8666.67, state='draft'),
+            self._get_depreciation_move_values(date='2022-11-30', depreciation_value=666.66, remaining_value=666.67, depreciated_value=9333.33, state='draft'),
+            self._get_depreciation_move_values(date='2022-12-31', depreciation_value=666.67, remaining_value=0, depreciated_value=10000, state='draft'),
+        ])
+
+    def test_linear_reevaluation_double_decrease(self):
+        asset = self.create_asset(value=60000, periodicity="monthly", periods=12, method="linear", acquisition_date="2022-01-01", prorata_computation_type="constant_periods")
+        asset.validate()
+
+        date_modify = fields.Date.to_date("2022-04-15")
+        self.env['asset.modify'].create({
+            'asset_id': asset.id,
+            'name': 'Test reason',
+            'date':  date_modify,
+            'value_residual': asset._get_residual_value_at_date(date_modify) - 8500,
+        }).modify()
+
+        self.env['asset.modify'].create({
+            'asset_id': asset.id,
+            'name': 'Test reason',
+            'date':  fields.Date.to_date("2022-06-30"),
+            'value_residual': 18000,  # -6000
+        }).modify()
+
+        self.assertRecordValues(asset.depreciation_move_ids.sorted(lambda mv: (mv.date, mv.id)), [
+            self._get_depreciation_move_values(date='2022-01-31', depreciation_value=5000, remaining_value=55000, depreciated_value=5000, state='posted'),
+            self._get_depreciation_move_values(date='2022-02-28', depreciation_value=5000, remaining_value=50000, depreciated_value=10000, state='posted'),
+            self._get_depreciation_move_values(date='2022-03-31', depreciation_value=5000, remaining_value=45000, depreciated_value=15000, state='posted'),
+            self._get_depreciation_move_values(date='2022-04-15', depreciation_value=2500, remaining_value=42500, depreciated_value=17500, state='posted'),
+            # decrease move
+            self._get_depreciation_move_values(date='2022-04-15', depreciation_value=8500, remaining_value=34000, depreciated_value=26000, state='posted'),
+
+            self._get_depreciation_move_values(date='2022-04-30', depreciation_value=2000, remaining_value=32000, depreciated_value=28000, state='posted'),
+            self._get_depreciation_move_values(date='2022-05-31', depreciation_value=4000, remaining_value=28000, depreciated_value=32000, state='posted'),
+            self._get_depreciation_move_values(date='2022-06-30', depreciation_value=4000, remaining_value=24000, depreciated_value=36000, state='posted'),
+            # decrease move
+            self._get_depreciation_move_values(date='2022-06-30', depreciation_value=6000, remaining_value=18000, depreciated_value=42000, state='posted'),
+
+            self._get_depreciation_move_values(date='2022-07-31', depreciation_value=3000, remaining_value=15000, depreciated_value=45000, state='draft'),
+            self._get_depreciation_move_values(date='2022-08-31', depreciation_value=3000, remaining_value=12000, depreciated_value=48000, state='draft'),
+            self._get_depreciation_move_values(date='2022-09-30', depreciation_value=3000, remaining_value=9000, depreciated_value=51000, state='draft'),
+            self._get_depreciation_move_values(date='2022-10-31', depreciation_value=3000, remaining_value=6000, depreciated_value=54000, state='draft'),
+            self._get_depreciation_move_values(date='2022-11-30', depreciation_value=3000, remaining_value=3000, depreciated_value=57000, state='draft'),
+            self._get_depreciation_move_values(date='2022-12-31', depreciation_value=3000, remaining_value=0, depreciated_value=60000, state='draft'),
+        ])
+
+    def test_linear_reevaluation_double_increase(self):
+        asset = self.create_asset(value=60000, periodicity="monthly", periods=12, method="linear", acquisition_date="2022-01-01", prorata_computation_type="constant_periods")
+        asset.validate()
+
+        date_modify_1 = fields.Date.to_date("2022-04-15")
+        self.env['asset.modify'].create({
+            'asset_id': asset.id,
+            'name': 'Test reason',
+            'date':  date_modify_1,
+            'value_residual': asset._get_residual_value_at_date(date_modify_1) + 8500,
+            "account_asset_counterpart_id": self.asset_counterpart_account_id.id,
+        }).modify()
+
+        date_modify_2 = fields.Date.to_date("2022-06-30")
+        self.env['asset.modify'].create({
+            'asset_id': asset.id,
+            'name': 'Test reason',
+            'date':  date_modify_2,
+            'value_residual': asset._get_residual_value_at_date(date_modify_2) + 6000,
+            "account_asset_counterpart_id": self.asset_counterpart_account_id.id,
+        }).modify()
+
+        self.assertRecordValues(asset.depreciation_move_ids.sorted(lambda mv: (mv.date, mv.id)), [
+            self._get_depreciation_move_values(date='2022-01-31', depreciation_value=5000, remaining_value=55000, depreciated_value=5000, state='posted'),
+            self._get_depreciation_move_values(date='2022-02-28', depreciation_value=5000, remaining_value=50000, depreciated_value=10000, state='posted'),
+            self._get_depreciation_move_values(date='2022-03-31', depreciation_value=5000, remaining_value=45000, depreciated_value=15000, state='posted'),
+            self._get_depreciation_move_values(date='2022-04-15', depreciation_value=2500, remaining_value=42500, depreciated_value=17500, state='posted'),
+
+            self._get_depreciation_move_values(date='2022-04-30', depreciation_value=2500, remaining_value=40000, depreciated_value=20000, state='posted'),
+            self._get_depreciation_move_values(date='2022-05-31', depreciation_value=5000, remaining_value=35000, depreciated_value=25000, state='posted'),
+            self._get_depreciation_move_values(date='2022-06-30', depreciation_value=5000, remaining_value=30000, depreciated_value=30000, state='posted'),
+
+            self._get_depreciation_move_values(date='2022-07-31', depreciation_value=5000, remaining_value=25000, depreciated_value=35000, state='draft'),
+            self._get_depreciation_move_values(date='2022-08-31', depreciation_value=5000, remaining_value=20000, depreciated_value=40000, state='draft'),
+            self._get_depreciation_move_values(date='2022-09-30', depreciation_value=5000, remaining_value=15000, depreciated_value=45000, state='draft'),
+            self._get_depreciation_move_values(date='2022-10-31', depreciation_value=5000, remaining_value=10000, depreciated_value=50000, state='draft'),
+            self._get_depreciation_move_values(date='2022-11-30', depreciation_value=5000, remaining_value=5000, depreciated_value=55000, state='draft'),
+            self._get_depreciation_move_values(date='2022-12-31', depreciation_value=5000, remaining_value=0, depreciated_value=60000, state='draft'),
+        ])
+
+        self.assertRecordValues(asset.children_ids[0].depreciation_move_ids.sorted(lambda mv: (mv.date, mv.id)), [
+            self._get_depreciation_move_values(date='2022-04-30', depreciation_value=500, remaining_value=8000, depreciated_value=500, state='posted'),
+            self._get_depreciation_move_values(date='2022-05-31', depreciation_value=1000, remaining_value=7000, depreciated_value=1500, state='posted'),
+            self._get_depreciation_move_values(date='2022-06-30', depreciation_value=1000, remaining_value=6000, depreciated_value=2500, state='posted'),
+
+            self._get_depreciation_move_values(date='2022-07-31', depreciation_value=1000, remaining_value=5000, depreciated_value=3500, state='draft'),
+            self._get_depreciation_move_values(date='2022-08-31', depreciation_value=1000, remaining_value=4000, depreciated_value=4500, state='draft'),
+            self._get_depreciation_move_values(date='2022-09-30', depreciation_value=1000, remaining_value=3000, depreciated_value=5500, state='draft'),
+            self._get_depreciation_move_values(date='2022-10-31', depreciation_value=1000, remaining_value=2000, depreciated_value=6500, state='draft'),
+            self._get_depreciation_move_values(date='2022-11-30', depreciation_value=1000, remaining_value=1000, depreciated_value=7500, state='draft'),
+            self._get_depreciation_move_values(date='2022-12-31', depreciation_value=1000, remaining_value=0, depreciated_value=8500, state='draft'),
+        ])
+
+        self.assertRecordValues(asset.children_ids[1].depreciation_move_ids.sorted(lambda mv: (mv.date, mv.id)), [
+            self._get_depreciation_move_values(date='2022-07-31', depreciation_value=1000, remaining_value=5000, depreciated_value=1000, state='draft'),
+            self._get_depreciation_move_values(date='2022-08-31', depreciation_value=1000, remaining_value=4000, depreciated_value=2000, state='draft'),
+            self._get_depreciation_move_values(date='2022-09-30', depreciation_value=1000, remaining_value=3000, depreciated_value=3000, state='draft'),
+            self._get_depreciation_move_values(date='2022-10-31', depreciation_value=1000, remaining_value=2000, depreciated_value=4000, state='draft'),
+            self._get_depreciation_move_values(date='2022-11-30', depreciation_value=1000, remaining_value=1000, depreciated_value=5000, state='draft'),
+            self._get_depreciation_move_values(date='2022-12-31', depreciation_value=1000, remaining_value=0, depreciated_value=6000, state='draft'),
+        ])
+
+    def test_linear_reevaluation_decrease_then_increase(self):
+        asset = self.create_asset(value=60000, periodicity="monthly", periods=12, method="linear", acquisition_date="2022-01-01", prorata_computation_type="constant_periods")
+        asset.validate()
+
+        date_modify_1 = fields.Date.to_date("2022-04-15")
+        self.env['asset.modify'].create({
+            'asset_id': asset.id,
+            'name': 'Test reason',
+            'date':  date_modify_1,
+            'value_residual': asset._get_residual_value_at_date(date_modify_1) - 8500,
+        }).modify()
+
+        date_modify_2 = fields.Date.to_date("2022-06-30")
+        self.env['asset.modify'].create({
+            'asset_id': asset.id,
+            'name': 'Test reason',
+            'date':  date_modify_2,
+            'value_residual': asset._get_residual_value_at_date(date_modify_2) + 6000,
+            "account_asset_counterpart_id": self.asset_counterpart_account_id.id,
+        }).modify()
+
+        self.assertRecordValues(asset.depreciation_move_ids.sorted(lambda mv: (mv.date, mv.id)), [
+            self._get_depreciation_move_values(date='2022-01-31', depreciation_value=5000, remaining_value=55000, depreciated_value=5000, state='posted'),
+            self._get_depreciation_move_values(date='2022-02-28', depreciation_value=5000, remaining_value=50000, depreciated_value=10000, state='posted'),
+            self._get_depreciation_move_values(date='2022-03-31', depreciation_value=5000, remaining_value=45000, depreciated_value=15000, state='posted'),
+            self._get_depreciation_move_values(date='2022-04-15', depreciation_value=2500, remaining_value=42500, depreciated_value=17500, state='posted'),
+            # decrease move
+            self._get_depreciation_move_values(date='2022-04-15', depreciation_value=8500, remaining_value=34000, depreciated_value=26000, state='posted'),
+
+            self._get_depreciation_move_values(date='2022-04-30', depreciation_value=2000, remaining_value=32000, depreciated_value=28000, state='posted'),
+            self._get_depreciation_move_values(date='2022-05-31', depreciation_value=4000, remaining_value=28000, depreciated_value=32000, state='posted'),
+            self._get_depreciation_move_values(date='2022-06-30', depreciation_value=4000, remaining_value=24000, depreciated_value=36000, state='posted'),
+
+            self._get_depreciation_move_values(date='2022-07-31', depreciation_value=4000, remaining_value=20000, depreciated_value=40000, state='draft'),
+            self._get_depreciation_move_values(date='2022-08-31', depreciation_value=4000, remaining_value=16000, depreciated_value=44000, state='draft'),
+            self._get_depreciation_move_values(date='2022-09-30', depreciation_value=4000, remaining_value=12000, depreciated_value=48000, state='draft'),
+            self._get_depreciation_move_values(date='2022-10-31', depreciation_value=4000, remaining_value=8000, depreciated_value=52000, state='draft'),
+            self._get_depreciation_move_values(date='2022-11-30', depreciation_value=4000, remaining_value=4000, depreciated_value=56000, state='draft'),
+            self._get_depreciation_move_values(date='2022-12-31', depreciation_value=4000, remaining_value=0, depreciated_value=60000, state='draft'),
+        ])
+
+        self.assertRecordValues(asset.children_ids.depreciation_move_ids.sorted(lambda mv: (mv.date, mv.id)), [
+            self._get_depreciation_move_values(date='2022-07-31', depreciation_value=1000, remaining_value=5000, depreciated_value=1000, state='draft'),
+            self._get_depreciation_move_values(date='2022-08-31', depreciation_value=1000, remaining_value=4000, depreciated_value=2000, state='draft'),
+            self._get_depreciation_move_values(date='2022-09-30', depreciation_value=1000, remaining_value=3000, depreciated_value=3000, state='draft'),
+            self._get_depreciation_move_values(date='2022-10-31', depreciation_value=1000, remaining_value=2000, depreciated_value=4000, state='draft'),
+            self._get_depreciation_move_values(date='2022-11-30', depreciation_value=1000, remaining_value=1000, depreciated_value=5000, state='draft'),
+            self._get_depreciation_move_values(date='2022-12-31', depreciation_value=1000, remaining_value=0, depreciated_value=6000, state='draft'),
+        ])
+
+    def test_linear_reevaluation_increase_then_decrease_in_future(self):
+        asset = self.create_asset(value=10000, periodicity="yearly", periods=5, method="linear", acquisition_date="2018-01-01", prorata_computation_type="constant_periods")
+        asset.validate()
+
+        date_modify_1 = fields.Date.to_date("2022-06-30")
+        self.env['asset.modify'].create({
+            'asset_id': asset.id,
+            'name': 'Test reason',
+            'date':  date_modify_1,
+            'value_residual': asset._get_residual_value_at_date(date_modify_1) + 1000,
+            "account_asset_counterpart_id": self.asset_counterpart_account_id.id,
+        }).modify()
+
+        date_modify_2 = fields.Date.to_date("2022-09-30")  # This is 3 month in the future
+        self.env['asset.modify'].create({
+            'asset_id': asset.id,
+            'name': 'Test reason',
+            'date':  date_modify_2,
+            'value_residual': asset._get_residual_value_at_date(date_modify_2) - 200,
+            'method_period': '1',  # to reflect the change on the child, we go in monthly
+            'method_number': 60,
+        }).modify()
+
+        self.assertRecordValues(asset.depreciation_move_ids.sorted(lambda mv: (mv.date, mv.id)), [
+            self._get_depreciation_move_values(date='2018-12-31', depreciation_value=2000, remaining_value=8000, depreciated_value=2000, state='posted'),
+            self._get_depreciation_move_values(date='2019-12-31', depreciation_value=2000, remaining_value=6000, depreciated_value=4000, state='posted'),
+            self._get_depreciation_move_values(date='2020-12-31', depreciation_value=2000, remaining_value=4000, depreciated_value=6000, state='posted'),
+            self._get_depreciation_move_values(date='2021-12-31', depreciation_value=2000, remaining_value=2000, depreciated_value=8000, state='posted'),
+            # move before increase
+            self._get_depreciation_move_values(date='2022-06-30', depreciation_value=1000, remaining_value=1000, depreciated_value=9000, state='posted'),
+            # move before decrease
+            self._get_depreciation_move_values(date='2022-09-30', depreciation_value=500, remaining_value=500, depreciated_value=9500, state='draft'),
+            # decrease move
+            self._get_depreciation_move_values(date='2022-09-30', depreciation_value=200, remaining_value=300, depreciated_value=9700, state='draft'),
+            self._get_depreciation_move_values(date='2022-10-31', depreciation_value=100, remaining_value=200, depreciated_value=9800, state='draft'),
+            self._get_depreciation_move_values(date='2022-11-30', depreciation_value=100, remaining_value=100, depreciated_value=9900, state='draft'),
+            self._get_depreciation_move_values(date='2022-12-31', depreciation_value=100, remaining_value=0, depreciated_value=10000, state='draft'),
+        ])
+
+        self.assertRecordValues(asset.children_ids.depreciation_move_ids.sorted(lambda mv: (mv.date, mv.id)), [
+            # move before switch to monthly
+            self._get_depreciation_move_values(date='2022-09-30', depreciation_value=500, remaining_value=500, depreciated_value=500, state='draft'),
+
+            self._get_depreciation_move_values(date='2022-10-31', depreciation_value=166.67, remaining_value=333.33, depreciated_value=666.67, state='draft'),
+            self._get_depreciation_move_values(date='2022-11-30', depreciation_value=166.66, remaining_value=166.67, depreciated_value=833.33, state='draft'),
+            self._get_depreciation_move_values(date='2022-12-31', depreciation_value=166.67, remaining_value=0, depreciated_value=1000, state='draft'),
+        ])
+
+    def test_linear_reevaluation_decrease_then_increase_with_lock_date(self):
+        self.company_data['company'].fiscalyear_lock_date = fields.Date.to_date('2022-03-01')
+        asset = self.create_asset(value=60000, periodicity="monthly", periods=12, method="linear", acquisition_date="2022-01-01", prorata_computation_type="constant_periods")
+        asset.validate()
+
+        date_modify_1 = fields.Date.to_date("2022-04-15")
+        self.env['asset.modify'].create({
+            'asset_id': asset.id,
+            'name': 'Test reason',
+            'date':  date_modify_1,
+            'value_residual': asset._get_residual_value_at_date(date_modify_1) - 8500,
+        }).modify()
+
+        self.company_data['company'].fiscalyear_lock_date = fields.Date.to_date('2022-05-01')
+
+        date_modify_2 = fields.Date.to_date("2022-06-30")
+        self.env['asset.modify'].create({
+            'asset_id': asset.id,
+            'name': 'Test reason',
+            'date':  date_modify_2,
+            'value_residual': asset._get_residual_value_at_date(date_modify_2) + 6000,
+            "account_asset_counterpart_id": self.asset_counterpart_account_id.id,
+        }).modify()
+
+        self.assertRecordValues(asset.depreciation_move_ids.sorted(lambda mv: (mv.date, mv.id)), [
+            self._get_depreciation_move_values(date='2022-03-31', depreciation_value=5000, remaining_value=55000, depreciated_value=5000, state='posted'),
+            self._get_depreciation_move_values(date='2022-03-31', depreciation_value=5000, remaining_value=50000, depreciated_value=10000, state='posted'),
+            self._get_depreciation_move_values(date='2022-03-31', depreciation_value=5000, remaining_value=45000, depreciated_value=15000, state='posted'),
+            self._get_depreciation_move_values(date='2022-04-15', depreciation_value=2500, remaining_value=42500, depreciated_value=17500, state='posted'),
+            # decrease move
+            self._get_depreciation_move_values(date='2022-04-15', depreciation_value=8500, remaining_value=34000, depreciated_value=26000, state='posted'),
+
+            self._get_depreciation_move_values(date='2022-04-30', depreciation_value=2000, remaining_value=32000, depreciated_value=28000, state='posted'),
+            self._get_depreciation_move_values(date='2022-05-31', depreciation_value=4000, remaining_value=28000, depreciated_value=32000, state='posted'),
+            self._get_depreciation_move_values(date='2022-06-30', depreciation_value=4000, remaining_value=24000, depreciated_value=36000, state='posted'),
+
+            self._get_depreciation_move_values(date='2022-07-31', depreciation_value=4000, remaining_value=20000, depreciated_value=40000, state='draft'),
+            self._get_depreciation_move_values(date='2022-08-31', depreciation_value=4000, remaining_value=16000, depreciated_value=44000, state='draft'),
+            self._get_depreciation_move_values(date='2022-09-30', depreciation_value=4000, remaining_value=12000, depreciated_value=48000, state='draft'),
+            self._get_depreciation_move_values(date='2022-10-31', depreciation_value=4000, remaining_value=8000, depreciated_value=52000, state='draft'),
+            self._get_depreciation_move_values(date='2022-11-30', depreciation_value=4000, remaining_value=4000, depreciated_value=56000, state='draft'),
+            self._get_depreciation_move_values(date='2022-12-31', depreciation_value=4000, remaining_value=0, depreciated_value=60000, state='draft'),
+        ])
+
+        self.assertRecordValues(asset.children_ids.depreciation_move_ids.sorted(lambda mv: (mv.date, mv.id)), [
+            self._get_depreciation_move_values(date='2022-07-31', depreciation_value=1000, remaining_value=5000, depreciated_value=1000, state='draft'),
+            self._get_depreciation_move_values(date='2022-08-31', depreciation_value=1000, remaining_value=4000, depreciated_value=2000, state='draft'),
+            self._get_depreciation_move_values(date='2022-09-30', depreciation_value=1000, remaining_value=3000, depreciated_value=3000, state='draft'),
+            self._get_depreciation_move_values(date='2022-10-31', depreciation_value=1000, remaining_value=2000, depreciated_value=4000, state='draft'),
+            self._get_depreciation_move_values(date='2022-11-30', depreciation_value=1000, remaining_value=1000, depreciated_value=5000, state='draft'),
+            self._get_depreciation_move_values(date='2022-12-31', depreciation_value=1000, remaining_value=0, depreciated_value=6000, state='draft'),
+        ])
+
+    def test_linear_reevaluation_increase_then_decrease(self):
+        asset = self.create_asset(value=60000, periodicity="monthly", periods=12, method="linear", acquisition_date="2022-01-01", prorata_computation_type="constant_periods")
+        asset.validate()
+
+        date_modify_1 = fields.Date.to_date("2022-04-15")
+        self.env['asset.modify'].create({
+            'asset_id': asset.id,
+            'name': 'Test reason',
+            'date':  date_modify_1,
+            'value_residual': asset._get_residual_value_at_date(date_modify_1) + 8500,
+            "account_asset_counterpart_id": self.asset_counterpart_account_id.id,
+        }).modify()
+
+        date_modify_2 = fields.Date.to_date("2022-06-30")
+        self.env['asset.modify'].create({
+            'asset_id': asset.id,
+            'name': 'Test reason',
+            'date':  date_modify_2,
+            'value_residual': asset._get_residual_value_at_date(date_modify_2) - 6000,
+        }).modify()
+
+        self.assertRecordValues(asset.depreciation_move_ids.sorted(lambda mv: (mv.date, mv.id)), [
+            self._get_depreciation_move_values(date='2022-01-31', depreciation_value=5000, remaining_value=55000, depreciated_value=5000, state='posted'),
+            self._get_depreciation_move_values(date='2022-02-28', depreciation_value=5000, remaining_value=50000, depreciated_value=10000, state='posted'),
+            self._get_depreciation_move_values(date='2022-03-31', depreciation_value=5000, remaining_value=45000, depreciated_value=15000, state='posted'),
+            self._get_depreciation_move_values(date='2022-04-15', depreciation_value=2500, remaining_value=42500, depreciated_value=17500, state='posted'),
+
+            self._get_depreciation_move_values(date='2022-04-30', depreciation_value=2500, remaining_value=40000, depreciated_value=20000, state='posted'),
+            self._get_depreciation_move_values(date='2022-05-31', depreciation_value=5000, remaining_value=35000, depreciated_value=25000, state='posted'),
+            self._get_depreciation_move_values(date='2022-06-30', depreciation_value=5000, remaining_value=30000, depreciated_value=30000, state='posted'),
+
+            # decrease move
+            self._get_depreciation_move_values(date='2022-06-30', depreciation_value=6000, remaining_value=24000, depreciated_value=36000, state='posted'),
+
+            self._get_depreciation_move_values(date='2022-07-31', depreciation_value=4000, remaining_value=20000, depreciated_value=40000, state='draft'),
+            self._get_depreciation_move_values(date='2022-08-31', depreciation_value=4000, remaining_value=16000, depreciated_value=44000, state='draft'),
+            self._get_depreciation_move_values(date='2022-09-30', depreciation_value=4000, remaining_value=12000, depreciated_value=48000, state='draft'),
+            self._get_depreciation_move_values(date='2022-10-31', depreciation_value=4000, remaining_value=8000, depreciated_value=52000, state='draft'),
+            self._get_depreciation_move_values(date='2022-11-30', depreciation_value=4000, remaining_value=4000, depreciated_value=56000, state='draft'),
+            self._get_depreciation_move_values(date='2022-12-31', depreciation_value=4000, remaining_value=0, depreciated_value=60000, state='draft'),
+        ])
+
+        self.assertRecordValues(asset.children_ids[0].depreciation_move_ids.sorted(lambda mv: (mv.date, mv.id)), [
+            self._get_depreciation_move_values(date='2022-04-30', depreciation_value=500, remaining_value=8000, depreciated_value=500, state='posted'),
+            self._get_depreciation_move_values(date='2022-05-31', depreciation_value=1000, remaining_value=7000, depreciated_value=1500, state='posted'),
+            self._get_depreciation_move_values(date='2022-06-30', depreciation_value=1000, remaining_value=6000, depreciated_value=2500, state='posted'),
+
+            self._get_depreciation_move_values(date='2022-07-31', depreciation_value=1000, remaining_value=5000, depreciated_value=3500, state='draft'),
+            self._get_depreciation_move_values(date='2022-08-31', depreciation_value=1000, remaining_value=4000, depreciated_value=4500, state='draft'),
+            self._get_depreciation_move_values(date='2022-09-30', depreciation_value=1000, remaining_value=3000, depreciated_value=5500, state='draft'),
+            self._get_depreciation_move_values(date='2022-10-31', depreciation_value=1000, remaining_value=2000, depreciated_value=6500, state='draft'),
+            self._get_depreciation_move_values(date='2022-11-30', depreciation_value=1000, remaining_value=1000, depreciated_value=7500, state='draft'),
+            self._get_depreciation_move_values(date='2022-12-31', depreciation_value=1000, remaining_value=0, depreciated_value=8500, state='draft'),
+        ])
+
+    def test_linear_reevaluation_decrease_then_disposal(self):
+        asset = self.create_asset(value=60000, periodicity="monthly", periods=12, method="linear", acquisition_date="2022-01-01", prorata_computation_type="constant_periods")
+        asset.validate()
+        self.loss_account_id = self.company_data['default_account_expense'].copy().id
+
+        date_modify = fields.Date.to_date("2022-04-15")
+        self.env['asset.modify'].create({
+            'asset_id': asset.id,
+            'name': 'Test reason',
+            'date':  date_modify,
+            'value_residual': asset._get_residual_value_at_date(date_modify) - 8500,
+        }).modify()
+
+        self.env['asset.modify'].create({
+            'asset_id': asset.id,
+            'date':  fields.Date.to_date("2022-06-30"),
+            'modify_action': 'dispose',
+            'loss_account_id': self.loss_account_id,
+        }).sell_dispose()
+
+        self.assertRecordValues(asset.depreciation_move_ids.sorted(lambda mv: (mv.date, mv.id)), [
+            self._get_depreciation_move_values(date='2022-01-31', depreciation_value=5000, remaining_value=55000, depreciated_value=5000, state='posted'),
+            self._get_depreciation_move_values(date='2022-02-28', depreciation_value=5000, remaining_value=50000, depreciated_value=10000, state='posted'),
+            self._get_depreciation_move_values(date='2022-03-31', depreciation_value=5000, remaining_value=45000, depreciated_value=15000, state='posted'),
+            self._get_depreciation_move_values(date='2022-04-15', depreciation_value=2500, remaining_value=42500, depreciated_value=17500, state='posted'),
+            # decrease move
+            self._get_depreciation_move_values(date='2022-04-15', depreciation_value=8500, remaining_value=34000, depreciated_value=26000, state='posted'),
+
+            self._get_depreciation_move_values(date='2022-04-30', depreciation_value=2000, remaining_value=32000, depreciated_value=28000, state='posted'),
+            self._get_depreciation_move_values(date='2022-05-31', depreciation_value=4000, remaining_value=28000, depreciated_value=32000, state='posted'),
+            self._get_depreciation_move_values(date='2022-06-30', depreciation_value=4000, remaining_value=24000, depreciated_value=36000, state='posted'),
+
+            self._get_depreciation_move_values(date='2022-06-30', depreciation_value=24000, remaining_value=0, depreciated_value=60000, state='draft'),
+        ])
+
+    def test_linear_reevaluation_increase_then_disposal(self):
+        asset = self.create_asset(value=36000, periodicity="yearly", periods=3, method="linear", acquisition_date="2022-01-01", prorata_computation_type="constant_periods")
+        asset.validate()
+        self.loss_account_id = self.company_data['default_account_expense'].copy().id
+        self.asset_counterpart_account_id = self.company_data['default_account_expense'].copy().id
+
+        date_modify = fields.Date.to_date("2022-04-15")
+        self.env['asset.modify'].create({
+            'asset_id': asset.id,
+            'name': 'Test reason',
+            'date':  date_modify,
+            'value_residual': asset._get_residual_value_at_date(date_modify) + 8500,
+            "account_asset_counterpart_id": self.asset_counterpart_account_id,
+        }).modify()
+
+        self.env['asset.modify'].create({
+            'asset_id': asset.id,
+            'date':  fields.Date.to_date("2022-06-30"),
+            'modify_action': 'dispose',
+            'loss_account_id': self.loss_account_id,
+        }).sell_dispose()
+
+        self.assertRecordValues(asset.depreciation_move_ids.sorted(lambda mv: (mv.date, mv.id)), [
+            self._get_depreciation_move_values(date='2022-04-15', depreciation_value=3500, remaining_value=32500, depreciated_value=3500, state='posted'),
+            self._get_depreciation_move_values(date='2022-06-30', depreciation_value=2500, remaining_value=30000, depreciated_value=6000, state='posted'),
+            # disposal move
+            self._get_depreciation_move_values(date='2022-06-30', depreciation_value=30000, remaining_value=0, depreciated_value=36000, state='draft'),
+        ])
+
+        self.assertRecordValues(asset.children_ids.depreciation_move_ids.sorted(lambda mv: (mv.date, mv.id)), [
+            # 653.85 = 8500 * (2.5 months * 30) / (32.5 months * 30)
+            self._get_depreciation_move_values(date='2022-06-30', depreciation_value=653.85, remaining_value=7846.15, depreciated_value=653.85, state='posted'),
+            # disposal move
+            self._get_depreciation_move_values(date='2022-06-30', depreciation_value=7846.15, remaining_value=0, depreciated_value=8500, state='draft'),
+        ])
+
+    def test_linear_reevaluation_increase_constant_periods(self):
+        asset = self.create_asset(value=1200, periodicity="monthly", periods=12, method="linear", acquisition_date="2021-10-01", prorata_computation_type="constant_periods")
+        asset.validate()
+
+        date_modify = fields.Date.to_date("2022-01-15")
+        self.env['asset.modify'].create({
+            'asset_id': asset.id,
+            'name': 'Test reason',
+            'date':  date_modify,
+            'modify_action': 'modify',
+            'value_residual': asset._get_residual_value_at_date(date_modify) + 2100,
+            'account_asset_counterpart_id': self.company_data['default_account_revenue'].copy().id,
+        }).modify()
+
+        self.assertRecordValues(asset.depreciation_move_ids.sorted(lambda mv: (mv.date, mv.id)), [
+            self._get_depreciation_move_values(date='2021-10-31', depreciation_value=100, remaining_value=1100, depreciated_value=100, state='posted'),
+            self._get_depreciation_move_values(date='2021-11-30', depreciation_value=100, remaining_value=1000, depreciated_value=200, state='posted'),
+            self._get_depreciation_move_values(date='2021-12-31', depreciation_value=100, remaining_value=900, depreciated_value=300, state='posted'),
+            self._get_depreciation_move_values(date='2022-01-15', depreciation_value=48.39, remaining_value=851.61, depreciated_value=348.39, state='posted'),
+
+            self._get_depreciation_move_values(date='2022-01-31', depreciation_value=51.61, remaining_value=800, depreciated_value=400, state='posted'),
+            self._get_depreciation_move_values(date='2022-02-28', depreciation_value=100, remaining_value=700, depreciated_value=500, state='posted'),
+            self._get_depreciation_move_values(date='2022-03-31', depreciation_value=100, remaining_value=600, depreciated_value=600, state='posted'),
+            self._get_depreciation_move_values(date='2022-04-30', depreciation_value=100, remaining_value=500, depreciated_value=700, state='posted'),
+            self._get_depreciation_move_values(date='2022-05-31', depreciation_value=100, remaining_value=400, depreciated_value=800, state='posted'),
+            self._get_depreciation_move_values(date='2022-06-30', depreciation_value=100, remaining_value=300, depreciated_value=900, state='posted'),
+            self._get_depreciation_move_values(date='2022-07-31', depreciation_value=100, remaining_value=200, depreciated_value=1000, state='draft'),
+            self._get_depreciation_move_values(date='2022-08-31', depreciation_value=100, remaining_value=100, depreciated_value=1100, state='draft'),
+            self._get_depreciation_move_values(date='2022-09-30', depreciation_value=100, remaining_value=0, depreciated_value=1200, state='draft'),
+        ])
+
+        self.assertRecordValues(asset.children_ids.depreciation_move_ids.sorted(lambda mv: (mv.date, mv.id)), [
+            self._get_depreciation_move_values(date='2022-01-31', depreciation_value=127.27, remaining_value=1972.73, depreciated_value=127.27, state='posted'),
+            self._get_depreciation_move_values(date='2022-02-28', depreciation_value=246.59, remaining_value=1726.14, depreciated_value=373.86, state='posted'),
+            self._get_depreciation_move_values(date='2022-03-31', depreciation_value=246.59, remaining_value=1479.55, depreciated_value=620.45, state='posted'),
+            self._get_depreciation_move_values(date='2022-04-30', depreciation_value=246.60, remaining_value=1232.95, depreciated_value=867.05, state='posted'),
+            self._get_depreciation_move_values(date='2022-05-31', depreciation_value=246.59, remaining_value=986.36, depreciated_value=1113.64, state='posted'),
+            self._get_depreciation_move_values(date='2022-06-30', depreciation_value=246.59, remaining_value=739.77, depreciated_value=1360.23, state='posted'),
+            self._get_depreciation_move_values(date='2022-07-31', depreciation_value=246.59, remaining_value=493.18, depreciated_value=1606.82, state='draft'),
+            self._get_depreciation_move_values(date='2022-08-31', depreciation_value=246.59, remaining_value=246.59, depreciated_value=1853.41, state='draft'),
+            self._get_depreciation_move_values(date='2022-09-30', depreciation_value=246.59, remaining_value=0, depreciated_value=2100, state='draft'),
+        ])
+
+    def test_linear_reevaluation_increase_daily_computation(self):
+        asset = self.create_asset(value=1200, periodicity="monthly", periods=12, method="linear", acquisition_date="2021-10-01", prorata_computation_type="daily_computation")
+        asset.validate()
+
+        self.env['asset.modify'].create({
+            'asset_id': asset.id,
+            'name': 'Test reason',
+            'date':  fields.Date.to_date("2022-01-15"),
+            'modify_action': 'modify',
+            'value_residual': 2945.75,
+            'account_asset_counterpart_id': self.company_data['default_account_revenue'].copy().id,
+        }).modify()
+
+        self.assertRecordValues(asset.depreciation_move_ids.sorted(lambda mv: (mv.date, mv.id)), [
+            self._get_depreciation_move_values(date='2021-10-31', depreciation_value=101.92, remaining_value=1098.08, depreciated_value=101.92, state='posted'),
+            self._get_depreciation_move_values(date='2021-11-30', depreciation_value=98.63, remaining_value=999.45, depreciated_value=200.55, state='posted'),
+            self._get_depreciation_move_values(date='2021-12-31', depreciation_value=101.92, remaining_value=897.53, depreciated_value=302.47, state='posted'),
+            self._get_depreciation_move_values(date='2022-01-15', depreciation_value=49.31, remaining_value=848.22, depreciated_value=351.78, state='posted'),
+
+            self._get_depreciation_move_values(date='2022-01-31', depreciation_value=52.60, remaining_value=795.62, depreciated_value=404.38, state='posted'),
+            self._get_depreciation_move_values(date='2022-02-28', depreciation_value=92.06, remaining_value=703.56, depreciated_value=496.44, state='posted'),
+            self._get_depreciation_move_values(date='2022-03-31', depreciation_value=101.92, remaining_value=601.64, depreciated_value=598.36, state='posted'),
+            self._get_depreciation_move_values(date='2022-04-30', depreciation_value=98.63, remaining_value=503.01, depreciated_value=696.99, state='posted'),
+            self._get_depreciation_move_values(date='2022-05-31', depreciation_value=101.91, remaining_value=401.10, depreciated_value=798.90, state='posted'),
+            self._get_depreciation_move_values(date='2022-06-30', depreciation_value=98.63, remaining_value=302.47, depreciated_value=897.53, state='posted'),
+            self._get_depreciation_move_values(date='2022-07-31', depreciation_value=101.92, remaining_value=200.55, depreciated_value=999.45, state='draft'),
+            self._get_depreciation_move_values(date='2022-08-31', depreciation_value=101.92, remaining_value=98.63, depreciated_value=1101.37, state='draft'),
+            self._get_depreciation_move_values(date='2022-09-30', depreciation_value=98.63, remaining_value=0, depreciated_value=1200, state='draft'),
+        ])
+
+        self.assertRecordValues(asset.children_ids.depreciation_move_ids.sorted(lambda mv: (mv.date, mv.id)), [
+            self._get_depreciation_move_values(date='2022-01-31', depreciation_value=130.08, remaining_value=1967.45, depreciated_value=130.08, state='posted'),
+            self._get_depreciation_move_values(date='2022-02-28', depreciation_value=227.64, remaining_value=1739.81, depreciated_value=357.72, state='posted'),
+            self._get_depreciation_move_values(date='2022-03-31', depreciation_value=252.03, remaining_value=1487.78, depreciated_value=609.75, state='posted'),
+            self._get_depreciation_move_values(date='2022-04-30', depreciation_value=243.90, remaining_value=1243.88, depreciated_value=853.65, state='posted'),
+            self._get_depreciation_move_values(date='2022-05-31', depreciation_value=252.02, remaining_value=991.86, depreciated_value=1105.67, state='posted'),
+            self._get_depreciation_move_values(date='2022-06-30', depreciation_value=243.90, remaining_value=747.96, depreciated_value=1349.57, state='posted'),
+            self._get_depreciation_move_values(date='2022-07-31', depreciation_value=252.03, remaining_value=495.93, depreciated_value=1601.60, state='draft'),
+            self._get_depreciation_move_values(date='2022-08-31', depreciation_value=252.03, remaining_value=243.90, depreciated_value=1853.63, state='draft'),
+            self._get_depreciation_move_values(date='2022-09-30', depreciation_value=243.90, remaining_value=0, depreciated_value=2097.53, state='draft'),
+        ])
+
+    def test_linear_reevaluation_increase_amount_and_length(self):
+        """ After 5 months, extend the lifetime by 3 month and the amount by 200 """
+        asset = self.create_asset(value=1200, periodicity="monthly", periods=10, method="linear", acquisition_date="2022-02-01", prorata_computation_type="constant_periods")
+        asset.validate()
+
+        date_modify = fields.Date.to_date("2022-06-30")
+        self.env['asset.modify'].create({
+            'asset_id': asset.id,
+            'name': 'Test reason',
+            'method_number': 10 + 3,
+            'date': date_modify,
+            'modify_action': 'modify',
+            'value_residual': asset._get_residual_value_at_date(date_modify) + 200,
+            'account_asset_counterpart_id': self.company_data['default_account_revenue'].copy().id,
+        }).modify()
+
+        self.assertRecordValues(asset.depreciation_move_ids.sorted(lambda mv: (mv.date, mv.id)), [
+            self._get_depreciation_move_values(date='2022-02-28', depreciation_value=120, remaining_value=1080, depreciated_value=120, state='posted'),
+            self._get_depreciation_move_values(date='2022-03-31', depreciation_value=120, remaining_value=960, depreciated_value=240, state='posted'),
+            self._get_depreciation_move_values(date='2022-04-30', depreciation_value=120, remaining_value=840, depreciated_value=360, state='posted'),
+            self._get_depreciation_move_values(date='2022-05-31', depreciation_value=120, remaining_value=720, depreciated_value=480, state='posted'),
+            self._get_depreciation_move_values(date='2022-06-30', depreciation_value=120, remaining_value=600, depreciated_value=600, state='posted'),
+            # After the reeval, we divide the amount to depreciate left on the amount left
+            self._get_depreciation_move_values(date='2022-07-31', depreciation_value=75, remaining_value=525, depreciated_value=675, state='draft'),
+            self._get_depreciation_move_values(date='2022-08-31', depreciation_value=75, remaining_value=450, depreciated_value=750, state='draft'),
+            self._get_depreciation_move_values(date='2022-09-30', depreciation_value=75, remaining_value=375, depreciated_value=825, state='draft'),
+            self._get_depreciation_move_values(date='2022-10-31', depreciation_value=75, remaining_value=300, depreciated_value=900, state='draft'),
+            self._get_depreciation_move_values(date='2022-11-30', depreciation_value=75, remaining_value=225, depreciated_value=975, state='draft'),
+            self._get_depreciation_move_values(date='2022-12-31', depreciation_value=75, remaining_value=150, depreciated_value=1050, state='draft'),
+            self._get_depreciation_move_values(date='2023-01-31', depreciation_value=75, remaining_value=75, depreciated_value=1125, state='draft'),
+            self._get_depreciation_move_values(date='2023-02-28', depreciation_value=75, remaining_value=0, depreciated_value=1200, state='draft'),
+        ])
+
+        self.assertRecordValues(asset.children_ids.depreciation_move_ids.sorted(lambda mv: (mv.date, mv.id)), [
+            self._get_depreciation_move_values(date='2022-07-31', depreciation_value=25, remaining_value=175, depreciated_value=25, state='draft'),
+            self._get_depreciation_move_values(date='2022-08-31', depreciation_value=25, remaining_value=150, depreciated_value=50, state='draft'),
+            self._get_depreciation_move_values(date='2022-09-30', depreciation_value=25, remaining_value=125, depreciated_value=75, state='draft'),
+            self._get_depreciation_move_values(date='2022-10-31', depreciation_value=25, remaining_value=100, depreciated_value=100, state='draft'),
+            self._get_depreciation_move_values(date='2022-11-30', depreciation_value=25, remaining_value=75, depreciated_value=125, state='draft'),
+            self._get_depreciation_move_values(date='2022-12-31', depreciation_value=25, remaining_value=50, depreciated_value=150, state='draft'),
+            self._get_depreciation_move_values(date='2023-01-31', depreciation_value=25, remaining_value=25, depreciated_value=175, state='draft'),
+            self._get_depreciation_move_values(date='2023-02-28', depreciation_value=25, remaining_value=0, depreciated_value=200, state='draft'),
+        ])
+
+    def test_linear_reevaluation_decrease_amount_and_increase_length(self):
+        """ After 5 months, extend the lifetime by 3 month and reduce the amount by 200 """
+        asset = self.create_asset(value=1200, periodicity="monthly", periods=10, method="linear", acquisition_date="2022-02-01", prorata_computation_type="constant_periods")
+        asset.validate()
+
+        date_modify = fields.Date.to_date("2022-06-30")
+        self.env['asset.modify'].create({
+            'asset_id': asset.id,
+            'name': 'Test reason',
+            'method_number': 10 + 3,
+            'date': date_modify,
+            'modify_action': 'modify',
+            'value_residual': asset._get_residual_value_at_date(date_modify) - 200,
+            'account_asset_counterpart_id': self.company_data['default_account_revenue'].copy().id,
+        }).modify()
+
+        self.assertRecordValues(asset.depreciation_move_ids.sorted(lambda mv: (mv.date, mv.id)), [
+            self._get_depreciation_move_values(date='2022-02-28', depreciation_value=120, remaining_value=1080, depreciated_value=120, state='posted'),
+            self._get_depreciation_move_values(date='2022-03-31', depreciation_value=120, remaining_value=960, depreciated_value=240, state='posted'),
+            self._get_depreciation_move_values(date='2022-04-30', depreciation_value=120, remaining_value=840, depreciated_value=360, state='posted'),
+            self._get_depreciation_move_values(date='2022-05-31', depreciation_value=120, remaining_value=720, depreciated_value=480, state='posted'),
+            self._get_depreciation_move_values(date='2022-06-30', depreciation_value=120, remaining_value=600, depreciated_value=600, state='posted'),
+            # Decrease Move
+            self._get_depreciation_move_values(date='2022-06-30', depreciation_value=200, remaining_value=400, depreciated_value=800, state='posted'),
+            # After the reeval, we divide the amount to depreciate left on the amount left
+            self._get_depreciation_move_values(date='2022-07-31', depreciation_value=50, remaining_value=350, depreciated_value=850, state='draft'),
+            self._get_depreciation_move_values(date='2022-08-31', depreciation_value=50, remaining_value=300, depreciated_value=900, state='draft'),
+            self._get_depreciation_move_values(date='2022-09-30', depreciation_value=50, remaining_value=250, depreciated_value=950, state='draft'),
+            self._get_depreciation_move_values(date='2022-10-31', depreciation_value=50, remaining_value=200, depreciated_value=1000, state='draft'),
+            self._get_depreciation_move_values(date='2022-11-30', depreciation_value=50, remaining_value=150, depreciated_value=1050, state='draft'),
+            self._get_depreciation_move_values(date='2022-12-31', depreciation_value=50, remaining_value=100, depreciated_value=1100, state='draft'),
+            self._get_depreciation_move_values(date='2023-01-31', depreciation_value=50, remaining_value=50, depreciated_value=1150, state='draft'),
+            self._get_depreciation_move_values(date='2023-02-28', depreciation_value=50, remaining_value=0, depreciated_value=1200, state='draft'),
+        ])
+
+    def test_monthly_degressive_start_beginning_month_increase_middle_month_on_degressive_part(self):
+        asset = self.degressive_asset
+        asset.validate()
+
+        date_modify = fields.Date.to_date("2022-06-15")
+        self.env['asset.modify'].create({
+            'asset_id': asset.id,
+            'name': 'Test reason',
+            'date':  date_modify,
+            'value_residual': asset._get_residual_value_at_date(date_modify) + 8500,
+            "account_asset_counterpart_id": self.asset_counterpart_account_id.id,
+        }).modify()
+
+        self.assertRecordValues(asset.depreciation_move_ids.sorted(lambda mv: (mv.date, mv.id)), [
+            self._get_depreciation_move_values(date='2020-07-31', depreciation_value=210.00, remaining_value=6990.00, depreciated_value=210.00, state='posted'),
+            self._get_depreciation_move_values(date='2020-08-31', depreciation_value=210.00, remaining_value=6780.00, depreciated_value=420.00, state='posted'),
+            self._get_depreciation_move_values(date='2020-09-30', depreciation_value=210.00, remaining_value=6570.00, depreciated_value=630.00, state='posted'),
+            self._get_depreciation_move_values(date='2020-10-31', depreciation_value=210.00, remaining_value=6360.00, depreciated_value=840.00, state='posted'),
+            self._get_depreciation_move_values(date='2020-11-30', depreciation_value=210.00, remaining_value=6150.00, depreciated_value=1050.00, state='posted'),
+            self._get_depreciation_move_values(date='2020-12-31', depreciation_value=210.00, remaining_value=5940.00, depreciated_value=1260.00, state='posted'),
+            # 2021
+            self._get_depreciation_move_values(date='2021-01-31', depreciation_value=173.25, remaining_value=5766.75, depreciated_value=1433.25, state='posted'),
+            self._get_depreciation_move_values(date='2021-02-28', depreciation_value=173.25, remaining_value=5593.50, depreciated_value=1606.50, state='posted'),
+            self._get_depreciation_move_values(date='2021-03-31', depreciation_value=173.25, remaining_value=5420.25, depreciated_value=1779.75, state='posted'),
+            self._get_depreciation_move_values(date='2021-04-30', depreciation_value=173.25, remaining_value=5247.00, depreciated_value=1953.00, state='posted'),
+            self._get_depreciation_move_values(date='2021-05-31', depreciation_value=173.25, remaining_value=5073.75, depreciated_value=2126.25, state='posted'),
+            self._get_depreciation_move_values(date='2021-06-30', depreciation_value=173.25, remaining_value=4900.50, depreciated_value=2299.50, state='posted'),
+            self._get_depreciation_move_values(date='2021-07-31', depreciation_value=173.25, remaining_value=4727.25, depreciated_value=2472.75, state='posted'),
+            self._get_depreciation_move_values(date='2021-08-31', depreciation_value=173.25, remaining_value=4554.00, depreciated_value=2646.00, state='posted'),
+            self._get_depreciation_move_values(date='2021-09-30', depreciation_value=173.25, remaining_value=4380.75, depreciated_value=2819.25, state='posted'),
+            self._get_depreciation_move_values(date='2021-10-31', depreciation_value=173.25, remaining_value=4207.50, depreciated_value=2992.50, state='posted'),
+            self._get_depreciation_move_values(date='2021-11-30', depreciation_value=173.25, remaining_value=4034.25, depreciated_value=3165.75, state='posted'),
+            self._get_depreciation_move_values(date='2021-12-31', depreciation_value=173.25, remaining_value=3861.00, depreciated_value=3339.00, state='posted'),
+            # 2022
+            self._get_depreciation_move_values(date='2022-01-31', depreciation_value=112.61, remaining_value=3748.39, depreciated_value=3451.61, state='posted'),
+            self._get_depreciation_move_values(date='2022-02-28', depreciation_value=112.61, remaining_value=3635.78, depreciated_value=3564.22, state='posted'),
+            self._get_depreciation_move_values(date='2022-03-31', depreciation_value=112.62, remaining_value=3523.16, depreciated_value=3676.84, state='posted'),
+            self._get_depreciation_move_values(date='2022-04-30', depreciation_value=112.61, remaining_value=3410.55, depreciated_value=3789.45, state='posted'),
+            self._get_depreciation_move_values(date='2022-05-31', depreciation_value=112.61, remaining_value=3297.94, depreciated_value=3902.06, state='posted'),
+            # Increase
+            self._get_depreciation_move_values(date='2022-06-15', depreciation_value=56.31, remaining_value=3241.63, depreciated_value=3958.37, state='posted'),
+            self._get_depreciation_move_values(date='2022-06-30', depreciation_value=47.27, remaining_value=3194.36, depreciated_value=4005.64, state='posted'),
+            self._get_depreciation_move_values(date='2022-07-31', depreciation_value=94.55, remaining_value=3099.81, depreciated_value=4100.19, state='draft'),
+            self._get_depreciation_move_values(date='2022-08-31', depreciation_value=94.55, remaining_value=3005.26, depreciated_value=4194.74, state='draft'),
+            self._get_depreciation_move_values(date='2022-09-30', depreciation_value=94.55, remaining_value=2910.71, depreciated_value=4289.29, state='draft'),
+            self._get_depreciation_move_values(date='2022-10-31', depreciation_value=94.54, remaining_value=2816.17, depreciated_value=4383.83, state='draft'),
+            self._get_depreciation_move_values(date='2022-11-30', depreciation_value=94.55, remaining_value=2721.62, depreciated_value=4478.38, state='draft'),
+            self._get_depreciation_move_values(date='2022-12-31', depreciation_value=94.55, remaining_value=2627.07, depreciated_value=4572.93, state='draft'),
+            # 2023
+            self._get_depreciation_move_values(date='2023-01-31', depreciation_value=87.57, remaining_value=2539.50, depreciated_value=4660.50, state='draft'),
+            self._get_depreciation_move_values(date='2023-02-28', depreciation_value=87.57, remaining_value=2451.93, depreciated_value=4748.07, state='draft'),
+            self._get_depreciation_move_values(date='2023-03-31', depreciation_value=87.57, remaining_value=2364.36, depreciated_value=4835.64, state='draft'),
+            self._get_depreciation_move_values(date='2023-04-30', depreciation_value=87.57, remaining_value=2276.79, depreciated_value=4923.21, state='draft'),
+            self._get_depreciation_move_values(date='2023-05-31', depreciation_value=87.56, remaining_value=2189.23, depreciated_value=5010.77, state='draft'),
+            self._get_depreciation_move_values(date='2023-06-30', depreciation_value=87.57, remaining_value=2101.66, depreciated_value=5098.34, state='draft'),
+            self._get_depreciation_move_values(date='2023-07-31', depreciation_value=87.57, remaining_value=2014.09, depreciated_value=5185.91, state='draft'),
+            self._get_depreciation_move_values(date='2023-08-31', depreciation_value=87.57, remaining_value=1926.52, depreciated_value=5273.48, state='draft'),
+            self._get_depreciation_move_values(date='2023-09-30', depreciation_value=87.57, remaining_value=1838.95, depreciated_value=5361.05, state='draft'),
+            self._get_depreciation_move_values(date='2023-10-31', depreciation_value=87.57, remaining_value=1751.38, depreciated_value=5448.62, state='draft'),
+            self._get_depreciation_move_values(date='2023-11-30', depreciation_value=87.57, remaining_value=1663.81, depreciated_value=5536.19, state='draft'),
+            self._get_depreciation_move_values(date='2023-12-31', depreciation_value=87.57, remaining_value=1576.24, depreciated_value=5623.76, state='draft'),
+            # 2024
+            self._get_depreciation_move_values(date='2024-01-31', depreciation_value=87.57, remaining_value=1488.67, depreciated_value=5711.33, state='draft'),
+            self._get_depreciation_move_values(date='2024-02-29', depreciation_value=87.57, remaining_value=1401.10, depreciated_value=5798.90, state='draft'),
+            self._get_depreciation_move_values(date='2024-03-31', depreciation_value=87.57, remaining_value=1313.53, depreciated_value=5886.47, state='draft'),
+            self._get_depreciation_move_values(date='2024-04-30', depreciation_value=87.57, remaining_value=1225.96, depreciated_value=5974.04, state='draft'),
+            self._get_depreciation_move_values(date='2024-05-31', depreciation_value=87.56, remaining_value=1138.40, depreciated_value=6061.60, state='draft'),
+            self._get_depreciation_move_values(date='2024-06-30', depreciation_value=87.57, remaining_value=1050.83, depreciated_value=6149.17, state='draft'),
+            self._get_depreciation_move_values(date='2024-07-31', depreciation_value=87.57, remaining_value=963.26, depreciated_value=6236.74, state='draft'),
+            self._get_depreciation_move_values(date='2024-08-31', depreciation_value=87.57, remaining_value=875.69, depreciated_value=6324.31, state='draft'),
+            self._get_depreciation_move_values(date='2024-09-30', depreciation_value=87.57, remaining_value=788.12, depreciated_value=6411.88, state='draft'),
+            self._get_depreciation_move_values(date='2024-10-31', depreciation_value=87.57, remaining_value=700.55, depreciated_value=6499.45, state='draft'),
+            self._get_depreciation_move_values(date='2024-11-30', depreciation_value=87.57, remaining_value=612.98, depreciated_value=6587.02, state='draft'),
+            self._get_depreciation_move_values(date='2024-12-31', depreciation_value=87.57, remaining_value=525.41, depreciated_value=6674.59, state='draft'),
+            # 2025
+            self._get_depreciation_move_values(date='2025-01-31', depreciation_value=87.57, remaining_value=437.84, depreciated_value=6762.16, state='draft'),
+            self._get_depreciation_move_values(date='2025-02-28', depreciation_value=87.57, remaining_value=350.27, depreciated_value=6849.73, state='draft'),
+            self._get_depreciation_move_values(date='2025-03-31', depreciation_value=87.56, remaining_value=262.71, depreciated_value=6937.29, state='draft'),
+            self._get_depreciation_move_values(date='2025-04-30', depreciation_value=87.57, remaining_value=175.14, depreciated_value=7024.86, state='draft'),
+            self._get_depreciation_move_values(date='2025-05-31', depreciation_value=87.57, remaining_value=87.57, depreciated_value=7112.43, state='draft'),
+            self._get_depreciation_move_values(date='2025-06-30', depreciation_value=87.57, remaining_value=0.00, depreciated_value=7200.00, state='draft'),
+        ])
+
+        self.assertRecordValues(asset.children_ids[0].depreciation_move_ids.sorted(lambda mv: (mv.date, mv.id)), [
+            self._get_depreciation_move_values(date='2022-06-30', depreciation_value=123.96, remaining_value=8376.04, depreciated_value=123.96, state='posted'),
+            self._get_depreciation_move_values(date='2022-07-31', depreciation_value=247.92, remaining_value=8128.12, depreciated_value=371.88, state='draft'),
+            self._get_depreciation_move_values(date='2022-08-31', depreciation_value=247.91, remaining_value=7880.21, depreciated_value=619.79, state='draft'),
+            self._get_depreciation_move_values(date='2022-09-30', depreciation_value=247.92, remaining_value=7632.29, depreciated_value=867.71, state='draft'),
+            self._get_depreciation_move_values(date='2022-10-31', depreciation_value=247.92, remaining_value=7384.37, depreciated_value=1115.63, state='draft'),
+            self._get_depreciation_move_values(date='2022-11-30', depreciation_value=247.91, remaining_value=7136.46, depreciated_value=1363.54, state='draft'),
+            self._get_depreciation_move_values(date='2022-12-31', depreciation_value=247.92, remaining_value=6888.54, depreciated_value=1611.46, state='draft'),
+            # 2023
+            self._get_depreciation_move_values(date='2023-01-31', depreciation_value=229.62, remaining_value=6658.92, depreciated_value=1841.08, state='draft'),
+            self._get_depreciation_move_values(date='2023-02-28', depreciation_value=229.62, remaining_value=6429.30, depreciated_value=2070.70, state='draft'),
+            self._get_depreciation_move_values(date='2023-03-31', depreciation_value=229.61, remaining_value=6199.69, depreciated_value=2300.31, state='draft'),
+            self._get_depreciation_move_values(date='2023-04-30', depreciation_value=229.62, remaining_value=5970.07, depreciated_value=2529.93, state='draft'),
+            self._get_depreciation_move_values(date='2023-05-31', depreciation_value=229.62, remaining_value=5740.45, depreciated_value=2759.55, state='draft'),
+            self._get_depreciation_move_values(date='2023-06-30', depreciation_value=229.62, remaining_value=5510.83, depreciated_value=2989.17, state='draft'),
+            self._get_depreciation_move_values(date='2023-07-31', depreciation_value=229.62, remaining_value=5281.21, depreciated_value=3218.79, state='draft'),
+            self._get_depreciation_move_values(date='2023-08-31', depreciation_value=229.61, remaining_value=5051.60, depreciated_value=3448.40, state='draft'),
+            self._get_depreciation_move_values(date='2023-09-30', depreciation_value=229.62, remaining_value=4821.98, depreciated_value=3678.02, state='draft'),
+            self._get_depreciation_move_values(date='2023-10-31', depreciation_value=229.62, remaining_value=4592.36, depreciated_value=3907.64, state='draft'),
+            self._get_depreciation_move_values(date='2023-11-30', depreciation_value=229.62, remaining_value=4362.74, depreciated_value=4137.26, state='draft'),
+            self._get_depreciation_move_values(date='2023-12-31', depreciation_value=229.62, remaining_value=4133.12, depreciated_value=4366.88, state='draft'),
+            # 2024
+            self._get_depreciation_move_values(date='2024-01-31', depreciation_value=229.62, remaining_value=3903.50, depreciated_value=4596.50, state='draft'),
+            self._get_depreciation_move_values(date='2024-02-29', depreciation_value=229.62, remaining_value=3673.88, depreciated_value=4826.12, state='draft'),
+            self._get_depreciation_move_values(date='2024-03-31', depreciation_value=229.61, remaining_value=3444.27, depreciated_value=5055.73, state='draft'),
+            self._get_depreciation_move_values(date='2024-04-30', depreciation_value=229.62, remaining_value=3214.65, depreciated_value=5285.35, state='draft'),
+            self._get_depreciation_move_values(date='2024-05-31', depreciation_value=229.62, remaining_value=2985.03, depreciated_value=5514.97, state='draft'),
+            self._get_depreciation_move_values(date='2024-06-30', depreciation_value=229.62, remaining_value=2755.41, depreciated_value=5744.59, state='draft'),
+            self._get_depreciation_move_values(date='2024-07-31', depreciation_value=229.61, remaining_value=2525.80, depreciated_value=5974.20, state='draft'),
+            self._get_depreciation_move_values(date='2024-08-31', depreciation_value=229.62, remaining_value=2296.18, depreciated_value=6203.82, state='draft'),
+            self._get_depreciation_move_values(date='2024-09-30', depreciation_value=229.62, remaining_value=2066.56, depreciated_value=6433.44, state='draft'),
+            self._get_depreciation_move_values(date='2024-10-31', depreciation_value=229.62, remaining_value=1836.94, depreciated_value=6663.06, state='draft'),
+            self._get_depreciation_move_values(date='2024-11-30', depreciation_value=229.62, remaining_value=1607.32, depreciated_value=6892.68, state='draft'),
+            self._get_depreciation_move_values(date='2024-12-31', depreciation_value=229.61, remaining_value=1377.71, depreciated_value=7122.29, state='draft'),
+            # 2025
+            self._get_depreciation_move_values(date='2025-01-31', depreciation_value=229.62, remaining_value=1148.09, depreciated_value=7351.91, state='draft'),
+            self._get_depreciation_move_values(date='2025-02-28', depreciation_value=229.62, remaining_value=918.47, depreciated_value=7581.53, state='draft'),
+            self._get_depreciation_move_values(date='2025-03-31', depreciation_value=229.62, remaining_value=688.85, depreciated_value=7811.15, state='draft'),
+            self._get_depreciation_move_values(date='2025-04-30', depreciation_value=229.61, remaining_value=459.24, depreciated_value=8040.76, state='draft'),
+            self._get_depreciation_move_values(date='2025-05-31', depreciation_value=229.62, remaining_value=229.62, depreciated_value=8270.38, state='draft'),
+            self._get_depreciation_move_values(date='2025-06-30', depreciation_value=229.62, remaining_value=0.00, depreciated_value=8500.00, state='draft'),
+        ])
+
+    def test_monthly_degressive_start_beginning_month_increase_middle_month_on_linear_part(self):
+        asset = self.degressive_asset
+        asset.write({'acquisition_date': '2019-07-01'})
+        asset.validate()
+
+        date_modify = fields.Date.to_date("2022-06-15")
+        self.env['asset.modify'].create({
+            'asset_id': asset.id,
+            'name': 'Test reason',
+            'date':  date_modify,
+            'value_residual': asset._get_residual_value_at_date(date_modify) + 8500,
+            "account_asset_counterpart_id": self.asset_counterpart_account_id.id,
+        }).modify()
+
+        self.assertRecordValues(asset.depreciation_move_ids.sorted(lambda mv: (mv.date, mv.id)), [
+            self._get_depreciation_move_values(date='2019-07-31', depreciation_value=210.00, remaining_value=6990.00, depreciated_value=210.00, state='posted'),
+            self._get_depreciation_move_values(date='2019-08-31', depreciation_value=210.00, remaining_value=6780.00, depreciated_value=420.00, state='posted'),
+            self._get_depreciation_move_values(date='2019-09-30', depreciation_value=210.00, remaining_value=6570.00, depreciated_value=630.00, state='posted'),
+            self._get_depreciation_move_values(date='2019-10-31', depreciation_value=210.00, remaining_value=6360.00, depreciated_value=840.00, state='posted'),
+            self._get_depreciation_move_values(date='2019-11-30', depreciation_value=210.00, remaining_value=6150.00, depreciated_value=1050.00, state='posted'),
+            self._get_depreciation_move_values(date='2019-12-31', depreciation_value=210.00, remaining_value=5940.00, depreciated_value=1260.00, state='posted'),
+            # 2020
+            self._get_depreciation_move_values(date='2020-01-31', depreciation_value=173.25, remaining_value=5766.75, depreciated_value=1433.25, state='posted'),
+            self._get_depreciation_move_values(date='2020-02-29', depreciation_value=173.25, remaining_value=5593.50, depreciated_value=1606.50, state='posted'),
+            self._get_depreciation_move_values(date='2020-03-31', depreciation_value=173.25, remaining_value=5420.25, depreciated_value=1779.75, state='posted'),
+            self._get_depreciation_move_values(date='2020-04-30', depreciation_value=173.25, remaining_value=5247.00, depreciated_value=1953.00, state='posted'),
+            self._get_depreciation_move_values(date='2020-05-31', depreciation_value=173.25, remaining_value=5073.75, depreciated_value=2126.25, state='posted'),
+            self._get_depreciation_move_values(date='2020-06-30', depreciation_value=173.25, remaining_value=4900.50, depreciated_value=2299.50, state='posted'),
+            self._get_depreciation_move_values(date='2020-07-31', depreciation_value=173.25, remaining_value=4727.25, depreciated_value=2472.75, state='posted'),
+            self._get_depreciation_move_values(date='2020-08-31', depreciation_value=173.25, remaining_value=4554.00, depreciated_value=2646.00, state='posted'),
+            self._get_depreciation_move_values(date='2020-09-30', depreciation_value=173.25, remaining_value=4380.75, depreciated_value=2819.25, state='posted'),
+            self._get_depreciation_move_values(date='2020-10-31', depreciation_value=173.25, remaining_value=4207.50, depreciated_value=2992.50, state='posted'),
+            self._get_depreciation_move_values(date='2020-11-30', depreciation_value=173.25, remaining_value=4034.25, depreciated_value=3165.75, state='posted'),
+            self._get_depreciation_move_values(date='2020-12-31', depreciation_value=173.25, remaining_value=3861.00, depreciated_value=3339.00, state='posted'),
+            # 2021
+            self._get_depreciation_move_values(date='2021-01-31', depreciation_value=112.61, remaining_value=3748.39, depreciated_value=3451.61, state='posted'),
+            self._get_depreciation_move_values(date='2021-02-28', depreciation_value=112.61, remaining_value=3635.78, depreciated_value=3564.22, state='posted'),
+            self._get_depreciation_move_values(date='2021-03-31', depreciation_value=112.62, remaining_value=3523.16, depreciated_value=3676.84, state='posted'),
+            self._get_depreciation_move_values(date='2021-04-30', depreciation_value=112.61, remaining_value=3410.55, depreciated_value=3789.45, state='posted'),
+            self._get_depreciation_move_values(date='2021-05-31', depreciation_value=112.61, remaining_value=3297.94, depreciated_value=3902.06, state='posted'),
+            self._get_depreciation_move_values(date='2021-06-30', depreciation_value=112.61, remaining_value=3185.33, depreciated_value=4014.67, state='posted'),
+            self._get_depreciation_move_values(date='2021-07-31', depreciation_value=112.62, remaining_value=3072.71, depreciated_value=4127.29, state='posted'),
+            self._get_depreciation_move_values(date='2021-08-31', depreciation_value=112.61, remaining_value=2960.10, depreciated_value=4239.90, state='posted'),
+            self._get_depreciation_move_values(date='2021-09-30', depreciation_value=112.61, remaining_value=2847.49, depreciated_value=4352.51, state='posted'),
+            self._get_depreciation_move_values(date='2021-10-31', depreciation_value=112.61, remaining_value=2734.88, depreciated_value=4465.12, state='posted'),
+            self._get_depreciation_move_values(date='2021-11-30', depreciation_value=112.62, remaining_value=2622.26, depreciated_value=4577.74, state='posted'),
+            self._get_depreciation_move_values(date='2021-12-31', depreciation_value=112.61, remaining_value=2509.65, depreciated_value=4690.35, state='posted'),
+            # 2022
+            self._get_depreciation_move_values(date='2022-01-31', depreciation_value=83.66, remaining_value=2425.99, depreciated_value=4774.01, state='posted'),
+            self._get_depreciation_move_values(date='2022-02-28', depreciation_value=83.65, remaining_value=2342.34, depreciated_value=4857.66, state='posted'),
+            self._get_depreciation_move_values(date='2022-03-31', depreciation_value=83.65, remaining_value=2258.69, depreciated_value=4941.31, state='posted'),
+            self._get_depreciation_move_values(date='2022-04-30', depreciation_value=83.66, remaining_value=2175.03, depreciated_value=5024.97, state='posted'),
+            self._get_depreciation_move_values(date='2022-05-31', depreciation_value=83.66, remaining_value=2091.37, depreciated_value=5108.63, state='posted'),
+            # Increase
+            self._get_depreciation_move_values(date='2022-06-15', depreciation_value=41.82, remaining_value=2049.55, depreciated_value=5150.45, state='posted'),
+            self._get_depreciation_move_values(date='2022-06-30', depreciation_value=41.83, remaining_value=2007.72, depreciated_value=5192.28, state='posted'),
+            self._get_depreciation_move_values(date='2022-07-31', depreciation_value=83.65, remaining_value=1924.07, depreciated_value=5275.93, state='draft'),
+            self._get_depreciation_move_values(date='2022-08-31', depreciation_value=83.66, remaining_value=1840.41, depreciated_value=5359.59, state='draft'),
+            self._get_depreciation_move_values(date='2022-09-30', depreciation_value=83.65, remaining_value=1756.76, depreciated_value=5443.24, state='draft'),
+            self._get_depreciation_move_values(date='2022-10-31', depreciation_value=83.66, remaining_value=1673.10, depreciated_value=5526.90, state='draft'),
+            self._get_depreciation_move_values(date='2022-11-30', depreciation_value=83.65, remaining_value=1589.45, depreciated_value=5610.55, state='draft'),
+            self._get_depreciation_move_values(date='2022-12-31', depreciation_value=83.66, remaining_value=1505.79, depreciated_value=5694.21, state='draft'),
+            # 2023
+            self._get_depreciation_move_values(date='2023-01-31', depreciation_value=83.66, remaining_value=1422.13, depreciated_value=5777.87, state='draft'),
+            self._get_depreciation_move_values(date='2023-02-28', depreciation_value=83.65, remaining_value=1338.48, depreciated_value=5861.52, state='draft'),
+            self._get_depreciation_move_values(date='2023-03-31', depreciation_value=83.65, remaining_value=1254.83, depreciated_value=5945.17, state='draft'),
+            self._get_depreciation_move_values(date='2023-04-30', depreciation_value=83.66, remaining_value=1171.17, depreciated_value=6028.83, state='draft'),
+            self._get_depreciation_move_values(date='2023-05-31', depreciation_value=83.65, remaining_value=1087.52, depreciated_value=6112.48, state='draft'),
+            self._get_depreciation_move_values(date='2023-06-30', depreciation_value=83.66, remaining_value=1003.86, depreciated_value=6196.14, state='draft'),
+            self._get_depreciation_move_values(date='2023-07-31', depreciation_value=83.65, remaining_value=920.21, depreciated_value=6279.79, state='draft'),
+            self._get_depreciation_move_values(date='2023-08-31', depreciation_value=83.66, remaining_value=836.55, depreciated_value=6363.45, state='draft'),
+            self._get_depreciation_move_values(date='2023-09-30', depreciation_value=83.65, remaining_value=752.90, depreciated_value=6447.10, state='draft'),
+            self._get_depreciation_move_values(date='2023-10-31', depreciation_value=83.66, remaining_value=669.24, depreciated_value=6530.76, state='draft'),
+            self._get_depreciation_move_values(date='2023-11-30', depreciation_value=83.65, remaining_value=585.59, depreciated_value=6614.41, state='draft'),
+            self._get_depreciation_move_values(date='2023-12-31', depreciation_value=83.66, remaining_value=501.93, depreciated_value=6698.07, state='draft'),
+            # 2024
+            self._get_depreciation_move_values(date='2024-01-31', depreciation_value=83.65, remaining_value=418.28, depreciated_value=6781.72, state='draft'),
+            self._get_depreciation_move_values(date='2024-02-29', depreciation_value=83.66, remaining_value=334.62, depreciated_value=6865.38, state='draft'),
+            self._get_depreciation_move_values(date='2024-03-31', depreciation_value=83.65, remaining_value=250.97, depreciated_value=6949.03, state='draft'),
+            self._get_depreciation_move_values(date='2024-04-30', depreciation_value=83.66, remaining_value=167.31, depreciated_value=7032.69, state='draft'),
+            self._get_depreciation_move_values(date='2024-05-31', depreciation_value=83.65, remaining_value=83.66, depreciated_value=7116.34, state='draft'),
+            self._get_depreciation_move_values(date='2024-06-30', depreciation_value=83.66, remaining_value=0.00, depreciated_value=7200.00, state='draft'),
+        ])
+
+        self.assertRecordValues(asset.children_ids[0].depreciation_move_ids.sorted(lambda mv: (mv.date, mv.id)), [
+            self._get_depreciation_move_values(date='2022-06-30', depreciation_value=173.47, remaining_value=8326.53, depreciated_value=173.47, state='posted'),
+            self._get_depreciation_move_values(date='2022-07-31', depreciation_value=346.94, remaining_value=7979.59, depreciated_value=520.41, state='draft'),
+            self._get_depreciation_move_values(date='2022-08-31', depreciation_value=346.94, remaining_value=7632.65, depreciated_value=867.35, state='draft'),
+            self._get_depreciation_move_values(date='2022-09-30', depreciation_value=346.94, remaining_value=7285.71, depreciated_value=1214.29, state='draft'),
+            self._get_depreciation_move_values(date='2022-10-31', depreciation_value=346.93, remaining_value=6938.78, depreciated_value=1561.22, state='draft'),
+            self._get_depreciation_move_values(date='2022-11-30', depreciation_value=346.94, remaining_value=6591.84, depreciated_value=1908.16, state='draft'),
+            self._get_depreciation_move_values(date='2022-12-31', depreciation_value=346.94, remaining_value=6244.90, depreciated_value=2255.10, state='draft'),
+            # 2023
+            self._get_depreciation_move_values(date='2023-01-31', depreciation_value=346.94, remaining_value=5897.96, depreciated_value=2602.04, state='draft'),
+            self._get_depreciation_move_values(date='2023-02-28', depreciation_value=346.94, remaining_value=5551.02, depreciated_value=2948.98, state='draft'),
+            self._get_depreciation_move_values(date='2023-03-31', depreciation_value=346.94, remaining_value=5204.08, depreciated_value=3295.92, state='draft'),
+            self._get_depreciation_move_values(date='2023-04-30', depreciation_value=346.94, remaining_value=4857.14, depreciated_value=3642.86, state='draft'),
+            self._get_depreciation_move_values(date='2023-05-31', depreciation_value=346.93, remaining_value=4510.21, depreciated_value=3989.79, state='draft'),
+            self._get_depreciation_move_values(date='2023-06-30', depreciation_value=346.94, remaining_value=4163.27, depreciated_value=4336.73, state='draft'),
+            self._get_depreciation_move_values(date='2023-07-31', depreciation_value=346.94, remaining_value=3816.33, depreciated_value=4683.67, state='draft'),
+            self._get_depreciation_move_values(date='2023-08-31', depreciation_value=346.94, remaining_value=3469.39, depreciated_value=5030.61, state='draft'),
+            self._get_depreciation_move_values(date='2023-09-30', depreciation_value=346.94, remaining_value=3122.45, depreciated_value=5377.55, state='draft'),
+            self._get_depreciation_move_values(date='2023-10-31', depreciation_value=346.94, remaining_value=2775.51, depreciated_value=5724.49, state='draft'),
+            self._get_depreciation_move_values(date='2023-11-30', depreciation_value=346.94, remaining_value=2428.57, depreciated_value=6071.43, state='draft'),
+            self._get_depreciation_move_values(date='2023-12-31', depreciation_value=346.94, remaining_value=2081.63, depreciated_value=6418.37, state='draft'),
+            # 2024
+            self._get_depreciation_move_values(date='2024-01-31', depreciation_value=346.94, remaining_value=1734.69, depreciated_value=6765.31, state='draft'),
+            self._get_depreciation_move_values(date='2024-02-29', depreciation_value=346.94, remaining_value=1387.75, depreciated_value=7112.25, state='draft'),
+            self._get_depreciation_move_values(date='2024-03-31', depreciation_value=346.94, remaining_value=1040.81, depreciated_value=7459.19, state='draft'),
+            self._get_depreciation_move_values(date='2024-04-30', depreciation_value=346.93, remaining_value=693.88, depreciated_value=7806.12, state='draft'),
+            self._get_depreciation_move_values(date='2024-05-31', depreciation_value=346.94, remaining_value=346.94, depreciated_value=8153.06, state='draft'),
+            self._get_depreciation_move_values(date='2024-06-30', depreciation_value=346.94, remaining_value=0.00, depreciated_value=8500.00, state='draft'),
+        ])
+
+    def test_monthly_degressive_start_beginning_month_decrease_middle_month(self):
+        asset = self.degressive_asset
+        asset.validate()
+
+        date_modify = fields.Date.to_date("2022-06-15")
+        self.env['asset.modify'].create({
+            'asset_id': asset.id,
+            'name': 'Test reason',
+            'date':  date_modify,
+            'value_residual': asset._get_residual_value_at_date(date_modify) - 500,
+            "account_asset_counterpart_id": self.asset_counterpart_account_id.id,
+        }).modify()
+
+        self.assertRecordValues(asset.depreciation_move_ids.sorted(lambda mv: (mv.date, mv.id)), [
+            self._get_depreciation_move_values(date='2020-07-31', depreciation_value=210.00, remaining_value=6990.00, depreciated_value=210.00, state='posted'),
+            self._get_depreciation_move_values(date='2020-08-31', depreciation_value=210.00, remaining_value=6780.00, depreciated_value=420.00, state='posted'),
+            self._get_depreciation_move_values(date='2020-09-30', depreciation_value=210.00, remaining_value=6570.00, depreciated_value=630.00, state='posted'),
+            self._get_depreciation_move_values(date='2020-10-31', depreciation_value=210.00, remaining_value=6360.00, depreciated_value=840.00, state='posted'),
+            self._get_depreciation_move_values(date='2020-11-30', depreciation_value=210.00, remaining_value=6150.00, depreciated_value=1050.00, state='posted'),
+            self._get_depreciation_move_values(date='2020-12-31', depreciation_value=210.00, remaining_value=5940.00, depreciated_value=1260.00, state='posted'),
+            # 2021
+            self._get_depreciation_move_values(date='2021-01-31', depreciation_value=173.25, remaining_value=5766.75, depreciated_value=1433.25, state='posted'),
+            self._get_depreciation_move_values(date='2021-02-28', depreciation_value=173.25, remaining_value=5593.50, depreciated_value=1606.50, state='posted'),
+            self._get_depreciation_move_values(date='2021-03-31', depreciation_value=173.25, remaining_value=5420.25, depreciated_value=1779.75, state='posted'),
+            self._get_depreciation_move_values(date='2021-04-30', depreciation_value=173.25, remaining_value=5247.00, depreciated_value=1953.00, state='posted'),
+            self._get_depreciation_move_values(date='2021-05-31', depreciation_value=173.25, remaining_value=5073.75, depreciated_value=2126.25, state='posted'),
+            self._get_depreciation_move_values(date='2021-06-30', depreciation_value=173.25, remaining_value=4900.50, depreciated_value=2299.50, state='posted'),
+            self._get_depreciation_move_values(date='2021-07-31', depreciation_value=173.25, remaining_value=4727.25, depreciated_value=2472.75, state='posted'),
+            self._get_depreciation_move_values(date='2021-08-31', depreciation_value=173.25, remaining_value=4554.00, depreciated_value=2646.00, state='posted'),
+            self._get_depreciation_move_values(date='2021-09-30', depreciation_value=173.25, remaining_value=4380.75, depreciated_value=2819.25, state='posted'),
+            self._get_depreciation_move_values(date='2021-10-31', depreciation_value=173.25, remaining_value=4207.50, depreciated_value=2992.50, state='posted'),
+            self._get_depreciation_move_values(date='2021-11-30', depreciation_value=173.25, remaining_value=4034.25, depreciated_value=3165.75, state='posted'),
+            self._get_depreciation_move_values(date='2021-12-31', depreciation_value=173.25, remaining_value=3861.00, depreciated_value=3339.00, state='posted'),
+            # 2022
+            self._get_depreciation_move_values(date='2022-01-31', depreciation_value=112.61, remaining_value=3748.39, depreciated_value=3451.61, state='posted'),
+            self._get_depreciation_move_values(date='2022-02-28', depreciation_value=112.61, remaining_value=3635.78, depreciated_value=3564.22, state='posted'),
+            self._get_depreciation_move_values(date='2022-03-31', depreciation_value=112.62, remaining_value=3523.16, depreciated_value=3676.84, state='posted'),
+            self._get_depreciation_move_values(date='2022-04-30', depreciation_value=112.61, remaining_value=3410.55, depreciated_value=3789.45, state='posted'),
+            self._get_depreciation_move_values(date='2022-05-31', depreciation_value=112.61, remaining_value=3297.94, depreciated_value=3902.06, state='posted'),
+            self._get_depreciation_move_values(date='2022-06-15', depreciation_value=56.31, remaining_value=3241.63, depreciated_value=3958.37, state='posted'),
+            # Decrease
+            self._get_depreciation_move_values(date='2022-06-15', depreciation_value=500.00, remaining_value=2741.63, depreciated_value=4458.37, state='posted'),
+            self._get_depreciation_move_values(date='2022-06-30', depreciation_value=39.98, remaining_value=2701.65, depreciated_value=4498.35, state='posted'),
+            self._get_depreciation_move_values(date='2022-07-31', depreciation_value=79.97, remaining_value=2621.68, depreciated_value=4578.32, state='draft'),
+            self._get_depreciation_move_values(date='2022-08-31', depreciation_value=79.96, remaining_value=2541.72, depreciated_value=4658.28, state='draft'),
+            self._get_depreciation_move_values(date='2022-09-30', depreciation_value=79.96, remaining_value=2461.76, depreciated_value=4738.24, state='draft'),
+            self._get_depreciation_move_values(date='2022-10-31', depreciation_value=79.97, remaining_value=2381.79, depreciated_value=4818.21, state='draft'),
+            self._get_depreciation_move_values(date='2022-11-30', depreciation_value=79.96, remaining_value=2301.83, depreciated_value=4898.17, state='draft'),
+            self._get_depreciation_move_values(date='2022-12-31', depreciation_value=79.97, remaining_value=2221.86, depreciated_value=4978.14, state='draft'),
+            # 2023
+            self._get_depreciation_move_values(date='2023-01-31', depreciation_value=74.06, remaining_value=2147.80, depreciated_value=5052.20, state='draft'),
+            self._get_depreciation_move_values(date='2023-02-28', depreciation_value=74.06, remaining_value=2073.74, depreciated_value=5126.26, state='draft'),
+            self._get_depreciation_move_values(date='2023-03-31', depreciation_value=74.07, remaining_value=1999.67, depreciated_value=5200.33, state='draft'),
+            self._get_depreciation_move_values(date='2023-04-30', depreciation_value=74.06, remaining_value=1925.61, depreciated_value=5274.39, state='draft'),
+            self._get_depreciation_move_values(date='2023-05-31', depreciation_value=74.06, remaining_value=1851.55, depreciated_value=5348.45, state='draft'),
+            self._get_depreciation_move_values(date='2023-06-30', depreciation_value=74.06, remaining_value=1777.49, depreciated_value=5422.51, state='draft'),
+            self._get_depreciation_move_values(date='2023-07-31', depreciation_value=74.06, remaining_value=1703.43, depreciated_value=5496.57, state='draft'),
+            self._get_depreciation_move_values(date='2023-08-31', depreciation_value=74.07, remaining_value=1629.36, depreciated_value=5570.64, state='draft'),
+            self._get_depreciation_move_values(date='2023-09-30', depreciation_value=74.06, remaining_value=1555.30, depreciated_value=5644.70, state='draft'),
+            self._get_depreciation_move_values(date='2023-10-31', depreciation_value=74.06, remaining_value=1481.24, depreciated_value=5718.76, state='draft'),
+            self._get_depreciation_move_values(date='2023-11-30', depreciation_value=74.06, remaining_value=1407.18, depreciated_value=5792.82, state='draft'),
+            self._get_depreciation_move_values(date='2023-12-31', depreciation_value=74.06, remaining_value=1333.12, depreciated_value=5866.88, state='draft'),
+            # 2024
+            self._get_depreciation_move_values(date='2024-01-31', depreciation_value=74.06, remaining_value=1259.06, depreciated_value=5940.94, state='draft'),
+            self._get_depreciation_move_values(date='2024-02-29', depreciation_value=74.06, remaining_value=1185.00, depreciated_value=6015.00, state='draft'),
+            self._get_depreciation_move_values(date='2024-03-31', depreciation_value=74.07, remaining_value=1110.93, depreciated_value=6089.07, state='draft'),
+            self._get_depreciation_move_values(date='2024-04-30', depreciation_value=74.06, remaining_value=1036.87, depreciated_value=6163.13, state='draft'),
+            self._get_depreciation_move_values(date='2024-05-31', depreciation_value=74.06, remaining_value=962.81, depreciated_value=6237.19, state='draft'),
+            self._get_depreciation_move_values(date='2024-06-30', depreciation_value=74.06, remaining_value=888.75, depreciated_value=6311.25, state='draft'),
+            self._get_depreciation_move_values(date='2024-07-31', depreciation_value=74.07, remaining_value=814.68, depreciated_value=6385.32, state='draft'),
+            self._get_depreciation_move_values(date='2024-08-31', depreciation_value=74.06, remaining_value=740.62, depreciated_value=6459.38, state='draft'),
+            self._get_depreciation_move_values(date='2024-09-30', depreciation_value=74.06, remaining_value=666.56, depreciated_value=6533.44, state='draft'),
+            self._get_depreciation_move_values(date='2024-10-31', depreciation_value=74.06, remaining_value=592.50, depreciated_value=6607.50, state='draft'),
+            self._get_depreciation_move_values(date='2024-11-30', depreciation_value=74.06, remaining_value=518.44, depreciated_value=6681.56, state='draft'),
+            self._get_depreciation_move_values(date='2024-12-31', depreciation_value=74.07, remaining_value=444.37, depreciated_value=6755.63, state='draft'),
+            # 2025
+            self._get_depreciation_move_values(date='2025-01-31', depreciation_value=74.06, remaining_value=370.31, depreciated_value=6829.69, state='draft'),
+            self._get_depreciation_move_values(date='2025-02-28', depreciation_value=74.06, remaining_value=296.25, depreciated_value=6903.75, state='draft'),
+            self._get_depreciation_move_values(date='2025-03-31', depreciation_value=74.07, remaining_value=222.18, depreciated_value=6977.82, state='draft'),
+            self._get_depreciation_move_values(date='2025-04-30', depreciation_value=74.06, remaining_value=148.12, depreciated_value=7051.88, state='draft'),
+            self._get_depreciation_move_values(date='2025-05-31', depreciation_value=74.06, remaining_value=74.06, depreciated_value=7125.94, state='draft'),
+            self._get_depreciation_move_values(date='2025-06-30', depreciation_value=74.06, remaining_value=0.00, depreciated_value=7200.00, state='draft'),
+        ])
+
+    def test_monthly_degressive_then_linear_start_beginning_month_increase_middle_month_on_degressive_part(self):
+        asset = self.degressive_then_linear_asset
+        asset.validate()
+
+        date_modify = fields.Date.to_date("2021-06-15")
+        self.env['asset.modify'].create({
+            'asset_id': asset.id,
+            'name': 'Test reason',
+            'date':  date_modify,
+            'value_residual': asset._get_residual_value_at_date(date_modify) + 8500,
+            "account_asset_counterpart_id": self.asset_counterpart_account_id.id,
+        }).modify()
+
+        self.assertRecordValues(asset.depreciation_move_ids.sorted(lambda mv: (mv.date, mv.id)), [
+            self._get_depreciation_move_values(date='2020-07-31', depreciation_value=210.00, remaining_value=6990.00, depreciated_value=210.00, state='posted'),
+            self._get_depreciation_move_values(date='2020-08-31', depreciation_value=210.00, remaining_value=6780.00, depreciated_value=420.00, state='posted'),
+            self._get_depreciation_move_values(date='2020-09-30', depreciation_value=210.00, remaining_value=6570.00, depreciated_value=630.00, state='posted'),
+            self._get_depreciation_move_values(date='2020-10-31', depreciation_value=210.00, remaining_value=6360.00, depreciated_value=840.00, state='posted'),
+            self._get_depreciation_move_values(date='2020-11-30', depreciation_value=210.00, remaining_value=6150.00, depreciated_value=1050.00, state='posted'),
+            self._get_depreciation_move_values(date='2020-12-31', depreciation_value=210.00, remaining_value=5940.00, depreciated_value=1260.00, state='posted'),
+            # 2021
+            self._get_depreciation_move_values(date='2021-01-31', depreciation_value=173.25, remaining_value=5766.75, depreciated_value=1433.25, state='posted'),
+            self._get_depreciation_move_values(date='2021-02-28', depreciation_value=173.25, remaining_value=5593.50, depreciated_value=1606.50, state='posted'),
+            self._get_depreciation_move_values(date='2021-03-31', depreciation_value=173.25, remaining_value=5420.25, depreciated_value=1779.75, state='posted'),
+            self._get_depreciation_move_values(date='2021-04-30', depreciation_value=173.25, remaining_value=5247.00, depreciated_value=1953.00, state='posted'),
+            self._get_depreciation_move_values(date='2021-05-31', depreciation_value=173.25, remaining_value=5073.75, depreciated_value=2126.25, state='posted'),
+            # Increase
+            self._get_depreciation_move_values(date='2021-06-15', depreciation_value=86.63, remaining_value=4987.12, depreciated_value=2212.88, state='posted'),
+            self._get_depreciation_move_values(date='2021-06-30', depreciation_value=72.73, remaining_value=4914.39, depreciated_value=2285.61, state='posted'),
+            self._get_depreciation_move_values(date='2021-07-31', depreciation_value=145.46, remaining_value=4768.93, depreciated_value=2431.07, state='posted'),
+            self._get_depreciation_move_values(date='2021-08-31', depreciation_value=145.45, remaining_value=4623.48, depreciated_value=2576.52, state='posted'),
+            self._get_depreciation_move_values(date='2021-09-30', depreciation_value=145.46, remaining_value=4478.02, depreciated_value=2721.98, state='posted'),
+            self._get_depreciation_move_values(date='2021-10-31', depreciation_value=145.46, remaining_value=4332.56, depreciated_value=2867.44, state='posted'),
+            self._get_depreciation_move_values(date='2021-11-30', depreciation_value=145.46, remaining_value=4187.10, depreciated_value=3012.90, state='posted'),
+            self._get_depreciation_move_values(date='2021-12-31', depreciation_value=145.45, remaining_value=4041.65, depreciated_value=3158.35, state='posted'),
+            # 2022
+            self._get_depreciation_move_values(date='2022-01-31', depreciation_value=120.00, remaining_value=3921.65, depreciated_value=3278.35, state='posted'),
+            self._get_depreciation_move_values(date='2022-02-28', depreciation_value=120.00, remaining_value=3801.65, depreciated_value=3398.35, state='posted'),
+            self._get_depreciation_move_values(date='2022-03-31', depreciation_value=120.00, remaining_value=3681.65, depreciated_value=3518.35, state='posted'),
+            self._get_depreciation_move_values(date='2022-04-30', depreciation_value=120.00, remaining_value=3561.65, depreciated_value=3638.35, state='posted'),
+            self._get_depreciation_move_values(date='2022-05-31', depreciation_value=120.00, remaining_value=3441.65, depreciated_value=3758.35, state='posted'),
+            self._get_depreciation_move_values(date='2022-06-30', depreciation_value=120.00, remaining_value=3321.65, depreciated_value=3878.35, state='posted'),
+            self._get_depreciation_move_values(date='2022-07-31', depreciation_value=120.00, remaining_value=3201.65, depreciated_value=3998.35, state='draft'),
+            self._get_depreciation_move_values(date='2022-08-31', depreciation_value=120.00, remaining_value=3081.65, depreciated_value=4118.35, state='draft'),
+            self._get_depreciation_move_values(date='2022-09-30', depreciation_value=120.00, remaining_value=2961.65, depreciated_value=4238.35, state='draft'),
+            self._get_depreciation_move_values(date='2022-10-31', depreciation_value=120.00, remaining_value=2841.65, depreciated_value=4358.35, state='draft'),
+            self._get_depreciation_move_values(date='2022-11-30', depreciation_value=120.00, remaining_value=2721.65, depreciated_value=4478.35, state='draft'),
+            self._get_depreciation_move_values(date='2022-12-31', depreciation_value=120.00, remaining_value=2601.65, depreciated_value=4598.35, state='draft'),
+            # 2023
+            self._get_depreciation_move_values(date='2023-01-31', depreciation_value=120.00, remaining_value=2481.65, depreciated_value=4718.35, state='draft'),
+            self._get_depreciation_move_values(date='2023-02-28', depreciation_value=120.00, remaining_value=2361.65, depreciated_value=4838.35, state='draft'),
+            self._get_depreciation_move_values(date='2023-03-31', depreciation_value=120.00, remaining_value=2241.65, depreciated_value=4958.35, state='draft'),
+            self._get_depreciation_move_values(date='2023-04-30', depreciation_value=120.00, remaining_value=2121.65, depreciated_value=5078.35, state='draft'),
+            self._get_depreciation_move_values(date='2023-05-31', depreciation_value=120.00, remaining_value=2001.65, depreciated_value=5198.35, state='draft'),
+            self._get_depreciation_move_values(date='2023-06-30', depreciation_value=120.00, remaining_value=1881.65, depreciated_value=5318.35, state='draft'),
+            self._get_depreciation_move_values(date='2023-07-31', depreciation_value=120.00, remaining_value=1761.65, depreciated_value=5438.35, state='draft'),
+            self._get_depreciation_move_values(date='2023-08-31', depreciation_value=120.00, remaining_value=1641.65, depreciated_value=5558.35, state='draft'),
+            self._get_depreciation_move_values(date='2023-09-30', depreciation_value=120.00, remaining_value=1521.65, depreciated_value=5678.35, state='draft'),
+            self._get_depreciation_move_values(date='2023-10-31', depreciation_value=120.00, remaining_value=1401.65, depreciated_value=5798.35, state='draft'),
+            self._get_depreciation_move_values(date='2023-11-30', depreciation_value=120.00, remaining_value=1281.65, depreciated_value=5918.35, state='draft'),
+            self._get_depreciation_move_values(date='2023-12-31', depreciation_value=120.00, remaining_value=1161.65, depreciated_value=6038.35, state='draft'),
+            # 2024
+            self._get_depreciation_move_values(date='2024-01-31', depreciation_value=120.00, remaining_value=1041.65, depreciated_value=6158.35, state='draft'),
+            self._get_depreciation_move_values(date='2024-02-29', depreciation_value=120.00, remaining_value=921.65, depreciated_value=6278.35, state='draft'),
+            self._get_depreciation_move_values(date='2024-03-31', depreciation_value=120.00, remaining_value=801.65, depreciated_value=6398.35, state='draft'),
+            self._get_depreciation_move_values(date='2024-04-30', depreciation_value=120.00, remaining_value=681.65, depreciated_value=6518.35, state='draft'),
+            self._get_depreciation_move_values(date='2024-05-31', depreciation_value=120.00, remaining_value=561.65, depreciated_value=6638.35, state='draft'),
+            self._get_depreciation_move_values(date='2024-06-30', depreciation_value=120.00, remaining_value=441.65, depreciated_value=6758.35, state='draft'),
+            self._get_depreciation_move_values(date='2024-07-31', depreciation_value=120.00, remaining_value=321.65, depreciated_value=6878.35, state='draft'),
+            self._get_depreciation_move_values(date='2024-08-31', depreciation_value=120.00, remaining_value=201.65, depreciated_value=6998.35, state='draft'),
+            self._get_depreciation_move_values(date='2024-09-30', depreciation_value=120.00, remaining_value=81.65, depreciated_value=7118.35, state='draft'),
+            self._get_depreciation_move_values(date='2024-10-31', depreciation_value=81.65, remaining_value=0.00, depreciated_value=7200.00, state='draft'),
+        ])
+
+        self.assertRecordValues(asset.children_ids[0].depreciation_move_ids.sorted(lambda mv: (mv.date, mv.id)), [
+            self._get_depreciation_move_values(date='2021-06-30', depreciation_value=123.96, remaining_value=8376.04, depreciated_value=123.96, state='posted'),
+            self._get_depreciation_move_values(date='2021-07-31', depreciation_value=247.92, remaining_value=8128.12, depreciated_value=371.88, state='posted'),
+            self._get_depreciation_move_values(date='2021-08-31', depreciation_value=247.91, remaining_value=7880.21, depreciated_value=619.79, state='posted'),
+            self._get_depreciation_move_values(date='2021-09-30', depreciation_value=247.92, remaining_value=7632.29, depreciated_value=867.71, state='posted'),
+            self._get_depreciation_move_values(date='2021-10-31', depreciation_value=247.92, remaining_value=7384.37, depreciated_value=1115.63, state='posted'),
+            self._get_depreciation_move_values(date='2021-11-30', depreciation_value=247.91, remaining_value=7136.46, depreciated_value=1363.54, state='posted'),
+            self._get_depreciation_move_values(date='2021-12-31', depreciation_value=247.92, remaining_value=6888.54, depreciated_value=1611.46, state='posted'),
+            # 2022
+            self._get_depreciation_move_values(date='2022-01-31', depreciation_value=204.52, remaining_value=6684.02, depreciated_value=1815.98, state='posted'),
+            self._get_depreciation_move_values(date='2022-02-28', depreciation_value=204.52, remaining_value=6479.50, depreciated_value=2020.50, state='posted'),
+            self._get_depreciation_move_values(date='2022-03-31', depreciation_value=204.53, remaining_value=6274.97, depreciated_value=2225.03, state='posted'),
+            self._get_depreciation_move_values(date='2022-04-30', depreciation_value=204.52, remaining_value=6070.45, depreciated_value=2429.55, state='posted'),
+            self._get_depreciation_move_values(date='2022-05-31', depreciation_value=204.52, remaining_value=5865.93, depreciated_value=2634.07, state='posted'),
+            self._get_depreciation_move_values(date='2022-06-30', depreciation_value=204.53, remaining_value=5661.40, depreciated_value=2838.60, state='posted'),
+            self._get_depreciation_move_values(date='2022-07-31', depreciation_value=204.52, remaining_value=5456.88, depreciated_value=3043.12, state='draft'),
+            self._get_depreciation_move_values(date='2022-08-31', depreciation_value=204.52, remaining_value=5252.36, depreciated_value=3247.64, state='draft'),
+            self._get_depreciation_move_values(date='2022-09-30', depreciation_value=204.53, remaining_value=5047.83, depreciated_value=3452.17, state='draft'),
+            self._get_depreciation_move_values(date='2022-10-31', depreciation_value=204.52, remaining_value=4843.31, depreciated_value=3656.69, state='draft'),
+            self._get_depreciation_move_values(date='2022-11-30', depreciation_value=204.52, remaining_value=4638.79, depreciated_value=3861.21, state='draft'),
+            self._get_depreciation_move_values(date='2022-12-31', depreciation_value=204.52, remaining_value=4434.27, depreciated_value=4065.73, state='draft'),
+            # 2023
+            self._get_depreciation_move_values(date='2023-01-31', depreciation_value=204.53, remaining_value=4229.74, depreciated_value=4270.26, state='draft'),
+            self._get_depreciation_move_values(date='2023-02-28', depreciation_value=204.52, remaining_value=4025.22, depreciated_value=4474.78, state='draft'),
+            self._get_depreciation_move_values(date='2023-03-31', depreciation_value=204.52, remaining_value=3820.70, depreciated_value=4679.30, state='draft'),
+            self._get_depreciation_move_values(date='2023-04-30', depreciation_value=204.53, remaining_value=3616.17, depreciated_value=4883.83, state='draft'),
+            self._get_depreciation_move_values(date='2023-05-31', depreciation_value=204.52, remaining_value=3411.65, depreciated_value=5088.35, state='draft'),
+            self._get_depreciation_move_values(date='2023-06-30', depreciation_value=204.52, remaining_value=3207.13, depreciated_value=5292.87, state='draft'),
+            self._get_depreciation_move_values(date='2023-07-31', depreciation_value=204.52, remaining_value=3002.61, depreciated_value=5497.39, state='draft'),
+            self._get_depreciation_move_values(date='2023-08-31', depreciation_value=204.53, remaining_value=2798.08, depreciated_value=5701.92, state='draft'),
+            self._get_depreciation_move_values(date='2023-09-30', depreciation_value=204.52, remaining_value=2593.56, depreciated_value=5906.44, state='draft'),
+            self._get_depreciation_move_values(date='2023-10-31', depreciation_value=204.52, remaining_value=2389.04, depreciated_value=6110.96, state='draft'),
+            self._get_depreciation_move_values(date='2023-11-30', depreciation_value=204.53, remaining_value=2184.51, depreciated_value=6315.49, state='draft'),
+            self._get_depreciation_move_values(date='2023-12-31', depreciation_value=204.52, remaining_value=1979.99, depreciated_value=6520.01, state='draft'),
+            # 2024
+            self._get_depreciation_move_values(date='2024-01-31', depreciation_value=204.52, remaining_value=1775.47, depreciated_value=6724.53, state='draft'),
+            self._get_depreciation_move_values(date='2024-02-29', depreciation_value=204.52, remaining_value=1570.95, depreciated_value=6929.05, state='draft'),
+            self._get_depreciation_move_values(date='2024-03-31', depreciation_value=204.53, remaining_value=1366.42, depreciated_value=7133.58, state='draft'),
+            self._get_depreciation_move_values(date='2024-04-30', depreciation_value=204.52, remaining_value=1161.90, depreciated_value=7338.10, state='draft'),
+            self._get_depreciation_move_values(date='2024-05-31', depreciation_value=204.52, remaining_value=957.38, depreciated_value=7542.62, state='draft'),
+            self._get_depreciation_move_values(date='2024-06-30', depreciation_value=204.53, remaining_value=752.85, depreciated_value=7747.15, state='draft'),
+            self._get_depreciation_move_values(date='2024-07-31', depreciation_value=204.52, remaining_value=548.33, depreciated_value=7951.67, state='draft'),
+            self._get_depreciation_move_values(date='2024-08-31', depreciation_value=204.52, remaining_value=343.81, depreciated_value=8156.19, state='draft'),
+            self._get_depreciation_move_values(date='2024-09-30', depreciation_value=204.53, remaining_value=139.28, depreciated_value=8360.72, state='draft'),
+            self._get_depreciation_move_values(date='2024-10-31', depreciation_value=139.28, remaining_value=0.00, depreciated_value=8500.00, state='draft'),
+        ])
+
+    def test_monthly_degressive_then_linear_start_beginning_month_increase_middle_month_on_linear_part(self):
+        asset = self.degressive_then_linear_asset
+        asset.validate()
+
+        date_modify = fields.Date.to_date("2022-06-15")
+        self.env['asset.modify'].create({
+            'asset_id': asset.id,
+            'name': 'Test reason',
+            'date':  date_modify,
+            'value_residual': asset._get_residual_value_at_date(date_modify) + 8500,
+            "account_asset_counterpart_id": self.asset_counterpart_account_id.id,
+        }).modify()
+
+        self.assertRecordValues(asset.depreciation_move_ids.sorted(lambda mv: (mv.date, mv.id)), [
+            self._get_depreciation_move_values(date='2020-07-31', depreciation_value=210.00, remaining_value=6990.00, depreciated_value=210.00, state='posted'),
+            self._get_depreciation_move_values(date='2020-08-31', depreciation_value=210.00, remaining_value=6780.00, depreciated_value=420.00, state='posted'),
+            self._get_depreciation_move_values(date='2020-09-30', depreciation_value=210.00, remaining_value=6570.00, depreciated_value=630.00, state='posted'),
+            self._get_depreciation_move_values(date='2020-10-31', depreciation_value=210.00, remaining_value=6360.00, depreciated_value=840.00, state='posted'),
+            self._get_depreciation_move_values(date='2020-11-30', depreciation_value=210.00, remaining_value=6150.00, depreciated_value=1050.00, state='posted'),
+            self._get_depreciation_move_values(date='2020-12-31', depreciation_value=210.00, remaining_value=5940.00, depreciated_value=1260.00, state='posted'),
+            # 2021
+            self._get_depreciation_move_values(date='2021-01-31', depreciation_value=173.25, remaining_value=5766.75, depreciated_value=1433.25, state='posted'),
+            self._get_depreciation_move_values(date='2021-02-28', depreciation_value=173.25, remaining_value=5593.50, depreciated_value=1606.50, state='posted'),
+            self._get_depreciation_move_values(date='2021-03-31', depreciation_value=173.25, remaining_value=5420.25, depreciated_value=1779.75, state='posted'),
+            self._get_depreciation_move_values(date='2021-04-30', depreciation_value=173.25, remaining_value=5247.00, depreciated_value=1953.00, state='posted'),
+            self._get_depreciation_move_values(date='2021-05-31', depreciation_value=173.25, remaining_value=5073.75, depreciated_value=2126.25, state='posted'),
+            self._get_depreciation_move_values(date='2021-06-30', depreciation_value=173.25, remaining_value=4900.50, depreciated_value=2299.50, state='posted'),
+            self._get_depreciation_move_values(date='2021-07-31', depreciation_value=173.25, remaining_value=4727.25, depreciated_value=2472.75, state='posted'),
+            self._get_depreciation_move_values(date='2021-08-31', depreciation_value=173.25, remaining_value=4554.00, depreciated_value=2646.00, state='posted'),
+            self._get_depreciation_move_values(date='2021-09-30', depreciation_value=173.25, remaining_value=4380.75, depreciated_value=2819.25, state='posted'),
+            self._get_depreciation_move_values(date='2021-10-31', depreciation_value=173.25, remaining_value=4207.50, depreciated_value=2992.50, state='posted'),
+            self._get_depreciation_move_values(date='2021-11-30', depreciation_value=173.25, remaining_value=4034.25, depreciated_value=3165.75, state='posted'),
+            self._get_depreciation_move_values(date='2021-12-31', depreciation_value=173.25, remaining_value=3861.00, depreciated_value=3339.00, state='posted'),
+            # 2022
+            self._get_depreciation_move_values(date='2022-01-31', depreciation_value=120.00, remaining_value=3741.00, depreciated_value=3459.00, state='posted'),
+            self._get_depreciation_move_values(date='2022-02-28', depreciation_value=120.00, remaining_value=3621.00, depreciated_value=3579.00, state='posted'),
+            self._get_depreciation_move_values(date='2022-03-31', depreciation_value=120.00, remaining_value=3501.00, depreciated_value=3699.00, state='posted'),
+            self._get_depreciation_move_values(date='2022-04-30', depreciation_value=120.00, remaining_value=3381.00, depreciated_value=3819.00, state='posted'),
+            self._get_depreciation_move_values(date='2022-05-31', depreciation_value=120.00, remaining_value=3261.00, depreciated_value=3939.00, state='posted'),
+            # Increase
+            self._get_depreciation_move_values(date='2022-06-15', depreciation_value=60.00, remaining_value=3201.00, depreciated_value=3999.00, state='posted'),
+            self._get_depreciation_move_values(date='2022-06-30', depreciation_value=60.00, remaining_value=3141.00, depreciated_value=4059.00, state='posted'),
+            self._get_depreciation_move_values(date='2022-07-31', depreciation_value=120.00, remaining_value=3021.00, depreciated_value=4179.00, state='draft'),
+            self._get_depreciation_move_values(date='2022-08-31', depreciation_value=120.00, remaining_value=2901.00, depreciated_value=4299.00, state='draft'),
+            self._get_depreciation_move_values(date='2022-09-30', depreciation_value=120.00, remaining_value=2781.00, depreciated_value=4419.00, state='draft'),
+            self._get_depreciation_move_values(date='2022-10-31', depreciation_value=120.00, remaining_value=2661.00, depreciated_value=4539.00, state='draft'),
+            self._get_depreciation_move_values(date='2022-11-30', depreciation_value=120.00, remaining_value=2541.00, depreciated_value=4659.00, state='draft'),
+            self._get_depreciation_move_values(date='2022-12-31', depreciation_value=120.00, remaining_value=2421.00, depreciated_value=4779.00, state='draft'),
+            # 2023
+            self._get_depreciation_move_values(date='2023-01-31', depreciation_value=120.00, remaining_value=2301.00, depreciated_value=4899.00, state='draft'),
+            self._get_depreciation_move_values(date='2023-02-28', depreciation_value=120.00, remaining_value=2181.00, depreciated_value=5019.00, state='draft'),
+            self._get_depreciation_move_values(date='2023-03-31', depreciation_value=120.00, remaining_value=2061.00, depreciated_value=5139.00, state='draft'),
+            self._get_depreciation_move_values(date='2023-04-30', depreciation_value=120.00, remaining_value=1941.00, depreciated_value=5259.00, state='draft'),
+            self._get_depreciation_move_values(date='2023-05-31', depreciation_value=120.00, remaining_value=1821.00, depreciated_value=5379.00, state='draft'),
+            self._get_depreciation_move_values(date='2023-06-30', depreciation_value=120.00, remaining_value=1701.00, depreciated_value=5499.00, state='draft'),
+            self._get_depreciation_move_values(date='2023-07-31', depreciation_value=120.00, remaining_value=1581.00, depreciated_value=5619.00, state='draft'),
+            self._get_depreciation_move_values(date='2023-08-31', depreciation_value=120.00, remaining_value=1461.00, depreciated_value=5739.00, state='draft'),
+            self._get_depreciation_move_values(date='2023-09-30', depreciation_value=120.00, remaining_value=1341.00, depreciated_value=5859.00, state='draft'),
+            self._get_depreciation_move_values(date='2023-10-31', depreciation_value=120.00, remaining_value=1221.00, depreciated_value=5979.00, state='draft'),
+            self._get_depreciation_move_values(date='2023-11-30', depreciation_value=120.00, remaining_value=1101.00, depreciated_value=6099.00, state='draft'),
+            self._get_depreciation_move_values(date='2023-12-31', depreciation_value=120.00, remaining_value=981.00, depreciated_value=6219.00, state='draft'),
+            # 2024
+            self._get_depreciation_move_values(date='2024-01-31', depreciation_value=120.00, remaining_value=861.00, depreciated_value=6339.00, state='draft'),
+            self._get_depreciation_move_values(date='2024-02-29', depreciation_value=120.00, remaining_value=741.00, depreciated_value=6459.00, state='draft'),
+            self._get_depreciation_move_values(date='2024-03-31', depreciation_value=120.00, remaining_value=621.00, depreciated_value=6579.00, state='draft'),
+            self._get_depreciation_move_values(date='2024-04-30', depreciation_value=120.00, remaining_value=501.00, depreciated_value=6699.00, state='draft'),
+            self._get_depreciation_move_values(date='2024-05-31', depreciation_value=120.00, remaining_value=381.00, depreciated_value=6819.00, state='draft'),
+            self._get_depreciation_move_values(date='2024-06-30', depreciation_value=120.00, remaining_value=261.00, depreciated_value=6939.00, state='draft'),
+            self._get_depreciation_move_values(date='2024-07-31', depreciation_value=120.00, remaining_value=141.00, depreciated_value=7059.00, state='draft'),
+            self._get_depreciation_move_values(date='2024-08-31', depreciation_value=120.00, remaining_value=21.00, depreciated_value=7179.00, state='draft'),
+            self._get_depreciation_move_values(date='2024-09-30', depreciation_value=21.00, remaining_value=0.00, depreciated_value=7200.00, state='draft'),
+        ])
+
+        self.assertRecordValues(asset.children_ids[0].depreciation_move_ids.sorted(lambda mv: (mv.date, mv.id)), [
+            self._get_depreciation_move_values(date='2022-06-30', depreciation_value=159.32, remaining_value=8340.68, depreciated_value=159.32, state='posted'),
+            self._get_depreciation_move_values(date='2022-07-31', depreciation_value=318.65, remaining_value=8022.03, depreciated_value=477.97, state='draft'),
+            self._get_depreciation_move_values(date='2022-08-31', depreciation_value=318.65, remaining_value=7703.38, depreciated_value=796.62, state='draft'),
+            self._get_depreciation_move_values(date='2022-09-30', depreciation_value=318.65, remaining_value=7384.73, depreciated_value=1115.27, state='draft'),
+            self._get_depreciation_move_values(date='2022-10-31', depreciation_value=318.65, remaining_value=7066.08, depreciated_value=1433.92, state='draft'),
+            self._get_depreciation_move_values(date='2022-11-30', depreciation_value=318.65, remaining_value=6747.43, depreciated_value=1752.57, state='draft'),
+            self._get_depreciation_move_values(date='2022-12-31', depreciation_value=318.65, remaining_value=6428.78, depreciated_value=2071.22, state='draft'),
+            # 2023
+            self._get_depreciation_move_values(date='2023-01-31', depreciation_value=318.65, remaining_value=6110.13, depreciated_value=2389.87, state='draft'),
+            self._get_depreciation_move_values(date='2023-02-28', depreciation_value=318.65, remaining_value=5791.48, depreciated_value=2708.52, state='draft'),
+            self._get_depreciation_move_values(date='2023-03-31', depreciation_value=318.65, remaining_value=5472.83, depreciated_value=3027.17, state='draft'),
+            self._get_depreciation_move_values(date='2023-04-30', depreciation_value=318.65, remaining_value=5154.18, depreciated_value=3345.82, state='draft'),
+            self._get_depreciation_move_values(date='2023-05-31', depreciation_value=318.65, remaining_value=4835.53, depreciated_value=3664.47, state='draft'),
+            self._get_depreciation_move_values(date='2023-06-30', depreciation_value=318.65, remaining_value=4516.88, depreciated_value=3983.12, state='draft'),
+            self._get_depreciation_move_values(date='2023-07-31', depreciation_value=318.65, remaining_value=4198.23, depreciated_value=4301.77, state='draft'),
+            self._get_depreciation_move_values(date='2023-08-31', depreciation_value=318.65, remaining_value=3879.58, depreciated_value=4620.42, state='draft'),
+            self._get_depreciation_move_values(date='2023-09-30', depreciation_value=318.65, remaining_value=3560.93, depreciated_value=4939.07, state='draft'),
+            self._get_depreciation_move_values(date='2023-10-31', depreciation_value=318.65, remaining_value=3242.28, depreciated_value=5257.72, state='draft'),
+            self._get_depreciation_move_values(date='2023-11-30', depreciation_value=318.65, remaining_value=2923.63, depreciated_value=5576.37, state='draft'),
+            self._get_depreciation_move_values(date='2023-12-31', depreciation_value=318.65, remaining_value=2604.98, depreciated_value=5895.02, state='draft'),
+            # 2024
+            self._get_depreciation_move_values(date='2024-01-31', depreciation_value=318.65, remaining_value=2286.33, depreciated_value=6213.67, state='draft'),
+            self._get_depreciation_move_values(date='2024-02-29', depreciation_value=318.65, remaining_value=1967.68, depreciated_value=6532.32, state='draft'),
+            self._get_depreciation_move_values(date='2024-03-31', depreciation_value=318.65, remaining_value=1649.03, depreciated_value=6850.97, state='draft'),
+            self._get_depreciation_move_values(date='2024-04-30', depreciation_value=318.65, remaining_value=1330.38, depreciated_value=7169.62, state='draft'),
+            self._get_depreciation_move_values(date='2024-05-31', depreciation_value=318.65, remaining_value=1011.73, depreciated_value=7488.27, state='draft'),
+            self._get_depreciation_move_values(date='2024-06-30', depreciation_value=318.65, remaining_value=693.08, depreciated_value=7806.92, state='draft'),
+            self._get_depreciation_move_values(date='2024-07-31', depreciation_value=318.65, remaining_value=374.43, depreciated_value=8125.57, state='draft'),
+            self._get_depreciation_move_values(date='2024-08-31', depreciation_value=318.65, remaining_value=55.78, depreciated_value=8444.22, state='draft'),
+            self._get_depreciation_move_values(date='2024-09-30', depreciation_value=55.78, remaining_value=0.00, depreciated_value=8500.00, state='draft'),
+        ])
+
+    def test_monthly_degressive_then_linear_start_beginning_month_decrease_middle_month(self):
+        asset = self.degressive_then_linear_asset
+        asset.validate()
+
+        date_modify = fields.Date.to_date("2022-06-15")
+        self.env['asset.modify'].create({
+            'asset_id': asset.id,
+            'name': 'Test reason',
+            'date':  date_modify,
+            'value_residual': asset._get_residual_value_at_date(date_modify) - 500,
+            "account_asset_counterpart_id": self.asset_counterpart_account_id.id,
+        }).modify()
+
+        self.assertRecordValues(asset.depreciation_move_ids.sorted(lambda mv: (mv.date, mv.id)), [
+            self._get_depreciation_move_values(date='2020-07-31', depreciation_value=210.00, remaining_value=6990.00, depreciated_value=210.00, state='posted'),
+            self._get_depreciation_move_values(date='2020-08-31', depreciation_value=210.00, remaining_value=6780.00, depreciated_value=420.00, state='posted'),
+            self._get_depreciation_move_values(date='2020-09-30', depreciation_value=210.00, remaining_value=6570.00, depreciated_value=630.00, state='posted'),
+            self._get_depreciation_move_values(date='2020-10-31', depreciation_value=210.00, remaining_value=6360.00, depreciated_value=840.00, state='posted'),
+            self._get_depreciation_move_values(date='2020-11-30', depreciation_value=210.00, remaining_value=6150.00, depreciated_value=1050.00, state='posted'),
+            self._get_depreciation_move_values(date='2020-12-31', depreciation_value=210.00, remaining_value=5940.00, depreciated_value=1260.00, state='posted'),
+            # 2021
+            self._get_depreciation_move_values(date='2021-01-31', depreciation_value=173.25, remaining_value=5766.75, depreciated_value=1433.25, state='posted'),
+            self._get_depreciation_move_values(date='2021-02-28', depreciation_value=173.25, remaining_value=5593.50, depreciated_value=1606.50, state='posted'),
+            self._get_depreciation_move_values(date='2021-03-31', depreciation_value=173.25, remaining_value=5420.25, depreciated_value=1779.75, state='posted'),
+            self._get_depreciation_move_values(date='2021-04-30', depreciation_value=173.25, remaining_value=5247.00, depreciated_value=1953.00, state='posted'),
+            self._get_depreciation_move_values(date='2021-05-31', depreciation_value=173.25, remaining_value=5073.75, depreciated_value=2126.25, state='posted'),
+            self._get_depreciation_move_values(date='2021-06-30', depreciation_value=173.25, remaining_value=4900.50, depreciated_value=2299.50, state='posted'),
+            self._get_depreciation_move_values(date='2021-07-31', depreciation_value=173.25, remaining_value=4727.25, depreciated_value=2472.75, state='posted'),
+            self._get_depreciation_move_values(date='2021-08-31', depreciation_value=173.25, remaining_value=4554.00, depreciated_value=2646.00, state='posted'),
+            self._get_depreciation_move_values(date='2021-09-30', depreciation_value=173.25, remaining_value=4380.75, depreciated_value=2819.25, state='posted'),
+            self._get_depreciation_move_values(date='2021-10-31', depreciation_value=173.25, remaining_value=4207.50, depreciated_value=2992.50, state='posted'),
+            self._get_depreciation_move_values(date='2021-11-30', depreciation_value=173.25, remaining_value=4034.25, depreciated_value=3165.75, state='posted'),
+            self._get_depreciation_move_values(date='2021-12-31', depreciation_value=173.25, remaining_value=3861.00, depreciated_value=3339.00, state='posted'),
+            # 2022
+            self._get_depreciation_move_values(date='2022-01-31', depreciation_value=120.00, remaining_value=3741.00, depreciated_value=3459.00, state='posted'),
+            self._get_depreciation_move_values(date='2022-02-28', depreciation_value=120.00, remaining_value=3621.00, depreciated_value=3579.00, state='posted'),
+            self._get_depreciation_move_values(date='2022-03-31', depreciation_value=120.00, remaining_value=3501.00, depreciated_value=3699.00, state='posted'),
+            self._get_depreciation_move_values(date='2022-04-30', depreciation_value=120.00, remaining_value=3381.00, depreciated_value=3819.00, state='posted'),
+            self._get_depreciation_move_values(date='2022-05-31', depreciation_value=120.00, remaining_value=3261.00, depreciated_value=3939.00, state='posted'),
+            self._get_depreciation_move_values(date='2022-06-15', depreciation_value=60.00, remaining_value=3201.00, depreciated_value=3999.00, state='posted'),
+            # Decrease
+            self._get_depreciation_move_values(date='2022-06-15', depreciation_value=500.00, remaining_value=2701.00, depreciated_value=4499.00, state='posted'),
+            self._get_depreciation_move_values(date='2022-06-30', depreciation_value=53.15, remaining_value=2647.85, depreciated_value=4552.15, state='posted'),
+            self._get_depreciation_move_values(date='2022-07-31', depreciation_value=106.30, remaining_value=2541.55, depreciated_value=4658.45, state='draft'),
+            self._get_depreciation_move_values(date='2022-08-31', depreciation_value=106.30, remaining_value=2435.25, depreciated_value=4764.75, state='draft'),
+            self._get_depreciation_move_values(date='2022-09-30', depreciation_value=106.30, remaining_value=2328.95, depreciated_value=4871.05, state='draft'),
+            self._get_depreciation_move_values(date='2022-10-31', depreciation_value=106.30, remaining_value=2222.65, depreciated_value=4977.35, state='draft'),
+            self._get_depreciation_move_values(date='2022-11-30', depreciation_value=106.30, remaining_value=2116.35, depreciated_value=5083.65, state='draft'),
+            self._get_depreciation_move_values(date='2022-12-31', depreciation_value=106.30, remaining_value=2010.05, depreciated_value=5189.95, state='draft'),
+            # 2023
+            self._get_depreciation_move_values(date='2023-01-31', depreciation_value=106.30, remaining_value=1903.75, depreciated_value=5296.25, state='draft'),
+            self._get_depreciation_move_values(date='2023-02-28', depreciation_value=106.30, remaining_value=1797.45, depreciated_value=5402.55, state='draft'),
+            self._get_depreciation_move_values(date='2023-03-31', depreciation_value=106.30, remaining_value=1691.15, depreciated_value=5508.85, state='draft'),
+            self._get_depreciation_move_values(date='2023-04-30', depreciation_value=106.30, remaining_value=1584.85, depreciated_value=5615.15, state='draft'),
+            self._get_depreciation_move_values(date='2023-05-31', depreciation_value=106.30, remaining_value=1478.55, depreciated_value=5721.45, state='draft'),
+            self._get_depreciation_move_values(date='2023-06-30', depreciation_value=106.30, remaining_value=1372.25, depreciated_value=5827.75, state='draft'),
+            self._get_depreciation_move_values(date='2023-07-31', depreciation_value=106.30, remaining_value=1265.95, depreciated_value=5934.05, state='draft'),
+            self._get_depreciation_move_values(date='2023-08-31', depreciation_value=106.30, remaining_value=1159.65, depreciated_value=6040.35, state='draft'),
+            self._get_depreciation_move_values(date='2023-09-30', depreciation_value=106.30, remaining_value=1053.35, depreciated_value=6146.65, state='draft'),
+            self._get_depreciation_move_values(date='2023-10-31', depreciation_value=106.30, remaining_value=947.05, depreciated_value=6252.95, state='draft'),
+            self._get_depreciation_move_values(date='2023-11-30', depreciation_value=106.30, remaining_value=840.75, depreciated_value=6359.25, state='draft'),
+            self._get_depreciation_move_values(date='2023-12-31', depreciation_value=106.30, remaining_value=734.45, depreciated_value=6465.55, state='draft'),
+            # 2024
+            self._get_depreciation_move_values(date='2024-01-31', depreciation_value=106.30, remaining_value=628.15, depreciated_value=6571.85, state='draft'),
+            self._get_depreciation_move_values(date='2024-02-29', depreciation_value=106.30, remaining_value=521.85, depreciated_value=6678.15, state='draft'),
+            self._get_depreciation_move_values(date='2024-03-31', depreciation_value=106.30, remaining_value=415.55, depreciated_value=6784.45, state='draft'),
+            self._get_depreciation_move_values(date='2024-04-30', depreciation_value=106.30, remaining_value=309.25, depreciated_value=6890.75, state='draft'),
+            self._get_depreciation_move_values(date='2024-05-31', depreciation_value=106.30, remaining_value=202.95, depreciated_value=6997.05, state='draft'),
+            self._get_depreciation_move_values(date='2024-06-30', depreciation_value=106.30, remaining_value=96.65, depreciated_value=7103.35, state='draft'),
+            self._get_depreciation_move_values(date='2024-07-31', depreciation_value=96.65, remaining_value=0.00, depreciated_value=7200.00, state='draft'),
+        ])
+
+    def test_linear_modify_0_value_residual(self):
+        """Set the value residual to 0"""
+        asset = self.create_asset(value=10000, periodicity="monthly", periods=10, method="linear", acquisition_date="2022-02-01", prorata_computation_type="constant_periods")
+        asset.validate()
+
+        self.env['asset.modify'].create({
+            'asset_id': asset.id,
+            'name': 'Test reason',
+            'method_number': 4,
+            'date': fields.Date.to_date("2022-06-24"),
+            'modify_action': 'modify',
+            'value_residual': 0,
+            'account_asset_counterpart_id': self.company_data['default_account_revenue'].copy().id,
+        }).modify()
+
+        self.assertRecordValues(asset.depreciation_move_ids.sorted(lambda mv: (mv.date, mv.id)), [
+            self._get_depreciation_move_values(date='2022-02-28', depreciation_value=1000, remaining_value=9000, depreciated_value=1000, state='posted'),
+            self._get_depreciation_move_values(date='2022-03-31', depreciation_value=1000, remaining_value=8000, depreciated_value=2000, state='posted'),
+            self._get_depreciation_move_values(date='2022-04-30', depreciation_value=1000, remaining_value=7000, depreciated_value=3000, state='posted'),
+            self._get_depreciation_move_values(date='2022-05-31', depreciation_value=1000, remaining_value=6000, depreciated_value=4000, state='posted'),
+            self._get_depreciation_move_values(date='2022-06-24', depreciation_value=800, remaining_value=5200, depreciated_value=4800, state='posted'),
+
+            self._get_depreciation_move_values(date='2022-06-24', depreciation_value=5200, remaining_value=0, depreciated_value=10000, state='posted'),
+        ])
+
+    def test_asset_modify_value_residual_after_reversal(self):
+        """ Tests the special case of residual amounts on a board with a reverse entry.
+            It keeps its focus on the computed residual amount in the modify asset wizard as for now,
+            the recomputation after a modify on a board with reverse entries is broken. This should be corrected in a later task."""
+
+        asset = self.create_asset(value=1000, periodicity="yearly", periods=5, method="linear", acquisition_date="2020-01-01", prorata_computation_type="constant_periods")
+        asset.validate()
+
+        self.assertRecordValues(asset.depreciation_move_ids.sorted(lambda mv: (mv.date, mv.id)), [
+            self._get_depreciation_move_values(date='2020-12-31', depreciation_value=200, remaining_value=800, depreciated_value=200, state='posted'),
+            self._get_depreciation_move_values(date='2021-12-31', depreciation_value=200, remaining_value=600, depreciated_value=400, state='posted'),
+            self._get_depreciation_move_values(date='2022-12-31', depreciation_value=200, remaining_value=400, depreciated_value=600, state='draft'),
+            self._get_depreciation_move_values(date='2023-12-31', depreciation_value=200, remaining_value=200, depreciated_value=800, state='draft'),
+            self._get_depreciation_move_values(date='2024-12-31', depreciation_value=200, remaining_value=0, depreciated_value=1000, state='draft'),
+        ])
+
+        move_to_reverse = asset.depreciation_move_ids.sorted(lambda mv: (mv.date, mv.id))[0]
+        self.env['account.move.reversal']\
+            .with_context(active_model="account.move", active_ids=move_to_reverse.ids)\
+            .create({
+                'journal_id': move_to_reverse.journal_id.id
+            }).reverse_moves()
+
+        self.assertRecordValues(asset.depreciation_move_ids.sorted(lambda mv: (mv.date, mv.id)), [
+            self._get_depreciation_move_values(date='2020-12-31', depreciation_value=200, remaining_value=800, depreciated_value=200, state='posted'),
+            self._get_depreciation_move_values(date='2021-12-31', depreciation_value=200, remaining_value=600, depreciated_value=400, state='posted'),
+            self._get_depreciation_move_values(date='2022-06-30', depreciation_value=-200, remaining_value=800, depreciated_value=200, state='posted'),
+            self._get_depreciation_move_values(date='2022-12-31', depreciation_value=400, remaining_value=400, depreciated_value=600, state='draft'),
+            self._get_depreciation_move_values(date='2023-12-31', depreciation_value=200, remaining_value=200, depreciated_value=800, state='draft'),
+            self._get_depreciation_move_values(date='2024-12-31', depreciation_value=200, remaining_value=0, depreciated_value=1000, state='draft'),
+        ])
+
+        asset_modify = self.env['asset.modify'].create({
+            'asset_id': asset.id,
+            'name': 'Test reason',
+            'date': fields.Date.to_date("2022-06-30"),
+            'modify_action': 'modify',
+        })
+
+        # We want to show the actual remaining value of the asset.
+        self.assertEqual(asset_modify.value_residual, 500, "The computation of the value_residual in asset.modify shouldn't care about the reversal.")
+
+    def test_asset_gain_or_loss_account(self):
+        asset = self.create_asset(value=1000, periodicity="yearly", periods=5, method="linear", acquisition_date="2020-01-01", prorata_computation_type="constant_periods")
+        asset.validate()
+
+        invoice = self.env['account.move'].create({
+            'move_type': 'out_invoice',
+            'partner_id': self.env['res.partner'].create({'name': 'Res Partner 12'}).id,
+            'invoice_date': '2022-06-30',
+            'invoice_line_ids': [(0, 0, {
+                'name': 'Asset sold',
+                'tax_ids': [],
+                'price_unit': 500,
+            })],
+        })
+        invoice.action_post()
+
+        asset_modify = self.env['asset.modify'].create({
+            'asset_id': asset.id,
+            'name': 'Test reason',
+            'date': fields.Date.to_date('2022-06-10'),
+            'modify_action': 'sell',
+            'invoice_ids': invoice.ids,
+            'invoice_line_ids': invoice.invoice_line_ids.ids
+        })
+        # The remaining value of the asset on 2022-06-30 is 500: if the asset is sold before that date, it will result in a loss (and a gain if sold after)
+        self.assertEqual(asset_modify.gain_or_loss, 'loss')
+
+        asset_modify.date = fields.Date.from_string('2022-07-15')
+        self.assertEqual(asset_modify.gain_or_loss, 'gain')
+
+        asset_modify.date = fields.Date.from_string('2022-06-30')
+        self.assertEqual(asset_modify.gain_or_loss, 'no')
+
+    def test_asset_disposal_on_hashed_journal(self):
+        asset = self.create_asset(
+            value=3000,
+            periodicity='monthly',
+            periods=3,
+            method='linear',
+            acquisition_date='2022-05-01',
+            prorata_computation_type='constant_periods',
+        )
+        asset.journal_id.restrict_mode_hash_table = True
+        asset.validate()
+
+        self.env['asset.modify'].create({
+            'asset_id': asset.id,
+            'date':  fields.Date.to_date('2022-05-15'),
+            'modify_action': 'dispose',
+            'loss_account_id': self.company_data['default_account_expense'].copy().id,
+        }).sell_dispose()
+
+        self.assertRecordValues(asset.depreciation_move_ids.sorted(lambda mv: (mv.date, mv.id)), [
+            self._get_depreciation_move_values(date='2022-05-15', depreciation_value=483.87, remaining_value=2516.13, depreciated_value=483.87, state='posted'),
+            self._get_depreciation_move_values(date='2022-05-15', depreciation_value=2516.13, remaining_value=0, depreciated_value=3000, state='draft'),
+            # At this point the asset is disposed, which means its 'remaining_value' is 0.
+            # But the next 2 depreciation moves could not be removed due to the hash on the journal.
+            # This results in a negative 'remaining_value' and a 'depreciated_value' that exceeds the asset's initial value.
+            self._get_depreciation_move_values(date='2022-05-31', depreciation_value=1000, remaining_value=-1000, depreciated_value=4000, state='posted'),
+            self._get_depreciation_move_values(date='2022-06-30', depreciation_value=1000, remaining_value=-2000, depreciated_value=5000, state='posted'),
+            # The next 2 depreciation moves are reverting the previous 2,
+            # bringing the 'remaining_value' back to 0 on the last one, as it should be.
+            self._get_depreciation_move_values(date='2022-06-30', depreciation_value=-1000, remaining_value=-1000, depreciated_value=4000, state='posted'),
+            self._get_depreciation_move_values(date='2022-06-30', depreciation_value=-1000, remaining_value=0, depreciated_value=3000, state='posted'),
+        ])
+
+    def test_asset_disposal_with_audit_trail(self):
+        asset = self.create_asset(
+            value=3000,
+            periodicity='monthly',
+            periods=3,
+            method='linear',
+            acquisition_date='2022-05-01',
+            prorata_computation_type='constant_periods',
+        )
+        asset.validate()
+
+        with patch.object(self.env.registry['account.move'], '_is_protected_by_audit_trail', lambda move: True):
+            self.env['asset.modify'].create({
+                'asset_id': asset.id,
+                'date':  fields.Date.to_date('2022-06-15'),
+                'modify_action': 'dispose',
+                'loss_account_id': self.company_data['default_account_expense'].copy().id,
+            }).sell_dispose()
+
+        self.assertRecordValues(asset.depreciation_move_ids.sorted(lambda mv: (mv.date, mv.id)), [
+            self._get_depreciation_move_values(date='2022-05-31', depreciation_value=1000, remaining_value=2000, depreciated_value=1000, state='posted'),
+            self._get_depreciation_move_values(date='2022-06-15', depreciation_value=500, remaining_value=1500, depreciated_value=1500, state='posted'),
+            self._get_depreciation_move_values(date='2022-06-15', depreciation_value=1500, remaining_value=0, depreciated_value=3000, state='draft'),
+            self._get_depreciation_move_values(date='2022-06-30', depreciation_value=1000, remaining_value=0, depreciated_value=3000, state='cancel'),
+            self._get_depreciation_move_values(date='2022-07-31', depreciation_value=1000, remaining_value=0, depreciated_value=3000, state='cancel'),
+        ])
+
+    def test_disposal_of_fully_depreciated_asset(self):
+        asset = self.create_asset(value=10000, periodicity="yearly", periods=2, method="degressive", acquisition_date="2020-01-01", prorata_computation_type="constant_periods")
+        asset.validate()
+
+        self.env['asset.modify'].create({
+            'asset_id': asset.id,
+            'date':  fields.Date.to_date("2022-01-01"),
+            'modify_action': 'dispose',
+            'loss_account_id': self.company_data['default_account_expense'].copy().id,
+        }).sell_dispose()
+
+    def test_asset_disposal_in_middle_of_fiscal_year(self):
+        self.company_data['company'].fiscalyear_last_month = "3"
+
+        asset = self.create_asset(value=10000, periodicity="monthly", periods=12, method="degressive", acquisition_date="2022-01-01", prorata_computation_type="daily_computation")
+        asset.validate()
+
+        self.env['asset.modify'].create({
+            'asset_id': asset.id,
+            'date':  fields.Date.to_date("2022-02-24"),
+            'modify_action': 'dispose',
+            'loss_account_id': self.company_data['default_account_expense'].copy().id,
+        }).sell_dispose()
+
+        self.assertRecordValues(asset.depreciation_move_ids.sorted(lambda mv: (mv.date, mv.id)), [
+            self._get_depreciation_move_values(date='2022-01-31', depreciation_value=849.32, remaining_value=9150.68, depreciated_value=849.32, state='posted'),
+            self._get_depreciation_move_values(date='2022-02-24', depreciation_value=657.53, remaining_value=8493.15, depreciated_value=1506.85, state='posted'),
+            self._get_depreciation_move_values(date='2022-02-24', depreciation_value=8493.15, remaining_value=0, depreciated_value=10000, state='draft'),
+        ])
diff --git a/dev_odex30_accounting/odex30_account_asset/views/account_account_views.xml b/dev_odex30_accounting/odex30_account_asset/views/account_account_views.xml
new file mode 100644
index 0000000..dc3b053
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_asset/views/account_account_views.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <record id="view_move_line_tree" model="ir.ui.view">
+        <field name="name">account.move.line.list</field>
+        <field name="model">account.move.line</field>
+        <field name="inherit_id" ref="odex30_account_accountant.view_move_line_tree"/>
+        <field name="mode">extension</field>
+        <field name="arch" type="xml">
+            <xpath expr="//header" position="inside">
+                <button name="turn_as_asset" type="object" string="Create Asset" groups="account.group_account_user" data-hotkey="c"/>
+            </xpath>
+        </field>
+    </record>
+
+    <record id="view_account_form_asset_inherit" model="ir.ui.view">
+        <field name="name">account.account.form</field>
+        <field name="model">account.account</field>
+        <field name="inherit_id" ref="account.view_account_form"/>
+        <field name="arch" type="xml">
+            <xpath expr="//page[@name='accounting']" position="after">
+                <page string="Automation" name="page_automation" invisible="not can_create_asset">
+                    <group>
+                        <group>
+                            <field name="can_create_asset" invisible="1"/>
+                            <field name="form_view_ref" invisible="1"/>
+                            <td class="o_td_label">
+                                <label for="create_asset" string="Automate Asset"/>
+                            </td>
+                            <field name="create_asset" invisible="not can_create_asset" nolabel="1" widget="radio"/>
+                            <field name="multiple_assets_per_line" string="Manage Items" invisible="not can_create_asset or create_asset == 'no'"/>
+                            <field name="asset_model_ids"
+                                   widget="many2many_tags"
+                                   domain="[('state', '=', 'model')]"
+                                   invisible="context.get('hide_model_on_account') or (create_asset == 'no' or not can_create_asset)"
+                                   required="create_asset == 'validate' and can_create_asset"
+                                   context="{
+                                        'default_state': 'model',
+                                        'form_view_ref': form_view_ref,
+                                        'default_account_depreciation_id': id,
+                                   }"
+                                   string="Asset Model"
+                                   options="{'no_quick_create': True}"
+                            />
+                        </group>
+                    </group>
+                </page>
+            </xpath>
+        </field>
+    </record>
+</odoo>
diff --git a/dev_odex30_accounting/odex30_account_asset/views/account_asset_group_views.xml b/dev_odex30_accounting/odex30_account_asset/views/account_asset_group_views.xml
new file mode 100644
index 0000000..4fc62eb
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_asset/views/account_asset_group_views.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <data>
+
+        <record id="asset_group_form_view" model="ir.ui.view">
+            <field name="name">account.asset.group.form</field>
+            <field name="model">account.asset.group</field>
+            <field name="arch" type="xml">
+                <form string="Asset Group">
+                    <sheet>
+                        <div class="oe_button_box" name="button_box">
+                            <button name="action_open_linked_assets"
+                                type="object"
+                                class="oe_stat_button"
+                                icon="fa-bars"
+                                invisible="count_linked_assets == 0">
+                                <field string="Asset(s)" name="count_linked_assets" widget="statinfo"/>
+                            </button>
+                        </div>
+                        <div class="oe_title">
+                            <label for="name"/>
+                            <h1>
+                                <field name="name" placeholder="Asset Group"/>
+                            </h1>
+                        </div>
+                        <group>
+                            <group>
+                               <field name="company_id" options="{'no_create': True}" groups="base.group_multi_company"/>
+                            </group>
+                        </group>
+                    </sheet>
+                </form>
+            </field>
+        </record>
+
+        <record id="asset_group_list_view" model="ir.ui.view">
+            <field name="name">account.asset.group.list</field>
+            <field name="model">account.asset.group</field>
+            <field name="arch" type="xml">
+                <list string="Asset Group">
+                    <field name="name"/>
+                    <field name="company_id" options="{'no_create': True}" groups="base.group_multi_company"/>
+                </list>
+            </field>
+        </record>
+    </data>
+</odoo>
diff --git a/dev_odex30_accounting/odex30_account_asset/views/account_asset_views.xml b/dev_odex30_accounting/odex30_account_asset/views/account_asset_views.xml
new file mode 100644
index 0000000..38d1add
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_asset/views/account_asset_views.xml
@@ -0,0 +1,518 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+    <record model="ir.ui.view" id="view_account_asset_form">
+        <field name="name">account.asset.form</field>
+        <field name="model">account.asset</field>
+        <field name="priority">1</field>
+        <field name="arch" type="xml">
+            <form string="Asset">
+                <field name="company_id" invisible="1" readonly="state != 'draft'"/>
+                <field name="currency_id" invisible="1"/>
+                <field name="account_type" invisible="1"/>
+                <field name="account_asset_id" invisible="1" readonly="state == 'close'"/>
+                <field name="display_account_asset_id" invisible="1"/>
+                <field name="state" invisible="1"/>
+                <field name="total_depreciation_entries_count" invisible="1"/>
+                <field name="parent_id" invisible="1"/>
+                <header>
+                    <button name="validate" invisible="state != 'draft'" string="Confirm" type="object" class="oe_highlight" data-hotkey="q"/>
+                    <button type="object" name="compute_depreciation_board" string="Compute Depreciation" invisible="state != 'draft'" data-hotkey="d"/>
+                    <button name="set_to_draft" string="Set to Draft" type="object" invisible="depreciation_move_ids or state not in ['open', 'cancelled']"/>
+                    <button name="set_to_running" string="Set to Running" type="object" invisible="state != 'close'"/>
+                    <button name="resume_after_pause" string="Resume Depreciation" type="object" class="oe_highlight" invisible="state != 'paused'"/>
+                    <button name="action_asset_modify" invisible="state != 'open'" string="Modify Depreciation" type="object" data-hotkey="e" class="oe_highlight"/>
+                    <button name="action_save_model" invisible="state not in ('open', 'paused', 'close')" string="Save as Model" type="object" data-hotkey="m"/>
+                    <button name="set_to_cancelled" string="Cancel Asset" type="object" invisible="state != 'open'" data-hotkey="x"/>
+                    <field name="state" widget="statusbar" statusbar_visible="draft,open" invisible="state == 'model'"/>
+                </header>
+                <sheet>
+                    <div class="oe_button_box" name="button_box" invisible="state == 'model'">
+                        <button name="action_open_linked_assets"
+                            type="object"
+                            class="oe_stat_button"
+                            icon="fa-id-card-o"
+                            invisible="count_linked_asset == 0 or warning_count_assets">
+                            <field string="Asset(s)" name="count_linked_asset" widget="statinfo"/>
+                        </button>
+                        <button name="action_open_linked_assets"
+                            type="object"
+                            class="oe_stat_button text-danger"
+                            icon="fa-id-card-o"
+                            invisible="count_linked_asset == 0 or not warning_count_assets">
+                            <field string="Asset(s)" name="count_linked_asset" widget="statinfo"/>
+                        </button>
+                        <button class="oe_stat_button" name="open_entries"  type="object" icon="fa-bars" data-hotkey="p">
+                            <field string="Posted Entries" name="depreciation_entries_count" widget="statinfo" />
+                        </button>
+                        <button class="oe_stat_button" name="open_increase"  type="object" icon="fa-chevron-circle-up" invisible="gross_increase_count == 0">
+                            <field string="Gross Increase" name="gross_increase_count" widget="statinfo" />
+                        </button>
+                        <button class="oe_stat_button" string="Parent Asset" name="open_parent_id" type="object" icon="fa-bars" invisible ="not parent_id"/>
+                    </div>
+                    <widget name="web_ribbon" title="Archived" bg_color="text-bg-danger" invisible="active"/>
+                    <div class="oe_title">
+                        <label for="name" name="name_label" invisible="state == 'model'"/>
+                        <label for="name" name="model_name_label" string="Asset Model name" invisible="state != 'model'"/>
+                        <h1>
+                            <field name="name" placeholder="e.g. Laptop iBook" required="1"/>
+                        </h1>
+                    </div>
+                    <group invisible="state != 'model'">
+                        <group string="Depreciation Method">
+                            <field name="method" required="1" readonly="state not in ['draft', 'model']" />
+                            <field name="method_progress_factor" widget="percentage" invisible="method == 'linear'" readonly="state not in ['draft', 'model']" required="method in ('degressive', 'degressive_then_linear')"/>
+                            <label for="method_number" string="Duration"/>
+                            <div class="o_row">
+                                <field name="method_number" required="1" readonly="state not in ['draft', 'model']"/>
+                                <field name="method_period" required="1" readonly="state not in ['draft', 'model']" nolabel="1"/>
+                            </div>
+                            <field name="prorata_computation_type" readonly="state not in ['draft', 'model']"/>
+                            <label for="salvage_value_pct"/>
+                            <div>
+                                <field name="salvage_value_pct" widget="percentage" class="oe_inline"/>
+                            </div>
+                        </group>
+                        <group string="Accounting">
+                            <field name="company_id" options="{'no_create': True}" groups="base.group_multi_company" readonly="state != 'draft'"/>
+                            <field
+                                name="account_asset_id"
+                                domain="[
+                                    ('company_ids', 'parent_of', company_id),
+                                    ('account_type', 'in', (
+                                        'asset_fixed',
+                                        'asset_non_current',
+                                        'asset_current')
+                                    ),
+                                ]"
+                                context="{
+                                    'default_account_type': 'asset_fixed',
+                                    'hide_model_on_account': state == 'model' and not id,
+                                    'account_type_domain': [('account_type', 'in', (
+                                        'asset_fixed',
+                                        'asset_non_current'))]}"
+                                groups="base.group_no_one"
+                                invisible="not display_account_asset_id"
+                                readonly="state == 'close'"/>
+                            <field
+                                name="account_depreciation_id"
+                                domain="[
+                                    ('company_ids', 'parent_of', company_id),
+                                    ('account_type', 'in', (
+                                        'asset_fixed',
+                                        'asset_non_current',
+                                        'asset_current')
+                                    ),
+                                ]"
+                                context="{
+                                    'default_account_type': 'asset_non_current',
+                                    'hide_model_on_account': state == 'model' and not id,
+                                    'account_type_domain': [('account_type', 'in', (
+                                        'asset_fixed',
+                                        'asset_non_current'))]}"
+                                required="1"
+                                readonly="state == 'close'"/>
+                            <field
+                                name="account_depreciation_expense_id"
+                                domain="[
+                                    ('company_ids', 'parent_of', company_id),
+                                    ('account_type', 'in', (
+                                        'expense_depreciation',
+                                        'expense')
+                                    ),
+                                ]"
+                                context="{
+                                    'default_account_type': 'expense_depreciation',
+                                    'default_tax_ids': [],
+                                    'hide_model_on_account': state == 'model' and not id,
+                                    'account_type_domain': [('account_type', 'in', (
+                                        'expense_depreciation',
+                                        'expense'))]}"
+                                required="1"
+                                readonly="state == 'close'"/>
+                            <field name="journal_id" required="1" readonly="state not in ['draft', 'model']"/>
+                        </group>
+                    </group>
+                    <notebook colspan="4" invisible="state == 'model'">
+                        <page string="Asset" name="main_page">
+                            <group>
+                                <field name="active" invisible="1"/>
+                                <field name="asset_properties" columns="2"/>
+                                <group string="Asset Values" invisible="state == 'model'" name="asset_values">
+                                    <field name="original_value" widget="monetary" options="{'currency_field': 'currency_id'}" invisible="state == 'model'" readonly="state != 'draft'"/>
+                                    <field name="gross_increase_value" widget="monetary" invisible="state == 'model' or gross_increase_value == 0" options="{'currency_field': 'currency_id'}"/>
+                                    <field name="acquisition_date" invisible="state == 'model'" readonly="state != 'draft'"/>
+                                    <field  name="model_id"
+                                            string="Asset Model"
+                                            domain="[('state', '=', 'model')]"
+                                            options="{'no_quick_create': True}"
+                                            context="{
+                                                'default_state': 'model',
+                                                'default_account_asset_id': account_asset_id,
+                                                'default_account_depreciation_id': account_depreciation_id,
+                                                'default_account_depreciation_expense_id': account_depreciation_expense_id
+                                            }" readonly="state != 'draft'"/>
+                                    <field name="asset_group_id"/>
+                                </group>
+                                <group string="Current Values" invisible="state == 'model'" name="current_values">
+                                    <field name="salvage_value" widget="monetary" options="{'currency_field': 'currency_id'}" readonly="state != 'draft'"/>
+                                    <label for="book_value"/>
+                                    <span>
+                                        <field name="book_value" class="oe_inline" widget="monetary" required="1" invisible="state == 'model'" options="{'currency_field': 'currency_id'}"/>
+                                        <span invisible="salvage_value == 0">
+                                            (incl.
+                                            <field name="value_residual" nolabel="1" force_save="1" widget="monetary" invisible="state == 'model'" options="{'currency_field': 'currency_id'}"/>
+                                             depreciable)
+                                        </span>
+                                    </span>
+                                </group>
+                                <group string="Depreciation Method">
+                                    <field name="method" required="1" readonly="state not in ['draft', 'model']" />
+                                    <field name="method_progress_factor" widget="percentage" invisible="method == 'linear'" readonly="state not in ['draft', 'model']" required="method in ('degressive', 'degressive_then_linear')"/>
+                                    <label for="method_number" string="Duration"/>
+                                    <div class="o_row">
+                                        <field name="method_number" required="1" readonly="state not in ['draft', 'model']" class="oe_inline"/>
+                                        <field name="method_period" required="1" readonly="state not in ['draft', 'model']" nolabel="1"/>
+                                    </div>
+                                    <field name="prorata_computation_type" readonly="state not in ['draft', 'model']"/>
+                                    <field name="prorata_date" invisible="prorata_computation_type == 'none'" readonly="state != 'draft'"/>
+                                </group>
+                                <group string="Accounting">
+                                    <field name="company_id" options="{'no_create': True}" groups="base.group_multi_company" readonly="state != 'draft'"/>
+                                    <field
+                                        name="account_asset_id"
+                                        domain="[
+                                            ('company_ids', 'parent_of', company_id),
+                                            ('account_type', 'in', (
+                                                'asset_fixed',
+                                                'asset_non_current',
+                                                'asset_current')
+                                            ),
+                                        ]"
+                                        context="{
+                                            'default_account_type': 'asset_fixed',
+                                            'hide_model_on_account': state == 'model' and not id,
+                                            'account_type_domain': [('account_type', 'in', (
+                                                'asset_fixed',
+                                                'asset_non_current'))]}"
+                                        invisible="not display_account_asset_id"
+                                        readonly="state == 'close'"/>
+                                    <field
+                                        name="account_depreciation_id"
+                                        domain="[
+                                            ('company_ids', 'parent_of', company_id),
+                                            ('account_type', 'in', (
+                                                'asset_fixed',
+                                                'asset_non_current',
+                                                'asset_current')
+                                            ),
+                                        ]"
+                                        context="{
+                                            'default_account_type': 'asset_non_current',
+                                            'hide_model_on_account': state == 'model' and not id,
+                                            'account_type_domain': [('account_type', 'in', (
+                                                'asset_fixed',
+                                                'asset_non_current'))]}"
+                                        required="1"
+                                        readonly="state == 'close'"/>
+                                    <field
+                                        name="account_depreciation_expense_id"
+                                        domain="[
+                                            ('company_ids', 'parent_of', company_id),
+                                            ('account_type', 'in', (
+                                                'expense_depreciation',
+                                                'expense')
+                                            ),
+                                        ]"
+                                        context="{
+                                            'default_account_type': 'expense_depreciation',
+                                            'hide_model_on_account': state == 'model' and not id,
+                                            'account_type_domain': [('account_type', 'in', (
+                                                'expense_depreciation',
+                                                'expense'))]}"
+                                        required="1"
+                                        readonly="state == 'close'"/>
+                                    <field name="journal_id" required="1" readonly="state not in ['draft', 'model']"/>
+                                    <field name="analytic_distribution" groups="analytic.group_analytic_accounting" widget="analytic_distribution"
+                                           options="{'account_field': 'account_depreciation_expense_id', 'business_domain': 'general'}"
+                                           readonly="0"/>
+                                </group>
+                                <group string="Value at Import" invisible="state == 'model'">
+                                    <field name="already_depreciated_amount_import" string="Depreciated Amount" readonly="state != 'draft'"/>
+                                </group>
+                            </group>
+                        </page>
+                        <page string="Depreciation Board" name="depreciation_board" invisible="total_depreciation_entries_count == 0">
+                            <field name="depreciation_move_ids" mode="list" options="{'reload_whole_on_button': true}" readonly="state not in ['draft', 'open', 'paused']">
+                                <list string="Depreciation Lines" decoration-info="state == 'draft'" decoration-muted="state == 'cancel'" create="0"  default_order="date asc, id asc" editable="top">
+                                    <field name="currency_id" column_invisible="True" readonly="state in ['cancel', 'posted']"/>
+                                    <field name="date" string="Depreciation Date" readonly="state in ['cancel', 'posted']"/>
+                                    <field name="ref" invisible="0"/>
+                                    <field name="reversal_move_ids" widget="deprec_lines_reversed" nolabel="1"/>
+                                    <field name="depreciation_value" widget="monetary" string="Depreciation" options="{'currency_field': 'currency_id'}" readonly="state == 'posted'"/>
+                                    <field name="asset_depreciated_value" readonly="1" force_save="1" options="{'currency_field': 'currency_id'}"/>
+                                    <field name="asset_remaining_value" readonly="1" widget="monetary" force_save="1" options="{'currency_field': 'currency_id'}"/>
+                                    <field name="name" readonly="1" string="Journal Entry" widget="open_move_widget"/>
+                                    <field name="state" column_invisible="True"/>
+                                </list>
+                            </field>
+                        </page>
+                        <page string="Bills" name="related_items">
+                            <field
+                                name="original_move_line_ids"
+                                readonly="state == 'posted'"
+                                domain="[
+                                    ('parent_state', '=', 'posted'),
+                                    ('company_id', '=', company_id),
+                                    ('account_id.account_type', 'in', ('asset_fixed', 'asset_non_current', 'asset_current')),
+                                    ('move_id.move_type', 'in', ('in_invoice', 'in_refund', 'in_receipt', 'entry')),
+                                    ('move_id.asset_id', '=', False),
+                                ]"
+                                class="original_move_line_ids_field"
+                                context="{'disable_preview': 1, 'list_view_ref': 'odex30_account_asset.view_move_line_tree_asset'}">
+                                <list create="0" no_open="1">
+                                    <field name="date"/>
+                                    <field name="move_name" string="Journal Entry" widget="open_move_widget"/>
+                                    <field name="account_id"/>
+                                    <field name="name"/>
+                                    <field name="debit" widget="monetary"/>
+                                    <field name="credit" widget="monetary"/>
+                                    <field name="company_currency_id" column_invisible="True"/>
+                                </list>
+                            </field>
+                        </page>
+                    </notebook>
+                </sheet>
+                <chatter/>
+            </form>
+        </field>
+    </record>
+
+    <record id="view_account_asset_kanban" model="ir.ui.view">
+        <field name="name">account.asset.kanban</field>
+        <field name="model">account.asset</field>
+        <field name="arch" type="xml">
+            <kanban class="o_kanban_mobile" sample="1">
+                <field name="currency_id"/>
+                <templates>
+                    <t t-name="card">
+                        <div class="row mb4">
+                            <field name="name" class="fw-bold fs-5 col-10"/>
+                            <div class="col-2">
+                                <field name="state" class="float-end" widget="label_selection" options="{'classes': {'draft': 'primary', 'open': 'success', 'close': 'default'}}"/>
+                            </div>
+                        </div>
+                        <div class="row">
+                            <div class="col-5">
+                                Original Value
+                            </div>
+                            <div class="col-7 text-end">
+                                <field name="original_value" widget='monetary' readonly="state != 'draft'"/>
+                            </div>
+                        </div>
+                        <div class="row">
+                            <div class="col-5">
+                                Acquisition Date
+                            </div>
+                            <div class="col-7 text-end">
+                                <field name="acquisition_date" readonly="state != 'draft'"/>
+                            </div>
+                        </div>
+                        <div class="row">
+                            <div class="col-5">
+                                Duration
+                            </div>
+                            <div class="col-7 text-end">
+                                <field name="method_number" readonly="state not in ['draft', 'model']"/> <field name="method_period" readonly="state not in ['draft', 'model']"/>
+                            </div>
+                        </div>
+                        <div class="row" t-if="record.model_id.value">
+                            <div class="col-5">
+                                Model
+                            </div>
+                            <div class="col-7 text-end">
+                                <field name="model_id" readonly="state != 'draft'"/>
+                            </div>
+                        </div>
+                    </t>
+                </templates>
+            </kanban>
+        </field>
+    </record>
+
+    <record model="ir.ui.view" id="view_account_asset_tree">
+        <field name="name">account.asset.list</field>
+        <field name="model">account.asset</field>
+        <field name="arch" type="xml">
+            <list string="Assets" decoration-info="(state == 'draft')" decoration-muted="(state in ['close', 'cancelled'])" decoration-warning="(state == 'close' and value_residual != 0)" sample="1">
+                <field name="name"/>
+                <field name="parent_id" optional="hide"/>
+                <field name="acquisition_date" readonly="state != 'draft'"/>
+                <field name="original_value" readonly="state != 'draft'"/>
+                <field name="method" readonly="state not in ['draft', 'model']"/>
+                <field name="book_value"/>
+                <field name="value_residual" widget="monetary"/>
+                <field name="account_asset_id" optional="hide" readonly="state == 'close'"/>
+                <field name="account_depreciation_id" optional="hide" readonly="state == 'close'"/>
+                <field name="account_depreciation_expense_id" optional="hide" readonly="state == 'close'"/>
+                <field name="currency_id" groups="base.group_multi_currency" optional="hide"/>
+                <field name="company_id" groups="base.group_multi_company" optional="hide" readonly="state != 'draft'"/>
+                <field name="company_id" groups="!base.group_multi_company" column_invisible="True" readonly="state != 'draft'"/>
+                <field name="asset_properties"/>
+                <field name="state"/>
+                <field name="activity_exception_decoration" widget="activity_exception"/>
+                <field name="activity_ids" widget="list_activity" optional="hide"/>
+            </list>
+        </field>
+    </record>
+
+    <record model="ir.ui.view" id="view_account_asset_model_tree">
+        <field name="name">account.asset.model.list</field>
+        <field name="model">account.asset</field>
+        <field name="arch" type="xml">
+            <list string="Asset Models">
+                <field name="name"/>
+                <field name="account_asset_id" readonly="state == 'close'"/>
+                <field name="account_depreciation_id" readonly="state == 'close'"/>
+                <field name="account_depreciation_expense_id"/>
+                <field name="method" readonly="state not in ['draft', 'model']"/>
+                <field name="method_number" string="Number of Depreciations" readonly="state not in ['draft', 'model']"/>
+                <field name="method_period" string="Period length" readonly="state not in ['draft', 'model']"/>
+                <field name="company_id" column_invisible="True" readonly="state != 'draft'"/>
+                <field name="state" column_invisible="True"/>
+            </list>
+        </field>
+    </record>
+
+    <record id="view_account_asset_search" model="ir.ui.view">
+        <field name="name">account.asset.search</field>
+        <field name="model">account.asset</field>
+        <field name="arch" type="xml">
+            <search string="Asset Account">
+                <field name="name" string="Asset"/>
+                <field name="acquisition_date"/>
+                <filter string="Current" name="current" domain="[('state','in', ('draft','open'))]" help="Assets in draft and open states"/>
+                <filter string="Closed" name="closed" domain="[('state','=', 'close')]" help="Assets in closed state"/>
+                <field name="model_id" string="Asset Model"/>
+                <separator/>
+                <field name="asset_properties"/>
+                <filter invisible="1" string="Late Activities" name="activities_overdue"
+                    domain="[('my_activity_date_deadline', '&lt;', context_today().strftime('%Y-%m-%d'))]"
+                    help="Show all records which has next action date is before today"/>
+                <filter invisible="1" string="Today Activities" name="activities_today"
+                    domain="[('my_activity_date_deadline', '=', context_today().strftime('%Y-%m-%d'))]"/>
+                <filter invisible="1" string="Future Activities" name="activities_upcoming_all"
+                    domain="[('my_activity_date_deadline', '&gt;', context_today().strftime('%Y-%m-%d'))]"/>
+                <separator/>
+                <filter name="archived" string="Archived" domain="[('active', '=', False)]"/>
+                <group expand="0" string="Group By...">
+                        <filter string="Date" name="month" domain="[]" context="{'group_by':'acquisition_date'}"/>
+                        <filter string="Asset Model" name="model" domain="[]" context="{'group_by':'model_id'}"/>
+                        <filter string="Properties" name="group_by_properties" context="{'group_by': 'asset_properties'}"/>
+                </group>
+            </search>
+        </field>
+    </record>
+
+    <record id="view_account_asset_model_search" model="ir.ui.view">
+        <field name="name">account.asset.model.search</field>
+        <field name="model">account.asset</field>
+        <field name="priority">100</field>
+        <field name="arch" type="xml">
+            <search string="Asset Model">
+                <field name="name"/>
+                <filter name="archived" string="Archived" domain="[('active', '=', False)]"/>
+                <group expand="0" string="Group By...">
+                        <filter string="Fixed Asset Account" name="account_asset_id" domain="[]" context="{'group_by':'account_asset_id'}"/>
+                        <filter string="Depreciation Account" name="account_depreciation_id" domain="[]" context="{'group_by':'account_depreciation_id'}"/>
+                        <filter string="Expense Account" name="account_depreciation_expense_id" domain="[]" context="{'group_by':'account_depreciation_expense_id'}"/>
+                        <filter string="Journal" name="journal_id" domain="[]" context="{'group_by':'journal_id'}"/>
+                </group>
+            </search>
+        </field>
+    </record>
+
+    <record model="ir.actions.act_window" id="action_account_asset_form">
+        <field name="name">Assets</field>
+        <field name="res_model">account.asset</field>
+        <field name="view_ids" eval="[(5, 0, 0),
+            (0, 0, {'view_mode': 'list', 'view_id': ref('view_account_asset_tree')}),
+            (0, 0, {'view_mode': 'kanban'}),
+            (0, 0, {'view_mode': 'activity'}),
+            (0, 0, {'view_mode': 'form', 'view_id': ref('view_account_asset_form')})]"/>
+        <field name="domain">[('state', '!=', 'model'), ('parent_id', '=', False)]</field>
+        <field name="help" type="html">
+            <p class="o_view_nocontent_smiling_face">
+                Create new asset
+            </p>
+        </field>
+    </record>
+
+    <record model="ir.actions.act_window" id="action_account_asset_model_form">
+        <field name="name">Asset Models</field>
+        <field name="res_model">account.asset</field>
+        <field name="view_mode">list,kanban,form</field>
+        <field name="view_ids" eval="[(5, 0, 0),
+            (0, 0, {'view_mode': 'list', 'view_id': ref('view_account_asset_model_tree')}),
+            (0, 0, {'view_mode': 'kanban'}),
+            (0, 0, {'view_mode': 'form', 'view_id': ref('view_account_asset_form')})]"/>
+        <field name="search_view_id" ref="view_account_asset_model_search"/>
+        <field name="domain">[('state', '=', 'model')]</field>
+        <field name="context">{'default_state': 'model'}</field>
+        <field name="help" type="html">
+            <p class="o_view_nocontent_smiling_face">
+                Create new asset model
+            </p>
+        </field>
+    </record>
+
+    <menuitem parent="account.menu_finance_entries" id="menu_action_account_asset_form" action="action_account_asset_form" sequence="60" groups="account.group_account_readonly"/>
+    <menuitem parent="account.account_management_menu" sequence="1" id="menu_action_account_asset_model_form" action="action_account_asset_model_form" groups="account.group_account_readonly"/>
+
+    <record model="ir.actions.server" id="action_account_asset_run">
+        <field name="name">Confirm</field>
+        <field name="groups_id" eval="[(4, ref('account.group_account_user'))]"/>
+        <field name="model_id" ref="odex30_account_asset.model_account_asset"/>
+        <field name="binding_model_id" ref="odex30_account_asset.model_account_asset" />
+        <field name="state">code</field>
+        <field name="code">
+if records:
+    action = records.filtered(lambda asset: asset.state == 'draft').validate()
+        </field>
+    </record>
+
+    <record model="ir.actions.server" id="action_account_asset_compute_depreciations">
+        <field name="name">Compute Depreciation</field>
+        <field name="groups_id" eval="[(4, ref('account.group_account_user'))]"/>
+        <field name="model_id" ref="odex30_account_asset.model_account_asset"/>
+        <field name="binding_model_id" ref="odex30_account_asset.model_account_asset" />
+        <field name="binding_view_types">list</field>
+        <field name="state">code</field>
+        <field name="code">
+if records:
+    action = records.filtered(lambda asset: asset.state == 'draft').compute_depreciation_board()
+        </field>
+    </record>
+
+    <!-- Configuration -->
+
+    <menuitem id="menu_finance_config_assets" name="Assets and Revenues" parent="account.menu_finance_configuration" sequence="25"/>
+
+    <!-- Override of move line list view. Avoid the assets taking a random list view, and make sure to only display relevant fields by default. -->
+
+    <record id="view_move_line_tree_asset" model="ir.ui.view">
+        <field name="name">account.move.line.list.asset</field>
+        <field name="model">account.move.line</field>
+        <field name="mode">primary</field>
+        <field name="inherit_id" ref="account.view_move_line_tree"/>
+        <field name="arch" type="xml">
+            <field name="amount_currency" position="attributes"><attribute name="optional">hide</attribute></field>
+            <field name="debit" position="attributes"><attribute name="optional">hide</attribute></field>
+            <field name="credit" position="attributes"><attribute name="optional">hide</attribute></field>
+            <field name="matching_number" position="attributes"><attribute name="optional">hide</attribute></field>
+            <field name="analytic_distribution" position="attributes"><attribute name="optional">hide</attribute></field>
+            <field name="balance" position="attributes"><attribute name="optional">show</attribute></field>
+        </field>
+    </record>
+
+</odoo>
diff --git a/dev_odex30_accounting/odex30_account_asset/views/account_move_views.xml b/dev_odex30_accounting/odex30_account_asset/views/account_move_views.xml
new file mode 100644
index 0000000..5be8e1f
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_asset/views/account_move_views.xml
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <record id="view_move_form_asset_inherit" model="ir.ui.view">
+        <field name="name">account.move.form</field>
+        <field name="model">account.move</field>
+        <field name="inherit_id" ref="account.view_move_form"/>
+        <field name="arch" type="xml">
+            <xpath expr="//div[hasclass('oe_button_box')]" position="inside">
+                <field name="asset_id" invisible="1"/>
+                <field name="asset_ids" invisible="1"/>
+                <field name="count_asset" invisible="1"/>
+                <field name="draft_asset_exists" invisible="1"/>
+                <button name="open_asset_view"
+                    invisible="not asset_id"
+                    class="oe_stat_button"
+                    icon="fa-cube"
+                    type="object">
+                    <field name="asset_id_display_name" nolabel="1"/>
+                </button>
+                <button name="action_open_asset_ids"
+                    type="object"
+                    class="oe_stat_button"
+                    icon="fa-id-card-o"
+                    invisible="count_asset == 0 or draft_asset_exists">
+                    <field string="Asset(s)" name="count_asset" widget="statinfo"/>
+                </button>
+                <button name="action_open_asset_ids"
+                    type="object"
+                    class="oe_stat_button text-danger"
+                    icon="fa-id-card-o"
+                    invisible="count_asset == 0 or not draft_asset_exists">
+                    <field string="Asset(s)" name="count_asset" widget="statinfo"/>
+                </button>
+            </xpath>
+            <xpath expr="//page[@id='other_tab']//group[@name='accounting_info_group']" position="inside">
+                <field name="asset_move_type" invisible="not asset_id and not asset_ids" readonly="0"/>
+            </xpath>
+            <xpath expr="//page[@id='other_tab_entry']//group[@id='other_tab_entry_group']//group[@name='misc_group']" position="inside">
+                <field name="asset_move_type" invisible="not asset_id and not asset_ids" readonly="0"/>
+            </xpath>
+        </field>
+    </record>
+
+    <record id="view_move_line_form_asset_inherit" model="ir.ui.view">
+        <field name="name">account.move.line.form</field>
+        <field name="model">account.move.line</field>
+        <field name="inherit_id" ref="account.view_move_line_form"/>
+        <field name="arch" type="xml">
+            <field name="move_id" position="after">
+                <group string="Related Assets" invisible="not asset_ids">
+                    <field name="asset_ids" nolabel="1"/>
+                </group>
+            </field>
+        </field>
+    </record>
+
+    <record model="ir.actions.server" id="action_account_aml_to_asset">
+        <field name="name">Create Asset</field>
+        <field name="groups_id" eval="[(4, ref('account.group_account_user'))]"/>
+        <field name="model_id" ref="account.model_account_move_line"/>
+        <field name="binding_model_id" ref="account.model_account_move_line" />
+        <field name="state">code</field>
+        <field name="code">
+if records:
+    action = records.turn_as_asset()
+        </field>
+    </record>
+</odoo>
diff --git a/dev_odex30_accounting/odex30_account_asset/wizard/__init__.py b/dev_odex30_accounting/odex30_account_asset/wizard/__init__.py
new file mode 100644
index 0000000..71973ea
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_asset/wizard/__init__.py
@@ -0,0 +1,3 @@
+# -*- coding: utf-8 -*-
+
+from . import asset_modify
diff --git a/dev_odex30_accounting/odex30_account_asset/wizard/__pycache__/__init__.cpython-311.pyc b/dev_odex30_accounting/odex30_account_asset/wizard/__pycache__/__init__.cpython-311.pyc
new file mode 100644
index 0000000..0b7c888
Binary files /dev/null and b/dev_odex30_accounting/odex30_account_asset/wizard/__pycache__/__init__.cpython-311.pyc differ
diff --git a/dev_odex30_accounting/odex30_account_asset/wizard/__pycache__/asset_modify.cpython-311.pyc b/dev_odex30_accounting/odex30_account_asset/wizard/__pycache__/asset_modify.cpython-311.pyc
new file mode 100644
index 0000000..35e5444
Binary files /dev/null and b/dev_odex30_accounting/odex30_account_asset/wizard/__pycache__/asset_modify.cpython-311.pyc differ
diff --git a/dev_odex30_accounting/odex30_account_asset/wizard/asset_modify.py b/dev_odex30_accounting/odex30_account_asset/wizard/asset_modify.py
new file mode 100644
index 0000000..310e1ef
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_asset/wizard/asset_modify.py
@@ -0,0 +1,409 @@
+# -*- coding: utf-8 -*-
+
+from odoo import api, fields, models, _, Command
+from odoo.exceptions import UserError
+from odoo.tools.misc import format_date
+from odoo.tools import float_is_zero
+
+from dateutil.relativedelta import relativedelta
+
+
+class AssetModify(models.TransientModel):
+    _name = 'asset.modify'
+    _description = 'Modify Asset'
+
+    name = fields.Text(string='Note')
+    asset_id = fields.Many2one(string="Asset", comodel_name='account.asset', required=True, help="The asset to be modified by this wizard", ondelete="cascade")
+    method_number = fields.Integer(string='Duration', required=True)
+    method_period = fields.Selection([('1', 'Months'), ('12', 'Years')], string='Number of Months in a Period', help="The amount of time between two depreciations")
+    value_residual = fields.Monetary(string="Depreciable Amount", help="New residual amount for the asset", compute="_compute_value_residual", store=True, readonly=False)
+    salvage_value = fields.Monetary(string="Not Depreciable Amount", help="New salvage amount for the asset")
+    currency_id = fields.Many2one(related='asset_id.currency_id')
+    date = fields.Date(default=lambda self: fields.Date.today(), string='Date')
+    select_invoice_line_id = fields.Boolean(compute="_compute_select_invoice_line_id")
+    # if we should display the fields for the creation of gross increase asset
+    gain_value = fields.Boolean(compute="_compute_gain_value")
+
+    account_asset_id = fields.Many2one(
+        'account.account',
+        string="Gross Increase Account",
+        check_company=True,
+        domain="[('deprecated', '=', False)]",
+    )
+    account_asset_counterpart_id = fields.Many2one(
+        'account.account',
+        check_company=True,
+        domain="[('deprecated', '=', False)]",
+        string="Asset Counterpart Account",
+    )
+    account_depreciation_id = fields.Many2one(
+        'account.account',
+        check_company=True,
+        domain="[('deprecated', '=', False)]",
+        string="Depreciation Account",
+    )
+    account_depreciation_expense_id = fields.Many2one(
+        'account.account',
+        check_company=True,
+        domain="[('deprecated', '=', False)]",
+        string="Expense Account",
+    )
+    modify_action = fields.Selection(selection="_get_selection_modify_options", string="Action")
+    company_id = fields.Many2one('res.company', related='asset_id.company_id')
+
+    invoice_ids = fields.Many2many(
+        comodel_name='account.move',
+        string="Customer Invoice",
+        check_company=True,
+        domain="[('move_type', '=', 'out_invoice'), ('state', '=', 'posted')]",
+        help="The disposal invoice is needed in order to generate the closing journal entry.",
+    )
+    invoice_line_ids = fields.Many2many(
+        comodel_name='account.move.line',
+        check_company=True,
+        domain="[('move_id', '=', invoice_id), ('display_type', '=', 'product')]",
+        help="There are multiple lines that could be the related to this asset",
+    )
+    gain_account_id = fields.Many2one(
+        comodel_name='account.account',
+        check_company=True,
+        domain="[('deprecated', '=', False)]",
+        compute="_compute_accounts", inverse="_inverse_gain_account", readonly=False, compute_sudo=True,
+        help="Account used to write the journal item in case of gain",
+    )
+    loss_account_id = fields.Many2one(
+        comodel_name='account.account',
+        check_company=True,
+        domain="[('deprecated', '=', False)]",
+        compute="_compute_accounts", inverse="_inverse_loss_account", readonly=False, compute_sudo=True,
+        help="Account used to write the journal item in case of loss",
+    )
+
+    informational_text = fields.Html(compute='_compute_informational_text')
+
+    # Technical field to know if there was a profit or a loss in the selling of the asset
+    gain_or_loss = fields.Selection([('gain', 'Gain'), ('loss', 'Loss'), ('no', 'No')], compute='_compute_gain_or_loss')
+
+    def _compute_modify_action(self):
+        if self.env.context.get('resume_after_pause'):
+            return 'resume'
+        else:
+            return 'dispose'
+
+    @api.depends('asset_id')
+    def _get_selection_modify_options(self):
+        if self.env.context.get('resume_after_pause'):
+            return [('resume', _('Resume'))]
+        return [
+            ('dispose', _("Dispose")),
+            ('sell', _("Sell")),
+            ('modify', _("Re-evaluate")),
+            ('pause', _("Pause")),
+        ]
+
+    @api.depends('company_id')
+    def _compute_accounts(self):
+        for record in self:
+            record.gain_account_id = record.company_id.gain_account_id
+            record.loss_account_id = record.company_id.loss_account_id
+
+    @api.depends('date')
+    def _compute_value_residual(self):
+        for record in self:
+            record.value_residual = record.asset_id._get_residual_value_at_date(record.date)
+
+    def _inverse_gain_account(self):
+        for record in self:
+            record.company_id.sudo().gain_account_id = record.gain_account_id
+
+    def _inverse_loss_account(self):
+        for record in self:
+            record.company_id.sudo().loss_account_id = record.loss_account_id
+
+    @api.onchange('modify_action')
+    def _onchange_action(self):
+        if self.modify_action == 'sell' and self.asset_id.children_ids.filtered(lambda a: a.state in ('draft', 'open') or a.value_residual > 0):
+            raise UserError(_("You cannot automate the journal entry for an asset that has a running gross increase. Please use 'Dispose' on the increase(s)."))
+        if self.modify_action not in ('modify', 'resume'):
+            self.write({'value_residual': self.asset_id._get_residual_value_at_date(self.date), 'salvage_value': self.asset_id.salvage_value})
+
+    @api.onchange('invoice_ids')
+    def _onchange_invoice_ids(self):
+        self.invoice_line_ids = self.invoice_ids.invoice_line_ids.filtered(lambda line: line._origin.id in self.invoice_line_ids.ids)  # because the domain filter doesn't apply and the invoice_line_ids remains selected
+        for invoice in self.invoice_ids.filtered(lambda inv: len(inv.invoice_line_ids) == 1):
+            self.invoice_line_ids += invoice.invoice_line_ids
+
+    @api.depends('asset_id', 'invoice_ids', 'invoice_line_ids', 'modify_action', 'date')
+    def _compute_gain_or_loss(self):
+        for record in self:
+            balances = abs(sum([invoice.balance for invoice in record.invoice_line_ids]))
+            comparison = record.company_id.currency_id.compare_amounts(record.asset_id._get_own_book_value(record.date), balances)
+            if record.modify_action in ('sell', 'dispose') and comparison < 0:
+                record.gain_or_loss = 'gain'
+            elif record.modify_action in ('sell', 'dispose') and comparison > 0:
+                record.gain_or_loss = 'loss'
+            else:
+                record.gain_or_loss = 'no'
+
+    @api.depends('asset_id', 'value_residual', 'salvage_value')
+    def _compute_gain_value(self):
+        for record in self:
+            record.gain_value = record.currency_id.compare_amounts(
+                record._get_own_book_value(),
+                record.asset_id._get_own_book_value(record.date)
+            ) > 0
+
+    @api.depends('loss_account_id', 'gain_account_id', 'gain_or_loss', 'modify_action', 'date', 'value_residual', 'salvage_value')
+    def _compute_informational_text(self):
+        for wizard in self:
+            if wizard.modify_action == 'dispose':
+                if wizard.gain_or_loss == 'gain':
+                    account = wizard.gain_account_id.display_name or ''
+                    gain_or_loss = _('gain')
+                elif wizard.gain_or_loss == 'loss':
+                    account = wizard.loss_account_id.display_name or ''
+                    gain_or_loss = _('loss')
+                else:
+                    account = ''
+                    gain_or_loss = _('gain/loss')
+                wizard.informational_text = _(
+                    "A depreciation entry will be posted on and including the date %(date)s."
+                    "<br/> A disposal entry will be posted on the %(account_type)s account <b>%(account)s</b>.",
+                    date=format_date(self.env, wizard.date), account_type=gain_or_loss, account=account,
+                )
+            elif wizard.modify_action == 'sell':
+                if wizard.gain_or_loss == 'gain':
+                    account = wizard.gain_account_id.display_name or ''
+                elif wizard.gain_or_loss == 'loss':
+                    account = wizard.loss_account_id.display_name or ''
+                else:
+                    account = ''
+                wizard.informational_text = _(
+                    "A depreciation entry will be posted on and including the date %(date)s."
+                    "<br/> A second entry will neutralize the original income and post the  "
+                    "outcome of this sale on account <b>%(account)s</b>.",
+                    date=format_date(self.env, wizard.date), account=account,
+                )
+            elif wizard.modify_action == 'pause':
+                wizard.informational_text = _(
+                    "A depreciation entry will be posted on and including the date %s.",
+                    format_date(self.env, wizard.date)
+                )
+            elif wizard.modify_action == 'modify':
+                if wizard.gain_value:
+                    text = _("An asset will be created for the value increase of the asset. <br/>")
+                else:
+                    text = ""
+                wizard.informational_text = _(
+                    "A depreciation entry will be posted on and including the date %(date)s. <br/> %(extra_text)s "
+                    "Future entries will be recomputed to depreciate the asset following the changes.",
+                    date=format_date(self.env, wizard.date), extra_text=text,
+                )
+
+            else:
+                if wizard.gain_value:
+                    text = _("An asset will be created for the value increase of the asset. <br/>")
+                else:
+                    text = ""
+                wizard.informational_text = _("%s Future entries will be recomputed to depreciate the asset following the changes.", text)
+
+    @api.depends('invoice_ids', 'modify_action')
+    def _compute_select_invoice_line_id(self):
+        for record in self:
+            record.select_invoice_line_id = record.modify_action == 'sell' and len(record.invoice_ids.invoice_line_ids) > 1
+
+    @api.model_create_multi
+    def create(self, vals_list):
+        for vals in vals_list:
+            if 'asset_id' in vals:
+                asset = self.env['account.asset'].browse(vals['asset_id'])
+                if asset.depreciation_move_ids.filtered(lambda m: m.state == 'posted' and not m.reversal_move_ids and m.date > fields.Date.today()):
+                    raise UserError(_('Reverse the depreciation entries posted in the future in order to modify the depreciation'))
+                if 'method_number' not in vals:
+                    vals.update({'method_number': asset.method_number})
+                if 'method_period' not in vals:
+                    vals.update({'method_period': asset.method_period})
+                if 'salvage_value' not in vals:
+                    vals.update({'salvage_value': asset.salvage_value})
+                if 'account_asset_id' not in vals:
+                    vals.update({'account_asset_id': asset.account_asset_id.id})
+                if 'account_depreciation_id' not in vals:
+                    vals.update({'account_depreciation_id': asset.account_depreciation_id.id})
+                if 'account_depreciation_expense_id' not in vals:
+                    vals.update({'account_depreciation_expense_id': asset.account_depreciation_expense_id.id})
+        return super().create(vals_list)
+
+    def modify(self):
+        """ Modifies the duration of asset for calculating depreciation
+        and maintains the history of old values, in the chatter.
+        """
+        if self.date <= self.asset_id.company_id._get_user_fiscal_lock_date(self.asset_id.journal_id):
+            raise UserError(_("You can't re-evaluate the asset before the lock date."))
+
+        old_values = {
+            'method_number': self.asset_id.method_number,
+            'method_period': self.asset_id.method_period,
+            'value_residual': self.asset_id.value_residual,
+            'salvage_value': self.asset_id.salvage_value,
+        }
+
+        asset_vals = {
+            'method_number': self.method_number,
+            'method_period': self.method_period,
+            'salvage_value': self.salvage_value,
+            'account_asset_id': self.account_asset_id,
+            'account_depreciation_id': self.account_depreciation_id,
+            'account_depreciation_expense_id': self.account_depreciation_expense_id,
+        }
+        if self.env.context.get('resume_after_pause'):
+            date_before_pause = max(self.asset_id.depreciation_move_ids, key=lambda x: x.date).date if self.asset_id.depreciation_move_ids else self.asset_id.acquisition_date
+            # We are removing one day to number days because we don't count the current day
+            # i.e. If we pause and resume the same day, there isn't any gap whereas for depreciation
+            # purpose it would count as one full day
+            number_days = self.asset_id._get_delta_days(date_before_pause, self.date) - 1
+            if self.currency_id.compare_amounts(number_days, 0) < 0:
+                raise UserError(_("You cannot resume at a date equal to or before the pause date"))
+
+            asset_vals.update({'asset_paused_days': self.asset_id.asset_paused_days + number_days})
+            asset_vals.update({'state': 'open'})
+            self.asset_id.message_post(body=_("Asset unpaused. %s", self.name))
+
+        current_asset_book = self.asset_id._get_own_book_value(self.date)
+        after_asset_book = self._get_own_book_value()
+        increase = after_asset_book - current_asset_book
+
+        new_residual, new_salvage = self._get_new_asset_values(current_asset_book)
+        residual_increase = max(0, self.value_residual - new_residual)
+        salvage_increase = max(0, self.salvage_value - new_salvage)
+
+        if not self.env.context.get('resume_after_pause'):
+            if self.env['account.move'].search_count([('asset_id', '=', self.asset_id.id), ('state', '=', 'draft'), ('date', '<=', self.date)], limit=1):
+                raise UserError(_('There are unposted depreciations prior to the selected operation date, please deal with them first.'))
+            self.asset_id._create_move_before_date(self.date)
+
+        asset_vals.update({
+            'salvage_value': new_salvage,
+        })
+        computation_children_changed = (
+                asset_vals['method_number'] != self.asset_id.method_number
+                or asset_vals['method_period'] != self.asset_id.method_period
+                or asset_vals.get('asset_paused_days') and not float_is_zero(asset_vals['asset_paused_days'] - self.asset_id.asset_paused_days, 8)
+        )
+        self.asset_id.write(asset_vals)
+
+        # Check for residual/salvage increase while rounding with the company currency precision to prevent float precision issues.
+        if self.currency_id.compare_amounts(residual_increase + salvage_increase, 0) > 0:
+            move = self.env['account.move'].create({
+                'journal_id': self.asset_id.journal_id.id,
+                'date': self.date + relativedelta(days=1),
+                'move_type': 'entry',
+                'asset_move_type': 'positive_revaluation',
+                'line_ids': [
+                    Command.create({
+                        'account_id': self.account_asset_id.id,
+                        'debit': residual_increase + salvage_increase,
+                        'credit': 0,
+                        'name': _('Value increase for: %(asset)s', asset=self.asset_id.name),
+                    }),
+                    Command.create({
+                        'account_id': self.account_asset_counterpart_id.id,
+                        'debit': 0,
+                        'credit': residual_increase + salvage_increase,
+                        'name': _('Value increase for: %(asset)s', asset=self.asset_id.name),
+                    }),
+                ],
+            })
+            move._post()
+            asset_increase = self.env['account.asset'].create({
+                'name': self.asset_id.name + ': ' + self.name if self.name else "",
+                'currency_id': self.asset_id.currency_id.id,
+                'company_id': self.asset_id.company_id.id,
+                'method': self.asset_id.method,
+                'method_number': self.method_number,
+                'method_period': self.method_period,
+                'method_progress_factor': self.asset_id.method_progress_factor,
+                'acquisition_date': self.date + relativedelta(days=1),
+                'value_residual': residual_increase,
+                'salvage_value': salvage_increase,
+                'prorata_date': self.date + relativedelta(days=1),
+                'prorata_computation_type': 'daily_computation' if self.asset_id.prorata_computation_type == 'daily_computation' else 'constant_periods',
+                'original_value': self._get_increase_original_value(residual_increase, salvage_increase),
+                'account_asset_id': self.account_asset_id.id,
+                'account_depreciation_id': self.account_depreciation_id.id,
+                'account_depreciation_expense_id': self.account_depreciation_expense_id.id,
+                'journal_id': self.asset_id.journal_id.id,
+                'parent_id': self.asset_id.id,
+                'original_move_line_ids': [(6, 0, move.line_ids.filtered(lambda r: r.account_id == self.account_asset_id).ids)],
+            })
+            asset_increase.validate()
+
+            subject = _('A gross increase has been created: %(link)s', link=asset_increase._get_html_link())
+            self.asset_id.message_post(body=subject)
+
+        if self.currency_id.compare_amounts(increase, 0) < 0:
+            move = self.env['account.move'].create(self.env['account.move']._prepare_move_for_asset_depreciation({
+                'amount': -increase,
+                'asset_id': self.asset_id,
+                'move_ref': _('Value decrease for: %(asset)s', asset=self.asset_id.name),
+                'depreciation_beginning_date': self.date,
+                'depreciation_end_date': self.date,
+                'date': self.date,
+                'asset_number_days': 0,
+                'asset_value_change': True,
+                'asset_move_type': 'negative_revaluation',
+            }))._post()
+
+        restart_date = self.date if self.env.context.get('resume_after_pause') else self.date + relativedelta(days=1)
+        if self.asset_id.depreciation_move_ids:
+            self.asset_id.compute_depreciation_board(restart_date)
+        else:
+            # We have no moves, we can compute it as new
+            self.asset_id.compute_depreciation_board()
+
+        if computation_children_changed:
+            children = self.asset_id.children_ids
+            children.write({
+                'method_number': asset_vals['method_number'],
+                'method_period': asset_vals['method_period'],
+                'asset_paused_days': self.asset_id.asset_paused_days,
+            })
+
+            for child in children:
+                if not self.env.context.get('resume_after_pause'):
+                    child._create_move_before_date(self.date)
+                if child.depreciation_move_ids:
+                    child.compute_depreciation_board(restart_date)
+                else:
+                    child.compute_depreciation_board()
+                child._check_depreciations()
+                child.depreciation_move_ids.filtered(lambda move: move.state != 'posted')._post()
+        tracked_fields = self.env['account.asset'].fields_get(old_values.keys())
+        changes, tracking_value_ids = self.asset_id._mail_track(tracked_fields, old_values)
+        if changes:
+            self.asset_id.message_post(body=_('Depreciation board modified %s', self.name), tracking_value_ids=tracking_value_ids)
+        self.asset_id._check_depreciations()
+        self.asset_id.depreciation_move_ids.filtered(lambda move: move.state != 'posted')._post()
+        return {'type': 'ir.actions.act_window_close'}
+
+    def pause(self):
+        for record in self:
+            record.asset_id.pause(pause_date=record.date, message=self.name)
+
+    def sell_dispose(self):
+        self.ensure_one()
+        if self.gain_account_id == self.asset_id.account_depreciation_id or self.loss_account_id == self.asset_id.account_depreciation_id:
+            raise UserError(_("You cannot select the same account as the Depreciation Account"))
+        invoice_lines = self.env['account.move.line'] if self.modify_action == 'dispose' else self.invoice_line_ids
+        return self.asset_id.set_to_close(invoice_line_ids=invoice_lines, date=self.date, message=self.name)
+
+    def _get_own_book_value(self):
+        return self.value_residual + self.salvage_value
+
+    def _get_increase_original_value(self, residual_increase, salvage_increase):
+        return residual_increase + salvage_increase
+
+    def _get_new_asset_values(self, current_asset_book):
+        self.ensure_one()
+        new_residual = min(current_asset_book - min(self.salvage_value, self.asset_id.salvage_value), self.value_residual)
+        new_salvage = min(current_asset_book - new_residual, self.salvage_value)
+        return new_residual, new_salvage
diff --git a/dev_odex30_accounting/odex30_account_asset/wizard/asset_modify_views.xml b/dev_odex30_accounting/odex30_account_asset/wizard/asset_modify_views.xml
new file mode 100644
index 0000000..c36d943
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_asset/wizard/asset_modify_views.xml
@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+    <record model="ir.ui.view" id="asset_modify_form">
+        <field name="name">wizard.asset.modify.form</field>
+        <field name="model">asset.modify</field>
+        <field name="arch" type="xml">
+            <form string="Modify Asset">
+                <field name="asset_id" invisible="1"/>
+                <field name="gain_value" invisible="1"/>
+                <field name="select_invoice_line_id" invisible="1"/>
+                <field name="gain_or_loss" invisible="1"/>
+                <field name="company_id" invisible="1"/>
+                <group col="2" invisible="modify_action == 'resume'">
+                    <field name="modify_action" widget="radio" required="1" options="{'horizontal': true}"/>
+                </group>
+                <group invisible="not modify_action">
+                    <group>
+                        <field name="date"/>
+
+                        <label for="method_number" invisible="modify_action not in ('modify', 'resume')"/>
+                        <div class="o_row" invisible="modify_action not in ('modify', 'resume')">
+                            <field name="method_number" required="1"/>
+                            <field name="method_period" required="1" nolabel="1"/>
+                        </div>
+
+                        <field name="invoice_ids"
+                               options="{'no_quick_create': True}"
+                               context="{'default_move_type': 'out_invoice', 'input_full_display_name': True}"
+                               invisible="modify_action != 'sell'"
+                               required="modify_action == 'sell'"
+                               widget="many2many_tags"/>
+
+                        <field name="invoice_line_ids"
+                               options="{'no_create': True, 'no_quick_create': True}"
+                               invisible="modify_action != 'sell' and not select_invoice_line_id"
+                               required="select_invoice_line_id"
+                               domain="[('move_id', 'in', invoice_ids), ('display_type', '=', 'product')]"
+                               widget="many2many_tags"/>
+
+                        <field name="gain_account_id"
+                               invisible="gain_or_loss != 'gain'"
+                               required="gain_or_loss == 'gain'"/>
+
+                        <field name="loss_account_id"
+                               invisible="gain_or_loss != 'loss'"
+                               required="gain_or_loss == 'loss'"/>
+
+                        <field name="value_residual" invisible="modify_action not in ('modify', 'resume')"/>
+                        <field name="salvage_value" invisible="modify_action not in ('modify', 'resume')"/>
+                        <field name="account_asset_id" invisible="modify_action != 'modify'" required="gain_value"/>
+                        <field name="account_asset_counterpart_id" invisible="modify_action not in ('modify', 'resume') or not gain_value" required="gain_value"/>
+                        <field name="account_depreciation_id" invisible="modify_action != 'modify'" required="gain_value"/>
+                        <field name="account_depreciation_expense_id" invisible="modify_action != 'modify'" required="gain_value"/>
+
+                        <field name="name"
+                               placeholder="Add an internal note"
+                               required="modify_action in ('modify', 'resume')"/>
+                    </group>
+                    <group>
+                        <field name="informational_text" nolabel="1"/>
+                    </group>
+                </group>
+                <footer>
+                    <button name="pause"
+                            string="Pause"
+                            type="object"
+                            class="btn-primary"
+                            data-hotkey="p"
+                            invisible="modify_action != 'pause'"/>
+                    <button name="modify"
+                            string="Modify"
+                            type="object"
+                            class="btn-primary"
+                            data-hotkey="q"
+                            invisible="modify_action != 'modify'"/>
+                    <button name="modify"
+                            string="Resume"
+                            type="object"
+                            class="btn-primary"
+                            data-hotkey="r"
+                            invisible="modify_action != 'resume'"/>
+                    <button name="sell_dispose"
+                            string="Sell"
+                            type="object"
+                            class="btn-primary"
+                            data-hotkey="s"
+                            invisible="modify_action != 'sell'" />
+                    <button name="sell_dispose"
+                            string="Dispose"
+                            type="object"
+                            class="btn-primary"
+                            data-hotkey="t"
+                            invisible="modify_action != 'dispose'" />
+                    <button string="Cancel"
+                            class="btn-secondary"
+                            special="cancel"
+                            data-hotkey="x"/>
+                </footer>
+            </form>
+        </field>
+    </record>
+
+</odoo>
diff --git a/dev_odex30_accounting/odex30_account_auto_transfer/__init__.py b/dev_odex30_accounting/odex30_account_auto_transfer/__init__.py
new file mode 100644
index 0000000..502c788
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_auto_transfer/__init__.py
@@ -0,0 +1,4 @@
+# -*- coding: utf-8 -*-
+
+from . import models
+from . import demo
diff --git a/dev_odex30_accounting/odex30_account_auto_transfer/__manifest__.py b/dev_odex30_accounting/odex30_account_auto_transfer/__manifest__.py
new file mode 100644
index 0000000..71a683a
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_auto_transfer/__manifest__.py
@@ -0,0 +1,21 @@
+# -*- coding: utf-8 -*-
+
+{
+    'name': 'Account Automatic Transfers',
+    'depends': ['odex30_account_accountant'],
+    'description': """
+Account Automatic Transfers
+===========================
+Manage automatic transfers between your accounts.
+    """,
+        'category': 'Odex30-Accounting/Odex30-Accounting',
+        'author': "Expert Co. Ltd.",
+        'website': "http://www.exp-sa.com",
+    'data': [
+        'security/account_auto_transfer_security.xml',
+        'security/ir.model.access.csv',
+        'data/cron.xml',
+        'views/transfer_model_views.xml',
+    ],
+    'auto_install': True,
+}
diff --git a/dev_odex30_accounting/odex30_account_auto_transfer/__pycache__/__init__.cpython-311.pyc b/dev_odex30_accounting/odex30_account_auto_transfer/__pycache__/__init__.cpython-311.pyc
new file mode 100644
index 0000000..5f93de8
Binary files /dev/null and b/dev_odex30_accounting/odex30_account_auto_transfer/__pycache__/__init__.cpython-311.pyc differ
diff --git a/dev_odex30_accounting/odex30_account_auto_transfer/data/cron.xml b/dev_odex30_accounting/odex30_account_auto_transfer/data/cron.xml
new file mode 100644
index 0000000..a6b169b
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_auto_transfer/data/cron.xml
@@ -0,0 +1,10 @@
+<odoo>
+    <record id="ir_cron_auto_transfer" model="ir.cron">
+        <field name="name">Account automatic transfers: Perform transfers</field>
+        <field name="model_id" ref="model_account_transfer_model"/>
+        <field name="state">code</field>
+        <field name="code">model.action_cron_auto_transfer()</field>
+        <field name="interval_number">1</field>
+        <field name="interval_type">days</field>
+    </record>
+</odoo>
diff --git a/dev_odex30_accounting/odex30_account_auto_transfer/demo/__init__.py b/dev_odex30_accounting/odex30_account_auto_transfer/demo/__init__.py
new file mode 100644
index 0000000..7eaefb9
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_auto_transfer/demo/__init__.py
@@ -0,0 +1 @@
+from . import account_demo
diff --git a/dev_odex30_accounting/odex30_account_auto_transfer/demo/__pycache__/__init__.cpython-311.pyc b/dev_odex30_accounting/odex30_account_auto_transfer/demo/__pycache__/__init__.cpython-311.pyc
new file mode 100644
index 0000000..4638962
Binary files /dev/null and b/dev_odex30_accounting/odex30_account_auto_transfer/demo/__pycache__/__init__.cpython-311.pyc differ
diff --git a/dev_odex30_accounting/odex30_account_auto_transfer/demo/__pycache__/account_demo.cpython-311.pyc b/dev_odex30_accounting/odex30_account_auto_transfer/demo/__pycache__/account_demo.cpython-311.pyc
new file mode 100644
index 0000000..3d62215
Binary files /dev/null and b/dev_odex30_accounting/odex30_account_auto_transfer/demo/__pycache__/account_demo.cpython-311.pyc differ
diff --git a/dev_odex30_accounting/odex30_account_auto_transfer/demo/account_demo.py b/dev_odex30_accounting/odex30_account_auto_transfer/demo/account_demo.py
new file mode 100644
index 0000000..17893f3
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_auto_transfer/demo/account_demo.py
@@ -0,0 +1,63 @@
+import time
+
+from odoo import api, _, models, Command
+
+
+class AccountChartTemplate(models.AbstractModel):
+    _inherit = "account.chart.template"
+
+    @api.model
+    def _get_demo_data(self, company=False):
+        demo_data = {
+            'account.journal': {},
+            **super()._get_demo_data(company),
+        }
+        demo_data['account.journal'].update({
+            'auto_transfer_journal': {
+                'name': _("IFRS Automatic Transfers"),
+                'code': "IFRSA",
+                'type': 'general',
+                'show_on_dashboard': False,
+                'sequence': 1000,
+            },
+        })
+        demo_data['account.transfer.model'] = {
+            'monthly_model': {
+                'name': _("IFRS rent expense transfer"),
+                'date_start': time.strftime('%Y-01-01'),
+                'frequency': 'month',
+                'journal_id': 'auto_transfer_journal',
+                'account_ids': [self._get_demo_account('expense_rent', 'expense', company).id],
+                'line_ids': [
+                    Command.create({
+                        'account_id': self._get_demo_account('expense_rd', 'expense', company).id,
+                        'percent': 35.0,
+                    }),
+                    Command.create({
+                        'account_id': self._get_demo_account('expense_sales', 'expense_direct_cost', company).id,
+                        'percent': 65.0,
+                    }),
+                ],
+            },
+            'yearly_model': {
+                'name': _("Yearly liabilites auto transfers"),
+                'date_start': time.strftime('%Y-01-01'),
+                'frequency': 'year',
+                'journal_id': 'auto_transfer_journal',
+                'account_ids': [Command.set([
+                    self._get_demo_account('current_liabilities', 'liability_current', company).id,
+                    self._get_demo_account('payable', 'liability_payable', company).id
+                ])],
+                'line_ids': [
+                    Command.create({
+                        'account_id': self._get_demo_account('payable', 'liability_payable', company).id,
+                        'percent': 77.5,
+                    }),
+                    Command.create({
+                        'account_id': self._get_demo_account('non_current_liabilities', 'liability_non_current', company).id,
+                        'percent': 22.5,
+                    }),
+                ],
+            },
+        }
+        return demo_data
diff --git a/dev_odex30_accounting/odex30_account_auto_transfer/i18n/ar.po b/dev_odex30_accounting/odex30_account_auto_transfer/i18n/ar.po
new file mode 100644
index 0000000..c3d8bc6
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_auto_transfer/i18n/ar.po
@@ -0,0 +1,479 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# 	* odex30_account_auto_transfer
+# 
+# Translators:
+# Wil Odoo, 2024
+# Mustafa J. Kadhem <safi2266@gmail.com>, 2024
+# Malaz Abuidris <msea@odoo.com>, 2024
+# 
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 18.0+e\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2024-09-25 09:26+0000\n"
+"PO-Revision-Date: 2024-09-25 09:43+0000\n"
+"Last-Translator: Malaz Abuidris <msea@odoo.com>, 2024\n"
+"Language-Team: Arabic (https://app.transifex.com/odoo/teams/41243/ar/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Language: ar\n"
+"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
+
+#. module: odex30_account_auto_transfer
+#: model_terms:ir.ui.view,arch_db:odex30_account_auto_transfer.view_transfer_model_form
+msgid "<span> to </span>"
+msgstr "<span> إلى </span>"
+
+#. module: odex30_account_auto_transfer
+#: model:ir.model,name:odex30_account_auto_transfer.model_account_chart_template
+msgid "Account Chart Template"
+msgstr "نموذج مخطط الحساب "
+
+#. module: odex30_account_auto_transfer
+#: model:ir.model,name:odex30_account_auto_transfer.model_account_transfer_model
+msgid "Account Transfer Model"
+msgstr "نموذج تحويل الحساب "
+
+#. module: odex30_account_auto_transfer
+#: model:ir.model,name:odex30_account_auto_transfer.model_account_transfer_model_line
+msgid "Account Transfer Model Line"
+msgstr "بند نموذج تحويل الحساب "
+
+#. module: odex30_account_auto_transfer
+#: model:ir.actions.server,name:odex30_account_auto_transfer.ir_cron_auto_transfer_ir_actions_server
+msgid "Account automatic transfers: Perform transfers"
+msgstr "تحويلات الحساب التلقائية: أداء التحويلات "
+
+#. module: odex30_account_auto_transfer
+#: model_terms:ir.ui.view,arch_db:odex30_account_auto_transfer.view_transfer_model_form
+msgid "Activate"
+msgstr "تفعيل"
+
+#. module: odex30_account_auto_transfer
+#: model:ir.model.fields,field_description:odex30_account_auto_transfer.field_account_transfer_model__active
+msgid "Active"
+msgstr "نشط "
+
+#. module: odex30_account_auto_transfer
+#: model:ir.model.fields,help:odex30_account_auto_transfer.field_account_transfer_model_line__analytic_account_ids
+msgid ""
+"Adds a condition to only transfer the sum of the lines from the origin "
+"accounts that match these analytic accounts to the destination account"
+msgstr ""
+"يقوم بإضافة شرط لتحويل مجموع البنود من الحسابات الأصلية التي تطابق تلك "
+"الحسابات التحليلية إلى الحساب الهدف فقط "
+
+#. module: odex30_account_auto_transfer
+#: model:ir.model.fields,help:odex30_account_auto_transfer.field_account_transfer_model_line__partner_ids
+msgid ""
+"Adds a condition to only transfer the sum of the lines from the origin "
+"accounts that match these partners to the destination account"
+msgstr ""
+"يقوم بإضافة شرط لتحويل مجموع البنود من الحسابات الأصلية التي تطابق هؤلاء "
+"الشركاء إلى الحساب الهدف فقط "
+
+#. module: odex30_account_auto_transfer
+#: model:ir.model.fields,field_description:odex30_account_auto_transfer.field_account_transfer_model_line__analytic_account_ids
+msgid "Analytic Filter"
+msgstr "عامل تصفية تحليلي "
+
+#. module: odex30_account_auto_transfer
+#: model_terms:ir.ui.view,arch_db:odex30_account_auto_transfer.view_transfer_model_form
+#: model_terms:ir.ui.view,arch_db:odex30_account_auto_transfer.view_transfer_model_search
+msgid "Archived"
+msgstr "مؤرشف "
+
+#. module: odex30_account_auto_transfer
+#: model_terms:ir.ui.view,arch_db:odex30_account_auto_transfer.view_transfer_model_form
+msgid "Automated Transfer"
+msgstr "التحويل التلقائي "
+
+#. module: odex30_account_auto_transfer
+#. odoo-python
+#: code:addons/odex30_account_auto_transfer/models/transfer_model.py:0
+msgid "Automatic Transfer (%(percent)s%% from account %(origin_account)s)"
+msgstr "التحويل التلقائي (%(percent)s%% من الحساب %(origin_account)s) "
+
+#. module: odex30_account_auto_transfer
+#. odoo-python
+#: code:addons/odex30_account_auto_transfer/models/transfer_model.py:0
+msgid "Automatic Transfer (-%s%%)"
+msgstr "التحويل التلقائي (-%s%%)"
+
+#. module: odex30_account_auto_transfer
+#. odoo-python
+#: code:addons/odex30_account_auto_transfer/models/transfer_model.py:0
+msgid ""
+"Automatic Transfer (entries with analytic account(s): %(analytic_accounts)s "
+"and partner(s): %(partners)s)"
+msgstr ""
+"التحويل التلقائي (القيود التي بها حساب (حسابات) تحليلية: "
+"%(analytic_accounts)s والشريك (الشركاء): %(partners)s) "
+
+#. module: odex30_account_auto_transfer
+#. odoo-python
+#: code:addons/odex30_account_auto_transfer/models/transfer_model.py:0
+msgid "Automatic Transfer (entries with analytic account(s): %s)"
+msgstr "التحويل التلقائي (القيود التي بها حساب (حسابات) تحليلية: %s)"
+
+#. module: odex30_account_auto_transfer
+#. odoo-python
+#: code:addons/odex30_account_auto_transfer/models/transfer_model.py:0
+msgid "Automatic Transfer (entries with partner(s): %s)"
+msgstr "التحويل التلقائي (القيود التي بها شريك (شركاء): %s) "
+
+#. module: odex30_account_auto_transfer
+#. odoo-python
+#: code:addons/odex30_account_auto_transfer/models/transfer_model.py:0
+msgid ""
+"Automatic Transfer (from account %(origin_account)s with analytic "
+"account(s): %(analytic_accounts)s and partner(s): %(partners)s)"
+msgstr ""
+"التحويل التلقائي (من الحساب %(origin_account)s الذي به حسابات تحليلية: "
+"%(analytic_accounts)s والشريك (الشركاء): %(partners)s) "
+
+#. module: odex30_account_auto_transfer
+#. odoo-python
+#: code:addons/odex30_account_auto_transfer/models/transfer_model.py:0
+msgid ""
+"Automatic Transfer (from account %(origin_account)s with analytic "
+"account(s): %(analytic_accounts)s)"
+msgstr ""
+"التحويل التلقائي (من الحساب %(origin_account)s الذي به حسابات تحليلية: "
+"%(analytic_accounts)s) "
+
+#. module: odex30_account_auto_transfer
+#. odoo-python
+#: code:addons/odex30_account_auto_transfer/models/transfer_model.py:0
+msgid ""
+"Automatic Transfer (from account %(origin_account)s with partner(s): "
+"%(partners)s)"
+msgstr ""
+"التحويل التلقائي (من الحساب %(origin_account)s الذي به الشركاء: "
+"%(partners)s) "
+
+#. module: odex30_account_auto_transfer
+#. odoo-python
+#: code:addons/odex30_account_auto_transfer/models/transfer_model.py:0
+msgid "Automatic Transfer (to account %s)"
+msgstr "التحويل التلقائي (للحساب %s)"
+
+#. module: odex30_account_auto_transfer
+#: model:ir.actions.act_window,name:odex30_account_auto_transfer.transfer_model_action
+msgid "Automatic Transfers"
+msgstr "التحويلات التلقائية "
+
+#. module: odex30_account_auto_transfer
+#: model:ir.model.fields,field_description:odex30_account_auto_transfer.field_account_transfer_model__company_id
+msgid "Company"
+msgstr "الشركة "
+
+#. module: odex30_account_auto_transfer
+#: model:ir.model.fields,help:odex30_account_auto_transfer.field_account_transfer_model__company_id
+msgid "Company related to this journal"
+msgstr "الشركة المتعلقة بهذه اليومية "
+
+#. module: odex30_account_auto_transfer
+#: model_terms:ir.ui.view,arch_db:odex30_account_auto_transfer.view_transfer_model_form
+msgid "Compute Transfer"
+msgstr "حساب التحويل "
+
+#. module: odex30_account_auto_transfer
+#: model:ir.model.fields,field_description:odex30_account_auto_transfer.field_account_transfer_model__create_uid
+#: model:ir.model.fields,field_description:odex30_account_auto_transfer.field_account_transfer_model_line__create_uid
+msgid "Created by"
+msgstr "أنشئ بواسطة"
+
+#. module: odex30_account_auto_transfer
+#: model:ir.model.fields,field_description:odex30_account_auto_transfer.field_account_transfer_model__create_date
+#: model:ir.model.fields,field_description:odex30_account_auto_transfer.field_account_transfer_model_line__create_date
+msgid "Created on"
+msgstr "أنشئ في"
+
+#. module: odex30_account_auto_transfer
+#: model_terms:ir.ui.view,arch_db:odex30_account_auto_transfer.view_transfer_model_form
+msgid "Description"
+msgstr "الوصف"
+
+#. module: odex30_account_auto_transfer
+#: model:ir.model.fields,field_description:odex30_account_auto_transfer.field_account_transfer_model_line__account_id
+msgid "Destination Account"
+msgstr "حساب الوجهة"
+
+#. module: odex30_account_auto_transfer
+#: model:ir.model.fields,field_description:odex30_account_auto_transfer.field_account_transfer_model__line_ids
+msgid "Destination Accounts"
+msgstr "حسابات الوجهة "
+
+#. module: odex30_account_auto_transfer
+#: model:ir.model.fields,field_description:odex30_account_auto_transfer.field_account_transfer_model__journal_id
+msgid "Destination Journal"
+msgstr "يومية الوجهة "
+
+#. module: odex30_account_auto_transfer
+#: model_terms:ir.ui.view,arch_db:odex30_account_auto_transfer.view_transfer_model_form
+msgid "Disable"
+msgstr "تعطيل"
+
+#. module: odex30_account_auto_transfer
+#: model:ir.model.fields.selection,name:odex30_account_auto_transfer.selection__account_transfer_model__state__disabled
+msgid "Disabled"
+msgstr "معطل"
+
+#. module: odex30_account_auto_transfer
+#: model:ir.model.fields,field_description:odex30_account_auto_transfer.field_account_transfer_model__display_name
+#: model:ir.model.fields,field_description:odex30_account_auto_transfer.field_account_transfer_model_line__display_name
+msgid "Display Name"
+msgstr "اسم العرض "
+
+#. module: odex30_account_auto_transfer
+#: model:ir.model.fields,field_description:odex30_account_auto_transfer.field_account_transfer_model__frequency
+msgid "Frequency"
+msgstr "معدل الحدوث "
+
+#. module: odex30_account_auto_transfer
+#: model:ir.actions.act_window,name:odex30_account_auto_transfer.generated_transfers_action
+msgid "Generated Entries"
+msgstr "القيود المُنشأة "
+
+#. module: odex30_account_auto_transfer
+#: model:ir.model.fields,field_description:odex30_account_auto_transfer.field_account_transfer_model__move_ids
+msgid "Generated Moves"
+msgstr "الحركات المُنشأة "
+
+#. module: odex30_account_auto_transfer
+#: model:ir.model.fields,field_description:odex30_account_auto_transfer.field_account_transfer_model__id
+#: model:ir.model.fields,field_description:odex30_account_auto_transfer.field_account_transfer_model_line__id
+msgid "ID"
+msgstr "المُعرف"
+
+#. module: odex30_account_auto_transfer
+#. odoo-python
+#: code:addons/odex30_account_auto_transfer/demo/account_demo.py:0
+msgid "IFRS Automatic Transfers"
+msgstr "التحويلات التلقائية في IFRS "
+
+#. module: odex30_account_auto_transfer
+#. odoo-python
+#: code:addons/odex30_account_auto_transfer/demo/account_demo.py:0
+msgid "IFRS rent expense transfer"
+msgstr "تحويل نفقات الإيجار في IFRS "
+
+#. module: odex30_account_auto_transfer
+#: model:ir.model,name:odex30_account_auto_transfer.model_account_journal
+#: model_terms:ir.ui.view,arch_db:odex30_account_auto_transfer.view_transfer_model_form
+msgid "Journal"
+msgstr "دفتر اليومية"
+
+#. module: odex30_account_auto_transfer
+#: model:ir.model,name:odex30_account_auto_transfer.model_account_move
+msgid "Journal Entry"
+msgstr "قيد اليومية"
+
+#. module: odex30_account_auto_transfer
+#: model:ir.model,name:odex30_account_auto_transfer.model_account_move_line
+msgid "Journal Item"
+msgstr "عنصر اليومية"
+
+#. module: odex30_account_auto_transfer
+#: model:ir.model.fields,field_description:odex30_account_auto_transfer.field_account_transfer_model__write_uid
+#: model:ir.model.fields,field_description:odex30_account_auto_transfer.field_account_transfer_model_line__write_uid
+msgid "Last Updated by"
+msgstr "آخر تحديث بواسطة"
+
+#. module: odex30_account_auto_transfer
+#: model:ir.model.fields,field_description:odex30_account_auto_transfer.field_account_transfer_model__write_date
+#: model:ir.model.fields,field_description:odex30_account_auto_transfer.field_account_transfer_model_line__write_date
+msgid "Last Updated on"
+msgstr "آخر تحديث في"
+
+#. module: odex30_account_auto_transfer
+#: model:ir.model.fields.selection,name:odex30_account_auto_transfer.selection__account_transfer_model__frequency__month
+msgid "Monthly"
+msgstr "شهرياً"
+
+#. module: odex30_account_auto_transfer
+#: model:ir.model.fields,field_description:odex30_account_auto_transfer.field_account_transfer_model__move_ids_count
+msgid "Move Ids Count"
+msgstr "تعداد مُعرفات الحركات "
+
+#. module: odex30_account_auto_transfer
+#: model_terms:ir.ui.view,arch_db:odex30_account_auto_transfer.view_transfer_model_form
+msgid "Move Model"
+msgstr "نموذج الحركة "
+
+#. module: odex30_account_auto_transfer
+#: model_terms:ir.ui.view,arch_db:odex30_account_auto_transfer.view_transfer_model_tree
+msgid "Move Models"
+msgstr "نماذج الحركة "
+
+#. module: odex30_account_auto_transfer
+#: model:ir.model.fields,field_description:odex30_account_auto_transfer.field_account_transfer_model__name
+msgid "Name"
+msgstr "الاسم"
+
+#. module: odex30_account_auto_transfer
+#: model:ir.model.constraint,message:odex30_account_auto_transfer.constraint_account_transfer_model_line_unique_account_by_transfer_model
+msgid "Only one account occurrence by transfer model"
+msgstr "يُسمح بوجود حساب واحد فقط لكل نموذج تحويل "
+
+#. module: odex30_account_auto_transfer
+#: model:ir.model.fields,field_description:odex30_account_auto_transfer.field_account_transfer_model__account_ids
+#: model_terms:ir.ui.view,arch_db:odex30_account_auto_transfer.view_transfer_model_form
+msgid "Origin Accounts"
+msgstr "الحسابات الأصلية "
+
+#. module: odex30_account_auto_transfer
+#: model:ir.model.fields,field_description:odex30_account_auto_transfer.field_account_bank_statement_line__transfer_model_id
+#: model:ir.model.fields,field_description:odex30_account_auto_transfer.field_account_move__transfer_model_id
+msgid "Originating Model"
+msgstr "النموذج المُنشئ "
+
+#. module: odex30_account_auto_transfer
+#: model:ir.model.fields,field_description:odex30_account_auto_transfer.field_account_transfer_model_line__partner_ids
+msgid "Partner Filter"
+msgstr "عامل تصفية الشريك "
+
+#. module: odex30_account_auto_transfer
+#: model:ir.model.fields,field_description:odex30_account_auto_transfer.field_account_transfer_model_line__percent
+msgid "Percent"
+msgstr "بالمئة "
+
+#. module: odex30_account_auto_transfer
+#: model_terms:ir.ui.view,arch_db:odex30_account_auto_transfer.view_transfer_model_form
+msgid "Percent (%)"
+msgstr "النسبة (%)"
+
+#. module: odex30_account_auto_transfer
+#: model:ir.model.fields,field_description:odex30_account_auto_transfer.field_account_transfer_model_line__percent_is_readonly
+msgid "Percent Is Readonly"
+msgstr "النسبة للقراءة فقط "
+
+#. module: odex30_account_auto_transfer
+#: model:ir.model.fields,help:odex30_account_auto_transfer.field_account_transfer_model_line__percent
+msgid ""
+"Percentage of the sum of lines from the origin accounts will be transferred "
+"to the destination account"
+msgstr ""
+"سوف يتم تحويل نسبة من مجموع البنود من الحسابات الأصلية إلى حساب الوجهة "
+
+#. module: odex30_account_auto_transfer
+#: model_terms:ir.ui.view,arch_db:odex30_account_auto_transfer.view_transfer_model_form
+msgid "Period"
+msgstr "الفترة"
+
+#. module: odex30_account_auto_transfer
+#: model:ir.model.fields.selection,name:odex30_account_auto_transfer.selection__account_transfer_model__frequency__quarter
+msgid "Quarterly"
+msgstr "ربع سنوي"
+
+#. module: odex30_account_auto_transfer
+#: model:ir.model.fields.selection,name:odex30_account_auto_transfer.selection__account_transfer_model__state__in_progress
+msgid "Running"
+msgstr "جاري"
+
+#. module: odex30_account_auto_transfer
+#: model:ir.model.fields,field_description:odex30_account_auto_transfer.field_account_transfer_model_line__sequence
+msgid "Sequence"
+msgstr "تسلسل "
+
+#. module: odex30_account_auto_transfer
+#: model:ir.model.fields,field_description:odex30_account_auto_transfer.field_account_transfer_model__date_start
+msgid "Start Date"
+msgstr "تاريخ البدء "
+
+#. module: odex30_account_auto_transfer
+#: model:ir.model.fields,field_description:odex30_account_auto_transfer.field_account_transfer_model__state
+msgid "State"
+msgstr "الحالة "
+
+#. module: odex30_account_auto_transfer
+#: model:ir.model.fields,field_description:odex30_account_auto_transfer.field_account_transfer_model__date_stop
+msgid "Stop Date"
+msgstr "تاريخ الإيقاف "
+
+#. module: odex30_account_auto_transfer
+#. odoo-python
+#: code:addons/odex30_account_auto_transfer/models/transfer_model.py:0
+msgid "The analytic filter %s is duplicated"
+msgstr "تم إنشاء نسخة مطابقة من عامل التصفية التحليلي %s "
+
+#. module: odex30_account_auto_transfer
+#. odoo-python
+#: code:addons/odex30_account_auto_transfer/models/transfer_model.py:0
+msgid ""
+"The partner filter %(partner_filter)s in combination with the analytic "
+"filter %(analytic_filter)s is duplicated"
+msgstr ""
+"تم إنشاء نسخة مطابقة لعامل تصفية الشريك %(partner_filter)s وجمعه مع الحساب "
+"التحليلي %(analytic_filter)s "
+
+#. module: odex30_account_auto_transfer
+#. odoo-python
+#: code:addons/odex30_account_auto_transfer/models/transfer_model.py:0
+msgid "The partner filter %s is duplicated"
+msgstr "تم إنشاء نسخة مطابقة لعامل تصفية الشريك %s "
+
+#. module: odex30_account_auto_transfer
+#. odoo-python
+#: code:addons/odex30_account_auto_transfer/models/transfer_model.py:0
+msgid "The total percentage (%s) should be less or equal to 100!"
+msgstr "يجب أن تكون النسبة الكلية (%s) أقل من أو تساوي 100! "
+
+#. module: odex30_account_auto_transfer
+#: model:ir.model.fields,field_description:odex30_account_auto_transfer.field_account_transfer_model__total_percent
+msgid "Total Percent"
+msgstr "النسبة الكلية "
+
+#. module: odex30_account_auto_transfer
+#: model:ir.model.fields,field_description:odex30_account_auto_transfer.field_account_transfer_model_line__transfer_model_id
+msgid "Transfer Model"
+msgstr "نموذج التحويل "
+
+#. module: odex30_account_auto_transfer
+#: model:ir.ui.menu,name:odex30_account_auto_transfer.menu_auto_transfer
+#: model_terms:ir.ui.view,arch_db:odex30_account_auto_transfer.view_transfer_model_form
+msgid "Transfers"
+msgstr "التحويلات "
+
+#. module: odex30_account_auto_transfer
+#: model:ir.model.fields.selection,name:odex30_account_auto_transfer.selection__account_transfer_model__frequency__year
+msgid "Yearly"
+msgstr "سنويًا"
+
+#. module: odex30_account_auto_transfer
+#. odoo-python
+#: code:addons/odex30_account_auto_transfer/demo/account_demo.py:0
+msgid "Yearly liabilites auto transfers"
+msgstr "التحويلات التلقائية للالتزامات السنوية "
+
+#. module: odex30_account_auto_transfer
+#. odoo-python
+#: code:addons/odex30_account_auto_transfer/models/transfer_model.py:0
+msgid ""
+"You cannot delete an automatic transfer that has draft moves attached "
+"('%s'). Please delete them before deleting this transfer."
+msgstr ""
+"لا يمكنك حذف شحنة تلقائية بها حركات مرفقة بحالة المسودة ('%s')؛ يرجى حذفها "
+"قبل حذف هذه الشحنة. "
+
+#. module: odex30_account_auto_transfer
+#. odoo-python
+#: code:addons/odex30_account_auto_transfer/models/transfer_model.py:0
+msgid ""
+"You cannot delete an automatic transfer that has posted moves attached "
+"('%s')."
+msgstr "لا يمكنك حذف شحنة تلقائية بها حركات مرفقة قد تم ترحيلها ('%s'). "
+
+#. module: odex30_account_auto_transfer
+#. odoo-python
+#: code:addons/odex30_account_auto_transfer/models/account_move_line.py:0
+msgid "You cannot set Tax on Automatic Transfer's entries."
+msgstr "لا يمكنك تعيين ضريبة في قيود التحويل التلقائي. "
+
+#. module: odex30_account_auto_transfer
+#: model_terms:ir.ui.view,arch_db:odex30_account_auto_transfer.view_transfer_model_form
+msgid "e.g. Monthly Expense Transfer"
+msgstr "مثال: التحويل الشهري للنفقات "
diff --git a/dev_odex30_accounting/odex30_account_auto_transfer/models/__init__.py b/dev_odex30_accounting/odex30_account_auto_transfer/models/__init__.py
new file mode 100644
index 0000000..0664ea8
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_auto_transfer/models/__init__.py
@@ -0,0 +1,6 @@
+# -*- coding: utf-8 -*-
+
+from . import account_journal
+from . import account_move
+from . import account_move_line
+from . import transfer_model
diff --git a/dev_odex30_accounting/odex30_account_auto_transfer/models/__pycache__/__init__.cpython-311.pyc b/dev_odex30_accounting/odex30_account_auto_transfer/models/__pycache__/__init__.cpython-311.pyc
new file mode 100644
index 0000000..0f077a4
Binary files /dev/null and b/dev_odex30_accounting/odex30_account_auto_transfer/models/__pycache__/__init__.cpython-311.pyc differ
diff --git a/dev_odex30_accounting/odex30_account_auto_transfer/models/__pycache__/account_journal.cpython-311.pyc b/dev_odex30_accounting/odex30_account_auto_transfer/models/__pycache__/account_journal.cpython-311.pyc
new file mode 100644
index 0000000..cbf4914
Binary files /dev/null and b/dev_odex30_accounting/odex30_account_auto_transfer/models/__pycache__/account_journal.cpython-311.pyc differ
diff --git a/dev_odex30_accounting/odex30_account_auto_transfer/models/__pycache__/account_move.cpython-311.pyc b/dev_odex30_accounting/odex30_account_auto_transfer/models/__pycache__/account_move.cpython-311.pyc
new file mode 100644
index 0000000..eb76819
Binary files /dev/null and b/dev_odex30_accounting/odex30_account_auto_transfer/models/__pycache__/account_move.cpython-311.pyc differ
diff --git a/dev_odex30_accounting/odex30_account_auto_transfer/models/__pycache__/account_move_line.cpython-311.pyc b/dev_odex30_accounting/odex30_account_auto_transfer/models/__pycache__/account_move_line.cpython-311.pyc
new file mode 100644
index 0000000..620c95e
Binary files /dev/null and b/dev_odex30_accounting/odex30_account_auto_transfer/models/__pycache__/account_move_line.cpython-311.pyc differ
diff --git a/dev_odex30_accounting/odex30_account_auto_transfer/models/__pycache__/transfer_model.cpython-311.pyc b/dev_odex30_accounting/odex30_account_auto_transfer/models/__pycache__/transfer_model.cpython-311.pyc
new file mode 100644
index 0000000..2d583ba
Binary files /dev/null and b/dev_odex30_accounting/odex30_account_auto_transfer/models/__pycache__/transfer_model.cpython-311.pyc differ
diff --git a/dev_odex30_accounting/odex30_account_auto_transfer/models/account_journal.py b/dev_odex30_accounting/odex30_account_auto_transfer/models/account_journal.py
new file mode 100644
index 0000000..95f5402
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_auto_transfer/models/account_journal.py
@@ -0,0 +1,11 @@
+from odoo import models, api
+from odoo.addons.base.models.ir_model import MODULE_UNINSTALL_FLAG
+
+
+class AccountJournal(models.Model):
+    _inherit = 'account.journal'
+
+    @api.ondelete(at_uninstall=True)
+    def _unlink_cascade_transfer_model(self):
+        if self.env.context.get(MODULE_UNINSTALL_FLAG):  # only cascade when switching CoA
+            self.env['account.transfer.model'].search([('journal_id', 'in', self.ids)]).unlink()
diff --git a/dev_odex30_accounting/odex30_account_auto_transfer/models/account_move.py b/dev_odex30_accounting/odex30_account_auto_transfer/models/account_move.py
new file mode 100644
index 0000000..d4dd1e5
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_auto_transfer/models/account_move.py
@@ -0,0 +1,9 @@
+# -*- coding: utf-8 -*-
+
+from odoo import fields, models
+
+
+class AccountMove(models.Model):
+    _inherit = 'account.move'
+
+    transfer_model_id = fields.Many2one('account.transfer.model', string="Originating Model")
diff --git a/dev_odex30_accounting/odex30_account_auto_transfer/models/account_move_line.py b/dev_odex30_accounting/odex30_account_auto_transfer/models/account_move_line.py
new file mode 100644
index 0000000..623c520
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_auto_transfer/models/account_move_line.py
@@ -0,0 +1,13 @@
+# -*- coding: utf-8 -*-
+
+from odoo import api, models, _
+from odoo.exceptions import UserError
+
+
+class AccountMoveLine(models.Model):
+    _inherit = 'account.move.line'
+
+    @api.constrains('tax_ids')
+    def _check_auto_transfer_line_ids_tax(self):
+        if any(line.move_id.transfer_model_id and line.tax_ids for line in self):
+            raise UserError(_("You cannot set Tax on Automatic Transfer's entries."))
diff --git a/dev_odex30_accounting/odex30_account_auto_transfer/models/transfer_model.py b/dev_odex30_accounting/odex30_account_auto_transfer/models/transfer_model.py
new file mode 100644
index 0000000..a4cb5f5
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_auto_transfer/models/transfer_model.py
@@ -0,0 +1,531 @@
+# -*- coding: utf-8 -*-
+
+from datetime import date
+
+from dateutil.relativedelta import relativedelta
+
+from odoo import fields, models, api, _
+from odoo.exceptions import UserError, ValidationError
+from odoo.osv import expression
+from odoo.tools.float_utils import float_compare, float_is_zero
+
+
+class TransferModel(models.Model):
+    _name = "account.transfer.model"
+    _description = "Account Transfer Model"
+
+    # DEFAULTS
+    def _get_default_date_start(self):
+        company = self.env.company
+        return company.compute_fiscalyear_dates(date.today())['date_from'] if company else None
+
+    def _get_default_journal(self):
+        return self.env['account.journal'].search([
+            *self.env['account.journal']._check_company_domain(self.env.company),
+            ('type', '=', 'general'),
+        ], limit=1)
+
+    name = fields.Char(required=True)
+    active = fields.Boolean(default=True)
+    journal_id = fields.Many2one('account.journal', required=True, string="Destination Journal", default=_get_default_journal)
+    company_id = fields.Many2one('res.company', readonly=True, related='journal_id.company_id')
+    date_start = fields.Date(string="Start Date", required=True, default=_get_default_date_start)
+    date_stop = fields.Date(string="Stop Date", required=False)
+    frequency = fields.Selection([('month', 'Monthly'), ('quarter', 'Quarterly'), ('year', 'Yearly')],
+                                 required=True, default='month')
+    account_ids = fields.Many2many('account.account', 'account_model_rel', string="Origin Accounts", domain="[('account_type', '!=', 'off_balance')]")
+    line_ids = fields.One2many('account.transfer.model.line', 'transfer_model_id', string="Destination Accounts")
+    move_ids = fields.One2many('account.move', 'transfer_model_id', string="Generated Moves")
+    move_ids_count = fields.Integer(compute="_compute_move_ids_count")
+    total_percent = fields.Float(compute="_compute_total_percent", string="Total Percent", readonly=True)
+    state = fields.Selection([('disabled', 'Disabled'), ('in_progress', 'Running')], default='disabled', required=True)
+
+    def copy(self, default=None):
+        new_models = super().copy(default)
+        for old_model, new_model in zip(self, new_models):
+            new_model.account_ids += old_model.account_ids
+            old_model.line_ids.copy({'transfer_model_id': new_model.id})
+        return new_models
+
+    @api.ondelete(at_uninstall=False)
+    def _unlink_with_check_moves(self):
+        # Only unlink a transfer that has no posted/draft moves attached.
+        for transfer in self:
+            if transfer.move_ids_count > 0:
+                posted_moves = any(move.state == 'posted' for move in transfer.move_ids)
+                if posted_moves:
+                    raise UserError(_("You cannot delete an automatic transfer that has posted moves attached ('%s').", transfer.name))
+                draft_moves = any(move.state == 'draft' for move in transfer.move_ids)
+                if draft_moves:
+                    raise UserError(_("You cannot delete an automatic transfer that has draft moves attached ('%s'). "
+                                      "Please delete them before deleting this transfer.", transfer.name))
+
+    def action_archive(self):
+        self.action_disable()
+        return super().action_archive()
+
+    # COMPUTEDS / CONSTRAINS
+    @api.depends('move_ids')
+    def _compute_move_ids_count(self):
+        """ Compute the amount of move ids have been generated by this transfer model. """
+        for record in self:
+            record.move_ids_count = len(record.move_ids)
+
+    @api.constrains('line_ids')
+    def _check_line_ids_percent(self):
+        """ Check that the total percent is not bigger than 100.0 """
+        for record in self:
+            if not (0 < record.total_percent <= 100.0):
+                raise ValidationError(_('The total percentage (%s) should be less or equal to 100!', record.total_percent))
+
+    @api.constrains('line_ids')
+    def _check_line_ids_filters(self):
+        """ Check that the filters on the lines make sense """
+        for record in self:
+            combinations = []
+            for line in record.line_ids:
+                if line.partner_ids and line.analytic_account_ids:
+                    for p in line.partner_ids:
+                        for a in line.analytic_account_ids:
+                            combination = (p.id, a.id)
+                            if combination in combinations:
+                                raise ValidationError(_(
+                                    "The partner filter %(partner_filter)s in combination with the analytic filter %(analytic_filter)s is duplicated",
+                                    partner_filter=p.display_name, analytic_filter=a.display_name,
+                                ))
+                            combinations.append(combination)
+                elif line.partner_ids:
+                    for p in line.partner_ids:
+                        combination = (p.id, None)
+                        if combination in combinations:
+                            raise ValidationError(_("The partner filter %s is duplicated", p.display_name))
+                        combinations.append(combination)
+                elif line.analytic_account_ids:
+                    for a in line.analytic_account_ids:
+                        combination = (None, a.id)
+                        if combination in combinations:
+                            raise ValidationError(_("The analytic filter %s is duplicated", a.display_name))
+                        combinations.append(combination)
+
+    @api.depends('line_ids')
+    def _compute_total_percent(self):
+        """ Compute the total percentage of all lines linked to this model. """
+        for record in self:
+            non_filtered_lines = record.line_ids.filtered(lambda l: not l.partner_ids and not l.analytic_account_ids)
+            if record.line_ids and not non_filtered_lines:
+                # Lines are only composed of filtered ones thus percentage does not matter, make it 100
+                record.total_percent = 100.0
+            else:
+                total_percent = sum(non_filtered_lines.mapped('percent'))
+                if float_compare(total_percent, 100.0, precision_digits=6) == 0:
+                    total_percent = 100.0
+                record.total_percent = total_percent
+
+    # ACTIONS
+    def action_activate(self):
+        """ Put this move model in "in progress" state. """
+        return self.write({'state': 'in_progress'})
+
+    def action_disable(self):
+        """ Put this move model in "disabled" state. """
+        return self.write({'state': 'disabled'})
+
+    @api.model
+    def action_cron_auto_transfer(self):
+        """ Perform the automatic transfer for the all active move models. """
+        self.search([('state', '=', 'in_progress')]).action_perform_auto_transfer()
+
+    def action_perform_auto_transfer(self):
+        """ Perform the automatic transfer for the current recordset of models  """
+        for record in self:
+            # If no account to ventilate or no account to ventilate into : nothing to do
+            if record.account_ids and record.line_ids:
+                today = date.today()
+                max_date = record.date_stop and min(today, record.date_stop) or today
+                start_date = record._determine_start_date()
+                next_move_date = record._get_next_move_date(start_date)
+
+                # (Re)Generate moves in draft untill today
+                # Journal entries will be recomputed everyday until posted.
+                while next_move_date <= max_date:
+                    record._create_or_update_move_for_period(start_date, next_move_date)
+                    start_date = next_move_date + relativedelta(days=1)
+                    next_move_date = record._get_next_move_date(start_date)
+
+                # (Re)Generate move for one more period if needed
+                if not record.date_stop:
+                    record._create_or_update_move_for_period(start_date, next_move_date)
+                elif today < record.date_stop:
+                    record._create_or_update_move_for_period(start_date, min(next_move_date, record.date_stop))
+        return False
+
+    def _get_move_lines_base_domain(self, start_date, end_date):
+        """
+        Determine the domain to get all account move lines posted in a given period, for an account in origin accounts
+        :param start_date: the start date of the period
+        :param end_date: the end date of the period
+        :return: the computed domain
+        :rtype: list
+        """
+        self.ensure_one()
+        return [
+            ('account_id', 'in', self.account_ids.ids),
+            ('date', '>=', start_date),
+            ('date', '<=', end_date),
+            ('parent_state', '=', 'posted')
+        ]
+
+    # PROTECTEDS
+
+    def _create_or_update_move_for_period(self, start_date, end_date):
+        """
+        Create or update a move for a given period. This means (re)generates all the needed moves to execute the
+        transfers
+        :param start_date: the start date of the targeted period
+        :param end_date: the end date of the targeted period
+        :return: the created (or updated) move
+        """
+        self.ensure_one()
+        current_move = self._get_move_for_period(end_date)
+        line_values = self._get_auto_transfer_move_line_values(start_date, end_date)
+        if line_values:
+            if current_move is None:
+                current_move = self.env['account.move'].create({
+                    'ref': '%s: %s --> %s' % (self.name, str(start_date), str(end_date)),
+                    'date': end_date,
+                    'journal_id': self.journal_id.id,
+                    'transfer_model_id': self.id,
+                })
+
+            line_ids_values = [(0, 0, value) for value in line_values]
+            # unlink all old line ids
+            current_move.line_ids.unlink()
+            # recreate line ids
+            current_move.write({'line_ids': line_ids_values})
+        return current_move
+
+    def _get_move_for_period(self, end_date):
+        """ Get the generated move for a given period
+        :param end_date: the end date of the wished period, do not need the start date as the move will always be
+        generated with end date of a period as date
+        :return: a recordset containing the move found if any, else None
+        """
+        self.ensure_one()
+        # Move will always be generated with end_date of a period as date
+        domain = [
+            ('date', '=', end_date),
+            ('state', '=', 'draft'),
+            ('transfer_model_id', '=', self.id)
+        ]
+        current_moves = self.env['account.move'].search(domain, limit=1, order="date desc")
+        return current_moves[0] if current_moves else None
+
+    def _determine_start_date(self):
+        """ Determine the automatic transfer start date which is the last created move if any or the start date of the model  """
+        self.ensure_one()
+        # Get last generated move date if any (to know when to start)
+        last_move_domain = [('transfer_model_id', '=', self.id), ('state', '=', 'posted'), ('company_id', '=', self.company_id.id)]
+        move_ids = self.env['account.move'].search(last_move_domain, order='date desc', limit=1)
+        return (move_ids[0].date + relativedelta(days=1)) if move_ids else self.date_start
+
+    def _get_next_move_date(self, date):
+        """ Compute the following date of automated transfer move, based on a date and the frequency """
+        self.ensure_one()
+        if self.frequency == 'month':
+            delta = relativedelta(months=1)
+        elif self.frequency == 'quarter':
+            delta = relativedelta(months=3)
+        else:
+            delta = relativedelta(years=1)
+        return date + delta - relativedelta(days=1)
+
+    def _get_auto_transfer_move_line_values(self, start_date, end_date):
+        """ Get all the transfer move lines values for a given period
+        :param start_date: the start date of the period
+        :param end_date: the end date of the period
+        :return: a list of dict representing the values of lines to create
+        :rtype: list
+        """
+        self.ensure_one()
+        values = []
+        # Get the balance of all moves from all selected accounts, grouped by accounts
+        filtered_lines = self.line_ids.filtered(lambda x: x.analytic_account_ids or x.partner_ids)
+        if filtered_lines:
+            values += filtered_lines._get_transfer_move_lines_values(start_date, end_date)
+
+        non_filtered_lines = self.line_ids - filtered_lines
+        if non_filtered_lines:
+            values += self._get_non_filtered_auto_transfer_move_line_values(non_filtered_lines, start_date, end_date)
+
+        return values
+
+    def _get_non_filtered_auto_transfer_move_line_values(self, lines, start_date, end_date):
+        """
+        Get all values to create move lines corresponding to the transfers needed by all lines without analytic
+        account or partner for a given period. It contains the move lines concerning destination accounts and
+        the ones concerning the origin accounts. This process all the origin accounts one after one.
+        :param lines: the move model lines to handle
+        :param start_date: the start date of the period
+        :param end_date: the end date of the period
+        :return: a list of dict representing the values to use to create the needed move lines
+        :rtype: list
+        """
+        self.ensure_one()
+        domain = expression.AND([
+            self._get_move_lines_base_domain(start_date, end_date),
+            [('partner_id', 'not in', self.line_ids.partner_ids.ids)],
+            [('analytic_distribution', 'not in', self.line_ids.analytic_account_ids.ids)],
+        ])
+        total_balance_account = self.env['account.move.line']._read_group(
+            domain,
+            ['account_id'],
+            ['balance:sum'],
+        )
+        # balance = debit - credit
+        # --> balance > 0 means a debit so it should be credited on the source account
+        # --> balance < 0 means a credit so it should be debited on the source account
+        values_list = []
+        for account, balance in total_balance_account:
+            initial_amount = abs(balance)
+            source_account_is_debit = balance >= 0
+            if not float_is_zero(initial_amount, precision_digits=9):
+                move_lines_values, amount_left = self._get_non_analytic_transfer_values(account, lines, end_date,
+                                                                                        initial_amount,
+                                                                                        source_account_is_debit)
+
+                # the line which credit/debit the source account
+                substracted_amount = initial_amount - amount_left
+                source_move_line = {
+                    'name': _('Automatic Transfer (-%s%%)', self.total_percent),
+                    'account_id': account.id,
+                    'date_maturity': end_date,
+                    'credit' if source_account_is_debit else 'debit': substracted_amount
+                }
+                values_list += move_lines_values
+                values_list.append(source_move_line)
+        return values_list
+
+    def _get_non_analytic_transfer_values(self, account, lines, write_date, amount, is_debit):
+        """
+        Get all values to create destination account move lines corresponding to the transfers needed by all lines
+        without analytic account for a given account.
+        :param account: the origin account to handle
+        :param write_date: the write date of the move lines
+        :param amount: the total amount to take care on the origin account
+        :type amount: float
+        :param is_debit: True if origin account has a debit balance, False if it's a credit
+        :type is_debit: bool
+        :return: a tuple containing the move lines values in a list and the amount left on the origin account after
+        processing as a float
+        :rtype: tuple
+        """
+        # if total ventilated is 100%
+        #   then the last line should not compute in % but take the rest
+        # else
+        #   it should compute in % (as the rest will stay on the source account)
+        self.ensure_one()
+        amount_left = amount
+
+        take_the_rest = self.total_percent == 100.0
+        amount_of_lines = len(lines)
+        values_list = []
+
+        for i, line in enumerate(lines):
+            if take_the_rest and i == amount_of_lines - 1:
+                line_amount = amount_left
+                amount_left = 0
+            else:
+                currency = self.journal_id.currency_id or self.company_id.currency_id
+                line_amount = currency.round((line.percent / 100.0) * amount)
+                amount_left -= line_amount
+
+            move_line = line._get_destination_account_transfer_move_line_values(account, line_amount, is_debit,
+                                                                                write_date)
+            values_list.append(move_line)
+
+        return values_list, amount_left
+
+
+class TransferModelLine(models.Model):
+    _name = "account.transfer.model.line"
+    _description = "Account Transfer Model Line"
+    _order = "sequence, id"
+
+    transfer_model_id = fields.Many2one('account.transfer.model', string="Transfer Model", required=True, ondelete='cascade')
+    account_id = fields.Many2one('account.account', string="Destination Account", required=True,
+                                 domain="[('account_type', '!=', 'off_balance')]")
+    percent = fields.Float(string="Percent", required=True, default=100, help="Percentage of the sum of lines from the origin accounts will be transferred to the destination account")
+    analytic_account_ids = fields.Many2many('account.analytic.account', string='Analytic Filter', help="Adds a condition to only transfer the sum of the lines from the origin accounts that match these analytic accounts to the destination account")
+    partner_ids = fields.Many2many('res.partner', string='Partner Filter', help="Adds a condition to only transfer the sum of the lines from the origin accounts that match these partners to the destination account")
+    percent_is_readonly = fields.Boolean(compute="_compute_percent_is_readonly")
+    sequence = fields.Integer("Sequence")
+
+    _sql_constraints = [
+        (
+            'unique_account_by_transfer_model', 'UNIQUE(transfer_model_id, account_id)',
+            'Only one account occurrence by transfer model')
+    ]
+
+    @api.onchange('analytic_account_ids', 'partner_ids')
+    def set_percent_if_analytic_account_ids(self):
+        """
+        Set percent to 100 if at least analytic account id is set.
+        """
+        for record in self:
+            if record.analytic_account_ids or record.partner_ids:
+                record.percent = 100
+
+    def _get_transfer_move_lines_values(self, start_date, end_date):
+        """
+        Get values to create the move lines to perform all needed transfers between accounts linked to current recordset
+        for a given period
+        :param start_date: the start date of the targeted period
+        :param end_date: the end date of the targeted period
+        :return: a list containing all the values needed to create the needed transfers
+        :rtype: list
+        """
+        transfer_values = []
+        # Avoid to transfer two times the same entry
+        already_handled_move_line_ids = []
+        for transfer_model_line in self:
+            domain = transfer_model_line._get_move_lines_domain(start_date, end_date, already_handled_move_line_ids)
+
+            if transfer_model_line.analytic_account_ids:
+                domain = expression.AND([
+                    domain,
+                    [('analytic_distribution', 'in', transfer_model_line.analytic_account_ids.ids)],
+                ])
+
+            total_balances = self.env['account.move.line']._read_group(
+                domain,
+                ['account_id'],
+                ['id:array_agg', 'balance:sum'],
+            )
+            for account, ids, balance in total_balances:
+                already_handled_move_line_ids += ids
+                if not float_is_zero(balance, precision_digits=9):
+                    amount = abs(balance)
+                    source_account_is_debit = balance > 0
+                    transfer_values += transfer_model_line._get_transfer_values(account, amount, source_account_is_debit,
+                                                                            end_date)
+        return transfer_values
+
+    def _get_move_lines_domain(self, start_date, end_date, avoid_move_line_ids=None):
+        """
+        Determine the domain to get all account move lines posted in a given period corresponding to self move model
+        line.
+        :param start_date: the start date of the targeted period
+        :param end_date: the end date of the targeted period
+        :param avoid_move_line_ids: the account.move.line ids that should be excluded from the domain
+        :return: the computed domain
+        :rtype: list
+        """
+        self.ensure_one()
+        move_lines_domain = self.transfer_model_id._get_move_lines_base_domain(start_date, end_date)
+        if avoid_move_line_ids:
+            move_lines_domain.append(('id', 'not in', avoid_move_line_ids))
+        if self.partner_ids:
+            move_lines_domain.append(('partner_id', 'in', self.partner_ids.ids))
+        return move_lines_domain
+
+    def _get_transfer_values(self, account, amount, is_debit, write_date):
+        """
+        Get values to create the move lines to perform a transfer between self account and given account
+        :param account: the account
+        :param amount: the amount that is being transferred
+        :type amount: float
+        :param is_debit: True if the transferred amount is a debit, False if credit
+        :type is_debit: bool
+        :param write_date: the date to use for the move line writing
+        :return: a list containing the values to create the needed move lines
+        :rtype: list
+        """
+        self.ensure_one()
+        return [
+            self._get_destination_account_transfer_move_line_values(account, amount, is_debit, write_date),
+            self._get_origin_account_transfer_move_line_values(account, amount, is_debit, write_date)
+        ]
+
+    def _get_origin_account_transfer_move_line_values(self, origin_account, amount, is_debit,
+                                                      write_date):
+        """
+        Get values to create the move line in the origin account side for a given transfer of a given amount from origin
+        account to a given destination account.
+        :param origin_account: the origin account
+        :param amount: the amount that is being transferred
+        :type amount: float
+        :param is_debit: True if the transferred amount is a debit, False if credit
+        :type is_debit: bool
+        :param write_date: the date to use for the move line writing
+        :return: a dict containing the values to create the move line
+        :rtype: dict
+        """
+        anal_accounts = self.analytic_account_ids and ', '.join(self.analytic_account_ids.mapped('name'))
+        partners = self.partner_ids and ', '.join(self.partner_ids.mapped('name'))
+        if anal_accounts and partners:
+            name = _("Automatic Transfer (entries with analytic account(s): %(analytic_accounts)s and partner(s): %(partners)s)", analytic_accounts=anal_accounts, partners=partners)
+        elif anal_accounts:
+            name = _("Automatic Transfer (entries with analytic account(s): %s)", anal_accounts)
+        elif partners:
+            name = _("Automatic Transfer (entries with partner(s): %s)", partners)
+        else:
+            name = _("Automatic Transfer (to account %s)", self.account_id.code)
+        return {
+            'name': name,
+            'account_id': origin_account.id,
+            'date_maturity': write_date,
+            'credit' if is_debit else 'debit': amount
+        }
+
+    def _get_destination_account_transfer_move_line_values(self, origin_account, amount, is_debit,
+                                                           write_date):
+        """
+        Get values to create the move line in the destination account side for a given transfer of a given amount from
+        given origin account to destination account.
+        :param origin_account: the origin account
+        :param amount: the amount that is being transferred
+        :type amount: float
+        :param is_debit: True if the transferred amount is a debit, False if credit
+        :type is_debit: bool
+        :param write_date: the date to use for the move line writing
+        :return: a dict containing the values to create the move line
+        :rtype dict:
+        """
+        anal_accounts = self.analytic_account_ids and ', '.join(self.analytic_account_ids.mapped('name'))
+        partners = self.partner_ids and ', '.join(self.partner_ids.mapped('name'))
+        if anal_accounts and partners:
+            name = _(
+                "Automatic Transfer (from account %(origin_account)s with analytic account(s): %(analytic_accounts)s and partner(s): %(partners)s)",
+                origin_account=origin_account.code,
+                analytic_accounts=anal_accounts,
+                partners=partners,
+            )
+        elif anal_accounts:
+            name = _(
+                "Automatic Transfer (from account %(origin_account)s with analytic account(s): %(analytic_accounts)s)",
+                origin_account=origin_account.code,
+                analytic_accounts=anal_accounts
+            )
+        elif partners:
+            name = _(
+                "Automatic Transfer (from account %(origin_account)s with partner(s): %(partners)s)",
+                origin_account=origin_account.code,
+                partners=partners,
+            )
+        else:
+            name = _(
+                "Automatic Transfer (%(percent)s%% from account %(origin_account)s)",
+                percent=self.percent,
+                origin_account=origin_account.code,
+            )
+        return {
+            'name': name,
+            'account_id': self.account_id.id,
+            'date_maturity': write_date,
+            'debit' if is_debit else 'credit': amount
+        }
+
+    @api.depends('analytic_account_ids', 'partner_ids')
+    def _compute_percent_is_readonly(self):
+        for record in self:
+            record.percent_is_readonly = record.analytic_account_ids or record.partner_ids
diff --git a/dev_odex30_accounting/odex30_account_auto_transfer/security/account_auto_transfer_security.xml b/dev_odex30_accounting/odex30_account_auto_transfer/security/account_auto_transfer_security.xml
new file mode 100644
index 0000000..21ec454
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_auto_transfer/security/account_auto_transfer_security.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+<data noupdate="1">
+    <record id="account_auto_transfer_rule" model="ir.rule">
+        <field name="name">Account Automatic Transfer</field>
+        <field name="model_id" ref="model_account_transfer_model"/>
+        <field name="global" eval="True"/>
+        <field name="domain_force">[('company_id', 'in', company_ids)]</field>
+    </record>
+</data>
+</odoo>
diff --git a/dev_odex30_accounting/odex30_account_auto_transfer/security/ir.model.access.csv b/dev_odex30_accounting/odex30_account_auto_transfer/security/ir.model.access.csv
new file mode 100644
index 0000000..f214369
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_auto_transfer/security/ir.model.access.csv
@@ -0,0 +1,7 @@
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_account_transfer_model,access_account_transfer_model,odex30_account_auto_transfer.model_account_transfer_model,account.group_account_readonly,1,0,0,0
+access_account_transfer_model_manager,access_account_transfer_model_manager,odex30_account_auto_transfer.model_account_transfer_model,account.group_account_manager,1,1,1,1
+access_account_transfer_model_invoicing_payment,access_account_transfer_model_invoicing_payment,odex30_account_auto_transfer.model_account_transfer_model,account.group_account_invoice,1,0,1,0
+access_account_transfer_model_line,access_account_transfer_model_line,odex30_account_auto_transfer.model_account_transfer_model_line,account.group_account_readonly,1,0,0,0
+access_account_transfer_model_line_manager,access_account_transfer_model_line_manager,odex30_account_auto_transfer.model_account_transfer_model_line,account.group_account_manager,1,1,1,1
+access_account_transfer_model_line_invoicing_payment,access_account_transfer_model_line_invoicing_payment,odex30_account_auto_transfer.model_account_transfer_model_line,account.group_account_invoice,1,0,1,0
diff --git a/dev_odex30_accounting/odex30_account_auto_transfer/static/description/icon.png b/dev_odex30_accounting/odex30_account_auto_transfer/static/description/icon.png
new file mode 100644
index 0000000..a058ecb
Binary files /dev/null and b/dev_odex30_accounting/odex30_account_auto_transfer/static/description/icon.png differ
diff --git a/dev_odex30_accounting/odex30_account_auto_transfer/static/description/icon.svg b/dev_odex30_accounting/odex30_account_auto_transfer/static/description/icon.svg
new file mode 100644
index 0000000..92b815f
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_auto_transfer/static/description/icon.svg
@@ -0,0 +1 @@
+<svg width="50" height="50" viewBox="0 0 50 50" xmlns="http://www.w3.org/2000/svg"><path d="M.923 23.987C-.85 22.701.103 20 2.331 20h23.342c1.285 0 2.327.994 2.327 2.22v17.556c0 1.865-2.265 2.899-3.788 1.728L9.967 30.544.923 23.987Z" fill="#1AD3BB"/><path d="M49.077 26.013c1.774 1.286.82 3.987-1.408 3.987H24.327C23.042 30 22 29.006 22 27.78V10.224c0-1.865 2.265-2.899 3.788-1.728l14.245 10.96 9.044 6.557Z" fill="#FC868B"/><path d="M22 20h3.673c1.285 0 2.327.994 2.327 2.22V30h-3.673C23.042 30 22 29.006 22 27.78V20Z" fill="#1A6F66"/></svg>
diff --git a/dev_odex30_accounting/odex30_account_auto_transfer/tests/__init__.py b/dev_odex30_accounting/odex30_account_auto_transfer/tests/__init__.py
new file mode 100644
index 0000000..7bb7698
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_auto_transfer/tests/__init__.py
@@ -0,0 +1,3 @@
+# -*- coding: utf-8 -*-
+from . import test_transfer_model
+from . import test_transfer_model_line
diff --git a/dev_odex30_accounting/odex30_account_auto_transfer/tests/account_auto_transfer_test_classes.py b/dev_odex30_accounting/odex30_account_auto_transfer/tests/account_auto_transfer_test_classes.py
new file mode 100644
index 0000000..c6d94fd
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_auto_transfer/tests/account_auto_transfer_test_classes.py
@@ -0,0 +1,99 @@
+# -*- coding: utf-8 -*-
+from datetime import datetime
+from uuid import uuid4
+from odoo.tests import common
+
+from odoo.addons.account.tests.common import AccountTestInvoicingCommon
+
+
+class AccountAutoTransferTestCase(AccountTestInvoicingCommon):
+
+    @classmethod
+    def setUpClass(cls):
+        super().setUpClass()
+        cls.journal = cls.env['account.journal'].create({'type': 'bank', 'name': 'bank', 'code': 'BANK'})
+        cls.transfer_model = cls.env['account.transfer.model'].create({
+            'name': 'Test Transfer',
+            'date_start': '2019-06-01',
+            'frequency': 'month',
+            'journal_id': cls.journal.id
+        })
+        cls.analytic_plan = cls.env['account.analytic.plan'].create({
+            'name': 'A',
+        })
+
+        cls.master_account_index = 0
+        cls.slave_account_index = 1
+        cls.origin_accounts, cls.destination_accounts = cls._create_accounts(cls)
+
+    def _assign_origin_accounts(self):
+        self.transfer_model.write({
+            'account_ids': [(6, 0, self.origin_accounts.ids)]
+        })
+
+    def _create_accounts(self, amount_of_master_accounts=2, amount_of_slave_accounts=4):
+        master_ids = self.env['account.account']
+
+        for i in range(amount_of_master_accounts):
+            self.master_account_index += 1
+            master_ids += self.env['account.account'].create({
+                'name': 'MASTER %s' % self.master_account_index,
+                'code': 'MA00%s' % self.master_account_index,
+                'account_type': 'asset_receivable',
+                'reconcile': True
+            })
+
+        slave_ids = self.env['account.account']
+        for i in range(amount_of_slave_accounts):
+            self.slave_account_index += 1
+            slave_ids += self.env['account.account'].create({
+                'name': 'SLAVE %s' % self.slave_account_index,
+                'code': 'SL000%s' % self.slave_account_index,
+                'account_type': 'asset_receivable',
+                'reconcile': True
+            })
+        return master_ids, slave_ids
+
+    def _create_analytic_account(self, code='ANAL01'):
+        return self.env['account.analytic.account'].create({'name': code, 'code': code, 'plan_id': self.analytic_plan.id})
+
+    def _create_partner(self, name="partner01"):
+        return self.env['res.partner'].create({'name': name})
+
+    def _create_basic_move(self, cred_account=None, deb_account=None, amount=0, date_str='2019-02-01',
+                           partner_id=False, name=False, cred_analytic=False, deb_analytic=False,
+                           transfer_model_id=False, journal_id=False, posted=True):
+        move_vals = {
+            'date': date_str,
+            'transfer_model_id': transfer_model_id,
+            'line_ids': [
+                (0, 0, {
+                    'account_id': cred_account or self.origin_accounts[0].id,
+                    'credit': amount,
+                    'analytic_distribution': {cred_analytic: 100} if cred_analytic else {},
+                    'partner_id': partner_id,
+                }),
+                (0, 0, {
+                    'account_id': deb_account or self.origin_accounts[1].id,
+                    'analytic_distribution': {deb_analytic: 100} if deb_analytic else {},
+                    'debit': amount,
+                    'partner_id': partner_id,
+                }),
+            ]
+        }
+        if journal_id:
+            move_vals['journal_id'] = journal_id
+        move = self.env['account.move'].create(move_vals)
+        if posted:
+            move.action_post()
+        return move
+
+    def _add_transfer_model_line(self, account_id: int = False, percent: float = 100.0, analytic_account_ids: list = False, partner_ids: list = False):
+        account_id = account_id or self.destination_accounts[0].id
+        return self.env['account.transfer.model.line'].create({
+            'percent': percent,
+            'account_id': account_id,
+            'transfer_model_id': self.transfer_model.id,
+            'analytic_account_ids': analytic_account_ids and [(4, aa) for aa in analytic_account_ids],
+            'partner_ids': partner_ids and [(4, p) for p in partner_ids],
+        })
diff --git a/dev_odex30_accounting/odex30_account_auto_transfer/tests/test_transfer_model.py b/dev_odex30_accounting/odex30_account_auto_transfer/tests/test_transfer_model.py
new file mode 100644
index 0000000..69645bc
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_auto_transfer/tests/test_transfer_model.py
@@ -0,0 +1,537 @@
+# -*- coding: utf-8 -*-
+from datetime import datetime, timedelta
+from unittest.mock import patch, call
+from functools import reduce
+from itertools import chain
+from freezegun import freeze_time
+
+from dateutil.relativedelta import relativedelta
+from odoo.addons.odex30_account_auto_transfer.tests.account_auto_transfer_test_classes import AccountAutoTransferTestCase
+
+from odoo import Command, fields
+from odoo.models import UserError, ValidationError
+from odoo.tests import tagged
+
+# ############################################################################ #
+#                             FUNCTIONAL TESTS                                 #
+# ############################################################################ #
+@tagged('post_install', '-at_install')
+class TransferModelTestFunctionalCase(AccountAutoTransferTestCase):
+
+    @classmethod
+    def setUpClass(cls):
+        super().setUpClass()
+        # Model with 4 lines of 20%, 20% is left in origin accounts
+        cls.functional_transfer = cls.env['account.transfer.model'].create({
+            'name': 'Test Functional Model',
+            'date_start': '2019-01-01',
+            'date_stop': datetime.today() + relativedelta(months=1),
+            'journal_id': cls.journal.id,
+            'account_ids': [(6, 0, cls.origin_accounts.ids)],
+            'line_ids': [(0, 0, {
+                'account_id': account.id,
+                'percent': 20,
+            }) for account in cls.destination_accounts],
+        })
+        neutral_account = cls.env['account.account'].create({
+            'name': 'Neutral Account',
+            'code': 'NEUT',
+            'account_type': 'income',
+        })
+        cls.analytic_accounts = reduce(lambda x, y: x + y, (cls._create_analytic_account(cls, name) for name in ('ANA1', 'ANA2', 'ANA3')))
+        cls.dates = ('2019-01-15', '2019-02-15')
+        # Create one line for each date...
+        for date in cls.dates:
+            # ...with each analytic account, and with no analytic account...
+            for an_account in chain(cls.analytic_accounts, [cls.env['account.analytic.account']]):
+                # ...in each origin account with a balance of 1000.
+                for account in cls.origin_accounts:
+                    cls._create_basic_move(
+                        cls,
+                        deb_account=account.id,
+                        deb_analytic=an_account.id,
+                        cred_account=neutral_account.id,
+                        amount=1000,
+                        date_str=date,
+                    )
+
+    def test_no_analytics(self):
+        # Balance is +8000 in each origin account
+        # 80% is transfered in 4 destination accounts in equal proprotions
+        self.functional_transfer.action_perform_auto_transfer()
+        # 1600 is left in each origin account
+        for account in self.origin_accounts:
+            self.assertEqual(sum(self.env['account.move.line'].search([('account_id', '=', account.id)]).mapped('balance')), 1600)
+        # 3200 has been transfered in each destination account
+        for account in self.destination_accounts:
+            self.assertEqual(sum(self.env['account.move.line'].search([('account_id', '=', account.id)]).mapped('balance')), 3200)
+            for date in self.dates:
+                # 2 move lines have been created in each account for each date
+                self.assertEqual(len(self.env['account.move.line'].search([('account_id', '=', account.id), ('date', '=', fields.Date.to_date(date) + relativedelta(day=31))])), 2)
+
+    def test_analytics(self):
+        # Each line with analytic accounts is set to 100%
+        self.functional_transfer.line_ids[0].analytic_account_ids = self.analytic_accounts[0:2]
+        self.functional_transfer.line_ids[1].analytic_account_ids = self.analytic_accounts[2]
+
+        self.functional_transfer.action_perform_auto_transfer()
+        # 1200 is left in each origin account (60% of 2 lines)
+        for account in self.origin_accounts:
+            self.assertEqual(sum(self.env['account.move.line'].search([('account_id', '=', account.id)]).mapped('balance')), 1200)
+        # 8000 has been transfered the first destination account (100% of 8 lines)
+        self.assertEqual(sum(self.env['account.move.line'].search([('account_id', '=', self.destination_accounts[0].id)]).mapped('balance')), 8000)
+        # 4000 has been transfered the first destination account (100% of 4 lines)
+        self.assertEqual(sum(self.env['account.move.line'].search([('account_id', '=', self.destination_accounts[1].id)]).mapped('balance')), 4000)
+        # 800 has been transfered in each of the last two destination account (20% of 4 lines)
+        self.assertEqual(sum(self.env['account.move.line'].search([('account_id', '=', self.destination_accounts[2].id)]).mapped('balance')), 800)
+        self.assertEqual(sum(self.env['account.move.line'].search([('account_id', '=', self.destination_accounts[3].id)]).mapped('balance')), 800)
+
+
+# ############################################################################ #
+#                                UNIT TESTS                                    #
+# ############################################################################ #
+@tagged('post_install', '-at_install')
+class TransferModelTestCase(AccountAutoTransferTestCase):
+    @patch('odoo.addons.odex30_account_auto_transfer.models.transfer_model.TransferModel.action_perform_auto_transfer')
+    def test_action_cron_auto_transfer(self, patched):
+        TransferModel = self.env['account.transfer.model']
+        TransferModel.create({
+            'name': 'Test Cron Model',
+            'date_start': '2019-01-01',
+            'date_stop': datetime.today() + relativedelta(months=1),
+            'journal_id': self.journal.id
+        })
+        TransferModel.action_cron_auto_transfer()
+        patched.assert_called_once()
+
+    @patch('odoo.addons.odex30_account_auto_transfer.models.transfer_model.TransferModel._create_or_update_move_for_period')
+    @freeze_time('2022-01-01')
+    def test_action_perform_auto_transfer(self, patched):
+        self.transfer_model.date_start = datetime.strftime(datetime.today() + relativedelta(day=1), "%Y-%m-%d")
+        # - CASE 1 : normal case, acting on current period
+        self.transfer_model.action_perform_auto_transfer()
+        patched.assert_not_called()  # create_or_update method should not be called for self.transfer_model as no account_ids and no line_ids
+
+        master_ids, slave_ids = self._create_accounts(1, 2)
+        self.transfer_model.write({'account_ids': [(6, 0, [master_ids.id])]})
+
+        self.transfer_model.action_perform_auto_transfer()
+        patched.assert_not_called()  # create_or_update method should not be called for self.transfer_model as no line_ids
+
+        self.transfer_model.write({'line_ids': [
+            (0, 0, {
+                'percent': 50.0,
+                'account_id': slave_ids[0].id
+            }),
+            (0, 0, {
+                'percent': 50.0,
+                'account_id': slave_ids[1].id
+            })
+        ]})
+
+        self.transfer_model.action_perform_auto_transfer()
+        patched.assert_called_once()  # create_or_update method should be called for self.transfer_model
+
+        # - CASE 2 : "old" case, acting on everything before now as nothing has been done yet
+        transfer_model = self.transfer_model.copy()
+        transfer_model.write({
+            'date_start': transfer_model.date_start + relativedelta(months=-12)
+        })
+        initial_call_count = patched.call_count
+        transfer_model.action_perform_auto_transfer()
+        self.assertEqual(initial_call_count + 13, patched.call_count, '13 more calls should have been done')
+
+    @patch('odoo.addons.odex30_account_auto_transfer.models.transfer_model.TransferModel._get_auto_transfer_move_line_values')
+    def test__create_or_update_move_for_period(self, patched_get_auto_transfer_move_line_values):
+        # PREPARATION
+        master_ids, slave_ids = self._create_accounts(2, 0)
+        next_move_date = self.transfer_model._get_next_move_date(self.transfer_model.date_start)
+        patched_get_auto_transfer_move_line_values.return_value = [
+            {
+                'account_id': master_ids[0].id,
+                'date_maturity': next_move_date,
+                'credit': 250.0,
+            },
+            {
+                'account_id': master_ids[1].id,
+                'date_maturity': next_move_date,
+                'debit': 250.0,
+            }
+        ]
+
+        # There is no existing move, this is a brand new one
+        created_move = self.transfer_model._create_or_update_move_for_period(self.transfer_model.date_start, next_move_date)
+        self.assertEqual(len(created_move.line_ids), 2)
+        self.assertRecordValues(created_move, [{
+            'date': next_move_date,
+            'journal_id': self.transfer_model.journal_id.id,
+            'transfer_model_id': self.transfer_model.id,
+        }])
+        self.assertRecordValues(created_move.line_ids.filtered(lambda l: l.credit), [{
+            'account_id': master_ids[0].id,
+            'date_maturity': next_move_date,
+            'credit': 250.0,
+        }])
+        self.assertRecordValues(created_move.line_ids.filtered(lambda l: l.debit), [{
+            'account_id': master_ids[1].id,
+            'date_maturity': next_move_date,
+            'debit': 250.0,
+        }])
+
+        patched_get_auto_transfer_move_line_values.return_value = [
+            {
+                'account_id': master_ids[0].id,
+                'date_maturity': next_move_date,
+                'credit': 78520.0,
+            },
+            {
+                'account_id': master_ids[1].id,
+                'date_maturity': next_move_date,
+                'debit': 78520.0,
+            }
+        ]
+
+        # Update the existing move but don't create a new one
+        amount_of_moves = self.env['account.move'].search_count([])
+        amount_of_move_lines = self.env['account.move.line'].search_count([])
+        updated_move = self.transfer_model._create_or_update_move_for_period(self.transfer_model.date_start, next_move_date)
+        self.assertEqual(amount_of_moves, self.env['account.move'].search_count([]), 'No move have been created')
+        self.assertEqual(amount_of_move_lines, self.env['account.move.line'].search_count([]),
+                         'No move line have been created (in fact yes but the old ones have been deleted)')
+        self.assertEqual(updated_move, created_move, 'Existing move has been updated')
+        self.assertRecordValues(updated_move.line_ids.filtered(lambda l: l.credit), [{
+            'account_id': master_ids[0].id,
+            'date_maturity': next_move_date,
+            'credit': 78520.0,
+        }])
+        self.assertRecordValues(updated_move.line_ids.filtered(lambda l: l.debit), [{
+            'account_id': master_ids[1].id,
+            'date_maturity': next_move_date,
+            'debit': 78520.0,
+        }])
+
+    def test__get_move_for_period(self):
+        # 2019-06-30 --> None as no move generated
+        date_to_test = datetime.strptime('2019-06-30', '%Y-%m-%d').date()
+        move_for_period = self.transfer_model._get_move_for_period(date_to_test)
+        self.assertIsNone(move_for_period, 'No move is generated yet')
+
+        # Generate a move
+        move_date = self.transfer_model._get_next_move_date(self.transfer_model.date_start)
+        already_generated_move = self.env['account.move'].create({
+            'date': move_date,
+            'journal_id': self.journal.id,
+            'transfer_model_id': self.transfer_model.id
+        })
+        # 2019-06-30 --> None as generated move is generated for 01/07
+        move_for_period = self.transfer_model._get_move_for_period(date_to_test)
+        self.assertEqual(move_for_period, already_generated_move, 'Should be equal to the already generated move')
+
+        # 2019-07-01 --> The generated move
+        date_to_test += relativedelta(days=1)
+        move_for_period = self.transfer_model._get_move_for_period(date_to_test)
+        self.assertIsNone(move_for_period, 'The generated move is for the next period')
+
+        # 2019-07-02 --> None as generated move is generated for 01/07
+        date_to_test += relativedelta(days=1)
+        move_for_period = self.transfer_model._get_move_for_period(date_to_test)
+        self.assertIsNone(move_for_period, 'No move is generated yet for the next period')
+
+    def test__determine_start_date(self):
+        start_date = self.transfer_model._determine_start_date()
+        self.assertEqual(start_date, self.transfer_model.date_start, 'No moves generated yet, start date should be the start date of the transfer model')
+
+        move = self._create_basic_move(date_str='2019-07-01', journal_id=self.journal.id, transfer_model_id=self.transfer_model.id, posted=False)
+        start_date = self.transfer_model._determine_start_date()
+        self.assertEqual(start_date, self.transfer_model.date_start, 'A move generated but not posted, start date should be the start date of the transfer model')
+
+        move.action_post()
+        start_date = self.transfer_model._determine_start_date()
+        self.assertEqual(start_date, move.date + relativedelta(days=1), 'A move posted, start date should be the day after that move')
+
+        second_move = self._create_basic_move(date_str='2019-08-01', journal_id=self.journal.id, transfer_model_id=self.transfer_model.id, posted=False)
+        start_date = self.transfer_model._determine_start_date()
+        self.assertEqual(start_date, move.date + relativedelta(days=1), 'Two moves generated, start date should be the day after the last posted one')
+
+        second_move.action_post()
+        random_move = self._create_basic_move(date_str='2019-08-01', journal_id=self.journal.id)
+        start_date = self.transfer_model._determine_start_date()
+        self.assertEqual(start_date, second_move.date + relativedelta(days=1), 'Random move generated not linked to transfer model, start date should be the day after the last one linked to it')
+
+    def test__get_next_move_date(self):
+        experimentations = {
+            'month': [
+                # date, expected date
+                (self.transfer_model.date_start, '2019-06-30'),
+                (fields.Date.to_date('2019-01-29'), '2019-02-27'),
+                (fields.Date.to_date('2019-01-30'), '2019-02-27'),
+                (fields.Date.to_date('2019-01-31'), '2019-02-27'),
+                (fields.Date.to_date('2019-02-28'), '2019-03-27'),
+                (fields.Date.to_date('2019-12-31'), '2020-01-30'),
+            ],
+            'quarter': [
+                (self.transfer_model.date_start, '2019-08-31'),
+                (fields.Date.to_date('2019-01-31'), '2019-04-29'),
+                (fields.Date.to_date('2019-02-28'), '2019-05-27'),
+                (fields.Date.to_date('2019-12-31'), '2020-03-30'),
+            ],
+            'year': [
+                (self.transfer_model.date_start, '2020-05-31'),
+                (fields.Date.to_date('2019-01-31'), '2020-01-30'),
+                (fields.Date.to_date('2019-02-28'), '2020-02-27'),
+                (fields.Date.to_date('2019-12-31'), '2020-12-30'),
+            ]
+        }
+
+        for frequency in experimentations:
+            self.transfer_model.write({'frequency': frequency})
+            for start_date, expected_date_str in experimentations[frequency]:
+                next_date = self.transfer_model._get_next_move_date(start_date)
+                self.assertEqual(next_date, fields.Date.to_date(expected_date_str),
+                                 'Next date from %s should be %s' % (str(next_date), expected_date_str))
+
+    @patch('odoo.addons.odex30_account_auto_transfer.models.transfer_model.TransferModel._get_non_analytic_transfer_values')
+    def test__get_non_filtered_auto_transfer_move_line_values(self, patched_get_values):
+        start_date = fields.Date.to_date('2019-01-01')
+        self.transfer_model.write({'account_ids': [(6, 0, [ma.id for ma in self.origin_accounts])], })
+        end_date = fields.Date.to_date('2019-12-31')
+
+        move = self.env['account.move'].create({
+            'move_type': 'entry',
+            'date': '2019-12-01',
+            'journal_id': self.company_data['default_journal_misc'].id,
+            'line_ids': [
+                (0, 0, {
+                    'debit': 4242.42,
+                    'credit': 0,
+                    'account_id': self.origin_accounts[0].id,
+                }),
+                (0, 0, {
+                    'debit': 8342.58,
+                    'credit': 0,
+                    'account_id': self.company_data.get('default_account_revenue').id,
+                }),
+                (0, 0, {
+                    'debit': 0,
+                    'credit': 0,
+                    'account_id': self.destination_accounts[0].id,
+                }),
+                (0, 0, {
+                    'debit': 0,
+                    'credit': 12585.0,
+                    'account_id': self.origin_accounts[1].id,
+                }),
+            ]
+        })
+        move.action_post()
+        amount_left = 10.0
+        patched_get_values.return_value = [{
+            'name': "YO",
+            'account_id': 1,
+            'date_maturity': start_date,
+            'debit': 123.45
+        }], amount_left
+
+        exp = [{
+            'name': 'YO',
+            'account_id': 1,
+            'date_maturity': start_date,
+            'debit': 123.45
+        }, {
+            'name': 'Automatic Transfer (-%s%%)' % self.transfer_model.total_percent,
+            'account_id': self.origin_accounts[0].id,
+            'date_maturity': end_date,
+            'credit': 4242.42 - amount_left
+        }, {
+            'name': 'YO',
+            'account_id': 1,
+            'date_maturity': start_date,
+            'debit': 123.45
+        }, {
+            'name': 'Automatic Transfer (-%s%%)' % self.transfer_model.total_percent,
+            'account_id': self.origin_accounts[1].id,
+            'date_maturity': end_date,
+            'debit': 12585.0 - amount_left
+        }]
+        res = self.transfer_model._get_non_filtered_auto_transfer_move_line_values([], start_date, end_date)
+        self.assertEqual(len(res), 4)
+        self.assertListEqual(exp, res)
+
+    @patch(
+        'odoo.addons.odex30_account_auto_transfer'
+        '.models.transfer_model.TransferModelLine._get_destination_account_transfer_move_line_values')
+    def test__get_non_analytic_transfer_values(self, patched):
+        # Just need a transfer model line
+        percents = [45, 45]
+        self.transfer_model.write({
+            'account_ids': [(6, 0, [ma.id for ma in self.origin_accounts])],
+            'line_ids': [
+                (0, 0, {
+                    'percent': percents[0],
+                    'account_id': self.destination_accounts[0].id
+                }),
+                (0, 0, {
+                    'percent': percents[1],
+                    'account_id': self.destination_accounts[1].id
+                })
+            ]
+        })
+        account = self.origin_accounts[0]
+        write_date = fields.Date.to_date('2019-01-01')
+        lines = self.transfer_model.line_ids
+        amount_of_line = len(lines)
+        amount = 4242.0
+        is_debit = False
+        patched.return_value = {
+            'name': "YO",
+            'account_id': account.id,
+            'date_maturity': write_date,
+            'debit' if is_debit else 'credit': amount
+        }
+        expected_result_list = [patched.return_value] * 2
+        expected_result_amount = amount * ((100.0 - sum(percents)) / 100.0)
+
+        res = self.transfer_model._get_non_analytic_transfer_values(account, lines, write_date, amount, is_debit)
+        self.assertListEqual(res[0], expected_result_list)
+        self.assertAlmostEqual(res[1], expected_result_amount)
+        self.assertEqual(patched.call_count, amount_of_line)
+
+        # need to round amount to avoid failing float comparison (as magic mock uses "==" to compare args)
+        exp_calls = [call(account, round(amount * (line.percent / 100.0), 1), is_debit, write_date) for line in lines]
+        patched.assert_has_calls(exp_calls)
+
+        # Try now with 100% repartition
+        lines[0].write({'percent': 55.0})
+        res = self.transfer_model._get_non_analytic_transfer_values(account, lines, write_date, amount, is_debit)
+        self.assertAlmostEqual(res[1], 0.0)
+
+    # TEST CONSTRAINTS
+    def test__check_line_ids_percents(self):
+        with self.assertRaises(ValidationError):
+            transfer_model_lines = []
+            for i, percent in enumerate((50.0, 50.01)):
+                transfer_model_lines.append((0, 0, {
+                    'percent': percent,
+                    'account_id': self.destination_accounts[i].id
+                }))
+            self.transfer_model.write({
+                'account_ids': [(6, 0, [ma.id for ma in self.origin_accounts])],
+                'line_ids': transfer_model_lines
+            })
+
+    def test_unlink_of_transfer_with_no_moves(self):
+        """ Deletion of an automatic transfer that has no move should not raise an error. """
+
+        self.transfer_model.write({
+            'account_ids': [Command.link(self.origin_accounts[0].id)],
+            'line_ids': [
+                Command.create({
+                    'percent': 100,
+                    'account_id': self.destination_accounts[0].id
+                })
+            ]
+        })
+        self.transfer_model.action_activate()
+
+        self.assertEqual(self.transfer_model.move_ids_count, 0)
+        self.transfer_model.unlink()
+
+    def test_error_unlink_of_transfer_with_moves(self):
+        """ Deletion of an automatic transfer that has posted/draft moves should raise an error. """
+
+        self.transfer_model.write({
+            'date_start': datetime.today() - relativedelta(day=1),
+            'frequency': 'year',
+            'account_ids': [Command.link(self.company_data['default_account_revenue'].id)],
+            'line_ids': [
+                Command.create({
+                    'percent': 100,
+                    'account_id': self.destination_accounts[0].id
+                })
+            ]
+        })
+        self.transfer_model.action_activate()
+
+        # Add a transaction on the journal so that the move is not empty
+        self.env['account.move'].create({
+            'move_type': 'out_invoice',
+            'partner_id': self.partner_a.id,
+            'invoice_date': datetime.today(),
+            'invoice_line_ids': [
+                Command.create({
+                    'name': 'line1',
+                    'account_id': self.company_data['default_account_revenue'].id,
+                    'price_unit': 1000.0,
+                }),
+            ]
+        }).action_post()
+
+        # Generate draft moves
+        self.transfer_model.action_perform_auto_transfer()
+
+        error_message = "You cannot delete an automatic transfer that has draft moves*"
+        with self.assertRaisesRegex(UserError, error_message):
+            self.transfer_model.unlink()
+
+        # Post one of the moves
+        self.transfer_model.move_ids[0].action_post()
+
+        error_message = "You cannot delete an automatic transfer that has posted moves*"
+        with self.assertRaisesRegex(UserError, error_message):
+            self.transfer_model.unlink()
+
+    def test_disable_transfer_when_archived(self):
+        """ An automatic transfer in progress should be disabled when archived. """
+
+        self.transfer_model.action_activate()
+        self.assertEqual(self.transfer_model.state, 'in_progress')
+
+        self.transfer_model.action_archive()
+        self.assertEqual(self.transfer_model.state, 'disabled')
+
+    @freeze_time('2022-01-01')
+    def test_compute_transfer_lines_100_percent_transfer(self):
+        """ Transfer 100% of the source account in separate destinations. """
+        self.transfer_model.date_start = datetime.strftime(datetime.today() + relativedelta(day=1), "%Y-%m-%d")
+
+        _, slave_ids = self._create_accounts(0, 3)
+        self.transfer_model.write({
+            'account_ids': [Command.link(self.company_data['default_account_revenue'].id)],
+            'line_ids': [
+                Command.create({
+                    'percent': 15,
+                    'account_id': slave_ids[0].id
+                }),
+                Command.create({
+                    'percent': 42.50,
+                    'account_id': slave_ids[1].id
+                }),
+                Command.create({
+                    'percent': 42.50,
+                    'account_id': slave_ids[2].id
+                }),
+            ]
+        })
+        self.env['account.move'].create({
+            'move_type': 'out_invoice',
+            'partner_id': self.partner_a.id,
+            'invoice_date': datetime.today(),
+            'invoice_line_ids': [
+                Command.create({
+                    'name': 'line_xyz',
+                    'account_id': self.company_data['default_account_revenue'].id,
+                    'price_unit': 410.34,
+                }),
+            ]
+        }).action_post()
+        self.transfer_model.action_activate()
+        self.transfer_model.action_perform_auto_transfer()
+        lines = self.transfer_model.move_ids.line_ids
+        # 100% of the total amount
+        self.assertAlmostEqual(lines.filtered(lambda l: l.account_id == self.company_data['default_account_revenue']).debit, 410.34)
+        # 15% of the total amount
+        self.assertAlmostEqual(lines.filtered(lambda l: l.account_id == slave_ids[0]).credit, 61.55)
+        # 42.50% of the total amount
+        self.assertAlmostEqual(lines.filtered(lambda l: l.account_id == slave_ids[1]).credit, 174.39)
+        # the remaining amount of the total amount (42.50%)
+        self.assertAlmostEqual(lines.filtered(lambda l: l.account_id == slave_ids[2]).credit, 174.4)
diff --git a/dev_odex30_accounting/odex30_account_auto_transfer/tests/test_transfer_model_line.py b/dev_odex30_accounting/odex30_account_auto_transfer/tests/test_transfer_model_line.py
new file mode 100644
index 0000000..d4a340b
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_auto_transfer/tests/test_transfer_model_line.py
@@ -0,0 +1,288 @@
+# -*- coding: utf-8 -*-
+
+from unittest.mock import patch
+
+from odoo.addons.odex30_account_auto_transfer.tests.account_auto_transfer_test_classes import AccountAutoTransferTestCase
+
+from odoo import fields
+from odoo.tests import tagged
+
+# ############################################################################ #
+#                                UNIT TESTS                                    #
+# ############################################################################ #
+@tagged('post_install', '-at_install')
+class MoveModelLineTestCase(AccountAutoTransferTestCase):
+
+    @classmethod
+    def setUpClass(cls):
+        super().setUpClass()
+        cls._assign_origin_accounts(cls)
+
+    def test__get_transfer_move_lines_values_same_aaccounts(self):
+        amounts = [4242.42, 1234.56]
+        aaccounts = [self._create_analytic_account('ANAL0' + str(i)) for i in range(2)]
+        self._create_basic_move(
+            cred_account=self.destination_accounts[0].id,
+            deb_account=self.origin_accounts[0].id,
+            amount=amounts[0],
+            deb_analytic=aaccounts[0].id
+        )
+        self._create_basic_move(
+            cred_account=self.destination_accounts[1].id,
+            deb_account=self.origin_accounts[0].id,
+            amount=amounts[1],
+            deb_analytic=aaccounts[1].id
+        )
+        transfer_model_line_1 = self._add_transfer_model_line(self.destination_accounts[0].id,
+                                                      analytic_account_ids=[aaccounts[0].id, aaccounts[1].id])
+        transfer_model_line_2 = self._add_transfer_model_line(self.destination_accounts[1].id,
+                                                      analytic_account_ids=[aaccounts[0].id])
+
+        transfer_models_lines = transfer_model_line_1 + transfer_model_line_2
+        args = [fields.Date.to_date('2019-01-01'), fields.Date.to_date('2019-12-19')]
+        res = transfer_models_lines._get_transfer_move_lines_values(*args)
+        exp = [{
+            'name': 'Automatic Transfer (from account MA001 with analytic account(s): ANAL00, ANAL01)',
+            'account_id': self.destination_accounts[0].id,
+            'date_maturity': args[1],
+            'debit': sum(amounts),
+        }, {
+            'name': 'Automatic Transfer (entries with analytic account(s): ANAL00, ANAL01)',
+            'account_id': self.origin_accounts[0].id,
+            'date_maturity': args[1],
+            'credit': sum(amounts),
+        }]
+        self.assertListEqual(exp, res,
+                             'Only first transfer model line should be handled, second should get 0 and thus not be added')
+
+    def test__get_transfer_move_lines_values(self):
+        amounts = [4242.0, 1234.56]
+        aaccounts = [self._create_analytic_account('ANAL0' + str(i)) for i in range(3)]
+        self._create_basic_move(
+            cred_account=self.destination_accounts[0].id,
+            deb_account=self.origin_accounts[0].id,
+            amount=amounts[0],
+            deb_analytic=aaccounts[0].id
+        )
+        self._create_basic_move(
+            cred_account=self.destination_accounts[1].id,
+            deb_account=self.origin_accounts[0].id,
+            amount=amounts[1],
+            deb_analytic=aaccounts[2].id
+        )
+        transfer_model_line_1 = self._add_transfer_model_line(self.destination_accounts[0].id,
+                                                      analytic_account_ids=[aaccounts[0].id, aaccounts[1].id])
+        transfer_model_line_2 = self._add_transfer_model_line(self.destination_accounts[1].id,
+                                                      analytic_account_ids=[aaccounts[2].id])
+
+        transfer_models_lines = transfer_model_line_1 + transfer_model_line_2
+        args = [fields.Date.to_date('2019-01-01'), fields.Date.to_date('2019-12-19')]
+        res = transfer_models_lines._get_transfer_move_lines_values(*args)
+        exp = [
+            {
+                'name': 'Automatic Transfer (from account MA001 with analytic account(s): ANAL00, ANAL01)',
+                'account_id': self.destination_accounts[0].id,
+                'date_maturity': args[1],
+                'debit': amounts[0],
+            },
+            {
+                'name': 'Automatic Transfer (entries with analytic account(s): ANAL00, ANAL01)',
+                'account_id': self.origin_accounts[0].id,
+                'date_maturity': args[1],
+                'credit': amounts[0],
+            },
+            {
+                'name': 'Automatic Transfer (from account MA001 with analytic account(s): ANAL02)',
+                'account_id': self.destination_accounts[1].id,
+                'date_maturity': args[1],
+                'debit': amounts[1],
+            },
+            {
+                'name': 'Automatic Transfer (entries with analytic account(s): ANAL02)',
+                'account_id': self.origin_accounts[0].id,
+                'date_maturity': args[1],
+                'credit': amounts[1],
+            }
+        ]
+        self.assertListEqual(exp, res)
+
+    @patch('odoo.addons.odex30_account_auto_transfer.models.transfer_model.TransferModel._get_move_lines_base_domain')
+    def test__get_move_lines_domain(self, patched):
+        return_val = [('bla', '=', 42)]
+        # we need to copy return val as there are edge effects due to mocking
+        # return_value is modified by the function call)
+        patched.return_value = return_val[:]
+        args = [fields.Date.to_date('2019-01-01'), fields.Date.to_date('2019-12-19')]
+        aaccount_1 = self._create_analytic_account('ANAL01')
+        aaccount_2 = self._create_analytic_account('ANAL02')
+        percent = 42.42
+        analytic_transfer_model_line = self._add_transfer_model_line(self.destination_accounts[0].id,
+                                                             analytic_account_ids=[aaccount_1.id, aaccount_2.id])
+        percent_transfer_model_line = self._add_transfer_model_line(self.destination_accounts[1].id, percent=percent)
+
+        anal_res = analytic_transfer_model_line._get_move_lines_domain(*args)
+        anal_expected = return_val
+        patched.assert_called_once_with(*args)
+        self.assertListEqual(anal_res, anal_expected)
+        patched.reset_mock()
+
+        perc_res = percent_transfer_model_line._get_move_lines_domain(*args)
+        patched.assert_called_once_with(*args)
+        self.assertListEqual(perc_res, patched.return_value)
+
+    def test__get_origin_account_transfer_move_line_values(self):
+        percent = 92.42
+        transfer_model_line = self._add_transfer_model_line(self.destination_accounts[0].id, percent=percent)
+        origin_account = self.origin_accounts[0]
+        amount = 4200.42
+        is_debit = True
+        write_date = fields.Date.to_date('2019-12-19')
+        params = [origin_account, amount, is_debit, write_date]
+        result = transfer_model_line._get_origin_account_transfer_move_line_values(*params)
+        expected = {
+            'name': 'Automatic Transfer (to account %s)' % self.destination_accounts[0].code,
+            'account_id': origin_account.id,
+            'date_maturity': write_date,
+            'credit' if is_debit else 'debit': amount
+        }
+        self.assertDictEqual(result, expected)
+
+    def test__get_destination_account_transfer_move_line_values(self):
+        aaccount_1 = self._create_analytic_account('ANAL01')
+        aaccount_2 = self._create_analytic_account('ANAL02')
+        percent = 42.42
+        analytic_transfer_model_line = self._add_transfer_model_line(self.destination_accounts[0].id,
+                                                             analytic_account_ids=[aaccount_1.id, aaccount_2.id])
+        percent_transfer_model_line = self._add_transfer_model_line(self.destination_accounts[1].id, percent=percent)
+        origin_account = self.origin_accounts[0]
+        amount = 4200
+        is_debit = True
+        write_date = fields.Date.to_date('2019-12-19')
+        params = [origin_account, amount, is_debit, write_date]
+        anal_result = analytic_transfer_model_line._get_destination_account_transfer_move_line_values(*params)
+        aaccount_names = ', '.join([aac.name for aac in [aaccount_1, aaccount_2]])
+        anal_expected_result = {
+            'name': 'Automatic Transfer (from account %s with analytic account(s): %s)' % (
+                origin_account.code, aaccount_names),
+            'account_id': self.destination_accounts[0].id,
+            'date_maturity': write_date,
+            'debit' if is_debit else 'credit': amount
+        }
+        self.assertDictEqual(anal_result, anal_expected_result)
+        percent_result = percent_transfer_model_line._get_destination_account_transfer_move_line_values(*params)
+        percent_expected_result = {
+            'name': 'Automatic Transfer (%s%% from account %s)' % (percent, self.origin_accounts[0].code),
+            'account_id': self.destination_accounts[1].id,
+            'date_maturity': write_date,
+            'debit' if is_debit else 'credit': amount
+        }
+        self.assertDictEqual(percent_result, percent_expected_result)
+
+    def test__get_transfer_move_lines_values_same_partner_ids(self):
+        """
+        Make sure we only process the account moves once.
+        Here the second line references a partner already handled in the first one.
+        The second transfer should thus not be apply on the account lines already handled by the first transfer.
+        """
+        amounts = [4242.42, 1234.56]
+        partner_ids = [self._create_partner('partner' + str(i))for i in range(2)]
+        self._create_basic_move(
+            cred_account=self.destination_accounts[0].id,
+            deb_account=self.origin_accounts[0].id,
+            amount=amounts[0],
+            partner_id=partner_ids[0].id,
+            date_str='2019-02-01'
+        )
+        self._create_basic_move(
+            cred_account=self.destination_accounts[1].id,
+            deb_account=self.origin_accounts[0].id,
+            amount=amounts[1],
+            partner_id=partner_ids[1].id,
+            date_str='2019-02-01'
+        )
+        self._create_basic_move(
+            cred_account=self.destination_accounts[0].id,
+            deb_account=self.origin_accounts[0].id,
+            amount=amounts[0],
+            date_str='2019-02-01'
+        )
+        transfer_model_line_1 = self._add_transfer_model_line(self.destination_accounts[0].id,
+                                                      partner_ids=[partner_ids[0].id, partner_ids[1].id])
+        transfer_model_line_2 = self._add_transfer_model_line(self.destination_accounts[1].id,
+                                                      partner_ids=[partner_ids[0].id])
+
+        transfer_models_lines = transfer_model_line_1 + transfer_model_line_2
+        args = [fields.Date.to_date('2019-01-01'), fields.Date.to_date('2019-12-19')]
+        res = transfer_models_lines._get_transfer_move_lines_values(*args)
+        exp = [{
+            'name': 'Automatic Transfer (from account MA001 with partner(s): partner0, partner1)',
+            'account_id': self.destination_accounts[0].id,
+            'date_maturity': args[1],
+            'debit': sum(amounts),
+        }, {
+            'name': 'Automatic Transfer (entries with partner(s): partner0, partner1)',
+            'account_id': self.origin_accounts[0].id,
+            'date_maturity': args[1],
+            'credit': sum(amounts),
+        }]
+        self.assertListEqual(exp, res,
+                             'Only first transfer model line should be handled, second should get 0 and thus not be added')
+
+    def test__get_transfer_move_lines_values_partner(self):
+        """
+        Create account moves and transfer, verify that the result of the auto transfer is correct.
+        """
+        amounts = [4242.0, 1234.56]
+        aaccounts = [self._create_analytic_account('ANAL00')]
+        partner_ids = [self._create_partner('partner' + str(i))for i in range(2)]
+        self._create_basic_move(
+            cred_account=self.destination_accounts[2].id,
+            deb_account=self.origin_accounts[0].id,
+            amount=amounts[0],
+            partner_id=partner_ids[0].id,
+            date_str='2019-02-01'
+        )
+        self._create_basic_move(
+            cred_account=self.destination_accounts[3].id,
+            deb_account=self.origin_accounts[0].id,
+            amount=amounts[1],
+            deb_analytic=aaccounts[0].id,
+            partner_id=partner_ids[1].id,
+            date_str='2019-02-01'
+        )
+        transfer_model_line_1 = self._add_transfer_model_line(self.destination_accounts[3].id,
+                                                      analytic_account_ids=[aaccounts[0].id],
+                                                      partner_ids=[partner_ids[1].id])
+        transfer_model_line_2 = self._add_transfer_model_line(self.destination_accounts[2].id,
+                                                      partner_ids=[partner_ids[0].id])
+
+        transfer_models_lines = transfer_model_line_1 + transfer_model_line_2
+        args = [fields.Date.to_date('2019-01-01'), fields.Date.to_date('2019-12-19')]
+        res = transfer_models_lines._get_transfer_move_lines_values(*args)
+        exp = [
+            {
+                'name': 'Automatic Transfer (from account MA001 with analytic account(s): ANAL00 and partner(s): partner1)',
+                'account_id': self.destination_accounts[3].id,
+                'date_maturity': args[1],
+                'debit': amounts[1],
+            },
+            {
+                'name': 'Automatic Transfer (entries with analytic account(s): ANAL00 and partner(s): partner1)',
+                'account_id': self.origin_accounts[0].id,
+                'date_maturity': args[1],
+                'credit': amounts[1],
+            },
+            {
+                'name': 'Automatic Transfer (from account MA001 with partner(s): partner0)',
+                'account_id': self.destination_accounts[2].id,
+                'date_maturity': args[1],
+                'debit': amounts[0],
+            },
+            {
+                'name': 'Automatic Transfer (entries with partner(s): partner0)',
+                'account_id': self.origin_accounts[0].id,
+                'date_maturity': args[1],
+                'credit': amounts[0],
+            },
+        ]
+        self.assertListEqual(exp, res)
diff --git a/dev_odex30_accounting/odex30_account_auto_transfer/views/transfer_model_views.xml b/dev_odex30_accounting/odex30_account_auto_transfer/views/transfer_model_views.xml
new file mode 100644
index 0000000..de695e1
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_auto_transfer/views/transfer_model_views.xml
@@ -0,0 +1,142 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <!-- SEARCH VIEW -->
+    <record model="ir.ui.view" id="view_generated_transfer_search">
+        <field name="name">account.auto.transfer.search</field>
+        <field name="model">account.move</field>
+        <field name="inherit_id" ref="account.view_account_move_filter"/>
+        <field name="arch" type="xml">
+            <xpath expr="//field[@name='partner_id']" position="after">
+                <field name="transfer_model_id"/>
+            </xpath>
+        </field>
+    </record>
+
+    <!-- ACTIONS -->
+    <!--    MOVE MODELS (FROM MENU) -->
+    <record model="ir.actions.act_window" id="transfer_model_action">
+        <field name="name">Automatic Transfers</field>
+        <field name="res_model">account.transfer.model</field>
+        <field name="view_mode">list,form</field>
+    </record>
+
+    <!--    GENERATED MOVES -->
+    <record model="ir.actions.act_window" id="generated_transfers_action">
+        <field name="name">Generated Entries</field>
+        <field name="res_model">account.move</field>
+        <field name="view_mode">list,form</field>
+        <field name="view_id" ref="account.view_move_tree"/>
+        <field name="search_view_id" ref="view_generated_transfer_search"/>
+    </record>
+
+    <!-- MENU -->
+    <menuitem id="menu_auto_transfer"
+              name="Transfers"
+              action="transfer_model_action"
+              groups="account.group_account_user"
+              parent="account.menu_finance_entries" sequence="30"/>
+
+    <!-- VIEWS -->
+    <!--    LIST -->
+    <record model="ir.ui.view" id="view_transfer_model_tree">
+        <field name="name">account.auto.transfer.model.list</field>
+        <field name="model">account.transfer.model</field>
+        <field name="arch" type="xml">
+            <list string="Move Models" sample="1">
+                <field name="name"/>
+                <field name="company_id" groups="base.group_multi_company"/>
+                <field name="date_start"/>
+                <field name="date_stop"/>
+                <field name="frequency"/>
+            </list>
+        </field>
+    </record>
+    <!--    FORM -->
+    <record model="ir.ui.view" id="view_transfer_model_form">
+        <field name="name">account.auto.transfer.model.form</field>
+        <field name="model">account.transfer.model</field>
+        <field name="arch" type="xml">
+            <form string="Move Model" class="o_auto_transfer_form">
+                <header>
+                    <button name="action_activate" type="object"
+                            string="Activate" class="oe_highlight"
+                            invisible="state == 'in_progress' or not active"/>
+                    <button name="action_perform_auto_transfer" type="object"
+                            string="Compute Transfer" class="oe_highlight"
+                            invisible="state != 'in_progress' or not active"/>
+                    <button name="action_disable" type="object"
+                            string="Disable"
+                            invisible="state != 'in_progress' or not active"/>
+                    <field name="state" widget="statusbar"/>
+                </header>
+                <sheet>
+                    <div name="button_box" class="oe_button_box" invisible="not id">
+                        <button class="oe_stat_button" type="action"
+                                name="%(generated_transfers_action)d" icon="fa-book"
+                                context="{'search_default_transfer_model_id': id, 'default_transfer_model_id': id}">
+                            <field name="move_ids_count" string="Transfers" widget="statinfo"/>
+                        </button>
+                    </div>
+                    <widget name="web_ribbon" title="Archived" bg_color="bg-danger" invisible="active"/>
+                    <field name="active" invisible="1"/>
+                    <div class="oe_title">
+                        <label for="name" string="Description"/>
+                        <h1>
+                            <field name="name" placeholder="e.g. Monthly Expense Transfer"/>
+                        </h1>
+                    </div>
+                    <group>
+                        <group>
+                            <label for="date_start" string="Period"/>
+                            <div>
+                                <field name="date_start" class="oe_inline"/>
+                                <span> to </span>
+                                <field name="date_stop" class="oe_inline"/>
+                            </div>
+                            <field name="frequency"/>
+                        </group>
+                        <group>
+                            <field name="journal_id" string="Journal" domain="[('type', '=', 'general')]"/>
+                        </group>
+                    </group>
+                    <group>
+                        <group string="Origin Accounts">
+                            <field name="account_ids" nolabel="1">
+                                <list>
+                                    <field name="code"/>
+                                    <field name="name"/>
+                                    <field name="account_type"/>
+                                </list>
+                            </field>
+                        </group>
+                        <group string="Automated Transfer">
+                            <field name="line_ids" nolabel="1"
+                                   context="{'default_transfer_model_id': id}">
+                                <list editable="bottom">
+                                    <field name="percent_is_readonly" column_invisible="True"/>
+                                    <field name="sequence" widget="handle"/>
+                                    <field name="analytic_account_ids"
+                                           widget="many2many_tags"/>
+                                    <field name="partner_ids" widget="many2many_tags" domain="[('parent_id', '=', False)]"/>
+                                    <field name="percent" string="Percent (%)" readonly="percent_is_readonly"/>
+                                    <field name="account_id"/>
+                                </list>
+                            </field>
+                        </group>
+                    </group>
+                </sheet>
+            </form>
+        </field>
+    </record>
+    <record model="ir.ui.view" id="view_transfer_model_search">
+        <field name="name">account.auto.transfer.model.search</field>
+        <field name="model">account.transfer.model</field>
+        <field name="arch" type="xml">
+            <search>
+                <field name="name"/>
+                <separator/>
+                <filter string="Archived" name="archived" domain="[('active', '=', False)]"/>
+            </search>
+        </field>
+    </record>
+</odoo>
diff --git a/dev_odex30_accounting/odex30_account_bank_statement_import/__init__.py b/dev_odex30_accounting/odex30_account_bank_statement_import/__init__.py
new file mode 100644
index 0000000..7749576
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_bank_statement_import/__init__.py
@@ -0,0 +1,4 @@
+# -*- encoding: utf-8 -*-
+
+from . import models
+from . import wizard
diff --git a/dev_odex30_accounting/odex30_account_bank_statement_import/__manifest__.py b/dev_odex30_accounting/odex30_account_bank_statement_import/__manifest__.py
new file mode 100644
index 0000000..f524d31
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_bank_statement_import/__manifest__.py
@@ -0,0 +1,26 @@
+# -*- encoding: utf-8 -*-
+{
+    'name': 'Account Bank Statement Import',
+    'category': 'Odex30-Accounting/Odex30-Accounting',
+    'version': '1.0',
+    'depends': ['odex30_account_accountant', 'base_import'],
+    'description': """Generic Wizard to Import Bank Statements.
+
+(This module does not include any type of import format.)
+
+OFX and QIF imports are available in Enterprise version.""",
+    'data': [
+        'views/account_bank_statement_import_view.xml',
+    ],
+    'demo': [
+        'demo/partner_bank.xml',
+    ],
+    'installable': True,
+    'auto_install': True,
+    'assets': {
+        'web.assets_backend': [
+            'odex30_account_bank_statement_import/static/src/**/*',
+        ],
+    },
+
+}
diff --git a/dev_odex30_accounting/odex30_account_bank_statement_import/__pycache__/__init__.cpython-311.pyc b/dev_odex30_accounting/odex30_account_bank_statement_import/__pycache__/__init__.cpython-311.pyc
new file mode 100644
index 0000000..580c2ae
Binary files /dev/null and b/dev_odex30_accounting/odex30_account_bank_statement_import/__pycache__/__init__.cpython-311.pyc differ
diff --git a/dev_odex30_accounting/odex30_account_bank_statement_import/demo/partner_bank.xml b/dev_odex30_accounting/odex30_account_bank_statement_import/demo/partner_bank.xml
new file mode 100644
index 0000000..ab15c79
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_bank_statement_import/demo/partner_bank.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <data>
+
+        <record id="ofx_partner_bank_1" model="res.partner.bank">
+            <field name="acc_number">BE68539007547034</field>
+            <field name="partner_id" ref="base.res_partner_2"></field>
+            <field name="bank_id" ref="base.res_bank_1"/>
+        </record>
+
+        <record id="ofx_partner_bank_2" model="res.partner.bank">
+            <field name="acc_number">00987654322</field>
+            <field name="partner_id" ref="base.res_partner_3"></field>
+            <field name="bank_id" ref="base.res_bank_1"/>
+        </record>
+
+        <record id="qif_partner_bank_1" model="res.partner.bank">
+            <field name="acc_number">10987654320</field>
+            <field name="partner_id" ref="base.res_partner_4"></field>
+            <field name="bank_id" ref="base.res_bank_1"/>
+        </record>
+
+        <record id="qif_partner_bank_2" model="res.partner.bank">
+            <field name="acc_number">10987654322</field>
+            <field name="partner_id" ref="base.res_partner_3"></field>
+            <field name="bank_id" ref="base.res_bank_1"/>
+        </record>
+
+    </data>
+</odoo>
diff --git a/dev_odex30_accounting/odex30_account_bank_statement_import/i18n/ar.po b/dev_odex30_accounting/odex30_account_bank_statement_import/i18n/ar.po
new file mode 100644
index 0000000..65b1fa4
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_bank_statement_import/i18n/ar.po
@@ -0,0 +1,201 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# 	* odex30_account_bank_statement_import
+# 
+# Translators:
+# Wil Odoo, 2024
+# Malaz Abuidris <msea@odoo.com>, 2025
+# 
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 18.0+e\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2024-09-25 09:26+0000\n"
+"PO-Revision-Date: 2024-09-25 09:43+0000\n"
+"Last-Translator: Malaz Abuidris <msea@odoo.com>, 2025\n"
+"Language-Team: Arabic (https://app.transifex.com/odoo/teams/41243/ar/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Language: ar\n"
+"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
+
+#. module: odex30_account_bank_statement_import
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import/models/account_journal.py:0
+msgid "%d transactions had already been imported and were ignored."
+msgstr "تم استيراد %d معاملات بالفعل وتجاهلها. "
+
+#. module: odex30_account_bank_statement_import
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import/models/account_journal.py:0
+msgid "1 transaction had already been imported and was ignored."
+msgstr "تم تجاهل 1 معاملة سبق استيرادها بالفعل."
+
+#. module: odex30_account_bank_statement_import
+#: model:ir.model.constraint,message:odex30_account_bank_statement_import.constraint_account_bank_statement_line_unique_import_id
+msgid "A bank account transactions can be imported only once!"
+msgstr "يمكن استيراد معاملات الحساب البنكي مرة واحدة فقط! "
+
+#. module: odex30_account_bank_statement_import
+#: model:ir.model,name:odex30_account_bank_statement_import.model_account_bank_statement_line
+msgid "Bank Statement Line"
+msgstr "بند كشف الحساب البنكي"
+
+#. module: odex30_account_bank_statement_import
+#: model:ir.model,name:odex30_account_bank_statement_import.model_account_setup_bank_manual_config
+msgid "Bank setup manual config"
+msgstr "التهيئة اليدوية لإعدادات البنك "
+
+#. module: odex30_account_bank_statement_import
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import/models/account_journal.py:0
+msgid ""
+"Cannot find in which journal import this statement. Please manually select a"
+" journal."
+msgstr ""
+"لقد تعذر إيجاد دفتر اليومية الذي يتم توريد كشف الحساب المحدد إليه. الرجاء "
+"اختيار دفتر اليومية يدوياً. "
+
+#. module: odex30_account_bank_statement_import
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import/models/account_bank_statement.py:0
+msgid "Click \"New\" or upload a %s."
+msgstr "اضغط على\"جديد\" أو قم برفع %s. "
+
+#. module: odex30_account_bank_statement_import
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import/models/account_journal.py:0
+msgid ""
+"Could not make sense of the given file.\n"
+"Did you install the module to support this type of file?"
+msgstr ""
+" تعذر فهم طبيعة الملف المحدد.\n"
+"هل قمت بتثبيت التطبيق المناسب لدعم هذا النوع من الملفات؟ "
+
+#. module: odex30_account_bank_statement_import
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import/models/account_journal.py:0
+msgid "Go to Apps"
+msgstr "الذهاب إلى التطبيقات "
+
+#. module: odex30_account_bank_statement_import
+#: model_terms:ir.ui.view,arch_db:odex30_account_bank_statement_import.journal_dashboard_view_inherit
+msgid "Import File"
+msgstr "استيراد ملف"
+
+#. module: odex30_account_bank_statement_import
+#: model:ir.model.fields,field_description:odex30_account_bank_statement_import.field_account_bank_statement_line__unique_import_id
+msgid "Import ID"
+msgstr "معرف الاستيراد"
+
+#. module: odex30_account_bank_statement_import
+#. odoo-javascript
+#: code:addons/odex30_account_bank_statement_import/static/src/account_bank_statement_import_model.js:0
+msgid "Import Template for Bank Statements"
+msgstr "استيراد قالب لكشوفات الحسابات البنكية "
+
+#. module: odex30_account_bank_statement_import
+#: model:ir.model,name:odex30_account_bank_statement_import.model_account_journal
+msgid "Journal"
+msgstr "دفتر اليومية"
+
+#. module: odex30_account_bank_statement_import
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import/models/account_journal.py:0
+msgid "Manual (or import %(import_formats)s)"
+msgstr "يدوي (أو استيراد %(import_formats)s) "
+
+#. module: odex30_account_bank_statement_import
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import/models/account_journal.py:0
+msgid "No attachment was provided"
+msgstr "لم يتم توفير مرفق"
+
+#. module: odex30_account_bank_statement_import
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import/models/account_journal.py:0
+msgid "No currency found matching '%s'."
+msgstr "لم يمكن العثور على أي عملة تطابق '%s'."
+
+#. module: odex30_account_bank_statement_import
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import/models/account_bank_statement.py:0
+msgid "No transactions matching your filters were found."
+msgstr "لم يتم العثور على أي معاملات تطابق عوامل التصفية الخاصة بك. "
+
+#. module: odex30_account_bank_statement_import
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import/models/account_bank_statement.py:0
+msgid "Nothing to do here!"
+msgstr "لا شيء لتفعله هنا! "
+
+#. module: odex30_account_bank_statement_import
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import/models/account_journal.py:0
+msgid ""
+"The account of this statement (%(account)s) is not the same as the journal "
+"(%(journal)s)."
+msgstr ""
+"الحساب في كشف الحساب البنكي (%(account)s) مختلف عن حساب دفتر اليومية "
+"(%(journal)s). "
+
+#. module: odex30_account_bank_statement_import
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import/models/account_journal.py:0
+msgid ""
+"The currency of the bank statement (%(code)s) is not the same as the "
+"currency of the journal (%(journal)s)."
+msgstr ""
+"العملة في كشف الحساب البنكي (%(code)s) مختلفة عن العملة في دفتر اليومية "
+"(%(journal)s). "
+
+#. module: odex30_account_bank_statement_import
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import/models/account_journal.py:0
+msgid "The following files could not be imported:\n"
+msgstr "تعذر استيراد الملفات التالية: \n"
+
+#. module: odex30_account_bank_statement_import
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import/models/account_journal.py:0
+msgid ""
+"This file doesn't contain any statement for account %s.\n"
+"If it contains transactions for more than one account, it must be imported on each of them."
+msgstr ""
+"لا يحتوي هذا الملف على أي كشف للحساب %s.\n"
+"إذا كان يحتوي على معاملات لأكثر من حساب، فيجب استيراده في كل منها. "
+
+#. module: odex30_account_bank_statement_import
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import/models/account_journal.py:0
+msgid ""
+"This file doesn't contain any transaction for account %s.\n"
+"If it contains transactions for more than one account, it must be imported on each of them."
+msgstr ""
+"لا يحتوي هذا الملف على أي معاملات للحساب %s.\n"
+"إذا كان يحتوي على معاملات لأكثر من حساب، فيجب استيراده في كل منها. "
+
+#. module: odex30_account_bank_statement_import
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import/models/account_journal.py:0
+msgid "View successfully imported statements"
+msgstr "عرض كشوفات الحساب البنكية التي تم استيرادها بنجاح "
+
+#. module: odex30_account_bank_statement_import
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import/models/account_journal.py:0
+msgid "You already have imported that file."
+msgstr "لقد قمت باستيراد هذا الملف بالفعل."
+
+#. module: odex30_account_bank_statement_import
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import/models/account_journal.py:0
+msgid "You have to set a Default Account for the journal: %s"
+msgstr "عليك تعيين حساب افتراضي لليومية: %s"
+
+#. module: odex30_account_bank_statement_import
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import/models/account_journal.py:0
+msgid "You uploaded an invalid or empty file."
+msgstr "لقد قمت برفع ملف فارغ أو غير صالح. "
diff --git a/dev_odex30_accounting/odex30_account_bank_statement_import/models/__init__.py b/dev_odex30_accounting/odex30_account_bank_statement_import/models/__init__.py
new file mode 100644
index 0000000..5b36696
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_bank_statement_import/models/__init__.py
@@ -0,0 +1,2 @@
+from . import account_bank_statement
+from . import account_journal
diff --git a/dev_odex30_accounting/odex30_account_bank_statement_import/models/__pycache__/__init__.cpython-311.pyc b/dev_odex30_accounting/odex30_account_bank_statement_import/models/__pycache__/__init__.cpython-311.pyc
new file mode 100644
index 0000000..c591a80
Binary files /dev/null and b/dev_odex30_accounting/odex30_account_bank_statement_import/models/__pycache__/__init__.cpython-311.pyc differ
diff --git a/dev_odex30_accounting/odex30_account_bank_statement_import/models/__pycache__/account_bank_statement.cpython-311.pyc b/dev_odex30_accounting/odex30_account_bank_statement_import/models/__pycache__/account_bank_statement.cpython-311.pyc
new file mode 100644
index 0000000..f6cb64f
Binary files /dev/null and b/dev_odex30_accounting/odex30_account_bank_statement_import/models/__pycache__/account_bank_statement.cpython-311.pyc differ
diff --git a/dev_odex30_accounting/odex30_account_bank_statement_import/models/__pycache__/account_journal.cpython-311.pyc b/dev_odex30_accounting/odex30_account_bank_statement_import/models/__pycache__/account_journal.cpython-311.pyc
new file mode 100644
index 0000000..d98c0e6
Binary files /dev/null and b/dev_odex30_accounting/odex30_account_bank_statement_import/models/__pycache__/account_journal.cpython-311.pyc differ
diff --git a/dev_odex30_accounting/odex30_account_bank_statement_import/models/account_bank_statement.py b/dev_odex30_accounting/odex30_account_bank_statement_import/models/account_bank_statement.py
new file mode 100644
index 0000000..6391252
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_bank_statement_import/models/account_bank_statement.py
@@ -0,0 +1,28 @@
+# -*- coding: utf-8 -*-
+
+from odoo import fields, models, _
+
+from markupsafe import Markup
+
+import logging
+_logger = logging.getLogger(__name__)
+
+
+class AccountBankStatementLine(models.Model):
+    _inherit = "account.bank.statement.line"
+
+    # Ensure transactions can be imported only once (if the import format provides unique transaction ids)
+    unique_import_id = fields.Char(string='Import ID', readonly=True, copy=False)
+
+    _sql_constraints = [
+        ('unique_import_id', 'unique (unique_import_id)', 'A bank account transactions can be imported only once!')
+    ]
+
+    def _action_open_bank_reconciliation_widget(self, extra_domain=None, default_context=None, name=None, kanban_first=True):
+        res = super()._action_open_bank_reconciliation_widget(extra_domain, default_context, name, kanban_first)
+        res['help'] = Markup("<p class='o_view_nocontent_smiling_face'>{}</p><p>{}<br/>{}</p>").format(
+            _('Nothing to do here!'),
+            _('No transactions matching your filters were found.'),
+            _('Click "New" or upload a %s.', ", ".join(self.env['account.journal']._get_bank_statements_available_import_formats())),
+        )
+        return res
diff --git a/dev_odex30_accounting/odex30_account_bank_statement_import/models/account_journal.py b/dev_odex30_accounting/odex30_account_bank_statement_import/models/account_journal.py
new file mode 100644
index 0000000..114ea1d
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_bank_statement_import/models/account_journal.py
@@ -0,0 +1,299 @@
+# -*- coding: utf-8 -*-
+from odoo import models, tools, _
+from odoo.addons.base.models.res_bank import sanitize_account_number
+from odoo.exceptions import UserError, RedirectWarning
+
+
+class AccountJournal(models.Model):
+    _inherit = "account.journal"
+
+    def _get_bank_statements_available_import_formats(self):
+        """ Returns a list of strings representing the supported import formats.
+        """
+        return []
+
+    def __get_bank_statements_available_sources(self):
+        rslt = super(AccountJournal, self).__get_bank_statements_available_sources()
+        formats_list = self._get_bank_statements_available_import_formats()
+        if formats_list:
+            formats_list.sort()
+            import_formats_str = ', '.join(formats_list)
+            rslt.append(("file_import", _("Manual (or import %(import_formats)s)", import_formats=import_formats_str)))
+        return rslt
+
+    def create_document_from_attachment(self, attachment_ids=None):
+        journal = self or self.browse(self.env.context.get('default_journal_id'))
+        if journal.type in ('bank', 'credit', 'cash'):
+            attachments = self.env['ir.attachment'].browse(attachment_ids)
+            if not attachments:
+                raise UserError(_("No attachment was provided"))
+            return journal._import_bank_statement(attachments)
+        return super().create_document_from_attachment(attachment_ids)
+
+    def _import_bank_statement(self, attachments):
+        """ Process the file chosen in the wizard, create bank statement(s) and go to reconciliation. """
+        if any(not a.raw for a in attachments):
+            raise UserError(_("You uploaded an invalid or empty file."))
+
+        statement_ids_all = []
+        notifications_all = {}
+        errors = {}
+        # Let the appropriate implementation module parse the file and return the required data
+        # The active_id is passed in context in case an implementation module requires information about the wizard state (see QIF)
+        for attachment in attachments:
+            try:
+                currency_code, account_number, stmts_vals = self._parse_bank_statement_file(attachment)
+                # Check raw data
+                self._check_parsed_data(stmts_vals, account_number)
+                # Try to find the currency and journal in odoo
+                journal = self._find_additional_data(currency_code, account_number)
+                # If no journal found, ask the user about creating one
+                if not journal.default_account_id:
+                    raise UserError(_('You have to set a Default Account for the journal: %s', journal.name))
+                # Prepare statement data to be used for bank statements creation
+                stmts_vals = self._complete_bank_statement_vals(stmts_vals, journal, account_number, attachment)
+                # Create the bank statements
+                statement_ids, dummy, notifications = self._create_bank_statements(stmts_vals)
+                statement_ids_all.extend(statement_ids)
+
+                # Now that the import worked out, set it as the bank_statements_source of the journal
+                if journal.bank_statements_source != 'file_import':
+                    # Use sudo() because only 'account.group_account_manager'
+                    # has write access on 'account.journal', but 'account.group_account_user'
+                    # must be able to import bank statement files
+                    journal.sudo().bank_statements_source = 'file_import'
+
+                msg = ""
+                for notif in notifications:
+                    msg += (
+                        f"{notif['message']}"
+                    )
+                if notifications:
+                    notifications_all[attachment.name] = msg
+            except (UserError, RedirectWarning) as e:
+                errors[attachment.name] = e.args[0]
+
+        statements = self.env['account.bank.statement'].browse(statement_ids_all)
+        line_to_reconcile = statements.line_ids
+        if line_to_reconcile:
+            # 'limit_time_real_cron' defaults to -1.
+            # Manual fallback applied for non-POSIX systems where this key is disabled (set to None).
+            cron_limit_time = tools.config['limit_time_real_cron'] or -1
+            limit_time = cron_limit_time if 0 < cron_limit_time < 180 else 180
+            line_to_reconcile._cron_try_auto_reconcile_statement_lines(limit_time=limit_time)
+
+        result = self.env['account.bank.statement.line']._action_open_bank_reconciliation_widget(
+            extra_domain=[('statement_id', 'in', statements.ids)],
+            default_context={
+                'search_default_not_matched': True,
+                'default_journal_id': statements[:1].journal_id.id,
+                'notifications': notifications_all,
+            },
+        )
+
+        if errors:
+            error_msg = _("The following files could not be imported:\n")
+            error_msg += "\n".join([f"- {attachment_name}: {msg}" for attachment_name, msg in errors.items()])
+            if statements:
+                self.env.cr.commit()  # save the correctly uploaded statements to the db before raising the errors
+                raise RedirectWarning(error_msg, result, _('View successfully imported statements'))
+            else:
+                raise UserError(error_msg)
+        return result
+
+    def _parse_bank_statement_file(self, attachment) -> tuple:
+        """ Each module adding a file support must extends this method. It processes the file if it can, returns super otherwise, resulting in a chain of responsability.
+            This method parses the given file and returns the data required by the bank statement import process, as specified below.
+            rtype: triplet (if a value can't be retrieved, use None)
+                - currency code: string (e.g: 'EUR')
+                    The ISO 4217 currency code, case insensitive
+                - account number: string (e.g: 'BE1234567890')
+                    The number of the bank account which the statement belongs to
+                - bank statements data: list of dict containing (optional items marked by o) :
+                    - 'name': string (e.g: '000000123')
+                    - 'date': date (e.g: 2013-06-26)
+                    -o 'balance_start': float (e.g: 8368.56)
+                    -o 'balance_end_real': float (e.g: 8888.88)
+                    - 'transactions': list of dict containing :
+                        - 'name': string (e.g: 'KBC-INVESTERINGSKREDIET 787-5562831-01')
+                        - 'date': date
+                        - 'amount': float
+                        - 'unique_import_id': string
+                        -o 'account_number': string
+                            Will be used to find/create the res.partner.bank in odoo
+                        -o 'note': string
+                        -o 'partner_name': string
+                        -o 'ref': string
+        """
+        raise RedirectWarning(
+            message=_("Could not make sense of the given file.\nDid you install the module to support this type of file?"),
+            action=self.env.ref('base.open_module_tree').id,
+            button_text=_("Go to Apps"),
+            additional_context={
+                'search_default_name': 'account_bank_statement_import',
+                'search_default_extra': True,
+            },
+        )
+
+    def _check_parsed_data(self, stmts_vals, account_number):
+        """ Basic and structural verifications """
+        if len(stmts_vals) == 0:
+            raise UserError(_(
+                'This file doesn\'t contain any statement for account %s.\nIf it contains transactions for more than one account, it must be imported on each of them.',
+                account_number,
+            ))
+
+        no_st_line = True
+        for vals in stmts_vals:
+            if vals['transactions'] and len(vals['transactions']) > 0:
+                no_st_line = False
+                break
+        if no_st_line:
+            raise UserError(_(
+                'This file doesn\'t contain any transaction for account %s.\nIf it contains transactions for more than one account, it must be imported on each of them.',
+                account_number,
+            ))
+
+    def _statement_import_check_bank_account(self, account_number):
+        # Needed for CH to accommodate for non-unique account numbers
+        sanitized_acc_number = self.bank_account_id.sanitized_acc_number.split(" ")[0]
+        # Needed for BNP France
+        if len(sanitized_acc_number) == 27 and len(account_number) == 11 and sanitized_acc_number[:2].upper() == "FR":
+            return sanitized_acc_number[14:-2] == account_number
+
+        # Needed for Credit Lyonnais (LCL)
+        if len(sanitized_acc_number) == 27 and len(account_number) == 7 and sanitized_acc_number[:2].upper() == "FR":
+            return sanitized_acc_number[18:-2] == account_number
+
+        return sanitized_acc_number == account_number
+
+    def _find_additional_data(self, currency_code, account_number):
+        """ Look for the account.journal using values extracted from the
+            statement and make sure it's consistent.
+        """
+        company_currency = self.env.company.currency_id
+        currency = None
+        sanitized_account_number = sanitize_account_number(account_number)
+
+        if currency_code:
+            currency = self.env['res.currency'].search([('name', '=ilike', currency_code)], limit=1)
+            if not currency:
+                raise UserError(_("No currency found matching '%s'.", currency_code))
+            if currency == company_currency:
+                currency = False
+
+        journal = self
+        if account_number:
+            # No bank account on the journal : create one from the account number of the statement
+            if journal and not journal.bank_account_id:
+                journal.set_bank_account(account_number)
+            # No journal passed to the wizard : try to find one using the account number of the statement
+            elif not journal:
+                journal = self.search([('bank_account_id.sanitized_acc_number', '=', sanitized_account_number)])
+                if not journal:
+                    # Sometimes the bank returns only part of the full account number (e.g. local account number instead of full IBAN)
+                    partial_match = self.search([('bank_account_id.sanitized_acc_number', 'ilike', sanitized_account_number)])
+                    if len(partial_match) == 1:
+                        journal = partial_match
+            # Already a bank account on the journal : check it's the same as on the statement
+            else:
+                if not self._statement_import_check_bank_account(sanitized_account_number):
+                    raise UserError(_('The account of this statement (%(account)s) is not the same as the journal (%(journal)s).', account=account_number, journal=journal.bank_account_id.acc_number))
+
+        # If importing into an existing journal, its currency must be the same as the bank statement
+        if journal:
+            journal_currency = journal.currency_id or journal.company_id.currency_id
+            if currency is None:
+                currency = journal_currency
+            if currency and currency != journal_currency:
+                statement_cur_code = not currency and company_currency.name or currency.name
+                journal_cur_code = not journal_currency and company_currency.name or journal_currency.name
+                raise UserError(_('The currency of the bank statement (%(code)s) is not the same as the currency of the journal (%(journal)s).', code=statement_cur_code, journal=journal_cur_code))
+
+        if not journal:
+            raise UserError(_('Cannot find in which journal import this statement. Please manually select a journal.'))
+        return journal
+
+    def _complete_bank_statement_vals(self, stmts_vals, journal, account_number, attachment):
+        for st_vals in stmts_vals:
+            if not st_vals.get('reference'):
+                st_vals['reference'] = attachment.name
+            for line_vals in st_vals['transactions']:
+                line_vals['journal_id'] = journal.id
+                unique_import_id = line_vals.get('unique_import_id')
+                if unique_import_id:
+                    sanitized_account_number = sanitize_account_number(account_number)
+                    line_vals['unique_import_id'] = (sanitized_account_number and sanitized_account_number + '-' or '') + str(journal.id) + '-' + unique_import_id
+
+                if not line_vals.get('partner_bank_id'):
+                    # Find the partner and his bank account or create the bank account. The partner selected during the
+                    # reconciliation process will be linked to the bank when the statement is closed.
+                    identifying_string = line_vals.get('account_number')
+                    if identifying_string:
+                        if line_vals.get('partner_id'):
+                            partner_bank = self.env['res.partner.bank'].search([
+                                ('acc_number', '=', identifying_string),
+                                ('partner_id', '=', line_vals['partner_id'])
+                            ])
+                        else:
+                            partner_bank = self.env['res.partner.bank'].search([
+                                ('acc_number', '=', identifying_string),
+                                ('company_id', 'in', (False, journal.company_id.id))
+                            ])
+                        # If multiple partners share the same account number, do not try to guess and just avoid setting it
+                        if partner_bank and len(partner_bank) == 1:
+                            line_vals['partner_bank_id'] = partner_bank.id
+                            line_vals['partner_id'] = partner_bank.partner_id.id
+        return stmts_vals
+
+    def _create_bank_statements(self, stmts_vals, raise_no_imported_file=True):
+        """ Create new bank statements from imported values, filtering out already imported transactions, and returns data used by the reconciliation widget """
+        BankStatement = self.env['account.bank.statement']
+        BankStatementLine = self.env['account.bank.statement.line']
+
+        # Filter out already imported transactions and create statements
+        statement_ids = []
+        statement_line_ids = []
+        ignored_statement_lines_import_ids = []
+        for st_vals in stmts_vals:
+            filtered_st_lines = []
+            for line_vals in st_vals['transactions']:
+                if (line_vals['amount'] != 0
+                   and ('unique_import_id' not in line_vals
+                   or not line_vals['unique_import_id']
+                   or not bool(BankStatementLine.sudo().search([('unique_import_id', '=', line_vals['unique_import_id'])], limit=1)))):
+                    filtered_st_lines.append(line_vals)
+                else:
+                    ignored_statement_lines_import_ids.append(line_vals)
+                    if st_vals.get('balance_start') is not None:
+                        st_vals['balance_start'] += float(line_vals['amount'])
+
+            if len(filtered_st_lines) > 0:
+                # Remove values that won't be used to create records
+                st_vals.pop('transactions', None)
+                # Create the statement
+                st_vals['line_ids'] = [[0, False, line] for line in filtered_st_lines]
+                statement = BankStatement.with_context(default_journal_id=self.id).create(st_vals)
+                if not statement.name:
+                    statement.name = st_vals['reference']
+                statement_ids.append(statement.id)
+                statement_line_ids.extend(statement.line_ids.ids)
+
+                # Create the report.
+                if statement.is_complete and not self._context.get('skip_pdf_attachment_generation'):
+                    statement.action_generate_attachment()
+
+        if len(statement_line_ids) == 0 and raise_no_imported_file:
+            raise UserError(_('You already have imported that file.'))
+
+        # Prepare import feedback
+        notifications = []
+        num_ignored = len(ignored_statement_lines_import_ids)
+        if num_ignored > 0:
+            notifications += [{
+                'type': 'warning',
+                'message': _("%d transactions had already been imported and were ignored.", num_ignored)
+                           if num_ignored > 1
+                           else _("1 transaction had already been imported and was ignored."),
+            }]
+        return statement_ids, statement_line_ids, notifications
diff --git a/dev_odex30_accounting/odex30_account_bank_statement_import/static/csv/account.bank.statement.csv b/dev_odex30_accounting/odex30_account_bank_statement_import/static/csv/account.bank.statement.csv
new file mode 100644
index 0000000..7be40fd
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_bank_statement_import/static/csv/account.bank.statement.csv
@@ -0,0 +1,6 @@
+Journal,Name,Date,Starting Balance,Ending Balance,Statement lines / Date,Statement lines / Label,Statement lines / Partner,Statement lines / Reference,Statement lines / Amount,Statement lines / Amount Currency,Statement lines / Currency
+Bank,Statement May 01,2017-05-15,100,5124.5,2017-05-10,INV/2017/0001,,#01,4610,,
+,,,,,2017-05-11,Payment bill 20170521,,#02,-100,,
+,,,,,2017-05-15,INV/2017/0003 discount 2% early payment,,#03,514.5,,
+Bank,Statement May 02,2017-05-30,5124.5,9847.35,2017-05-30,INV/2017/0002 + INV/2017/0004,,#01,5260,,
+,,,,,2017-05-31,Payment bill EUR 001234565,,#02,-537.15,-500,EUR
diff --git a/dev_odex30_accounting/odex30_account_bank_statement_import/static/description/icon_src.svg b/dev_odex30_accounting/odex30_account_bank_statement_import/static/description/icon_src.svg
new file mode 100644
index 0000000..664381e
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_bank_statement_import/static/description/icon_src.svg
@@ -0,0 +1,178 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   enable-background="new 0 0 100 100"
+   height="100px"
+   id="Layer_1"
+   version="1.1"
+   viewBox="0 0 100 100"
+   width="100px"
+   xml:space="preserve"
+   inkscape:version="0.48.2 r9819"
+   sodipodi:docname="1409271720_Noun_Project_100Icon_10px_grid-17.svg"
+   inkscape:export-filename="/Users/arthurmaniet/Desktop/icon.png"
+   inkscape:export-xdpi="115.2"
+   inkscape:export-ydpi="115.2"><metadata
+     id="metadata9"><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
+     id="defs7" /><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1733"
+     inkscape:window-height="1001"
+     id="namedview5"
+     showgrid="false"
+     inkscape:zoom="11.62"
+     inkscape:cx="21.99675"
+     inkscape:cy="56.127828"
+     inkscape:window-x="76"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="Layer_1" /><path
+     d="M79.043,31.615l-5.742,5.742V13h-58v74h58V48.67l11.398-11.399L79.043,31.615z M71.301,39.357L50.758,59.898l-1.414,4.242  l-1.414,4.244l8.486-2.828L71.301,50.67V85h-54V15h54V39.357z M54.564,65.119l-3.182,1.06l-1.248-1.248l1.061-3.182l3.1,3.099  L54.564,65.119z"
+     id="path3" /><text
+     xml:space="preserve"
+     style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
+     x="18.006462"
+     y="17.887218"
+     id="text2986"
+     sodipodi:linespacing="125%"><tspan
+       sodipodi:role="line"
+       x="18.006462"
+       y="17.887218"
+       style="font-size:3px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-family:Arial;-inkscape-font-specification:Arial Bold"
+       id="tspan3520">08/12/13    1000.00    Delta PC</tspan><tspan
+       sodipodi:role="line"
+       x="18.006462"
+       y="21.637218"
+       style="font-size:3px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-family:Arial;-inkscape-font-specification:Arial Bold"
+       id="tspan3731">08/15/13    75.46        Walts Drugs</tspan><tspan
+       sodipodi:role="line"
+       x="18.006462"
+       y="25.387218"
+       style="font-size:3px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-family:Arial;-inkscape-font-specification:Arial Bold"
+       id="tspan3733">03/03/13    379.00      Epic Technologies</tspan><tspan
+       sodipodi:role="line"
+       x="18.006462"
+       y="29.137218"
+       style="font-size:3px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-family:Arial;-inkscape-font-specification:Arial Bold"
+       id="tspan3735">03/04/13    20.28        YOUR LOCAL SU</tspan><tspan
+       sodipodi:role="line"
+       x="18.006462"
+       y="32.887218"
+       style="font-size:3px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-family:Arial;-inkscape-font-specification:Arial Bold"
+       id="tspan3737">03/03/13    421.35      SPRINGFIELD WA</tspan><tspan
+       sodipodi:role="line"
+       x="18.006462"
+       y="36.637218"
+       style="font-size:3px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-family:Arial;-inkscape-font-specification:Arial Bold"
+       id="tspan3739">03/03/13    379.00      Epic Technologies</tspan><tspan
+       sodipodi:role="line"
+       x="18.006462"
+       y="40.387218"
+       style="font-size:3px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-family:Arial;-inkscape-font-specification:Arial Bold"
+       id="tspan3743">03/04/13    20.28        YOUR LOCAL SUP</tspan><tspan
+       sodipodi:role="line"
+       x="18.006462"
+       y="44.137218"
+       style="font-size:3px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-family:Arial;-inkscape-font-specification:Arial Bold"
+       id="tspan3846">08/15/13    75.46        Walts Drugs</tspan><tspan
+       sodipodi:role="line"
+       x="18.006462"
+       y="47.887218"
+       style="font-size:3px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-family:Arial;-inkscape-font-specification:Arial Bold"
+       id="tspan3745">08/12/13    1000.00    Delta PC</tspan><tspan
+       sodipodi:role="line"
+       x="18.006462"
+       y="51.637218"
+       style="font-size:3px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-family:Arial;-inkscape-font-specification:Arial Bold"
+       id="tspan3747">03/03/13    421.35      SPRINGFIELD WA</tspan><tspan
+       sodipodi:role="line"
+       x="18.006462"
+       y="55.387218"
+       style="font-size:3px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-family:Arial;-inkscape-font-specification:Arial Bold"
+       id="tspan3749">03/04/13    20.28        YOUR LOCAL SU</tspan><tspan
+       sodipodi:role="line"
+       x="18.006462"
+       y="59.137218"
+       style="font-size:3px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-family:Arial;-inkscape-font-specification:Arial Bold"
+       id="tspan3751">03/03/13    379.00      Epic Technologies</tspan><tspan
+       sodipodi:role="line"
+       x="18.006462"
+       y="62.887218"
+       style="font-size:3px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-family:Arial;-inkscape-font-specification:Arial Bold"
+       id="tspan3753">08/12/13    1000.00    De  a PC</tspan><tspan
+       sodipodi:role="line"
+       x="18.006462"
+       y="66.637222"
+       style="font-size:3px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-family:Arial;-inkscape-font-specification:Arial Bold"
+       id="tspan3755">03/03/13    379.00      E       Technologies</tspan><tspan
+       sodipodi:role="line"
+       x="18.006462"
+       y="70.387222"
+       style="font-size:3px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-family:Arial;-inkscape-font-specification:Arial Bold"
+       id="tspan3757">08/15/13    75.46        Walts Drugs</tspan><tspan
+       sodipodi:role="line"
+       x="18.006462"
+       y="74.137222"
+       style="font-size:3px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-family:Arial;-inkscape-font-specification:Arial Bold"
+       id="tspan3759">03/04/13    20.28        YOUR LOCAL SU</tspan><tspan
+       sodipodi:role="line"
+       x="18.006462"
+       y="77.887222"
+       style="font-size:3px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-family:Arial;-inkscape-font-specification:Arial Bold"
+       id="tspan3761">03/03/13    379.00      Epic Technologies</tspan><tspan
+       sodipodi:role="line"
+       x="18.006462"
+       y="81.637222"
+       style="font-size:3px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-family:Arial;-inkscape-font-specification:Arial Bold"
+       id="tspan3763">08/12/13    1000.00    Delta PC</tspan><tspan
+       sodipodi:role="line"
+       x="18.006462"
+       y="85.387222"
+       style="font-size:3px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-family:Arial;-inkscape-font-specification:Arial Bold"
+       id="tspan3765">08/15/13    75.46        Walts Drugs</tspan><tspan
+       sodipodi:role="line"
+       x="18.006462"
+       y="89.137222"
+       style="font-size:3px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-family:Arial;-inkscape-font-specification:Arial Bold"
+       id="tspan3783" /><tspan
+       sodipodi:role="line"
+       x="18.006462"
+       y="92.887222"
+       style="font-size:3px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-family:Arial;-inkscape-font-specification:Arial Bold"
+       id="tspan3799" /><tspan
+       sodipodi:role="line"
+       x="18.006462"
+       y="96.637222"
+       style="font-size:3px;font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-family:Arial;-inkscape-font-specification:Arial Bold"
+       id="tspan3801" /></text>
+<text
+     xml:space="preserve"
+     style="font-size:40px;font-style:normal;font-weight:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Sans"
+     x="43.851177"
+     y="32.13871"
+     id="text3838"
+     sodipodi:linespacing="125%"
+     inkscape:export-filename="/Users/arthurmaniet/Desktop/icon.png"
+     inkscape:export-xdpi="115.2"
+     inkscape:export-ydpi="115.2"><tspan
+       sodipodi:role="line"
+       id="tspan3840"
+       x="43.851177"
+       y="32.13871"
+       style="font-size:16px;font-weight:bold;text-align:center;text-anchor:middle;-inkscape-font-specification:Sans Bold" /></text>
+</svg>
\ No newline at end of file
diff --git a/dev_odex30_accounting/odex30_account_bank_statement_import/static/src/account_bank_statement_import_model.js b/dev_odex30_accounting/odex30_account_bank_statement_import/static/src/account_bank_statement_import_model.js
new file mode 100644
index 0000000..99b6246
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_bank_statement_import/static/src/account_bank_statement_import_model.js
@@ -0,0 +1,18 @@
+/** @odoo-module **/
+
+import { BaseImportModel } from "@base_import/import_model";
+import { patch } from "@web/core/utils/patch";
+import { _t } from "@web/core/l10n/translation";
+
+patch(BaseImportModel.prototype, {
+    async init() {
+        await super.init(...arguments);
+
+        if (this.resModel === "account.bank.statement") {
+            this.importTemplates.push({
+                label: _t("Import Template for Bank Statements"),
+                template: "/odex30_account_bank_statement_import/static/csv/account.bank.statement.csv",
+            });
+        }
+    }
+});
diff --git a/dev_odex30_accounting/odex30_account_bank_statement_import/static/src/bank_reconciliation/finish_buttons.js b/dev_odex30_accounting/odex30_account_bank_statement_import/static/src/bank_reconciliation/finish_buttons.js
new file mode 100644
index 0000000..72c1af2
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_bank_statement_import/static/src/bank_reconciliation/finish_buttons.js
@@ -0,0 +1,10 @@
+/** @odoo-module **/
+import { patch } from "@web/core/utils/patch";
+import { AccountFileUploader } from "@account/components/account_file_uploader/account_file_uploader";
+import { BankRecFinishButtons } from "@odex30_account_accountant/components/bank_reconciliation/finish_buttons";
+
+patch(BankRecFinishButtons, {
+    components: {
+        AccountFileUploader,
+    }
+})
diff --git a/dev_odex30_accounting/odex30_account_bank_statement_import/static/src/bank_reconciliation/finish_buttons.xml b/dev_odex30_accounting/odex30_account_bank_statement_import/static/src/bank_reconciliation/finish_buttons.xml
new file mode 100644
index 0000000..f9a6334
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_bank_statement_import/static/src/bank_reconciliation/finish_buttons.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<templates id="template" xml:space="preserve">
+    <t t-name="odex30_account_bank_statement_import.BankRecFinishButtons" t-inherit="odex30_account_accountant.BankRecFinishButtons" t-inherit-mode="extension">
+        <xpath expr="//p" position="before">
+            <div class="mb-1" t-call="account.AccountViewUploadButton"/>
+        </xpath>
+    </t>
+</templates>
diff --git a/dev_odex30_accounting/odex30_account_bank_statement_import/static/src/bank_reconciliation/kanban.js b/dev_odex30_accounting/odex30_account_bank_statement_import/static/src/bank_reconciliation/kanban.js
new file mode 100644
index 0000000..61fece5
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_bank_statement_import/static/src/bank_reconciliation/kanban.js
@@ -0,0 +1,42 @@
+/** @odoo-module **/
+import { registry } from "@web/core/registry";
+import { AccountFileUploader } from "@account/components/account_file_uploader/account_file_uploader";
+import { UploadDropZone } from "@account/components/upload_drop_zone/upload_drop_zone";
+import { BankRecKanbanView, BankRecKanbanController, BankRecKanbanRenderer } from "@odex30_account_accountant/components/bank_reconciliation/kanban";
+import { useState } from "@odoo/owl";
+
+export class BankRecKanbanUploadController extends BankRecKanbanController {
+    static components = {
+        ...BankRecKanbanController.components,
+        AccountFileUploader,
+    }
+}
+
+export class BankRecUploadKanbanRenderer extends BankRecKanbanRenderer {
+    static template = "account.BankRecKanbanUploadRenderer";
+    static components = {
+        ...BankRecKanbanRenderer.components,
+        UploadDropZone,
+    };
+    setup() {
+        super.setup();
+        this.dropzoneState = useState({
+            visible: false,
+        });
+    }
+
+    onDragStart(ev) {
+        if (ev.dataTransfer.types.includes("Files")) {
+            this.dropzoneState.visible = true
+        }
+    }
+}
+
+export const BankRecKanbanUploadView = {
+    ...BankRecKanbanView,
+    Controller: BankRecKanbanUploadController,
+    Renderer: BankRecUploadKanbanRenderer,
+    buttonTemplate: "account.BankRecKanbanButtons",
+};
+
+registry.category("views").add('bank_rec_widget_kanban', BankRecKanbanUploadView, { force: true });
diff --git a/dev_odex30_accounting/odex30_account_bank_statement_import/static/src/bank_reconciliation/kanban.xml b/dev_odex30_accounting/odex30_account_bank_statement_import/static/src/bank_reconciliation/kanban.xml
new file mode 100644
index 0000000..9252348
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_bank_statement_import/static/src/bank_reconciliation/kanban.xml
@@ -0,0 +1,19 @@
+<templates id="template" xml:space="preserve">
+    <t t-name="account.BankRecKanbanButtons">
+        <xpath expr="//div[hasclass('o_cp_buttons')]" position="inside">
+            <t t-call="account.AccountViewUploadButton"/>
+        </xpath>
+    </t>
+
+    <t t-name="account.BankRecKanbanUploadRenderer" t-inherit="account.BankRecKanbanRenderer" t-inherit-mode="primary">
+        <xpath expr="//div[@t-ref='root']" position="before">
+            <UploadDropZone
+                visible="dropzoneState.visible"
+                hideZone="() => dropzoneState.visible = false"/>
+        </xpath>
+        <xpath expr="//div[@t-ref='root']" position="attributes">
+            <attribute name="t-on-dragenter.stop.prevent">onDragStart</attribute>
+        </xpath>
+    </t>
+
+</templates>
diff --git a/dev_odex30_accounting/odex30_account_bank_statement_import/static/src/bank_reconciliation/list.js b/dev_odex30_accounting/odex30_account_bank_statement_import/static/src/bank_reconciliation/list.js
new file mode 100644
index 0000000..8668138
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_bank_statement_import/static/src/bank_reconciliation/list.js
@@ -0,0 +1,43 @@
+/** @odoo-module */
+
+import { registry } from "@web/core/registry";
+import { ListRenderer } from "@web/views/list/list_renderer";
+import { AccountFileUploader } from "@account/components/account_file_uploader/account_file_uploader";
+import { UploadDropZone } from "@account/components/upload_drop_zone/upload_drop_zone";
+import { bankRecListView, BankRecListController } from "@odex30_account_accountant/components/bank_reconciliation/list";
+import { useState } from "@odoo/owl";
+
+export class BankRecListUploadController extends BankRecListController {
+    static components = {
+        ...BankRecListController.components,
+        AccountFileUploader,
+    }
+}
+
+export class BankRecListUploadRenderer extends ListRenderer {
+    static template = "account.BankRecListUploadRenderer";
+    static components = {
+        ...ListRenderer.components,
+        UploadDropZone,
+    }
+
+    setup() {
+        super.setup();
+        this.dropzoneState = useState({ visible: false });
+    }
+
+    onDragStart(ev) {
+        if (ev.dataTransfer.types.includes("Files")) {
+            this.dropzoneState.visible = true
+        }
+    }
+}
+
+export const bankRecListUploadView = {
+    ...bankRecListView,
+    Controller: BankRecListUploadController,
+    Renderer: BankRecListUploadRenderer,
+    buttonTemplate: "account.BankRecListUploadButtons",
+}
+
+registry.category("views").add("bank_rec_list", bankRecListUploadView, { force: true });
diff --git a/dev_odex30_accounting/odex30_account_bank_statement_import/static/src/bank_reconciliation/list.xml b/dev_odex30_accounting/odex30_account_bank_statement_import/static/src/bank_reconciliation/list.xml
new file mode 100644
index 0000000..0db8ef5
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_bank_statement_import/static/src/bank_reconciliation/list.xml
@@ -0,0 +1,19 @@
+<templates id="template" xml:space="preserve">
+    <t t-name="account.BankRecListUploadButtons" t-inherit="web.ListView.Buttons" t-inherit-mode="primary">
+        <xpath expr="//div[hasclass('o_list_buttons')]" position="inside">
+            <t t-call="account.AccountViewUploadButton"/>
+        </xpath>
+    </t>
+
+    <t t-name="account.BankRecListUploadRenderer" t-inherit="web.ListRenderer" t-inherit-mode="primary">
+        <xpath expr="//div[@t-ref='root']" position="before">
+            <UploadDropZone
+                visible="dropzoneState.visible"
+                hideZone="() => dropzoneState.visible = false"/>
+        </xpath>
+
+        <xpath expr="//div[@t-ref='root']" position="attributes">
+            <attribute name="t-on-dragenter.stop.prevent">onDragStart</attribute>
+        </xpath>
+    </t>
+</templates>
diff --git a/dev_odex30_accounting/odex30_account_bank_statement_import/views/account_bank_statement_import_view.xml b/dev_odex30_accounting/odex30_account_bank_statement_import/views/account_bank_statement_import_view.xml
new file mode 100644
index 0000000..2fb4234
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_bank_statement_import/views/account_bank_statement_import_view.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" ?>
+<odoo>
+
+    <record id="journal_dashboard_view_inherit" model="ir.ui.view">
+        <field name="name">account.journal.dashboard.kanban.inherit</field>
+        <field name="model">account.journal</field>
+        <field name="inherit_id" ref="account.account_journal_dashboard_kanban_view"/>
+        <field name="arch" type="xml">
+            <xpath expr='//div[@name="bank_customer_payment"]' position="before">
+                <div t-if="journal_type == 'bank'">
+                    <widget name="account_file_uploader" title="Import File" btnClass="file_upload_kanban_action_a mb-0"/>
+                </div>
+            </xpath>
+       </field>
+    </record>
+
+    <record id="view_bank_statement_tree" model="ir.ui.view">
+        <field name="name">account.bank.statement.list</field>
+        <field name="model">account.bank.statement</field>
+        <field name="inherit_id" ref="account.view_bank_statement_tree"/>
+        <field name="arch" type="xml">
+            <list position="attributes">
+                <attribute name="js_class">account_tree</attribute>
+            </list>
+        </field>
+    </record>
+</odoo>
diff --git a/dev_odex30_accounting/odex30_account_bank_statement_import/wizard/__init__.py b/dev_odex30_accounting/odex30_account_bank_statement_import/wizard/__init__.py
new file mode 100644
index 0000000..a7e4f0c
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_bank_statement_import/wizard/__init__.py
@@ -0,0 +1 @@
+from . import setup_wizards
diff --git a/dev_odex30_accounting/odex30_account_bank_statement_import/wizard/__pycache__/__init__.cpython-311.pyc b/dev_odex30_accounting/odex30_account_bank_statement_import/wizard/__pycache__/__init__.cpython-311.pyc
new file mode 100644
index 0000000..74fe634
Binary files /dev/null and b/dev_odex30_accounting/odex30_account_bank_statement_import/wizard/__pycache__/__init__.cpython-311.pyc differ
diff --git a/dev_odex30_accounting/odex30_account_bank_statement_import/wizard/__pycache__/setup_wizards.cpython-311.pyc b/dev_odex30_accounting/odex30_account_bank_statement_import/wizard/__pycache__/setup_wizards.cpython-311.pyc
new file mode 100644
index 0000000..f0ab6b4
Binary files /dev/null and b/dev_odex30_accounting/odex30_account_bank_statement_import/wizard/__pycache__/setup_wizards.cpython-311.pyc differ
diff --git a/dev_odex30_accounting/odex30_account_bank_statement_import/wizard/setup_wizards.py b/dev_odex30_accounting/odex30_account_bank_statement_import/wizard/setup_wizards.py
new file mode 100644
index 0000000..2a6ab18
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_bank_statement_import/wizard/setup_wizards.py
@@ -0,0 +1,16 @@
+# -*- coding: utf-8 -*-
+
+from odoo import models, fields, api
+
+
+class SetupBarBankConfigWizard(models.TransientModel):
+    _inherit = 'account.setup.bank.manual.config'
+
+    def validate(self):
+        """ Default the bank statement source of new bank journals as 'file_import'
+        """
+        res = super(SetupBarBankConfigWizard, self).validate()
+        if (self.num_journals_without_account == 0 or self.linked_journal_id.bank_statements_source == 'undefined') \
+          and self.env['account.journal']._get_bank_statements_available_import_formats():
+            self.linked_journal_id.bank_statements_source = 'file_import'
+        return res
diff --git a/dev_odex30_accounting/odex30_account_bank_statement_import_camt/__init__.py b/dev_odex30_accounting/odex30_account_bank_statement_import_camt/__init__.py
new file mode 100644
index 0000000..cde864b
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_bank_statement_import_camt/__init__.py
@@ -0,0 +1,3 @@
+# -*- coding: utf-8 -*-
+
+from . import models
diff --git a/dev_odex30_accounting/odex30_account_bank_statement_import_camt/__manifest__.py b/dev_odex30_accounting/odex30_account_bank_statement_import_camt/__manifest__.py
new file mode 100644
index 0000000..d7f5f92
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_bank_statement_import_camt/__manifest__.py
@@ -0,0 +1,16 @@
+# -*- coding: utf-8 -*-
+
+{
+    'name': 'Import CAMT Bank Statement',
+    'category': 'Odex30-Accounting/Odex30-Accounting',
+    'author': "Expert Co. Ltd.",
+    'website': "http://www.exp-sa.com",
+    'depends': ['odex30_account_bank_statement_import'],
+    'description': """
+Module to import CAMT bank statements.
+======================================
+
+Improve the import of bank statement feature to support the SEPA recommended Cash Management format (CAMT.053).
+    """,
+    'auto_install': True,
+}
diff --git a/dev_odex30_accounting/odex30_account_bank_statement_import_camt/__pycache__/__init__.cpython-311.pyc b/dev_odex30_accounting/odex30_account_bank_statement_import_camt/__pycache__/__init__.cpython-311.pyc
new file mode 100644
index 0000000..7221b97
Binary files /dev/null and b/dev_odex30_accounting/odex30_account_bank_statement_import_camt/__pycache__/__init__.cpython-311.pyc differ
diff --git a/dev_odex30_accounting/odex30_account_bank_statement_import_camt/doc/standard-camt053-statement-v2-en_1.pdf b/dev_odex30_accounting/odex30_account_bank_statement_import_camt/doc/standard-camt053-statement-v2-en_1.pdf
new file mode 100644
index 0000000..36420b4
Binary files /dev/null and b/dev_odex30_accounting/odex30_account_bank_statement_import_camt/doc/standard-camt053-statement-v2-en_1.pdf differ
diff --git a/dev_odex30_accounting/odex30_account_bank_statement_import_camt/i18n/account_bank_statement_import_camt.pot b/dev_odex30_accounting/odex30_account_bank_statement_import_camt/i18n/account_bank_statement_import_camt.pot
new file mode 100644
index 0000000..9bcaad7
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_bank_statement_import_camt/i18n/account_bank_statement_import_camt.pot
@@ -0,0 +1,1920 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# 	* odex30_account_bank_statement_import_camt
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 18.0+e\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2024-09-25 09:26+0000\n"
+"PO-Revision-Date: 2024-09-25 09:26+0000\n"
+"Last-Translator: \n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "ACH Concentration"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "ACH Corporate Trade"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "ACH Credit"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "ACH Debit"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "ACH Pre-Authorised"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "ACH Return"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "ACH Reversal"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "ACH Settlement"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "ACH Transaction"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "ARP Debit"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Account Balancing"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Account Closing"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Account Management"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Account Opening"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Account Transfer"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/models/account_journal.py:0
+msgid "Additional Info: %s"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Additional Miscellaneous Credit Operations"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Additional Miscellaneous Debit Operations"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/models/account_journal.py:0
+msgid ""
+"Address:\n"
+"%s"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Adjustments"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Automatic Transfer"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Back Value"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Bank Cheque"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Bank Fees"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Blocked Transactions"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Bonus Issue/Capitalisation Issue"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Borrowing fee"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Branch Account Transfer"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Branch Deposit"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Branch Withdrawal"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Brokerage fee"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Buy Sell Back"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "CSD Blocked Transactions"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Call on intermediate securities"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Capital Gains Distribution"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Cash Deposit"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Cash Dividend"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Cash Letter"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Cash Letter Adjustment"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Cash Management"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Cash Pooling"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Cash Withdrawal"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Cash in lieu"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Certified Customer Cheque"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Charge/fees"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Charges"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/models/account_journal.py:0
+msgid "Check Number: %s"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Cheque"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Cheque Deposit"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Cheque Reversal"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Cheque Under Reserve"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Circular Cheque"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Clean Collection"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Client Owned Collateral"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Collateral Management"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Commission"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Commission excluding taxes"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Commission including taxes"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Commodities"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Compensation/Claims"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Consumer Loans"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Controlled Disbursement"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Conversion"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Corporate Action"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Corporate Own Account Transfer"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Corporate Rebate"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Corporate mark broker owned"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Corporate mark client owned"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/models/account_journal.py:0
+msgid "Counter Party: %(partner)s"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Counter Transactions"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Credit Adjustment"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Credit Adjustments"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Credit Card Payment"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Credit Transfer with agreed Commercial Information"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Cross Trade"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Cross-Border"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Cross-Border Cash Withdrawal"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Cross-Border Credit Card Payment"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Cross-Border Credit Transfer"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Cross-Border Direct Debit"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Cross-Border Intra Company Transfer"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Cross-Border Payroll/Salary Payment"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Cross-Border Standing Order"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Crossed Cheque"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Custody"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Custody Collection"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Customer Card Transactions"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Debit"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Debit Adjustments"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Decrease in Value"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Delivery"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Deposit"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Deposit/Contribution"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Depositary Receipt Issue"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Derivatives"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Direct Debit"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Direct Debit Payment"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Direct Debit under reserve"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Discounted Draft"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Dishonoured/Unpaid Draft"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Dividend Option"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Dividend Reinvestment"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Documentary Collection"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Documentary Credit"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Domestic Credit Transfer"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Draft Maturity Change"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Drafts/BillOfOrders"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Drawdown"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Drawing"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Dutch Auction"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/models/account_journal.py:0
+msgid "End to end ID: %s"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/models/account_journal.py:0
+msgid "Entry Info: %s"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Equity Premium Reserve"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Equity mark broker owned"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Equity mark client owned"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Exchange"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Exchange Rate Adjustment"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Exchange Traded"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Exchange Traded CCP"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Exchange Traded Non-CCP"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Extended Domain"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "External Account Transfer"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Factor Update"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Fees"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Fees, Commission , Taxes, Charges and Interest"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Final Maturity"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Final Payment"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Financial Institution Credit Transfer"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Financial Institution Direct Debit Payment"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Financial Institution Own Account Transfer"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Fixed Deposit Interest Amount"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Fixed Term Deposits"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Fixed Term Loans"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Float adjustment"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Foreign Cheque"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Foreign Cheque Under Reserve"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Foreign Currency Deposit"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Foreign Currency Withdrawal"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Foreign Exchange"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Forwards"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Forwards broker owned collateral"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Forwards client owned collateral"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Freeze of funds"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Full Call / Early Redemption"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Future Variation Margin"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Futures"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Futures Commission"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Futures Residual Amount"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Guarantees"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Inspeci/Share Exchange"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/models/account_journal.py:0
+msgid "Instruction ID: %s"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Interest"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Interest Payment"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Interest Payment with Principle"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Internal Account Transfer"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Internal Book Transfer"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Intra Company Transfer"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Invoice Accepted with Differed Due Date"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Issued Cash Concentration Transactions"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Issued Cheques"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Issued Credit Transfers"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Issued Direct Debits"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Issued Real Time Credit Transfer"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#: model:ir.model,name:odex30_account_bank_statement_import_camt.model_account_journal
+msgid "Journal"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Lack"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Lending Broker Owned Cash Collateral"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Lending Client Owned Cash Collateral"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Lending income"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Liquidation Dividend / Liquidation Payment"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Listed Derivatives – Futures"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Listed Derivatives – Options"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Loans, Deposits & Syndications"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Lockbox Transactions"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Management Fees"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/models/account_journal.py:0
+msgid "Mandate ID: %s"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Margin Payments"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Margin client owned cash collateral"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Merchant Card Transactions"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Merger"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Miscellaneous Credit Operations"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Miscellaneous Debit Operations"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Miscellaneous Deposit"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Miscellaneous Securities Operations"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Mixed Deposit"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Mortgage Loans"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Netting"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid ""
+"No exchange rate was found to convert an amount into the currency of the "
+"journal"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Non Deliverable"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Non Settled"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Non Syndicated"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Non Taxable commissions"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Non-Presented Circular Cheque"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Not available"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Notice Deposits"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Notice Loans"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "OTC"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "OTC CCP"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "OTC Derivatives – Bonds"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "OTC Derivatives – Credit Derivatives"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "OTC Derivatives – Equity"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "OTC Derivatives – Interest Rates"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "OTC Derivatives – Structured Exotic Derivatives"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "OTC Derivatives – Swaps"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "OTC Non-CCP"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Odd Lot Sale/Purchase"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "One-Off Direct Debit"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Open Cheque"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Opening & Closing"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Option broker owned collateral"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Option client owned collateral"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Options"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Order Cheque"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Other"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Overdraft"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Overdraft Charge"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Pair-Off"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Partial Payment"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Partial Redemption Without Reduction of Nominal Value"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Partial Redemption with reduction of nominal value"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Payments"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Payroll/Salary Payment"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Placement"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/models/account_journal.py:0
+msgid ""
+"Please check the currency on your bank journal.\n"
+"No statements in currency %s were found in this CAMT file."
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/models/account_journal.py:0
+msgid ""
+"Please set the IBAN account on your bank journal.\n"
+"\n"
+"This CAMT file is targeting several IBAN accounts but none match the current journal."
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Point-of-Sale (POS) Payment"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Point-of-Sale (POS) Payment - Debit Card"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Portfolio Move"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Posting Error"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Pre-Authorised Direct Debit"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Precious Metal"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Principal Pay-down/pay-up"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Principal Payment"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Priority Credit Transfer"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Priority Issue"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Put Redemption"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Received Cash Concentration Transactions"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Received Cheques"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Received Credit Transfers"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Received Direct Debits"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Received Real Time Credit Transfer"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Redemption"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Redemption Asset Allocation"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Redemption Withdrawing Plan"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Reimbursements"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Renewal"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Repayment"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Repo"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Repurchase offer/Issuer Bid/Reverse Rights."
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Reset Payment"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Reversal due to Payment Cancellation Request"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Reversal due to Payment Return/reimbursement of a Credit Transfer"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Reversal due to Payment Reversal"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Reversal due to Return/Unpaid Direct Debit"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Reversal due to a Payment Cancellation Request"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Reverse Repo"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Rights Issue/Subscription Rights/Rights Offer"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "SEPA B2B Direct Debit"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "SEPA Core Direct Debit"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "SEPA Credit Transfer"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Same Day Value Credit Transfer"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Securities"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Securities Borrowing"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Securities Lending"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Sell Buy Back"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Settlement"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Settlement after collection"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Settlement against bank guarantee"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Settlement at Maturity"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Settlement of Sight Export document"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Settlement of Sight Import document"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Settlement under reserve"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Smart-Card Payment"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Spots"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Stamp duty"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Stand-By Letter Of Credit"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Standing Order"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Subscription"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Subscription Asset Allocation"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Subscription Savings Plan"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Swap Payment"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Swap broker owned collateral"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Swaps"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Sweep"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Sweeping"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Switch"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Syndicated"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Syndications"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "TBA closing"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Tax Reclaim"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Taxes"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Tender"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Topping"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Trade"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Trade Services"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Trade, Clearing and Settlement"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Transaction Fees"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/models/account_journal.py:0
+msgid "Transaction ID: %s"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Transfer In"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Transfer Out"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Travellers Cheques Deposit"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Travellers Cheques Withdrawal"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Treasury Tax And Loan Service"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Triparty Repo"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Triparty Reverse Repo"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Turnaround"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Underwriting Commission"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Unpaid Card Transaction"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Unpaid Cheque"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Unpaid Foreign Cheque"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Upfront Payment"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Value Date"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Warrant Exercise/Warrant Conversion"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Withdrawal/distribution"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Withholding Tax"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "YTD Adjustment"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Zero Balancing"
+msgstr ""
diff --git a/dev_odex30_accounting/odex30_account_bank_statement_import_camt/i18n/ar.po b/dev_odex30_accounting/odex30_account_bank_statement_import_camt/i18n/ar.po
new file mode 100644
index 0000000..05dd499
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_bank_statement_import_camt/i18n/ar.po
@@ -0,0 +1,1932 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# 	* odex30_account_bank_statement_import_camt
+# 
+# Translators:
+# Wil Odoo, 2024
+# Malaz Abuidris <msea@odoo.com>, 2025
+# 
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 18.0+e\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2024-09-25 09:26+0000\n"
+"PO-Revision-Date: 2024-09-25 09:43+0000\n"
+"Last-Translator: Malaz Abuidris <msea@odoo.com>, 2025\n"
+"Language-Team: Arabic (https://app.transifex.com/odoo/teams/41243/ar/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Language: ar\n"
+"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "ACH Concentration"
+msgstr "تركيز غرفة المقاصة الآلية (ACH) "
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "ACH Corporate Trade"
+msgstr "تجارة الشركات عن طريق غرفة المقاصة الآلية (ACH) "
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "ACH Credit"
+msgstr "رصيد غرفة المقاصة الآلية "
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "ACH Debit"
+msgstr "خصم غرفة المقاصة الآلية "
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "ACH Pre-Authorised"
+msgstr "تفويض مسبق لغرفة المقاصة الآلية (ACH)"
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "ACH Return"
+msgstr "عائد غرفة المقاصة الآلية (ACH) "
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "ACH Reversal"
+msgstr "عكس معاملة في غرفة المقاصة الآلية "
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "ACH Settlement"
+msgstr "تسوية غرفة المقاصة الآلية (ACH) "
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "ACH Transaction"
+msgstr "معاملة غرفة المقاصة الآلية (ACH) "
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "ARP Debit"
+msgstr "خصم النسبة المئوية السنوية"
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Account Balancing"
+msgstr "موازنة الحساب"
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Account Closing"
+msgstr "إغلاق الحساب"
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Account Management"
+msgstr "إدارة الحساب"
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Account Opening"
+msgstr "فتح الحساب"
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Account Transfer"
+msgstr "تحويل لحساب"
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/models/account_journal.py:0
+msgid "Additional Info: %s"
+msgstr "معلومات إضافية:%s"
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Additional Miscellaneous Credit Operations"
+msgstr "عمليات الائتمان المتنوعة الإضافية"
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Additional Miscellaneous Debit Operations"
+msgstr "عمليات الخصم المتنوعة الإضافية"
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/models/account_journal.py:0
+msgid ""
+"Address:\n"
+"%s"
+msgstr ""
+"العنوان:\n"
+"%s "
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Adjustments"
+msgstr "التعديلات"
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Automatic Transfer"
+msgstr "التحويل التلقائي"
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Back Value"
+msgstr "استحقاق سابق "
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Bank Cheque"
+msgstr "شيك بنكي "
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Bank Fees"
+msgstr "رسوم بنكية"
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Blocked Transactions"
+msgstr "المعاملات المحظورة"
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Bonus Issue/Capitalisation Issue"
+msgstr "إصدار المكافأة / قضية الرسملة"
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Borrowing fee"
+msgstr "رسوم الاقتراض"
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Branch Account Transfer"
+msgstr "تحويل الحساب إلى الفرع "
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Branch Deposit"
+msgstr "إيداع في الفرع "
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Branch Withdrawal"
+msgstr "السحب من الفرع "
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Brokerage fee"
+msgstr "رسوم سمسرة "
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Buy Sell Back"
+msgstr "إعادة الشراء/ البيع"
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "CSD Blocked Transactions"
+msgstr "المعاملات المحظورة للإيداع المركزي للأوراق المالية (CSD) "
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Call on intermediate securities"
+msgstr "استدعاء الأوراق المالية الوسيطة"
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Capital Gains Distribution"
+msgstr "توزيع أرباح رأس المال"
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Cash Deposit"
+msgstr "الإيداع النقدي "
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Cash Dividend"
+msgstr "توزيعات الأرباح المالية "
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Cash Letter"
+msgstr "خطاب نقدي"
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Cash Letter Adjustment"
+msgstr "تعديل خطاب نقدي"
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Cash Management"
+msgstr "إدارة النقد "
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Cash Pooling"
+msgstr "تجميع النقد"
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Cash Withdrawal"
+msgstr "السحب النقدي "
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Cash in lieu"
+msgstr "نقد بالمقابل "
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Certified Customer Cheque"
+msgstr "شيك عميل معتمَد "
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Charge/fees"
+msgstr "الرسوم "
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Charges"
+msgstr "الرسوم "
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/models/account_journal.py:0
+msgid "Check Number: %s"
+msgstr "رقم الشيك: %s"
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Cheque"
+msgstr "الشيك "
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Cheque Deposit"
+msgstr "إيداع الشيك "
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Cheque Reversal"
+msgstr "شيك معكوس"
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Cheque Under Reserve"
+msgstr "شيك قيد الحجز"
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Circular Cheque"
+msgstr "شيك مدوّر"
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Clean Collection"
+msgstr "مجموعة نظيفة"
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Client Owned Collateral"
+msgstr "الضمانات التي يمتلكها العميل "
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Collateral Management"
+msgstr "إدارة الضمانات "
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Commission"
+msgstr "العمولة "
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Commission excluding taxes"
+msgstr "العمولة غير الشاملة للضريبة "
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Commission including taxes"
+msgstr "العمولة الشاملة للضريبة "
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Commodities"
+msgstr "السلع "
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Compensation/Claims"
+msgstr "التعويضات/المطالبات "
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Consumer Loans"
+msgstr "قروض المستهلك "
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Controlled Disbursement"
+msgstr "الصرف الخاضع للرقابة "
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Conversion"
+msgstr "التحويل "
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Corporate Action"
+msgstr "إجراء مؤسسي "
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Corporate Own Account Transfer"
+msgstr "تحويل الحساب الخاص بالمؤسسة "
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Corporate Rebate"
+msgstr "خصم المؤسسة "
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Corporate mark broker owned"
+msgstr "علامة تجارية مملوكة للسمسار "
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Corporate mark client owned"
+msgstr "علامة تجارية مملوكة للعميل"
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/models/account_journal.py:0
+msgid "Counter Party: %(partner)s"
+msgstr "الطرف المقابل: %(partner)s"
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Counter Transactions"
+msgstr "المعاملات المقابلة "
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Credit Adjustment"
+msgstr "تسوية الائتمان "
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Credit Adjustments"
+msgstr "تسويات الائتمان "
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Credit Card Payment"
+msgstr "الدفع عن طريق بطاقة الائتمان "
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Credit Transfer with agreed Commercial Information"
+msgstr "تحويل الرصيد مع معلومات تجارية متفق عليها "
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Cross Trade"
+msgstr "التجارة العابرة "
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Cross-Border"
+msgstr "عبر الحدود "
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Cross-Border Cash Withdrawal"
+msgstr "السحب النقدي عبر الحدود "
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Cross-Border Credit Card Payment"
+msgstr "الدفع عن طريق البطاقة الائتمانية عبر الحدود "
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Cross-Border Credit Transfer"
+msgstr "تحويل الرصيد عبر الحدود "
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Cross-Border Direct Debit"
+msgstr "الخصم المباشر عبر الحدود "
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Cross-Border Intra Company Transfer"
+msgstr "التحويل ما بين الشركات عبر الحدود "
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Cross-Border Payroll/Salary Payment"
+msgstr "كشوفات المرتبات/دفع الراتب عبر الحدود "
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Cross-Border Standing Order"
+msgstr "أمر دائم عبر الحدود "
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Crossed Cheque"
+msgstr "شيك مشطوب "
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Custody"
+msgstr "عهدة "
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Custody Collection"
+msgstr "تحصيل العهدة "
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Customer Card Transactions"
+msgstr "معاملات بطاقة العميل "
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Debit"
+msgstr "المدين"
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Debit Adjustments"
+msgstr "تعديلات الخصم "
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Decrease in Value"
+msgstr "انخفاض القيمة "
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Delivery"
+msgstr "التوصيل "
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Deposit"
+msgstr "إيداع "
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Deposit/Contribution"
+msgstr "إيداع/مساهمة "
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Depositary Receipt Issue"
+msgstr "إصدار إيصال إيداع "
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Derivatives"
+msgstr "المشتقات "
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Direct Debit"
+msgstr "الخصم المباشر "
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Direct Debit Payment"
+msgstr "دفع الخصم المباشر "
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Direct Debit under reserve"
+msgstr "الخصم المباشر تحت الحجز "
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Discounted Draft"
+msgstr "مسودة الخصم "
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Dishonoured/Unpaid Draft"
+msgstr "كمبيالة مرفوضة / غير مدفوعة"
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Dividend Option"
+msgstr "خيار الأرباح "
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Dividend Reinvestment"
+msgstr "إعادة استثمار الأرباح "
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Documentary Collection"
+msgstr "المجموعة المستندية "
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Documentary Credit"
+msgstr "الاعتمادات المستندية"
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Domestic Credit Transfer"
+msgstr "تحويل الرصيد المحلي "
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Draft Maturity Change"
+msgstr "مسودة تغيير النضج"
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Drafts/BillOfOrders"
+msgstr "مسودات/فواتير الطلبات "
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Drawdown"
+msgstr "السحب"
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Drawing"
+msgstr "سحب"
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Dutch Auction"
+msgstr "Dutch Auction"
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/models/account_journal.py:0
+msgid "End to end ID: %s"
+msgstr "معرف طرف إلى طرف: %s "
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/models/account_journal.py:0
+msgid "Entry Info: %s"
+msgstr "معلومات القيد: %s "
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Equity Premium Reserve"
+msgstr "احتياطي أقساط حقوق الملكية"
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Equity mark broker owned"
+msgstr "علامة سهم مملوكة للسمسار "
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Equity mark client owned"
+msgstr "علامة سهم مملوكة للعميل "
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Exchange"
+msgstr "تبادل"
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Exchange Rate Adjustment"
+msgstr "تعديل سعر الصرف"
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Exchange Traded"
+msgstr "متداولة "
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Exchange Traded CCP"
+msgstr "CCP المؤشرات المتداولة "
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Exchange Traded Non-CCP"
+msgstr "المؤشرات المتداولة لغير CCP "
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Extended Domain"
+msgstr "نطاق موسّع"
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "External Account Transfer"
+msgstr "تحويل حساب خارجي "
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Factor Update"
+msgstr "تحديث العامل "
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Fees"
+msgstr "رسوم"
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Fees, Commission , Taxes, Charges and Interest"
+msgstr "الرسوم والعمولات والضرائب والتكاليف والفوائد "
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Final Maturity"
+msgstr "تاريخ الاستحقاق النهائي "
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Final Payment"
+msgstr "الدفع النهائي "
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Financial Institution Credit Transfer"
+msgstr "تحويل الرصيد للمنشأة المالية "
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Financial Institution Direct Debit Payment"
+msgstr "دفع الخصم المباشر للمنشأة المالية "
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Financial Institution Own Account Transfer"
+msgstr "التحويل للحساب الشخصي للمنشأة المالية "
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Fixed Deposit Interest Amount"
+msgstr "إجمالي نسبة الفائدة الثابتة من الإيداع "
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Fixed Term Deposits"
+msgstr "الإيداعات بسعر فائدة ثابت "
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Fixed Term Loans"
+msgstr "قروض بسعر فائدة ثابت "
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Float adjustment"
+msgstr "تعديل الفاصلة "
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Foreign Cheque"
+msgstr "شيك أجنبي "
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Foreign Cheque Under Reserve"
+msgstr "شيك أجنبي تحت الحجز "
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Foreign Currency Deposit"
+msgstr "إيداع العملة الأجنبية "
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Foreign Currency Withdrawal"
+msgstr "سحب العملة الأجنبية "
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Foreign Exchange"
+msgstr "تحويل العملة الأجنبية "
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Forwards"
+msgstr "العقود الآجلة "
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Forwards broker owned collateral"
+msgstr "ضمانات العقود الآجلة المملوكة للسمسار "
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Forwards client owned collateral"
+msgstr "ضمانات العقود الآجلة المملوكة للعميل "
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Freeze of funds"
+msgstr "تجميد الأموال"
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Full Call / Early Redemption"
+msgstr "الدفع قبل تاريخ الاستحقاق / التحصيل قبل تاريخ الاستحقاق "
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Future Variation Margin"
+msgstr "هامش الاختلاف المستقبلي "
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Futures"
+msgstr "العقود الآجلة"
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Futures Commission"
+msgstr "عمولة العقود الآجلة "
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Futures Residual Amount"
+msgstr "المبالغ المتبقية من العقود الآجلة "
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Guarantees"
+msgstr "ضمانات"
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Inspeci/Share Exchange"
+msgstr "Inspeci/Share Exchange"
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/models/account_journal.py:0
+msgid "Instruction ID: %s"
+msgstr "معرف التعليمات: %s"
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Interest"
+msgstr "الفائدة "
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Interest Payment"
+msgstr "دفع الفوائد "
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Interest Payment with Principle"
+msgstr "دفع الفوائد مع المبلغ المتفق عليه "
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Internal Account Transfer"
+msgstr "تحويل الحساب الداخلي "
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Internal Book Transfer"
+msgstr "تحويل داخلي من حساب إلى آخر "
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Intra Company Transfer"
+msgstr "التحويل داخل الشركة "
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Invoice Accepted with Differed Due Date"
+msgstr "تم قبول الفاتورة بتاريخ استحقاق مختلف "
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Issued Cash Concentration Transactions"
+msgstr "معاملات التركيز النقدي التي تم إصدارها "
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Issued Cheques"
+msgstr "الشيكات المصدرة "
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Issued Credit Transfers"
+msgstr "تحويلات الرصيد المصدرة "
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Issued Direct Debits"
+msgstr "الخصومات المباشرة المصدرة "
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Issued Real Time Credit Transfer"
+msgstr "عملية تحويل الرصيد في الوقت الفعلي المصدرة "
+
+#. module: odex30_account_bank_statement_import_camt
+#: model:ir.model,name:odex30_account_bank_statement_import_camt.model_account_journal
+msgid "Journal"
+msgstr "دفتر اليومية"
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Lack"
+msgstr "قلة"
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Lending Broker Owned Cash Collateral"
+msgstr "إقراض الضمانات النقدية المملوكة للسمسار "
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Lending Client Owned Cash Collateral"
+msgstr "إقراض الضمانات النقدية المملوكة للعميل "
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Lending income"
+msgstr "دخل الإقراض "
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Liquidation Dividend / Liquidation Payment"
+msgstr "توزيعات أرباح التصفية / مدفوعات التصفية "
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Listed Derivatives – Futures"
+msgstr "المشتقات المسجلة – العقود الآجلة "
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Listed Derivatives – Options"
+msgstr "المشتقات المسجلة – الخيارات "
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Loans, Deposits & Syndications"
+msgstr "القروض، الإيداعات والقروض المشتركة "
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Lockbox Transactions"
+msgstr "معاملات صندوق الأمانات "
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Management Fees"
+msgstr "رسوم إدارية "
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/models/account_journal.py:0
+msgid "Mandate ID: %s"
+msgstr "معرف التوكيل: %s "
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Margin Payments"
+msgstr "مدفوعات الهوامش "
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Margin client owned cash collateral"
+msgstr "الضمانات النقدية للهامش المملوكة للعميل "
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Merchant Card Transactions"
+msgstr "معاملات بطاقة التاجر "
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Merger"
+msgstr "اندماج "
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Miscellaneous Credit Operations"
+msgstr "العمليات الائتمانية المتنوعة "
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Miscellaneous Debit Operations"
+msgstr "عمليات الخصم المتنوعة "
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Miscellaneous Deposit"
+msgstr "إيداع متنوعات "
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Miscellaneous Securities Operations"
+msgstr "عمليات الأوراق المالية المتنوعة "
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Mixed Deposit"
+msgstr "إيداع مختلط "
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Mortgage Loans"
+msgstr "قروض التمويل العقاري "
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Netting"
+msgstr "حساب الصافي "
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid ""
+"No exchange rate was found to convert an amount into the currency of the "
+"journal"
+msgstr "لم يتم العثور على سعر صرف لتحويل مبلغ إلى عملة دفتر اليومية "
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Non Deliverable"
+msgstr "غير قابل للتوصيل "
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Non Settled"
+msgstr "غير مسوى "
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Non Syndicated"
+msgstr "غير مشتركة "
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Non Taxable commissions"
+msgstr "العمولات غير الخاضعة للضريبة "
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Non-Presented Circular Cheque"
+msgstr "شيك دائري "
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Not available"
+msgstr "غير متاح"
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Notice Deposits"
+msgstr "إيداعات الإخطار"
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Notice Loans"
+msgstr "القروض التي تتطلب إخطاراً "
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "OTC"
+msgstr "التداول خارج البورصة "
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "OTC CCP"
+msgstr "OTC CCP"
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "OTC Derivatives – Bonds"
+msgstr "مشتقات التداول خارج البورصة - الصكوك "
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "OTC Derivatives – Credit Derivatives"
+msgstr "الصكوك الاشتقاقية الخارجة عن البورصة – المشتقات الائتمانية "
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "OTC Derivatives – Equity"
+msgstr "مشتقات التداول خارج البورصة - رأس المال "
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "OTC Derivatives – Interest Rates"
+msgstr "الصكوك الاشتقاقية الخارجة عن البورصة – نسبة الفوائد "
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "OTC Derivatives – Structured Exotic Derivatives"
+msgstr "الصكوك الاشتقاقية الخارجة عن البورصة – المشتقات الغريبة المنظمة "
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "OTC Derivatives – Swaps"
+msgstr "مشتقات التداول خارج البورصة - السواب "
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "OTC Non-CCP"
+msgstr "التداول خارج البورصة للطرف المقابل غير المركزي "
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Odd Lot Sale/Purchase"
+msgstr "مجموعة بيع/شراء شاذة "
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "One-Off Direct Debit"
+msgstr "الخصم المباشر على دفعة واحدة "
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Open Cheque"
+msgstr "شيك مفتوح "
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Opening & Closing"
+msgstr "الفتح والإقفال "
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Option broker owned collateral"
+msgstr "ضمانات العقود الآجلة المملوكة لوسيط الخيارات "
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Option client owned collateral"
+msgstr "ضمانات العقود الآجلة المملوكة لعميل الخيارات "
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Options"
+msgstr "الخيارات"
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Order Cheque"
+msgstr "شيك الطلب "
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Other"
+msgstr "غير ذلك"
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Overdraft"
+msgstr "السحب الزائد "
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Overdraft Charge"
+msgstr "رسوم السحب الزائد "
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Pair-Off"
+msgstr "إقران "
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Partial Payment"
+msgstr "الدفع الجزئي "
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Partial Redemption Without Reduction of Nominal Value"
+msgstr "الاسترداد الجزئي دون تخفيض القيمة الاسمية "
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Partial Redemption with reduction of nominal value"
+msgstr "الاسترداد الجزئي مع تخفيض القيمة الاسمية "
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Payments"
+msgstr "الدفعات"
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Payroll/Salary Payment"
+msgstr "كشوف المرتبات/دفع المرتبات "
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Placement"
+msgstr "تحديد مستوى"
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/models/account_journal.py:0
+msgid ""
+"Please check the currency on your bank journal.\n"
+"No statements in currency %s were found in this CAMT file."
+msgstr ""
+"يرجى التحقق من العملة في دفتر يومية بنكك. \n"
+"لم يتم العثور على كشوفات حساب بالعملة %s في ملف CAMT هذا. "
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/models/account_journal.py:0
+msgid ""
+"Please set the IBAN account on your bank journal.\n"
+"\n"
+"This CAMT file is targeting several IBAN accounts but none match the current journal."
+msgstr ""
+"يرجى تعيين حساب IBAN في دفتر يومية بنكك. \n"
+"\n"
+"يستهدف ملف CAMT عدة حسابات IBAN ولكن لا يطابق أي منها دفتر اليومية الحالي. "
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Point-of-Sale (POS) Payment"
+msgstr "مدفوعات نقطة البيع (POS) "
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Point-of-Sale (POS) Payment - Debit Card"
+msgstr "مدفوعات نقطة البيع (POS) - بطاقة الخصم "
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Portfolio Move"
+msgstr "حركة المحفظة "
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Posting Error"
+msgstr "خطأ في الترحيل "
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Pre-Authorised Direct Debit"
+msgstr "الخصم المباشر المصرح له مسبقاً "
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Precious Metal"
+msgstr "المعادن الثمينة"
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Principal Pay-down/pay-up"
+msgstr "Principal Pay-down/pay-up"
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Principal Payment"
+msgstr "مدفوعات أصل الدين "
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Priority Credit Transfer"
+msgstr "تحويل رصيد ذو أولوية "
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Priority Issue"
+msgstr "مشكلة في الأولوية "
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Put Redemption"
+msgstr "الاستبدال "
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Received Cash Concentration Transactions"
+msgstr "معاملات التركيز النقدي التي تم استلامها "
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Received Cheques"
+msgstr "الشيكات المستلمة "
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Received Credit Transfers"
+msgstr "تحويلات الرصيد المستلمة "
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Received Direct Debits"
+msgstr "الخصم المباشر الذي تم استلامه "
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Received Real Time Credit Transfer"
+msgstr "عملية تحويل الرصيد في الوقت الفعلي التي تم استلامها "
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Redemption"
+msgstr "استبدال "
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Redemption Asset Allocation"
+msgstr "Redemption Asset Allocation"
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Redemption Withdrawing Plan"
+msgstr "Redemption Withdrawing Plan"
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Reimbursements"
+msgstr "إعادة الأموال "
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Renewal"
+msgstr "التجديد"
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Repayment"
+msgstr "إعادة الدفع "
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Repo"
+msgstr "تقرير "
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Repurchase offer/Issuer Bid/Reverse Rights."
+msgstr "عرض إعادة الشراء/عطاء المُصدِر/ الحقوق المعكوسة. "
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Reset Payment"
+msgstr "إعادة الدفع"
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Reversal due to Payment Cancellation Request"
+msgstr "العكس نظراً لطلب إلغاء الدفع "
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Reversal due to Payment Return/reimbursement of a Credit Transfer"
+msgstr "العكس بسبب إرجاع المدفوعات/تعويض الأموال لتحويل الرصيد "
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Reversal due to Payment Reversal"
+msgstr "العكس بسبب عكس الدفع "
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Reversal due to Return/Unpaid Direct Debit"
+msgstr "العكس بسبب الإرجاع/الخصم المباشر غير المدفوع "
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Reversal due to a Payment Cancellation Request"
+msgstr "العكس نظراً لطلب إلغاء الدفع "
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Reverse Repo"
+msgstr "عكس التقرير "
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Rights Issue/Subscription Rights/Rights Offer"
+msgstr "إصدار الحقوق/حقوق الاشتراك/عرض الحقوق "
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "SEPA B2B Direct Debit"
+msgstr "خصم SEPA المباشر بين الشركات "
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "SEPA Core Direct Debit"
+msgstr "خصم SEPA المباشر الأساسي "
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "SEPA Credit Transfer"
+msgstr "تحويل الرصيد من خلال SEPA "
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Same Day Value Credit Transfer"
+msgstr "تحويل الرصيد بقيمة نفس اليوم "
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Securities"
+msgstr "ضمانات"
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Securities Borrowing"
+msgstr "اقتراض الأوراق المالية "
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Securities Lending"
+msgstr "إقراض الأوراق المالية "
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Sell Buy Back"
+msgstr "بيع الشراء مجدداً "
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Settlement"
+msgstr "التسوية "
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Settlement after collection"
+msgstr "التسوية بعد التحصيل "
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Settlement against bank guarantee"
+msgstr "التسوية مقابل ضمان البنك "
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Settlement at Maturity"
+msgstr "التسوية عند الوصول لتاريخ الاستحقاق "
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Settlement of Sight Export document"
+msgstr "تسوية وثيقة التصدير فورياً "
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Settlement of Sight Import document"
+msgstr "تسوية وثيقة الاستيراد فورياً "
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Settlement under reserve"
+msgstr "التسوية تحت الحجز "
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Smart-Card Payment"
+msgstr "الدفع عن طريق البطاقة الذكية "
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Spots"
+msgstr "Spots"
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Stamp duty"
+msgstr "رسوم الطابع "
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Stand-By Letter Of Credit"
+msgstr "رسالة الاعتماد الاحتياطية "
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Standing Order"
+msgstr "أمر دائم "
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Subscription"
+msgstr "الاشتراك"
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Subscription Asset Allocation"
+msgstr "تخصيص أصول الاشتراك "
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Subscription Savings Plan"
+msgstr "خطة التوفير في الاشتراك "
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Swap Payment"
+msgstr "الدفع عن طريق Swap "
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Swap broker owned collateral"
+msgstr "ضمانات Swap المملوكة للسمسار "
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Swaps"
+msgstr "Swaps"
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Sweep"
+msgstr "مسح "
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Sweeping"
+msgstr "المسح "
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Switch"
+msgstr "تبديل "
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Syndicated"
+msgstr "قرض مشترك "
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Syndications"
+msgstr "القروض المشتركة "
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "TBA closing"
+msgstr "إغلاق TBA "
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Tax Reclaim"
+msgstr "استرداد الضريبة "
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Taxes"
+msgstr "الضرائب"
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Tender"
+msgstr "مناقصة "
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Topping"
+msgstr "Topping"
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Trade"
+msgstr "تداول "
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Trade Services"
+msgstr "الخدمات التجارية "
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Trade, Clearing and Settlement"
+msgstr "التجارة والمقاصة والتسوية"
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Transaction Fees"
+msgstr "رسوم المعاملة "
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/models/account_journal.py:0
+msgid "Transaction ID: %s"
+msgstr "معرف المعاملة: %s "
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Transfer In"
+msgstr "التحويل إلى الداخل "
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Transfer Out"
+msgstr "التحويل إلى الخارج "
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Travellers Cheques Deposit"
+msgstr "إيداع شيكات المسافرين "
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Travellers Cheques Withdrawal"
+msgstr "سحب شيكات المسافرين "
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Treasury Tax And Loan Service"
+msgstr "ضريبة الخزينة وخدمات القروض "
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Triparty Repo"
+msgstr "تقرير ثلاثي "
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Triparty Reverse Repo"
+msgstr "تقرير ثلاثي عكسي "
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Turnaround"
+msgstr "تحول "
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Underwriting Commission"
+msgstr "عمولة الاكتتاب "
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Unpaid Card Transaction"
+msgstr "معاملة البطاقة غير المدفوعة "
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Unpaid Cheque"
+msgstr "شيك غير مدفوع "
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Unpaid Foreign Cheque"
+msgstr "شيك أجنبي غير مدفوع "
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Upfront Payment"
+msgstr "دفع مقدم "
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Value Date"
+msgstr "تاريخ القيمة "
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Warrant Exercise/Warrant Conversion"
+msgstr "Warrant Exercise/Warrant Conversion"
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Withdrawal/distribution"
+msgstr "السحب/التوزيع "
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Withholding Tax"
+msgstr "ضريبة الاحتجاز "
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "YTD Adjustment"
+msgstr "تعديل العام حتى تاريخه "
+
+#. module: odex30_account_bank_statement_import_camt
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_camt/lib/camt.py:0
+msgid "Zero Balancing"
+msgstr "Zero Balancing"
diff --git a/dev_odex30_accounting/odex30_account_bank_statement_import_camt/lib/__init__.py b/dev_odex30_accounting/odex30_account_bank_statement_import_camt/lib/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/dev_odex30_accounting/odex30_account_bank_statement_import_camt/lib/__pycache__/__init__.cpython-311.pyc b/dev_odex30_accounting/odex30_account_bank_statement_import_camt/lib/__pycache__/__init__.cpython-311.pyc
new file mode 100644
index 0000000..451ebc9
Binary files /dev/null and b/dev_odex30_accounting/odex30_account_bank_statement_import_camt/lib/__pycache__/__init__.cpython-311.pyc differ
diff --git a/dev_odex30_accounting/odex30_account_bank_statement_import_camt/lib/__pycache__/camt.cpython-311.pyc b/dev_odex30_accounting/odex30_account_bank_statement_import_camt/lib/__pycache__/camt.cpython-311.pyc
new file mode 100644
index 0000000..b204f0a
Binary files /dev/null and b/dev_odex30_accounting/odex30_account_bank_statement_import_camt/lib/__pycache__/camt.cpython-311.pyc differ
diff --git a/dev_odex30_accounting/odex30_account_bank_statement_import_camt/lib/camt.py b/dev_odex30_accounting/odex30_account_bank_statement_import_camt/lib/camt.py
new file mode 100644
index 0000000..a829cd4
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_bank_statement_import_camt/lib/camt.py
@@ -0,0 +1,806 @@
+
+import math
+import re
+from functools import partial
+
+from odoo.exceptions import ValidationError
+from odoo.tools import float_compare
+
+# keep code as-is but do not translate,
+# the language is not known in this context
+_lt = lambda x: x  # noqa: E731
+
+
+# Codes from the updated document of 30 june 2017
+# pylint: disable=duplicate-key
+codes = {
+    # ExternalBankTransactionDomain1Code #######################################
+    'PMNT': _lt('Payments'),
+    'CAMT': _lt('Cash Management'),
+    'DERV': _lt('Derivatives'),
+    'LDAS': _lt('Loans, Deposits & Syndications'),
+    'FORX': _lt('Foreign Exchange'),
+    'PMET': _lt('Precious Metal'),
+    'CMDT': _lt('Commodities'),
+    'TRAD': _lt('Trade Services'),
+    'SECU': _lt('Securities'),
+    'ACMT': _lt('Account Management'),
+    'XTND': _lt('Extended Domain'),
+    # ExternalBankTransactionFamily1Code #######################################
+    'RCDT': _lt('Received Credit Transfers'),  # Payments
+    'ICDT': _lt('Issued Credit Transfers'),
+    'RCCN': _lt('Received Cash Concentration Transactions'),
+    'ICCN': _lt('Issued Cash Concentration Transactions'),
+    'RDDT': _lt('Received Direct Debits'),
+    'IDDT': _lt('Issued Direct Debits'),
+    'RCHQ': _lt('Received Cheques'),
+    'ICHQ': _lt('Issued Cheques'),
+    'CCRD': _lt('Customer Card Transactions'),
+    'MCRD': _lt('Merchant Card Transactions'),
+    'LBOX': _lt('Lockbox Transactions'),
+    'CNTR': _lt('Counter Transactions'),
+    'DRFT': _lt('Drafts/BillOfOrders'),
+    'RRCT': _lt('Received Real Time Credit Transfer'),
+    'IRCT': _lt('Issued Real Time Credit Transfer'),
+    'CAPL': _lt('Cash Pooling'),  # Cash Management
+    'ACCB': _lt('Account Balancing'),
+    'OCRD': _lt('OTC Derivatives – Credit Derivatives'),  # Derivatives
+    'OIRT': _lt('OTC Derivatives – Interest Rates'),
+    'OEQT': _lt('OTC Derivatives – Equity'),
+    'OBND': _lt('OTC Derivatives – Bonds'),
+    'OSED': _lt('OTC Derivatives – Structured Exotic Derivatives'),
+    'OSWP': _lt('OTC Derivatives – Swaps'),
+    'LFUT': _lt('Listed Derivatives – Futures'),
+    'LOPT': _lt('Listed Derivatives – Options'),
+    'FTLN': _lt('Fixed Term Loans'),  # Loans, Deposits & Syndications
+    'NTLN': _lt('Notice Loans'),
+    'FTDP': _lt('Fixed Term Deposits'),
+    'NTDP': _lt('Notice Deposits'),
+    'MGLN': _lt('Mortgage Loans'),
+    'CSLN': _lt('Consumer Loans'),
+    'SYDN': _lt('Syndications'),
+    'SPOT': _lt('Spots'),  # Foreign Exchange
+    'FWRD': _lt('Forwards'),
+    'SWAP': _lt('Swaps'),
+    'FTUR': _lt('Futures'),
+    'NDFX': _lt('Non Deliverable'),
+    'SPOT': _lt('Spots'),  # Precious Metal
+    'FTUR': _lt('Futures'),
+    'OPTN': _lt('Options'),
+    'DLVR': _lt('Delivery'),
+    'SPOT': _lt('Spots'),  # Commodities
+    'FTUR': _lt('Futures'),
+    'OPTN': _lt('Options'),
+    'DLVR': _lt('Delivery'),
+    'LOCT': _lt('Stand-By Letter Of Credit'),  # Trade Services
+    'DCCT': _lt('Documentary Credit'),
+    'CLNC': _lt('Clean Collection'),
+    'DOCC': _lt('Documentary Collection'),
+    'GUAR': _lt('Guarantees'),
+    'SETT': _lt('Trade, Clearing and Settlement'),  # Securities
+    'NSET': _lt('Non Settled'),
+    'BLOC': _lt('Blocked Transactions'),
+    'OTHB': _lt('CSD Blocked Transactions'),
+    'COLL': _lt('Collateral Management'),
+    'CORP': _lt('Corporate Action'),
+    'CUST': _lt('Custody'),
+    'COLC': _lt('Custody Collection'),
+    'LACK': _lt('Lack'),
+    'CASH': _lt('Miscellaneous Securities Operations'),
+    'OPCL': _lt('Opening & Closing'),  # Account Management
+    'ACOP': _lt('Additional Miscellaneous Credit Operations'),
+    'ADOP': _lt('Additional Miscellaneous Debit Operations'),
+    # ExternalBankTransactionSubFamily1Code ####################################
+    # Generic Sub-Families
+    'FEES': _lt('Fees'),  # Miscellaneous Credit Operations
+    'COMM': _lt('Commission'),
+    'COME': _lt('Commission excluding taxes'),
+    'COMI': _lt('Commission including taxes'),
+    'COMT': _lt('Non Taxable commissions'),
+    'TAXE': _lt('Taxes'),
+    'CHRG': _lt('Charges'),
+    'INTR': _lt('Interest'),
+    'RIMB': _lt('Reimbursements'),
+    'ADJT': _lt('Adjustments'),
+    'FEES': _lt('Fees'),  # Miscellaneous Debit Operations
+    'COMM': _lt('Commission'),
+    'COME': _lt('Commission excluding taxes'),
+    'COMI': _lt('Commission including taxes'),
+    'COMT': _lt('Non Taxable commissions'),
+    'TAXE': _lt('Taxes'),
+    'CHRG': _lt('Charges'),
+    'INTR': _lt('Interest'),
+    'RIMB': _lt('Reimbursements'),
+    'ADJT': _lt('Adjustments'),
+    'IADD': _lt('Invoice Accepted with Differed Due Date'),
+    'FEES': _lt('Fees'),  # Generic Sub-Families
+    'COMM': _lt('Commission'),
+    'COME': _lt('Commission excluding taxes'),
+    'COMI': _lt('Commission including taxes'),
+    'COMT': _lt('Non Taxable commissions'),
+    'TAXE': _lt('Taxes'),
+    'CHRG': _lt('Charges'),
+    'INTR': _lt('Interest'),
+    'RIMB': _lt('Reimbursements'),
+    'DAJT': _lt('Credit Adjustments'),
+    'CAJT': _lt('Debit Adjustments'),
+    # Payments Sub-Families
+    'BOOK': _lt('Internal Book Transfer'),  # Received Credit Transfer
+    'STDO': _lt('Standing Order'),
+    'XBST': _lt('Cross-Border Standing Order'),
+    'ESCT': _lt('SEPA Credit Transfer'),
+    'DMCT': _lt('Domestic Credit Transfer'),
+    'XBCT': _lt('Cross-Border Credit Transfer'),
+    'VCOM': _lt('Credit Transfer with agreed Commercial Information'),
+    'FICT': _lt('Financial Institution Credit Transfer'),
+    'PRCT': _lt('Priority Credit Transfer'),
+    'SALA': _lt('Payroll/Salary Payment'),
+    'XBSA': _lt('Cross-Border Payroll/Salary Payment'),
+    'SDVA': _lt('Same Day Value Credit Transfer'),
+    'RPCR': _lt('Reversal due to Payment Cancellation Request'),
+    'RRTN': _lt('Reversal due to Payment Return/reimbursement of a Credit Transfer'),
+    'AUTT': _lt('Automatic Transfer'),
+    'ATXN': _lt('ACH Transaction'),
+    'ACOR': _lt('ACH Corporate Trade'),
+    'APAC': _lt('ACH Pre-Authorised'),
+    'ASET': _lt('ACH Settlement'),
+    'ARET': _lt('ACH Return'),
+    'AREV': _lt('ACH Reversal'),
+    'ACDT': _lt('ACH Credit'),
+    'ADBT': _lt('ACH Debit'),
+    'TTLS': _lt('Treasury Tax And Loan Service'),
+    'BOOK': _lt('Internal Book Transfer'),  # Issued Credit Transfer
+    'STDO': _lt('Standing Order'),
+    'XBST': _lt('Cross-Border Standing Order'),
+    'ESCT': _lt('SEPA Credit Transfer'),
+    'DMCT': _lt('Domestic Credit Transfer'),
+    'XBCT': _lt('Cross-Border Credit Transfer'),
+    'FICT': _lt('Financial Institution Credit Transfer'),
+    'PRCT': _lt('Priority Credit Transfer'),
+    'VCOM': _lt('Credit Transfer with agreed Commercial Information'),
+    'SALA': _lt('Payroll/Salary Payment'),
+    'XBSA': _lt('Cross-Border Payroll/Salary Payment'),
+    'RPCR': _lt('Reversal due to Payment Cancellation Request'),
+    'RRTN': _lt('Reversal due to Payment Return/reimbursement of a Credit Transfer'),
+    'SDVA': _lt('Same Day Value Credit Transfer'),
+    'AUTT': _lt('Automatic Transfer'),
+    'ATXN': _lt('ACH Transaction'),
+    'ACOR': _lt('ACH Corporate Trade'),
+    'APAC': _lt('ACH Pre-Authorised'),
+    'ASET': _lt('ACH Settlement'),
+    'ARET': _lt('ACH Return'),
+    'AREV': _lt('ACH Reversal'),
+    'ACDT': _lt('ACH Credit'),
+    'ADBT': _lt('ACH Debit'),
+    'TTLS': _lt('Treasury Tax And Loan Service'),
+    'COAT': _lt('Corporate Own Account Transfer'),  # Received Cash Concentration
+    'ICCT': _lt('Intra Company Transfer'),
+    'XICT': _lt('Cross-Border Intra Company Transfer'),
+    'FIOA': _lt('Financial Institution Own Account Transfer'),
+    'BACT': _lt('Branch Account Transfer'),
+    'ACON': _lt('ACH Concentration'),
+    'COAT': _lt('Corporate Own Account Transfer'),  # Issued Cash Concentration
+    'ICCT': _lt('Intra Company Transfer'),
+    'XICT': _lt('Cross-Border Intra Company Transfer'),
+    'FIOA': _lt('Financial Institution Own Account Transfer'),
+    'BACT': _lt('Branch Account Transfer'),
+    'ACON': _lt('ACH Concentration'),
+    'PMDD': _lt('Direct Debit'),  # Received Direct Debit
+    'URDD': _lt('Direct Debit under reserve'),
+    'ESDD': _lt('SEPA Core Direct Debit'),
+    'BBDD': _lt('SEPA B2B Direct Debit'),
+    'XBDD': _lt('Cross-Border Direct Debit'),
+    'OODD': _lt('One-Off Direct Debit'),
+    'PADD': _lt('Pre-Authorised Direct Debit'),
+    'FIDD': _lt('Financial Institution Direct Debit Payment'),
+    'RCDD': _lt('Reversal due to a Payment Cancellation Request'),
+    'UPDD': _lt('Reversal due to Return/Unpaid Direct Debit'),
+    'PRDD': _lt('Reversal due to Payment Reversal'),
+    'PMDD': _lt('Direct Debit Payment'),  # Issued Direct Debit
+    'URDD': _lt('Direct Debit under reserve'),
+    'ESDD': _lt('SEPA Core Direct Debit'),
+    'BBDD': _lt('SEPA B2B Direct Debit'),
+    'OODD': _lt('One-Off Direct Debit'),
+    'XBDD': _lt('Cross-Border Direct Debit'),
+    'PADD': _lt('Pre-Authorised Direct Debit'),
+    'FIDD': _lt('Financial Institution Direct Debit Payment'),
+    'RCDD': _lt('Reversal due to a Payment Cancellation Request'),
+    'UPDD': _lt('Reversal due to Return/Unpaid Direct Debit'),
+    'PRDD': _lt('Reversal due to Payment Reversal'),
+    'CCHQ': _lt('Cheque'),  # Received Cheque
+    'URCQ': _lt('Cheque Under Reserve'),
+    'UPCQ': _lt('Unpaid Cheque'),
+    'CQRV': _lt('Cheque Reversal'),
+    'CCCH': _lt('Certified Customer Cheque'),
+    'CLCQ': _lt('Circular Cheque'),
+    'NPCC': _lt('Non-Presented Circular Cheque'),
+    'CRCQ': _lt('Crossed Cheque'),
+    'ORCQ': _lt('Order Cheque'),
+    'OPCQ': _lt('Open Cheque'),
+    'BCHQ': _lt('Bank Cheque'),
+    'XBCQ': _lt('Foreign Cheque'),
+    'XRCQ': _lt('Foreign Cheque Under Reserve'),
+    'XPCQ': _lt('Unpaid Foreign Cheque'),
+    'CDIS': _lt('Controlled Disbursement'),
+    'ARPD': _lt('ARP Debit'),
+    'CASH': _lt('Cash Letter'),
+    'CSHA': _lt('Cash Letter Adjustment'),
+    'CCHQ': _lt('Cheque'),  # Issued Cheque
+    'URCQ': _lt('Cheque Under Reserve'),
+    'UPCQ': _lt('Unpaid Cheque'),
+    'CQRV': _lt('Cheque Reversal'),
+    'CCCH': _lt('Certified Customer Cheque'),
+    'CLCQ': _lt('Circular Cheque'),
+    'NPCC': _lt('Non-Presented Circular Cheque'),
+    'CRCQ': _lt('Crossed Cheque'),
+    'ORCQ': _lt('Order Cheque'),
+    'OPCQ': _lt('Open Cheque'),
+    'BCHQ': _lt('Bank Cheque'),
+    'XBCQ': _lt('Foreign Cheque'),
+    'XRCQ': _lt('Foreign Cheque Under Reserve'),
+    'XPCQ': _lt('Unpaid Foreign Cheque'),
+    'CDIS': _lt('Controlled Disbursement'),
+    'ARPD': _lt('ARP Debit'),
+    'CASH': _lt('Cash Letter'),
+    'CSHA': _lt('Cash Letter Adjustment'),
+    'CWDL': _lt('Cash Withdrawal'),  # Customer Card Transaction
+    'CDPT': _lt('Cash Deposit'),
+    'XBCW': _lt('Cross-Border Cash Withdrawal'),
+    'POSD': _lt('Point-of-Sale (POS) Payment - Debit Card'),
+    'POSC': _lt('Credit Card Payment'),
+    'XBCP': _lt('Cross-Border Credit Card Payment'),
+    'SMRT': _lt('Smart-Card Payment'),
+    'POSP': _lt('Point-of-Sale (POS) Payment'),  # Merchant Card Transaction
+    'POSC': _lt('Credit Card Payment'),
+    'SMCD': _lt('Smart-Card Payment'),
+    'UPCT': _lt('Unpaid Card Transaction'),
+    'CDPT': _lt('Cash Deposit'),  # Counter Transaction
+    'CWDL': _lt('Cash Withdrawal'),
+    'BCDP': _lt('Branch Deposit'),
+    'BCWD': _lt('Branch Withdrawal'),
+    'CHKD': _lt('Cheque Deposit'),
+    'MIXD': _lt('Mixed Deposit'),
+    'MSCD': _lt('Miscellaneous Deposit'),
+    'FCDP': _lt('Foreign Currency Deposit'),
+    'FCWD': _lt('Foreign Currency Withdrawal'),
+    'TCDP': _lt('Travellers Cheques Deposit'),
+    'TCWD': _lt('Travellers Cheques Withdrawal'),
+    'LBCA': _lt('Credit Adjustment'),  # Lockbox
+    'LBDB': _lt('Debit'),
+    'LBDP': _lt('Deposit'),
+    'STAM': _lt('Settlement at Maturity'),  # Drafts / Bill to Order
+    'STLR': _lt('Settlement under reserve'),
+    'DDFT': _lt('Discounted Draft'),
+    'UDFT': _lt('Dishonoured/Unpaid Draft'),
+    'DMCG': _lt('Draft Maturity Change'),
+    'BOOK': _lt('Internal Book Transfer'),  # Received Real-Time Credit Transfer
+    'STDO': _lt('Standing Order'),
+    'XBST': _lt('Cross-Border Standing Order'),
+    'ESCT': _lt('SEPA Credit Transfer'),
+    'DMCT': _lt('Domestic Credit Transfer'),
+    'XBCT': _lt('Cross-Border Credit Transfer'),
+    'VCOM': _lt('Credit Transfer with agreed Commercial Information'),
+    'FICT': _lt('Financial Institution Credit Transfer'),
+    'PRCT': _lt('Priority Credit Transfer'),
+    'SALA': _lt('Payroll/Salary Payment'),
+    'XBSA': _lt('Cross-Border Payroll/Salary Payment'),
+    'SDVA': _lt('Same Day Value Credit Transfer'),
+    'RPCR': _lt('Reversal due to Payment Cancellation Request'),
+    'RRTN': _lt('Reversal due to Payment Return/reimbursement of a Credit Transfer'),
+    'AUTT': _lt('Automatic Transfer'),
+    'ATXN': _lt('ACH Transaction'),
+    'ACOR': _lt('ACH Corporate Trade'),
+    'APAC': _lt('ACH Pre-Authorised'),
+    'ASET': _lt('ACH Settlement'),
+    'ARET': _lt('ACH Return'),
+    'AREV': _lt('ACH Reversal'),
+    'ACDT': _lt('ACH Credit'),
+    'ADBT': _lt('ACH Debit'),
+    'TTLS': _lt('Treasury Tax And Loan Service'),
+    'BOOK': _lt('Internal Book Transfer'),  # Issued Real-Time Credit Transfer
+    'STDO': _lt('Standing Order'),
+    'XBST': _lt('Cross-Border Standing Order'),
+    'ESCT': _lt('SEPA Credit Transfer'),
+    'DMCT': _lt('Domestic Credit Transfer'),
+    'XBCT': _lt('Cross-Border Credit Transfer'),
+    'FICT': _lt('Financial Institution Credit Transfer'),
+    'PRCT': _lt('Priority Credit Transfer'),
+    'VCOM': _lt('Credit Transfer with agreed Commercial Information'),
+    'SALA': _lt('Payroll/Salary Payment'),
+    'XBSA': _lt('Cross-Border Payroll/Salary Payment'),
+    'RPCR': _lt('Reversal due to Payment Cancellation Request'),
+    'RRTN': _lt('Reversal due to Payment Return/reimbursement of a Credit Transfer'),
+    'SDVA': _lt('Same Day Value Credit Transfer'),
+    'AUTT': _lt('Automatic Transfer'),
+    'ATXN': _lt('ACH Transaction'),
+    'ACOR': _lt('ACH Corporate Trade'),
+    'APAC': _lt('ACH Pre-Authorised'),
+    'ASET': _lt('ACH Settlement'),
+    'ARET': _lt('ACH Return'),
+    'AREV': _lt('ACH Reversal'),
+    'ACDT': _lt('ACH Credit'),
+    'ADBT': _lt('ACH Debit'),
+    'TTLS': _lt('Treasury Tax And Loan Service'),
+    # Cash Management Sub-Families
+    'XBRD': _lt('Cross-Border'),  # Cash Pooling
+    'ZABA': _lt('Zero Balancing'),  # Account Balancing
+    'SWEP': _lt('Sweeping'),
+    'TOPG': _lt('Topping'),
+    'DSBR': _lt('Controlled Disbursement'),
+    'ODFT': _lt('Overdraft'),
+    'XBRD': _lt('Cross-Border'),
+    # Derivatives Sub-Families
+    'SWUF': _lt('Upfront Payment'),
+    'SWRS': _lt('Reset Payment'),
+    'SWPP': _lt('Partial Payment'),
+    'SWFP': _lt('Final Payment'),
+    'SWCC': _lt('Client Owned Collateral'),
+    # Loans, Deposits & Syndications Sub-Families
+    'DDWN': _lt('Drawdown'),
+    'RNEW': _lt('Renewal'),
+    'PPAY': _lt('Principal Payment'),
+    'DPST': _lt('Deposit'),
+    'RPMT': _lt('Repayment'),
+    # Trade Services Sub-Families
+    'FRZF': _lt('Freeze of funds'),
+    'SOSI': _lt('Settlement of Sight Import document'),
+    'SOSE': _lt('Settlement of Sight Export document'),
+    'SABG': _lt('Settlement against bank guarantee'),
+    'STLR': _lt('Settlement under reserve'),
+    'STLR': _lt('Settlement under reserve'),
+    'STAC': _lt('Settlement after collection'),
+    'STLM': _lt('Settlement'),
+    # Securities Sub-Families
+    'PAIR': _lt('Pair-Off'),  # Trade, Clearing and Settlement & Non Settled
+    'TRAD': _lt('Trade'),
+    'NETT': _lt('Netting'),
+    'TRPO': _lt('Triparty Repo'),
+    'TRVO': _lt('Triparty Reverse Repo'),
+    'RVPO': _lt('Reverse Repo'),
+    'REPU': _lt('Repo'),
+    'SECB': _lt('Securities Borrowing'),
+    'SECL': _lt('Securities Lending'),
+    'BSBO': _lt('Buy Sell Back'),
+    'BSBC': _lt('Sell Buy Back'),
+    'FCTA': _lt('Factor Update'),
+    'ISSU': _lt('Depositary Receipt Issue'),
+    'INSP': _lt('Inspeci/Share Exchange'),
+    'OWNE': _lt('External Account Transfer'),
+    'OWNI': _lt('Internal Account Transfer'),
+    'NSYN': _lt('Non Syndicated'),
+    'PLAC': _lt('Placement'),
+    'PORT': _lt('Portfolio Move'),
+    'SYND': _lt('Syndicated'),
+    'TBAC': _lt('TBA closing'),
+    'TURN': _lt('Turnaround'),
+    'REDM': _lt('Redemption'),
+    'SUBS': _lt('Subscription'),
+    'CROS': _lt('Cross Trade'),
+    'SWIC': _lt('Switch'),
+    'REAA': _lt('Redemption Asset Allocation'),
+    'SUAA': _lt('Subscription Asset Allocation'),
+    'PRUD': _lt('Principal Pay-down/pay-up'),
+    'TOUT': _lt('Transfer Out'),
+    'TRIN': _lt('Transfer In'),
+    'XCHC': _lt('Exchange Traded CCP'),
+    'XCHG': _lt('Exchange Traded'),
+    'XCHN': _lt('Exchange Traded Non-CCP'),
+    'OTCC': _lt('OTC CCP'),
+    'OTCG': _lt('OTC'),
+    'OTCN': _lt('OTC Non-CCP'),
+    'XCHC': _lt('Exchange Traded CCP'),  # Blocked Transactions & CSD Blocked Transactions
+    'XCHG': _lt('Exchange Traded'),
+    'XCHN': _lt('Exchange Traded Non-CCP'),
+    'OTCC': _lt('OTC CCP'),
+    'OTCG': _lt('OTC'),
+    'OTCN': _lt('OTC Non-CCP'),
+    'MARG': _lt('Margin Payments'),  # Collateral Management
+    'TRPO': _lt('Triparty Repo'),
+    'REPU': _lt('Repo'),
+    'SECB': _lt('Securities Borrowing'),
+    'SECL': _lt('Securities Lending'),
+    'OPBC': _lt('Option broker owned collateral'),
+    'OPCC': _lt('Option client owned collateral'),
+    'FWBC': _lt('Forwards broker owned collateral'),
+    'FWCC': _lt('Forwards client owned collateral'),
+    'MGCC': _lt('Margin client owned cash collateral'),
+    'SWBC': _lt('Swap broker owned collateral'),
+    'EQCO': _lt('Equity mark client owned'),
+    'EQBO': _lt('Equity mark broker owned'),
+    'CMCO': _lt('Corporate mark client owned'),
+    'CMBO': _lt('Corporate mark broker owned'),
+    'SLBC': _lt('Lending Broker Owned Cash Collateral'),
+    'SLCC': _lt('Lending Client Owned Cash Collateral'),
+    'CPRB': _lt('Corporate Rebate'),
+    'BIDS': _lt('Repurchase offer/Issuer Bid/Reverse Rights.'),  # Corporate Action & Custody
+    'BONU': _lt('Bonus Issue/Capitalisation Issue'),
+    'BPUT': _lt('Put Redemption'),
+    'CAPG': _lt('Capital Gains Distribution'),
+    'CONV': _lt('Conversion'),
+    'DECR': _lt('Decrease in Value'),
+    'DRAW': _lt('Drawing'),
+    'DRIP': _lt('Dividend Reinvestment'),
+    'DTCH': _lt('Dutch Auction'),
+    'DVCA': _lt('Cash Dividend'),
+    'DVOP': _lt('Dividend Option'),
+    'EXOF': _lt('Exchange'),
+    'EXRI': _lt('Call on intermediate securities'),
+    'EXWA': _lt('Warrant Exercise/Warrant Conversion'),
+    'INTR': _lt('Interest Payment'),
+    'LIQU': _lt('Liquidation Dividend / Liquidation Payment'),
+    'MCAL': _lt('Full Call / Early Redemption'),
+    'MRGR': _lt('Merger'),
+    'ODLT': _lt('Odd Lot Sale/Purchase'),
+    'PCAL': _lt('Partial Redemption with reduction of nominal value'),
+    'PRED': _lt('Partial Redemption Without Reduction of Nominal Value'),
+    'PRII': _lt('Interest Payment with Principle'),
+    'PRIO': _lt('Priority Issue'),
+    'REDM': _lt('Final Maturity'),
+    'RHTS': _lt('Rights Issue/Subscription Rights/Rights Offer'),
+    'SHPR': _lt('Equity Premium Reserve'),
+    'TEND': _lt('Tender'),
+    'TREC': _lt('Tax Reclaim'),
+    'RWPL': _lt('Redemption Withdrawing Plan'),
+    'SSPL': _lt('Subscription Savings Plan'),
+    'CSLI': _lt('Cash in lieu'),
+    'CHAR': _lt('Charge/fees'),  # Miscellaneous Securities Operations
+    'BKFE': _lt('Bank Fees'),
+    'CLAI': _lt('Compensation/Claims'),
+    'MNFE': _lt('Management Fees'),
+    'OVCH': _lt('Overdraft Charge'),
+    'TRFE': _lt('Transaction Fees'),
+    'UNCO': _lt('Underwriting Commission'),
+    'STAM': _lt('Stamp duty'),
+    'WITH': _lt('Withholding Tax'),
+    'BROK': _lt('Brokerage fee'),
+    'PRIN': _lt('Interest Payment with Principle'),
+    'TREC': _lt('Tax Reclaim'),
+    'GEN1': _lt('Withdrawal/distribution'),
+    'GEN2': _lt('Deposit/Contribution'),
+    'ERWI': _lt('Borrowing fee'),
+    'ERWA': _lt('Lending income'),
+    'SWEP': _lt('Sweep'),
+    'SWAP': _lt('Swap Payment'),
+    'FUTU': _lt('Future Variation Margin'),
+    'RESI': _lt('Futures Residual Amount'),
+    'FUCO': _lt('Futures Commission'),
+    'INFD': _lt('Fixed Deposit Interest Amount'),
+    # Account Management Sub-Families
+    'ACCO': _lt('Account Opening'),
+    'ACCC': _lt('Account Closing'),
+    'ACCT': _lt('Account Transfer'),
+    'VALD': _lt('Value Date'),
+    'BCKV': _lt('Back Value'),
+    'YTDA': _lt('YTD Adjustment'),
+    'FLTA': _lt('Float adjustment'),
+    'ERTA': _lt('Exchange Rate Adjustment'),
+    'PSTE': _lt('Posting Error'),
+    # General
+    'NTAV': _lt('Not available'),
+    'OTHR': _lt('Other'),
+    'MCOP': _lt('Miscellaneous Credit Operations'),
+    'MDOP': _lt('Miscellaneous Debit Operations'),
+    'FCTI': _lt('Fees, Commission , Taxes, Charges and Interest'),
+}
+
+
+def _generic_get(*nodes, xpath, namespaces, placeholder=None):
+    if placeholder is not None:
+        xpath = xpath.format(placeholder=placeholder)
+    for node in nodes:
+        item = node.xpath(xpath, namespaces=namespaces)
+        if item:
+            return item[0]
+    return False
+
+class CAMT:
+    # These are pair of getters: (getter for the amount, getter for the amount's currency)
+    _amount_getters = [
+        (partial(_generic_get, xpath='ns:AmtDtls/ns:TxAmt/ns:Amt/text()'), partial(_generic_get, xpath='ns:AmtDtls/ns:TxAmt/ns:Amt/@Ccy')),
+        (partial(_generic_get, xpath='ns:AmtDtls/ns:CntrValAmt/ns:Amt/text()'), partial(_generic_get, xpath='ns:AmtDtls/ns:CntrValAmt/ns:Amt/@Ccy')),
+        (partial(_generic_get, xpath='ns:AmtDtls/ns:InstdAmt/ns:Amt/text()'), partial(_generic_get, xpath='ns:AmtDtls/ns:InstdAmt/ns:Amt/@Ccy')),
+        (partial(_generic_get, xpath='ns:Amt/text()'), partial(_generic_get, xpath='ns:Amt/@Ccy')),
+    ]
+
+    _charges_getters = [
+        (partial(_generic_get, xpath='ns:Chrgs/ns:Rcrd/ns:Amt/text()'), partial(_generic_get, xpath='ns:Chrgs/ns:Rcrd/ns:Amt/@Ccy')),
+        (partial(_generic_get, xpath='ns:Chrgs/ns:Amt/text()'), partial(_generic_get, xpath='ns:Chrgs/ns:Amt/@Ccy')),
+    ]
+
+    _amount_charges_getters = [
+        (partial(_generic_get, xpath='ns:Amt/text()'), partial(_generic_get, xpath='ns:Amt/@Ccy')),
+    ]
+
+    # These are pair of getters: (getter for the exchange rate, getter for the target currency)
+    _target_rate_getters = [
+        (partial(_generic_get, xpath='ns:AmtDtls/ns:CntrValAmt/ns:CcyXchg/ns:XchgRate/text()'), partial(_generic_get, xpath='ns:AmtDtls/ns:CntrValAmt/ns:CcyXchg/ns:TrgtCcy/text()')),
+        (partial(_generic_get, xpath='ns:AmtDtls/ns:CntrValAmt/ns:CcyXchg/ns:XchgRate/text()'), partial(_generic_get, xpath='ns:AmtDtls/ns:CntrValAmt/ns:CcyXchg/ns:SrcCcy/text()')),
+    ]
+
+    # These are pair of getters: (getter for the exchange rate, getter for the source currency)
+    _source_rate_getters = [
+        (partial(_generic_get, xpath='ns:AmtDtls/ns:TxAmt/ns:CcyXchg/ns:XchgRate/text()'), partial(_generic_get, xpath='ns:AmtDtls/ns:TxAmt/ns:CcyXchg/ns:SrcCcy/text()')),
+        (partial(_generic_get, xpath='ns:AmtDtls/ns:InstdAmt/ns:CcyXchg/ns:XchgRate/text()'), partial(_generic_get, xpath='ns:AmtDtls/ns:InstdAmt/ns:CcyXchg/ns:SrcCcy/text()')),
+        (partial(_generic_get, xpath='ns:AmtDtls/ns:TxAmt/ns:CcyXchg/ns:XchgRate/text()'), partial(_generic_get, xpath='ns:AmtDtls/ns:TxAmt/ns:CcyXchg/ns:TrgtCcy/text()')),
+        (partial(_generic_get, xpath='ns:AmtDtls/ns:InstdAmt/ns:CcyXchg/ns:XchgRate/text()'), partial(_generic_get, xpath='ns:AmtDtls/ns:InstdAmt/ns:CcyXchg/ns:TrgtCcy/text()')),
+    ]
+
+    # These are pair of getters: (getter for the amount, getter for the amount's currency)
+    _currency_amount_getters = [
+        (partial(_generic_get, xpath='ns:AmtDtls/ns:InstdAmt/ns:Amt/text()'), partial(_generic_get, xpath='ns:AmtDtls/ns:InstdAmt/ns:Amt/@Ccy')),
+        (partial(_generic_get, xpath='ns:NtryDtls/ns:TxDtls/ns:AmtDtls/ns:InstdAmt/ns:Amt/text()'), partial(_generic_get, xpath='ns:NtryDtls/ns:TxDtls/ns:AmtDtls/ns:InstdAmt/ns:Amt/@Ccy')),
+        (partial(_generic_get, xpath='ns:AmtDtls/ns:TxAmt/ns:Amt/text()'), partial(_generic_get, xpath='ns:AmtDtls/ns:TxAmt/ns:Amt/@Ccy')),
+        (partial(_generic_get, xpath='ns:NtryDtls/ns:TxDtls/ns:AmtDtls/ns:TxAmt/ns:Amt/text()'), partial(_generic_get, xpath='ns:NtryDtls/ns:TxDtls/ns:AmtDtls/ns:TxAmt/ns:Amt/@Ccy')),
+        (partial(_generic_get, xpath='ns:Amt/text()'), partial(_generic_get, xpath='ns:Amt/@Ccy')),
+    ]
+    _total_amount_getters = [
+        (partial(_generic_get, xpath='ns:NtryDtls/ns:Btch/ns:TtlAmt/text()'), partial(_generic_get, xpath='ns:NtryDtls/ns:Btch/ns:TtlAmt/@Ccy'))
+    ]
+
+    # Start Balance
+    #   OPBD : Opening Booked
+    #   PRCD : Previous Closing Balance
+    #   OPAV : Opening Available
+    #   ITBD : Interim Booked (in the case of preceeding pagination)
+    # These are pair of getters: (getter for the amount, getter for the sign)
+    _start_balance_getters = [
+        (partial(_generic_get, xpath="ns:Bal/ns:Tp/ns:CdOrPrtry[ns:Cd='OPBD']/../../ns:Amt/text()"),
+        partial(_generic_get, xpath="ns:Bal/ns:Tp/ns:CdOrPrtry[ns:Cd='OPBD']/../../ns:CdtDbtInd/text()")),
+        (partial(_generic_get, xpath="ns:Bal/ns:Tp/ns:CdOrPrtry[ns:Cd='PRCD']/../../ns:Amt/text()"),
+        partial(_generic_get, xpath="ns:Bal/ns:Tp/ns:CdOrPrtry[ns:Cd='PRCD']/../../ns:CdtDbtInd/text()")),
+        (partial(_generic_get, xpath="ns:Bal/ns:Tp/ns:CdOrPrtry[ns:Cd='OPAV']/../../ns:Amt/text()"),
+        partial(_generic_get, xpath="ns:Bal/ns:Tp/ns:CdOrPrtry[ns:Cd='OPAV']/../../ns:CdtDbtInd/text()")),
+        (partial(_generic_get, xpath="ns:Bal/ns:Tp/ns:CdOrPrtry[ns:Cd='ITBD']/../../ns:Amt/text()"),
+        partial(_generic_get, xpath="ns:Bal/ns:Tp/ns:CdOrPrtry[ns:Cd='ITBD']/../../ns:CdtDbtInd/text()")),
+    ]
+
+    # Ending Balance
+    #   CLBD : Closing Booked
+    #   CLAV : Closing Available
+    #   ITBD : Interim Booked
+    # These are pair of getters: (getter for the amount, getter for the sign)
+    _end_balance_getters = [
+        (partial(_generic_get, xpath="ns:Bal/ns:Tp/ns:CdOrPrtry[ns:Cd='CLBD']/../../ns:Amt/text()"),
+        partial(_generic_get, xpath="ns:Bal/ns:Tp/ns:CdOrPrtry[ns:Cd='CLBD']/../../ns:CdtDbtInd/text()")),
+        (partial(_generic_get, xpath="ns:Bal/ns:Tp/ns:CdOrPrtry[ns:Cd='CLAV']/../../ns:Amt/text()"),
+        partial(_generic_get, xpath="ns:Bal/ns:Tp/ns:CdOrPrtry[ns:Cd='CLAV']/../../ns:CdtDbtInd/text()")),
+        (partial(_generic_get, xpath="ns:Bal/ns:Tp/ns:CdOrPrtry[ns:Cd='ITBD']/../../ns:Amt/text()"),
+        partial(_generic_get, xpath="ns:Bal/ns:Tp/ns:CdOrPrtry[ns:Cd='ITBD']/../../ns:CdtDbtInd/text()")),
+    ]
+
+    _get_credit_debit_indicator = partial(_generic_get,
+        xpath='ns:CdtDbtInd/text()')
+
+    _get_charges_credit_debit_indicator = partial(_generic_get,
+        xpath='ns:Chrgs/ns:Rcrd/ns:CdtDbtInd/text()')
+
+    _get_transaction_date = partial(_generic_get,
+        xpath=('ns:ValDt/ns:Dt/text()'
+            '| ns:BookgDt/ns:Dt/text()'
+            '| ns:BookgDt/ns:DtTm/text()'))
+
+    _get_statement_date = partial(_generic_get,
+        xpath=("ns:Bal/ns:Tp/ns:CdOrPrtry[ns:Cd='CLBD']/../../ns:Dt/ns:Dt/text()"
+            " | ns:Bal/ns:Tp/ns:CdOrPrtry[ns:Cd='CLBD']/../../ns:Dt/ns:DtTm/text()"
+            " | ns:Bal/ns:Tp/ns:CdOrPrtry[ns:Cd='CLAV']/../../ns:Dt/ns:Dt/text()"
+            " | ns:Bal/ns:Tp/ns:CdOrPrtry[ns:Cd='CLAV']/../../ns:Dt/ns:DtTm/text()"
+            " | ns:Bal/ns:Tp/ns:CdOrPrtry[ns:Cd='ITBD']/../../ns:Dt/ns:Dt/text()"
+            " | ns:Bal/ns:Tp/ns:CdOrPrtry[ns:Cd='ITBD']/../../ns:Dt/ns:DtTm/text()"
+            ))
+
+    _get_partner_name = partial(_generic_get,
+        xpath=('.//ns:RltdPties/ns:Ultmt{placeholder}/ns:Nm/text()'
+            ' | .//ns:RltdPties/ns:Ultmt{placeholder}/ns:Pty/ns:Nm/text()'
+            ' | .//ns:RltdPties/ns:{placeholder}/ns:Nm/text()'
+            ' | .//ns:RltdPties/ns:{placeholder}/ns:Pty/ns:Nm/text()'
+            ))
+
+    _get_account_number = partial(_generic_get,
+        xpath=('.//ns:RltdPties/ns:{placeholder}Acct/ns:Id/ns:IBAN/text()'
+            '| (.//ns:{placeholder}Acct/ns:Id/ns:Othr/ns:Id)[1]/text()'))
+
+    _get_main_ref = partial(_generic_get,
+        xpath='.//ns:RmtInf/ns:Strd/ns:{placeholder}RefInf/ns:Ref/text()')
+
+    _get_other_ref = partial(_generic_get,
+        xpath=('ns:AcctSvcrRef/text()'
+            '| {placeholder}ns:Refs/ns:TxId/text()'
+            '| {placeholder}ns:Refs/ns:InstrId/text()'
+            '| {placeholder}ns:Refs/ns:EndToEndId/text()'
+            '| {placeholder}ns:Refs/ns:MndtId/text()'
+            '| {placeholder}ns:Refs/ns:ChqNb/text()'))
+
+    _get_additional_entry_info = partial(_generic_get, xpath='ns:AddtlNtryInf/text()')
+    _get_additional_text_info = partial(_generic_get, xpath='ns:AddtlTxInf/text()')
+    _get_transaction_id = partial(_generic_get, xpath='ns:Refs/ns:TxId/text()')
+    _get_instruction_id = partial(_generic_get, xpath='ns:Refs/ns:InstrId/text()')
+    _get_end_to_end_id = partial(_generic_get, xpath='ns:Refs/ns:EndToEndId/text()')
+    _get_mandate_id = partial(_generic_get, xpath='ns:Refs/ns:MndtId/text()')
+    _get_check_number = partial(_generic_get, xpath='ns:Refs/ns:ChqNb/text()')
+
+    @staticmethod
+    def _get_signed_balance(node, namespaces, getters):
+        for balance_getter, sign_getter in getters:
+            balance = balance_getter(node, namespaces=namespaces)
+            sign = sign_getter(node, namespaces=namespaces)
+            if balance and sign:
+                return -float(balance) if sign == 'DBIT'  else float(balance)
+        return None
+
+    @staticmethod
+    def _get_signed_amount(*nodes, namespaces, journal_currency=None):
+        def get_value_and_currency_name(node, getters, target_currency=None):
+            for value_getter, currency_getter in getters:
+                value = value_getter(node, namespaces=namespaces)
+                currency_name = currency_getter(node, namespaces=namespaces)
+                if value and (target_currency is None or currency_name == target_currency):
+                    return float(value), currency_name
+            return None, None
+
+        def get_rate(*entries, target_currency, source_currency=None):
+            for entry in entries:
+                source_rate = get_value_and_currency_name(entry, CAMT._source_rate_getters)[0]
+                target_rate = get_value_and_currency_name(entry, CAMT._target_rate_getters)[0]
+
+                rate = source_rate or target_rate
+                if rate:
+                    # According to the camt.053 Swiss Payment Standards, the exchange rate should be divided by 100 if the
+                    # currency is in YEN, SEK, DKK or NOK.
+                    if target_currency == 'CHF' and source_currency in ('SEK', 'DKK', 'YEN', 'NOK'):
+                        rate /= 100
+                    elif not source_rate:
+                        rate = 1 / rate
+                    return rate
+            return None
+
+        def get_charges(*entries, target_currency=None):
+            for entry in entries:
+                charges = get_value_and_currency_name(entry, CAMT._charges_getters, target_currency=target_currency)[0]
+                if charges:
+                    sign = -1 if CAMT._get_charges_credit_debit_indicator(entry, namespaces=namespaces) == "DBIT" else 1
+                    return sign * charges
+            return None
+
+        entry_details = nodes[0]
+        entry = nodes[1] if len(nodes) > 1 else nodes[0]
+        journal_currency_name = journal_currency.name if journal_currency else None
+        entry_amount = get_value_and_currency_name(entry, CAMT._amount_charges_getters, target_currency=journal_currency_name)[0]
+        entry_details_amount = get_value_and_currency_name(entry_details, CAMT._amount_charges_getters, target_currency=journal_currency_name)[0]
+
+        charges = get_charges(entry_details, entry)
+        getters = CAMT._amount_charges_getters if charges else CAMT._amount_getters
+        amount, amount_currency_name = get_value_and_currency_name(entry_details, getters)
+
+        if not amount or (charges and journal_currency and journal_currency.compare_amounts(amount + charges, entry_amount) == 0):
+            amount, amount_currency_name = get_value_and_currency_name(entry, getters)
+
+        entry_amount_in_currency = get_value_and_currency_name(entry, getters, target_currency=amount_currency_name)[0]
+        entry_details_amount_in_currency = get_value_and_currency_name(entry_details, getters, target_currency=amount_currency_name)[0]
+
+        if not journal_currency or amount_currency_name == journal_currency_name:
+            rate = 1.0
+        else:
+            rate = get_rate(entry_details, entry, target_currency=journal_currency_name, source_currency=amount_currency_name)
+            entry_amount = entry_details_amount or entry_amount
+            if entry_details_amount:
+                entry_amount_in_currency = entry_details_amount_in_currency
+            elif not entry_amount_in_currency:
+                entry_amount_in_currency = amount
+            computed_rate = entry_amount / entry_amount_in_currency
+            if rate:
+                if float_compare(rate, computed_rate, precision_digits=4) == 0:
+                    rate = computed_rate
+                elif float_compare(rate, 1 / computed_rate, precision_digits=4) == 0:
+                    rate = 1 / computed_rate
+            else:
+                amount, amount_currency_name = get_value_and_currency_name(entry_details, CAMT._amount_getters, target_currency=journal_currency_name)
+                if not amount:
+                    amount, amount_currency_name = get_value_and_currency_name(entry, CAMT._amount_getters, target_currency=journal_currency_name)
+                if amount_currency_name == journal_currency_name:
+                    rate = 1.0
+            if not rate:
+                raise ValidationError(_lt("No exchange rate was found to convert an amount into the currency of the journal"))
+
+        sign = 1 if CAMT._get_credit_debit_indicator(*nodes, namespaces=namespaces) == "CRDT" else -1
+        total_amount, total_amount_currency = get_value_and_currency_name(entry, CAMT._total_amount_getters)
+        result_amount = sign * amount * rate
+        if not total_amount or total_amount_currency != journal_currency_name and journal_currency:
+            entry_amount = entry_details_amount or entry_amount
+            total_amount = total_amount or amount
+            if journal_currency.compare_amounts(total_amount * rate, entry_amount) == 0:
+                result_amount = sign * amount * rate
+            elif journal_currency.compare_amounts(total_amount / rate, entry_amount) == 0:
+                result_amount = sign * amount / rate
+
+        if journal_currency:
+            result_amount = journal_currency.round(result_amount)
+        return result_amount
+
+    @staticmethod
+    def _get_counter_party(*nodes, namespaces):
+        ind = CAMT._get_credit_debit_indicator(*nodes, namespaces=namespaces)
+        return 'Dbtr' if ind == 'CRDT' else 'Cdtr'
+
+    @staticmethod
+    def _set_amount_in_currency(node, getters, entry_vals, currency, curr_cache, has_multi_currency, namespaces):
+        for value_getter, currency_getter in getters:
+            instruc_amount = value_getter(node, namespaces=namespaces)
+            instruc_curr = currency_getter(node, namespaces=namespaces)
+            if (has_multi_currency and instruc_amount and instruc_curr and
+                    instruc_curr != currency and instruc_curr in curr_cache):
+                entry_vals['amount_currency'] = math.copysign(abs(float(instruc_amount)), entry_vals['amount'])
+                entry_vals['foreign_currency_id'] = curr_cache[instruc_curr]
+                break
+
+    @staticmethod
+    def _get_transaction_name(node, namespaces, entry=None):
+        xpaths = (
+            './/ns:RmtInf/ns:Ustrd/text()',
+            './/ns:RmtInf/ns:Strd/ns:CdtrRefInf/ns:Ref/text()',
+            './/ns:AddtlNtryInf/text()',
+            './/ns:RmtInf/ns:Strd/ns:AddtlRmtInf/text()',
+        )
+        for xpath in xpaths:
+            if entry is not None and 'AddtlNtryInf' in xpath:
+                transaction_name = entry.xpath(xpath, namespaces=namespaces)
+            else:
+                transaction_name = node.xpath(xpath, namespaces=namespaces)
+            if transaction_name:
+                return ' '.join(transaction_name)
+        return '/'
+
+    @staticmethod
+    def _get_ref(node, counter_party, prefix, namespaces):
+        ref = CAMT._get_main_ref(node, placeholder=counter_party, namespaces=namespaces)
+        if ref is False:  # Explicitely match False, not a falsy value
+            ref = CAMT._get_other_ref(node, placeholder=prefix, namespaces=namespaces)
+        return ref
+
+    @staticmethod
+    def _get_unique_import_id(entry, sequence, name, date, unique_import_set, namespaces):
+        unique_import_ref = entry.xpath('ns:AcctSvcrRef/text()', namespaces=namespaces)
+        if unique_import_ref and not CAMT._is_full_of_zeros(unique_import_ref[0]) and unique_import_ref[0] != 'NOTPROVIDED':
+            entry_ref = entry.xpath('ns:NtryRef/text()', namespaces=namespaces)
+            if entry_ref:
+                return '{}-{}-{}'.format(name, unique_import_ref[0], entry_ref[0])
+            elif not entry_ref and unique_import_ref[0] not in unique_import_set:
+                return unique_import_ref[0]
+            else:
+                return '{}-{}-{}'.format(name, unique_import_ref[0], sequence)
+        else:
+            return '{}-{}-{}'.format(name, date, sequence)
+
+    @staticmethod
+    def _get_transaction_type(node, namespaces):
+        code = node.xpath('ns:Domn/ns:Cd/text()', namespaces=namespaces)
+        family = node.xpath('ns:Domn/ns:Fmly/ns:Cd/text()', namespaces=namespaces)
+        subfamily = node.xpath('ns:Domn/ns:Fmly/ns:SubFmlyCd/text()', namespaces=namespaces)
+        if code:
+            return {'transaction_type': "{code}: {family} ({subfamily})".format(
+                code=codes.get(code[0].upper(), code[0]),
+                family=family and codes.get(family[0].upper(), family[0]) or '',
+                subfamily=subfamily and codes.get(subfamily[0].upper(), subfamily[0]) or '',
+            )}
+        return {}
+
+    @staticmethod
+    def _get_partner_address(node, ns, ph):
+        StrtNm = node.xpath('ns:RltdPties/ns:{}/ns:PstlAdr/ns:StrtNm/text()'.format(ph), namespaces=ns)
+        BldgNb = node.xpath('ns:RltdPties/ns:{}/ns:PstlAdr/ns:BldgNb/text()'.format(ph), namespaces=ns)
+        PstCd = node.xpath('ns:RltdPties/ns:{}/ns:PstlAdr/ns:PstCd/text()'.format(ph), namespaces=ns)
+        TwnNm = node.xpath('ns:RltdPties/ns:{}/ns:PstlAdr/ns:TwnNm/text()'.format(ph), namespaces=ns)
+        Ctry = node.xpath('ns:RltdPties/ns:{}/ns:PstlAdr/ns:Ctry/text()'.format(ph), namespaces=ns)
+        AdrLine = node.xpath('ns:RltdPties/ns:{}/ns:PstlAdr/ns:AdrLine/text()'.format(ph), namespaces=ns)
+        address = "\n".join(AdrLine)
+        if StrtNm:
+            address = "\n".join([address, ", ".join(StrtNm + BldgNb)])
+        if PstCd or TwnNm:
+            address = "\n".join([address, " ".join(PstCd + TwnNm)])
+        if Ctry:
+            address = "\n".join([address, Ctry[0]])
+        return address
+
+    @staticmethod
+    def _is_full_of_zeros(strg):
+        pattern_zero = re.compile('^0+$')
+        return bool(pattern_zero.match(strg))
diff --git a/dev_odex30_accounting/odex30_account_bank_statement_import_camt/models/__init__.py b/dev_odex30_accounting/odex30_account_bank_statement_import_camt/models/__init__.py
new file mode 100644
index 0000000..dfddd98
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_bank_statement_import_camt/models/__init__.py
@@ -0,0 +1,4 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+from . import account_journal
\ No newline at end of file
diff --git a/dev_odex30_accounting/odex30_account_bank_statement_import_camt/models/__pycache__/__init__.cpython-311.pyc b/dev_odex30_accounting/odex30_account_bank_statement_import_camt/models/__pycache__/__init__.cpython-311.pyc
new file mode 100644
index 0000000..5c26b18
Binary files /dev/null and b/dev_odex30_accounting/odex30_account_bank_statement_import_camt/models/__pycache__/__init__.cpython-311.pyc differ
diff --git a/dev_odex30_accounting/odex30_account_bank_statement_import_camt/models/__pycache__/account_journal.cpython-311.pyc b/dev_odex30_accounting/odex30_account_bank_statement_import_camt/models/__pycache__/account_journal.cpython-311.pyc
new file mode 100644
index 0000000..4c3e40a
Binary files /dev/null and b/dev_odex30_accounting/odex30_account_bank_statement_import_camt/models/__pycache__/account_journal.cpython-311.pyc differ
diff --git a/dev_odex30_accounting/odex30_account_bank_statement_import_camt/models/account_journal.py b/dev_odex30_accounting/odex30_account_bank_statement_import_camt/models/account_journal.py
new file mode 100644
index 0000000..b437d3d
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_bank_statement_import_camt/models/account_journal.py
@@ -0,0 +1,175 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+import io
+import logging
+
+from lxml import etree
+
+from odoo import models, _
+from odoo.exceptions import UserError
+from odoo.addons.base.models.res_bank import sanitize_account_number
+from odoo.addons.odex30_account_bank_statement_import_camt.lib.camt import CAMT
+
+_logger = logging.getLogger(__name__)
+
+
+class AccountJournal(models.Model):
+    _inherit = 'account.journal'
+
+    def _get_bank_statements_available_import_formats(self):
+        rslt = super()._get_bank_statements_available_import_formats()
+        rslt.append('CAMT')
+        return rslt
+
+    def _check_camt(self, attachment):
+        try:
+            root = etree.parse(io.BytesIO(attachment.raw)).getroot()
+        except Exception:
+            return None
+        if root.tag.find('camt.053') != -1:
+            return root
+        return None
+
+    def _parse_bank_statement_file(self, attachment):
+        root = self._check_camt(attachment)
+        if root is not None:
+            return self._parse_bank_statement_file_camt(root)
+        return super()._parse_bank_statement_file(attachment)
+
+    def _parse_bank_statement_file_camt(self, root):
+        ns = {'ns': root.xpath('namespace-uri(.)')}
+
+        curr_cache = {c['name']: c['id'] for c in self.env['res.currency'].search_read([], ['id', 'name'])}
+        statements_per_iban = {}
+        currency_per_iban = {}
+        unique_import_set = set([])
+        currency = account_no = False
+        has_multi_currency = self.env.user.has_group('base.group_multi_currency')
+        journal_currency = self.currency_id or self.company_id.currency_id
+        for statement in root[0].findall('ns:Stmt', ns):
+            statement_vals = {}
+            statement_vals['name'] = (statement.xpath('ns:LglSeqNb/text()', namespaces=ns) or statement.xpath('ns:Id/text()', namespaces=ns))[0]
+            statement_date = CAMT._get_statement_date(statement, namespaces=ns)
+
+            # Transaction Entries 0..n
+            transactions = []
+            sequence = 0
+
+            # Account Number    1..1
+            # if not IBAN value then... <Othr><Id> would have.
+            account_no = sanitize_account_number(statement.xpath('ns:Acct/ns:Id/ns:IBAN/text() | ns:Acct/ns:Id/ns:Othr/ns:Id/text()',
+                namespaces=ns)[0])
+
+            # Currency 0..1
+            currency = statement.xpath('ns:Acct/ns:Ccy/text() | ns:Bal/ns:Amt/@Ccy', namespaces=ns)[0]
+
+            if currency and journal_currency and currency != journal_currency.name:
+                continue
+
+            for entry in statement.findall('ns:Ntry', ns):
+                # Date 0..1
+                date = CAMT._get_transaction_date(entry, namespaces=ns) or statement_date
+
+                transaction_details = entry.xpath('.//ns:TxDtls', namespaces=ns)
+                entry_details_sum = 0
+                largest_entry_vals = {'amount': 0}
+                for entry_details in transaction_details or [entry]:
+                    sequence += 1
+                    counter_party = CAMT._get_counter_party(entry_details, entry, namespaces=ns)
+                    partner_name = CAMT._get_partner_name(entry_details, placeholder=counter_party, namespaces=ns)
+                    entry_vals = {
+                        'sequence': sequence,
+                        'date': date,
+                        'amount': CAMT._get_signed_amount(entry_details, entry, namespaces=ns, journal_currency=journal_currency),
+                        'payment_ref': CAMT._get_transaction_name(entry_details, namespaces=ns, entry=entry),
+                        'partner_name': partner_name,
+                        'account_number': CAMT._get_account_number(entry_details, placeholder=counter_party, namespaces=ns),
+                        'ref': CAMT._get_ref(entry_details, counter_party=counter_party, prefix='', namespaces=ns),
+                    }
+
+                    entry_vals['unique_import_id'] = CAMT._get_unique_import_id(
+                        entry=entry_details,
+                        sequence=sequence,
+                        name=statement_vals['name'],
+                        date=entry_vals['date'],
+                        unique_import_set=unique_import_set,
+                        namespaces=ns)
+
+                    CAMT._set_amount_in_currency(
+                        node=entry_details,
+                        getters=CAMT._currency_amount_getters,
+                        entry_vals=entry_vals,
+                        currency=currency,
+                        curr_cache=curr_cache,
+                        has_multi_currency=has_multi_currency,
+                        namespaces=ns)
+
+                    BkTxCd = entry.xpath('ns:BkTxCd', namespaces=ns)[0]
+                    entry_vals.update(CAMT._get_transaction_type(BkTxCd, namespaces=ns))
+                    notes = []
+                    entry_info = CAMT._get_additional_entry_info(entry, namespaces=ns)
+                    if entry_info:
+                        notes.append(_('Entry Info: %s', entry_info))
+                    text_info = CAMT._get_additional_text_info(entry_details, namespaces=ns)
+                    if text_info:
+                        notes.append(_('Additional Info: %s', text_info))
+                    if partner_name:
+                        notes.append(_('Counter Party: %(partner)s', partner=partner_name))
+                    partner_address = CAMT._get_partner_address(entry_details, ns, counter_party)
+                    if partner_address:
+                        notes.append(_('Address:\n%s', partner_address))
+                    transaction_id = CAMT._get_transaction_id(entry_details, namespaces=ns)
+                    if transaction_id:
+                        notes.append(_('Transaction ID: %s', transaction_id))
+                    instruction_id = CAMT._get_instruction_id(entry_details, namespaces=ns)
+                    if instruction_id:
+                        notes.append(_('Instruction ID: %s', instruction_id))
+                    end_to_end_id = CAMT._get_end_to_end_id(entry_details, namespaces=ns)
+                    if end_to_end_id:
+                        notes.append(_('End to end ID: %s', end_to_end_id))
+                    mandate_id = CAMT._get_mandate_id(entry_details, namespaces=ns)
+                    if mandate_id:
+                        notes.append(_('Mandate ID: %s', mandate_id))
+                    check_number = CAMT._get_check_number(entry_details, namespaces=ns)
+                    if check_number:
+                        notes.append(_('Check Number: %s', check_number))
+                    entry_vals['narration'] = "\n".join(notes)
+
+                    unique_import_set.add(entry_vals['unique_import_id'])
+                    transactions.append(entry_vals)
+
+                    entry_details_sum += entry_vals['amount']
+                    if abs(entry_vals['amount']) >= abs(largest_entry_vals['amount']):
+                        largest_entry_vals = entry_vals
+                
+                # In a multi-currency entry (Ntry) with multiple entry details, we might have some rounding differences when applying the currency rate.
+                # We add this difference back on the largest amount.
+                transaction_amount = float(entry.find('ns:Amt', namespaces=ns).text)
+                transaction_amount = -transaction_amount if entry.find('ns:CdtDbtInd', namespaces=ns).text == 'DBIT' else transaction_amount
+                largest_entry_vals['amount'] += transaction_amount - entry_details_sum
+
+            statement_vals['transactions'] = transactions
+            statement_vals['balance_start'] = CAMT._get_signed_balance(node=statement, namespaces=ns, getters=CAMT._start_balance_getters)
+            statement_vals['balance_end_real'] = CAMT._get_signed_balance(node=statement, namespaces=ns, getters=CAMT._end_balance_getters)
+
+            # Save statements and currency
+            statements_per_iban.setdefault(account_no, []).append(statement_vals)
+            currency_per_iban[account_no] = currency
+
+        # If statements target multiple journals, returns thoses targeting the current journal
+        if len(statements_per_iban) > 1:
+            account_no = sanitize_account_number(self.bank_acc_number)
+            _logger.warning("The following statements will not be imported because they are targeting another journal (current journal id: %s):\n- %s",
+                            account_no, "\n- ".join("{}: {} statement(s)".format(iban, len(statements)) for iban, statements in statements_per_iban.items() if iban != account_no))
+            if not account_no:
+                raise UserError(_("Please set the IBAN account on your bank journal.\n\nThis CAMT file is targeting several IBAN accounts but none match the current journal."))
+
+        # Otherwise, returns those from only account_no
+        statement_list = statements_per_iban.get(account_no, [])
+        currency = currency_per_iban.get(account_no)
+
+        if not currency and not statement_list:
+            raise UserError(_("Please check the currency on your bank journal.\n"
+                            "No statements in currency %s were found in this CAMT file.", journal_currency.name))
+        return currency, account_no, statement_list
diff --git a/dev_odex30_accounting/odex30_account_bank_statement_import_camt/test_camt_file/camt_053_additional_entry_info.xml b/dev_odex30_accounting/odex30_account_bank_statement_import_camt/test_camt_file/camt_053_additional_entry_info.xml
new file mode 100644
index 0000000..8dbdd8a
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_bank_statement_import_camt/test_camt_file/camt_053_additional_entry_info.xml
@@ -0,0 +1,72 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<Document xmlns="urn:iso:std:iso:20022:tech:xsd:camt.053.001.04">
+  <BkToCstmrStmt>
+    <GrpHdr>
+      <MsgId>2514988305.2019-02-13</MsgId>
+      <CreDtTm>2019-02-13T15:27:15.66+02:00</CreDtTm>
+    </GrpHdr>
+    <Stmt>
+      <Id>2514988305.2019-02-13</Id>
+      <CreDtTm>2019-02-13T15:27:15.66+02:00</CreDtTm>
+      <Acct>
+        <Id>
+          <IBAN></IBAN>
+          <Othr>
+            <Id>112233</Id>
+          </Othr>
+        </Id>
+      </Acct>
+      <Bal>
+        <Tp>
+          <CdOrPrtry>
+            <Cd>OPBD</Cd>
+          </CdOrPrtry>
+        </Tp>
+        <Amt Ccy="USD">1000.00</Amt>
+        <CdtDbtInd>CRDT</CdtDbtInd>
+        <Dt>
+          <Dt>2019-02-12</Dt>
+        </Dt>
+      </Bal>
+      <Bal>
+        <Tp>
+          <CdOrPrtry>
+            <Cd>CLBD</Cd>
+          </CdOrPrtry>
+        </Tp>
+        <Amt Ccy="USD">1500.00</Amt>
+        <CdtDbtInd>CRDT</CdtDbtInd>
+        <Dt>
+          <Dt>2019-02-13</Dt>
+        </Dt>
+      </Bal>
+      <Ntry>
+        <Amt Ccy="USD">500.00</Amt>
+        <CdtDbtInd>CRDT</CdtDbtInd>
+        <Sts>BOOK</Sts>
+        <BkTxCd>
+          <Prtry>
+            <Cd>ABCD</Cd>
+          </Prtry>
+        </BkTxCd>
+        <NtryDtls>
+          <Btch>
+            <MsgId>MSGSALA0001</MsgId>
+            <PmtInfId>CustRefForSalaBatch</PmtInfId>
+            <NbOfTxs>1</NbOfTxs>
+            <TtlAmt Ccy="USD">500.0</TtlAmt>
+            <CdtDbtInd>CRDT</CdtDbtInd>
+          </Btch>
+          <TxDtls>
+            <AmtDtls>
+              <TxAmt>
+                <Amt Ccy="USD">500</Amt>
+              </TxAmt>
+            </AmtDtls>
+          </TxDtls>
+        </NtryDtls>
+        <AddtlNtryInf>entry info</AddtlNtryInf>
+      </Ntry>
+    </Stmt>
+  </BkToCstmrStmt>
+</Document>
diff --git a/dev_odex30_accounting/odex30_account_bank_statement_import_camt/test_camt_file/camt_053_custom_codes.xml b/dev_odex30_accounting/odex30_account_bank_statement_import_camt/test_camt_file/camt_053_custom_codes.xml
new file mode 100644
index 0000000..23d9f29
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_bank_statement_import_camt/test_camt_file/camt_053_custom_codes.xml
@@ -0,0 +1,62 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<Document xmlns="urn:iso:std:iso:20022:tech:xsd:camt.053.001.04">
+  <BkToCstmrStmt>
+    <GrpHdr>
+      <MsgId>2514988305.2019-02-13</MsgId>
+      <CreDtTm>2019-02-13T15:27:15.66+02:00</CreDtTm>
+    </GrpHdr>
+    <Stmt>
+      <Id>2514988305.2019-02-13</Id>
+      <CreDtTm>2019-02-13T15:27:15.66+02:00</CreDtTm>
+      <Acct>
+        <Id>
+          <IBAN></IBAN>
+          <Othr>
+            <Id>112233</Id>
+          </Othr>
+        </Id>
+      </Acct>
+      <Bal>
+        <Tp>
+          <CdOrPrtry>
+            <Cd>OPBD</Cd>
+          </CdOrPrtry>
+        </Tp>
+        <Amt Ccy="USD">1000.00</Amt>
+        <CdtDbtInd>CRDT</CdtDbtInd>
+        <Dt>
+          <Dt>2019-02-12</Dt>
+        </Dt>
+      </Bal>
+      <Bal>
+        <Tp>
+          <CdOrPrtry>
+            <Cd>CLBD</Cd>
+          </CdOrPrtry>
+        </Tp>
+        <Amt Ccy="USD">1500.00</Amt>
+        <CdtDbtInd>CRDT</CdtDbtInd>
+        <Dt>
+          <Dt>2019-02-13</Dt>
+        </Dt>
+      </Bal>
+      <Ntry>
+        <Amt Ccy="USD">500.00</Amt>
+        <CdtDbtInd>CRDT</CdtDbtInd>
+        <Sts>BOOK</Sts>
+        <BkTxCd>
+          <Domn>
+            <Cd>custom_code</Cd>
+            <Fmly>
+              <Cd>custom_family</Cd>
+              <SubFmlyCd>custom_subfamily</SubFmlyCd>
+            </Fmly>
+          </Domn>
+          <Prtry>
+            <Cd>ABCD</Cd>
+          </Prtry>
+        </BkTxCd>
+      </Ntry>
+    </Stmt>
+  </BkToCstmrStmt>
+</Document>
diff --git a/dev_odex30_accounting/odex30_account_bank_statement_import_camt/test_camt_file/camt_053_exchange_fees.xml b/dev_odex30_accounting/odex30_account_bank_statement_import_camt/test_camt_file/camt_053_exchange_fees.xml
new file mode 100644
index 0000000..3343fc1
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_bank_statement_import_camt/test_camt_file/camt_053_exchange_fees.xml
@@ -0,0 +1,71 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<Document xmlns="urn:iso:std:iso:20022:tech:xsd:camt.053.001.04">
+    <BkToCstmrStmt>
+        <GrpHdr>
+            <MsgId>2514988305.2019-02-13</MsgId>
+            <CreDtTm>2019-02-13T15:27:15.66+02:00</CreDtTm>
+        </GrpHdr>
+        <Stmt>
+            <Id>2514988305.2019-02-13</Id>
+            <CreDtTm>2019-02-13T15:27:15.66+02:00</CreDtTm>
+            <Acct>
+                <Id>
+                    <IBAN></IBAN>
+                    <Othr>
+                        <Id>112233</Id>
+                    </Othr>
+                </Id>
+            </Acct>
+            <Bal>
+                <Tp>
+                    <CdOrPrtry>
+                        <Cd>OPBD</Cd>
+                    </CdOrPrtry>
+                </Tp>
+                <Amt Ccy="USD">1000.00</Amt>
+                <CdtDbtInd>CRDT</CdtDbtInd>
+                <Dt>
+                    <Dt>2019-02-12</Dt>
+                </Dt>
+            </Bal>
+            <Bal>
+                <Tp>
+                    <CdOrPrtry>
+                        <Cd>CLBD</Cd>
+                    </CdOrPrtry>
+                </Tp>
+                <Amt Ccy="USD">2672.98</Amt>
+                <CdtDbtInd>CRDT</CdtDbtInd>
+                <Dt>
+                    <Dt>2019-02-13</Dt>
+                </Dt>
+            </Bal>
+            <Ntry>
+                <Amt Ccy="USD">1672.98</Amt>
+                <CdtDbtInd>CRDT</CdtDbtInd>
+                <Sts>BOOK</Sts>
+                <BkTxCd>
+                    <Prtry>
+                        <Cd>ABCD</Cd>
+                    </Prtry>
+                </BkTxCd>
+                <NtryDtls>
+                    <TxDtls>
+                        <AmtDtls>
+                            <TxAmt>
+                                <Amt Ccy="USD">1672.98</Amt>
+                                <CcyXchg>
+                                    <SrcCcy>CAD</SrcCcy>
+                                    <XchgRate>1.4595</XchgRate>
+                                </CcyXchg>
+                            </TxAmt>
+                            <CntrValAmt>
+                                <Amt Ccy="USD">1639.98</Amt>
+                            </CntrValAmt>
+                        </AmtDtls>
+                    </TxDtls>
+                </NtryDtls>
+            </Ntry>
+        </Stmt>
+    </BkToCstmrStmt>
+</Document>
diff --git a/dev_odex30_accounting/odex30_account_bank_statement_import_camt/test_camt_file/camt_053_minimal.xml b/dev_odex30_accounting/odex30_account_bank_statement_import_camt/test_camt_file/camt_053_minimal.xml
new file mode 100644
index 0000000..7e4a51c
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_bank_statement_import_camt/test_camt_file/camt_053_minimal.xml
@@ -0,0 +1,55 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<Document xmlns="urn:iso:std:iso:20022:tech:xsd:camt.053.001.04">
+  <BkToCstmrStmt>
+    <GrpHdr>
+      <MsgId>2514988305.2019-02-13</MsgId>
+      <CreDtTm>2019-02-13T15:27:15.66+02:00</CreDtTm>
+    </GrpHdr>
+    <Stmt>
+      <Id>2514988305.2019-02-13</Id>
+      <CreDtTm>2019-02-13T15:27:15.66+02:00</CreDtTm>
+      <Acct>
+        <Id>
+          <IBAN></IBAN>
+          <Othr>
+            <Id>112233</Id>
+          </Othr>
+        </Id>
+      </Acct>
+      <Bal>
+        <Tp>
+          <CdOrPrtry>
+            <Cd>OPBD</Cd>
+          </CdOrPrtry>
+        </Tp>
+        <Amt Ccy="USD">1000.00</Amt>
+        <CdtDbtInd>CRDT</CdtDbtInd>
+        <Dt>
+          <Dt>2019-02-12</Dt>
+        </Dt>
+      </Bal>
+      <Bal>
+        <Tp>
+          <CdOrPrtry>
+            <Cd>CLBD</Cd>
+          </CdOrPrtry>
+        </Tp>
+        <Amt Ccy="USD">1500.00</Amt>
+        <CdtDbtInd>CRDT</CdtDbtInd>
+        <Dt>
+          <Dt>2019-02-13</Dt>
+        </Dt>
+      </Bal>
+      <Ntry>
+        <Amt Ccy="USD">500.00</Amt>
+        <CdtDbtInd>CRDT</CdtDbtInd>
+        <Sts>BOOK</Sts>
+        <BkTxCd>
+          <Prtry>
+            <Cd>ABCD</Cd>
+          </Prtry>
+        </BkTxCd>
+      </Ntry>
+    </Stmt>
+  </BkToCstmrStmt>
+</Document>
\ No newline at end of file
diff --git a/dev_odex30_accounting/odex30_account_bank_statement_import_camt/test_camt_file/camt_053_minimal_EUR.xml b/dev_odex30_accounting/odex30_account_bank_statement_import_camt/test_camt_file/camt_053_minimal_EUR.xml
new file mode 100644
index 0000000..564ed87
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_bank_statement_import_camt/test_camt_file/camt_053_minimal_EUR.xml
@@ -0,0 +1,55 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<Document xmlns="urn:iso:std:iso:20022:tech:xsd:camt.053.001.04">
+  <BkToCstmrStmt>
+    <GrpHdr>
+      <MsgId>2514988305.2019-02-13</MsgId>
+      <CreDtTm>2019-02-13T15:27:15.66+02:00</CreDtTm>
+    </GrpHdr>
+    <Stmt>
+      <Id>2514988305.2019-02-13</Id>
+      <CreDtTm>2019-02-13T15:27:15.66+02:00</CreDtTm>
+      <Acct>
+        <Id>
+          <IBAN></IBAN>
+          <Othr>
+            <Id>112233</Id>
+          </Othr>
+        </Id>
+      </Acct>
+      <Bal>
+        <Tp>
+          <CdOrPrtry>
+            <Cd>OPBD</Cd>
+          </CdOrPrtry>
+        </Tp>
+        <Amt Ccy="EUR">1000.00</Amt>
+        <CdtDbtInd>CRDT</CdtDbtInd>
+        <Dt>
+          <Dt>2019-02-12</Dt>
+        </Dt>
+      </Bal>
+      <Bal>
+        <Tp>
+          <CdOrPrtry>
+            <Cd>CLBD</Cd>
+          </CdOrPrtry>
+        </Tp>
+        <Amt Ccy="EUR">1500.00</Amt>
+        <CdtDbtInd>CRDT</CdtDbtInd>
+        <Dt>
+          <Dt>2019-02-13</Dt>
+        </Dt>
+      </Bal>
+      <Ntry>
+        <Amt Ccy="EUR">500.00</Amt>
+        <CdtDbtInd>CRDT</CdtDbtInd>
+        <Sts>BOOK</Sts>
+        <BkTxCd>
+          <Prtry>
+            <Cd>ABCD</Cd>
+          </Prtry>
+        </BkTxCd>
+      </Ntry>
+    </Stmt>
+  </BkToCstmrStmt>
+</Document>
diff --git a/dev_odex30_accounting/odex30_account_bank_statement_import_camt/test_camt_file/camt_053_minimal_and_multicurrency.xml b/dev_odex30_accounting/odex30_account_bank_statement_import_camt/test_camt_file/camt_053_minimal_and_multicurrency.xml
new file mode 100644
index 0000000..4d96a15
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_bank_statement_import_camt/test_camt_file/camt_053_minimal_and_multicurrency.xml
@@ -0,0 +1,78 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<Document xmlns="urn:iso:std:iso:20022:tech:xsd:camt.053.001.04">
+    <BkToCstmrStmt>
+        <GrpHdr>
+            <MsgId>2514988305.2019-02-13</MsgId>
+            <CreDtTm>2019-02-13T15:27:15.66+02:00</CreDtTm>
+        </GrpHdr>
+        <Stmt>
+            <Id>2514988305.2019-02-13</Id>
+            <CreDtTm>2019-02-13T15:27:15.66+02:00</CreDtTm>
+            <Acct>
+                <Id>
+                    <IBAN></IBAN>
+                    <Othr>
+                        <Id>112233</Id>
+                    </Othr>
+                </Id>
+            </Acct>
+            <Bal>
+                <Tp>
+                    <CdOrPrtry>
+                        <Cd>OPBD</Cd>
+                    </CdOrPrtry>
+                </Tp>
+                <Amt Ccy="USD">1000.00</Amt>
+                <CdtDbtInd>CRDT</CdtDbtInd>
+                <Dt>
+                    <Dt>2019-02-12</Dt>
+                </Dt>
+            </Bal>
+            <Bal>
+                <Tp>
+                    <CdOrPrtry>
+                        <Cd>CLBD</Cd>
+                    </CdOrPrtry>
+                </Tp>
+                <Amt Ccy="USD">1500.00</Amt>
+                <CdtDbtInd>CRDT</CdtDbtInd>
+                <Dt>
+                    <Dt>2019-02-13</Dt>
+                </Dt>
+            </Bal>
+            <Ntry>
+                <Amt Ccy="USD">500.00</Amt>
+                <CdtDbtInd>CRDT</CdtDbtInd>
+                <Sts>BOOK</Sts>
+                <BkTxCd>
+                    <Domn>
+                        <Cd>PMNT</Cd>
+                        <Fmly>
+                            <Cd>RCDT</Cd>
+                            <SubFmlyCd>ESCT</SubFmlyCd>
+                        </Fmly>
+                    </Domn>
+                </BkTxCd>
+                <AmtDtls>
+                    <TxAmt>
+                        <Amt Ccy="EUR">250.00</Amt>
+                    </TxAmt>
+                    <CntrValAmt>
+                        <Amt Ccy="USD">500.00000</Amt>
+                        <CcyXchg>
+                            <SrcCcy>EUR</SrcCcy>
+                            <TrgtCcy>USD</TrgtCcy>
+                            <XchgRate>0.5</XchgRate>
+                        </CcyXchg>
+                    </CntrValAmt>
+                </AmtDtls>
+                <NtryDtls>
+                    <TxDtls>
+                        <Amt Ccy="EUR">250.00000</Amt>
+                        <CdtDbtInd>CRDT</CdtDbtInd>
+                    </TxDtls>
+                </NtryDtls>
+            </Ntry>
+        </Stmt>
+    </BkToCstmrStmt>
+</Document>
diff --git a/dev_odex30_accounting/odex30_account_bank_statement_import_camt/test_camt_file/camt_053_minimal_and_multicurrency_02.xml b/dev_odex30_accounting/odex30_account_bank_statement_import_camt/test_camt_file/camt_053_minimal_and_multicurrency_02.xml
new file mode 100644
index 0000000..ed8304c
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_bank_statement_import_camt/test_camt_file/camt_053_minimal_and_multicurrency_02.xml
@@ -0,0 +1,71 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<Document xmlns="urn:iso:std:iso:20022:tech:xsd:camt.053.001.04">
+    <BkToCstmrStmt>
+        <GrpHdr>
+            <MsgId>2514988305.2019-02-13</MsgId>
+            <CreDtTm>2019-02-13T15:27:15.66+02:00</CreDtTm>
+        </GrpHdr>
+        <Stmt>
+            <Id>2514988305.2019-02-13</Id>
+            <CreDtTm>2019-02-13T15:27:15.66+02:00</CreDtTm>
+            <Acct>
+                <Id>
+                    <IBAN></IBAN>
+                    <Othr>
+                        <Id>112233</Id>
+                    </Othr>
+                </Id>
+            </Acct>
+            <Bal>
+                <Tp>
+                    <CdOrPrtry>
+                        <Cd>OPBD</Cd>
+                    </CdOrPrtry>
+                </Tp>
+                <Amt Ccy="USD">1000.00</Amt>
+                <CdtDbtInd>CRDT</CdtDbtInd>
+                <Dt>
+                    <Dt>2019-02-12</Dt>
+                </Dt>
+            </Bal>
+            <Bal>
+                <Tp>
+                    <CdOrPrtry>
+                        <Cd>CLBD</Cd>
+                    </CdOrPrtry>
+                </Tp>
+                <Amt Ccy="USD">1500.00</Amt>
+                <CdtDbtInd>CRDT</CdtDbtInd>
+                <Dt>
+                    <Dt>2019-02-13</Dt>
+                </Dt>
+            </Bal>
+            <Ntry>
+                <Amt Ccy="USD">500.00</Amt>
+                <CdtDbtInd>CRDT</CdtDbtInd>
+                <Sts>BOOK</Sts>
+                <BkTxCd>
+                    <Prtry>
+                        <Cd>ABCD</Cd>
+                    </Prtry>
+                </BkTxCd>
+                <NtryDtls>
+                    <TxDtls>
+                        <Amt Ccy="USD">500</Amt>
+                        <CdtDbtInd>CRDT</CdtDbtInd>
+                        <AmtDtls>
+                            <TxAmt>
+                                <Amt Ccy="EUR">250</Amt>
+                                <CcyXchg>
+                                    <SrcCcy>USD</SrcCcy>
+                                    <TrgtCcy>EUR</TrgtCcy>
+                                    <XchgRate>2</XchgRate>
+                                </CcyXchg>
+                            </TxAmt>
+                        </AmtDtls>
+                    </TxDtls>
+                </NtryDtls>
+            </Ntry>
+        </Stmt>
+    </BkToCstmrStmt>
+</Document>
diff --git a/dev_odex30_accounting/odex30_account_bank_statement_import_camt/test_camt_file/camt_053_minimal_and_multicurrency_03.xml b/dev_odex30_accounting/odex30_account_bank_statement_import_camt/test_camt_file/camt_053_minimal_and_multicurrency_03.xml
new file mode 100644
index 0000000..46307d5
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_bank_statement_import_camt/test_camt_file/camt_053_minimal_and_multicurrency_03.xml
@@ -0,0 +1,73 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<Document xmlns="urn:iso:std:iso:20022:tech:xsd:camt.053.001.04">
+    <BkToCstmrStmt>
+        <GrpHdr>
+            <MsgId>2514988305.2019-02-13</MsgId>
+            <CreDtTm>2019-02-13T15:27:15.66+02:00</CreDtTm>
+        </GrpHdr>
+        <Stmt>
+            <Id>2514988305.2019-02-13</Id>
+            <CreDtTm>2019-02-13T15:27:15.66+02:00</CreDtTm>
+            <Acct>
+                <Id>
+                    <IBAN></IBAN>
+                    <Othr>
+                        <Id>112233</Id>
+                    </Othr>
+                </Id>
+            </Acct>
+            <Bal>
+                <Tp>
+                    <CdOrPrtry>
+                        <Cd>OPBD</Cd>
+                    </CdOrPrtry>
+                </Tp>
+                <Amt Ccy="USD">1000.00</Amt>
+                <CdtDbtInd>CRDT</CdtDbtInd>
+                <Dt>
+                    <Dt>2019-02-12</Dt>
+                </Dt>
+            </Bal>
+            <Bal>
+                <Tp>
+                    <CdOrPrtry>
+                        <Cd>CLBD</Cd>
+                    </CdOrPrtry>
+                </Tp>
+                <Amt Ccy="USD">1500.00</Amt>
+                <CdtDbtInd>CRDT</CdtDbtInd>
+                <Dt>
+                    <Dt>2019-02-13</Dt>
+                </Dt>
+            </Bal>
+            <Ntry>
+                <Amt Ccy="USD">500.00</Amt>
+                <CdtDbtInd>CRDT</CdtDbtInd>
+                <Sts>BOOK</Sts>
+                <BkTxCd>
+                    <Domn>
+                        <Cd>PMNT</Cd>
+                        <Fmly>
+                            <Cd>RCDT</Cd>
+                            <SubFmlyCd>ESCT</SubFmlyCd>
+                        </Fmly>
+                    </Domn>
+                </BkTxCd>
+                <AmtDtls>
+                    <TxAmt>
+                        <Amt Ccy="EUR">250.00</Amt>
+                    </TxAmt>
+                    <CntrValAmt>
+                        <Amt Ccy="USD">500.00000</Amt>
+                    </CntrValAmt>
+                </AmtDtls>
+                <NtryDtls>
+                    <TxDtls>
+                        <Amt Ccy="EUR">250.00000</Amt>
+                        <CdtDbtInd>CRDT</CdtDbtInd>
+                    </TxDtls>
+                </NtryDtls>
+            </Ntry>
+        </Stmt>
+    </BkToCstmrStmt>
+</Document>
diff --git a/dev_odex30_accounting/odex30_account_bank_statement_import_camt/test_camt_file/camt_053_minimal_and_multicurrency_04.xml b/dev_odex30_accounting/odex30_account_bank_statement_import_camt/test_camt_file/camt_053_minimal_and_multicurrency_04.xml
new file mode 100644
index 0000000..c410bea
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_bank_statement_import_camt/test_camt_file/camt_053_minimal_and_multicurrency_04.xml
@@ -0,0 +1,71 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<Document xmlns="urn:iso:std:iso:20022:tech:xsd:camt.053.001.04">
+    <BkToCstmrStmt>
+        <GrpHdr>
+            <MsgId>2514988305.2019-02-13</MsgId>
+            <CreDtTm>2019-02-13T15:27:15.66+02:00</CreDtTm>
+        </GrpHdr>
+        <Stmt>
+            <Id>2514988305.2019-02-13</Id>
+            <CreDtTm>2019-02-13T15:27:15.66+02:00</CreDtTm>
+            <Acct>
+                <Id>
+                    <IBAN></IBAN>
+                    <Othr>
+                        <Id>112233</Id>
+                    </Othr>
+                </Id>
+            </Acct>
+            <Bal>
+                <Tp>
+                    <CdOrPrtry>
+                        <Cd>OPBD</Cd>
+                    </CdOrPrtry>
+                </Tp>
+                <Amt Ccy="USD">1000.00</Amt>
+                <CdtDbtInd>CRDT</CdtDbtInd>
+                <Dt>
+                    <Dt>2019-02-12</Dt>
+                </Dt>
+            </Bal>
+            <Bal>
+                <Tp>
+                    <CdOrPrtry>
+                        <Cd>CLBD</Cd>
+                    </CdOrPrtry>
+                </Tp>
+                <Amt Ccy="USD">1500.00</Amt>
+                <CdtDbtInd>CRDT</CdtDbtInd>
+                <Dt>
+                    <Dt>2019-02-13</Dt>
+                </Dt>
+            </Bal>
+            <Ntry>
+                <Amt Ccy="USD">500.00</Amt>
+                <CdtDbtInd>CRDT</CdtDbtInd>
+                <Sts>BOOK</Sts>
+                <BkTxCd>
+                    <Prtry>
+                        <Cd>ABCD</Cd>
+                    </Prtry>
+                </BkTxCd>
+                <NtryDtls>
+                    <TxDtls>
+                        <Amt Ccy="USD">500</Amt>
+                        <CdtDbtInd>CRDT</CdtDbtInd>
+                        <AmtDtls>
+                            <TxAmt>
+                                <Amt Ccy="EUR">250</Amt>
+                                <CcyXchg>
+                                    <SrcCcy>EUR</SrcCcy>
+                                    <TrgtCcy>USD</TrgtCcy>
+                                    <XchgRate>2</XchgRate>
+                                </CcyXchg>
+                            </TxAmt>
+                        </AmtDtls>
+                    </TxDtls>
+                </NtryDtls>
+            </Ntry>
+        </Stmt>
+    </BkToCstmrStmt>
+</Document>
diff --git a/dev_odex30_accounting/odex30_account_bank_statement_import_camt/test_camt_file/camt_053_minimal_and_multicurrency_05.xml b/dev_odex30_accounting/odex30_account_bank_statement_import_camt/test_camt_file/camt_053_minimal_and_multicurrency_05.xml
new file mode 100644
index 0000000..b7e88e9
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_bank_statement_import_camt/test_camt_file/camt_053_minimal_and_multicurrency_05.xml
@@ -0,0 +1,71 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<Document xmlns="urn:iso:std:iso:20022:tech:xsd:camt.053.001.04">
+    <BkToCstmrStmt>
+        <GrpHdr>
+            <MsgId>2514988305.2019-02-13</MsgId>
+            <CreDtTm>2019-02-13T15:27:15.66+02:00</CreDtTm>
+        </GrpHdr>
+        <Stmt>
+            <Id>2514988305.2019-02-13</Id>
+            <CreDtTm>2019-02-13T15:27:15.66+02:00</CreDtTm>
+            <Acct>
+                <Id>
+                    <IBAN></IBAN>
+                    <Othr>
+                        <Id>112233</Id>
+                    </Othr>
+                </Id>
+            </Acct>
+            <Bal>
+                <Tp>
+                    <CdOrPrtry>
+                        <Cd>OPBD</Cd>
+                    </CdOrPrtry>
+                </Tp>
+                <Amt Ccy="USD">1000.00</Amt>
+                <CdtDbtInd>CRDT</CdtDbtInd>
+                <Dt>
+                    <Dt>2019-02-12</Dt>
+                </Dt>
+            </Bal>
+            <Bal>
+                <Tp>
+                    <CdOrPrtry>
+                        <Cd>CLBD</Cd>
+                    </CdOrPrtry>
+                </Tp>
+                <Amt Ccy="USD">1500.00</Amt>
+                <CdtDbtInd>CRDT</CdtDbtInd>
+                <Dt>
+                    <Dt>2019-02-13</Dt>
+                </Dt>
+            </Bal>
+            <Ntry>
+                <Amt Ccy="USD">500.00</Amt>
+                <CdtDbtInd>CRDT</CdtDbtInd>
+                <Sts>BOOK</Sts>
+                <BkTxCd>
+                    <Prtry>
+                        <Cd>ABCD</Cd>
+                    </Prtry>
+                </BkTxCd>
+                <NtryDtls>
+                    <TxDtls>
+                        <Amt Ccy="USD">500</Amt>
+                        <CdtDbtInd>CRDT</CdtDbtInd>
+                        <AmtDtls>
+                            <TxAmt>
+                                <Amt Ccy="EUR">250</Amt>
+                                <CcyXchg>
+                                    <SrcCcy>EUR</SrcCcy>
+                                    <TrgtCcy>USD</TrgtCcy>
+                                    <XchgRate>0.5</XchgRate>
+                                </CcyXchg>
+                            </TxAmt>
+                        </AmtDtls>
+                    </TxDtls>
+                </NtryDtls>
+            </Ntry>
+        </Stmt>
+    </BkToCstmrStmt>
+</Document>
diff --git a/dev_odex30_accounting/odex30_account_bank_statement_import_camt/test_camt_file/camt_053_minimal_and_multicurrency_06.xml b/dev_odex30_accounting/odex30_account_bank_statement_import_camt/test_camt_file/camt_053_minimal_and_multicurrency_06.xml
new file mode 100644
index 0000000..45ee941
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_bank_statement_import_camt/test_camt_file/camt_053_minimal_and_multicurrency_06.xml
@@ -0,0 +1,71 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<Document xmlns="urn:iso:std:iso:20022:tech:xsd:camt.053.001.04">
+    <BkToCstmrStmt>
+        <GrpHdr>
+            <MsgId>2514988305.2019-02-13</MsgId>
+            <CreDtTm>2019-02-13T15:27:15.66+02:00</CreDtTm>
+        </GrpHdr>
+        <Stmt>
+            <Id>2514988305.2019-02-13</Id>
+            <CreDtTm>2019-02-13T15:27:15.66+02:00</CreDtTm>
+            <Acct>
+                <Id>
+                    <IBAN></IBAN>
+                    <Othr>
+                        <Id>112233</Id>
+                    </Othr>
+                </Id>
+            </Acct>
+            <Bal>
+                <Tp>
+                    <CdOrPrtry>
+                        <Cd>OPBD</Cd>
+                    </CdOrPrtry>
+                </Tp>
+                <Amt Ccy="USD">1000.00</Amt>
+                <CdtDbtInd>CRDT</CdtDbtInd>
+                <Dt>
+                    <Dt>2019-02-12</Dt>
+                </Dt>
+            </Bal>
+            <Bal>
+                <Tp>
+                    <CdOrPrtry>
+                        <Cd>CLBD</Cd>
+                    </CdOrPrtry>
+                </Tp>
+                <Amt Ccy="USD">1500.00</Amt>
+                <CdtDbtInd>CRDT</CdtDbtInd>
+                <Dt>
+                    <Dt>2019-02-13</Dt>
+                </Dt>
+            </Bal>
+            <Ntry>
+                <Amt Ccy="USD">500.00</Amt>
+                <CdtDbtInd>CRDT</CdtDbtInd>
+                <Sts>BOOK</Sts>
+                <BkTxCd>
+                    <Prtry>
+                        <Cd>ABCD</Cd>
+                    </Prtry>
+                </BkTxCd>
+                <NtryDtls>
+                    <TxDtls>
+                        <Amt Ccy="USD">500</Amt>
+                        <CdtDbtInd>CRDT</CdtDbtInd>
+                        <AmtDtls>
+                            <TxAmt>
+                                <Amt Ccy="EUR">245</Amt>
+                                <CcyXchg>
+                                    <SrcCcy>USD</SrcCcy>
+                                    <TrgtCcy>EUR</TrgtCcy>
+                                    <XchgRate>2.040817</XchgRate>
+                                </CcyXchg>
+                            </TxAmt>
+                        </AmtDtls>
+                    </TxDtls>
+                </NtryDtls>
+            </Ntry>
+        </Stmt>
+    </BkToCstmrStmt>
+</Document>
diff --git a/dev_odex30_accounting/odex30_account_bank_statement_import_camt/test_camt_file/camt_053_minimal_and_multicurrency_07.xml b/dev_odex30_accounting/odex30_account_bank_statement_import_camt/test_camt_file/camt_053_minimal_and_multicurrency_07.xml
new file mode 100644
index 0000000..5b9369a
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_bank_statement_import_camt/test_camt_file/camt_053_minimal_and_multicurrency_07.xml
@@ -0,0 +1,78 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<Document xmlns="urn:iso:std:iso:20022:tech:xsd:camt.053.001.04">
+    <BkToCstmrStmt>
+        <GrpHdr>
+            <MsgId>2514988305.2019-02-13</MsgId>
+            <CreDtTm>2019-02-13T15:27:15.66+02:00</CreDtTm>
+        </GrpHdr>
+        <Stmt>
+            <Id>2514988305.2019-02-13</Id>
+            <CreDtTm>2019-02-13T15:27:15.66+02:00</CreDtTm>
+            <Acct>
+                <Id>
+                    <IBAN></IBAN>
+                    <Othr>
+                        <Id>112233</Id>
+                    </Othr>
+                </Id>
+            </Acct>
+            <Bal>
+                <Tp>
+                    <CdOrPrtry>
+                        <Cd>OPBD</Cd>
+                    </CdOrPrtry>
+                </Tp>
+                <Amt Ccy="USD">1000.00</Amt>
+                <CdtDbtInd>CRDT</CdtDbtInd>
+                <Dt>
+                    <Dt>2019-02-12</Dt>
+                </Dt>
+            </Bal>
+            <Bal>
+                <Tp>
+                    <CdOrPrtry>
+                        <Cd>CLBD</Cd>
+                    </CdOrPrtry>
+                </Tp>
+                <Amt Ccy="USD">1500.00</Amt>
+                <CdtDbtInd>CRDT</CdtDbtInd>
+                <Dt>
+                    <Dt>2019-02-13</Dt>
+                </Dt>
+            </Bal>
+            <Ntry>
+                <Amt Ccy="USD">500.00</Amt>
+                <CdtDbtInd>CRDT</CdtDbtInd>
+                <Sts>BOOK</Sts>
+                <BkTxCd>
+                    <Domn>
+                        <Cd>PMNT</Cd>
+                        <Fmly>
+                            <Cd>RCDT</Cd>
+                            <SubFmlyCd>ESCT</SubFmlyCd>
+                        </Fmly>
+                    </Domn>
+                </BkTxCd>
+                <AmtDtls>
+                    <TxAmt>
+                        <Amt Ccy="EUR">252.00</Amt>
+                    </TxAmt>
+                    <CntrValAmt>
+                        <Amt Ccy="USD">500.00</Amt>
+                        <CcyXchg>
+                            <SrcCcy>EUR</SrcCcy>
+                            <TrgtCcy>USD</TrgtCcy>
+                            <XchgRate>1.9841</XchgRate>
+                        </CcyXchg>
+                    </CntrValAmt>
+                </AmtDtls>
+                <NtryDtls>
+                    <TxDtls>
+                        <Amt Ccy="EUR">252.00</Amt>
+                        <CdtDbtInd>CRDT</CdtDbtInd>
+                    </TxDtls>
+                </NtryDtls>
+            </Ntry>
+        </Stmt>
+    </BkToCstmrStmt>
+</Document>
diff --git a/dev_odex30_accounting/odex30_account_bank_statement_import_camt/test_camt_file/camt_053_minimal_charges.xml b/dev_odex30_accounting/odex30_account_bank_statement_import_camt/test_camt_file/camt_053_minimal_charges.xml
new file mode 100644
index 0000000..6345a00
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_bank_statement_import_camt/test_camt_file/camt_053_minimal_charges.xml
@@ -0,0 +1,77 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<Document xmlns="urn:iso:std:iso:20022:tech:xsd:camt.053.001.04">
+  <BkToCstmrStmt>
+    <GrpHdr>
+      <MsgId>2514988305.2019-02-13</MsgId>
+      <CreDtTm>2019-02-13T15:27:15.66+02:00</CreDtTm>
+    </GrpHdr>
+    <Stmt>
+      <Id>2514988305.2019-02-13</Id>
+      <CreDtTm>2019-02-13T15:27:15.66+02:00</CreDtTm>
+      <Acct>
+        <Id>
+          <IBAN></IBAN>
+          <Othr>
+            <Id>112233</Id>
+          </Othr>
+        </Id>
+      </Acct>
+      <Bal>
+        <Tp>
+          <CdOrPrtry>
+            <Cd>OPBD</Cd>
+          </CdOrPrtry>
+        </Tp>
+        <Amt Ccy="USD">1000.00</Amt>
+        <CdtDbtInd>CRDT</CdtDbtInd>
+        <Dt>
+          <Dt>2019-02-12</Dt>
+        </Dt>
+      </Bal>
+      <Bal>
+        <Tp>
+          <CdOrPrtry>
+            <Cd>CLBD</Cd>
+          </CdOrPrtry>
+        </Tp>
+        <Amt Ccy="USD">1500.00</Amt>
+        <CdtDbtInd>CRDT</CdtDbtInd>
+        <Dt>
+          <Dt>2019-02-13</Dt>
+        </Dt>
+      </Bal>
+      <Ntry>
+        <Amt Ccy="USD">500.00</Amt>
+        <CdtDbtInd>CRDT</CdtDbtInd>
+        <Sts>BOOK</Sts>
+        <BkTxCd>
+          <Prtry>
+            <Cd>ABCD</Cd>
+          </Prtry>
+        </BkTxCd>
+        <Chrgs>
+          <TtlChrgsAndTaxAmt Ccy="USD">4</TtlChrgsAndTaxAmt>
+          <Rcrd>
+            <Amt Ccy="USD">4</Amt>
+            <CdtDbtInd>CRDT</CdtDbtInd>
+            <ChrgInclInd>true</ChrgInclInd>
+          </Rcrd>
+        </Chrgs>
+        <NtryDtls>
+          <TxDtls>
+            <Amt Ccy="USD">500</Amt>
+            <CdtDbtInd>CRDT</CdtDbtInd>
+            <AmtDtls>
+              <InstdAmt>
+                <Amt Ccy="USD">496</Amt>
+              </InstdAmt>
+              <TxAmt>
+                <Amt Ccy="USD">496</Amt>
+              </TxAmt>
+            </AmtDtls>
+          </TxDtls>
+        </NtryDtls>
+      </Ntry>
+    </Stmt>
+  </BkToCstmrStmt>
+</Document>
\ No newline at end of file
diff --git a/dev_odex30_accounting/odex30_account_bank_statement_import_camt/test_camt_file/camt_053_minimal_charges_02.xml b/dev_odex30_accounting/odex30_account_bank_statement_import_camt/test_camt_file/camt_053_minimal_charges_02.xml
new file mode 100644
index 0000000..a11851a
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_bank_statement_import_camt/test_camt_file/camt_053_minimal_charges_02.xml
@@ -0,0 +1,69 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<Document xmlns="urn:iso:std:iso:20022:tech:xsd:camt.053.001.04">
+  <BkToCstmrStmt>
+    <GrpHdr>
+      <MsgId>2514988305.2019-02-13</MsgId>
+      <CreDtTm>2019-02-13T15:27:15.66+02:00</CreDtTm>
+    </GrpHdr>
+    <Stmt>
+      <Id>2514988305.2019-02-13</Id>
+      <CreDtTm>2019-02-13T15:27:15.66+02:00</CreDtTm>
+      <Acct>
+        <Id>
+          <IBAN></IBAN>
+          <Othr>
+            <Id>112233</Id>
+          </Othr>
+        </Id>
+      </Acct>
+      <Bal>
+        <Tp>
+          <CdOrPrtry>
+            <Cd>OPBD</Cd>
+          </CdOrPrtry>
+        </Tp>
+        <Amt Ccy="USD">1000.00</Amt>
+        <CdtDbtInd>CRDT</CdtDbtInd>
+        <Dt>
+          <Dt>2019-02-12</Dt>
+        </Dt>
+      </Bal>
+      <Bal>
+        <Tp>
+          <CdOrPrtry>
+            <Cd>CLBD</Cd>
+          </CdOrPrtry>
+        </Tp>
+        <Amt Ccy="USD">1500.00</Amt>
+        <CdtDbtInd>CRDT</CdtDbtInd>
+        <Dt>
+          <Dt>2019-02-13</Dt>
+        </Dt>
+      </Bal>
+      <Ntry>
+        <Amt Ccy="USD">500.00</Amt>
+        <CdtDbtInd>CRDT</CdtDbtInd>
+        <Sts>BOOK</Sts>
+        <BkTxCd>
+          <Prtry>
+            <Cd>ABCD</Cd>
+          </Prtry>
+        </BkTxCd>
+        <NtryDtls>
+          <TxDtls>
+            <Amt Ccy="USD">496</Amt>
+            <CdtDbtInd>CRDT</CdtDbtInd>
+            <AmtDtls>
+              <InstdAmt>
+                <Amt Ccy="USD">496</Amt>
+              </InstdAmt>
+            </AmtDtls>
+            <Chrgs>
+              <Amt Ccy="USD">4</Amt>
+            </Chrgs>
+          </TxDtls>
+        </NtryDtls>
+      </Ntry>
+    </Stmt>
+  </BkToCstmrStmt>
+</Document>
\ No newline at end of file
diff --git a/dev_odex30_accounting/odex30_account_bank_statement_import_camt/test_camt_file/camt_053_minimal_charges_03.xml b/dev_odex30_accounting/odex30_account_bank_statement_import_camt/test_camt_file/camt_053_minimal_charges_03.xml
new file mode 100644
index 0000000..22b14a7
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_bank_statement_import_camt/test_camt_file/camt_053_minimal_charges_03.xml
@@ -0,0 +1,73 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<Document xmlns="urn:iso:std:iso:20022:tech:xsd:camt.053.001.04">
+  <BkToCstmrStmt>
+    <GrpHdr>
+      <MsgId>2514988305.2019-02-13</MsgId>
+      <CreDtTm>2019-02-13T15:27:15.66+02:00</CreDtTm>
+    </GrpHdr>
+    <Stmt>
+      <Id>2514988305.2019-02-13</Id>
+      <CreDtTm>2019-02-13T15:27:15.66+02:00</CreDtTm>
+      <Acct>
+        <Id>
+          <IBAN></IBAN>
+          <Othr>
+            <Id>112233</Id>
+          </Othr>
+        </Id>
+      </Acct>
+      <Bal>
+        <Tp>
+          <CdOrPrtry>
+            <Cd>OPBD</Cd>
+          </CdOrPrtry>
+        </Tp>
+        <Amt Ccy="USD">1000.00</Amt>
+        <CdtDbtInd>CRDT</CdtDbtInd>
+        <Dt>
+          <Dt>2019-02-12</Dt>
+        </Dt>
+      </Bal>
+      <Bal>
+        <Tp>
+          <CdOrPrtry>
+            <Cd>CLBD</Cd>
+          </CdOrPrtry>
+        </Tp>
+        <Amt Ccy="USD">1500.00</Amt>
+        <CdtDbtInd>CRDT</CdtDbtInd>
+        <Dt>
+          <Dt>2019-02-13</Dt>
+        </Dt>
+      </Bal>
+      <Ntry>
+        <Amt Ccy="USD">500.00</Amt>
+        <CdtDbtInd>CRDT</CdtDbtInd>
+        <Sts>BOOK</Sts>
+        <BkTxCd>
+          <Prtry>
+            <Cd>ABCD</Cd>
+          </Prtry>
+        </BkTxCd>
+        <NtryDtls>
+          <TxDtls>
+            <Amt Ccy="USD">505.00</Amt>
+            <CdtDbtInd>CRDT</CdtDbtInd>
+            <AmtDtls>
+              <InstdAmt>
+                <Amt Ccy="USD">505.00</Amt>
+              </InstdAmt>
+            </AmtDtls>
+            <Chrgs>
+              <Rcrd>
+                <Amt Ccy="USD">5.00</Amt>
+                <CdtDbtInd>DBIT</CdtDbtInd>
+                <ChrgInclInd>true</ChrgInclInd>
+              </Rcrd>
+            </Chrgs>
+          </TxDtls>
+        </NtryDtls>
+      </Ntry>
+    </Stmt>
+  </BkToCstmrStmt>
+</Document>
diff --git a/dev_odex30_accounting/odex30_account_bank_statement_import_camt/test_camt_file/camt_053_minimal_datetime.xml b/dev_odex30_accounting/odex30_account_bank_statement_import_camt/test_camt_file/camt_053_minimal_datetime.xml
new file mode 100644
index 0000000..bed9bb8
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_bank_statement_import_camt/test_camt_file/camt_053_minimal_datetime.xml
@@ -0,0 +1,55 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<Document xmlns="urn:iso:std:iso:20022:tech:xsd:camt.053.001.04">
+  <BkToCstmrStmt>
+    <GrpHdr>
+      <MsgId>2514988305.2019-02-13</MsgId>
+      <CreDtTm>2019-02-13T15:27:15.66+02:00</CreDtTm>
+    </GrpHdr>
+    <Stmt>
+      <Id>2514988305.2019-02-13</Id>
+      <CreDtTm>2019-02-13T15:27:15.66+02:00</CreDtTm>
+      <Acct>
+        <Id>
+          <IBAN></IBAN>
+          <Othr>
+            <Id>112233</Id>
+          </Othr>
+        </Id>
+      </Acct>
+      <Bal>
+        <Tp>
+          <CdOrPrtry>
+            <Cd>OPBD</Cd>
+          </CdOrPrtry>
+        </Tp>
+        <Amt Ccy="USD">1000.00</Amt>
+        <CdtDbtInd>CRDT</CdtDbtInd>
+        <Dt>
+          <DtTm>2019-02-13T21:00:00Z</DtTm>
+        </Dt>
+      </Bal>
+      <Bal>
+        <Tp>
+          <CdOrPrtry>
+            <Cd>CLBD</Cd>
+          </CdOrPrtry>
+        </Tp>
+        <Amt Ccy="USD">1500.00</Amt>
+        <CdtDbtInd>CRDT</CdtDbtInd>
+        <Dt>
+          <DtTm>2019-02-13T21:00:00Z</DtTm>
+        </Dt>
+      </Bal>
+      <Ntry>
+        <Amt Ccy="USD">500.00</Amt>
+        <CdtDbtInd>CRDT</CdtDbtInd>
+        <Sts>BOOK</Sts>
+        <BkTxCd>
+          <Prtry>
+            <Cd>ABCD</Cd>
+          </Prtry>
+        </BkTxCd>
+      </Ntry>
+    </Stmt>
+  </BkToCstmrStmt>
+</Document>
\ No newline at end of file
diff --git a/dev_odex30_accounting/odex30_account_bank_statement_import_camt/test_camt_file/camt_053_minimal_intraday.xml b/dev_odex30_accounting/odex30_account_bank_statement_import_camt/test_camt_file/camt_053_minimal_intraday.xml
new file mode 100644
index 0000000..cf5828f
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_bank_statement_import_camt/test_camt_file/camt_053_minimal_intraday.xml
@@ -0,0 +1,79 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<Document xmlns="urn:iso:std:iso:20022:tech:xsd:camt.053.001.04">
+  <BkToCstmrStmt>
+    <GrpHdr>
+      <MsgId>2514988305.2019-02-13</MsgId>
+      <CreDtTm>2019-02-13T15:27:15.66+02:00</CreDtTm>
+    </GrpHdr>
+    <Stmt>
+      <Id>2514988304.2019-02-13</Id>
+      <CreDtTm>2019-02-13T13:31:05.668+02:00</CreDtTm>
+      <Acct>
+        <Id>
+          <IBAN></IBAN>
+          <Othr>
+            <Id>445566</Id>
+          </Othr>
+        </Id>
+      </Acct>
+      <Bal>
+        <Tp>
+          <CdOrPrtry>
+            <Cd>ITBD</Cd>
+          </CdOrPrtry>
+        </Tp>
+        <Amt Ccy="CHF">0</Amt>
+        <CdtDbtInd>CRDT</CdtDbtInd>
+        <Dt>
+          <Dt>2019-02-13</Dt>
+        </Dt>
+      </Bal>
+    </Stmt>
+    <Stmt>
+      <Id>2514988305.2019-02-13</Id>
+      <CreDtTm>2019-02-13T15:27:15.66+02:00</CreDtTm>
+      <Acct>
+        <Id>
+          <IBAN></IBAN>
+          <Othr>
+            <Id>112233</Id>
+          </Othr>
+        </Id>
+      </Acct>
+      <Bal>
+        <Tp>
+          <CdOrPrtry>
+            <Cd>OPBD</Cd>
+          </CdOrPrtry>
+        </Tp>
+        <Amt Ccy="USD">1000.00</Amt>
+        <CdtDbtInd>CRDT</CdtDbtInd>
+        <Dt>
+          <Dt>2019-02-13</Dt>
+        </Dt>
+      </Bal>
+      <Bal>
+        <Tp>
+          <CdOrPrtry>
+            <Cd>CLBD</Cd>
+          </CdOrPrtry>
+        </Tp>
+        <Amt Ccy="USD">1500.00</Amt>
+        <CdtDbtInd>CRDT</CdtDbtInd>
+        <Dt>
+          <Dt>2019-02-13</Dt>
+        </Dt>
+      </Bal>
+      <Ntry>
+        <Amt Ccy="USD">500.00</Amt>
+        <CdtDbtInd>CRDT</CdtDbtInd>
+        <Sts>BOOK</Sts>
+        <BkTxCd>
+          <Prtry>
+            <Cd>ABCD</Cd>
+          </Prtry>
+        </BkTxCd>
+      </Ntry>
+    </Stmt>
+  </BkToCstmrStmt>
+</Document>
\ No newline at end of file
diff --git a/dev_odex30_accounting/odex30_account_bank_statement_import_camt/test_camt_file/camt_053_namespace.xml b/dev_odex30_accounting/odex30_account_bank_statement_import_camt/test_camt_file/camt_053_namespace.xml
new file mode 100644
index 0000000..b14cc0c
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_bank_statement_import_camt/test_camt_file/camt_053_namespace.xml
@@ -0,0 +1,55 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<camt:Document xmlns:camt="urn:iso:std:iso:20022:tech:xsd:camt.053.001.04">
+  <camt:BkToCstmrStmt>
+    <camt:GrpHdr>
+      <camt:MsgId>2514988305.2019-02-13</camt:MsgId>
+      <camt:CreDtTm>2019-02-13T15:27:15.66+02:00</camt:CreDtTm>
+    </camt:GrpHdr>
+    <camt:Stmt>
+      <camt:Id>2514988305.2019-02-13</camt:Id>
+      <camt:CreDtTm>2019-02-13T15:27:15.66+02:00</camt:CreDtTm>
+      <camt:Acct>
+        <camt:Id>
+          <camt:IBAN></camt:IBAN>
+          <camt:Othr>
+            <camt:Id>112233</camt:Id>
+          </camt:Othr>
+        </camt:Id>
+      </camt:Acct>
+      <camt:Bal>
+        <camt:Tp>
+          <camt:CdOrPrtry>
+            <camt:Cd>OPBD</camt:Cd>
+          </camt:CdOrPrtry>
+        </camt:Tp>
+        <camt:Amt Ccy="USD">1000.00</camt:Amt>
+        <camt:CdtDbtInd>CRDT</camt:CdtDbtInd>
+        <camt:Dt>
+          <camt:Dt>2019-02-12</camt:Dt>
+        </camt:Dt>
+      </camt:Bal>
+      <camt:Bal>
+        <camt:Tp>
+          <camt:CdOrPrtry>
+            <camt:Cd>CLBD</camt:Cd>
+          </camt:CdOrPrtry>
+        </camt:Tp>
+        <camt:Amt Ccy="USD">1500.00</camt:Amt>
+        <camt:CdtDbtInd>CRDT</camt:CdtDbtInd>
+        <camt:Dt>
+          <camt:Dt>2019-02-13</camt:Dt>
+        </camt:Dt>
+      </camt:Bal>
+      <camt:Ntry>
+        <camt:Amt Ccy="USD">500.00</camt:Amt>
+        <camt:CdtDbtInd>CRDT</camt:CdtDbtInd>
+        <camt:Sts>BOOK</camt:Sts>
+        <camt:BkTxCd>
+          <camt:Prtry>
+            <camt:Cd>ABCD</camt:Cd>
+          </camt:Prtry>
+        </camt:BkTxCd>
+      </camt:Ntry>
+    </camt:Stmt>
+  </camt:BkToCstmrStmt>
+</camt:Document>
diff --git a/dev_odex30_accounting/odex30_account_bank_statement_import_camt/test_camt_file/camt_053_sample.xml b/dev_odex30_accounting/odex30_account_bank_statement_import_camt/test_camt_file/camt_053_sample.xml
new file mode 100644
index 0000000..be4fe9c
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_bank_statement_import_camt/test_camt_file/camt_053_sample.xml
@@ -0,0 +1,948 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--Sample XML file generated by FFFS (www.fkl.fi) B2C project  to demonstrate FInnish statement of account, 2009-11-02-->
+<!--Attachment for Federation of Finnish Financial Services B2C Guideline for Finnish markets -description project -->
+<Document xmlns="urn:iso:std:iso:20022:tech:xsd:camt.053.001.02" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:iso:std:iso:20022:tech:xsd:camt.053.001.01
+camt.053.001.02.xsd">
+	<BkToCstmrStmt>
+		<GrpHdr>
+			<MsgId>BANKFILEID00001</MsgId>
+			<CreDtTm>2009-10-30T03:30:47+02:00</CreDtTm>
+			<!-- No need for message pagination (at this stage)-->
+		</GrpHdr>
+		<Stmt>
+			<!-- This ID identifies the statement at the bank (for example MT940 :20:)-->
+			<Id>BANKSTMTID0972009</Id>
+			<!-- Numbering to have audit for empty statements (may differ from Legal Number). Since this element is optional statement is valid also without it.  The Legal Sequence Number identifies the official statement number-->
+			<ElctrncSeqNb>120</ElctrncSeqNb>
+			<!-- Account Statement number (per Booking day, Periodical statements are inserted into same message but each day as own Stmt-instance -->
+			<!-- This number should be sequential and zero if this is an empty (without transactions, only the balances) statement because of audit trail -->
+			<!-- Note: Electronic Sequence Number starts from 1 in the beginning of camt-service (if bank is able to deliver it) and will increase without change to 1 in the each calendar year  -->
+			<LglSeqNb>97</LglSeqNb>
+			<CreDtTm>2009-10-30T02:00:00+02:00</CreDtTm>
+			<FrToDt>
+				<!-- Recommendation: One booking date from start of day till end of day-->
+				<!-- Each Balance instance has its own date to be used in the ERP database processing-->
+				<!-- Because of each balance instance on the statement has their correpsonding date, this structure may be omitted -->
+				<FrDtTm>2009-10-29T02:00:00+02:00</FrDtTm>
+				<ToDtTm>2009-10-29T21:00:00+02:00</ToDtTm>
+			</FrToDt>
+			<!-- Optional to indicate possible reporduction of the statement, not used at all if a "normal" one delivered statement -->
+			<!--	COPY is used for parallel statement delivered for two different customer id for same statement, DUPL is used if statement is reporduced by the request of the customer 
+			<CpyDplctInd>COPY</CpyDplctInd>
+			-->
+			<!-- Bank Account of which statement is reported -->
+			<Acct>
+				<Id>
+					<!-- always and only in IBAN format -->
+					<IBAN>FI7433010001222090</IBAN>
+				</Id>
+				<!-- optional info from the bank to identify account type, in this case Current account -->
+				<Tp>
+					<Cd>CACC</Cd>
+				</Tp>
+				<!-- "Main" Currency of the account.  In case of multicurrency account there should be own Stmt -instances for each currency pocket statement per booking date -->
+				<Ccy>EUR</Ccy>
+				<!-- Account owner per bank's register -->
+				<Ownr>
+					<Nm>BANK ACCOUNT OWNER</Nm>
+					<PstlAdr>
+						<StrtNm>HELSINGINKATU</StrtNm>
+						<BldgNb>31</BldgNb>
+						<PstCd>00100</PstCd>
+						<TwnNm>HELSINKI</TwnNm>
+						<Ctry>FI</Ctry>
+					</PstlAdr>
+					<Id>
+						<OrgId>
+							<Othr>
+								<!-- Finnish Organisation Id (Y-tunnus) -->
+								<Id>12345678901</Id>
+								<SchmeNm>
+									<!-- Recipient's bank Id.  In case of Finnish Y-tunnus use "CUST" -->
+									<Cd>BANK</Cd>
+								</SchmeNm>
+							</Othr>
+						</OrgId>
+					</Id>
+				</Ownr>
+				<!-- Reporting bank identified only by BIC but it is always available-->
+				<Svcr>
+					<FinInstnId>
+						<BIC>ESSEFIHX</BIC>
+					</FinInstnId>
+				</Svcr>
+			</Acct>
+			<RltdAcct>
+				<!-- Parent account of the current account and not used at all in case of single account reported within statement -->
+				<!-- TITO-structure of corporate group account statements is not repeated but Related Account info is enough to build up the structure at customer applications -->
+				<Id>
+					<IBAN>FI1533010001911270</IBAN>
+				</Id>
+				<Ccy>EUR</Ccy>
+			</RltdAcct>
+			<!-- Optional Interest terms and conditions reporting as statement level information for the reported bank account.  Level of this reporting is up to reporting bank -->
+			<!-- Actual Interest bookings (credits or debits) are done as normal statement bookings -->
+			<Intrst>
+				<Tp>
+					<!-- "normal" daily interest with INDY (if OVRN is reported it will be given in separate Intrst -instance) -->
+					<Cd>INDY</Cd>
+				</Tp>
+				<Rate>
+					<Tp>
+						<Othr>Business agreement</Othr>
+					</Tp>
+					<VldtyRg>
+						<Amt>
+							<FrToAmt>
+								<FrAmt>
+									<BdryAmt>0.00</BdryAmt>
+									<Incl>true</Incl>
+								</FrAmt>
+								<ToAmt>
+									<BdryAmt>1000000.00</BdryAmt>
+									<Incl>true</Incl>
+								</ToAmt>
+							</FrToAmt>
+						</Amt>
+						<CdtDbtInd>CRDT</CdtDbtInd>
+						<Ccy>EUR</Ccy>
+					</VldtyRg>
+				</Rate>
+			</Intrst>
+			<!-- Balances for the statement booking date reported -->
+			<!-- Minimum is to report OPBD and CLBD and in case of reporting the possible account limit value also the CLAV value inclduing the limit value (CLBD + limit = CLAV) -->
+			<!-- All other balances reported are based on bank implementation and are used for informative purposes -->
+			<!-- in case of later camt.052 B2C Account report for intra-day reports the ITAV and ITBD are used (not at all on camt.053 statement) -->
+			<Bal>
+				<Tp>
+					<CdOrPrtry>
+						<Cd>OPBD</Cd>
+					</CdOrPrtry>
+				</Tp>
+				<!-- Limit value (not included into the balance)-->
+				<CdtLine>
+					<Incl>false</Incl>
+					<Amt Ccy="EUR">10000.00</Amt>
+				</CdtLine>
+				<Amt Ccy="EUR">10000.00</Amt>
+				<CdtDbtInd>CRDT</CdtDbtInd>
+				<!-- OPBD reports the same date as the CLBD (in a daily statement) -->
+				<Dt>
+					<Dt>2009-10-29</Dt>
+				</Dt>
+			</Bal>
+			<!-- PRCD balance might also be used as complement for OPBD since it is recommended by SWIFT MT940-conversion guideline -->
+			<Bal>
+				<Tp>
+					<CdOrPrtry>
+						<Cd>PRCD</Cd>
+					</CdOrPrtry>
+				</Tp>
+				<CdtLine>
+					<Incl>false</Incl>
+					<Amt Ccy="EUR">10000.00</Amt>
+				</CdtLine>
+				<Amt Ccy="EUR">10000.00</Amt>
+				<CdtDbtInd>CRDT</CdtDbtInd>
+				<!-- Since PRCD must equal with previous camt.053 CLBD also the dates reported should equal: PRCD reports same date as the previous statements CLBD date -->
+				<Dt>
+					<Dt>2009-10-28</Dt>
+				</Dt>
+			</Bal>
+			<Bal>
+				<!-- Booked closing balanceOpening balance on the next banking date -->
+				<Tp>
+					<CdOrPrtry>
+						<Cd>CLBD</Cd>
+					</CdOrPrtry>
+				</Tp>
+				<!-- Limit value (not included into the balance)-->
+				<CdtLine>
+					<Incl>false</Incl>
+					<Amt Ccy="EUR">10000.00</Amt>
+				</CdtLine>
+				<Amt Ccy="EUR">23644.83</Amt>
+				<CdtDbtInd>CRDT</CdtDbtInd>
+				<!-- equals -->
+				<Dt>
+					<Dt>2009-10-29</Dt>
+				</Dt>
+			</Bal>
+			<Bal>
+				<!-- CLAV in Finnish TITO-meaning is to used to report CLBD + Credit Line and in this sense CLAV may be omitted because of OPBD and CLBD embedded credit line.  -->
+				<!-- When used to report meaning like MT940 64-tag info the CLAV is used to report funds available at the reported date based on the value date based bookings-->
+				<Tp>
+					<CdOrPrtry>
+						<Cd>CLAV</Cd>
+					</CdOrPrtry>
+				</Tp>
+				<Amt Ccy="EUR">33644.83</Amt>
+				<CdtDbtInd>CRDT</CdtDbtInd>
+				<Dt>
+					<Dt>2009-10-29</Dt>
+				</Dt>
+			</Bal>
+			<!-- additional optional summary information of the transactions.  To match current TITO at the minimun the statement (booking date) deposits and withdrawals should be reported-->
+			<TxsSummry>
+				<!-- total number of statement entries for reconciliation -->
+				<TtlNtries>
+					<NbOfNtries>10</NbOfNtries>
+				</TtlNtries>
+				<!-- Deposits)-->
+				<TtlCdtNtries>
+					<NbOfNtries>6</NbOfNtries>
+					<Sum>23075.00</Sum>
+				</TtlCdtNtries>
+				<!-- withdrawls)-->
+				<TtlDbtNtries>
+					<NbOfNtries>4</NbOfNtries>
+					<Sum>9430.17</Sum>
+				</TtlDbtNtries>
+				<!-- reporting transaction code based summaries if service is considered useful-->
+				<!--
+				<TtlNtriesPerBkTxCd>
+				</TtlNtriesPerBkTxCd> 
+				-->
+			</TxsSummry>
+			<!-- Here is the begiining of the transactions for the booking date 29.5.2009-->
+			<Ntry>
+				<!-- Transaction 1 as an sample of SALA batch  with elements filled both for PMJ-salaries as well as SCT SALA-->
+				<!-- Here only as collection, since in salaries the payment level details are not reported -->
+				<Amt Ccy="EUR">1000.12</Amt>
+				<CdtDbtInd>DBIT</CdtDbtInd>
+				<Sts>BOOK</Sts>
+				<BookgDt>
+					<Dt>2009-10-29</Dt>
+				</BookgDt>
+				<ValDt>
+					<Dt>2009-10-29</Dt>
+				</ValDt>
+				<!-- In case of separate Salary debit report (camt.054) is generated the banks' reference has to be in it as one matching term-->
+				<AcctSvcrRef>091029ACCTSTMTARCH01</AcctSvcrRef>
+				<BkTxCd>
+					<!-- In case of PMJ salaries as in the sample.  In case of SCT SALA PMNT/ICDT/ESCT + PurposeCode SALA) -->
+					<Domn>
+						<Cd>PMNT</Cd>
+						<Fmly>
+							<Cd>ICDT</Cd>
+							<SubFmlyCd>SALA</SubFmlyCd>
+						</Fmly>
+					</Domn>
+					<!-- Prtry used only in case of PMJ-salaries -->
+					<Prtry>
+						<Cd>NTRF+701TransactionCodeText</Cd>
+					</Prtry>
+				</BkTxCd>
+				<NtryDtls>
+					<Btch>
+						<!-- customer made batch and message-references (not in old TS but yes in SALA SCT in case that pain.001 is used and direct corresponding matching can be found).  Purpose: Reconciiation-->
+						<!-- Basic recommendation: as much as possible of the original payment instruction material that came from the customer into the bank-->
+						<MsgId>MSGSALA0001</MsgId>
+						<!-- in LM-batches this is an info given in the batch record and supported by most of the banks as the initiator batch level identification-->
+						<PmtInfId>CustRefForSalaBatch</PmtInfId>
+						<!-- customer made batch's transaction total by the initiated material.  Purpose: Reconciiation-->
+						<NbOfTxs>4</NbOfTxs>
+					</Btch>
+					<TxDtls>
+						<!-- used to specify what subtype (purpose code) of SCT SALA (category purpose and notice that tx code in this case is PMNT/ICDT/ESCT) debtor has used.  Not so critical on debtor stmts but on creditor it  is -->
+						<Purp>
+							<Cd>SALA</Cd>
+						</Purp>
+					</TxDtls>
+				</NtryDtls>
+			</Ntry>
+			<Ntry>
+				<!-- Transaction 2 / case of lump sum debit booking for a normal vendor payment batck (locl PMJ or SCT)-->
+				<!-- SCT lump sum booking logic is up to payment processing bank-->
+				<Amt Ccy="EUR">4000.00</Amt>
+				<CdtDbtInd>DBIT</CdtDbtInd>
+				<Sts>BOOK</Sts>
+				<BookgDt>
+					<Dt>2009-10-29</Dt>
+				</BookgDt>
+				<ValDt>
+					<Dt>2009-10-29</Dt>
+				</ValDt>
+				<!-- In case of separate payment debit report (camt.054) is generated the banks' reference has to be in it as one matching term-->
+				<AcctSvcrRef>091029ACCTSTMTARCH02</AcctSvcrRef>
+				<!-- In case of PMJ payments as in the sample.  In case of SCT PMNT/ICDT/ESCT with no purpose code) -->
+				<BkTxCd>
+					<Domn>
+						<Cd>PMNT</Cd>
+						<Fmly>
+							<Cd>ICDT</Cd>
+							<SubFmlyCd>DMCT</SubFmlyCd>
+						</Fmly>
+					</Domn>
+					<!-- Prtry used only in case of PMJ Payments-->
+					<Prtry>
+						<Cd>NTRF+702TransactionCodeText</Cd>
+					</Prtry>
+				</BkTxCd>
+				<NtryDtls>
+					<Btch>
+						<!-- customer made batch and message-references (not in old LM but yes in SCT in case that pain.001 is used and direct corresponding matching can be found).  Purpose: Reconciiation-->
+						<!-- Basic recommendation: as many original payment instruction ids that came from the customer into the bank should be reported -> and let the customer application to choose the ones for its reconciliation-->
+						<MsgId>MSGSCT0099</MsgId>
+						<PmtInfId>CustRefForPmtBatch</PmtInfId>
+						<!-- customer made batch's transaction total.  Purpose: Reconciiation-->
+						<NbOfTxs>3</NbOfTxs>
+					</Btch>
+				</NtryDtls>
+			</Ntry>
+			<Ntry>
+				<!-- Transaction 3 / alternative reporting for the transaction 2 when customer wants to have all in statment and not separate camt.054 advice -->
+				<Amt Ccy="EUR">4230.05</Amt>
+				<CdtDbtInd>DBIT</CdtDbtInd>
+				<Sts>BOOK</Sts>
+				<BookgDt>
+					<!--Booking date for all sub transactions in this entry -->
+					<Dt>2009-10-29</Dt>
+				</BookgDt>
+				<ValDt>
+					<!--Value date for all sub transactions in this entry -->
+					<Dt>2009-10-29</Dt>
+				</ValDt>
+				<AcctSvcrRef>091029ACCTSTMTARCH03</AcctSvcrRef>
+				<BkTxCd>
+					<Domn>
+						<Cd>PMNT</Cd>
+						<Fmly>
+							<Cd>ICDT</Cd>
+							<SubFmlyCd>DMCT</SubFmlyCd>
+						</Fmly>
+					</Domn>
+					<!-- Prtry used only in case of PMJ Payments-->
+					<Prtry>
+						<Cd>NTRF+702TransactionCodeText</Cd>
+					</Prtry>
+				</BkTxCd>
+				<NtryDtls>
+					<Btch>
+						<MsgId>MSGSCT0100</MsgId>
+						<PmtInfId>CustRefForPmtBatch9</PmtInfId>
+						<NbOfTxs>3</NbOfTxs>
+					</Btch>
+					<!-- Debit transaction details level depend on the source given by the originator in its payment material in different formats -->
+					<!-- Sufficient amount of references should be reported for reconciliation-->
+					<TxDtls>
+						<!-- Sub transaction no 1 of the batch /  with reference -->
+						<Refs>
+							<!-- The contents of Refs used depends on clearing system and / or availablle data on the instruction material -->
+							<AcctSvcrRef>091029ARCH03001</AcctSvcrRef>
+							<!-- Instruction Id to Indicate TITO_T11_06 id given from the initiator in specific LM-payment file field -->
+							<InstrId>TITOT1106ID01</InstrId>
+						</Refs>
+						<AmtDtls>
+							<TxAmt>
+								<Amt Ccy="EUR">2000.02</Amt>
+							</TxAmt>
+						</AmtDtls>
+						<RltdPties>
+							<Cdtr>
+								<Nm>Creditor Company</Nm>
+								<!-- unstructured address on LM based material -->
+								<PstlAdr>
+									<Ctry>FI</Ctry>
+									<AdrLine>Mannerheimintie 123</AdrLine>
+									<AdrLine>00100 Helsinki</AdrLine>
+								</PstlAdr>
+								<CtryOfRes>FI</CtryOfRes>
+							</Cdtr>
+							<!-- Creditor account in BBAN still in PMJ-transactions, banks don't convert internally into the reports creditor account on debtor reports -->
+							<CdtrAcct>
+								<Id>
+									<Othr>
+										<Id>29501800020582</Id>
+										<SchmeNm>
+											<Cd>BBAN</Cd>
+										</SchmeNm>
+									</Othr>
+								</Id>
+							</CdtrAcct>
+						</RltdPties>
+						<RmtInf>
+							<Strd>
+								<CdtrRefInf>
+									<Tp>
+										<CdOrPrtry>
+											<Cd>SCOR</Cd>
+										</CdOrPrtry>
+									</Tp>
+									<Ref>3900</Ref>
+								</CdtrRefInf>
+							</Strd>
+						</RmtInf>
+					</TxDtls>
+					<TxDtls>
+						<!-- Sub transaction no 2 of the batch /  with free text -->
+						<Refs>
+							<AcctSvcrRef>091029ARCH03002</AcctSvcrRef>
+							<InstrId>TITOT1106ID02</InstrId>
+						</Refs>
+						<AmtDtls>
+							<TxAmt>
+								<Amt Ccy="EUR">1000.01</Amt>
+							</TxAmt>
+						</AmtDtls>
+						<RltdPties>
+							<Cdtr>
+								<Nm>Creditor Company</Nm>
+								<PstlAdr>
+									<Ctry>FI</Ctry>
+									<AdrLine>Mannerheimintie 123</AdrLine>
+									<AdrLine>00100 Helsinki</AdrLine>
+								</PstlAdr>
+								<CtryOfRes>FI</CtryOfRes>
+							</Cdtr>
+							<CdtrAcct>
+								<Id>
+									<Othr>
+										<Id>29501800020582</Id>
+										<SchmeNm>
+											<Cd>BBAN</Cd>
+										</SchmeNm>
+									</Othr>
+								</Id>
+								<!-- Creditor Account Changed at Debtor bank for better routing according to Debtor and its bank agreement-->
+								<Tp>
+									<Prtry>ACWC</Prtry>
+								</Tp>
+							</CdtrAcct>
+						</RltdPties>
+						<RmtInf>
+							<Ustrd>Invoices 123 and 321</Ustrd>
+						</RmtInf>
+					</TxDtls>
+					<TxDtls>
+						<!-- Sub transaction no 3 of the batch /  with PMJ payment type code 2 (TITO T11-02) -->
+						<!-- One simple option is to write this type of remittance type into one Unstrcured instance-->
+						<Refs>
+							<AcctSvcrRef>091029ARCH03003</AcctSvcrRef>
+							<InstrId>TITOT1106ID03</InstrId>
+						</Refs>
+						<AmtDtls>
+							<TxAmt>
+								<Amt Ccy="EUR">1230.02</Amt>
+							</TxAmt>
+						</AmtDtls>
+						<RltdPties>
+							<Cdtr>
+								<Nm>Creditor Company</Nm>
+								<PstlAdr>
+									<Ctry>FI</Ctry>
+									<AdrLine>Mannerheimintie 123</AdrLine>
+									<AdrLine>00100 Helsinki</AdrLine>
+								</PstlAdr>
+								<CtryOfRes>FI</CtryOfRes>
+							</Cdtr>
+							<CdtrAcct>
+								<Id>
+									<Othr>
+										<Id>29501800020574</Id>
+										<SchmeNm>
+											<Cd>BBAN</Cd>
+										</SchmeNm>
+									</Othr>
+								</Id>
+							</CdtrAcct>
+						</RltdPties>
+						<RmtInf>
+							<Strd>
+								<RfrdDocInf>
+									<Tp>
+										<CdOrPrtry>
+											<Cd>CINV</Cd>
+										</CdOrPrtry>
+									</Tp>
+									<Nb>217827182718</Nb>
+								</RfrdDocInf>
+								<Invcee>
+									<Id>
+										<OrgId>
+											<Othr>
+												<Id>9102910</Id>
+											</Othr>
+										</OrgId>
+									</Id>
+								</Invcee>
+							</Strd>
+						</RmtInf>
+					</TxDtls>
+				</NtryDtls>
+			</Ntry>
+			<!-- Some Credit entry samples -->
+			<Ntry>
+				<!-- Transaction 4a / refers to sample camt.054 report in FI_camt.054_sample.xml and its first Entry-->
+				<Amt Ccy="EUR">2000.00</Amt>
+				<CdtDbtInd>CRDT</CdtDbtInd>
+				<Sts>BOOK</Sts>
+				<BookgDt>
+					<Dt>2009-10-29</Dt>
+				</BookgDt>
+				<ValDt>
+					<Dt>2009-10-29</Dt>
+				</ValDt>
+				<!-- Archiving code that matches account statement entry (don't care about the date)-->
+				<AcctSvcrRef>091029ACCTSTMTARCH04</AcctSvcrRef>
+				<BkTxCd>
+					<Domn>
+						<Cd>PMNT</Cd>
+						<Fmly>
+							<Cd>RCDT</Cd>
+							<SubFmlyCd>DMCT</SubFmlyCd>
+						</Fmly>
+					</Domn>
+					<Prtry>
+						<Cd>NTRF+705TransactionCodeText</Cd>
+					</Prtry>
+				</BkTxCd>
+				<NtryDtls>
+					<Btch>
+						<MsgId>BANKFILEID998765</MsgId>
+						<!-- customer made batch's transaction total.  Purpose: Reconciiation-->
+						<NbOfTxs>2</NbOfTxs>
+					</Btch>
+					<TxDtls>
+						<AmtDtls>
+							<TxAmt>
+								<Amt Ccy="EUR">2000.00</Amt>
+							</TxAmt>
+						</AmtDtls>
+					</TxDtls>
+				</NtryDtls>
+			</Ntry>
+			<Ntry>
+				<!-- Transaction 4b / refers to sample camt.054 report in FI_camt.054_sample.xml and its second Entry-->
+				<Amt Ccy="EUR">500.00</Amt>
+				<CdtDbtInd>CRDT</CdtDbtInd>
+				<Sts>BOOK</Sts>
+				<BookgDt>
+					<Dt>2009-10-29</Dt>
+				</BookgDt>
+				<ValDt>
+					<Dt>2009-10-29</Dt>
+				</ValDt>
+				<!-- Archiving code that matches account statement entry (don't care about the date)-->
+				<AcctSvcrRef>091029ACCTSTMTARCH21</AcctSvcrRef>
+				<BkTxCd>
+					<Domn>
+						<Cd>PMNT</Cd>
+						<Fmly>
+							<Cd>RDDT</Cd>
+							<SubFmlyCd>PMDD</SubFmlyCd>
+						</Fmly>
+					</Domn>
+					<Prtry>
+						<Cd>NTRF+705TransactionCodeText</Cd>
+					</Prtry>
+				</BkTxCd>
+				<NtryDtls>
+					<Btch>
+						<MsgId>BANKFILEID998799</MsgId>
+						<!-- customer made batch's transaction total.  Purpose: Reconciiation-->
+						<NbOfTxs>2</NbOfTxs>
+					</Btch>
+					<TxDtls>
+						<AmtDtls>
+							<TxAmt>
+								<Amt Ccy="EUR">500.00</Amt>
+							</TxAmt>
+						</AmtDtls>
+					</TxDtls>
+				</NtryDtls>
+			</Ntry>
+			<Ntry>
+				<!-- Transaction 5 / refers to sample camt.054 report in FI_camt.054_sample.xml and its third Entry-->
+				<Amt Ccy="EUR">3000.00</Amt>
+				<CdtDbtInd>CRDT</CdtDbtInd>
+				<Sts>BOOK</Sts>
+				<BookgDt>
+					<Dt>2009-10-29</Dt>
+				</BookgDt>
+				<ValDt>
+					<Dt>2009-10-29</Dt>
+				</ValDt>
+				<AcctSvcrRef>091029ACCTSTMTARCH05</AcctSvcrRef>
+				<BkTxCd>
+					<Domn>
+						<Cd>PMNT</Cd>
+						<Fmly>
+							<Cd>RCDT</Cd>
+							<SubFmlyCd>ESCT</SubFmlyCd>
+						</Fmly>
+					</Domn>
+				</BkTxCd>
+				<NtryDtls>
+					<Btch>
+						<MsgId>BANKFILEID998765</MsgId>
+						<!-- customer made batch's transaction total.  Purpose: Reconciiation-->
+						<NbOfTxs>2</NbOfTxs>
+					</Btch>
+					<TxDtls>
+						<AmtDtls>
+							<TxAmt>
+								<Amt Ccy="EUR">3000.00</Amt>
+							</TxAmt>
+						</AmtDtls>
+					</TxDtls>
+				</NtryDtls>
+			</Ntry>
+			<!-- Transaction 6 is an incoming international payment -->
+			<Ntry>
+				<Amt Ccy="EUR">2120.00</Amt>
+				<CdtDbtInd>CRDT</CdtDbtInd>
+				<Sts>BOOK</Sts>
+				<BookgDt>
+					<Dt>2009-10-29</Dt>
+				</BookgDt>
+				<!-- May differ from booking date on non-PSD (or one-leg) transactions -->
+				<ValDt>
+					<Dt>2009-10-30</Dt>
+				</ValDt>
+				<AcctSvcrRef>091029ACCTSTMTARCH06</AcctSvcrRef>
+				<BkTxCd>
+					<Domn>
+						<Cd>PMNT</Cd>
+						<Fmly>
+							<Cd>RCDT</Cd>
+							<SubFmlyCd>XBCT</SubFmlyCd>
+						</Fmly>
+					</Domn>
+				</BkTxCd>
+				<NtryDtls>
+					<TxDtls>
+						<Refs>
+							<!-- Reference used by the Debtor banks-->
+							<InstrId>ISSRBKREF12345678</InstrId>
+							<TxId>ISSRBKREF12345678</TxId>
+						</Refs>
+						<!-- specification of counter values (TITO T11_05) -->
+						<AmtDtls>
+							<!-- Amount as original -->
+							<InstdAmt>
+								<Amt Ccy="USD">3200.00</Amt>
+								<CcyXchg>
+									<SrcCcy>USD</SrcCcy>
+									<TrgtCcy>EUR</TrgtCcy>
+									<!-- denomintor currency in the Exchange rate factor: Exchange rate = Unit Curerency / Quoted Currency -->
+									<UnitCcy>EUR</UnitCcy>
+									<XchgRate>0.666667</XchgRate>
+									<CtrctId>FX12345</CtrctId>
+									<QtnDt>2009-10-29T10:00:00+02:00</QtnDt>
+								</CcyXchg>
+							</InstdAmt>
+							<TxAmt>
+								<Amt Ccy="EUR">2120.00</Amt>
+							</TxAmt>
+							<!-- Amount as CounterValue, usually used only for other than EUR-accounts to support EUR-based book keeping of the end-customers-->
+							<CntrValAmt>
+								<Amt Ccy="EUR">2120.00</Amt>
+								<CcyXchg>
+									<SrcCcy>USD</SrcCcy>
+									<TrgtCcy>EUR</TrgtCcy>
+									<UnitCcy>EUR</UnitCcy>
+									<XchgRate>0.666667</XchgRate>
+									<CtrctId>FX12345</CtrctId>
+									<QtnDt>2009-10-29T10:00:00+02:00</QtnDt>
+								</CcyXchg>
+							</CntrValAmt>
+						</AmtDtls>
+						<!-- in case of netted booking, debited charges are given like this.  Note!  Charges can be given without amount deduction also as an information!-->
+						<Chrgs>
+							<Amt Ccy="EUR">20.00</Amt>
+							<Tp>
+								<Cd>COMM</Cd>
+							</Tp>
+						</Chrgs>
+						<RltdPties>
+							<Dbtr>
+								<Nm>DEBTOR NAME</Nm>
+								<!-- Usually OrgId is not available in inernational money transfers -->
+								<Id>
+									<OrgId>
+										<Othr>
+											<Id>123456789</Id>
+											<SchmeNm>
+												<Cd>DUNS</Cd>
+											</SchmeNm>
+										</Othr>
+									</OrgId>
+								</Id>
+							</Dbtr>
+						</RltdPties>
+						<RltdAgts>
+							<DbtrAgt>
+								<FinInstnId>
+									<BIC>BOFAUS6H</BIC>
+								</FinInstnId>
+							</DbtrAgt>
+						</RltdAgts>
+						<RmtInf>
+							<Ustrd>INVOICE US20291092</Ustrd>
+						</RmtInf>
+					</TxDtls>
+				</NtryDtls>
+			</Ntry>
+			<!-- Transaction 7 as a sample of priority payment reporting-->
+			<Ntry>
+				<!-- Transaction 7-->
+				<Amt Ccy="EUR">5455.00</Amt>
+				<CdtDbtInd>CRDT</CdtDbtInd>
+				<Sts>BOOK</Sts>
+				<BookgDt>
+					<Dt>2009-10-29</Dt>
+				</BookgDt>
+				<ValDt>
+					<Dt>2009-10-29</Dt>
+				</ValDt>
+				<AcctSvcrRef>091029ACCTSTMTARCH07</AcctSvcrRef>
+				<BkTxCd>
+					<Domn>
+						<Cd>PMNT</Cd>
+						<Fmly>
+							<Cd>RCDT</Cd>
+							<!-- Priority Credit Transfer-->
+							<SubFmlyCd>PRCT</SubFmlyCd>
+						</Fmly>
+					</Domn>
+				</BkTxCd>
+				<NtryDtls>
+					<TxDtls>
+						<Refs>
+							<!-- Reference used by the Debtor banks -->
+							<InstrId>BKREFDBT0101010</InstrId>
+							<TxId>BKREFDBT0101010</TxId>
+						</Refs>
+						<AmtDtls>
+							<!-- Amount as original -->
+							<InstdAmt>
+								<Amt Ccy="EUR">5500.00</Amt>
+							</InstdAmt>
+							<TxAmt>
+								<Amt Ccy="EUR">5455.00</Amt>
+							</TxAmt>
+						</AmtDtls>
+						<Chrgs>
+							<Amt Ccy="EUR">45.00</Amt>
+							<Tp>
+								<Cd>COMM</Cd>
+							</Tp>
+						</Chrgs>
+						<RltdPties>
+							<Dbtr>
+								<Nm>PAYERS NAME2</Nm>
+								<PstlAdr>
+									<StrtNm>GOVERN STREET</StrtNm>
+									<BldgNb>22</BldgNb>
+									<PstCd>291092</PstCd>
+									<TwnNm>LONDON</TwnNm>
+									<Ctry>UK</Ctry>
+								</PstlAdr>
+								<Id>
+									<OrgId>
+										<Othr>
+											<Id>123456789</Id>
+											<SchmeNm>
+												<Cd>EANG</Cd>
+											</SchmeNm>
+										</Othr>
+									</OrgId>
+								</Id>
+							</Dbtr>
+						</RltdPties>
+						<RltdAgts>
+							<DbtrAgt>
+								<FinInstnId>
+									<BIC>BOFSGB22</BIC>
+								</FinInstnId>
+							</DbtrAgt>
+						</RltdAgts>
+						<RmtInf>
+							<Strd>
+								<RfrdDocAmt>
+									<RmtdAmt Ccy="EUR">5500.00</RmtdAmt>
+								</RfrdDocAmt>
+								<CdtrRefInf>
+									<Tp>
+										<CdOrPrtry>
+											<Cd>SCOR</Cd>
+										</CdOrPrtry>
+										<Issr>ISO</Issr>
+									</Tp>
+									<Ref>RF98123456789012</Ref>
+								</CdtrRefInf>
+							</Strd>
+						</RmtInf>
+					</TxDtls>
+				</NtryDtls>
+			</Ntry>
+			<!--Transaction 8/ Single incoming SCT-->
+			<Ntry>
+				<Amt Ccy="EUR">10000.00</Amt>
+				<CdtDbtInd>CRDT</CdtDbtInd>
+				<Sts>BOOK</Sts>
+				<BookgDt>
+					<Dt>2009-10-29</Dt>
+				</BookgDt>
+				<ValDt>
+					<Dt>2009-10-29</Dt>
+				</ValDt>
+				<AcctSvcrRef>091029ACCTSTMTARCH08</AcctSvcrRef>
+				<BkTxCd>
+					<Domn>
+						<Cd>PMNT</Cd>
+						<Fmly>
+							<Cd>RCDT</Cd>
+							<SubFmlyCd>ESCT</SubFmlyCd>
+						</Fmly>
+					</Domn>
+				</BkTxCd>
+				<NtryDtls>
+					<TxDtls>
+						<Refs>
+							<EndToEndId>EndToEndIdSCT01</EndToEndId>
+						</Refs>
+						<!-- EPC recommendation -->
+						<AmtDtls>
+							<TxAmt>
+								<Amt Ccy="EUR">10000.00</Amt>
+							</TxAmt>
+						</AmtDtls>
+						<RltdPties>
+							<Dbtr>
+								<Nm>DEBTOR</Nm>
+							</Dbtr>
+							<UltmtDbtr>
+								<Nm>ULTIMATE DEBTOR</Nm>
+								<Id>
+									<OrgId>
+										<Othr>
+											<Id>987654321</Id>
+											<SchmeNm>
+												<Cd>TXID</Cd>
+											</SchmeNm>
+										</Othr>
+									</OrgId>
+								</Id>
+							</UltmtDbtr>
+						</RltdPties>
+						<RltdAgts>
+							<DbtrAgt>
+								<FinInstnId>
+									<BIC>NDEAFIHH</BIC>
+								</FinInstnId>
+							</DbtrAgt>
+						</RltdAgts>
+						<Purp>
+							<Cd>TREA</Cd>
+						</Purp>
+						<RmtInf>
+							<Strd>
+								<CdtrRefInf>
+									<Tp>
+										<CdOrPrtry>
+											<Cd>SCOR</Cd>
+										</CdOrPrtry>
+										<Issr>ISO</Issr>
+									</Tp>
+									<Ref>RF98123456789012</Ref>
+								</CdtrRefInf>
+							</Strd>
+						</RmtInf>
+						<RltdDts>
+							<AccptncDtTm>2009-10-28T03:00:00+02:00</AccptncDtTm>
+						</RltdDts>
+					</TxDtls>
+				</NtryDtls>
+			</Ntry>
+			<Ntry>
+				<!-- Transaction 9 as an sample of bank charges debit that can be applied to Interest too if bank has possibility to do such a reporting-->
+				<!-- Maybe iomplemented for the interest reporting too-->
+				<Amt Ccy="EUR">200.00</Amt>
+				<CdtDbtInd>DBIT</CdtDbtInd>
+				<Sts>BOOK</Sts>
+				<BookgDt>
+					<Dt>2009-10-29</Dt>
+				</BookgDt>
+				<ValDt>
+					<Dt>2009-10-29</Dt>
+				</ValDt>
+				<AcctSvcrRef>091029ACCTSTMTARCH09</AcctSvcrRef>
+				<!-- generic Family code to give possibility to report  received PMNT charges with sub types for DMCT and ESCT-->
+				<BkTxCd>
+					<Domn>
+						<Cd>PMNT</Cd>
+						<Fmly>
+							<Cd>RCDT</Cd>
+							<SubFmlyCd>CHRG</SubFmlyCd>
+						</Fmly>
+					</Domn>
+				</BkTxCd>
+				<NtryDtls>
+					<!-- TX-details defining the type specific charges -->
+					<!-- PMJ received Payments -->
+					<TxDtls>
+						<Refs>
+							<AcctSvcrRef>091029ARCH09001</AcctSvcrRef>
+						</Refs>
+						<AmtDtls>
+							<TxAmt>
+								<Amt Ccy="EUR">100.00</Amt>
+							</TxAmt>
+						</AmtDtls>
+						<BkTxCd>
+							<Domn>
+								<Cd>PMNT</Cd>
+								<Fmly>
+									<Cd>RCDT</Cd>
+									<SubFmlyCd>DMCT</SubFmlyCd>
+								</Fmly>
+							</Domn>
+						</BkTxCd>
+						<RltdPties>
+							<Dbtr>
+								<Nm>SEB Merchant Banking Finland</Nm>
+							</Dbtr>
+						</RltdPties>
+						<RltdQties>
+							<Qty>
+								<Unit>10000</Unit>
+							</Qty>
+						</RltdQties>
+					</TxDtls>
+					<!-- SEPA Received  Payments -->
+					<TxDtls>
+						<Refs>
+							<AcctSvcrRef>091029ARCH09001</AcctSvcrRef>
+						</Refs>
+						<AmtDtls>
+							<TxAmt>
+								<Amt Ccy="EUR">100.00</Amt>
+							</TxAmt>
+						</AmtDtls>
+						<BkTxCd>
+							<Domn>
+								<Cd>PMNT</Cd>
+								<Fmly>
+									<Cd>RCDT</Cd>
+									<SubFmlyCd>ESCT</SubFmlyCd>
+								</Fmly>
+							</Domn>
+						</BkTxCd>
+						<RltdPties>
+							<Dbtr>
+								<Nm>SEB Merchant Banking Finland</Nm>
+							</Dbtr>
+						</RltdPties>
+						<RltdQties>
+							<Qty>
+								<Unit>150000</Unit>
+							</Qty>
+						</RltdQties>
+					</TxDtls>
+				</NtryDtls>
+			</Ntry>
+		</Stmt>
+	</BkToCstmrStmt>
+</Document>
diff --git a/dev_odex30_accounting/odex30_account_bank_statement_import_camt/test_camt_file/camt_053_several_ibans.xml b/dev_odex30_accounting/odex30_account_bank_statement_import_camt/test_camt_file/camt_053_several_ibans.xml
new file mode 100644
index 0000000..a2ce288
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_bank_statement_import_camt/test_camt_file/camt_053_several_ibans.xml
@@ -0,0 +1,96 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<Document xmlns="urn:iso:std:iso:20022:tech:xsd:camt.053.001.04">
+  <BkToCstmrStmt>
+    <GrpHdr>
+      <MsgId>2514988305.2019-05-23</MsgId>
+      <CreDtTm>2019-05-23T15:27:15.66+02:00</CreDtTm>
+    </GrpHdr>
+    <Stmt>
+      <Id>2514988305.2019-05-23</Id>
+      <CreDtTm>2019-05-23T15:27:15.66+02:00</CreDtTm>
+      <Acct>
+        <Id>
+          <IBAN>BE86 6635 9439 7150</IBAN>  <!-- This IBAN is valid but the bank does not exists -->
+        </Id>
+      </Acct>
+      <Bal>
+        <Tp>
+          <CdOrPrtry>
+            <Cd>OPBD</Cd>
+          </CdOrPrtry>
+        </Tp>
+        <Amt Ccy="USD">1000.00</Amt>
+        <CdtDbtInd>CRDT</CdtDbtInd>
+        <Dt>
+          <Dt>2019-05-22</Dt>
+        </Dt>
+      </Bal>
+      <Bal>
+        <Tp>
+          <CdOrPrtry>
+            <Cd>CLBD</Cd>
+          </CdOrPrtry>
+        </Tp>
+        <Amt Ccy="USD">1600.00</Amt>
+        <CdtDbtInd>CRDT</CdtDbtInd>
+        <Dt>
+          <Dt>2019-05-23</Dt>
+        </Dt>
+      </Bal>
+      <Ntry>
+        <Amt Ccy="USD">600.00</Amt>
+        <CdtDbtInd>CRDT</CdtDbtInd>
+        <Sts>BOOK</Sts>
+        <BkTxCd>
+          <Prtry>
+            <Cd>ABCD</Cd>
+          </Prtry>
+        </BkTxCd>
+      </Ntry>
+    </Stmt>
+
+    <Stmt>
+      <Id>2514988305.2019-05-23</Id>
+      <CreDtTm>2019-05-23T15:27:15.66+02:00</CreDtTm>
+      <Acct>
+        <Id>
+          <IBAN>BE79 5390 0754 6933</IBAN>  <!-- This IBAN is valid but the bank does not exists -->
+        </Id>
+      </Acct>
+      <Bal>
+        <Tp>
+          <CdOrPrtry>
+            <Cd>OPBD</Cd>
+          </CdOrPrtry>
+        </Tp>
+        <Amt Ccy="USD">100.00</Amt>
+        <CdtDbtInd>CRDT</CdtDbtInd>
+        <Dt>
+          <Dt>2019-05-22</Dt>
+        </Dt>
+      </Bal>
+      <Bal>
+        <Tp>
+          <CdOrPrtry>
+            <Cd>CLBD</Cd>
+          </CdOrPrtry>
+        </Tp>
+        <Amt Ccy="USD">150.00</Amt>
+        <CdtDbtInd>CRDT</CdtDbtInd>
+        <Dt>
+          <Dt>2019-05-23</Dt>
+        </Dt>
+      </Bal>
+      <Ntry>
+        <Amt Ccy="USD">50.00</Amt>
+        <CdtDbtInd>CRDT</CdtDbtInd>
+        <Sts>BOOK</Sts>
+        <BkTxCd>
+          <Prtry>
+            <Cd>ABCD</Cd>
+          </Prtry>
+        </BkTxCd>
+      </Ntry>
+    </Stmt>
+  </BkToCstmrStmt>
+</Document>
\ No newline at end of file
diff --git a/dev_odex30_accounting/odex30_account_bank_statement_import_camt/test_camt_file/camt_053_several_minimal_stmt_different_currency.xml b/dev_odex30_accounting/odex30_account_bank_statement_import_camt/test_camt_file/camt_053_several_minimal_stmt_different_currency.xml
new file mode 100644
index 0000000..6628923
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_bank_statement_import_camt/test_camt_file/camt_053_several_minimal_stmt_different_currency.xml
@@ -0,0 +1,103 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<Document xmlns="urn:iso:std:iso:20022:tech:xsd:camt.053.001.04">
+  <BkToCstmrStmt>
+    <GrpHdr>
+      <MsgId>2514988305.2019-02-13</MsgId>
+      <CreDtTm>2019-02-13T15:27:15.66+02:00</CreDtTm>
+    </GrpHdr>
+    <Stmt>
+      <Id>2514988305.2019-02-13</Id>
+      <CreDtTm>2019-02-13T15:27:15.66+02:00</CreDtTm>
+      <Acct>
+        <Id>
+          <IBAN></IBAN>
+          <Othr>
+            <Id>112233</Id>
+          </Othr>
+        </Id>
+        <Ccy>USD</Ccy>
+      </Acct>
+      <Bal>
+        <Tp>
+          <CdOrPrtry>
+            <Cd>OPBD</Cd>
+          </CdOrPrtry>
+        </Tp>
+        <Amt Ccy="USD">1000.00</Amt>
+        <CdtDbtInd>CRDT</CdtDbtInd>
+        <Dt>
+          <Dt>2019-02-12</Dt>
+        </Dt>
+      </Bal>
+      <Bal>
+        <Tp>
+          <CdOrPrtry>
+            <Cd>CLBD</Cd>
+          </CdOrPrtry>
+        </Tp>
+        <Amt Ccy="USD">1500.00</Amt>
+        <CdtDbtInd>CRDT</CdtDbtInd>
+        <Dt>
+          <Dt>2019-02-13</Dt>
+        </Dt>
+      </Bal>
+      <Ntry>
+        <Amt Ccy="USD">500.00</Amt>
+        <CdtDbtInd>CRDT</CdtDbtInd>
+        <Sts>BOOK</Sts>
+        <BkTxCd>
+          <Prtry>
+            <Cd>ABCD</Cd>
+          </Prtry>
+        </BkTxCd>
+      </Ntry>
+    </Stmt>
+    <Stmt>
+      <Id>2514988305.2019-02-13</Id>
+      <CreDtTm>2019-02-13T15:27:15.66+02:00</CreDtTm>
+      <Acct>
+        <Id>
+          <IBAN></IBAN>
+          <Othr>
+            <Id>112233</Id>
+          </Othr>
+        </Id>
+        <Ccy>EUR</Ccy>
+      </Acct>
+      <Bal>
+        <Tp>
+          <CdOrPrtry>
+            <Cd>OPBD</Cd>
+          </CdOrPrtry>
+        </Tp>
+        <Amt Ccy="EUR">2000.00</Amt>
+        <CdtDbtInd>CRDT</CdtDbtInd>
+        <Dt>
+          <Dt>2019-02-12</Dt>
+        </Dt>
+      </Bal>
+      <Bal>
+        <Tp>
+          <CdOrPrtry>
+            <Cd>CLBD</Cd>
+          </CdOrPrtry>
+        </Tp>
+        <Amt Ccy="EUR">3000.00</Amt>
+        <CdtDbtInd>CRDT</CdtDbtInd>
+        <Dt>
+          <Dt>2019-02-13</Dt>
+        </Dt>
+      </Bal>
+      <Ntry>
+        <Amt Ccy="EUR">1000.00</Amt>
+        <CdtDbtInd>CRDT</CdtDbtInd>
+        <Sts>BOOK</Sts>
+        <BkTxCd>
+          <Prtry>
+            <Cd>ABCD</Cd>
+          </Prtry>
+        </BkTxCd>
+      </Ntry>
+    </Stmt>
+  </BkToCstmrStmt>
+</Document>
diff --git a/dev_odex30_accounting/odex30_account_bank_statement_import_camt/test_camt_file/camt_053_several_tx_details.xml b/dev_odex30_accounting/odex30_account_bank_statement_import_camt/test_camt_file/camt_053_several_tx_details.xml
new file mode 100644
index 0000000..9f732b2
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_bank_statement_import_camt/test_camt_file/camt_053_several_tx_details.xml
@@ -0,0 +1,94 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<Document xmlns="urn:iso:std:iso:20022:tech:xsd:camt.053.001.04">
+  <BkToCstmrStmt>
+    <GrpHdr>
+      <MsgId>2514988305.2019-02-13</MsgId>
+      <CreDtTm>2019-02-13T15:27:15.66+02:00</CreDtTm>
+    </GrpHdr>
+    <Stmt>
+      <Id>2514988305.2019-02-13</Id>
+      <CreDtTm>2019-02-13T15:27:15.66+02:00</CreDtTm>
+      <Acct>
+        <Id>
+          <IBAN></IBAN>
+          <Othr>
+            <Id>112233</Id>
+          </Othr>
+        </Id>
+      </Acct>
+      <Bal>
+        <Tp>
+          <CdOrPrtry>
+            <Cd>OPBD</Cd>
+          </CdOrPrtry>
+        </Tp>
+        <Amt Ccy="USD">1000.00</Amt>
+        <CdtDbtInd>CRDT</CdtDbtInd>
+        <Dt>
+          <Dt>2019-02-12</Dt>
+        </Dt>
+      </Bal>
+      <Bal>
+        <Tp>
+          <CdOrPrtry>
+            <Cd>CLBD</Cd>
+          </CdOrPrtry>
+        </Tp>
+        <Amt Ccy="USD">1500.00</Amt>
+        <CdtDbtInd>CRDT</CdtDbtInd>
+        <Dt>
+          <Dt>2019-02-13</Dt>
+        </Dt>
+      </Bal>
+      <Ntry>
+        <Amt Ccy="USD">500.00</Amt>
+        <CdtDbtInd>CRDT</CdtDbtInd>
+        <Sts>BOOK</Sts>
+        <BkTxCd>
+          <Prtry>
+            <Cd>ABCD</Cd>
+          </Prtry>
+        </BkTxCd>
+        <NtryDtls>
+          <Btch>
+            <MsgId>MSGSALA0001</MsgId>
+            <PmtInfId>CustRefForSalaBatch</PmtInfId>
+            <NbOfTxs>3</NbOfTxs>
+            <TtlAmt Ccy="USD">500.0</TtlAmt>
+            <CdtDbtInd>CRDT</CdtDbtInd>
+          </Btch>
+          <TxDtls>
+            <AmtDtls>
+              <TxAmt>
+                <Amt Ccy="USD">100</Amt>
+              </TxAmt>
+            </AmtDtls>
+            <RmtInf>
+              <Ustrd>label01</Ustrd>
+            </RmtInf>
+          </TxDtls>
+          <TxDtls>
+            <AmtDtls>
+              <TxAmt>
+                <Amt Ccy="USD">150</Amt>
+              </TxAmt>
+            </AmtDtls>
+            <RmtInf>
+              <Ustrd>label02</Ustrd>
+            </RmtInf>
+          </TxDtls>
+          <TxDtls>
+            <AmtDtls>
+              <TxAmt>
+                <Amt Ccy="USD">250</Amt>
+              </TxAmt>
+            </AmtDtls>
+            <RmtInf>
+              <Ustrd>label03</Ustrd>
+            </RmtInf>
+          </TxDtls>
+        </NtryDtls>
+      </Ntry>
+    </Stmt>
+  </BkToCstmrStmt>
+</Document>
diff --git a/dev_odex30_accounting/odex30_account_bank_statement_import_camt/test_camt_file/camt_053_several_tx_details_and_charges.xml b/dev_odex30_accounting/odex30_account_bank_statement_import_camt/test_camt_file/camt_053_several_tx_details_and_charges.xml
new file mode 100644
index 0000000..b45cdb0
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_bank_statement_import_camt/test_camt_file/camt_053_several_tx_details_and_charges.xml
@@ -0,0 +1,108 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<Document xmlns="urn:iso:std:iso:20022:tech:xsd:camt.053.001.04">
+  <BkToCstmrStmt>
+    <GrpHdr>
+      <MsgId>2514988305.2019-02-13</MsgId>
+      <CreDtTm>2019-02-13T15:27:15.66+02:00</CreDtTm>
+    </GrpHdr>
+    <Stmt>
+      <Id>2514988305.2019-02-13</Id>
+      <CreDtTm>2019-02-13T15:27:15.66+02:00</CreDtTm>
+      <Acct>
+        <Id>
+          <IBAN></IBAN>
+          <Othr>
+            <Id>112233</Id>
+          </Othr>
+        </Id>
+      </Acct>
+      <Bal>
+        <Tp>
+          <CdOrPrtry>
+            <Cd>OPBD</Cd>
+          </CdOrPrtry>
+        </Tp>
+        <Amt Ccy="USD">1000.00</Amt>
+        <CdtDbtInd>CRDT</CdtDbtInd>
+        <Dt>
+          <Dt>2019-02-12</Dt>
+        </Dt>
+      </Bal>
+      <Bal>
+        <Tp>
+          <CdOrPrtry>
+            <Cd>CLBD</Cd>
+          </CdOrPrtry>
+        </Tp>
+        <Amt Ccy="USD">1500.00</Amt>
+        <CdtDbtInd>CRDT</CdtDbtInd>
+        <Dt>
+          <Dt>2019-02-13</Dt>
+        </Dt>
+      </Bal>
+      <Ntry>
+        <Amt Ccy="USD">500.00</Amt>
+        <CdtDbtInd>CRDT</CdtDbtInd>
+        <Sts>BOOK</Sts>
+        <BkTxCd>
+          <Prtry>
+            <Cd>ABCD</Cd>
+          </Prtry>
+        </BkTxCd>
+        <Chrgs>
+          <TtlChrgsAndTaxAmt Ccy="USD">15</TtlChrgsAndTaxAmt>
+          <Rcrd>
+            <Amt Ccy="USD">15</Amt>
+            <CdtDbtInd>CRDT</CdtDbtInd>
+            <ChrgInclInd>false</ChrgInclInd>
+          </Rcrd>
+        </Chrgs>
+        <NtryDtls>
+          <Btch>
+            <MsgId>MSGSALA0001</MsgId>
+            <PmtInfId>CustRefForSalaBatch</PmtInfId>
+            <NbOfTxs>3</NbOfTxs>
+            <TtlAmt Ccy="USD">500.0</TtlAmt>
+            <CdtDbtInd>CRDT</CdtDbtInd>
+          </Btch>
+          <TxDtls>
+            <Amt Ccy="USD">100</Amt>
+            <CdtDbtInd>CRDT</CdtDbtInd>
+            <Chrgs>
+              <Rcrd>
+                <Amt Ccy="CHF">6</Amt>
+              </Rcrd>
+            </Chrgs>
+            <RmtInf>
+              <Ustrd>label01</Ustrd>
+            </RmtInf>
+          </TxDtls>
+          <TxDtls>
+            <Amt Ccy="USD">150</Amt>
+            <CdtDbtInd>CRDT</CdtDbtInd>
+            <Chrgs>
+              <Rcrd>
+                <Amt Ccy="CHF">5</Amt>
+              </Rcrd>
+            </Chrgs>
+            <RmtInf>
+              <Ustrd>label02</Ustrd>
+            </RmtInf>
+          </TxDtls>
+          <TxDtls>
+            <Amt Ccy="USD">250</Amt>
+            <CdtDbtInd>CRDT</CdtDbtInd>
+            <Chrgs>
+              <Rcrd>
+                <Amt Ccy="CHF">4</Amt>
+              </Rcrd>
+            </Chrgs>
+            <RmtInf>
+              <Ustrd>label03</Ustrd>
+            </RmtInf>
+          </TxDtls>
+        </NtryDtls>
+      </Ntry>
+    </Stmt>
+  </BkToCstmrStmt>
+</Document>
diff --git a/dev_odex30_accounting/odex30_account_bank_statement_import_camt/test_camt_file/camt_053_several_tx_details_and_instructed_amount.xml b/dev_odex30_accounting/odex30_account_bank_statement_import_camt/test_camt_file/camt_053_several_tx_details_and_instructed_amount.xml
new file mode 100644
index 0000000..a3e87ee
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_bank_statement_import_camt/test_camt_file/camt_053_several_tx_details_and_instructed_amount.xml
@@ -0,0 +1,94 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<Document xmlns="urn:iso:std:iso:20022:tech:xsd:camt.053.001.04">
+  <BkToCstmrStmt>
+    <GrpHdr>
+      <MsgId>2514988305.2019-02-13</MsgId>
+      <CreDtTm>2019-02-13T15:27:15.66+02:00</CreDtTm>
+    </GrpHdr>
+    <Stmt>
+      <Id>2514988305.2019-02-13</Id>
+      <CreDtTm>2019-02-13T15:27:15.66+02:00</CreDtTm>
+      <Acct>
+        <Id>
+          <IBAN></IBAN>
+          <Othr>
+            <Id>112233</Id>
+          </Othr>
+        </Id>
+      </Acct>
+      <Bal>
+        <Tp>
+          <CdOrPrtry>
+            <Cd>OPBD</Cd>
+          </CdOrPrtry>
+        </Tp>
+        <Amt Ccy="USD">1000.00</Amt>
+        <CdtDbtInd>CRDT</CdtDbtInd>
+        <Dt>
+          <Dt>2019-02-12</Dt>
+        </Dt>
+      </Bal>
+      <Bal>
+        <Tp>
+          <CdOrPrtry>
+            <Cd>CLBD</Cd>
+          </CdOrPrtry>
+        </Tp>
+        <Amt Ccy="USD">1500.00</Amt>
+        <CdtDbtInd>CRDT</CdtDbtInd>
+        <Dt>
+          <Dt>2019-02-13</Dt>
+        </Dt>
+      </Bal>
+      <Ntry>
+        <Amt Ccy="USD">500.00</Amt>
+        <CdtDbtInd>CRDT</CdtDbtInd>
+        <Sts>BOOK</Sts>
+        <BkTxCd>
+          <Prtry>
+            <Cd>ABCD</Cd>
+          </Prtry>
+        </BkTxCd>
+        <NtryDtls>
+          <Btch>
+            <MsgId>MSGSALA0001</MsgId>
+            <PmtInfId>CustRefForSalaBatch</PmtInfId>
+            <NbOfTxs>3</NbOfTxs>
+            <TtlAmt Ccy="USD">500.0</TtlAmt>
+            <CdtDbtInd>CRDT</CdtDbtInd>
+          </Btch>
+          <TxDtls>
+            <AmtDtls>
+              <InstdAmt>
+                <Amt Ccy="USD">100</Amt>
+              </InstdAmt>
+            </AmtDtls>
+            <RmtInf>
+              <Ustrd>label01</Ustrd>
+            </RmtInf>
+          </TxDtls>
+          <TxDtls>
+            <AmtDtls>
+              <InstdAmt>
+                <Amt Ccy="USD">150</Amt>
+              </InstdAmt>
+            </AmtDtls>
+            <RmtInf>
+              <Ustrd>label02</Ustrd>
+            </RmtInf>
+          </TxDtls>
+          <TxDtls>
+            <AmtDtls>
+              <InstdAmt>
+                <Amt Ccy="USD">250</Amt>
+              </InstdAmt>
+            </AmtDtls>
+            <RmtInf>
+              <Ustrd>label03</Ustrd>
+            </RmtInf>
+          </TxDtls>
+        </NtryDtls>
+      </Ntry>
+    </Stmt>
+  </BkToCstmrStmt>
+</Document>
diff --git a/dev_odex30_accounting/odex30_account_bank_statement_import_camt/test_camt_file/camt_053_several_tx_details_and_instructed_amount_02.xml b/dev_odex30_accounting/odex30_account_bank_statement_import_camt/test_camt_file/camt_053_several_tx_details_and_instructed_amount_02.xml
new file mode 100644
index 0000000..266c1cb
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_bank_statement_import_camt/test_camt_file/camt_053_several_tx_details_and_instructed_amount_02.xml
@@ -0,0 +1,90 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<Document xmlns="urn:iso:std:iso:20022:tech:xsd:camt.053.001.04">
+  <BkToCstmrStmt>
+    <GrpHdr>
+      <MsgId>2514988305.2019-02-13</MsgId>
+      <CreDtTm>2019-02-13T15:27:15.66+02:00</CreDtTm>
+    </GrpHdr>
+    <Stmt>
+      <Id>2514988305.2019-02-13</Id>
+      <CreDtTm>2019-02-13T15:27:15.66+02:00</CreDtTm>
+      <Acct>
+        <Id>
+          <IBAN></IBAN>
+          <Othr>
+            <Id>112233</Id>
+          </Othr>
+        </Id>
+      </Acct>
+      <Bal>
+        <Tp>
+          <CdOrPrtry>
+            <Cd>OPBD</Cd>
+          </CdOrPrtry>
+        </Tp>
+        <Amt Ccy="USD">1000.00</Amt>
+        <CdtDbtInd>CRDT</CdtDbtInd>
+        <Dt>
+          <Dt>2019-02-12</Dt>
+        </Dt>
+      </Bal>
+      <Bal>
+        <Tp>
+          <CdOrPrtry>
+            <Cd>CLBD</Cd>
+          </CdOrPrtry>
+        </Tp>
+        <Amt Ccy="USD">1500.00</Amt>
+        <CdtDbtInd>CRDT</CdtDbtInd>
+        <Dt>
+          <Dt>2019-02-13</Dt>
+        </Dt>
+      </Bal>
+      <Ntry>
+        <Amt Ccy="USD">500.00</Amt>
+        <CdtDbtInd>CRDT</CdtDbtInd>
+        <Sts>BOOK</Sts>
+        <BkTxCd>
+          <Prtry>
+            <Cd>ABCD</Cd>
+          </Prtry>
+        </BkTxCd>
+        <NtryDtls>
+          <Btch>
+            <NbOfTxs>3</NbOfTxs>
+          </Btch>
+          <TxDtls>
+            <AmtDtls>
+              <InstdAmt>
+                <Amt Ccy="USD">100</Amt>
+              </InstdAmt>
+            </AmtDtls>
+            <RmtInf>
+              <Ustrd>label01</Ustrd>
+            </RmtInf>
+          </TxDtls>
+          <TxDtls>
+            <AmtDtls>
+              <InstdAmt>
+                <Amt Ccy="USD">150</Amt>
+              </InstdAmt>
+            </AmtDtls>
+            <RmtInf>
+              <Ustrd>label02</Ustrd>
+            </RmtInf>
+          </TxDtls>
+          <TxDtls>
+            <AmtDtls>
+              <InstdAmt>
+                <Amt Ccy="USD">250</Amt>
+              </InstdAmt>
+            </AmtDtls>
+            <RmtInf>
+              <Ustrd>label03</Ustrd>
+            </RmtInf>
+          </TxDtls>
+        </NtryDtls>
+      </Ntry>
+    </Stmt>
+  </BkToCstmrStmt>
+</Document>
diff --git a/dev_odex30_accounting/odex30_account_bank_statement_import_camt/test_camt_file/camt_053_several_tx_details_and_multicurrency_01.xml b/dev_odex30_accounting/odex30_account_bank_statement_import_camt/test_camt_file/camt_053_several_tx_details_and_multicurrency_01.xml
new file mode 100644
index 0000000..f53a131
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_bank_statement_import_camt/test_camt_file/camt_053_several_tx_details_and_multicurrency_01.xml
@@ -0,0 +1,104 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<Document xmlns="urn:iso:std:iso:20022:tech:xsd:camt.053.001.04">
+  <BkToCstmrStmt>
+    <GrpHdr>
+      <MsgId>2514988305.2019-02-13</MsgId>
+      <CreDtTm>2019-02-13T15:27:15.66+02:00</CreDtTm>
+    </GrpHdr>
+    <Stmt>
+      <Id>2514988305.2019-02-13</Id>
+      <CreDtTm>2019-02-13T15:27:15.66+02:00</CreDtTm>
+      <Acct>
+        <Id>
+          <IBAN></IBAN>
+          <Othr>
+            <Id>112233</Id>
+          </Othr>
+        </Id>
+      </Acct>
+      <Bal>
+        <Tp>
+          <CdOrPrtry>
+            <Cd>OPBD</Cd>
+          </CdOrPrtry>
+        </Tp>
+        <Amt Ccy="USD">1000.00</Amt>
+        <CdtDbtInd>CRDT</CdtDbtInd>
+        <Dt>
+          <Dt>2019-02-12</Dt>
+        </Dt>
+      </Bal>
+      <Bal>
+        <Tp>
+          <CdOrPrtry>
+            <Cd>CLBD</Cd>
+          </CdOrPrtry>
+        </Tp>
+        <Amt Ccy="USD">1500.00</Amt>
+        <CdtDbtInd>CRDT</CdtDbtInd>
+        <Dt>
+          <Dt>2019-02-13</Dt>
+        </Dt>
+      </Bal>
+      <Ntry>
+        <Amt Ccy="USD">500.00</Amt>
+        <CdtDbtInd>CRDT</CdtDbtInd>
+        <Sts>BOOK</Sts>
+        <BkTxCd>
+          <Prtry>
+            <Cd>ABCD</Cd>
+          </Prtry>
+        </BkTxCd>
+        <AmtDtls>
+            <CntrValAmt>
+              <Amt Ccy="USD">500</Amt>
+              <CcyXchg>
+                <SrcCcy>EUR</SrcCcy>
+                <TrgtCcy>USD</TrgtCcy>
+                <XchgRate>0.5</XchgRate>
+              </CcyXchg>
+            </CntrValAmt>
+          </AmtDtls>
+        <NtryDtls>
+          <Btch>
+            <MsgId>MSGSALA0001</MsgId>
+            <PmtInfId>CustRefForSalaBatch</PmtInfId>
+            <NbOfTxs>3</NbOfTxs>
+            <TtlAmt Ccy="USD">500.0</TtlAmt>
+            <CdtDbtInd>CRDT</CdtDbtInd>
+          </Btch>
+          <TxDtls>
+            <AmtDtls>
+              <TxAmt>
+                <Amt Ccy="EUR">50</Amt>
+              </TxAmt>
+            </AmtDtls>
+            <RmtInf>
+              <Ustrd>label01</Ustrd>
+            </RmtInf>
+          </TxDtls>
+          <TxDtls>
+            <AmtDtls>
+              <TxAmt>
+                <Amt Ccy="EUR">75</Amt>
+              </TxAmt>
+            </AmtDtls>
+            <RmtInf>
+              <Ustrd>label02</Ustrd>
+            </RmtInf>
+          </TxDtls>
+          <TxDtls>
+            <AmtDtls>
+              <TxAmt>
+                <Amt Ccy="EUR">125</Amt>
+              </TxAmt>
+            </AmtDtls>
+            <RmtInf>
+              <Ustrd>label03</Ustrd>
+            </RmtInf>
+          </TxDtls>
+        </NtryDtls>
+      </Ntry>
+    </Stmt>
+  </BkToCstmrStmt>
+</Document>
diff --git a/dev_odex30_accounting/odex30_account_bank_statement_import_camt/test_camt_file/camt_053_several_tx_details_and_multicurrency_02.xml b/dev_odex30_accounting/odex30_account_bank_statement_import_camt/test_camt_file/camt_053_several_tx_details_and_multicurrency_02.xml
new file mode 100644
index 0000000..9fc8fa9
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_bank_statement_import_camt/test_camt_file/camt_053_several_tx_details_and_multicurrency_02.xml
@@ -0,0 +1,104 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<Document xmlns="urn:iso:std:iso:20022:tech:xsd:camt.053.001.04">
+  <BkToCstmrStmt>
+    <GrpHdr>
+      <MsgId>2514988305.2019-02-13</MsgId>
+      <CreDtTm>2019-02-13T15:27:15.66+02:00</CreDtTm>
+    </GrpHdr>
+    <Stmt>
+      <Id>2514988305.2019-02-13</Id>
+      <CreDtTm>2019-02-13T15:27:15.66+02:00</CreDtTm>
+      <Acct>
+        <Id>
+          <IBAN></IBAN>
+          <Othr>
+            <Id>112233</Id>
+          </Othr>
+        </Id>
+      </Acct>
+      <Bal>
+        <Tp>
+          <CdOrPrtry>
+            <Cd>OPBD</Cd>
+          </CdOrPrtry>
+        </Tp>
+        <Amt Ccy="USD">1000.00</Amt>
+        <CdtDbtInd>CRDT</CdtDbtInd>
+        <Dt>
+          <Dt>2019-02-12</Dt>
+        </Dt>
+      </Bal>
+      <Bal>
+        <Tp>
+          <CdOrPrtry>
+            <Cd>CLBD</Cd>
+          </CdOrPrtry>
+        </Tp>
+        <Amt Ccy="USD">1500.00</Amt>
+        <CdtDbtInd>CRDT</CdtDbtInd>
+        <Dt>
+          <Dt>2019-02-13</Dt>
+        </Dt>
+      </Bal>
+      <Ntry>
+        <Amt Ccy="USD">500.00</Amt>
+        <CdtDbtInd>CRDT</CdtDbtInd>
+        <Sts>BOOK</Sts>
+        <BkTxCd>
+          <Prtry>
+            <Cd>ABCD</Cd>
+          </Prtry>
+        </BkTxCd>
+        <AmtDtls>
+            <CntrValAmt>
+              <Amt Ccy="USD">500</Amt>
+              <CcyXchg>
+                <SrcCcy>EUR</SrcCcy>
+                <TrgtCcy>USD</TrgtCcy>
+                <XchgRate>0.5</XchgRate>
+              </CcyXchg>
+            </CntrValAmt>
+          </AmtDtls>
+        <NtryDtls>
+          <Btch>
+            <MsgId>MSGSALA0001</MsgId>
+            <PmtInfId>CustRefForSalaBatch</PmtInfId>
+            <NbOfTxs>3</NbOfTxs>
+            <TtlAmt Ccy="EUR">250.0</TtlAmt>
+            <CdtDbtInd>CRDT</CdtDbtInd>
+          </Btch>
+          <TxDtls>
+            <AmtDtls>
+              <TxAmt>
+                <Amt Ccy="EUR">50</Amt>
+              </TxAmt>
+            </AmtDtls>
+            <RmtInf>
+              <Ustrd>label01</Ustrd>
+            </RmtInf>
+          </TxDtls>
+          <TxDtls>
+            <AmtDtls>
+              <TxAmt>
+                <Amt Ccy="EUR">75</Amt>
+              </TxAmt>
+            </AmtDtls>
+            <RmtInf>
+              <Ustrd>label02</Ustrd>
+            </RmtInf>
+          </TxDtls>
+          <TxDtls>
+            <AmtDtls>
+              <TxAmt>
+                <Amt Ccy="EUR">125</Amt>
+              </TxAmt>
+            </AmtDtls>
+            <RmtInf>
+              <Ustrd>label03</Ustrd>
+            </RmtInf>
+          </TxDtls>
+        </NtryDtls>
+      </Ntry>
+    </Stmt>
+  </BkToCstmrStmt>
+</Document>
diff --git a/dev_odex30_accounting/odex30_account_bank_statement_import_camt/test_camt_file/camt_053_several_tx_details_and_multicurrency_03.xml b/dev_odex30_accounting/odex30_account_bank_statement_import_camt/test_camt_file/camt_053_several_tx_details_and_multicurrency_03.xml
new file mode 100644
index 0000000..5959dd0
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_bank_statement_import_camt/test_camt_file/camt_053_several_tx_details_and_multicurrency_03.xml
@@ -0,0 +1,97 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<Document xmlns="urn:iso:std:iso:20022:tech:xsd:camt.053.001.04">
+  <BkToCstmrStmt>
+    <GrpHdr>
+      <MsgId>2514988305.2019-02-13</MsgId>
+      <CreDtTm>2019-02-13T15:27:15.66+02:00</CreDtTm>
+    </GrpHdr>
+    <Stmt>
+      <Id>2514988305.2019-02-13</Id>
+      <CreDtTm>2019-02-13T15:27:15.66+02:00</CreDtTm>
+      <Acct>
+        <Id>
+          <IBAN></IBAN>
+          <Othr>
+            <Id>112233</Id>
+          </Othr>
+        </Id>
+      </Acct>
+      <Bal>
+        <Tp>
+          <CdOrPrtry>
+            <Cd>OPBD</Cd>
+          </CdOrPrtry>
+        </Tp>
+        <Amt Ccy="USD">1000.00</Amt>
+        <CdtDbtInd>CRDT</CdtDbtInd>
+        <Dt>
+          <Dt>2019-02-12</Dt>
+        </Dt>
+      </Bal>
+      <Bal>
+        <Tp>
+          <CdOrPrtry>
+            <Cd>CLBD</Cd>
+          </CdOrPrtry>
+        </Tp>
+        <Amt Ccy="USD">1500.00</Amt>
+        <CdtDbtInd>CRDT</CdtDbtInd>
+        <Dt>
+          <Dt>2019-02-13</Dt>
+        </Dt>
+      </Bal>
+      <Ntry>
+        <Amt Ccy="USD">500.00</Amt>
+        <CdtDbtInd>CRDT</CdtDbtInd>
+        <Sts>BOOK</Sts>
+        <BkTxCd>
+          <Prtry>
+            <Cd>ABCD</Cd>
+          </Prtry>
+        </BkTxCd>
+        <AmtDtls>
+            <CntrValAmt>
+              <Amt Ccy="USD">500</Amt>
+              <CcyXchg>
+                <SrcCcy>EUR</SrcCcy>
+                <TrgtCcy>USD</TrgtCcy>
+                <XchgRate>0.5</XchgRate>
+              </CcyXchg>
+            </CntrValAmt>
+          </AmtDtls>
+        <NtryDtls>
+          <TxDtls>
+            <AmtDtls>
+              <TxAmt>
+                <Amt Ccy="EUR">50</Amt>
+              </TxAmt>
+            </AmtDtls>
+            <RmtInf>
+              <Ustrd>label01</Ustrd>
+            </RmtInf>
+          </TxDtls>
+          <TxDtls>
+            <AmtDtls>
+              <TxAmt>
+                <Amt Ccy="EUR">75</Amt>
+              </TxAmt>
+            </AmtDtls>
+            <RmtInf>
+              <Ustrd>label02</Ustrd>
+            </RmtInf>
+          </TxDtls>
+          <TxDtls>
+            <AmtDtls>
+              <TxAmt>
+                <Amt Ccy="EUR">125</Amt>
+              </TxAmt>
+            </AmtDtls>
+            <RmtInf>
+              <Ustrd>label03</Ustrd>
+            </RmtInf>
+          </TxDtls>
+        </NtryDtls>
+      </Ntry>
+    </Stmt>
+  </BkToCstmrStmt>
+</Document>
diff --git a/dev_odex30_accounting/odex30_account_bank_statement_import_camt/test_camt_file/camt_053_several_tx_details_and_multicurrency_04.xml b/dev_odex30_accounting/odex30_account_bank_statement_import_camt/test_camt_file/camt_053_several_tx_details_and_multicurrency_04.xml
new file mode 100644
index 0000000..0293518
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_bank_statement_import_camt/test_camt_file/camt_053_several_tx_details_and_multicurrency_04.xml
@@ -0,0 +1,100 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<Document xmlns="urn:iso:std:iso:20022:tech:xsd:camt.053.001.04">
+  <BkToCstmrStmt>
+    <GrpHdr>
+      <MsgId>2514988305.2019-02-13</MsgId>
+      <CreDtTm>2019-02-13T15:27:15.66+02:00</CreDtTm>
+    </GrpHdr>
+    <Stmt>
+      <Id>2514988305.2019-02-13</Id>
+      <CreDtTm>2019-02-13T15:27:15.66+02:00</CreDtTm>
+      <Acct>
+        <Id>
+          <IBAN></IBAN>
+          <Othr>
+            <Id>112233</Id>
+          </Othr>
+        </Id>
+      </Acct>
+      <Bal>
+        <Tp>
+          <CdOrPrtry>
+            <Cd>OPBD</Cd>
+          </CdOrPrtry>
+        </Tp>
+        <Amt Ccy="USD">100000.00</Amt>
+        <CdtDbtInd>CRDT</CdtDbtInd>
+        <Dt>
+          <Dt>2019-02-12</Dt>
+        </Dt>
+      </Bal>
+      <Bal>
+        <Tp>
+          <CdOrPrtry>
+            <Cd>CLBD</Cd>
+          </CdOrPrtry>
+        </Tp>
+        <Amt Ccy="USD">150000.00</Amt>
+        <CdtDbtInd>CRDT</CdtDbtInd>
+        <Dt>
+          <Dt>2019-02-13</Dt>
+        </Dt>
+      </Bal>
+      <Ntry>
+        <Amt Ccy="USD">50000.00</Amt>
+        <CdtDbtInd>CRDT</CdtDbtInd>
+        <Sts>BOOK</Sts>
+        <BkTxCd>
+          <Prtry>
+            <Cd>ABCD</Cd>
+          </Prtry>
+        </BkTxCd>
+        <AmtDtls>
+            <TxAmt>
+              <Amt Ccy="EUR">47824.94</Amt>
+              <CcyXchg>
+                <SrcCcy>USD</SrcCcy>
+                <TrgtCcy>EUR</TrgtCcy>
+                <XchgRate>1.0455</XchgRate>
+              </CcyXchg>
+            </TxAmt>
+          </AmtDtls>
+        <NtryDtls>
+          <Btch>
+            <NbOfTxs>3</NbOfTxs>
+          </Btch>
+          <TxDtls>
+            <AmtDtls>
+              <TxAmt>
+                <Amt Ccy="EUR">9564.99</Amt>
+              </TxAmt>
+            </AmtDtls>
+            <RmtInf>
+              <Ustrd>label01</Ustrd>
+            </RmtInf>
+          </TxDtls>
+          <TxDtls>
+            <AmtDtls>
+              <TxAmt>
+                <Amt Ccy="EUR">14347.48</Amt>
+              </TxAmt>
+            </AmtDtls>
+            <RmtInf>
+              <Ustrd>label02</Ustrd>
+            </RmtInf>
+          </TxDtls>
+          <TxDtls>
+            <AmtDtls>
+              <TxAmt>
+                <Amt Ccy="EUR">23912.47</Amt>
+              </TxAmt>
+            </AmtDtls>
+            <RmtInf>
+              <Ustrd>label03</Ustrd>
+            </RmtInf>
+          </TxDtls>
+        </NtryDtls>
+      </Ntry>
+    </Stmt>
+  </BkToCstmrStmt>
+</Document>
diff --git a/dev_odex30_accounting/odex30_account_bank_statement_import_camt/test_camt_file/camt_053_several_tx_details_and_multicurrency_05.xml b/dev_odex30_accounting/odex30_account_bank_statement_import_camt/test_camt_file/camt_053_several_tx_details_and_multicurrency_05.xml
new file mode 100644
index 0000000..987b845
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_bank_statement_import_camt/test_camt_file/camt_053_several_tx_details_and_multicurrency_05.xml
@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Document xmlns="urn:iso:std:iso:20022:tech:xsd:camt.053.001.04" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:iso:std:iso:20022:tech:xsd:camt.053.001.04 camt.053.001.04.xsd">
+  <BkToCstmrStmt>
+    <GrpHdr>
+      <MsgId>2514988305.2019-02-13</MsgId>
+      <CreDtTm>2019-02-13T15:27:15.66+02:00</CreDtTm>
+    </GrpHdr>
+    <Stmt>
+      <Id>2514988306.2019-02-13</Id>
+      <CreDtTm>2019-02-12T21:17:26+01:00</CreDtTm>
+      <Acct>
+        <Id>
+          <IBAN></IBAN>
+          <Othr>
+            <Id>112233</Id>
+          </Othr>
+        </Id>
+      </Acct>
+      <Bal>
+        <Tp>
+          <CdOrPrtry>
+            <Cd>OPBD</Cd>
+          </CdOrPrtry>
+        </Tp>
+        <Amt Ccy="USD">100000.00</Amt>
+        <CdtDbtInd>CRDT</CdtDbtInd>
+        <Dt>
+          <Dt>2019-02-12</Dt>
+        </Dt>
+      </Bal>
+      <Bal>
+        <Tp>
+          <CdOrPrtry>
+            <Cd>CLBD</Cd>
+          </CdOrPrtry>
+        </Tp>
+        <Amt Ccy="USD">150000.00</Amt>
+        <CdtDbtInd>CRDT</CdtDbtInd>
+        <Dt>
+          <Dt>2019-02-13</Dt>
+        </Dt>
+      </Bal>
+      <Ntry>
+        <Amt Ccy="USD">50000.00</Amt>
+        <CdtDbtInd>DBIT</CdtDbtInd>
+        <Sts>BOOK</Sts>
+        <BookgDt>
+          <Dt>2024-11-25</Dt>
+        </BookgDt>
+        <ValDt>
+          <Dt>2024-11-25</Dt>
+        </ValDt>
+        <BkTxCd>
+          <Prtry>
+            <Cd>ABCD</Cd>
+          </Prtry>
+        </BkTxCd>
+        <AmtDtls>
+          <InstdAmt>
+            <Amt Ccy="EUR">52759.31</Amt>
+          </InstdAmt>
+          <TxAmt>
+            <Amt Ccy="EUR">52759.31</Amt>
+            <CcyXchg>
+              <SrcCcy>EUR</SrcCcy>
+              <XchgRate>0.9477</XchgRate>
+            </CcyXchg>
+          </TxAmt>
+        </AmtDtls>
+        <NtryDtls>
+          <Btch>
+            <NbOfTxs>4</NbOfTxs>
+          </Btch>
+          <TxDtls>
+            <Amt Ccy="EUR">19962.03</Amt>
+            <CdtDbtInd>DBIT</CdtDbtInd>
+            <RmtInf>
+              <Ustrd>label01</Ustrd>
+            </RmtInf>
+          </TxDtls>
+          <TxDtls>
+            <Amt Ccy="EUR">24806</Amt>
+            <CdtDbtInd>DBIT</CdtDbtInd>
+            <RmtInf>
+              <Ustrd>label02</Ustrd>
+            </RmtInf>
+          </TxDtls>
+          <TxDtls>
+            <Refs>
+              <AcctSvcrRef>A6Z0001086376914</AcctSvcrRef>
+              <InstrId>8052-2410138</InstrId>
+            </Refs>
+            <Amt Ccy="EUR">7991.28</Amt>
+            <CdtDbtInd>DBIT</CdtDbtInd>
+            <RmtInf>
+              <Ustrd>label03</Ustrd>
+            </RmtInf>
+          </TxDtls>
+        </NtryDtls>
+      </Ntry>
+    </Stmt>
+  </BkToCstmrStmt>
+</Document>
diff --git a/dev_odex30_accounting/odex30_account_bank_statement_import_camt/test_camt_file/camt_053_several_tx_details_nordic.xml b/dev_odex30_accounting/odex30_account_bank_statement_import_camt/test_camt_file/camt_053_several_tx_details_nordic.xml
new file mode 100644
index 0000000..15a189e
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_bank_statement_import_camt/test_camt_file/camt_053_several_tx_details_nordic.xml
@@ -0,0 +1,104 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<Document xmlns="urn:iso:std:iso:20022:tech:xsd:camt.053.001.04">
+  <BkToCstmrStmt>
+    <GrpHdr>
+      <MsgId>2514988305.2019-02-13</MsgId>
+      <CreDtTm>2019-02-13T15:27:15.66+02:00</CreDtTm>
+    </GrpHdr>
+    <Stmt>
+      <Id>2514988305.2019-02-13</Id>
+      <CreDtTm>2019-02-13T15:27:15.66+02:00</CreDtTm>
+      <Acct>
+        <Id>
+          <IBAN></IBAN>
+          <Othr>
+            <Id>112233</Id>
+          </Othr>
+        </Id>
+      </Acct>
+      <Bal>
+        <Tp>
+          <CdOrPrtry>
+            <Cd>OPBD</Cd>
+          </CdOrPrtry>
+        </Tp>
+        <Amt Ccy="USD">1000.00</Amt>
+        <CdtDbtInd>CRDT</CdtDbtInd>
+        <Dt>
+          <Dt>2019-02-12</Dt>
+        </Dt>
+      </Bal>
+      <Bal>
+        <Tp>
+          <CdOrPrtry>
+            <Cd>CLBD</Cd>
+          </CdOrPrtry>
+        </Tp>
+        <Amt Ccy="USD">1500.00</Amt>
+        <CdtDbtInd>CRDT</CdtDbtInd>
+        <Dt>
+          <Dt>2019-02-13</Dt>
+        </Dt>
+      </Bal>
+      <Ntry>
+        <Amt Ccy="USD">500.00</Amt>
+        <CdtDbtInd>CRDT</CdtDbtInd>
+        <Sts>BOOK</Sts>
+        <BkTxCd>
+          <Prtry>
+            <Cd>ABCD</Cd>
+          </Prtry>
+        </BkTxCd>
+        <NtryDtls>
+          <Btch>
+            <MsgId>MSGSALA0001</MsgId>
+            <PmtInfId>CustRefForSalaBatch</PmtInfId>
+            <NbOfTxs>3</NbOfTxs>
+            <TtlAmt Ccy="USD">500.0</TtlAmt>
+            <CdtDbtInd>CRDT</CdtDbtInd>
+          </Btch>
+          <TxDtls>
+            <AmtDtls>
+              <TxAmt>
+                <Amt Ccy="USD">100</Amt>
+              </TxAmt>
+            </AmtDtls>
+            <RmtInf>
+              <Ustrd>label01</Ustrd>
+            </RmtInf>
+          </TxDtls>
+          <TxDtls>
+            <AmtDtls>
+              <TxAmt>
+                <Amt Ccy="USD">150</Amt>
+              </TxAmt>
+            </AmtDtls>
+            <RmtInf>
+              <Ustrd>label02</Ustrd>
+            </RmtInf>
+          </TxDtls>
+          <TxDtls>
+            <AmtDtls>
+              <TxAmt>
+                <Amt Ccy="USD">250</Amt>
+              </TxAmt>
+            </AmtDtls>
+            <RltdPties>
+              <UltmtDbtr>
+                <Nm>Ultimate Debtor Name</Nm>
+              </UltmtDbtr>
+              <Dbtr>
+                <Nm>DEBTOR NAME</Nm>
+              </Dbtr>
+            </RltdPties>
+            <RmtInf>
+              <Strd>
+                <AddtlRmtInf>Transaction 03 name</AddtlRmtInf>
+              </Strd>
+            </RmtInf>
+          </TxDtls>
+        </NtryDtls>
+      </Ntry>
+    </Stmt>
+  </BkToCstmrStmt>
+</Document>
diff --git a/dev_odex30_accounting/odex30_account_bank_statement_import_camt/test_camt_file/test_camt.xml b/dev_odex30_accounting/odex30_account_bank_statement_import_camt/test_camt_file/test_camt.xml
new file mode 100644
index 0000000..45074eb
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_bank_statement_import_camt/test_camt_file/test_camt.xml
@@ -0,0 +1,249 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Document xmlns='urn:iso:std:iso:20022:tech:xsd:camt.053.001.02' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>
+  <BkToCstmrStmt>
+    <GrpHdr>
+      <MsgId>0574908765.2015-12-05</MsgId>
+      <CreDtTm>2015-12-05T10:55:08.66+02:00</CreDtTm>
+      <MsgPgntn>
+        <PgNb>1</PgNb>
+        <LastPgInd>true</LastPgInd>
+      </MsgPgntn>
+    </GrpHdr>
+    <Stmt>
+      <Id>0574908765.2015-12-05</Id>
+      <ElctrncSeqNb>0070</ElctrncSeqNb>
+      <CreDtTm>2015-12-05T10:55:08.66+02:00</CreDtTm>
+      <Acct>
+        <Id>
+          <IBAN></IBAN>
+          <Othr>
+            <Id>123456</Id>
+          </Othr>
+        </Id>
+        <Nm>Norbert Brant</Nm>
+        <Svcr>
+          <FinInstnId>
+            <BIC>ABNANL2A</BIC>
+          </FinInstnId>
+        </Svcr>
+      </Acct>
+      <Bal>
+        <Tp>
+          <CdOrPrtry>
+            <Cd>OPBD</Cd>
+          </CdOrPrtry>
+        </Tp>
+        <Amt Ccy="USD">8998.20</Amt>
+        <CdtDbtInd>CRDT</CdtDbtInd>
+        <Dt>
+          <Dt>2015-12-05</Dt>
+        </Dt>
+      </Bal>
+      <Bal>
+        <Tp>
+          <CdOrPrtry>
+            <Cd>CLAV</Cd>
+          </CdOrPrtry>
+        </Tp>
+        <Amt Ccy="USD">2661.49</Amt>
+        <CdtDbtInd>CRDT</CdtDbtInd>
+        <Dt>
+          <Dt>2015-12-05</Dt>
+        </Dt>
+      </Bal>
+      <Ntry>
+        <Amt Ccy="USD">7379.54</Amt>
+        <CdtDbtInd>DBIT</CdtDbtInd>
+        <Sts>BOOK</Sts>
+        <BookgDt>
+          <Dt>2015-12-01</Dt>
+        </BookgDt>
+        <ValDt>
+          <Dt>2015-12-01</Dt>
+        </ValDt>
+        <BkTxCd>
+          <Domn>
+            <Cd>PMNT</Cd>
+            <Fmly>
+              <Cd>RDDT</Cd>
+              <SubFmlyCd>ESDD</SubFmlyCd>
+            </Fmly>
+          </Domn>
+          <Prtry>
+            <Cd>EI</Cd>
+          </Prtry>
+        </BkTxCd>
+        <NtryDtls>
+          <TxDtls>
+            <Refs>
+              <InstrId>INNDNL2U20141231000142300002844</InstrId>
+              <EndToEndId>435005714488-ABNO33052620</EndToEndId>
+              <MndtId>1880000341866</MndtId>
+            </Refs>
+            <AmtDtls>
+              <TxAmt>
+                <Amt Ccy="USD">7379.54</Amt>
+              </TxAmt>
+            </AmtDtls>
+            <RltdPties>
+              <Cdtr>
+                <Nm>ASUSTeK</Nm>
+                <PstlAdr>
+                  <StrtNm>TEST STREET 20</StrtNm>
+                  <TwnNm>1234 AB TESTCITY</TwnNm>
+                  <Ctry>NL</Ctry>
+                </PstlAdr>
+              </Cdtr>
+              <CdtrAcct>
+                <Id>
+                  <IBAN>NL46ABNA0499998748</IBAN>
+                </Id>
+              </CdtrAcct>
+            </RltdPties>
+            <RltdAgts>
+              <CdtrAgt>
+                <FinInstnId>
+                  <BIC>ABNANL2A</BIC>
+                </FinInstnId>
+              </CdtrAgt>
+            </RltdAgts>
+            <RmtInf>
+              <Ustrd>BILL 2015 0002</Ustrd>
+            </RmtInf>
+            <AddtlTxInf>MKB 859239PERIOD 31.12.2015</AddtlTxInf>
+          </TxDtls>
+        </NtryDtls>
+      </Ntry>
+      <Ntry>
+        <Amt Ccy="USD">564.05</Amt>
+        <CdtDbtInd>DBIT</CdtDbtInd>
+        <RvslInd>true</RvslInd>
+        <Sts>BOOK</Sts>
+        <BookgDt>
+          <Dt>2015-11-29</Dt>
+        </BookgDt>
+        <ValDt>
+          <Dt>2015-11-29</Dt>
+        </ValDt>
+        <BkTxCd>
+          <Domn>
+            <Cd>PMNT</Cd>
+            <Fmly>
+              <Cd>IDDT</Cd>
+              <SubFmlyCd>UPDD</SubFmlyCd>
+            </Fmly>
+          </Domn>
+          <Prtry>
+            <Cd>EIST</Cd>
+          </Prtry>
+        </BkTxCd>
+        <NtryDtls>
+          <TxDtls>
+            <Refs>
+              <InstrId>TESTBANK/NL/20151129/01206408</InstrId>
+              <EndToEndId>TESTBANK/NL/20151129/01206408</EndToEndId>
+              <MndtId>NL22ZZZ524885430000-C0125.1</MndtId>
+            </Refs>
+            <AmtDtls>
+              <TxAmt>
+                <Amt Ccy="USD">564.05</Amt>
+              </TxAmt>
+            </AmtDtls>
+            <RltdPties>
+              <Cdtr>
+                <Nm>China Export</Nm>
+                <PstlAdr>
+                  <Ctry>NL</Ctry>
+                </PstlAdr>
+              </Cdtr>
+              <CdtrAcct>
+                <Id>
+                  <Othr>
+                    <Id>10987654323</Id>
+                  </Othr>
+                </Id>
+              </CdtrAcct>
+            </RltdPties>
+            <RltdAgts>
+              <CdtrAgt>
+                <FinInstnId>
+                  <BIC>ABNANL2A</BIC>
+                </FinInstnId>
+              </CdtrAgt>
+            </RltdAgts>
+            <RmtInf>
+              <Ustrd>Direct Debit S14 0410</Ustrd>
+            </RmtInf>
+            <RtrInf>
+              <Rsn>
+                <Cd>AC06</Cd>
+              </Rsn>
+            </RtrInf>
+            <AddtlTxInf>Direct debit S14 0410 AC07 Rek.nummer blokkade TESTBANK/NL/20141229/01206408</AddtlTxInf>
+          </TxDtls>
+        </NtryDtls>
+      </Ntry>
+      <Ntry>
+        <Amt Ccy="USD">1636.88</Amt>
+        <CdtDbtInd>CRDT</CdtDbtInd>
+        <Sts>BOOK</Sts>
+        <BookgDt>
+          <Dt>2015-01-05</Dt>
+        </BookgDt>
+        <ValDt>
+          <Dt>2015-01-05</Dt>
+        </ValDt>
+        <BkTxCd>
+          <Domn>
+            <Cd>PMNT</Cd>
+            <Fmly>
+              <Cd>RCDT</Cd>
+              <SubFmlyCd>ESCT</SubFmlyCd>
+            </Fmly>
+          </Domn>
+          <Prtry>
+            <Cd>ET</Cd>
+          </Prtry>
+        </BkTxCd>
+        <NtryDtls>
+          <TxDtls>
+            <Refs>
+              <InstrId>INNDNL2U20150105000217200000708</InstrId>
+              <EndToEndId>115</EndToEndId>
+            </Refs>
+            <AmtDtls>
+              <TxAmt>
+                <Amt Ccy="USD">1636.88</Amt>
+              </TxAmt>
+            </AmtDtls>
+            <RltdPties>
+              <Dbtr>
+                <Nm>Norbert Brant</Nm>
+                <PstlAdr>
+                  <StrtNm>SOMESTREET 570-A</StrtNm>
+                  <TwnNm>1276 ML HOUSCITY</TwnNm>
+                  <Ctry>NL</Ctry>
+                </PstlAdr>
+              </Dbtr>
+              <DbtrAcct>
+                <Id>
+                  <Othr>
+                    <Id>BE93999574162167</Id>
+                  </Othr>
+                </Id>
+              </DbtrAcct>
+            </RltdPties>
+            <RltdAgts>
+              <DbtrAgt>
+                <FinInstnId>
+                  <BIC>ABNANL2A</BIC>
+                </FinInstnId>
+              </DbtrAgt>
+            </RltdAgts>
+            <AddtlTxInf>#RD INV/2015/0002 INV/2015/0003</AddtlTxInf>
+          </TxDtls>
+        </NtryDtls>
+      </Ntry>
+    </Stmt>
+  </BkToCstmrStmt>
+</Document>
diff --git a/dev_odex30_accounting/odex30_account_bank_statement_import_camt/test_camt_file/test_camt_no_opening_balance.xml b/dev_odex30_accounting/odex30_account_bank_statement_import_camt/test_camt_file/test_camt_no_opening_balance.xml
new file mode 100644
index 0000000..d7baa7b
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_bank_statement_import_camt/test_camt_file/test_camt_no_opening_balance.xml
@@ -0,0 +1,43 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<Document xmlns="urn:iso:std:iso:20022:tech:xsd:camt.053.001.04">
+  <BkToCstmrStmt>
+    <GrpHdr>
+      <MsgId>2514988305.2019-02-13</MsgId>
+      <CreDtTm>2019-02-13T15:27:15.66+02:00</CreDtTm>
+    </GrpHdr>
+    <Stmt>
+      <Id>2514988305.2019-02-13</Id>
+      <CreDtTm>2019-02-13T15:27:15.66+02:00</CreDtTm>
+      <Acct>
+        <Id>
+          <IBAN></IBAN>
+          <Othr>
+            <Id>112233</Id>
+          </Othr>
+        </Id>
+      </Acct>
+      <Bal>
+        <Tp>
+          <CdOrPrtry>
+            <Cd>CLBD</Cd>
+          </CdOrPrtry>
+        </Tp>
+        <Amt Ccy="USD">1500.00</Amt>
+        <CdtDbtInd>CRDT</CdtDbtInd>
+        <Dt>
+          <Dt>2019-02-13</Dt>
+        </Dt>
+      </Bal>
+      <Ntry>
+        <Amt Ccy="USD">500.00</Amt>
+        <CdtDbtInd>CRDT</CdtDbtInd>
+        <Sts>BOOK</Sts>
+        <BkTxCd>
+          <Prtry>
+            <Cd>ABCD</Cd>
+          </Prtry>
+        </BkTxCd>
+      </Ntry>
+    </Stmt>
+  </BkToCstmrStmt>
+</Document>
diff --git a/dev_odex30_accounting/odex30_account_bank_statement_import_camt/tests/__init__.py b/dev_odex30_accounting/odex30_account_bank_statement_import_camt/tests/__init__.py
new file mode 100644
index 0000000..5102391
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_bank_statement_import_camt/tests/__init__.py
@@ -0,0 +1,4 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+from . import test_account_bank_statement_import_camt
diff --git a/dev_odex30_accounting/odex30_account_bank_statement_import_camt/tests/test_account_bank_statement_import_camt.py b/dev_odex30_accounting/odex30_account_bank_statement_import_camt/tests/test_account_bank_statement_import_camt.py
new file mode 100644
index 0000000..2e1deb3
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_bank_statement_import_camt/tests/test_account_bank_statement_import_camt.py
@@ -0,0 +1,473 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+from odoo.addons.account.tests.common import AccountTestInvoicingCommon
+from odoo.tests import tagged
+from odoo.tools import file_open
+from odoo.exceptions import UserError
+from odoo.addons.odex30_account_bank_statement_import_camt.models.account_journal import _logger as camt_wizard_logger
+
+NORMAL_AMOUNTS = [100, 150, 250]
+LARGE_AMOUNTS = [10000, 15000, 25000]
+
+@tagged('post_install', '-at_install')
+class TestAccountBankStatementImportCamt(AccountTestInvoicingCommon):
+
+    def test_camt_file_import(self):
+        bank_journal = self.env['account.journal'].create({
+            'name': 'Bank 123456',
+            'code': 'BNK67',
+            'type': 'bank',
+            'bank_acc_number': '123456',
+            'currency_id': self.env.ref('base.USD').id,
+        })
+
+        partner_norbert = self.env['res.partner'].create({
+            'name': 'Norbert Brant',
+            'is_company': True,
+        })
+        bank_norbert = self.env['res.bank'].create({'name': 'test'})
+
+        self.env['res.partner.bank'].create({
+            'acc_number': 'BE93999574162167',
+            'partner_id': partner_norbert.id,
+            'bank_id': bank_norbert.id,
+        })
+        self.env['res.partner.bank'].create({
+            'acc_number': '10987654323',
+            'partner_id': self.partner_a.id,
+            'bank_id': bank_norbert.id,
+        })
+
+        # Get CAMT file content
+        camt_file_path = 'odex30_account_bank_statement_import_camt/test_camt_file/test_camt.xml'
+        with file_open(camt_file_path, 'rb') as camt_file:
+            bank_journal.create_document_from_attachment(self.env['ir.attachment'].create({
+                'mimetype': 'application/xml',
+                'name': 'test_camt.xml',
+                'raw': camt_file.read(),
+            }).ids)
+
+        # Check the imported bank statement
+        imported_statement = self.env['account.bank.statement'].search([('company_id', '=', self.env.company.id)])
+        self.assertRecordValues(imported_statement, [{
+            'name': '0574908765.2015-12-05',
+            'balance_start': 8998.20,
+            'balance_end_real': 2661.49,
+        }])
+        self.assertRecordValues(imported_statement.line_ids.sorted('ref'), [
+            {
+                'ref': 'INNDNL2U20141231000142300002844',
+                'partner_name': 'ASUSTeK',
+                'amount': -7379.54,
+                'partner_id': False,
+            },
+            {
+                'ref': 'INNDNL2U20150105000217200000708',
+                'partner_name': partner_norbert.name,
+                'amount': 1636.88,
+                'partner_id': partner_norbert.id,
+            },
+            {
+                'ref': 'TESTBANK/NL/20151129/01206408',
+                'partner_name': 'China Export',
+                'amount': -564.05,
+                'partner_id': self.partner_a.id,
+            },
+        ])
+
+    def test_minimal_camt_file_import(self):
+        """
+        This basic test aims at importing a file with amounts expressed in USD
+        while the company's currency is USD too and the journal has not any currency
+        """
+        usd_currency = self.env.ref('base.USD')
+        self.assertEqual(self.env.company.currency_id.id, usd_currency.id)
+        self._test_minimal_camt_file_import('camt_053_minimal.xml', usd_currency)
+
+    def test_minimal_and_multicurrency_camt_file_import(self):
+        """
+        This test aims at importing a file with amounts expressed in EUR and USD.
+        The company's currency is USD.
+        """
+        usd_currency = self.env.ref('base.USD')
+        self.assertEqual(self.env.company.currency_id.id, usd_currency.id)
+        self._test_minimal_camt_file_import('camt_053_minimal_and_multicurrency.xml', usd_currency)
+
+    def test_minimal_and_multicurrency_camt_file_import_02(self):
+        """
+        This test aims at importing a file with amounts expressed in EUR and USD.
+        The company's currency is USD.
+        The exchange rate is provided and the company's currency is set in the source currency.
+        """
+        usd_currency = self.env.ref('base.USD')
+        self.assertEqual(self.env.company.currency_id.id, usd_currency.id)
+        self._test_minimal_camt_file_import('camt_053_minimal_and_multicurrency_02.xml', usd_currency)
+
+    def test_minimal_and_multicurrency_camt_file_import_03(self):
+        """
+        This test aims at importing a file with amounts expressed in EUR and USD but with no rate provided.
+        The company's currency is USD.
+        """
+        usd_currency = self.env.ref('base.USD')
+        self.assertEqual(self.env.company.currency_id.id, usd_currency.id)
+        self._test_minimal_camt_file_import('camt_053_minimal_and_multicurrency_03.xml', usd_currency)
+
+    def test_minimal_and_multicurrency_camt_file_import_04(self):
+        """
+        This test aims at importing a file with amounts expressed in EUR and USD.
+        The company's currency is USD.
+        This is the same test than test_minimal_and_multicurrency_camt_file_import_02,
+        except that the company's currency is set in the target currency.
+        """
+        usd_currency = self.env.ref('base.USD')
+        self.assertEqual(self.env.company.currency_id.id, usd_currency.id)
+        self._test_minimal_camt_file_import('camt_053_minimal_and_multicurrency_04.xml', usd_currency)
+
+    def test_minimal_and_multicurrency_camt_file_import_05(self):
+        """
+        This test aims at importing a file with amounts expressed in EUR and USD.
+        The company's currency is USD.
+        This is the same test than test_minimal_and_multicurrency_camt_file_import_04,
+        except that the exchange rate is inverted.
+        """
+        usd_currency = self.env.ref('base.USD')
+        self.assertEqual(self.env.company.currency_id.id, usd_currency.id)
+        self._test_minimal_camt_file_import('camt_053_minimal_and_multicurrency_05.xml', usd_currency)
+
+    def test_minimal_and_multicurrency_camt_file_import_06(self):
+        """
+        This test aims at importing a file with amounts expressed in EUR and USD.
+        The company's currency is USD.
+        This is the same test than test_minimal_and_multicurrency_camt_file_import_02,
+        except that the exchange rate is leading to a rounding difference.
+        """
+        usd_currency = self.env.ref('base.USD')
+        self.assertEqual(self.env.company.currency_id.id, usd_currency.id)
+        self._test_minimal_camt_file_import('camt_053_minimal_and_multicurrency_06.xml', usd_currency)
+
+    def test_minimal_and_multicurrency_camt_file_import_07(self):
+        """
+        This test aims at importing a file with amounts expressed in EUR and USD.
+        The company's currency is USD.
+        This is the same test than test_minimal_and_multicurrency_camt_file_import,
+        except that the exchange rate is rounded to 4 digits.
+        """
+        usd_currency = self.env.ref('base.USD')
+        self.assertEqual(self.env.company.currency_id.id, usd_currency.id)
+        self._test_minimal_camt_file_import('camt_053_minimal_and_multicurrency_07.xml', usd_currency)
+
+    def test_several_minimal_stmt_different_currency(self):
+        """
+        Two different journals with the same bank account. The first one is in USD, the second one in EUR
+        Test to import a CAMT file with two statements: one in USD, another in EUR
+        """
+        usd_currency = self.env.ref('base.USD')
+        eur_currency = self.env.ref('base.EUR')
+        self.assertEqual(self.env.company.currency_id.id, usd_currency.id)
+        # USD Statement
+        self._test_minimal_camt_file_import('camt_053_several_minimal_stmt_different_currency.xml', usd_currency)
+        # EUR Statement
+        eur_currency.active = True
+        self._test_minimal_camt_file_import('camt_053_several_minimal_stmt_different_currency.xml', eur_currency,
+                                            start_balance=2000, end_balance=3000)
+
+    def test_journal_with_other_currency(self):
+        """
+        This test aims at importing a file with amounts expressed in EUR into a journal
+        that also uses EUR while the company's currency is USD.
+        """
+        self.assertEqual(self.env.company.currency_id.id, self.env.ref('base.USD').id)
+        self.env.ref('base.EUR').active = True
+        self._test_minimal_camt_file_import('camt_053_minimal_EUR.xml', self.env.ref('base.EUR'))
+
+    def _import_camt_file(self, camt_file_name, currency):
+        # Create a bank account and journal corresponding to the CAMT
+        # file (same currency and account number)
+        BankAccount = self.env['res.partner.bank']
+        partner = self.env.user.company_id.partner_id
+        bank_account = BankAccount.search([('acc_number', '=', '112233'), ('partner_id', '=', partner.id)]) \
+                       or BankAccount.create({'acc_number': '112233', 'partner_id': partner.id})
+        bank_journal = self.env['account.journal'].create(
+            {
+                'name': "Bank 112233 %s" % currency.name,
+                'code': "B-%s" % currency.name,
+                'type': 'bank',
+                'bank_account_id': bank_account.id,
+                'currency_id': currency.id,
+            }
+        )
+
+        # Use an import wizard to process the file
+        camt_file_path = f'odex30_account_bank_statement_import_camt/test_camt_file/{camt_file_name}'
+        with file_open(camt_file_path, 'rb') as camt_file:
+            bank_journal.create_document_from_attachment(self.env['ir.attachment'].create({
+                'mimetype': 'application/xml',
+                'name': 'test_camt.xml',
+                'raw': camt_file.read(),
+            }).ids)
+
+    def _test_minimal_camt_file_import(self, camt_file_name, currency, start_balance=1000, end_balance=1500):
+        # Create a bank account and journal corresponding to the CAMT
+        # file (same currency and account number)
+        self._import_camt_file(camt_file_name, currency)
+        # Check the imported bank statement
+        bank_st_record = self.env['account.bank.statement'].search(
+            [('name', '=', '2514988305.2019-02-13')]
+        ).filtered(lambda bk_stmt: bk_stmt.currency_id == currency).ensure_one()
+        self.assertEqual(
+            bank_st_record.balance_start, start_balance, "Start balance not matched"
+        )
+        self.assertEqual(
+            bank_st_record.balance_end_real, end_balance, "End balance not matched"
+        )
+
+        # Check the imported bank statement line
+        line = bank_st_record.line_ids.ensure_one()
+        self.assertEqual(line.amount, end_balance - start_balance, "Transaction not matched")
+
+    def _test_camt_with_several_tx_details(self, filename, expected_amounts=None):
+        if expected_amounts is None:
+            expected_amounts = NORMAL_AMOUNTS
+        usd_currency = self.env.ref('base.USD')
+        self.assertEqual(self.env.company.currency_id.id, usd_currency.id)
+        self._import_camt_file(filename, usd_currency)
+        imported_statement = self.env['account.bank.statement'].search([('company_id', '=', self.env.company.id)], order='id desc', limit=1)
+        self.assertEqual(len(imported_statement.line_ids), 3)
+        self.assertEqual(imported_statement.line_ids[0].payment_ref, 'label01')
+        self.assertEqual(usd_currency.round(imported_statement.line_ids[0].amount), expected_amounts[0])
+        self.assertEqual(imported_statement.line_ids[1].payment_ref, 'label02')
+        self.assertEqual(usd_currency.round(imported_statement.line_ids[1].amount), expected_amounts[1])
+        self.assertEqual(imported_statement.line_ids[2].payment_ref, 'label03')
+        self.assertEqual(usd_currency.round(imported_statement.line_ids[2].amount), expected_amounts[2])
+
+    def test_camt_with_several_tx_details(self):
+        self._test_camt_with_several_tx_details('camt_053_several_tx_details.xml')
+
+    def test_camt_with_several_tx_details_and_instructed_amount(self):
+        self._test_camt_with_several_tx_details('camt_053_several_tx_details_and_instructed_amount.xml')
+
+    def test_camt_with_several_tx_details_and_instructed_amount_02(self):
+        self._test_camt_with_several_tx_details('camt_053_several_tx_details_and_instructed_amount_02.xml')
+
+    def test_camt_with_several_tx_details_and_multicurrency_01(self):
+        self._test_camt_with_several_tx_details('camt_053_several_tx_details_and_multicurrency_01.xml')
+
+    def test_camt_with_several_tx_details_and_multicurrency_02(self):
+        self._test_camt_with_several_tx_details('camt_053_several_tx_details_and_multicurrency_02.xml')
+
+    def test_camt_with_several_tx_details_and_multicurrency_03(self):
+        self._test_camt_with_several_tx_details('camt_053_several_tx_details_and_multicurrency_03.xml')
+
+    def test_camt_with_several_tx_details_and_multicurrency_04(self):
+        self._test_camt_with_several_tx_details('camt_053_several_tx_details_and_multicurrency_04.xml',
+            expected_amounts=LARGE_AMOUNTS)
+
+    def test_camt_with_several_tx_details_and_multicurrency_05(self):
+        # Tests when the rounded sum is different by one cent from the sum of the rounded amounts after applying the currency rate.
+        # The difference is put on the largest amount (positive or negative)
+        self._test_camt_with_several_tx_details('camt_053_several_tx_details_and_multicurrency_05.xml',
+            expected_amounts=[-18918.02, -23508.64, -7573.34])
+
+    def test_camt_with_several_tx_details_and_charges(self):
+        self._test_camt_with_several_tx_details('camt_053_several_tx_details_and_charges.xml')
+
+    def test_several_ibans_match_journal_camt_file_import(self):
+        # Create a bank account and journal corresponding to the CAMT
+        # file (same currency and account number)
+        bank_journal = self.env['account.journal'].create({
+            'name': "Bank BE86 6635 9439 7150",
+            'code': 'BNK69',
+            'type': 'bank',
+            'bank_acc_number': 'BE86 6635 9439 7150',
+            'currency_id': self.env.ref('base.USD').id,
+        })
+
+        # Use an import wizard to process the file
+        camt_file_path = 'odex30_account_bank_statement_import_camt/test_camt_file/camt_053_several_ibans.xml'
+        with file_open(camt_file_path, 'rb') as camt_file:
+            with self.assertLogs(level="WARNING") as log_catcher:
+                bank_journal.create_document_from_attachment(self.env['ir.attachment'].create({
+                    'mimetype': 'application/xml',
+                    'name': 'test_camt.xml',
+                    'raw': camt_file.read(),
+                }).ids)
+        self.assertEqual(len(log_catcher.output), 1, "Exactly one warning should be logged")
+        self.assertIn(
+            "The following statements will not be imported",
+            log_catcher.output[0],
+            "The logged warning warns about non-imported statements",
+        )
+
+        # Check the imported bank statement
+        imported_statement = self.env['account.bank.statement'].search([('company_id', '=', self.env.company.id)])
+        self.assertRecordValues(imported_statement, [{
+            'name': '2514988305.2019-05-23',
+            'balance_start': 1000.00,
+            'balance_end_real': 1600.00,
+        }])
+        self.assertRecordValues(imported_statement.line_ids.sorted('ref'), [{'amount': 600.00}])
+
+    def test_several_ibans_missing_journal_id_camt_file_import(self):
+        # Create a bank account and journal corresponding to the CAMT
+        # file (same currency and account number)
+        bank_journal = self.env['account.journal'].create({
+            'name': "Bank BE43 9787 8497 9701",
+            'code': 'BNK69',
+            'type': 'bank',
+            'currency_id': self.env.ref('base.USD').id,
+            # missing bank account number
+        })
+
+        # Use an import wizard to process the file
+        camt_file_path = 'odex30_account_bank_statement_import_camt/test_camt_file/camt_053_several_ibans.xml'
+        with file_open(camt_file_path, 'rb') as camt_file:
+            with self.assertLogs(camt_wizard_logger, level="WARNING") as log_catcher:
+                with self.assertRaises(UserError) as error_catcher:
+                    bank_journal.create_document_from_attachment(self.env['ir.attachment'].create({
+                        'mimetype': 'application/xml',
+                        'name': 'test_camt.xml',
+                        'raw': camt_file.read(),
+                    }).ids)
+
+        self.assertEqual(len(log_catcher.output), 1, "Exactly one warning should be logged")
+        self.assertIn(
+            "The following statements will not be imported",
+            log_catcher.output[0],
+            "The logged warning warns about non-imported statements",
+        )
+
+        self.assertEqual(error_catcher.exception.args[0], (
+            "The following files could not be imported:\n"
+            "- test_camt.xml: Please set the IBAN account on your bank journal.\n\n"
+            "This CAMT file is targeting several IBAN accounts but none match the current journal."
+        ))
+
+    def test_date_and_time_format_camt_file_import(self):
+        """
+        This test aims to import a statement having dates specified in datetime format.
+        """
+        usd_currency = self.env.ref('base.USD')
+        self.assertEqual(self.env.company.currency_id.id, usd_currency.id)
+        self._test_minimal_camt_file_import('camt_053_minimal_datetime.xml', usd_currency)
+
+    def test_intraday_camt_file_import(self):
+        """
+        This test aims to import a statement having only an ITBD balance, where we have
+        only one date, corresponding to the same opening and closing amount.
+        """
+        usd_currency = self.env.ref('base.USD')
+        self.assertEqual(self.env.company.currency_id.id, usd_currency.id)
+        self._test_minimal_camt_file_import('camt_053_minimal_intraday.xml', usd_currency)
+
+    def test_charges_camt_file_import(self):
+        """
+        This test aims to import a statement having transactions including charges in their
+        total amount. In that case, we need to check that the retrieved amount is correct.
+        """
+        usd_currency = self.env.ref('base.USD')
+        self.assertEqual(self.env.company.currency_id.id, usd_currency.id)
+        self._test_minimal_camt_file_import('camt_053_minimal_charges.xml', usd_currency)
+
+    def test_charges_camt_file_import_02(self):
+        """
+        This test aims to import a statement having transactions including charges in their
+        total amount. In that case, we need to check that the retrieved amount is correct.
+        """
+        usd_currency = self.env.ref('base.USD')
+        self.assertEqual(self.env.company.currency_id.id, usd_currency.id)
+        self._test_minimal_camt_file_import('camt_053_minimal_charges_02.xml', usd_currency)
+
+    def test_charges_camt_file_import_03(self):
+        """
+        This test aims to import a statement having transactions including charges in their
+        total amount. In that case, we need to check that the retrieved amount is correct.
+        """
+        usd_currency = self.env.ref('base.USD')
+        self.assertEqual(self.env.company.currency_id.id, usd_currency.id)
+        self._test_minimal_camt_file_import('camt_053_minimal_charges_03.xml', usd_currency)
+
+    def test_import_already_fully_imported_catm_without_opening_balance(self):
+        """
+        Test the scenario when you have a CAMT file where one statement does not
+        have an opening balance, and you try to import it twice
+        """
+        bank_journal = self.env['account.journal'].create({
+            'name': 'Bank 123456',
+            'code': 'BNK67',
+            'type': 'bank',
+            'bank_acc_number': '112233',
+            'currency_id': self.env.ref('base.USD').id,
+        })
+
+        camt_file_path = 'odex30_account_bank_statement_import_camt/test_camt_file/test_camt_no_opening_balance.xml'
+
+        def import_file():
+            with file_open(camt_file_path, 'rb') as camt_file:
+                bank_journal.create_document_from_attachment(self.env['ir.attachment'].create({
+                    'mimetype': 'application/xml',
+                    'name': 'test_camt_no_opening_balance.xml',
+                    'raw': camt_file.read(),
+                }).ids)
+
+        import_file()
+        with self.assertRaises(UserError, msg='You already have imported that file.'):
+            import_file()
+
+    def test_import_camt_with_nordic_tags(self):
+        usd_currency = self.env.ref('base.USD')
+        self.assertEqual(self.env.company.currency_id.id, usd_currency.id)
+        self._import_camt_file('camt_053_several_tx_details_nordic.xml', usd_currency)
+        imported_statement = self.env['account.bank.statement'].search([('company_id', '=', self.env.company.id)], order='id desc', limit=1)
+        self.assertEqual(len(imported_statement.line_ids), 3)
+        third_line = imported_statement.line_ids[2]
+        self.assertEqual(third_line.payment_ref, 'Transaction 03 name')
+        self.assertEqual(third_line.partner_name, 'Ultimate Debtor Name')
+
+    def test_import_camt_additional_entry_info(self):
+        """
+        Ensures that '<AddtlNtryInf>' is used as a fallback for the payment reference
+        """
+        usd_currency = self.env.ref("base.USD")
+        self.assertEqual(self.env.company.currency_id.id, usd_currency.id)
+        self._import_camt_file("camt_053_additional_entry_info.xml", usd_currency)
+        imported_statement = self.env["account.bank.statement"].search(
+            [("company_id", "=", self.env.company.id)], order="id desc", limit=1
+        )
+        self.assertEqual(len(imported_statement.line_ids), 1)
+        self.assertEqual(imported_statement.line_ids.payment_ref, "entry info")
+
+    def test_import_camt_amounts_with_fees(self):
+        """
+        Ensures that '<AddtlNtryInf>' is used as a fallback for the payment reference
+        """
+        usd_currency = self.env.ref("base.USD")
+        self.assertEqual(self.env.company.currency_id.id, usd_currency.id)
+        self._import_camt_file("camt_053_exchange_fees.xml", usd_currency)
+        imported_statement = self.env["account.bank.statement"].search(
+            [("company_id", "=", self.env.company.id)], order="id desc", limit=1
+        )
+        self.assertEqual(len(imported_statement.line_ids), 1)
+        self.assertRecordValues(imported_statement.line_ids, [{
+            'amount': 1672.98,
+        }])
+
+    def test_camt_file_import_namespace(self):
+        """
+        Ensures that CAMT files using namespaces can be imported.
+        """
+        usd_currency = self.env.ref('base.USD')
+        self.assertEqual(self.env.company.currency_id.id, usd_currency.id)
+        self._test_minimal_camt_file_import('camt_053_namespace.xml', usd_currency)
+
+    def test_camt_file_import_custom_code(self):
+        """
+        Ensures that CAMT files with custom codes can be imported.
+        """
+        usd_currency = self.env.ref('base.USD')
+        self.assertEqual(self.env.company.currency_id.id, usd_currency.id)
+        self._test_minimal_camt_file_import('camt_053_custom_codes.xml', usd_currency)
+        bank_st_record = self.env['account.bank.statement'].search(
+            [('name', '=', '2514988305.2019-02-13')]
+        ).filtered(lambda bk_stmt: bk_stmt.currency_id == usd_currency).ensure_one()
+        line = bank_st_record.line_ids.ensure_one()
+        self.assertEqual(line.transaction_type, "custom_code: custom_family (custom_subfamily)")
diff --git a/dev_odex30_accounting/odex30_account_bank_statement_import_csv/__init__.py b/dev_odex30_accounting/odex30_account_bank_statement_import_csv/__init__.py
new file mode 100644
index 0000000..35e7c96
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_bank_statement_import_csv/__init__.py
@@ -0,0 +1,4 @@
+# -*- coding: utf-8 -*-
+
+from . import models
+from . import wizard
diff --git a/dev_odex30_accounting/odex30_account_bank_statement_import_csv/__manifest__.py b/dev_odex30_accounting/odex30_account_bank_statement_import_csv/__manifest__.py
new file mode 100644
index 0000000..1808e41
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_bank_statement_import_csv/__manifest__.py
@@ -0,0 +1,30 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+{
+    'name': 'Import CSV Bank Statement',
+    'category': 'Odex30-Accounting/Odex30-Accounting',
+    'author': "Expert Co. Ltd.",
+    'website': "http://www.exp-sa.com",
+    'version': '1.0',
+    'description': r'''
+Module to import CSV bank statements.
+======================================
+
+This module allows you to import CSV Files in Odoo: they are parsed and stored in human readable format in
+Accounting \ Bank and Cash \ Bank Statements.
+
+Important Note
+---------------------------------------------
+Because of the CSV format limitation, we cannot ensure the same transactions aren't imported several times or handle multicurrency.
+Whenever possible, you should use a more appropriate file format like OFX.
+''',
+    'depends': ['odex30_account_bank_statement_import', 'base_import'],
+    'installable': True,
+    'auto_install': True,
+    'assets': {
+        'web.assets_backend': [
+            'odex30_account_bank_statement_import_csv/static/src/**/*',
+        ],
+    }
+}
diff --git a/dev_odex30_accounting/odex30_account_bank_statement_import_csv/__pycache__/__init__.cpython-311.pyc b/dev_odex30_accounting/odex30_account_bank_statement_import_csv/__pycache__/__init__.cpython-311.pyc
new file mode 100644
index 0000000..2952708
Binary files /dev/null and b/dev_odex30_accounting/odex30_account_bank_statement_import_csv/__pycache__/__init__.cpython-311.pyc differ
diff --git a/dev_odex30_accounting/odex30_account_bank_statement_import_csv/i18n/account_bank_statement_import_csv.pot b/dev_odex30_accounting/odex30_account_bank_statement_import_csv/i18n/account_bank_statement_import_csv.pot
new file mode 100644
index 0000000..4582db7
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_bank_statement_import_csv/i18n/account_bank_statement_import_csv.pot
@@ -0,0 +1,56 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# 	* odex30_account_bank_statement_import_csv
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 18.0+e\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2024-12-19 09:52+0000\n"
+"PO-Revision-Date: 2024-12-19 09:52+0000\n"
+"Last-Translator: \n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: odex30_account_bank_statement_import_csv
+#: model:ir.model,name:odex30_account_bank_statement_import_csv.model_base_import_import
+msgid "Base Import"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_csv
+#. odoo-javascript
+#: code:addons/odex30_account_bank_statement_import_csv/static/src/bank_statement_csv_import_action.js:0
+msgid "Import Bank Statement"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_csv
+#: model:ir.model,name:odex30_account_bank_statement_import_csv.model_account_journal
+msgid "Journal"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_csv
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_csv/wizard/account_bank_statement_import_csv.py:0
+msgid "Make sure that an Amount or Debit and Credit is in the file."
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_csv
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_csv/models/account_journal.py:0
+msgid "Mixing CSV files with other file types is not allowed."
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_csv
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_csv/models/account_journal.py:0
+msgid "Only one CSV file can be selected."
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_csv
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_csv/wizard/account_bank_statement_import_csv.py:0
+msgid "Rows must be sorted by date."
+msgstr ""
diff --git a/dev_odex30_accounting/odex30_account_bank_statement_import_csv/i18n/ar.po b/dev_odex30_accounting/odex30_account_bank_statement_import_csv/i18n/ar.po
new file mode 100644
index 0000000..8158116
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_bank_statement_import_csv/i18n/ar.po
@@ -0,0 +1,62 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# 	* odex30_account_bank_statement_import_csv
+#
+# Translators:
+# Wil Odoo, 2024
+# Malaz Abuidris <msea@odoo.com>, 2025
+# 
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 18.0+e\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2024-12-19 09:52+0000\n"
+"PO-Revision-Date: 2024-09-25 09:43+0000\n"
+"Last-Translator: Malaz Abuidris <msea@odoo.com>, 2025\n"
+"Language-Team: Arabic (https://app.transifex.com/odoo/teams/41243/ar/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Language: ar\n"
+"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
+
+#. module: odex30_account_bank_statement_import_csv
+#: model:ir.model,name:odex30_account_bank_statement_import_csv.model_base_import_import
+msgid "Base Import"
+msgstr "الاستيراد الأساسي"
+
+#. module: odex30_account_bank_statement_import_csv
+#. odoo-javascript
+#: code:addons/odex30_account_bank_statement_import_csv/static/src/bank_statement_csv_import_action.js:0
+msgid "Import Bank Statement"
+msgstr "استيراد كشف حساب بنكي"
+
+#. module: odex30_account_bank_statement_import_csv
+#: model:ir.model,name:odex30_account_bank_statement_import_csv.model_account_journal
+msgid "Journal"
+msgstr "دفتر اليومية"
+
+#. module: odex30_account_bank_statement_import_csv
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_csv/wizard/account_bank_statement_import_csv.py:0
+msgid "Make sure that an Amount or Debit and Credit is in the file."
+msgstr "تأكد من وجود مبلغ أو رصيد مدين ومخصوم في الملف. "
+
+#. module: odex30_account_bank_statement_import_csv
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_csv/models/account_journal.py:0
+msgid "Mixing CSV files with other file types is not allowed."
+msgstr ""
+"لا يسمح بخلط ملفات القيم المفصولة بفواصل (CSV) مع أنواع الملفات الأخرى. "
+
+#. module: odex30_account_bank_statement_import_csv
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_csv/models/account_journal.py:0
+msgid "Only one CSV file can be selected."
+msgstr "يمكنك تحديد ملف قيم مفصولة بفواصل (CSV) واحد فقط. "
+
+#. module: odex30_account_bank_statement_import_csv
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_csv/wizard/account_bank_statement_import_csv.py:0
+msgid "Rows must be sorted by date."
+msgstr "يجب أن يتم فرز الصفوف حسب التاريخ. "
diff --git a/dev_odex30_accounting/odex30_account_bank_statement_import_csv/models/__init__.py b/dev_odex30_accounting/odex30_account_bank_statement_import_csv/models/__init__.py
new file mode 100644
index 0000000..5cd061d
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_bank_statement_import_csv/models/__init__.py
@@ -0,0 +1,3 @@
+# -*- coding: utf-8 -*-
+
+from . import account_journal
\ No newline at end of file
diff --git a/dev_odex30_accounting/odex30_account_bank_statement_import_csv/models/__pycache__/__init__.cpython-311.pyc b/dev_odex30_accounting/odex30_account_bank_statement_import_csv/models/__pycache__/__init__.cpython-311.pyc
new file mode 100644
index 0000000..5459258
Binary files /dev/null and b/dev_odex30_accounting/odex30_account_bank_statement_import_csv/models/__pycache__/__init__.cpython-311.pyc differ
diff --git a/dev_odex30_accounting/odex30_account_bank_statement_import_csv/models/__pycache__/account_journal.cpython-311.pyc b/dev_odex30_accounting/odex30_account_bank_statement_import_csv/models/__pycache__/account_journal.cpython-311.pyc
new file mode 100644
index 0000000..9e3ed62
Binary files /dev/null and b/dev_odex30_accounting/odex30_account_bank_statement_import_csv/models/__pycache__/account_journal.cpython-311.pyc differ
diff --git a/dev_odex30_accounting/odex30_account_bank_statement_import_csv/models/account_journal.py b/dev_odex30_accounting/odex30_account_bank_statement_import_csv/models/account_journal.py
new file mode 100644
index 0000000..35b52e3
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_bank_statement_import_csv/models/account_journal.py
@@ -0,0 +1,47 @@
+# -*- coding: utf-8 -*-
+
+from odoo import _, models
+from odoo.exceptions import UserError
+
+
+class AccountJournal(models.Model):
+    _inherit = 'account.journal'
+
+    def _get_bank_statements_available_import_formats(self):
+        rslt = super()._get_bank_statements_available_import_formats()
+        rslt.extend(['CSV', 'XLS', 'XLSX'])
+        return rslt
+
+    def _check_file_format(self, filename):
+        return filename and filename.lower().strip().endswith(('.csv', '.xls', '.xlsx'))
+
+    def _import_bank_statement(self, attachments):
+        # In case of CSV files, only one file can be imported at a time.
+        if len(attachments) > 1:
+            csv = [bool(self._check_file_format(att.name)) for att in attachments]
+            if True in csv and False in csv:
+                raise UserError(_('Mixing CSV files with other file types is not allowed.'))
+            if csv.count(True) > 1:
+                raise UserError(_('Only one CSV file can be selected.'))
+            return super()._import_bank_statement(attachments)
+
+        if not self._check_file_format(attachments.name):
+            return super()._import_bank_statement(attachments)
+        ctx = dict(self.env.context)
+        import_wizard = self.env['base_import.import'].create({
+            'res_model': 'account.bank.statement.line',
+            'file': attachments.raw,
+            'file_name': attachments.name,
+            'file_type': attachments.mimetype,
+        })
+        ctx['wizard_id'] = import_wizard.id
+        ctx['default_journal_id'] = self.id
+        return {
+            'type': 'ir.actions.client',
+            'tag': 'import_bank_stmt',
+            'params': {
+                'model': 'account.bank.statement.line',
+                'context': ctx,
+                'filename': attachments.name,
+            }
+        }
diff --git a/dev_odex30_accounting/odex30_account_bank_statement_import_csv/static/csv/account.bank.statement.csv b/dev_odex30_accounting/odex30_account_bank_statement_import_csv/static/csv/account.bank.statement.csv
new file mode 100644
index 0000000..b27f721
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_bank_statement_import_csv/static/csv/account.bank.statement.csv
@@ -0,0 +1,6 @@
+Date,Reference,Partner,Label,Amount,Amount Currency,Currency,Cumulative Balance
+2017-05-10,INV/2017/0001,,#01,4610,,,4710
+2017-05-11,Payment bill 20170521,,#02,-100,,,4610
+2017-05-15,INV/2017/0003 discount 2% early payment,,#03,514.5,,,5124.5
+2017-05-30,INV/2017/0002 + INV/2017/0004,,#04,5260,,,10384.5
+2017-05-31,Payment bill EUR 001234565,,#05,-537.15,-500,EUR,9847.35
diff --git a/dev_odex30_accounting/odex30_account_bank_statement_import_csv/static/src/bank_statement_csv_import_action.js b/dev_odex30_accounting/odex30_account_bank_statement_import_csv/static/src/bank_statement_csv_import_action.js
new file mode 100644
index 0000000..e2dd13b
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_bank_statement_import_csv/static/src/bank_statement_csv_import_action.js
@@ -0,0 +1,47 @@
+/** @odoo-module **/
+
+import { onWillStart } from "@odoo/owl";
+import { registry } from "@web/core/registry";
+import { useService } from "@web/core/utils/hooks";
+import { _t } from "@web/core/l10n/translation";
+import { ImportAction } from "@base_import/import_action/import_action";
+import { useBankStatementCSVImportModel } from "./bank_statement_csv_import_model";
+
+export class BankStatementImportAction extends ImportAction {
+    setup() {
+        super.setup();
+
+        this.action = useService("action");
+
+        this.model = useBankStatementCSVImportModel({
+            env: this.env,
+            resModel: this.resModel,
+            context: this.props.action.params.context || {},
+            orm: this.orm,
+        });
+
+        this.env.config.setDisplayName(_t("Import Bank Statement")); // Displayed in the breadcrumbs
+        this.state.filename = this.props.action.params.filename || undefined;
+
+        onWillStart(async () => {
+            if (this.props.action.params.context) {
+                this.model.id = this.props.action.params.context.wizard_id;
+                await super.handleFilesUpload([{ name: this.state.filename }])
+            }
+        });
+    }
+
+    async exit() {
+        if (this.model.statement_id) {
+            const res = await this.orm.call(
+                "account.bank.statement",
+                "action_open_bank_reconcile_widget",
+                [this.model.statement_id]
+            );
+            return this.action.doAction(res);
+        }
+        super.exit();
+    }
+}
+
+registry.category("actions").add("import_bank_stmt", BankStatementImportAction);
diff --git a/dev_odex30_accounting/odex30_account_bank_statement_import_csv/static/src/bank_statement_csv_import_model.js b/dev_odex30_accounting/odex30_account_bank_statement_import_csv/static/src/bank_statement_csv_import_model.js
new file mode 100644
index 0000000..d990721
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_bank_statement_import_csv/static/src/bank_statement_csv_import_model.js
@@ -0,0 +1,37 @@
+/** @odoo-module **/
+
+import { useState } from "@odoo/owl";
+import { BaseImportModel } from "@base_import/import_model";
+
+class BankStatementCSVImportModel extends BaseImportModel {
+    async init() {
+        this.importOptionsValues.bank_stmt_import = {
+            value: true,
+        };
+        return Promise.resolve();
+    }
+
+    async _onLoadSuccess(res) {
+        super._onLoadSuccess(res);
+
+        if (!res.messages || res.messages.length === 0 || res.messages.length > 1) {
+            return;
+        }
+
+        const message = res.messages[0];
+        if (message.ids) {
+            this.statement_line_ids = message.ids
+        }
+
+        if (message.messages && message.messages.length > 0) {
+            this.statement_id = message.messages[0].statement_id
+        }
+    }
+}
+
+/**
+ * @returns {BankStatementCSVImportModel}
+ */
+export function useBankStatementCSVImportModel({ env, resModel, context, orm }) {
+    return useState(new BankStatementCSVImportModel({ env, resModel, context, orm }));
+}
diff --git a/dev_odex30_accounting/odex30_account_bank_statement_import_csv/test_csv_file/test_csv.csv b/dev_odex30_accounting/odex30_account_bank_statement_import_csv/test_csv_file/test_csv.csv
new file mode 100644
index 0000000..8e8bfea
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_bank_statement_import_csv/test_csv_file/test_csv.csv
@@ -0,0 +1,20 @@
+02 01 15;;LAST STATEMENT;; $21,699.55 
+02 02 15;;"DEBIT CARD 6906 EFF 02-01""01/31 MAILCHIMP MAILCHIMP.COMGA";($240.00); $21,459.55 
+02 02 15;;"DEBIT CARD 6906 EFF 02-01""01/31 INDEED 203-564-2400 CT";($500.08); $20,959.46 
+02 02 15;;"ACH CREDIT""AMERICAN EXPRESS-SETTLEMENT";$3,728.87 ; $24,688.34 
+02 02 15;;"DEBIT CARD 6906""BAYSIDE MARKET/1 SAN FRANCISCO CA";($41.64); $24,646.70 
+02 02 15;;"DEBIT CARD 6906""02/02 COMFORT INNS SAN FRANCISCOCA";($2,064.82); $22,581.88 
+02 03 15;;"ACH CREDIT""CHECKFLUID INC -013015";$2,500.00 ; $25,081.88 
+02 03 15;;"DEBIT CARD 6906""02/02 DISTRICT SF SAN FRANCISCOCA";($45.86); $25,036.02 
+02 03 15;;"DEPOSIT-WIRED FUNDS""TVET OPERATING PLLC";$8,366.00 ; $33,402.02 
+02 03 15;;"DEBIT CARD 6906""02/03 IBM USED PC 888S 188-874-6742 NY";($4,344.66); $29,057.36 
+02 03 15;;"DEBIT CARD 6906""02/02 VIR ATL 9327 180-08628621 CT";($1,284.33); $27,773.03 
+02 03 15;;"DEBIT CARD 6906""02/02 VIR ATL 9327 180-08628621 CT";($1,284.33); $26,488.70 
+02 03 15;;"DEBIT CARD 6906""02/02 VIR ATL 9327 180-08628621 CT";($1,284.33); $25,204.37 
+02 03 15;;"DEBIT CARD 6906""02/02 VIR ATL 9327 180-08628621 CT";($1,123.33); $24,081.04 
+02 03 15;;"DEBIT CARD 6906""02/02 VIR ATL 9327 180-08628621 CT";($1,123.33); $22,957.71 
+02 03 15;;"ACH DEBIT""AUTHNET GATEWAY -BILLING";($25.00); $22,932.71 
+02 03 15;;"ACH DEBIT""WW 222 BROADWAY -ACH";($7,500.00); $15,432.71 
+02 04 15;;"DEBIT CARD 6906""02/03 VIR ATL 9327 180-08628621 CT";($1,284.33); $14,148.38 
+02 04 15;;"DEBIT CARD 6906""02/04 GROUPON INC 877-788-7858 IL";($204.23); $13,944.15 
+02 05 15;;"ACH CREDIT""MERCHE-SOLUTIONS-MERCH DEP";$9,518.40 ; $23,462.55 
diff --git a/dev_odex30_accounting/odex30_account_bank_statement_import_csv/test_csv_file/test_csv_empty_date.csv b/dev_odex30_accounting/odex30_account_bank_statement_import_csv/test_csv_file/test_csv_empty_date.csv
new file mode 100644
index 0000000..e1769a4
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_bank_statement_import_csv/test_csv_file/test_csv_empty_date.csv
@@ -0,0 +1,5 @@
+02 01 15;;LAST STATEMENT;; $21,699.55
+02 02 15;;"DEBIT CARD 6906 EFF 02-01""01/31 MAILCHIMP MAILCHIMP.COMGA"; ($240.00); $21,459.55
+04 02 15;;"DEBIT CARD 6906 EFF 02-01""01/31 INDEED 203-564-2400 CT"; ($500.08); $20,959.46
+02 02 15;;"ACH CREDIT""AMERICAN EXPRESS-SETTLEMENT"; $3,728.87; $24,688.34
+;;"DEBIT CARD 6906""BAYSIDE MARKET/1 SAN FRANCISCO CA"; ($41.64); $24,646.70
diff --git a/dev_odex30_accounting/odex30_account_bank_statement_import_csv/test_csv_file/test_csv_missing_values.csv b/dev_odex30_accounting/odex30_account_bank_statement_import_csv/test_csv_file/test_csv_missing_values.csv
new file mode 100644
index 0000000..b930490
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_bank_statement_import_csv/test_csv_file/test_csv_missing_values.csv
@@ -0,0 +1,2 @@
+TRANSFER;bank_ref_1;bank_statement_line_1;;1000
+TRANSFER;;bank_statement_line_2;;3500
diff --git a/dev_odex30_accounting/odex30_account_bank_statement_import_csv/test_csv_file/test_csv_non_sorted.csv b/dev_odex30_accounting/odex30_account_bank_statement_import_csv/test_csv_file/test_csv_non_sorted.csv
new file mode 100644
index 0000000..98d6a30
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_bank_statement_import_csv/test_csv_file/test_csv_non_sorted.csv
@@ -0,0 +1,4 @@
+02 01 15;;LAST STATEMENT;; $21,699.55
+02 02 15;;"DEBIT CARD 6906 EFF 02-01""01/31 MAILCHIMP MAILCHIMP.COMGA";($240.00); $21,459.55
+04 02 15;;"DEBIT CARD 6906 EFF 02-01""01/31 INDEED 203-564-2400 CT";($500.08); $20,959.46
+02 02 15;;"ACH CREDIT""AMERICAN EXPRESS-SETTLEMENT";$3,728.87 ; $24,688.34
diff --git a/dev_odex30_accounting/odex30_account_bank_statement_import_csv/test_csv_file/test_csv_without_amount.csv b/dev_odex30_accounting/odex30_account_bank_statement_import_csv/test_csv_file/test_csv_without_amount.csv
new file mode 100644
index 0000000..3d1973e
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_bank_statement_import_csv/test_csv_file/test_csv_without_amount.csv
@@ -0,0 +1,3 @@
+02 01 15;;LAST STATEMENT;
+02 02 15;;"DEBIT CARD 6906 EFF 02-01""01/31 MAILCHIMP MAILCHIMP.COMGA";
+
diff --git a/dev_odex30_accounting/odex30_account_bank_statement_import_csv/tests/__init__.py b/dev_odex30_accounting/odex30_account_bank_statement_import_csv/tests/__init__.py
new file mode 100644
index 0000000..3eb2e34
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_bank_statement_import_csv/tests/__init__.py
@@ -0,0 +1,4 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+from . import test_import_bank_statement
diff --git a/dev_odex30_accounting/odex30_account_bank_statement_import_csv/tests/test_import_bank_statement.py b/dev_odex30_accounting/odex30_account_bank_statement_import_csv/tests/test_import_bank_statement.py
new file mode 100644
index 0000000..57e3386
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_bank_statement_import_csv/tests/test_import_bank_statement.py
@@ -0,0 +1,117 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+from odoo.addons.account.tests.common import AccountTestInvoicingCommon
+from odoo import fields
+from odoo.exceptions import UserError, ValidationError
+from odoo.tests import tagged
+from odoo.tools import file_open
+
+
+@tagged('post_install', '-at_install')
+class TestAccountBankStatementImportCSV(AccountTestInvoicingCommon):
+
+    def _import_file(self, csv_file_path, csv_fields=False):
+        # Create a bank account and journal corresponding to the CSV file (same currency and account number)
+        bank_journal = self.env['account.journal'].create({
+            'name': 'Bank 123456',
+            'code': 'BNK67',
+            'type': 'bank',
+            'bank_acc_number': '123456',
+            'currency_id': self.env.ref("base.USD").id,
+        })
+
+        # Use an import wizard to process the file
+        with file_open(csv_file_path, 'rb') as csv_file:
+            action = bank_journal.create_document_from_attachment(self.env['ir.attachment'].create({
+                'mimetype': 'text/csv',
+                'name': 'test_csv.csv',
+                'raw': csv_file.read(),
+            }).ids)
+        import_wizard = self.env['base_import.import'].browse(
+            action['params']['context']['wizard_id']
+        ).with_context(action['params']['context'])
+
+        import_wizard_options = {
+            'date_format': '%m %d %y',
+            'keep_matches': False,
+            'encoding': 'utf-8',
+            'fields': [],
+            'quoting': '"',
+            'bank_stmt_import': True,
+            'headers': True,
+            'limit': 10,
+            'skip': 0,
+            'separator': ';',
+            'float_thousand_separator': ',',
+            'float_decimal_separator': '.',
+            'advanced': False,
+        }
+        import_wizard_fields = csv_fields or ['date', False, 'payment_ref', 'amount', 'balance']
+        res = import_wizard.execute_import(import_wizard_fields, [], import_wizard_options, dryrun=False)
+        while not res['messages'] and res['nextrow'] != 0:  # no error and there is a next row
+            import_wizard_options['skip'] = res['nextrow'] + 1
+            res = import_wizard.execute_import(import_wizard_fields, [], import_wizard_options, dryrun=False)
+
+    def test_csv_file_import(self):
+        self._import_file('odex30_account_bank_statement_import_csv/test_csv_file/test_csv.csv')
+
+        # Check the imported bank statement
+        imported_statement = self.env['account.bank.statement'].search([('company_id', '=', self.env.company.id)])
+        self.assertRecordValues(imported_statement, [
+            {
+                'reference': 'test_csv.csv',
+                'balance_start': 27773.03,
+                'balance_end_real': 23462.55,
+            },
+            {
+                'reference': 'test_csv.csv',
+                'balance_start': 21699.55,
+                'balance_end_real': 23462.55,
+            }
+        ])
+        self.assertRecordValues(imported_statement.line_ids.sorted(lambda line: (line.date, line.payment_ref)), [
+            {'date': fields.Date.from_string('2015-02-02'), 'amount': 3728.87,  'payment_ref': 'ACH CREDIT"AMERICAN EXPRESS-SETTLEMENT'},
+            {'date': fields.Date.from_string('2015-02-02'), 'amount': -500.08,  'payment_ref': 'DEBIT CARD 6906 EFF 02-01"01/31 INDEED 203-564-2400 CT'},
+            {'date': fields.Date.from_string('2015-02-02'), 'amount': -240.00,  'payment_ref': 'DEBIT CARD 6906 EFF 02-01"01/31 MAILCHIMP MAILCHIMP.COMGA'},
+            {'date': fields.Date.from_string('2015-02-02'), 'amount': -2064.82, 'payment_ref': 'DEBIT CARD 6906"02/02 COMFORT INNS SAN FRANCISCOCA'},
+            {'date': fields.Date.from_string('2015-02-02'), 'amount': -41.64,   'payment_ref': 'DEBIT CARD 6906"BAYSIDE MARKET/1 SAN FRANCISCO CA'},
+            {'date': fields.Date.from_string('2015-02-03'), 'amount': 2500.00,  'payment_ref': 'ACH CREDIT"CHECKFLUID INC -013015'},
+            {'date': fields.Date.from_string('2015-02-03'), 'amount': -25.00,   'payment_ref': 'ACH DEBIT"AUTHNET GATEWAY -BILLING'},
+            {'date': fields.Date.from_string('2015-02-03'), 'amount': -7500.00, 'payment_ref': 'ACH DEBIT"WW 222 BROADWAY -ACH'},
+            {'date': fields.Date.from_string('2015-02-03'), 'amount': -45.86,   'payment_ref': 'DEBIT CARD 6906"02/02 DISTRICT SF SAN FRANCISCOCA'},
+            {'date': fields.Date.from_string('2015-02-03'), 'amount': -1284.33, 'payment_ref': 'DEBIT CARD 6906"02/02 VIR ATL 9327 180-08628621 CT'},
+            {'date': fields.Date.from_string('2015-02-03'), 'amount': -1284.33, 'payment_ref': 'DEBIT CARD 6906"02/02 VIR ATL 9327 180-08628621 CT'},
+            {'date': fields.Date.from_string('2015-02-03'), 'amount': -1123.33, 'payment_ref': 'DEBIT CARD 6906"02/02 VIR ATL 9327 180-08628621 CT'},
+            {'date': fields.Date.from_string('2015-02-03'), 'amount': -1123.33, 'payment_ref': 'DEBIT CARD 6906"02/02 VIR ATL 9327 180-08628621 CT'},
+            {'date': fields.Date.from_string('2015-02-03'), 'amount': -1284.33, 'payment_ref': 'DEBIT CARD 6906"02/02 VIR ATL 9327 180-08628621 CT'},
+            {'date': fields.Date.from_string('2015-02-03'), 'amount': -4344.66, 'payment_ref': 'DEBIT CARD 6906"02/03 IBM USED PC 888S 188-874-6742 NY'},
+            {'date': fields.Date.from_string('2015-02-03'), 'amount': 8366.00,  'payment_ref': 'DEPOSIT-WIRED FUNDS"TVET OPERATING PLLC'},
+            {'date': fields.Date.from_string('2015-02-04'), 'amount': -1284.33, 'payment_ref': 'DEBIT CARD 6906"02/03 VIR ATL 9327 180-08628621 CT'},
+            {'date': fields.Date.from_string('2015-02-04'), 'amount': -204.23,  'payment_ref': 'DEBIT CARD 6906"02/04 GROUPON INC 877-788-7858 IL'},
+            {'date': fields.Date.from_string('2015-02-05'), 'amount': 9518.40,  'payment_ref': 'ACH CREDIT"MERCHE-SOLUTIONS-MERCH DEP'},
+        ])
+
+    def test_csv_file_import_with_missing_values(self):
+        self._import_file('odex30_account_bank_statement_import_csv/test_csv_file/test_csv_missing_values.csv', ['transaction_type', 'ref', 'payment_ref', 'debit', 'credit'])
+
+        imported_statement = self.env['account.bank.statement'].search([('company_id', '=', self.env.company.id)])
+
+        self.assertEqual(len(imported_statement.line_ids), 2)
+
+        self.assertRecordValues(imported_statement.line_ids.sorted(lambda line: line.amount), [
+            {'transaction_type': 'TRANSFER', 'ref': 'bank_ref_1', 'payment_ref': 'bank_statement_line_1', 'sequence': 0, 'amount': 1000.0},
+            {'transaction_type': 'TRANSFER', 'ref': False, 'payment_ref': 'bank_statement_line_2', 'sequence': 1, 'amount': 3500.0},
+        ])
+
+    def test_csv_file_import_non_ordered(self):
+        with self.assertRaises(UserError):
+            self._import_file('odex30_account_bank_statement_import_csv/test_csv_file/test_csv_non_sorted.csv')
+
+    def test_csv_file_empty_date(self):
+        with self.assertRaises(UserError):
+            self._import_file('odex30_account_bank_statement_import_csv/test_csv_file/test_csv_empty_date.csv')
+
+    def test_csv_file_import_without_amount(self):
+        csv_fields = ['date', False, 'payment_ref', 'balance']
+        with self.assertRaisesRegex(ValidationError, "Make sure that an Amount or Debit and Credit is in the file."):
+            self._import_file('odex30_account_bank_statement_import_csv/test_csv_file/test_csv_without_amount.csv', csv_fields)
diff --git a/dev_odex30_accounting/odex30_account_bank_statement_import_csv/wizard/__init__.py b/dev_odex30_accounting/odex30_account_bank_statement_import_csv/wizard/__init__.py
new file mode 100644
index 0000000..da76434
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_bank_statement_import_csv/wizard/__init__.py
@@ -0,0 +1,4 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+from . import account_bank_statement_import_csv
diff --git a/dev_odex30_accounting/odex30_account_bank_statement_import_csv/wizard/__pycache__/__init__.cpython-311.pyc b/dev_odex30_accounting/odex30_account_bank_statement_import_csv/wizard/__pycache__/__init__.cpython-311.pyc
new file mode 100644
index 0000000..f8809bf
Binary files /dev/null and b/dev_odex30_accounting/odex30_account_bank_statement_import_csv/wizard/__pycache__/__init__.cpython-311.pyc differ
diff --git a/dev_odex30_accounting/odex30_account_bank_statement_import_csv/wizard/__pycache__/account_bank_statement_import_csv.cpython-311.pyc b/dev_odex30_accounting/odex30_account_bank_statement_import_csv/wizard/__pycache__/account_bank_statement_import_csv.cpython-311.pyc
new file mode 100644
index 0000000..15d20b7
Binary files /dev/null and b/dev_odex30_accounting/odex30_account_bank_statement_import_csv/wizard/__pycache__/account_bank_statement_import_csv.cpython-311.pyc differ
diff --git a/dev_odex30_accounting/odex30_account_bank_statement_import_csv/wizard/account_bank_statement_import_csv.py b/dev_odex30_accounting/odex30_account_bank_statement_import_csv/wizard/account_bank_statement_import_csv.py
new file mode 100644
index 0000000..713d19a
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_bank_statement_import_csv/wizard/account_bank_statement_import_csv.py
@@ -0,0 +1,149 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+import contextlib
+
+import psycopg2
+
+from odoo import _, api, fields, models, Command
+from odoo.exceptions import UserError, ValidationError
+from odoo.addons.base_import.models.base_import import FIELDS_RECURSION_LIMIT
+
+
+class AccountBankStmtImportCSV(models.TransientModel):
+
+    _inherit = 'base_import.import'
+
+    @api.model
+    def get_fields_tree(self, model, depth=FIELDS_RECURSION_LIMIT):
+        fields_list = super(AccountBankStmtImportCSV, self).get_fields_tree(model, depth=depth)
+        if self._context.get('bank_stmt_import', False):
+            add_fields = [{
+                'id': 'balance',
+                'name': 'balance',
+                'string': 'Cumulative Balance',
+                'required': False,
+                'fields': [],
+                'type': 'monetary',
+                'model_name': model,
+            }, {
+                'id': 'debit',
+                'name': 'debit',
+                'string': 'Debit',
+                'required': False,
+                'fields': [],
+                'type': 'monetary',
+                'model_name': model,
+            }, {
+                'id': 'credit',
+                'name': 'credit',
+                'string': 'Credit',
+                'required': False,
+                'fields': [],
+                'type': 'monetary',
+                'model_name': model,
+            }]
+            fields_list.extend(add_fields)
+        return fields_list
+
+    def _convert_to_float(self, value):
+        return float(value) if value else 0.0
+
+    def _parse_import_data(self, data, import_fields, options):
+        # EXTENDS base
+        data = super()._parse_import_data(data, import_fields, options)
+        journal_id = self._context.get('default_journal_id')
+        bank_stmt_import = options.get('bank_stmt_import')
+        if not journal_id or not bank_stmt_import:
+            return data
+
+        has_amount = 'amount' in import_fields
+        has_credit = 'credit' in import_fields
+        has_debit = 'debit' in import_fields
+        if (has_debit ^ has_credit) or not (has_amount ^ has_debit):
+            raise ValidationError(_("Make sure that an Amount or Debit and Credit is in the file."))
+        statement_vals = options['statement_vals'] = {}
+        ret_data = []
+
+        import_fields.append('sequence')
+        index_balance = False
+        convert_to_amount = False
+
+        # check that the rows are sorted by date (ascending or descending) as we assume they are in the following code
+        # we can't order the rows for the user as two rows could have the same date
+        # and we don't have a way to know which one should be first
+        if 'date' in import_fields:
+            index_date = import_fields.index('date')
+            dates = [fields.Date.from_string(line[index_date]) for line in data if line[index_date]]
+            sorted_dates_asc = sorted(dates)
+            if dates != sorted_dates_asc:  # If dates are not in ascending order, check if they are in descending order
+                sorted_dates_desc = sorted_dates_asc[::-1]
+                if dates == sorted_dates_desc:
+                    data = data[::-1]  # reverse data if dates are in descending order to make them ascending
+                else:  # If dates are not sorted at all, we throw an error
+                    raise UserError(_('Rows must be sorted by date.'))
+
+        if 'debit' in import_fields and 'credit' in import_fields:
+            index_debit = import_fields.index('debit')
+            index_credit = import_fields.index('credit')
+            self._parse_float_from_data(data, index_debit, 'debit', options)
+            self._parse_float_from_data(data, index_credit, 'credit', options)
+            import_fields.append('amount')
+            convert_to_amount = True
+
+        # add starting balance and ending balance to context
+        if 'balance' in import_fields:
+            index_balance = import_fields.index('balance')
+            self._parse_float_from_data(data, index_balance, 'balance', options)
+            statement_vals['balance_start'] = self._convert_to_float(data[0][index_balance])
+            statement_vals['balance_start'] -= self._convert_to_float(data[0][import_fields.index('amount')]) \
+                                            if not convert_to_amount \
+                                            else abs(self._convert_to_float(data[0][index_credit]))-abs(self._convert_to_float(data[0][index_debit]))
+            statement_vals['balance_end_real'] = data[len(data)-1][index_balance]
+            import_fields.remove('balance')
+
+        if convert_to_amount:
+            import_fields.remove('debit')
+            import_fields.remove('credit')
+
+        for index, line in enumerate(data):
+            line.append(index)
+            remove_index = []
+            if convert_to_amount:
+                line.append(
+                    abs(self._convert_to_float(line[index_credit]))
+                    - abs(self._convert_to_float(line[index_debit]))
+                )
+                remove_index.extend([index_debit, index_credit])
+            if index_balance:
+                remove_index.append(index_balance)
+            # Remove added field debit/credit/balance
+            for index in sorted(remove_index, reverse=True):
+                del line[index]
+            if line[import_fields.index('amount')]:
+                ret_data.append(line)
+
+        return ret_data
+
+    def parse_preview(self, options, count=10):
+        if options.get('bank_stmt_import', False):
+            self = self.with_context(bank_stmt_import=True)
+        return super(AccountBankStmtImportCSV, self).parse_preview(options, count=count)
+
+    def execute_import(self, fields, columns, options, dryrun=False):
+        if options.get('bank_stmt_import'):
+            with self.env.cr.savepoint(flush=False) as sp:
+                res = super().execute_import(fields, columns, options, dryrun=dryrun)
+
+                if not 'statement_id' in fields:
+                    statement = self.env['account.bank.statement'].create({
+                        'reference': self.file_name,
+                        'line_ids': [Command.set(res.get('ids', []))],
+                        **options.get('statement_vals', {}),
+                    })
+
+                with contextlib.suppress(psycopg2.InternalError):
+                    sp.close(rollback=dryrun)
+
+                return res
+        else:
+            return super(AccountBankStmtImportCSV, self).execute_import(fields, columns, options, dryrun=dryrun)
diff --git a/dev_odex30_accounting/odex30_account_bank_statement_import_ofx/__init__.py b/dev_odex30_accounting/odex30_account_bank_statement_import_ofx/__init__.py
new file mode 100644
index 0000000..cde864b
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_bank_statement_import_ofx/__init__.py
@@ -0,0 +1,3 @@
+# -*- coding: utf-8 -*-
+
+from . import models
diff --git a/dev_odex30_accounting/odex30_account_bank_statement_import_ofx/__manifest__.py b/dev_odex30_accounting/odex30_account_bank_statement_import_ofx/__manifest__.py
new file mode 100644
index 0000000..28f0b07
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_bank_statement_import_ofx/__manifest__.py
@@ -0,0 +1,23 @@
+# -*- coding: utf-8 -*-
+
+{
+    'name': 'Import OFX Bank Statement',
+    'category': 'Odex30-Accounting/Odex30-Accounting',
+    'author': "Expert Co. Ltd.",
+    'website': "http://www.exp-sa.com",
+    'version': '1.0',
+    'depends': ['odex30_account_bank_statement_import'],
+    'description': r"""
+Module to import OFX bank statements.
+======================================
+
+This module allows you to import the machine readable OFX Files in Odoo: they are parsed and stored in human readable format in
+Accounting \ Bank and Cash \ Bank Statements.
+
+Bank Statements may be generated containing a subset of the OFX information (only those transaction lines that are required for the
+creation of the Financial Accounting records).
+    """,
+    'installable': True,
+    'auto_install': True,
+    'license': 'OEEL-1',
+}
diff --git a/dev_odex30_accounting/odex30_account_bank_statement_import_ofx/__pycache__/__init__.cpython-311.pyc b/dev_odex30_accounting/odex30_account_bank_statement_import_ofx/__pycache__/__init__.cpython-311.pyc
new file mode 100644
index 0000000..4308148
Binary files /dev/null and b/dev_odex30_accounting/odex30_account_bank_statement_import_ofx/__pycache__/__init__.cpython-311.pyc differ
diff --git a/dev_odex30_accounting/odex30_account_bank_statement_import_ofx/i18n/account_bank_statement_import_ofx.pot b/dev_odex30_accounting/odex30_account_bank_statement_import_ofx/i18n/account_bank_statement_import_ofx.pot
new file mode 100644
index 0000000..82ad174
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_bank_statement_import_ofx/i18n/account_bank_statement_import_ofx.pot
@@ -0,0 +1,33 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# 	* odex30_account_bank_statement_import_ofx
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 18.0+e\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2025-05-07 20:46+0000\n"
+"PO-Revision-Date: 2025-05-07 20:46+0000\n"
+"Last-Translator: \n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: odex30_account_bank_statement_import_ofx
+#: model:ir.model,name:odex30_account_bank_statement_import_ofx.model_account_journal
+msgid "Journal"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_ofx
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_ofx/models/account_journal.py:0
+msgid "The library 'ofxparse' is missing, OFX import cannot proceed."
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_ofx
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_ofx/models/account_journal.py:0
+msgid "There was an issue decoding the file. Please check the file encoding."
+msgstr ""
diff --git a/dev_odex30_accounting/odex30_account_bank_statement_import_ofx/i18n/ar.po b/dev_odex30_accounting/odex30_account_bank_statement_import_ofx/i18n/ar.po
new file mode 100644
index 0000000..8e021c2
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_bank_statement_import_ofx/i18n/ar.po
@@ -0,0 +1,38 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# 	* odex30_account_bank_statement_import_ofx
+# 
+# Translators:
+# Wil Odoo, 2024
+# Malaz Abuidris <msea@odoo.com>, 2025
+# 
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 18.0+e\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2025-05-07 20:46+0000\n"
+"PO-Revision-Date: 2024-09-25 09:43+0000\n"
+"Last-Translator: Malaz Abuidris <msea@odoo.com>, 2025\n"
+"Language-Team: Arabic (https://app.transifex.com/odoo/teams/41243/ar/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Language: ar\n"
+"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
+
+#. module: odex30_account_bank_statement_import_ofx
+#: model:ir.model,name:odex30_account_bank_statement_import_ofx.model_account_journal
+msgid "Journal"
+msgstr "دفتر اليومية"
+
+#. module: odex30_account_bank_statement_import_ofx
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_ofx/models/account_journal.py:0
+msgid "The library 'ofxparse' is missing, OFX import cannot proceed."
+msgstr "المكتبة 'ofxparse' غير مثبتة، لن يمكن استيراد ملفات OFX بدونها."
+
+#. module: odex30_account_bank_statement_import_ofx
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_ofx/models/account_journal.py:0
+msgid "There was an issue decoding the file. Please check the file encoding."
+msgstr "حدثت مشكلة أثناء فك تشفير الملف. يرجى التحقق من ترميز الملف. "
diff --git a/dev_odex30_accounting/odex30_account_bank_statement_import_ofx/models/__init__.py b/dev_odex30_accounting/odex30_account_bank_statement_import_ofx/models/__init__.py
new file mode 100644
index 0000000..5cd061d
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_bank_statement_import_ofx/models/__init__.py
@@ -0,0 +1,3 @@
+# -*- coding: utf-8 -*-
+
+from . import account_journal
\ No newline at end of file
diff --git a/dev_odex30_accounting/odex30_account_bank_statement_import_ofx/models/__pycache__/__init__.cpython-311.pyc b/dev_odex30_accounting/odex30_account_bank_statement_import_ofx/models/__pycache__/__init__.cpython-311.pyc
new file mode 100644
index 0000000..354cec5
Binary files /dev/null and b/dev_odex30_accounting/odex30_account_bank_statement_import_ofx/models/__pycache__/__init__.cpython-311.pyc differ
diff --git a/dev_odex30_accounting/odex30_account_bank_statement_import_ofx/models/__pycache__/account_journal.cpython-311.pyc b/dev_odex30_accounting/odex30_account_bank_statement_import_ofx/models/__pycache__/account_journal.cpython-311.pyc
new file mode 100644
index 0000000..040cbdc
Binary files /dev/null and b/dev_odex30_accounting/odex30_account_bank_statement_import_ofx/models/__pycache__/account_journal.cpython-311.pyc differ
diff --git a/dev_odex30_accounting/odex30_account_bank_statement_import_ofx/models/account_journal.py b/dev_odex30_accounting/odex30_account_bank_statement_import_ofx/models/account_journal.py
new file mode 100644
index 0000000..dd8c842
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_bank_statement_import_ofx/models/account_journal.py
@@ -0,0 +1,182 @@
+
+# -*- coding: utf-8 -*-
+
+import datetime
+import io
+import logging
+import re
+import unicodedata
+from xml.etree import ElementTree
+
+try:
+    from ofxparse import OfxParser
+    OfxParserClass = OfxParser
+except ImportError:
+    logging.getLogger(__name__).warning("The ofxparse python library is not installed, ofx import will not work.")
+    OfxParser = None
+    OfxParserClass = object
+
+from odoo import models, _
+from odoo.exceptions import UserError
+
+
+class PatchedOfxParser(OfxParserClass):
+    """ This class monkey-patches the ofxparse library in order to fix the following known bug: ',' is a valid
+        decimal separator for amounts, as we can encounter in ofx files made by european banks.
+    """
+
+    @classmethod
+    def decimal_separator_cleanup(cls, tag):
+        if hasattr(tag, "contents"):
+            tag.string = tag.contents[0].replace(',', '.')
+
+    @classmethod
+    def parseStatement(cls, stmt_ofx):
+        ledger_bal_tag = stmt_ofx.find('ledgerbal')
+        if hasattr(ledger_bal_tag, "contents"):
+            balamt_tag = ledger_bal_tag.find('balamt')
+            cls.decimal_separator_cleanup(balamt_tag)
+        avail_bal_tag = stmt_ofx.find('availbal')
+        if hasattr(avail_bal_tag, "contents"):
+            balamt_tag = avail_bal_tag.find('balamt')
+            cls.decimal_separator_cleanup(balamt_tag)
+        return super().parseStatement(stmt_ofx)
+
+    @classmethod
+    def parseTransaction(cls, txn_ofx):
+        amt_tag = txn_ofx.find('trnamt')
+        cls.decimal_separator_cleanup(amt_tag)
+        return super().parseTransaction(txn_ofx)
+
+    @classmethod
+    def parseInvestmentPosition(cls, ofx):
+        tag = ofx.find('units')
+        cls.decimal_separator_cleanup(tag)
+        tag = ofx.find('unitprice')
+        cls.decimal_separator_cleanup(tag)
+        return super().parseInvestmentPosition(ofx)
+
+    @classmethod
+    def parseInvestmentTransaction(cls, ofx):
+        tag = ofx.find('units')
+        cls.decimal_separator_cleanup(tag)
+        tag = ofx.find('unitprice')
+        cls.decimal_separator_cleanup(tag)
+        return super().parseInvestmentTransaction(ofx)
+
+    @classmethod
+    def parseOfxDateTime(cls, ofxDateTime):
+        res = re.search(r"^[0-9]*\.([0-9]{0,5})", ofxDateTime)
+        if res:
+            msec = datetime.timedelta(seconds=float("0." + res.group(1)))
+        else:
+            msec = datetime.timedelta(seconds=0)
+
+        # Some banks seem to return some OFX dates as YYYY-MM-DD; so we remove
+        # the '-' characters to support them as well
+        ofxDateTime = ofxDateTime.replace('-', '')
+
+        try:
+            local_date = datetime.datetime.strptime(
+                ofxDateTime[:14], '%Y%m%d%H%M%S'
+            )
+            return local_date + msec
+        except Exception:
+            if not ofxDateTime or ofxDateTime[:8] == "00000000":
+                return None
+
+            return datetime.datetime.strptime(
+                ofxDateTime[:8], '%Y%m%d') + msec
+
+
+class AccountJournal(models.Model):
+    _inherit = 'account.journal'
+
+    def _get_bank_statements_available_import_formats(self):
+        rslt = super(AccountJournal, self)._get_bank_statements_available_import_formats()
+        rslt.append('OFX')
+        return rslt
+
+
+    def _check_ofx(self, attachment):
+        if (attachment.raw or b'').startswith(b"OFXHEADER"):
+            #v1 OFX
+            return True
+        try:
+            #v2 OFX
+            return b"<ofx>" in (attachment.raw or b'').lower()
+        except ElementTree.ParseError:
+            return False
+
+    def _fill_transaction_vals_line_ofx(self, transaction, length_transactions, partner_bank):
+        return {
+            'date': transaction.date,
+            'payment_ref': transaction.payee + (transaction.memo and ': ' + transaction.memo or ''),
+            'ref': transaction.id,
+            'amount': float(transaction.amount),
+            'unique_import_id': transaction.id,
+            'account_number': partner_bank.acc_number,
+            'partner_id': partner_bank.partner_id.id,
+            'sequence': length_transactions + 1,
+        }
+
+    def _parse_bank_statement_file(self, attachment):
+        if not self._check_ofx(attachment):
+            return super()._parse_bank_statement_file(attachment)
+        if OfxParser is None:
+            raise UserError(_("The library 'ofxparse' is missing, OFX import cannot proceed."))
+
+        try:
+            ofx = PatchedOfxParser.parse(io.BytesIO(attachment.raw))
+        except UnicodeDecodeError:
+            # Replacing utf-8 chars with ascii equivalent
+            encoding = re.findall(b'encoding="(.*?)"', attachment.raw)
+            encoding = encoding[0] if len(encoding) > 1 else 'utf-8'
+            try:
+                attachment = unicodedata.normalize('NFKD', attachment.raw.decode(encoding)).encode('ascii', 'ignore')
+                ofx = PatchedOfxParser.parse(io.BytesIO(attachment))
+            except UnicodeDecodeError:
+                raise UserError(_("There was an issue decoding the file. Please check the file encoding."))
+        vals_bank_statement = []
+        account_lst = set()
+        currency_lst = set()
+        # Since ofxparse doesn't provide account numbers, we'll have to find res.partner and res.partner.bank here
+        # (normal behaviour is to provide 'account_number', which the generic module uses to find partner/bank)
+        transaction_payees = [
+            transaction.payee
+            for account in ofx.accounts
+            for transaction in account.statement.transactions
+        ]
+        partner_banks_dict = {
+            partner_bank.partner_id.name: partner_bank
+            for partner_bank in self.env['res.partner.bank'].search([
+                ('partner_id.name', 'in', transaction_payees)
+            ])
+        }
+        for account in ofx.accounts:
+            account_lst.add(account.number)
+            currency_lst.add(account.statement.currency)
+            transactions = []
+            total_amt = 0.00
+            for transaction in account.statement.transactions:
+                partner_bank = partner_banks_dict.get(transaction.payee, self.env['res.partner.bank'])
+                vals_line = self._fill_transaction_vals_line_ofx(transaction, len(transactions), partner_bank)
+                total_amt += float(transaction.amount)
+                transactions.append(vals_line)
+
+            vals_bank_statement.append({
+                'transactions': transactions,
+                # WARNING: the provided ledger balance is not necessarily the ending balance of the statement
+                # see https://github.com/odoo/odoo/issues/3003
+                'balance_start': float(account.statement.balance) - total_amt,
+                'balance_end_real': account.statement.balance,
+            })
+
+        if account_lst and len(account_lst) == 1:
+            account_lst = account_lst.pop()
+            currency_lst = currency_lst.pop()
+        else:
+            account_lst = None
+            currency_lst = None
+
+        return currency_lst, account_lst, vals_bank_statement
diff --git a/dev_odex30_accounting/odex30_account_bank_statement_import_ofx/static/description/icon.png b/dev_odex30_accounting/odex30_account_bank_statement_import_ofx/static/description/icon.png
new file mode 100644
index 0000000..2002d99
Binary files /dev/null and b/dev_odex30_accounting/odex30_account_bank_statement_import_ofx/static/description/icon.png differ
diff --git a/dev_odex30_accounting/odex30_account_bank_statement_import_ofx/static/description/icon.svg b/dev_odex30_accounting/odex30_account_bank_statement_import_ofx/static/description/icon.svg
new file mode 100644
index 0000000..07c6969
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_bank_statement_import_ofx/static/description/icon.svg
@@ -0,0 +1 @@
+<svg width="50" height="50" viewBox="0 0 50 50" xmlns="http://www.w3.org/2000/svg"><path d="M14.502 6.812c-10.044 5.807-13.48 18.641-7.69 28.686 5.807 10.044 18.641 13.48 28.686 7.69 10.044-5.807 13.48-18.641 7.69-28.686-5.79-10.044-18.641-13.48-28.686-7.69ZM38.76 25a3.044 3.044 0 0 1-3.052 3.052h-2.32c-4.097 0-7.881 2.18-9.922 5.72l-1.15 2.005c-.837 1.465-2.72 1.953-4.168 1.116-1.465-.837-1.953-2.703-1.116-4.168l1.15-2.005a11.487 11.487 0 0 0 0-11.457l-1.098-1.919c-.837-1.464-.418-3.365 1.012-4.237 1.464-.89 3.365-.384 4.22 1.081l1.15 2.006a11.447 11.447 0 0 0 9.923 5.72h2.32c1.673.034 3.05 1.395 3.05 3.086Z" fill="#F79E37"/><path d="M43.105 4h.972V.818h1.108V0H42v.818h1.105V4Zm2.775 0h.858V1.453h.053L47.663 4h.555l.871-2.547h.056V4H50V0h-1.108l-.924 2.714h-.05L46.99 0h-1.11v4Z" fill="#D1D5DB"/></svg>
diff --git a/dev_odex30_accounting/odex30_account_bank_statement_import_ofx/static/ofx/test_ofx.ofx b/dev_odex30_accounting/odex30_account_bank_statement_import_ofx/static/ofx/test_ofx.ofx
new file mode 100644
index 0000000..e23d0fe
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_bank_statement_import_ofx/static/ofx/test_ofx.ofx
@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="ASCII"?>
+<?OFX OFXHEADER="200" VERSION="211" SECURITY="NONE" OLDFILEUID="NONE" NEWFILEUID="NONE"?>
+<OFX>
+  <SIGNONMSGSRSV1>
+    <SONRS>
+      <STATUS>
+        <CODE>0</CODE>
+        <SEVERITY>INFO</SEVERITY>
+      </STATUS>
+      <DTSERVER>20130831165153.000[-8:PST]</DTSERVER>
+      <LANGUAGE>ENG</LANGUAGE>
+    </SONRS>
+  </SIGNONMSGSRSV1>
+  <BANKMSGSRSV1>
+    <STMTTRNRS>
+      <TRNUID>0</TRNUID>
+      <STATUS>
+        <CODE>0</CODE>
+        <SEVERITY>INFO</SEVERITY>
+      </STATUS>
+      <STMTRS>
+        <CURDEF>USD</CURDEF>
+        <BANKACCTFROM>
+          <BANKID>000000123</BANKID>
+          <ACCTID>123456</ACCTID>
+          <ACCTTYPE>CHECKING</ACCTTYPE>
+        </BANKACCTFROM>
+        <BANKTRANLIST>
+          <DTSTART>20130801</DTSTART>
+          <DTEND>20130831165153.000[-8:PST]</DTEND>
+          <STMTTRN>
+            <TRNTYPE>POS</TRNTYPE>
+            <DTPOSTED>20130824080000</DTPOSTED>
+            <TRNAMT>-80</TRNAMT>
+            <FITID>219378</FITID>
+            <NAME>Norbert Brant</NAME>
+          </STMTTRN>
+        </BANKTRANLIST>
+        <BANKTRANLIST>
+          <DTSTART>20130801</DTSTART>
+          <DTEND>20130831165153.000[-8:PST]</DTEND>
+          <STMTTRN>
+            <TRNTYPE>POS</TRNTYPE>
+            <DTPOSTED>20130824080000</DTPOSTED>
+            <TRNAMT>-90</TRNAMT>
+            <FITID>219379</FITID>
+            <NAME>China Export</NAME>
+          </STMTTRN>
+        </BANKTRANLIST>
+        <BANKTRANLIST>
+          <DTSTART>20130801</DTSTART>
+          <DTEND>20130831165153.000[-8:PST]</DTEND>
+          <STMTTRN>
+            <TRNTYPE>POS</TRNTYPE>
+            <DTPOSTED>20130824080000</DTPOSTED>
+            <TRNAMT>-100</TRNAMT>
+            <FITID>219380</FITID>
+            <NAME>Axelor Scuba</NAME>
+          </STMTTRN>
+        </BANKTRANLIST>
+        <BANKTRANLIST>
+          <DTSTART>20130801</DTSTART>
+          <DTEND>20130831165153.000[-8:PST]</DTEND>
+          <STMTTRN>
+            <TRNTYPE>POS</TRNTYPE>
+            <DTPOSTED>20130824080000</DTPOSTED>
+            <TRNAMT>-90</TRNAMT>
+            <FITID>219381</FITID>
+            <NAME>China Scuba</NAME>
+          </STMTTRN>
+        </BANKTRANLIST>
+        <LEDGERBAL>
+          <BALAMT>2156.56</BALAMT>
+          <DTASOF>20130831165153</DTASOF>
+        </LEDGERBAL>
+      </STMTRS>
+    </STMTTRNRS>
+  </BANKMSGSRSV1>
+  <CREDITCARDMSGSRSV1>
+    <CCSTMTTRNRS>
+      <TRNUID>0</TRNUID>
+      <STATUS>
+        <CODE>0</CODE>
+        <SEVERITY>INFO</SEVERITY>
+      </STATUS>
+      <CCSTMTRS>
+        <CURDEF>USD</CURDEF>
+        <CCACCTFROM>
+          <ACCTID>123456</ACCTID>
+        </CCACCTFROM>
+        <BANKTRANLIST>
+        </BANKTRANLIST>
+        <LEDGERBAL>
+          <BALAMT>-562.00</BALAMT>
+          <DTASOF>20130831165153</DTASOF>
+        </LEDGERBAL>
+      </CCSTMTRS>
+    </CCSTMTTRNRS>
+  </CREDITCARDMSGSRSV1>
+</OFX>
diff --git a/dev_odex30_accounting/odex30_account_bank_statement_import_ofx/static/ofx/test_ofx_unicode_error.ofx b/dev_odex30_accounting/odex30_account_bank_statement_import_ofx/static/ofx/test_ofx_unicode_error.ofx
new file mode 100644
index 0000000..9744131
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_bank_statement_import_ofx/static/ofx/test_ofx_unicode_error.ofx
@@ -0,0 +1,56 @@
+
+OFXHEADER:100
+DATA:OFXSGML
+VERSION:102
+SECURITY:NONE
+ENCODING:USASCII
+CHARSET:1252
+COMPRESSION:NONE
+OLDFILEUID:NONE
+NEWFILEUID:NONE
+
+<OFX>
+  <SIGNONMSGSRSV1>
+    <SONRS>
+      <STATUS>
+        <CODE>0</CODE>
+        <SEVERITY>INFO</SEVERITY>
+      </STATUS>
+      <DTSERVER>00000000000000</DTSERVER>
+      <LANGUAGE>POR</LANGUAGE>
+    </SONRS>
+  </SIGNONMSGSRSV1>
+  <BANKMSGSRSV1>
+    <STMTTRNRS>
+      <TRNUID>0</TRNUID>
+      <STATUS>
+        <CODE>0<</CODE>
+        <SEVERITY>INFO</SEVERITY>
+      </STATUS>
+      <STMTRS>
+        <CURDEF>BRL</CURDEF>
+        <BANKACCTFROM>
+          <BANKID>000000123</BANKID
+          <ACCTID>123456</ACCTID>
+          <ACCTTYPE>CHECKING</ACCTTYPE>
+        </BANKACCTFROM>
+        <BANKTRANLIST>
+          <DTSTART>20250116120000</DTSTART>
+          <DTEND>20250116120000</DTEND>
+          <STMTTRN>
+            <TRNTYPE>DEBIT</TRNTYPE>
+            <DTPOSTED>20241205120000</DTPOSTED>
+            <TRNAMT>-630,00</TRNAMT>
+            <FITID>219378</FITID>
+            <CHECKNUM>123456</CHECKNUM>
+            <MEMO>All� les d�ab!</MEMO>
+          </STMTTRN>
+        </BANKTRANLIST>
+        <LEDGERBAL>
+          <BALAMT>630,00</BALAMT>
+          <DTASOF>00000000</DTASOF>
+        </LEDGERBAL>
+      </STMTRS>
+    </STMTTRNRS>
+  </BANKMSGSRSV1>
+</OFX>
diff --git a/dev_odex30_accounting/odex30_account_bank_statement_import_ofx/tests/__init__.py b/dev_odex30_accounting/odex30_account_bank_statement_import_ofx/tests/__init__.py
new file mode 100644
index 0000000..f68c22d
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_bank_statement_import_ofx/tests/__init__.py
@@ -0,0 +1,3 @@
+# -*- coding: utf-8 -*-
+
+from . import test_import_bank_statement
diff --git a/dev_odex30_accounting/odex30_account_bank_statement_import_ofx/tests/test_import_bank_statement.py b/dev_odex30_accounting/odex30_account_bank_statement_import_ofx/tests/test_import_bank_statement.py
new file mode 100644
index 0000000..2d6233a
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_bank_statement_import_ofx/tests/test_import_bank_statement.py
@@ -0,0 +1,95 @@
+# -*- coding: utf-8 -*-
+from odoo.addons.account.tests.common import AccountTestInvoicingCommon
+from odoo.exceptions import UserError
+from odoo.tests import tagged
+from odoo.tools import file_open
+
+
+@tagged('post_install', '-at_install')
+class TestAccountBankStatementImportOFX(AccountTestInvoicingCommon):
+
+    def test_ofx_file_import(self):
+        bank_journal = self.env['account.journal'].create({
+            'name': 'Bank 123456',
+            'code': 'BNK67',
+            'type': 'bank',
+            'bank_acc_number': '123456',
+            'currency_id': self.env.ref('base.USD').id,
+        })
+
+        partner_norbert = self.env['res.partner'].create({
+            'name': 'Norbert Brant',
+            'is_company': True,
+        })
+        bank_norbert = self.env['res.bank'].create({'name': 'test'})
+        partner_bank_norbert = self.env['res.partner.bank'].create({
+            'acc_number': 'BE93999574162167',
+            'partner_id': partner_norbert.id,
+            'bank_id': bank_norbert.id,
+        })
+
+        # Get OFX file content
+        ofx_file_path = 'account_bank_statement_import_ofx/static/ofx/test_ofx.ofx'
+        with file_open(ofx_file_path, 'rb') as ofx_file:
+            bank_journal.create_document_from_attachment(self.env['ir.attachment'].create({
+                'mimetype': 'application/xml',
+                'name': 'test_ofx.ofx',
+                'raw': ofx_file.read(),
+            }).ids)
+
+        # Check the imported bank statement
+        imported_statement = self.env['account.bank.statement'].search([('company_id', '=', self.env.company.id)])
+        self.assertRecordValues(imported_statement, [{
+            'reference': 'test_ofx.ofx',
+            'balance_start': 2516.56,
+            'balance_end_real': 2156.56,
+        }])
+        self.assertRecordValues(imported_statement.line_ids.sorted('payment_ref'), [
+            {
+                'payment_ref': 'Axelor Scuba',
+                'amount': -100.0,
+                'partner_id': False,
+                'account_number': False,
+            },
+            {
+                'payment_ref': 'China Export',
+                'amount': -90.0,
+                'partner_id': False,
+                'account_number': False,
+            },
+            {
+                'payment_ref': 'China Scuba',
+                'amount': -90.0,
+                'partner_id': False,
+                'account_number': False,
+            },
+            {
+                'payment_ref': partner_norbert.name,
+                'amount': -80.0,
+                'partner_id': partner_norbert.id,
+                'account_number': partner_bank_norbert.acc_number,
+            },
+        ])
+
+    def test_ofx_file_import_error(self):
+        """
+        Check if a UserError is triggered when importing a file that contains characters that cannot be decoded with the default encoding
+        """
+        bank_journal = self.env['account.journal'].create({
+            'name': 'Bank 123456',
+            'code': 'BNK67',
+            'type': 'bank',
+            'bank_acc_number': '123456',
+            'currency_id': self.env.ref('base.USD').id,
+        })
+
+        # Get OFX file content
+        # This file contains characters that cannot be decoded with the default encoding - PLEASE DO NOT UPDATE THIS FILE
+        ofx_file_path = 'account_bank_statement_import_ofx/static/ofx/test_ofx_unicode_error.ofx'
+        with self.assertRaises(UserError, msg="There was an issue decoding the file. Please check the file encoding."):
+            with file_open(ofx_file_path, 'rb') as ofx_file:
+                bank_journal.create_document_from_attachment(self.env['ir.attachment'].create({
+                    'mimetype': 'application/xml',
+                    'name': 'test_ofx.ofx',
+                    'raw': ofx_file.read(),
+                }).ids)
diff --git a/dev_odex30_accounting/odex30_account_bank_statement_import_qif/__init__.py b/dev_odex30_accounting/odex30_account_bank_statement_import_qif/__init__.py
new file mode 100644
index 0000000..cde864b
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_bank_statement_import_qif/__init__.py
@@ -0,0 +1,3 @@
+# -*- coding: utf-8 -*-
+
+from . import models
diff --git a/dev_odex30_accounting/odex30_account_bank_statement_import_qif/__manifest__.py b/dev_odex30_accounting/odex30_account_bank_statement_import_qif/__manifest__.py
new file mode 100644
index 0000000..288188e
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_bank_statement_import_qif/__manifest__.py
@@ -0,0 +1,27 @@
+# -*- coding: utf-8 -*-
+
+{
+    'name': 'Import QIF Bank Statement',
+    'category': 'Odex30-Accounting/Odex30-Accounting',
+    'author': "Expert Co. Ltd.",
+    'website': "http://www.exp-sa.com",
+    'version': '1.0',
+    'description': r'''
+Module to import QIF bank statements.
+======================================
+
+This module allows you to import the machine readable QIF Files in Odoo: they are parsed and stored in human readable format in
+Accounting \ Bank and Cash \ Bank Statements.
+
+Important Note
+---------------------------------------------
+Because of the QIF format limitation, we cannot ensure the same transactions aren't imported several times or handle multicurrency.
+Whenever possible, you should use a more appropriate file format like OFX.
+''',
+    'depends': ['odex30_account_bank_statement_import'],
+    'data': [
+        'views/account_journal_views.xml',
+    ],
+    'installable': True,
+    'license': 'OEEL-1',
+}
diff --git a/dev_odex30_accounting/odex30_account_bank_statement_import_qif/__pycache__/__init__.cpython-311.pyc b/dev_odex30_accounting/odex30_account_bank_statement_import_qif/__pycache__/__init__.cpython-311.pyc
new file mode 100644
index 0000000..07e5fdb
Binary files /dev/null and b/dev_odex30_accounting/odex30_account_bank_statement_import_qif/__pycache__/__init__.cpython-311.pyc differ
diff --git a/dev_odex30_accounting/odex30_account_bank_statement_import_qif/i18n/account_bank_statement_import_qif.pot b/dev_odex30_accounting/odex30_account_bank_statement_import_qif/i18n/account_bank_statement_import_qif.pot
new file mode 100644
index 0000000..df6d53b
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_bank_statement_import_qif/i18n/account_bank_statement_import_qif.pot
@@ -0,0 +1,66 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# 	* odex30_account_bank_statement_import_qif
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 18.0+e\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2024-09-25 09:26+0000\n"
+"PO-Revision-Date: 2024-09-25 09:26+0000\n"
+"Last-Translator: \n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: odex30_account_bank_statement_import_qif
+#: model:ir.model.fields,help:odex30_account_bank_statement_import_qif.field_account_journal__qif_date_format
+msgid ""
+"Although the historic QIF date format is month-first (mm/dd/yy), many "
+"financial institutions use the local format.Therefore, it is frequent "
+"outside the US to have QIF date formatted day-first (dd/mm/yy)."
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_qif
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_qif/models/account_journal.py:0
+msgid "Could not decipher the QIF file."
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_qif
+#: model:ir.model.fields,help:odex30_account_bank_statement_import_qif.field_account_journal__qif_decimal_point
+msgid "Field used to avoid conversion issues."
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_qif
+#: model:ir.model,name:odex30_account_bank_statement_import_qif.model_account_journal
+msgid "Journal"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_qif
+#: model:ir.model.fields,field_description:odex30_account_bank_statement_import_qif.field_account_journal__qif_date_format
+msgid "QIF Dates format"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_qif
+#: model:ir.model.fields,field_description:odex30_account_bank_statement_import_qif.field_account_journal__qif_decimal_point
+msgid "QIF Decimal Separator"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_qif
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_qif/models/account_journal.py:0
+msgid "This file is either not a bank statement or is not correctly formed."
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_qif
+#: model:ir.model.fields.selection,name:odex30_account_bank_statement_import_qif.selection__account_journal__qif_date_format__day_first
+msgid "dd/mm/yy"
+msgstr ""
+
+#. module: odex30_account_bank_statement_import_qif
+#: model:ir.model.fields.selection,name:odex30_account_bank_statement_import_qif.selection__account_journal__qif_date_format__month_first
+msgid "mm/dd/yy"
+msgstr ""
diff --git a/dev_odex30_accounting/odex30_account_bank_statement_import_qif/i18n/ar.po b/dev_odex30_accounting/odex30_account_bank_statement_import_qif/i18n/ar.po
new file mode 100644
index 0000000..9f99879
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_bank_statement_import_qif/i18n/ar.po
@@ -0,0 +1,74 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# 	* odex30_account_bank_statement_import_qif
+# 
+# Translators:
+# Wil Odoo, 2024
+# 
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 18.0+e\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2024-09-25 09:26+0000\n"
+"PO-Revision-Date: 2024-09-25 09:43+0000\n"
+"Last-Translator: Wil Odoo, 2024\n"
+"Language-Team: Arabic (https://app.transifex.com/odoo/teams/41243/ar/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Language: ar\n"
+"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
+
+#. module: odex30_account_bank_statement_import_qif
+#: model:ir.model.fields,help:odex30_account_bank_statement_import_qif.field_account_journal__qif_date_format
+msgid ""
+"Although the historic QIF date format is month-first (mm/dd/yy), many "
+"financial institutions use the local format.Therefore, it is frequent "
+"outside the US to have QIF date formatted day-first (dd/mm/yy)."
+msgstr ""
+"بالرغم من أن نظام تنسيق التواريخ المعتاد بملفات QIF هو البدء بالشهر "
+"(شهر/يوم/سنة)، إلا أن مؤسسات مالية عديدة تستخدم التنسيق المتعارف عليه "
+"محلياً. لذا، كثيرًا ما يُضبط تنسيق التواريخ بملفات QIF خارج الولايات المتحدة"
+" الأمريكية ليكون بنظام البدء باليوم (يوم/شهر/سنة)."
+
+#. module: odex30_account_bank_statement_import_qif
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_qif/models/account_journal.py:0
+msgid "Could not decipher the QIF file."
+msgstr "تعذّر فهم محتويات ملف QIF."
+
+#. module: odex30_account_bank_statement_import_qif
+#: model:ir.model.fields,help:odex30_account_bank_statement_import_qif.field_account_journal__qif_decimal_point
+msgid "Field used to avoid conversion issues."
+msgstr "حقل يُستَخدم لتجنب مشاكل التحويل "
+
+#. module: odex30_account_bank_statement_import_qif
+#: model:ir.model,name:odex30_account_bank_statement_import_qif.model_account_journal
+msgid "Journal"
+msgstr "دفتر اليومية"
+
+#. module: odex30_account_bank_statement_import_qif
+#: model:ir.model.fields,field_description:odex30_account_bank_statement_import_qif.field_account_journal__qif_date_format
+msgid "QIF Dates format"
+msgstr "تنسيق التواريخ بملفات QIF "
+
+#. module: odex30_account_bank_statement_import_qif
+#: model:ir.model.fields,field_description:odex30_account_bank_statement_import_qif.field_account_journal__qif_decimal_point
+msgid "QIF Decimal Separator"
+msgstr "الفاصلة العشرية لـ QIF "
+
+#. module: odex30_account_bank_statement_import_qif
+#. odoo-python
+#: code:addons/odex30_account_bank_statement_import_qif/models/account_journal.py:0
+msgid "This file is either not a bank statement or is not correctly formed."
+msgstr "إما أن هذا الملف ليس كشف حساب أو لم يتم تكوينه بشكل صحيح."
+
+#. module: odex30_account_bank_statement_import_qif
+#: model:ir.model.fields.selection,name:odex30_account_bank_statement_import_qif.selection__account_journal__qif_date_format__day_first
+msgid "dd/mm/yy"
+msgstr "يوم/شهر/سنة"
+
+#. module: odex30_account_bank_statement_import_qif
+#: model:ir.model.fields.selection,name:odex30_account_bank_statement_import_qif.selection__account_journal__qif_date_format__month_first
+msgid "mm/dd/yy"
+msgstr "شهر/يوم/ سنة"
diff --git a/dev_odex30_accounting/odex30_account_bank_statement_import_qif/models/__init__.py b/dev_odex30_accounting/odex30_account_bank_statement_import_qif/models/__init__.py
new file mode 100644
index 0000000..5cd061d
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_bank_statement_import_qif/models/__init__.py
@@ -0,0 +1,3 @@
+# -*- coding: utf-8 -*-
+
+from . import account_journal
\ No newline at end of file
diff --git a/dev_odex30_accounting/odex30_account_bank_statement_import_qif/models/__pycache__/__init__.cpython-311.pyc b/dev_odex30_accounting/odex30_account_bank_statement_import_qif/models/__pycache__/__init__.cpython-311.pyc
new file mode 100644
index 0000000..d33f0e5
Binary files /dev/null and b/dev_odex30_accounting/odex30_account_bank_statement_import_qif/models/__pycache__/__init__.cpython-311.pyc differ
diff --git a/dev_odex30_accounting/odex30_account_bank_statement_import_qif/models/__pycache__/account_journal.cpython-311.pyc b/dev_odex30_accounting/odex30_account_bank_statement_import_qif/models/__pycache__/account_journal.cpython-311.pyc
new file mode 100644
index 0000000..7967884
Binary files /dev/null and b/dev_odex30_accounting/odex30_account_bank_statement_import_qif/models/__pycache__/account_journal.cpython-311.pyc differ
diff --git a/dev_odex30_accounting/odex30_account_bank_statement_import_qif/models/account_journal.py b/dev_odex30_accounting/odex30_account_bank_statement_import_qif/models/account_journal.py
new file mode 100644
index 0000000..9c78038
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_bank_statement_import_qif/models/account_journal.py
@@ -0,0 +1,112 @@
+# -*- coding: utf-8 -*-
+
+import io
+import logging
+
+import dateutil.parser
+
+from odoo import fields, models, _
+from odoo.exceptions import UserError
+
+
+logger = logging.getLogger(__name__)
+
+DATE_OF_TRANSACTION = b'D'
+TOTAL_AMOUNT = b'T'
+CHECK_NUMBER = b'N'
+PAYEE = b'P'
+MEMO = b'M'
+END_OF_ITEM = b'^'
+
+
+class AccountJournal(models.Model):
+    _inherit = 'account.journal'
+
+    qif_decimal_point = fields.Char(
+        string="QIF Decimal Separator",
+        default='.',
+        help="Field used to avoid conversion issues.",
+    )
+    qif_date_format = fields.Selection(
+        selection=[
+            ('month_first', "mm/dd/yy"),
+            ('day_first', "dd/mm/yy"),
+        ],
+        default='day_first',
+        string='QIF Dates format',
+        help="Although the historic QIF date format is month-first (mm/dd/yy), many financial institutions use the local format."
+             "Therefore, it is frequent outside the US to have QIF date formatted day-first (dd/mm/yy).",
+    )
+
+    def _get_bank_statements_available_import_formats(self):
+        rslt = super(AccountJournal, self)._get_bank_statements_available_import_formats()
+        rslt.append('QIF')
+        return rslt
+
+    def _check_qif(self, attachment):
+        return (attachment.raw or b'').strip().startswith(b'!Type:')
+
+    def _parse_bank_statement_file(self, attachment):
+        if not self._check_qif(attachment):
+            return super()._parse_bank_statement_file(attachment)
+
+        data_list = [
+            line.rstrip(b'\r\n')
+            for line in io.BytesIO(attachment.raw.strip())
+        ]
+        try:
+            header = data_list[0].strip().split(b':')[1]
+        except:
+            raise UserError(_('Could not decipher the QIF file.'))
+
+        transactions = []
+        vals_line = {'payment_ref': []}
+        total = 0.0
+        # Identified header types of the QIF format that we support.
+        # Other types might need to be added. Here are the possible values
+        # according to the QIF spec: Cash, Bank, CCard, Invst, Oth A, Oth L, Invoice.
+        if header in [b'Bank', b'Cash', b'CCard']:
+            vals_bank_statement = {}
+            for line in data_list:
+                line = line.strip()
+                if not line:
+                    continue
+                vals_line['sequence'] = len(transactions) + 1
+                data = line[1:]
+                if line[:1] == DATE_OF_TRANSACTION:
+                    dayfirst = self.qif_date_format == 'day_first'
+                    vals_line['date'] = dateutil.parser.parse(data, fuzzy=True, dayfirst=dayfirst).date()
+                elif line[:1] == TOTAL_AMOUNT:
+                    amount = float(data.replace(b',', b'.' if self.qif_decimal_point == ',' else b''))
+                    total += amount
+                    vals_line['amount'] = amount
+                elif line[:1] == CHECK_NUMBER:
+                    vals_line['ref'] = data.decode()
+                elif line[:1] == PAYEE:
+                    name = data.decode()
+                    vals_line['payment_ref'].append(name)
+                    # Since QIF doesn't provide account numbers, we'll have to find res.partner and res.partner.bank here
+                    # (normal behavious is to provide 'account_number', which the generic module uses to find partner/bank)
+                    partner_bank = self.env['res.partner.bank'].search([('partner_id.name', '=', name)], limit=1)
+                    if partner_bank:
+                        vals_line['partner_bank_id'] = partner_bank.id
+                        vals_line['partner_id'] = partner_bank.partner_id.id
+                elif line[:1] == MEMO:
+                    vals_line['payment_ref'].append(data.decode())
+                elif line[:1] == END_OF_ITEM:
+                    if vals_line['payment_ref']:
+                        vals_line['payment_ref'] = u': '.join(vals_line['payment_ref'])
+                    else:
+                        del vals_line['payment_ref']
+                    transactions.append(vals_line)
+                    vals_line = {'payment_ref': []}
+                elif line[:1] == b'\n':
+                    transactions = []
+        else:
+            raise UserError(_('This file is either not a bank statement or is not correctly formed.'))
+
+        vals_bank_statement.update({
+            'balance_end_real': total,
+            'transactions': transactions
+        })
+        return None, None, [vals_bank_statement]
diff --git a/dev_odex30_accounting/odex30_account_bank_statement_import_qif/static/description/icon.png b/dev_odex30_accounting/odex30_account_bank_statement_import_qif/static/description/icon.png
new file mode 100644
index 0000000..5a05c28
Binary files /dev/null and b/dev_odex30_accounting/odex30_account_bank_statement_import_qif/static/description/icon.png differ
diff --git a/dev_odex30_accounting/odex30_account_bank_statement_import_qif/static/description/icon.svg b/dev_odex30_accounting/odex30_account_bank_statement_import_qif/static/description/icon.svg
new file mode 100644
index 0000000..a262898
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_bank_statement_import_qif/static/description/icon.svg
@@ -0,0 +1 @@
+<svg width="50" height="50" viewBox="0 0 50 50" xmlns="http://www.w3.org/2000/svg"><path d="M38 46H12c-4.418 0-8-3.498-8-7.814V4h30c2.21 0 4 1.75 4 3.907V46Z" fill="#FBB945"/><path d="M38 46H12c-4.418 0-8-3.498-8-7.814V4h30c2.21 0 4 1.75 4 3.907V46Z" fill="#FBB945"/><path d="M12 46h26a7.999 7.999 0 0 0 8-8H20a8 8 0 0 1-8 8Z" fill="#953B24"/><path d="M38 8C23.408 8 10.687 16.014 4 27.88V4h30a4 4 0 0 1 4 4Z" fill="#F78613"/><path d="M19.241 24.986a3.548 3.548 0 0 1-2.585-.805 3.476 3.476 0 0 1-.436-4.93 3.56 3.56 0 0 1 4.98-.432 3.479 3.479 0 0 1 1.25 2.99l3.368-3.334c.502-.497 1.2-.612 1.559-.257L29 19.825l-5.294 5.242a3.555 3.555 0 0 1 2.959.752 3.476 3.476 0 0 1 .435 4.93 3.56 3.56 0 0 1-4.98.432 3.48 3.48 0 0 1-1.197-3.36l-3.741 3.704c-.502.497-1.2.612-1.559.257L14 30.175l5.241-5.189Z" fill="#fff"/></svg>
diff --git a/dev_odex30_accounting/odex30_account_bank_statement_import_qif/static/qif/test_qif.qif b/dev_odex30_accounting/odex30_account_bank_statement_import_qif/static/qif/test_qif.qif
new file mode 100644
index 0000000..c18c9ac
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_bank_statement_import_qif/static/qif/test_qif.qif
@@ -0,0 +1,25 @@
+!Type:Bank
+D8/12/13
+T-1,000.00
+PDelta PC
+^
+D8/15/13
+T-75.46
+PWalts Drugs
+^
+D3/3/13
+T-379.00
+PEpic Technologies
+^
+D3/4/13
+T-20.28
+PYOUR LOCAL SUPERMARKET
+^
+D3/3/13
+T-421.35
+PSPRINGFIELD WATER UTILITY
+^
+D27/02/25
+T0.00
+PZero amount transaction
+^
diff --git a/dev_odex30_accounting/odex30_account_bank_statement_import_qif/tests/__init__.py b/dev_odex30_accounting/odex30_account_bank_statement_import_qif/tests/__init__.py
new file mode 100644
index 0000000..f68c22d
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_bank_statement_import_qif/tests/__init__.py
@@ -0,0 +1,3 @@
+# -*- coding: utf-8 -*-
+
+from . import test_import_bank_statement
diff --git a/dev_odex30_accounting/odex30_account_bank_statement_import_qif/tests/test_import_bank_statement.py b/dev_odex30_accounting/odex30_account_bank_statement_import_qif/tests/test_import_bank_statement.py
new file mode 100644
index 0000000..df52bcf
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_bank_statement_import_qif/tests/test_import_bank_statement.py
@@ -0,0 +1,40 @@
+# -*- coding: utf-8 -*-
+from odoo.addons.account.tests.common import AccountTestInvoicingCommon
+from odoo.tests import tagged
+from odoo.tools import file_open
+
+import base64
+
+
+@tagged('post_install', '-at_install')
+class TestAccountBankStatementImportQIF(AccountTestInvoicingCommon):
+
+    def test_qif_file_import(self):
+        bank_journal = self.env['account.journal'].create({
+            'name': 'bank QIF',
+            'code': 'BNK67',
+            'type': 'bank',
+            'bank_acc_number': '123456',
+            'currency_id': self.env.ref('base.USD').id,
+        })
+
+        qif_file_path = 'odex30_account_bank_statement_import_qif/static/qif/test_qif.qif'
+        with file_open(qif_file_path, 'rb') as qif_file:
+            bank_journal.create_document_from_attachment(self.env['ir.attachment'].create({
+                'mimetype': 'application/text',
+                'name': 'test_qif.qif',
+                'raw': qif_file.read(),
+            }).ids)
+
+        imported_statement = self.env['account.bank.statement'].search([('company_id', '=', self.env.company.id)])
+        self.assertRecordValues(imported_statement, [{
+            'balance_start': 0.0,
+            'balance_end_real': -1896.09,
+        }])
+        self.assertRecordValues(imported_statement.line_ids.sorted('payment_ref'), [
+            {'amount': -1000.00,    'payment_ref': 'Delta PC'},
+            {'amount': -379.00,     'payment_ref': 'Epic Technologies'},
+            {'amount': -421.35,     'payment_ref': 'SPRINGFIELD WATER UTILITY'},
+            {'amount': -75.46,      'payment_ref': 'Walts Drugs'},
+            {'amount': -20.28,      'payment_ref': 'YOUR LOCAL SUPERMARKET'},
+        ])
diff --git a/dev_odex30_accounting/odex30_account_bank_statement_import_qif/views/account_journal_views.xml b/dev_odex30_accounting/odex30_account_bank_statement_import_qif/views/account_journal_views.xml
new file mode 100644
index 0000000..befd69b
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_bank_statement_import_qif/views/account_journal_views.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" ?>
+<odoo>
+    <record id="view_account_journal_form_inherited" model="ir.ui.view">
+        <field name="name">account.journal.form.inherited</field>
+        <field name="model">account.journal</field>
+        <field name="inherit_id" ref="account.view_account_journal_form" />
+        <field name="arch" type="xml">
+            <group name="bank_account_number" position="inside">
+                <label for="qif_decimal_point" class="text-nowrap" invisible="bank_statements_source != 'file_import'"/>
+                <field name="qif_decimal_point" nolabel="1" invisible="bank_statements_source != 'file_import'" required="bank_statements_source == 'file_import'"/>
+                <label for="qif_date_format" class="text-nowrap" invisible="bank_statements_source != 'file_import'"/>
+                <field name="qif_date_format" nolabel="1" invisible="bank_statements_source != 'file_import'" required="bank_statements_source == 'file_import'"/>
+            </group>
+        </field>
+    </record>
+</odoo>
diff --git a/dev_odex30_accounting/odex30_account_batch_payment/__init__.py b/dev_odex30_accounting/odex30_account_batch_payment/__init__.py
new file mode 100644
index 0000000..de9509a
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_batch_payment/__init__.py
@@ -0,0 +1,5 @@
+# -*- coding: utf-8 -*-
+
+from . import models
+from . import report
+from . import wizard
diff --git a/dev_odex30_accounting/odex30_account_batch_payment/__manifest__.py b/dev_odex30_accounting/odex30_account_batch_payment/__manifest__.py
new file mode 100644
index 0000000..0f9c490
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_batch_payment/__manifest__.py
@@ -0,0 +1,35 @@
+# -*- coding: utf-8 -*-
+{
+    'name': 'Batch Payment',
+    'version': '1.0',
+    'category': 'Odex30-Accounting/Odex30-Accounting',
+    'author': "Expert Co. Ltd.",
+    'website': "http://www.exp-sa.com",
+    'description': """
+Batch Payments
+=======================================
+Batch payments allow grouping payments.
+
+They are used namely, but not only, to group several cheques before depositing them in a single batch to the bank.
+The total amount deposited will then appear as a single transaction on your bank statement.
+When you reconcile, simply select the corresponding batch payment to reconcile all the payments in the batch.
+    """,
+    'depends': ['account'],
+    'data': [
+        'security/account_batch_payment_security.xml',
+        'security/ir.model.access.csv',
+        'data/account_batch_payment_data.xml',
+        'report/account_batch_payment_reports.xml',
+        'report/account_batch_payment_report_templates.xml',
+        'views/account_batch_payment_views.xml',
+        'views/account_payment_views.xml',
+        'views/account_journal_views.xml',
+        'wizard/batch_error_views.xml',
+    ],
+    'installable': True,
+    'assets': {
+        'web.report_assets_common': [
+            'odex30_account_batch_payment/static/src/scss/**/*',
+        ],
+    }
+}
diff --git a/dev_odex30_accounting/odex30_account_batch_payment/__pycache__/__init__.cpython-311.pyc b/dev_odex30_accounting/odex30_account_batch_payment/__pycache__/__init__.cpython-311.pyc
new file mode 100644
index 0000000..eed6141
Binary files /dev/null and b/dev_odex30_accounting/odex30_account_batch_payment/__pycache__/__init__.cpython-311.pyc differ
diff --git a/dev_odex30_accounting/odex30_account_batch_payment/data/account_batch_payment_data.xml b/dev_odex30_accounting/odex30_account_batch_payment/data/account_batch_payment_data.xml
new file mode 100644
index 0000000..058b59b
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_batch_payment/data/account_batch_payment_data.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <data noupdate="1">
+
+        <!-- Payment methods -->
+
+        <record id="account_payment_method_batch_deposit" model="account.payment.method">
+            <field name="name">Batch Deposit</field>
+            <field name="code">batch_payment</field>
+            <field name="payment_type">inbound</field>
+        </record>
+    </data>
+
+    <data noupdate="0">
+        <function model="account.journal" name="_create_batch_payment_outbound_sequence"/>
+        <function model="account.journal" name="_create_batch_payment_inbound_sequence"/>
+    </data>
+</odoo>
diff --git a/dev_odex30_accounting/odex30_account_batch_payment/i18n/account_batch_payment.pot b/dev_odex30_accounting/odex30_account_batch_payment/i18n/account_batch_payment.pot
new file mode 100644
index 0000000..c4d0bdb
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_batch_payment/i18n/account_batch_payment.pot
@@ -0,0 +1,922 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# 	* odex30_account_batch_payment
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 18.0+e\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2025-10-31 18:47+0000\n"
+"PO-Revision-Date: 2025-10-31 18:47+0000\n"
+"Last-Translator: \n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: odex30_account_batch_payment
+#: model_terms:ir.ui.view,arch_db:odex30_account_batch_payment.print_batch_payment
+msgid "$1000.0"
+msgstr ""
+
+#. module: odex30_account_batch_payment
+#: model_terms:ir.ui.view,arch_db:odex30_account_batch_payment.print_batch_payment
+msgid "2023-08-14"
+msgstr ""
+
+#. module: odex30_account_batch_payment
+#: model_terms:ir.ui.view,arch_db:odex30_account_batch_payment.print_batch_payment
+msgid "2023-08-15"
+msgstr ""
+
+#. module: odex30_account_batch_payment
+#: model_terms:ir.ui.view,arch_db:odex30_account_batch_payment.print_batch_payment
+msgid "3956012345678"
+msgstr ""
+
+#. module: odex30_account_batch_payment
+#: model_terms:ir.ui.view,arch_db:odex30_account_batch_payment.view_account_move_kanban
+msgid "<i class=\"fa fa-clock-o\" aria-label=\"Date\" role=\"img\" title=\"Date\"/>"
+msgstr ""
+
+#. module: odex30_account_batch_payment
+#: model_terms:ir.ui.view,arch_db:odex30_account_batch_payment.view_account_payment_form_inherit_account_batch_payment
+msgid "<span>Batch Payment</span>"
+msgstr ""
+
+#. module: odex30_account_batch_payment
+#: model_terms:ir.ui.view,arch_db:odex30_account_batch_payment.batch_error_wizard_form
+msgid ""
+"<strong invisible=\"not warning_line_ids\">The following warnings were also "
+"raised; they do not impeach validation</strong>"
+msgstr ""
+
+#. module: odex30_account_batch_payment
+#: model_terms:ir.ui.view,arch_db:odex30_account_batch_payment.batch_error_wizard_form
+msgid "<strong>Please first consider the following warnings</strong>"
+msgstr ""
+
+#. module: odex30_account_batch_payment
+#: model_terms:ir.ui.view,arch_db:odex30_account_batch_payment.batch_error_wizard_form
+msgid "<strong>The following errors occurred</strong>"
+msgstr ""
+
+#. module: odex30_account_batch_payment
+#: model_terms:ir.ui.view,arch_db:odex30_account_batch_payment.print_batch_payment
+msgid "ABC Holder Name"
+msgstr ""
+
+#. module: odex30_account_batch_payment
+#: model_terms:ir.ui.view,arch_db:odex30_account_batch_payment.print_batch_payment
+msgid "ABC Suppliers"
+msgstr ""
+
+#. module: odex30_account_batch_payment
+#: model_terms:ir.ui.view,arch_db:odex30_account_batch_payment.print_batch_payment
+msgid "Account Holder Name"
+msgstr ""
+
+#. module: odex30_account_batch_payment
+#: model:ir.model.fields,field_description:odex30_account_batch_payment.field_account_batch_payment__message_needaction
+msgid "Action Needed"
+msgstr ""
+
+#. module: odex30_account_batch_payment
+#: model:ir.model.fields,field_description:odex30_account_batch_payment.field_account_batch_payment__activity_ids
+msgid "Activities"
+msgstr ""
+
+#. module: odex30_account_batch_payment
+#: model:ir.model.fields,field_description:odex30_account_batch_payment.field_account_batch_payment__activity_exception_decoration
+msgid "Activity Exception Decoration"
+msgstr ""
+
+#. module: odex30_account_batch_payment
+#: model:ir.model.fields,field_description:odex30_account_batch_payment.field_account_batch_payment__activity_state
+msgid "Activity State"
+msgstr ""
+
+#. module: odex30_account_batch_payment
+#: model:ir.model.fields,field_description:odex30_account_batch_payment.field_account_batch_payment__activity_type_icon
+msgid "Activity Type Icon"
+msgstr ""
+
+#. module: odex30_account_batch_payment
+#. odoo-python
+#: code:addons/odex30_account_batch_payment/models/account_batch_payment.py:0
+msgid "All payments in the batch must share the same payment method."
+msgstr ""
+
+#. module: odex30_account_batch_payment
+#: model:ir.model.fields,field_description:odex30_account_batch_payment.field_account_batch_payment__amount
+#: model_terms:ir.ui.view,arch_db:odex30_account_batch_payment.print_batch_payment
+#: model_terms:ir.ui.view,arch_db:odex30_account_batch_payment.view_batch_payment_form
+msgid "Amount"
+msgstr ""
+
+#. module: odex30_account_batch_payment
+#: model:ir.model.fields,field_description:odex30_account_batch_payment.field_account_batch_payment__amount_residual
+msgid "Amount Residual"
+msgstr ""
+
+#. module: odex30_account_batch_payment
+#: model:ir.model.fields,field_description:odex30_account_batch_payment.field_account_batch_payment__amount_residual_currency
+msgid "Amount Residual Currency"
+msgstr ""
+
+#. module: odex30_account_batch_payment
+#: model:ir.model.fields,field_description:odex30_account_batch_payment.field_account_payment__amount_signed
+msgid "Amount Signed"
+msgstr ""
+
+#. module: odex30_account_batch_payment
+#: model:ir.model.fields,field_description:odex30_account_batch_payment.field_account_batch_payment__message_attachment_count
+msgid "Attachment Count"
+msgstr ""
+
+#. module: odex30_account_batch_payment
+#: model:ir.model.fields,field_description:odex30_account_batch_payment.field_account_batch_payment__available_payment_method_ids
+msgid "Available Payment Method"
+msgstr ""
+
+#. module: odex30_account_batch_payment
+#: model:ir.model.fields,field_description:odex30_account_batch_payment.field_account_batch_payment__journal_id
+msgid "Bank"
+msgstr ""
+
+#. module: odex30_account_batch_payment
+#: model_terms:ir.ui.view,arch_db:odex30_account_batch_payment.view_batch_payment_search
+msgid "Bank Journal"
+msgstr ""
+
+#. module: odex30_account_batch_payment
+#: model_terms:ir.ui.view,arch_db:odex30_account_batch_payment.print_batch_payment
+msgid "Bank Transfer"
+msgstr ""
+
+#. module: odex30_account_batch_payment
+#: model_terms:ir.ui.view,arch_db:odex30_account_batch_payment.view_batch_payment_form
+msgid "Batch Content"
+msgstr ""
+
+#. module: odex30_account_batch_payment
+#: model:account.payment.method,name:odex30_account_batch_payment.account_payment_method_batch_deposit
+#: model_terms:ir.ui.view,arch_db:odex30_account_batch_payment.account_journal_dashboard_kanban_view_inherited
+msgid "Batch Deposit"
+msgstr ""
+
+#. module: odex30_account_batch_payment
+#: model:ir.model,name:odex30_account_batch_payment.model_report_account_batch_payment_print_batch_payment
+msgid "Batch Deposit Report"
+msgstr ""
+
+#. module: odex30_account_batch_payment
+#. odoo-python
+#: code:addons/odex30_account_batch_payment/models/account_payment.py:0
+#: model:ir.model,name:odex30_account_batch_payment.model_account_batch_payment
+#: model:ir.model.fields,field_description:odex30_account_batch_payment.field_account_batch_error_wizard__batch_payment_id
+#: model:ir.model.fields,field_description:odex30_account_batch_payment.field_account_payment__batch_payment_id
+#: model_terms:ir.ui.view,arch_db:odex30_account_batch_payment.view_batch_payment_form
+#: model_terms:ir.ui.view,arch_db:odex30_account_batch_payment.view_batch_payment_search
+msgid "Batch Payment"
+msgstr ""
+
+#. module: odex30_account_batch_payment
+#: model:ir.ui.menu,name:odex30_account_batch_payment.menu_batch_payment_purchases
+#: model:ir.ui.menu,name:odex30_account_batch_payment.menu_batch_payment_sales
+#: model_terms:ir.ui.view,arch_db:odex30_account_batch_payment.view_account_payment_search_inherit_account_batch_payment
+msgid "Batch Payments"
+msgstr ""
+
+#. module: odex30_account_batch_payment
+#: model:ir.model.fields,field_description:odex30_account_batch_payment.field_account_batch_payment__batch_type
+msgid "Batch Type"
+msgstr ""
+
+#. module: odex30_account_batch_payment
+#: model_terms:ir.actions.act_window,help:odex30_account_batch_payment.action_batch_payment_in
+#: model_terms:ir.actions.act_window,help:odex30_account_batch_payment.action_batch_payment_out
+msgid ""
+"Batch payments allow you grouping different payments to ease\n"
+"                    reconciliation. They are also useful when depositing checks\n"
+"                    to the bank."
+msgstr ""
+
+#. module: odex30_account_batch_payment
+#: model:ir.model,name:odex30_account_batch_payment.model_account_batch_error_wizard
+msgid "Batch payments error reporting wizard"
+msgstr ""
+
+#. module: odex30_account_batch_payment
+#: model:ir.model,name:odex30_account_batch_payment.model_account_batch_error_wizard_line
+msgid "Batch payments error reporting wizard line"
+msgstr ""
+
+#. module: odex30_account_batch_payment
+#. odoo-python
+#: code:addons/odex30_account_batch_payment/models/account_batch_payment.py:0
+msgid "Cannot validate an empty batch. Please add some payments to it first."
+msgstr ""
+
+#. module: odex30_account_batch_payment
+#. odoo-python
+#: code:addons/odex30_account_batch_payment/models/account_batch_payment.py:0
+msgid "Check Payments"
+msgstr ""
+
+#. module: odex30_account_batch_payment
+#: model_terms:ir.ui.view,arch_db:odex30_account_batch_payment.batch_error_wizard_form
+msgid "Close"
+msgstr ""
+
+#. module: odex30_account_batch_payment
+#: model:ir.model.fields,field_description:odex30_account_batch_payment.field_account_batch_payment__payment_method_code
+msgid "Code"
+msgstr ""
+
+#. module: odex30_account_batch_payment
+#: model:ir.model.fields,field_description:odex30_account_batch_payment.field_account_batch_payment__company_id
+msgid "Company"
+msgstr ""
+
+#. module: odex30_account_batch_payment
+#: model:ir.model.fields,field_description:odex30_account_batch_payment.field_account_batch_payment__company_currency_id
+msgid "Company Currency"
+msgstr ""
+
+#. module: odex30_account_batch_payment
+#: model:ir.model.fields,help:odex30_account_batch_payment.field_account_batch_payment__company_id
+msgid "Company related to this journal"
+msgstr ""
+
+#. module: odex30_account_batch_payment
+#: model_terms:ir.ui.view,arch_db:odex30_account_batch_payment.view_account_payment_tree_inherit_account_batch_payment
+msgid "Create Batch"
+msgstr ""
+
+#. module: odex30_account_batch_payment
+#. odoo-python
+#: code:addons/odex30_account_batch_payment/models/account_journal.py:0
+msgid "Create Batch Payment"
+msgstr ""
+
+#. module: odex30_account_batch_payment
+#: model_terms:ir.actions.act_window,help:odex30_account_batch_payment.action_batch_payment_in
+msgid "Create a new customer batch payment"
+msgstr ""
+
+#. module: odex30_account_batch_payment
+#: model_terms:ir.actions.act_window,help:odex30_account_batch_payment.action_batch_payment_out
+msgid "Create a new vendor batch payment"
+msgstr ""
+
+#. module: odex30_account_batch_payment
+#: model:ir.actions.server,name:odex30_account_batch_payment.action_account_create_batch_payment
+msgid "Create batch payment"
+msgstr ""
+
+#. module: odex30_account_batch_payment
+#: model:ir.model.fields,field_description:odex30_account_batch_payment.field_account_batch_error_wizard__create_uid
+#: model:ir.model.fields,field_description:odex30_account_batch_payment.field_account_batch_error_wizard_line__create_uid
+#: model:ir.model.fields,field_description:odex30_account_batch_payment.field_account_batch_payment__create_uid
+msgid "Created by"
+msgstr ""
+
+#. module: odex30_account_batch_payment
+#: model:ir.model.fields,field_description:odex30_account_batch_payment.field_account_batch_error_wizard__create_date
+#: model:ir.model.fields,field_description:odex30_account_batch_payment.field_account_batch_error_wizard_line__create_date
+#: model:ir.model.fields,field_description:odex30_account_batch_payment.field_account_batch_payment__create_date
+msgid "Created on"
+msgstr ""
+
+#. module: odex30_account_batch_payment
+#: model:ir.model.fields,help:odex30_account_batch_payment.field_account_batch_payment__export_file_create_date
+msgid "Creation date of the related export file."
+msgstr ""
+
+#. module: odex30_account_batch_payment
+#: model:ir.model.fields,field_description:odex30_account_batch_payment.field_account_batch_payment__currency_id
+msgid "Currency"
+msgstr ""
+
+#. module: odex30_account_batch_payment
+#: model_terms:ir.ui.view,arch_db:odex30_account_batch_payment.print_batch_payment
+msgid "Customer"
+msgstr ""
+
+#. module: odex30_account_batch_payment
+#: model:ir.actions.act_window,name:odex30_account_batch_payment.action_batch_payment_in
+msgid "Customer Batch Payments"
+msgstr ""
+
+#. module: odex30_account_batch_payment
+#: model:ir.model.fields,field_description:odex30_account_batch_payment.field_account_batch_payment__date
+#: model_terms:ir.ui.view,arch_db:odex30_account_batch_payment.print_batch_payment
+msgid "Date"
+msgstr ""
+
+#. module: odex30_account_batch_payment
+#: model_terms:ir.ui.view,arch_db:odex30_account_batch_payment.print_batch_payment
+msgid "Demo Ref"
+msgstr ""
+
+#. module: odex30_account_batch_payment
+#: model:ir.model.fields,field_description:odex30_account_batch_payment.field_account_batch_error_wizard_line__description
+msgid "Description"
+msgstr ""
+
+#. module: odex30_account_batch_payment
+#: model:ir.model.fields,field_description:odex30_account_batch_payment.field_account_batch_error_wizard__display_name
+#: model:ir.model.fields,field_description:odex30_account_batch_payment.field_account_batch_error_wizard_line__display_name
+#: model:ir.model.fields,field_description:odex30_account_batch_payment.field_account_batch_payment__display_name
+msgid "Display Name"
+msgstr ""
+
+#. module: odex30_account_batch_payment
+#: model:ir.model.fields,field_description:odex30_account_batch_payment.field_account_batch_error_wizard__error_line_ids
+msgid "Error Line"
+msgstr ""
+
+#. module: odex30_account_batch_payment
+#: model:ir.model.fields,field_description:odex30_account_batch_payment.field_account_batch_error_wizard_line__error_wizard_id
+msgid "Error Wizard"
+msgstr ""
+
+#. module: odex30_account_batch_payment
+#: model_terms:ir.ui.view,arch_db:odex30_account_batch_payment.batch_error_wizard_line_tree
+msgid "Exclude Payments"
+msgstr ""
+
+#. module: odex30_account_batch_payment
+#: model:ir.model.fields,help:odex30_account_batch_payment.field_account_batch_payment__export_file
+msgid "Export file related to this batch"
+msgstr ""
+
+#. module: odex30_account_batch_payment
+#: model:ir.model.fields,field_description:odex30_account_batch_payment.field_account_batch_payment__export_file
+msgid "File"
+msgstr ""
+
+#. module: odex30_account_batch_payment
+#: model:ir.model.fields,field_description:odex30_account_batch_payment.field_account_batch_payment__file_generation_enabled
+msgid "File Generation Enabled"
+msgstr ""
+
+#. module: odex30_account_batch_payment
+#: model:ir.model.fields,field_description:odex30_account_batch_payment.field_account_batch_payment__export_filename
+msgid "File Name"
+msgstr ""
+
+#. module: odex30_account_batch_payment
+#: model:ir.model.fields,field_description:odex30_account_batch_payment.field_account_batch_payment__message_follower_ids
+msgid "Followers"
+msgstr ""
+
+#. module: odex30_account_batch_payment
+#: model:ir.model.fields,field_description:odex30_account_batch_payment.field_account_batch_payment__message_partner_ids
+msgid "Followers (Partners)"
+msgstr ""
+
+#. module: odex30_account_batch_payment
+#: model:ir.model.fields,help:odex30_account_batch_payment.field_account_batch_payment__activity_type_icon
+msgid "Font awesome icon e.g. fa-tasks"
+msgstr ""
+
+#. module: odex30_account_batch_payment
+#: model:ir.model.fields,field_description:odex30_account_batch_payment.field_account_batch_payment__export_file_create_date
+msgid "Generation Date"
+msgstr ""
+
+#. module: odex30_account_batch_payment
+#: model_terms:ir.ui.view,arch_db:odex30_account_batch_payment.view_batch_payment_search
+msgid "Group By"
+msgstr ""
+
+#. module: odex30_account_batch_payment
+#: model:ir.model.fields,field_description:odex30_account_batch_payment.field_account_batch_payment__has_message
+msgid "Has Message"
+msgstr ""
+
+#. module: odex30_account_batch_payment
+#: model:ir.model.fields,field_description:odex30_account_batch_payment.field_account_batch_error_wizard_line__help_message
+msgid "Help"
+msgstr ""
+
+#. module: odex30_account_batch_payment
+#: model:ir.model.fields,field_description:odex30_account_batch_payment.field_account_batch_error_wizard__id
+#: model:ir.model.fields,field_description:odex30_account_batch_payment.field_account_batch_error_wizard_line__id
+#: model:ir.model.fields,field_description:odex30_account_batch_payment.field_account_batch_payment__id
+msgid "ID"
+msgstr ""
+
+#. module: odex30_account_batch_payment
+#: model:ir.model.fields,field_description:odex30_account_batch_payment.field_account_batch_payment__activity_exception_icon
+msgid "Icon"
+msgstr ""
+
+#. module: odex30_account_batch_payment
+#: model:ir.model.fields,help:odex30_account_batch_payment.field_account_batch_payment__activity_exception_icon
+msgid "Icon to indicate an exception activity."
+msgstr ""
+
+#. module: odex30_account_batch_payment
+#: model:ir.model.fields,help:odex30_account_batch_payment.field_account_batch_payment__message_needaction
+msgid "If checked, new messages require your attention."
+msgstr ""
+
+#. module: odex30_account_batch_payment
+#: model:ir.model.fields,help:odex30_account_batch_payment.field_account_batch_payment__message_has_error
+#: model:ir.model.fields,help:odex30_account_batch_payment.field_account_batch_payment__message_has_sms_error
+msgid "If checked, some messages have a delivery error."
+msgstr ""
+
+#. module: odex30_account_batch_payment
+#: model:ir.model.fields.selection,name:odex30_account_batch_payment.selection__account_batch_payment__batch_type__inbound
+msgid "Inbound"
+msgstr ""
+
+#. module: odex30_account_batch_payment
+#. odoo-python
+#: code:addons/odex30_account_batch_payment/models/account_journal.py:0
+msgid "Inbound Batch Payments Sequence"
+msgstr ""
+
+#. module: odex30_account_batch_payment
+#. odoo-python
+#: code:addons/odex30_account_batch_payment/models/account_batch_payment.py:0
+msgid "Invalid Partners"
+msgstr ""
+
+#. module: odex30_account_batch_payment
+#: model:ir.model.fields,field_description:odex30_account_batch_payment.field_account_batch_payment__invalid_sct_partners_ids
+msgid "Invalid Sct Partners"
+msgstr ""
+
+#. module: odex30_account_batch_payment
+#: model:ir.model.fields,field_description:odex30_account_batch_payment.field_account_batch_payment__message_is_follower
+msgid "Is Follower"
+msgstr ""
+
+#. module: odex30_account_batch_payment
+#: model_terms:ir.ui.view,arch_db:odex30_account_batch_payment.print_batch_payment
+msgid "Issuing bank account :"
+msgstr ""
+
+#. module: odex30_account_batch_payment
+#: model:ir.model,name:odex30_account_batch_payment.model_account_journal
+msgid "Journal"
+msgstr ""
+
+#. module: odex30_account_batch_payment
+#: model:ir.model.fields,field_description:odex30_account_batch_payment.field_account_batch_error_wizard__write_uid
+#: model:ir.model.fields,field_description:odex30_account_batch_payment.field_account_batch_error_wizard_line__write_uid
+#: model:ir.model.fields,field_description:odex30_account_batch_payment.field_account_batch_payment__write_uid
+msgid "Last Updated by"
+msgstr ""
+
+#. module: odex30_account_batch_payment
+#: model:ir.model.fields,field_description:odex30_account_batch_payment.field_account_batch_error_wizard__write_date
+#: model:ir.model.fields,field_description:odex30_account_batch_payment.field_account_batch_error_wizard_line__write_date
+#: model:ir.model.fields,field_description:odex30_account_batch_payment.field_account_batch_payment__write_date
+msgid "Last Updated on"
+msgstr ""
+
+#. module: odex30_account_batch_payment
+#: model_terms:ir.ui.view,arch_db:odex30_account_batch_payment.view_batch_payment_form
+msgid "Leave empty to generate automatically..."
+msgstr ""
+
+#. module: odex30_account_batch_payment
+#: model_terms:ir.ui.view,arch_db:odex30_account_batch_payment.print_batch_payment
+msgid "Memo"
+msgstr ""
+
+#. module: odex30_account_batch_payment
+#: model:ir.model.fields,field_description:odex30_account_batch_payment.field_account_batch_payment__message_has_error
+msgid "Message Delivery error"
+msgstr ""
+
+#. module: odex30_account_batch_payment
+#: model:ir.model.fields,field_description:odex30_account_batch_payment.field_account_batch_payment__message_ids
+msgid "Messages"
+msgstr ""
+
+#. module: odex30_account_batch_payment
+#: model_terms:ir.ui.view,arch_db:odex30_account_batch_payment.print_batch_payment
+msgid "Monthly Payment"
+msgstr ""
+
+#. module: odex30_account_batch_payment
+#: model:ir.model.fields,field_description:odex30_account_batch_payment.field_account_batch_payment__my_activity_date_deadline
+msgid "My Activity Deadline"
+msgstr ""
+
+#. module: odex30_account_batch_payment
+#: model:ir.model.fields,field_description:odex30_account_batch_payment.field_account_payment__payment_method_name
+msgid "Name"
+msgstr ""
+
+#. module: odex30_account_batch_payment
+#: model:ir.model.fields,help:odex30_account_batch_payment.field_account_batch_payment__export_filename
+msgid "Name of the export file generated for this batch"
+msgstr ""
+
+#. module: odex30_account_batch_payment
+#: model:ir.model.fields,help:odex30_account_batch_payment.field_account_payment__amount_signed
+msgid "Negative value of amount field if payment_type is outbound"
+msgstr ""
+
+#. module: odex30_account_batch_payment
+#: model:ir.model.fields.selection,name:odex30_account_batch_payment.selection__account_batch_payment__state__draft
+msgid "New"
+msgstr ""
+
+#. module: odex30_account_batch_payment
+#: model:ir.model.fields,field_description:odex30_account_batch_payment.field_account_batch_payment__activity_calendar_event_id
+msgid "Next Activity Calendar Event"
+msgstr ""
+
+#. module: odex30_account_batch_payment
+#: model:ir.model.fields,field_description:odex30_account_batch_payment.field_account_batch_payment__activity_date_deadline
+msgid "Next Activity Deadline"
+msgstr ""
+
+#. module: odex30_account_batch_payment
+#: model:ir.model.fields,field_description:odex30_account_batch_payment.field_account_batch_payment__activity_summary
+msgid "Next Activity Summary"
+msgstr ""
+
+#. module: odex30_account_batch_payment
+#: model:ir.model.fields,field_description:odex30_account_batch_payment.field_account_batch_payment__activity_type_id
+msgid "Next Activity Type"
+msgstr ""
+
+#. module: odex30_account_batch_payment
+#: model_terms:ir.ui.view,arch_db:odex30_account_batch_payment.view_account_payment_search_inherit_account_batch_payment
+msgid "Not Batch Payments"
+msgstr ""
+
+#. module: odex30_account_batch_payment
+#: model_terms:ir.ui.view,arch_db:odex30_account_batch_payment.view_account_payment_search_inherit_account_batch_payment
+msgid "Not reconciled"
+msgstr ""
+
+#. module: odex30_account_batch_payment
+#: model:ir.model.fields,field_description:odex30_account_batch_payment.field_account_batch_payment__message_needaction_counter
+msgid "Number of Actions"
+msgstr ""
+
+#. module: odex30_account_batch_payment
+#: model:ir.model.fields,field_description:odex30_account_batch_payment.field_account_batch_payment__message_has_error_counter
+msgid "Number of errors"
+msgstr ""
+
+#. module: odex30_account_batch_payment
+#: model:ir.model.fields,help:odex30_account_batch_payment.field_account_batch_payment__message_needaction_counter
+msgid "Number of messages requiring action"
+msgstr ""
+
+#. module: odex30_account_batch_payment
+#: model:ir.model.fields,help:odex30_account_batch_payment.field_account_batch_payment__message_has_error_counter
+msgid "Number of messages with delivery error"
+msgstr ""
+
+#. module: odex30_account_batch_payment
+#: model_terms:ir.ui.view,arch_db:odex30_account_batch_payment.print_batch_payment
+msgid "Odoo Payments LLC"
+msgstr ""
+
+#. module: odex30_account_batch_payment
+#: model:ir.model.fields.selection,name:odex30_account_batch_payment.selection__account_batch_payment__batch_type__outbound
+msgid "Outbound"
+msgstr ""
+
+#. module: odex30_account_batch_payment
+#. odoo-python
+#: code:addons/odex30_account_batch_payment/models/account_journal.py:0
+msgid "Outbound Batch Payments Sequence"
+msgstr ""
+
+#. module: odex30_account_batch_payment
+#: model_terms:ir.ui.view,arch_db:odex30_account_batch_payment.view_account_payment_tree_inherit_account_batch_payment
+msgid "Partner"
+msgstr ""
+
+#. module: odex30_account_batch_payment
+#: model:ir.model.fields,field_description:odex30_account_batch_payment.field_account_batch_payment__payment_ids_domain
+msgid "Payment Ids Domain"
+msgstr ""
+
+#. module: odex30_account_batch_payment
+#: model:ir.model.fields,field_description:odex30_account_batch_payment.field_account_batch_payment__payment_method_id
+msgid "Payment Method"
+msgstr ""
+
+#. module: odex30_account_batch_payment
+#: model:ir.model,name:odex30_account_batch_payment.model_account_payment_method
+msgid "Payment Methods"
+msgstr ""
+
+#. module: odex30_account_batch_payment
+#. odoo-python
+#: code:addons/odex30_account_batch_payment/models/account_payment.py:0
+msgid "Payment added in batch %s"
+msgstr ""
+
+#. module: odex30_account_batch_payment
+#: model_terms:ir.ui.view,arch_db:odex30_account_batch_payment.view_batch_payment_form
+msgid "Payment method"
+msgstr ""
+
+#. module: odex30_account_batch_payment
+#. odoo-python
+#: code:addons/odex30_account_batch_payment/models/account_batch_payment.py:0
+#: code:addons/odex30_account_batch_payment/models/account_payment.py:0
+msgid "Payment removed from batch %s"
+msgstr ""
+
+#. module: odex30_account_batch_payment
+#: model:ir.model,name:odex30_account_batch_payment.model_account_payment
+#: model:ir.model.fields,field_description:odex30_account_batch_payment.field_account_batch_error_wizard_line__payment_ids
+#: model:ir.model.fields,field_description:odex30_account_batch_payment.field_account_batch_payment__payment_ids
+#: model_terms:ir.ui.view,arch_db:odex30_account_batch_payment.view_batch_payment_form
+msgid "Payments"
+msgstr ""
+
+#. module: odex30_account_batch_payment
+#. odoo-python
+#: code:addons/odex30_account_batch_payment/models/account_batch_payment.py:0
+#: code:addons/odex30_account_batch_payment/wizard/batch_error.py:0
+msgid "Payments in Error"
+msgstr ""
+
+#. module: odex30_account_batch_payment
+#: model_terms:ir.ui.view,arch_db:odex30_account_batch_payment.view_batch_payment_form
+msgid "Print"
+msgstr ""
+
+#. module: odex30_account_batch_payment
+#: model:ir.actions.report,name:odex30_account_batch_payment.action_print_batch_payment
+msgid "Print Batch Payment"
+msgstr ""
+
+#. module: odex30_account_batch_payment
+#: model_terms:ir.ui.view,arch_db:odex30_account_batch_payment.batch_error_wizard_form
+msgid "Proceed with validation"
+msgstr ""
+
+#. module: odex30_account_batch_payment
+#: model:ir.model.fields,field_description:odex30_account_batch_payment.field_account_batch_payment__rating_ids
+msgid "Ratings"
+msgstr ""
+
+#. module: odex30_account_batch_payment
+#: model_terms:ir.ui.view,arch_db:odex30_account_batch_payment.view_batch_payment_form
+msgid "Re-generate Export File"
+msgstr ""
+
+#. module: odex30_account_batch_payment
+#: model_terms:ir.ui.view,arch_db:odex30_account_batch_payment.print_batch_payment
+msgid "Recipient Bank Account"
+msgstr ""
+
+#. module: odex30_account_batch_payment
+#: model:ir.model.fields.selection,name:odex30_account_batch_payment.selection__account_batch_payment__state__reconciled
+msgid "Reconciled"
+msgstr ""
+
+#. module: odex30_account_batch_payment
+#: model:ir.model.fields,field_description:odex30_account_batch_payment.field_account_batch_payment__name
+msgid "Reference"
+msgstr ""
+
+#. module: odex30_account_batch_payment
+#. odoo-python
+#: code:addons/odex30_account_batch_payment/models/account_batch_payment.py:0
+msgid "Remove the payments from the batch or change their state."
+msgstr ""
+
+#. module: odex30_account_batch_payment
+#: model:ir.model.fields,field_description:odex30_account_batch_payment.field_account_batch_payment__activity_user_id
+msgid "Responsible User"
+msgstr ""
+
+#. module: odex30_account_batch_payment
+#: model:ir.model.fields,field_description:odex30_account_batch_payment.field_account_batch_payment__message_has_sms_error
+msgid "SMS Delivery error"
+msgstr ""
+
+#. module: odex30_account_batch_payment
+#: model:ir.model.fields.selection,name:odex30_account_batch_payment.selection__account_batch_payment__state__sent
+msgid "Sent"
+msgstr ""
+
+#. module: odex30_account_batch_payment
+#: model_terms:ir.ui.view,arch_db:odex30_account_batch_payment.batch_error_wizard_line_tree
+msgid "Show"
+msgstr ""
+
+#. module: odex30_account_batch_payment
+#: model:ir.model.fields,field_description:odex30_account_batch_payment.field_account_batch_error_wizard_line__show_remove_button
+msgid "Show Remove Button"
+msgstr ""
+
+#. module: odex30_account_batch_payment
+#: model:ir.model.fields,field_description:odex30_account_batch_payment.field_account_batch_error_wizard__show_remove_options
+msgid "Show Remove Options"
+msgstr ""
+
+#. module: odex30_account_batch_payment
+#. odoo-python
+#: code:addons/odex30_account_batch_payment/models/account_batch_payment.py:0
+msgid "Some payments have already been sent."
+msgstr ""
+
+#. module: odex30_account_batch_payment
+#. odoo-python
+#: code:addons/odex30_account_batch_payment/models/account_batch_payment.py:0
+msgid "Some recipient accounts do not allow out payments."
+msgstr ""
+
+#. module: odex30_account_batch_payment
+#: model:ir.model.fields,field_description:odex30_account_batch_payment.field_account_batch_payment__state
+#: model_terms:ir.ui.view,arch_db:odex30_account_batch_payment.view_batch_payment_search
+msgid "State"
+msgstr ""
+
+#. module: odex30_account_batch_payment
+#: model:ir.model.fields,help:odex30_account_batch_payment.field_account_batch_payment__activity_state
+msgid ""
+"Status based on activities\n"
+"Overdue: Due date is already passed\n"
+"Today: Activity date is today\n"
+"Planned: Future activities."
+msgstr ""
+
+#. module: odex30_account_batch_payment
+#: model_terms:ir.ui.view,arch_db:odex30_account_batch_payment.print_batch_payment
+msgid "TOTAL"
+msgstr ""
+
+#. module: odex30_account_batch_payment
+#. odoo-python
+#: code:addons/odex30_account_batch_payment/models/account_batch_payment.py:0
+msgid ""
+"Target another recipient account or allow sending money to the current one."
+msgstr ""
+
+#. module: odex30_account_batch_payment
+#: model_terms:ir.ui.view,arch_db:odex30_account_batch_payment.batch_error_wizard_form
+msgid "The batch cannot be validated."
+msgstr ""
+
+#. module: odex30_account_batch_payment
+#: model_terms:ir.ui.view,arch_db:odex30_account_batch_payment.batch_error_wizard_form
+msgid "The batch could not be validated"
+msgstr ""
+
+#. module: odex30_account_batch_payment
+#. odoo-python
+#: code:addons/odex30_account_batch_payment/models/account_batch_payment.py:0
+msgid ""
+"The batch must have the same payment method as the payments it contains."
+msgstr ""
+
+#. module: odex30_account_batch_payment
+#. odoo-python
+#: code:addons/odex30_account_batch_payment/models/account_batch_payment.py:0
+msgid "The batch must have the same type as the payments it contains."
+msgstr ""
+
+#. module: odex30_account_batch_payment
+#: model:ir.model.fields,help:odex30_account_batch_payment.field_account_batch_error_wizard__batch_payment_id
+msgid ""
+"The batch payment generating the errors and warnings displayed in this "
+"wizard."
+msgstr ""
+
+#. module: odex30_account_batch_payment
+#: model_terms:ir.ui.view,arch_db:odex30_account_batch_payment.view_batch_payment_form
+msgid "The country or city of"
+msgstr ""
+
+#. module: odex30_account_batch_payment
+#. odoo-python
+#: code:addons/odex30_account_batch_payment/models/account_batch_payment.py:0
+msgid ""
+"The journal of the batch payment and of the payments it contains must be the"
+" same."
+msgstr ""
+
+#. module: odex30_account_batch_payment
+#: model:ir.model.fields,help:odex30_account_batch_payment.field_account_batch_payment__payment_method_id
+msgid "The payment method used by the payments in this batch."
+msgstr ""
+
+#. module: odex30_account_batch_payment
+#. odoo-python
+#: code:addons/odex30_account_batch_payment/models/account_batch_payment.py:0
+msgid ""
+"To validate the batch, payments must be in process. But some are already "
+"matched with a bank statement."
+msgstr ""
+
+#. module: odex30_account_batch_payment
+#: model_terms:ir.ui.view,arch_db:odex30_account_batch_payment.view_batch_payment_form
+msgid "Total"
+msgstr ""
+
+#. module: odex30_account_batch_payment
+#: model:ir.model.fields,help:odex30_account_batch_payment.field_account_batch_error_wizard__show_remove_options
+msgid ""
+"True if and only if the options to remove the payments causing the errors or"
+" warnings from the batch should be shown"
+msgstr ""
+
+#. module: odex30_account_batch_payment
+#: model:ir.model.fields,help:odex30_account_batch_payment.field_account_batch_payment__activity_exception_decoration
+msgid "Type of the exception activity on record."
+msgstr ""
+
+#. module: odex30_account_batch_payment
+#: model_terms:ir.ui.view,arch_db:odex30_account_batch_payment.view_batch_payment_search
+msgid "Unreconciled"
+msgstr ""
+
+#. module: odex30_account_batch_payment
+#: model_terms:ir.ui.view,arch_db:odex30_account_batch_payment.view_batch_payment_form
+msgid "Validate"
+msgstr ""
+
+#. module: odex30_account_batch_payment
+#: model_terms:ir.ui.view,arch_db:odex30_account_batch_payment.print_batch_payment
+msgid "Vendor"
+msgstr ""
+
+#. module: odex30_account_batch_payment
+#: model:ir.actions.act_window,name:odex30_account_batch_payment.action_batch_payment_out
+msgid "Vendor Batch Payments"
+msgstr ""
+
+#. module: odex30_account_batch_payment
+#: model:ir.model.fields,field_description:odex30_account_batch_payment.field_account_batch_error_wizard__warning_line_ids
+msgid "Warning Line"
+msgstr ""
+
+#. module: odex30_account_batch_payment
+#: model:ir.model.fields,field_description:odex30_account_batch_payment.field_account_batch_error_wizard_line__warning_wizard_id
+msgid "Warning Wizard"
+msgstr ""
+
+#. module: odex30_account_batch_payment
+#: model:ir.model.fields,field_description:odex30_account_batch_payment.field_account_batch_payment__website_message_ids
+msgid "Website Messages"
+msgstr ""
+
+#. module: odex30_account_batch_payment
+#: model:ir.model.fields,help:odex30_account_batch_payment.field_account_batch_payment__website_message_ids
+msgid "Website communication history"
+msgstr ""
+
+#. module: odex30_account_batch_payment
+#: model:ir.model.fields,help:odex30_account_batch_payment.field_account_batch_payment__file_generation_enabled
+msgid ""
+"Whether or not this batch payment should display the 'Generate File' button "
+"instead of 'Print' in form view."
+msgstr ""
+
+#. module: odex30_account_batch_payment
+#. odoo-python
+#: code:addons/odex30_account_batch_payment/models/account_batch_payment.py:0
+msgid "You cannot add payments with zero amount in a Batch Payment."
+msgstr ""
+
+#. module: odex30_account_batch_payment
+#. odoo-python
+#: code:addons/odex30_account_batch_payment/models/account_batch_payment.py:0
+msgid "You cannot add the same payment to multiple batches."
+msgstr ""
+
+#. module: odex30_account_batch_payment
+#. odoo-python
+#: code:addons/odex30_account_batch_payment/models/account_batch_payment.py:0
+msgid ""
+"You cannot create a batch with payments that are already in another batch."
+msgstr ""
+
+#. module: odex30_account_batch_payment
+#. odoo-python
+#: code:addons/odex30_account_batch_payment/models/account_batch_payment.py:0
+msgid "You cannot create batches with overlapping payments."
+msgstr ""
+
+#. module: odex30_account_batch_payment
+#: model_terms:ir.ui.view,arch_db:odex30_account_batch_payment.view_batch_payment_form
+msgid "is not set, which could cause the file to be refused by the bank."
+msgstr ""
+
+#. module: odex30_account_batch_payment
+#: model_terms:ir.ui.view,arch_db:odex30_account_batch_payment.view_batch_payment_form
+msgid "these partners"
+msgstr ""
diff --git a/dev_odex30_accounting/odex30_account_batch_payment/i18n/ar.po b/dev_odex30_accounting/odex30_account_batch_payment/i18n/ar.po
new file mode 100644
index 0000000..fc6e21b
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_batch_payment/i18n/ar.po
@@ -0,0 +1,953 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# * odex30_account_batch_payment
+#
+# Translators:
+# Wil Odoo, 2024
+# Mustafa J. Kadhem <safi2266@gmail.com>, 2024
+# Malaz Abuidris <msea@odoo.com>, 2025
+# Weblate <noreply-mt-weblate@weblate.org>, 2025.
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 18.0+e\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2025-10-31 18:47+0000\n"
+"PO-Revision-Date: 2025-11-17 14:06+0000\n"
+"Last-Translator: Weblate <noreply-mt-weblate@weblate.org>\n"
+"Language-Team: Arabic <https://translate.odoo.com/projects/odoo-18/"
+"odex30_account_batch_payment/ar/>\n"
+"Language: ar\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 "
+"&& n%100<=10 ? 3 : n%100>=11 ? 4 : 5;\n"
+"X-Generator: Weblate 5.12.2\n"
+
+#. module: odex30_account_batch_payment
+#: model_terms:ir.ui.view,arch_db:odex30_account_batch_payment.print_batch_payment
+msgid "$1000.0"
+msgstr "$1000.0"
+
+#. module: odex30_account_batch_payment
+#: model_terms:ir.ui.view,arch_db:odex30_account_batch_payment.print_batch_payment
+msgid "2023-08-14"
+msgstr "2023-08-14"
+
+#. module: odex30_account_batch_payment
+#: model_terms:ir.ui.view,arch_db:odex30_account_batch_payment.print_batch_payment
+msgid "2023-08-15"
+msgstr "2023-08-15"
+
+#. module: odex30_account_batch_payment
+#: model_terms:ir.ui.view,arch_db:odex30_account_batch_payment.print_batch_payment
+msgid "3956012345678"
+msgstr "3956012345678"
+
+#. module: odex30_account_batch_payment
+#: model_terms:ir.ui.view,arch_db:odex30_account_batch_payment.view_account_move_kanban
+msgid ""
+"<i class=\"fa fa-clock-o\" aria-label=\"Date\" role=\"img\" title=\"Date\"/>"
+msgstr ""
+"<i class=\"fa fa-clock-o\" aria-label=\"Date\" role=\"img\" title=\"التاريخ "
+"\"/>"
+
+#. module: odex30_account_batch_payment
+#: model_terms:ir.ui.view,arch_db:odex30_account_batch_payment.view_account_payment_form_inherit_account_batch_payment
+msgid "<span>Batch Payment</span>"
+msgstr "<span>دفعة مجمعة</span>"
+
+#. module: odex30_account_batch_payment
+#: model_terms:ir.ui.view,arch_db:odex30_account_batch_payment.batch_error_wizard_form
+msgid ""
+"<strong invisible=\"not warning_line_ids\">The following warnings were also "
+"raised; they do not impeach validation</strong>"
+msgstr ""
+"<strong invisible=\"not warning_line_ids\">تم أيضاً رفع التحذيرات التالية؛ "
+"إنهم لا يشككون في التحقق من الصحة</strong> "
+
+#. module: odex30_account_batch_payment
+#: model_terms:ir.ui.view,arch_db:odex30_account_batch_payment.batch_error_wizard_form
+msgid "<strong>Please first consider the following warnings</strong>"
+msgstr "<strong>الرجاء اعتبار التحذيرات التالية أولاً</strong>"
+
+#. module: odex30_account_batch_payment
+#: model_terms:ir.ui.view,arch_db:odex30_account_batch_payment.batch_error_wizard_form
+msgid "<strong>The following errors occurred</strong>"
+msgstr "<strong>لقد حدثت الأخطاء التالية</strong>"
+
+#. module: odex30_account_batch_payment
+#: model_terms:ir.ui.view,arch_db:odex30_account_batch_payment.print_batch_payment
+msgid "ABC Holder Name"
+msgstr "اسم المالك ABC "
+
+#. module: odex30_account_batch_payment
+#: model_terms:ir.ui.view,arch_db:odex30_account_batch_payment.print_batch_payment
+msgid "ABC Suppliers"
+msgstr "مزودوا ABC "
+
+#. module: odex30_account_batch_payment
+#: model_terms:ir.ui.view,arch_db:odex30_account_batch_payment.print_batch_payment
+msgid "Account Holder Name"
+msgstr "اسم مالك الحساب"
+
+#. module: odex30_account_batch_payment
+#: model:ir.model.fields,field_description:odex30_account_batch_payment.field_account_batch_payment__message_needaction
+msgid "Action Needed"
+msgstr "إجراء مطلوب"
+
+#. module: odex30_account_batch_payment
+#: model:ir.model.fields,field_description:odex30_account_batch_payment.field_account_batch_payment__activity_ids
+msgid "Activities"
+msgstr "الأنشطة"
+
+#. module: odex30_account_batch_payment
+#: model:ir.model.fields,field_description:odex30_account_batch_payment.field_account_batch_payment__activity_exception_decoration
+msgid "Activity Exception Decoration"
+msgstr "زخرفة استثناء النشاط"
+
+#. module: odex30_account_batch_payment
+#: model:ir.model.fields,field_description:odex30_account_batch_payment.field_account_batch_payment__activity_state
+msgid "Activity State"
+msgstr "حالة النشاط"
+
+#. module: odex30_account_batch_payment
+#: model:ir.model.fields,field_description:odex30_account_batch_payment.field_account_batch_payment__activity_type_icon
+msgid "Activity Type Icon"
+msgstr "أيقونة نوع النشاط"
+
+#. module: odex30_account_batch_payment
+#. odoo-python
+#: code:addons/odex30_account_batch_payment/models/account_batch_payment.py:0
+msgid "All payments in the batch must share the same payment method."
+msgstr "يجب أن يكون لكافة عمليات السداد في هذه الدفعة طريقة السداد ذاتها. "
+
+#. module: odex30_account_batch_payment
+#: model:ir.model.fields,field_description:odex30_account_batch_payment.field_account_batch_payment__amount
+#: model_terms:ir.ui.view,arch_db:odex30_account_batch_payment.print_batch_payment
+#: model_terms:ir.ui.view,arch_db:odex30_account_batch_payment.view_batch_payment_form
+msgid "Amount"
+msgstr "مبلغ"
+
+#. module: odex30_account_batch_payment
+#: model:ir.model.fields,field_description:odex30_account_batch_payment.field_account_batch_payment__amount_residual
+msgid "Amount Residual"
+msgstr "المبلغ المتبقي"
+
+#. module: odex30_account_batch_payment
+#: model:ir.model.fields,field_description:odex30_account_batch_payment.field_account_batch_payment__amount_residual_currency
+msgid "Amount Residual Currency"
+msgstr "عملة المبلغ المتبقي "
+
+#. module: odex30_account_batch_payment
+#: model:ir.model.fields,field_description:odex30_account_batch_payment.field_account_payment__amount_signed
+msgid "Amount Signed"
+msgstr "المبلغ الموقع عليه"
+
+#. module: odex30_account_batch_payment
+#: model:ir.model.fields,field_description:odex30_account_batch_payment.field_account_batch_payment__message_attachment_count
+msgid "Attachment Count"
+msgstr "عدد المرفقات"
+
+#. module: odex30_account_batch_payment
+#: model:ir.model.fields,field_description:odex30_account_batch_payment.field_account_batch_payment__available_payment_method_ids
+msgid "Available Payment Method"
+msgstr "طريقة الدفع المتاحة "
+
+#. module: odex30_account_batch_payment
+#: model:ir.model.fields,field_description:odex30_account_batch_payment.field_account_batch_payment__journal_id
+msgid "Bank"
+msgstr "البنك"
+
+#. module: odex30_account_batch_payment
+#: model_terms:ir.ui.view,arch_db:odex30_account_batch_payment.view_batch_payment_search
+msgid "Bank Journal"
+msgstr "دفتر يومية البنك"
+
+#. module: odex30_account_batch_payment
+#: model_terms:ir.ui.view,arch_db:odex30_account_batch_payment.print_batch_payment
+msgid "Bank Transfer"
+msgstr "تحويل بنكي "
+
+#. module: odex30_account_batch_payment
+#: model_terms:ir.ui.view,arch_db:odex30_account_batch_payment.view_batch_payment_form
+msgid "Batch Content"
+msgstr "محتويات الدفعة"
+
+#. module: odex30_account_batch_payment
+#: model:account.payment.method,name:odex30_account_batch_payment.account_payment_method_batch_deposit
+#: model_terms:ir.ui.view,arch_db:odex30_account_batch_payment.account_journal_dashboard_kanban_view_inherited
+msgid "Batch Deposit"
+msgstr "إيداع مجمع "
+
+#. module: odex30_account_batch_payment
+#: model:ir.model,name:odex30_account_batch_payment.model_report_account_batch_payment_print_batch_payment
+msgid "Batch Deposit Report"
+msgstr "تقرير الإيداع المجمع "
+
+#. module: odex30_account_batch_payment
+#. odoo-python
+#: code:addons/odex30_account_batch_payment/models/account_payment.py:0
+#: model:ir.model,name:odex30_account_batch_payment.model_account_batch_payment
+#: model:ir.model.fields,field_description:odex30_account_batch_payment.field_account_batch_error_wizard__batch_payment_id
+#: model:ir.model.fields,field_description:odex30_account_batch_payment.field_account_payment__batch_payment_id
+#: model_terms:ir.ui.view,arch_db:odex30_account_batch_payment.view_batch_payment_form
+#: model_terms:ir.ui.view,arch_db:odex30_account_batch_payment.view_batch_payment_search
+msgid "Batch Payment"
+msgstr "دفعة مجمعة "
+
+#. module: odex30_account_batch_payment
+#: model:ir.ui.menu,name:odex30_account_batch_payment.menu_batch_payment_purchases
+#: model:ir.ui.menu,name:odex30_account_batch_payment.menu_batch_payment_sales
+#: model_terms:ir.ui.view,arch_db:odex30_account_batch_payment.view_account_payment_search_inherit_account_batch_payment
+msgid "Batch Payments"
+msgstr "الدفعات المجمعة "
+
+#. module: odex30_account_batch_payment
+#: model:ir.model.fields,field_description:odex30_account_batch_payment.field_account_batch_payment__batch_type
+msgid "Batch Type"
+msgstr "نوع الدفعة"
+
+#. module: odex30_account_batch_payment
+#: model_terms:ir.actions.act_window,help:odex30_account_batch_payment.action_batch_payment_in
+#: model_terms:ir.actions.act_window,help:odex30_account_batch_payment.action_batch_payment_out
+msgid ""
+"Batch payments allow you grouping different payments to ease\n"
+"                    reconciliation. They are also useful when depositing "
+"checks\n"
+"                    to the bank."
+msgstr ""
+"تسمح لك الدفعات المجمعة بتجميع مدفوعات مختلفة مما \n"
+"                    يُسهل من عملية التسوية. وهي مفيدة أيضاً عند إيداع شيكات\n"
+"                    في البنك. "
+
+#. module: odex30_account_batch_payment
+#: model:ir.model,name:odex30_account_batch_payment.model_account_batch_error_wizard
+msgid "Batch payments error reporting wizard"
+msgstr "مُعالج الإبلاغ عن وقوع خطأ في الدفعات المجمعة "
+
+#. module: odex30_account_batch_payment
+#: model:ir.model,name:odex30_account_batch_payment.model_account_batch_error_wizard_line
+msgid "Batch payments error reporting wizard line"
+msgstr "بند مُعالج الإبلاغ عن وقوع خطأ في الدفعات المجمعة "
+
+#. module: odex30_account_batch_payment
+#. odoo-python
+#: code:addons/odex30_account_batch_payment/models/account_batch_payment.py:0
+msgid "Cannot validate an empty batch. Please add some payments to it first."
+msgstr "لا يمكن تصديق دفعة فارغة. الرجاء إضافة بعض المدفوعات لها أولاً. "
+
+#. module: odex30_account_batch_payment
+#. odoo-python
+#: code:addons/odex30_account_batch_payment/models/account_batch_payment.py:0
+msgid "Check Payments"
+msgstr "التحقق من المدفوعات "
+
+#. module: odex30_account_batch_payment
+#: model_terms:ir.ui.view,arch_db:odex30_account_batch_payment.batch_error_wizard_form
+msgid "Close"
+msgstr "إغلاق"
+
+#. module: odex30_account_batch_payment
+#: model:ir.model.fields,field_description:odex30_account_batch_payment.field_account_batch_payment__payment_method_code
+msgid "Code"
+msgstr "رمز "
+
+#. module: odex30_account_batch_payment
+#: model:ir.model.fields,field_description:odex30_account_batch_payment.field_account_batch_payment__company_id
+msgid "Company"
+msgstr "الشركة "
+
+#. module: odex30_account_batch_payment
+#: model:ir.model.fields,field_description:odex30_account_batch_payment.field_account_batch_payment__company_currency_id
+msgid "Company Currency"
+msgstr "عملة الشركة "
+
+#. module: odex30_account_batch_payment
+#: model:ir.model.fields,help:odex30_account_batch_payment.field_account_batch_payment__company_id
+msgid "Company related to this journal"
+msgstr "الشركة المتعلقة بهذه اليومية "
+
+#. module: odex30_account_batch_payment
+#: model_terms:ir.ui.view,arch_db:odex30_account_batch_payment.view_account_payment_tree_inherit_account_batch_payment
+msgid "Create Batch"
+msgstr "إنشاء الدفعة"
+
+#. module: odex30_account_batch_payment
+#. odoo-python
+#: code:addons/odex30_account_batch_payment/models/account_journal.py:0
+msgid "Create Batch Payment"
+msgstr "إنشاء دفعة مجمعة "
+
+#. module: odex30_account_batch_payment
+#: model_terms:ir.actions.act_window,help:odex30_account_batch_payment.action_batch_payment_in
+msgid "Create a new customer batch payment"
+msgstr "إنشاء دفعة مجمعة جديدة لعميل "
+
+#. module: odex30_account_batch_payment
+#: model_terms:ir.actions.act_window,help:odex30_account_batch_payment.action_batch_payment_out
+msgid "Create a new vendor batch payment"
+msgstr "إنشاء دفعة مجمعة جديدة لمورد "
+
+#. module: odex30_account_batch_payment
+#: model:ir.actions.server,name:odex30_account_batch_payment.action_account_create_batch_payment
+msgid "Create batch payment"
+msgstr "إنشاء دفعة مجمعة "
+
+#. module: odex30_account_batch_payment
+#: model:ir.model.fields,field_description:odex30_account_batch_payment.field_account_batch_error_wizard__create_uid
+#: model:ir.model.fields,field_description:odex30_account_batch_payment.field_account_batch_error_wizard_line__create_uid
+#: model:ir.model.fields,field_description:odex30_account_batch_payment.field_account_batch_payment__create_uid
+msgid "Created by"
+msgstr "أنشئ بواسطة"
+
+#. module: odex30_account_batch_payment
+#: model:ir.model.fields,field_description:odex30_account_batch_payment.field_account_batch_error_wizard__create_date
+#: model:ir.model.fields,field_description:odex30_account_batch_payment.field_account_batch_error_wizard_line__create_date
+#: model:ir.model.fields,field_description:odex30_account_batch_payment.field_account_batch_payment__create_date
+msgid "Created on"
+msgstr "أنشئ في"
+
+#. module: odex30_account_batch_payment
+#: model:ir.model.fields,help:odex30_account_batch_payment.field_account_batch_payment__export_file_create_date
+msgid "Creation date of the related export file."
+msgstr "تاريخ الإنشاء لملف التصدير ذي الصلة. "
+
+#. module: odex30_account_batch_payment
+#: model:ir.model.fields,field_description:odex30_account_batch_payment.field_account_batch_payment__currency_id
+msgid "Currency"
+msgstr "العملة"
+
+#. module: odex30_account_batch_payment
+#: model_terms:ir.ui.view,arch_db:odex30_account_batch_payment.print_batch_payment
+msgid "Customer"
+msgstr "العميل"
+
+#. module: odex30_account_batch_payment
+#: model:ir.actions.act_window,name:odex30_account_batch_payment.action_batch_payment_in
+msgid "Customer Batch Payments"
+msgstr "مدفوعات العميل المجمعة "
+
+#. module: odex30_account_batch_payment
+#: model:ir.model.fields,field_description:odex30_account_batch_payment.field_account_batch_payment__date
+#: model_terms:ir.ui.view,arch_db:odex30_account_batch_payment.print_batch_payment
+msgid "Date"
+msgstr "التاريخ"
+
+#. module: odex30_account_batch_payment
+#: model_terms:ir.ui.view,arch_db:odex30_account_batch_payment.print_batch_payment
+msgid "Demo Ref"
+msgstr "المرجع التجريبي "
+
+#. module: odex30_account_batch_payment
+#: model:ir.model.fields,field_description:odex30_account_batch_payment.field_account_batch_error_wizard_line__description
+msgid "Description"
+msgstr "الوصف"
+
+#. module: odex30_account_batch_payment
+#: model:ir.model.fields,field_description:odex30_account_batch_payment.field_account_batch_error_wizard__display_name
+#: model:ir.model.fields,field_description:odex30_account_batch_payment.field_account_batch_error_wizard_line__display_name
+#: model:ir.model.fields,field_description:odex30_account_batch_payment.field_account_batch_payment__display_name
+msgid "Display Name"
+msgstr "اسم العرض "
+
+#. module: odex30_account_batch_payment
+#: model:ir.model.fields,field_description:odex30_account_batch_payment.field_account_batch_error_wizard__error_line_ids
+msgid "Error Line"
+msgstr "بند الخطأ "
+
+#. module: odex30_account_batch_payment
+#: model:ir.model.fields,field_description:odex30_account_batch_payment.field_account_batch_error_wizard_line__error_wizard_id
+msgid "Error Wizard"
+msgstr "مُعالج الخطأ "
+
+#. module: odex30_account_batch_payment
+#: model_terms:ir.ui.view,arch_db:odex30_account_batch_payment.batch_error_wizard_line_tree
+msgid "Exclude Payments"
+msgstr "استثناء الدفعات "
+
+#. module: odex30_account_batch_payment
+#: model:ir.model.fields,help:odex30_account_batch_payment.field_account_batch_payment__export_file
+msgid "Export file related to this batch"
+msgstr "تصدير الملف المتعلق بهذه الدفعة "
+
+#. module: odex30_account_batch_payment
+#: model:ir.model.fields,field_description:odex30_account_batch_payment.field_account_batch_payment__export_file
+msgid "File"
+msgstr "الملف"
+
+#. module: odex30_account_batch_payment
+#: model:ir.model.fields,field_description:odex30_account_batch_payment.field_account_batch_payment__file_generation_enabled
+msgid "File Generation Enabled"
+msgstr "تم تفعيل خيار إنشاء الملفات "
+
+#. module: odex30_account_batch_payment
+#: model:ir.model.fields,field_description:odex30_account_batch_payment.field_account_batch_payment__export_filename
+msgid "File Name"
+msgstr "اسم الملف"
+
+#. module: odex30_account_batch_payment
+#: model:ir.model.fields,field_description:odex30_account_batch_payment.field_account_batch_payment__message_follower_ids
+msgid "Followers"
+msgstr "المتابعين"
+
+#. module: odex30_account_batch_payment
+#: model:ir.model.fields,field_description:odex30_account_batch_payment.field_account_batch_payment__message_partner_ids
+msgid "Followers (Partners)"
+msgstr "المتابعين (الشركاء) "
+
+#. module: odex30_account_batch_payment
+#: model:ir.model.fields,help:odex30_account_batch_payment.field_account_batch_payment__activity_type_icon
+msgid "Font awesome icon e.g. fa-tasks"
+msgstr "أيقونة من Font awesome مثال: fa-tasks "
+
+#. module: odex30_account_batch_payment
+#: model:ir.model.fields,field_description:odex30_account_batch_payment.field_account_batch_payment__export_file_create_date
+msgid "Generation Date"
+msgstr "تاريخ الإنشاء"
+
+#. module: odex30_account_batch_payment
+#: model_terms:ir.ui.view,arch_db:odex30_account_batch_payment.view_batch_payment_search
+msgid "Group By"
+msgstr "تجميع حسب"
+
+#. module: odex30_account_batch_payment
+#: model:ir.model.fields,field_description:odex30_account_batch_payment.field_account_batch_payment__has_message
+msgid "Has Message"
+msgstr "يحتوي على رسالة "
+
+#. module: odex30_account_batch_payment
+#: model:ir.model.fields,field_description:odex30_account_batch_payment.field_account_batch_error_wizard_line__help_message
+msgid "Help"
+msgstr "المساعدة"
+
+#. module: odex30_account_batch_payment
+#: model:ir.model.fields,field_description:odex30_account_batch_payment.field_account_batch_error_wizard__id
+#: model:ir.model.fields,field_description:odex30_account_batch_payment.field_account_batch_error_wizard_line__id
+#: model:ir.model.fields,field_description:odex30_account_batch_payment.field_account_batch_payment__id
+msgid "ID"
+msgstr "المُعرف"
+
+#. module: odex30_account_batch_payment
+#: model:ir.model.fields,field_description:odex30_account_batch_payment.field_account_batch_payment__activity_exception_icon
+msgid "Icon"
+msgstr "الأيقونة"
+
+#. module: odex30_account_batch_payment
+#: model:ir.model.fields,help:odex30_account_batch_payment.field_account_batch_payment__activity_exception_icon
+msgid "Icon to indicate an exception activity."
+msgstr "الأيقونة للإشارة إلى النشاط المستثنى. "
+
+#. module: odex30_account_batch_payment
+#: model:ir.model.fields,help:odex30_account_batch_payment.field_account_batch_payment__message_needaction
+msgid "If checked, new messages require your attention."
+msgstr "إذا كان محددًا، فهناك رسائل جديدة عليك رؤيتها. "
+
+#. module: odex30_account_batch_payment
+#: model:ir.model.fields,help:odex30_account_batch_payment.field_account_batch_payment__message_has_error
+#: model:ir.model.fields,help:odex30_account_batch_payment.field_account_batch_payment__message_has_sms_error
+msgid "If checked, some messages have a delivery error."
+msgstr "إذا كان محددًا، فقد حدث خطأ في تسليم بعض الرسائل."
+
+#. module: odex30_account_batch_payment
+#: model:ir.model.fields.selection,name:odex30_account_batch_payment.selection__account_batch_payment__batch_type__inbound
+msgid "Inbound"
+msgstr "واردة"
+
+#. module: odex30_account_batch_payment
+#. odoo-python
+#: code:addons/odex30_account_batch_payment/models/account_journal.py:0
+msgid "Inbound Batch Payments Sequence"
+msgstr "تسلسل الدفعات المجمعة الواردة "
+
+#. module: odex30_account_batch_payment
+#. odoo-python
+#: code:addons/odex30_account_batch_payment/models/account_batch_payment.py:0
+msgid "Invalid Partners"
+msgstr "الشركاء غير صالحين"
+
+#. module: odex30_account_batch_payment
+#: model:ir.model.fields,field_description:odex30_account_batch_payment.field_account_batch_payment__invalid_sct_partners_ids
+msgid "Invalid Sct Partners"
+msgstr ""
+
+#. module: odex30_account_batch_payment
+#: model:ir.model.fields,field_description:odex30_account_batch_payment.field_account_batch_payment__message_is_follower
+msgid "Is Follower"
+msgstr "متابع"
+
+#. module: odex30_account_batch_payment
+#: model_terms:ir.ui.view,arch_db:odex30_account_batch_payment.print_batch_payment
+msgid "Issuing bank account :"
+msgstr "إصدار حساب بنكي:"
+
+#. module: odex30_account_batch_payment
+#: model:ir.model,name:odex30_account_batch_payment.model_account_journal
+msgid "Journal"
+msgstr "دفتر اليومية"
+
+#. module: odex30_account_batch_payment
+#: model:ir.model.fields,field_description:odex30_account_batch_payment.field_account_batch_error_wizard__write_uid
+#: model:ir.model.fields,field_description:odex30_account_batch_payment.field_account_batch_error_wizard_line__write_uid
+#: model:ir.model.fields,field_description:odex30_account_batch_payment.field_account_batch_payment__write_uid
+msgid "Last Updated by"
+msgstr "آخر تحديث بواسطة"
+
+#. module: odex30_account_batch_payment
+#: model:ir.model.fields,field_description:odex30_account_batch_payment.field_account_batch_error_wizard__write_date
+#: model:ir.model.fields,field_description:odex30_account_batch_payment.field_account_batch_error_wizard_line__write_date
+#: model:ir.model.fields,field_description:odex30_account_batch_payment.field_account_batch_payment__write_date
+msgid "Last Updated on"
+msgstr "آخر تحديث في"
+
+#. module: odex30_account_batch_payment
+#: model_terms:ir.ui.view,arch_db:odex30_account_batch_payment.view_batch_payment_form
+msgid "Leave empty to generate automatically..."
+msgstr "اتركه فارغًا ليتم إنشاؤه تلقائيًا ..."
+
+#. module: odex30_account_batch_payment
+#: model_terms:ir.ui.view,arch_db:odex30_account_batch_payment.print_batch_payment
+msgid "Memo"
+msgstr "بيان"
+
+#. module: odex30_account_batch_payment
+#: model:ir.model.fields,field_description:odex30_account_batch_payment.field_account_batch_payment__message_has_error
+msgid "Message Delivery error"
+msgstr "خطأ في تسليم الرسائل"
+
+#. module: odex30_account_batch_payment
+#: model:ir.model.fields,field_description:odex30_account_batch_payment.field_account_batch_payment__message_ids
+msgid "Messages"
+msgstr "الرسائل"
+
+#. module: odex30_account_batch_payment
+#: model_terms:ir.ui.view,arch_db:odex30_account_batch_payment.print_batch_payment
+msgid "Monthly Payment"
+msgstr "دفع شهري "
+
+#. module: odex30_account_batch_payment
+#: model:ir.model.fields,field_description:odex30_account_batch_payment.field_account_batch_payment__my_activity_date_deadline
+msgid "My Activity Deadline"
+msgstr "الموعد النهائي لنشاطاتي "
+
+#. module: odex30_account_batch_payment
+#: model:ir.model.fields,field_description:odex30_account_batch_payment.field_account_payment__payment_method_name
+msgid "Name"
+msgstr "الاسم"
+
+#. module: odex30_account_batch_payment
+#: model:ir.model.fields,help:odex30_account_batch_payment.field_account_batch_payment__export_filename
+msgid "Name of the export file generated for this batch"
+msgstr "اسم الملف المُصدر الذي تم إنشاؤه لهذه الدفعة "
+
+#. module: odex30_account_batch_payment
+#: model:ir.model.fields,help:odex30_account_batch_payment.field_account_payment__amount_signed
+msgid "Negative value of amount field if payment_type is outbound"
+msgstr "القيمة السالبة لحقل المبلغ إذا كان payment_type صادراً "
+
+#. module: odex30_account_batch_payment
+#: model:ir.model.fields.selection,name:odex30_account_batch_payment.selection__account_batch_payment__state__draft
+msgid "New"
+msgstr "جديد"
+
+#. module: odex30_account_batch_payment
+#: model:ir.model.fields,field_description:odex30_account_batch_payment.field_account_batch_payment__activity_calendar_event_id
+msgid "Next Activity Calendar Event"
+msgstr "الفعالية التالية في تقويم الأنشطة "
+
+#. module: odex30_account_batch_payment
+#: model:ir.model.fields,field_description:odex30_account_batch_payment.field_account_batch_payment__activity_date_deadline
+msgid "Next Activity Deadline"
+msgstr "الموعد النهائي للنشاط التالي"
+
+#. module: odex30_account_batch_payment
+#: model:ir.model.fields,field_description:odex30_account_batch_payment.field_account_batch_payment__activity_summary
+msgid "Next Activity Summary"
+msgstr "ملخص النشاط التالي"
+
+#. module: odex30_account_batch_payment
+#: model:ir.model.fields,field_description:odex30_account_batch_payment.field_account_batch_payment__activity_type_id
+msgid "Next Activity Type"
+msgstr "نوع النشاط التالي"
+
+#. module: odex30_account_batch_payment
+#: model_terms:ir.ui.view,arch_db:odex30_account_batch_payment.view_account_payment_search_inherit_account_batch_payment
+msgid "Not Batch Payments"
+msgstr "مدفوعات غير مجمعة "
+
+#. module: odex30_account_batch_payment
+#: model_terms:ir.ui.view,arch_db:odex30_account_batch_payment.view_account_payment_search_inherit_account_batch_payment
+msgid "Not reconciled"
+msgstr "غير مسوى "
+
+#. module: odex30_account_batch_payment
+#: model:ir.model.fields,field_description:odex30_account_batch_payment.field_account_batch_payment__message_needaction_counter
+msgid "Number of Actions"
+msgstr "عدد الإجراءات"
+
+#. module: odex30_account_batch_payment
+#: model:ir.model.fields,field_description:odex30_account_batch_payment.field_account_batch_payment__message_has_error_counter
+msgid "Number of errors"
+msgstr "عدد الأخطاء "
+
+#. module: odex30_account_batch_payment
+#: model:ir.model.fields,help:odex30_account_batch_payment.field_account_batch_payment__message_needaction_counter
+msgid "Number of messages requiring action"
+msgstr "عدد الرسائل التي تتطلب اتخاذ إجراء"
+
+#. module: odex30_account_batch_payment
+#: model:ir.model.fields,help:odex30_account_batch_payment.field_account_batch_payment__message_has_error_counter
+msgid "Number of messages with delivery error"
+msgstr "عدد الرسائل الحادث بها خطأ في التسليم"
+
+#. module: odex30_account_batch_payment
+#: model_terms:ir.ui.view,arch_db:odex30_account_batch_payment.print_batch_payment
+msgid "Odoo Payments LLC"
+msgstr "مدفوعات أودو المحدودة "
+
+#. module: odex30_account_batch_payment
+#: model:ir.model.fields.selection,name:odex30_account_batch_payment.selection__account_batch_payment__batch_type__outbound
+msgid "Outbound"
+msgstr "صادرة"
+
+#. module: odex30_account_batch_payment
+#. odoo-python
+#: code:addons/odex30_account_batch_payment/models/account_journal.py:0
+msgid "Outbound Batch Payments Sequence"
+msgstr "تسلسل الدفعات المجمعة الصادرة "
+
+#. module: odex30_account_batch_payment
+#: model_terms:ir.ui.view,arch_db:odex30_account_batch_payment.view_account_payment_tree_inherit_account_batch_payment
+msgid "Partner"
+msgstr "الشريك"
+
+#. module: odex30_account_batch_payment
+#: model:ir.model.fields,field_description:odex30_account_batch_payment.field_account_batch_payment__payment_ids_domain
+msgid "Payment Ids Domain"
+msgstr "نطاق معرّفات الدفع "
+
+#. module: odex30_account_batch_payment
+#: model:ir.model.fields,field_description:odex30_account_batch_payment.field_account_batch_payment__payment_method_id
+msgid "Payment Method"
+msgstr "طريقة الدفع "
+
+#. module: odex30_account_batch_payment
+#: model:ir.model,name:odex30_account_batch_payment.model_account_payment_method
+msgid "Payment Methods"
+msgstr "طرق الدفع "
+
+#. module: odex30_account_batch_payment
+#. odoo-python
+#: code:addons/odex30_account_batch_payment/models/account_payment.py:0
+msgid "Payment added in batch %s"
+msgstr "تمت إضافة المدفوعات إلى الدفعة %s "
+
+#. module: odex30_account_batch_payment
+#: model_terms:ir.ui.view,arch_db:odex30_account_batch_payment.view_batch_payment_form
+msgid "Payment method"
+msgstr "طريقة الدفع "
+
+#. module: odex30_account_batch_payment
+#. odoo-python
+#: code:addons/odex30_account_batch_payment/models/account_batch_payment.py:0
+#: code:addons/odex30_account_batch_payment/models/account_payment.py:0
+msgid "Payment removed from batch %s"
+msgstr "تمت إزالة المدفوعات من الدفعة %s "
+
+#. module: odex30_account_batch_payment
+#: model:ir.model,name:odex30_account_batch_payment.model_account_payment
+#: model:ir.model.fields,field_description:odex30_account_batch_payment.field_account_batch_error_wizard_line__payment_ids
+#: model:ir.model.fields,field_description:odex30_account_batch_payment.field_account_batch_payment__payment_ids
+#: model_terms:ir.ui.view,arch_db:odex30_account_batch_payment.view_batch_payment_form
+msgid "Payments"
+msgstr "الدفعات"
+
+#. module: odex30_account_batch_payment
+#. odoo-python
+#: code:addons/odex30_account_batch_payment/models/account_batch_payment.py:0
+#: code:addons/odex30_account_batch_payment/wizard/batch_error.py:0
+msgid "Payments in Error"
+msgstr "المدفوعات التي بها خطأ "
+
+#. module: odex30_account_batch_payment
+#: model_terms:ir.ui.view,arch_db:odex30_account_batch_payment.view_batch_payment_form
+msgid "Print"
+msgstr "طباعة"
+
+#. module: odex30_account_batch_payment
+#: model:ir.actions.report,name:odex30_account_batch_payment.action_print_batch_payment
+msgid "Print Batch Payment"
+msgstr "طباعة الدفعة المجمعة "
+
+#. module: odex30_account_batch_payment
+#: model_terms:ir.ui.view,arch_db:odex30_account_batch_payment.batch_error_wizard_form
+msgid "Proceed with validation"
+msgstr "الاستمرار بالتصديق "
+
+#. module: odex30_account_batch_payment
+#: model:ir.model.fields,field_description:odex30_account_batch_payment.field_account_batch_payment__rating_ids
+msgid "Ratings"
+msgstr "التقييمات "
+
+#. module: odex30_account_batch_payment
+#: model_terms:ir.ui.view,arch_db:odex30_account_batch_payment.view_batch_payment_form
+msgid "Re-generate Export File"
+msgstr "إعادة إنشاء ملف تصدير "
+
+#. module: odex30_account_batch_payment
+#: model_terms:ir.ui.view,arch_db:odex30_account_batch_payment.print_batch_payment
+msgid "Recipient Bank Account"
+msgstr "الحساب البنكي المستلم"
+
+#. module: odex30_account_batch_payment
+#: model:ir.model.fields.selection,name:odex30_account_batch_payment.selection__account_batch_payment__state__reconciled
+msgid "Reconciled"
+msgstr "تمت التسوية"
+
+#. module: odex30_account_batch_payment
+#: model:ir.model.fields,field_description:odex30_account_batch_payment.field_account_batch_payment__name
+msgid "Reference"
+msgstr "الرقم المرجعي "
+
+#. module: odex30_account_batch_payment
+#. odoo-python
+#: code:addons/odex30_account_batch_payment/models/account_batch_payment.py:0
+msgid "Remove the payments from the batch or change their state."
+msgstr "قم بإزالة المدفوعات من الدفعة أو تغيير حالتها."
+
+#. module: odex30_account_batch_payment
+#: model:ir.model.fields,field_description:odex30_account_batch_payment.field_account_batch_payment__activity_user_id
+msgid "Responsible User"
+msgstr "المستخدم المسؤول"
+
+#. module: odex30_account_batch_payment
+#: model:ir.model.fields,field_description:odex30_account_batch_payment.field_account_batch_payment__message_has_sms_error
+msgid "SMS Delivery error"
+msgstr "خطأ في تسليم الرسائل النصية القصيرة "
+
+#. module: odex30_account_batch_payment
+#: model:ir.model.fields.selection,name:odex30_account_batch_payment.selection__account_batch_payment__state__sent
+msgid "Sent"
+msgstr "تم الإرسال"
+
+#. module: odex30_account_batch_payment
+#: model_terms:ir.ui.view,arch_db:odex30_account_batch_payment.batch_error_wizard_line_tree
+msgid "Show"
+msgstr "إظهار "
+
+#. module: odex30_account_batch_payment
+#: model:ir.model.fields,field_description:odex30_account_batch_payment.field_account_batch_error_wizard_line__show_remove_button
+msgid "Show Remove Button"
+msgstr "إظهار زر الإزالة "
+
+#. module: odex30_account_batch_payment
+#: model:ir.model.fields,field_description:odex30_account_batch_payment.field_account_batch_error_wizard__show_remove_options
+msgid "Show Remove Options"
+msgstr "إظهار خيارات الإزالة "
+
+#. module: odex30_account_batch_payment
+#. odoo-python
+#: code:addons/odex30_account_batch_payment/models/account_batch_payment.py:0
+msgid "Some payments have already been sent."
+msgstr "لقد تم إرسال بعض المدفوعات بالفعل. "
+
+#. module: odex30_account_batch_payment
+#. odoo-python
+#: code:addons/odex30_account_batch_payment/models/account_batch_payment.py:0
+msgid "Some recipient accounts do not allow out payments."
+msgstr "لا تسمح بعض حسابات المستلمين بالدفع."
+
+#. module: odex30_account_batch_payment
+#: model:ir.model.fields,field_description:odex30_account_batch_payment.field_account_batch_payment__state
+#: model_terms:ir.ui.view,arch_db:odex30_account_batch_payment.view_batch_payment_search
+msgid "State"
+msgstr "الحالة "
+
+#. module: odex30_account_batch_payment
+#: model:ir.model.fields,help:odex30_account_batch_payment.field_account_batch_payment__activity_state
+msgid ""
+"Status based on activities\n"
+"Overdue: Due date is already passed\n"
+"Today: Activity date is today\n"
+"Planned: Future activities."
+msgstr ""
+"الأنشطة المعتمدة على الحالة\n"
+"المتأخرة: تاريخ الاستحقاق مر\n"
+"اليوم: تاريخ النشاط هو اليوم\n"
+"المخطط: الأنشطة المستقبلية."
+
+#. module: odex30_account_batch_payment
+#: model_terms:ir.ui.view,arch_db:odex30_account_batch_payment.print_batch_payment
+msgid "TOTAL"
+msgstr "الإجمالي"
+
+#. module: odex30_account_batch_payment
+#. odoo-python
+#: code:addons/odex30_account_batch_payment/models/account_batch_payment.py:0
+msgid ""
+"Target another recipient account or allow sending money to the current one."
+msgstr "استهدف حساب مستلم آخر أو اسمح بإرسال الأموال إلى الحساب الحالي."
+
+#. module: odex30_account_batch_payment
+#: model_terms:ir.ui.view,arch_db:odex30_account_batch_payment.batch_error_wizard_form
+msgid "The batch cannot be validated."
+msgstr "لا يمكن تصديق الدفعة "
+
+#. module: odex30_account_batch_payment
+#: model_terms:ir.ui.view,arch_db:odex30_account_batch_payment.batch_error_wizard_form
+msgid "The batch could not be validated"
+msgstr "تعذر تصديق الدفعة "
+
+#. module: odex30_account_batch_payment
+#. odoo-python
+#: code:addons/odex30_account_batch_payment/models/account_batch_payment.py:0
+msgid ""
+"The batch must have the same payment method as the payments it contains."
+msgstr "يجب أن يكون للدفعة نفس طريقة السداد ككافة عمليات السداد التي تحتويها. "
+
+#. module: odex30_account_batch_payment
+#. odoo-python
+#: code:addons/odex30_account_batch_payment/models/account_batch_payment.py:0
+msgid "The batch must have the same type as the payments it contains."
+msgstr "يجب أن يكون للدفعة نفس نوع عمليات السداد التي تحتويها."
+
+#. module: odex30_account_batch_payment
+#: model:ir.model.fields,help:odex30_account_batch_payment.field_account_batch_error_wizard__batch_payment_id
+msgid ""
+"The batch payment generating the errors and warnings displayed in this "
+"wizard."
+msgstr ""
+"الدفعة المجمعة التي تتسبب في الأخطاء والتحذيرات المعروضة على هذا المُعالج. "
+
+#. module: odex30_account_batch_payment
+#: model_terms:ir.ui.view,arch_db:odex30_account_batch_payment.view_batch_payment_form
+msgid "The country or city of"
+msgstr ""
+
+#. module: odex30_account_batch_payment
+#. odoo-python
+#: code:addons/odex30_account_batch_payment/models/account_batch_payment.py:0
+msgid ""
+"The journal of the batch payment and of the payments it contains must be the "
+"same."
+msgstr ""
+"يجب أن يكون دفتر اليومية للدفعة المجمعة مطابقاً لدفتر اليومية لكافة عمليات "
+"السداد التي يحتويها. "
+
+#. module: odex30_account_batch_payment
+#: model:ir.model.fields,help:odex30_account_batch_payment.field_account_batch_payment__payment_method_id
+msgid "The payment method used by the payments in this batch."
+msgstr "طريقة السداد المستخدمة في عمليات السداد في هذه الدفعة."
+
+#. module: odex30_account_batch_payment
+#. odoo-python
+#: code:addons/odex30_account_batch_payment/models/account_batch_payment.py:0
+msgid ""
+"To validate the batch, payments must be in process. But some are already "
+"matched with a bank statement."
+msgstr ""
+"للتحقق من صحة الدفعة، يجب أن تكون المدفوعات قيد المعالجة. ولكن بعضها مطابق "
+"بالفعل مع كشف حساب بنكي. "
+
+#. module: odex30_account_batch_payment
+#: model_terms:ir.ui.view,arch_db:odex30_account_batch_payment.view_batch_payment_form
+msgid "Total"
+msgstr "الإجمالي"
+
+#. module: odex30_account_batch_payment
+#: model:ir.model.fields,help:odex30_account_batch_payment.field_account_batch_error_wizard__show_remove_options
+msgid ""
+"True if and only if the options to remove the payments causing the errors or "
+"warnings from the batch should be shown"
+msgstr ""
+"تكون القيمة صحيحة فقط عندما يكون من الواجب إظهار الخيارات لإزالة المدفوعات "
+"المتسببة بالأخطاء أو التحذيرات "
+
+#. module: odex30_account_batch_payment
+#: model:ir.model.fields,help:odex30_account_batch_payment.field_account_batch_payment__activity_exception_decoration
+msgid "Type of the exception activity on record."
+msgstr "نوع النشاط المستثنى في السجل. "
+
+#. module: odex30_account_batch_payment
+#: model_terms:ir.ui.view,arch_db:odex30_account_batch_payment.view_batch_payment_search
+msgid "Unreconciled"
+msgstr "غير المسواة"
+
+#. module: odex30_account_batch_payment
+#: model_terms:ir.ui.view,arch_db:odex30_account_batch_payment.view_batch_payment_form
+msgid "Validate"
+msgstr "تصديق "
+
+#. module: odex30_account_batch_payment
+#: model_terms:ir.ui.view,arch_db:odex30_account_batch_payment.print_batch_payment
+msgid "Vendor"
+msgstr "المورّد "
+
+#. module: odex30_account_batch_payment
+#: model:ir.actions.act_window,name:odex30_account_batch_payment.action_batch_payment_out
+msgid "Vendor Batch Payments"
+msgstr "مدفوعات المورّد المجمعة "
+
+#. module: odex30_account_batch_payment
+#: model:ir.model.fields,field_description:odex30_account_batch_payment.field_account_batch_error_wizard__warning_line_ids
+msgid "Warning Line"
+msgstr "بند التحذير "
+
+#. module: odex30_account_batch_payment
+#: model:ir.model.fields,field_description:odex30_account_batch_payment.field_account_batch_error_wizard_line__warning_wizard_id
+msgid "Warning Wizard"
+msgstr "مُعالج التحذير "
+
+#. module: odex30_account_batch_payment
+#: model:ir.model.fields,field_description:odex30_account_batch_payment.field_account_batch_payment__website_message_ids
+msgid "Website Messages"
+msgstr "رسائل الموقع الإلكتروني "
+
+#. module: odex30_account_batch_payment
+#: model:ir.model.fields,help:odex30_account_batch_payment.field_account_batch_payment__website_message_ids
+msgid "Website communication history"
+msgstr "سجل تواصل الموقع الإلكتروني "
+
+#. module: odex30_account_batch_payment
+#: model:ir.model.fields,help:odex30_account_batch_payment.field_account_batch_payment__file_generation_enabled
+msgid ""
+"Whether or not this batch payment should display the 'Generate File' button "
+"instead of 'Print' in form view."
+msgstr ""
+"إذا ما كان ينبغي عرض زر 'إنشاء ملف' في واجهة الدفعة المجمعة عوضاً عن زر "
+"'طباعة' أم لا. "
+
+#. module: odex30_account_batch_payment
+#. odoo-python
+#: code:addons/odex30_account_batch_payment/models/account_batch_payment.py:0
+msgid "You cannot add payments with zero amount in a Batch Payment."
+msgstr "لا يمكنك إضافة مدفوعات قيمتها صفر في دفعة مجمعة "
+
+#. module: odex30_account_batch_payment
+#. odoo-python
+#: code:addons/odex30_account_batch_payment/models/account_batch_payment.py:0
+msgid "You cannot add the same payment to multiple batches."
+msgstr "لا يمكنك إضافة عدة مدفوعات إلى عدة دفعات. "
+
+#. module: odex30_account_batch_payment
+#. odoo-python
+#: code:addons/odex30_account_batch_payment/models/account_batch_payment.py:0
+msgid ""
+"You cannot create a batch with payments that are already in another batch."
+msgstr "لا يمكنك إنشاء دفعة بها مدفوعات موجودة بالفعل في دفعة أخرى. "
+
+#. module: odex30_account_batch_payment
+#. odoo-python
+#: code:addons/odex30_account_batch_payment/models/account_batch_payment.py:0
+msgid "You cannot create batches with overlapping payments."
+msgstr "لا يمكنك إنشاء دفعات بها مدفوعات متداخلة. "
+
+#. module: odex30_account_batch_payment
+#: model_terms:ir.ui.view,arch_db:odex30_account_batch_payment.view_batch_payment_form
+msgid "is not set, which could cause the file to be refused by the bank."
+msgstr ""
+
+#. module: odex30_account_batch_payment
+#: model_terms:ir.ui.view,arch_db:odex30_account_batch_payment.view_batch_payment_form
+msgid "these partners"
+msgstr ""
diff --git a/dev_odex30_accounting/odex30_account_batch_payment/models/__init__.py b/dev_odex30_accounting/odex30_account_batch_payment/models/__init__.py
new file mode 100644
index 0000000..593ad7f
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_batch_payment/models/__init__.py
@@ -0,0 +1,6 @@
+# -*- coding: utf-8 -*-
+
+from . import account_batch_payment
+from . import account_journal
+from . import account_payment
+from . import account_payment_method
diff --git a/dev_odex30_accounting/odex30_account_batch_payment/models/__pycache__/__init__.cpython-311.pyc b/dev_odex30_accounting/odex30_account_batch_payment/models/__pycache__/__init__.cpython-311.pyc
new file mode 100644
index 0000000..bf70b63
Binary files /dev/null and b/dev_odex30_accounting/odex30_account_batch_payment/models/__pycache__/__init__.cpython-311.pyc differ
diff --git a/dev_odex30_accounting/odex30_account_batch_payment/models/__pycache__/account_batch_payment.cpython-311.pyc b/dev_odex30_accounting/odex30_account_batch_payment/models/__pycache__/account_batch_payment.cpython-311.pyc
new file mode 100644
index 0000000..188b138
Binary files /dev/null and b/dev_odex30_accounting/odex30_account_batch_payment/models/__pycache__/account_batch_payment.cpython-311.pyc differ
diff --git a/dev_odex30_accounting/odex30_account_batch_payment/models/__pycache__/account_journal.cpython-311.pyc b/dev_odex30_accounting/odex30_account_batch_payment/models/__pycache__/account_journal.cpython-311.pyc
new file mode 100644
index 0000000..91df6d6
Binary files /dev/null and b/dev_odex30_accounting/odex30_account_batch_payment/models/__pycache__/account_journal.cpython-311.pyc differ
diff --git a/dev_odex30_accounting/odex30_account_batch_payment/models/__pycache__/account_payment.cpython-311.pyc b/dev_odex30_accounting/odex30_account_batch_payment/models/__pycache__/account_payment.cpython-311.pyc
new file mode 100644
index 0000000..0f1aa05
Binary files /dev/null and b/dev_odex30_accounting/odex30_account_batch_payment/models/__pycache__/account_payment.cpython-311.pyc differ
diff --git a/dev_odex30_accounting/odex30_account_batch_payment/models/__pycache__/account_payment_method.cpython-311.pyc b/dev_odex30_accounting/odex30_account_batch_payment/models/__pycache__/account_payment_method.cpython-311.pyc
new file mode 100644
index 0000000..91fa581
Binary files /dev/null and b/dev_odex30_accounting/odex30_account_batch_payment/models/__pycache__/account_payment_method.cpython-311.pyc differ
diff --git a/dev_odex30_accounting/odex30_account_batch_payment/models/account_batch_payment.py b/dev_odex30_accounting/odex30_account_batch_payment/models/account_batch_payment.py
new file mode 100644
index 0000000..805f770
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_batch_payment/models/account_batch_payment.py
@@ -0,0 +1,455 @@
+# -*- coding: utf-8 -*-
+import base64
+
+from odoo import models, fields, api, _
+from odoo.exceptions import RedirectWarning, ValidationError, UserError
+
+
+class AccountBatchPayment(models.Model):
+    _name = "account.batch.payment"
+    _description = "Batch Payment"
+    _order = "date desc, id desc"
+    _inherit = ["mail.thread", "mail.activity.mixin"]
+
+    name = fields.Char(required=True, copy=False, string='Reference')
+    date = fields.Date(required=True, copy=False, default=fields.Date.context_today, tracking=True)
+    state = fields.Selection([
+        ('draft', 'New'),
+        ('sent', 'Sent'),
+        ('reconciled', 'Reconciled'),
+    ], store=True, compute='_compute_state', default='draft', tracking=True)
+    journal_id = fields.Many2one(
+        'account.journal',
+        string='Bank',
+        check_company=True,
+        domain=[('type', '=', 'bank')],
+        tracking=True,
+    )
+    company_id = fields.Many2one('res.company', related='journal_id.company_id', readonly=True)
+    payment_ids = fields.One2many('account.payment', 'batch_payment_id', string="Payments", required=True)
+    payment_ids_domain = fields.Char(compute='_compute_payment_ids_domain')
+    currency_id = fields.Many2one('res.currency', compute='_compute_currency', store=True, readonly=True)
+    company_currency_id = fields.Many2one(
+        string="Company Currency",
+        related='journal_id.company_id.currency_id',
+        store=True,
+    )
+    amount_residual = fields.Monetary(
+        currency_field='company_currency_id',
+        compute='_compute_from_payment_ids',
+        store=True,
+    )
+    amount_residual_currency = fields.Monetary(
+        currency_field='currency_id',
+        compute='_compute_from_payment_ids',
+        store=True,
+    )
+    amount = fields.Monetary(
+        currency_field='currency_id',
+        compute='_compute_from_payment_ids',
+        store=True,
+    )
+    batch_type = fields.Selection(selection=[('inbound', 'Inbound'), ('outbound', 'Outbound')], required=True, default='inbound', tracking=True)
+    payment_method_id = fields.Many2one(
+        comodel_name='account.payment.method',
+        string='Payment Method', store=True, readonly=False,
+        compute='_compute_payment_method_id',
+        domain="[('id', 'in', available_payment_method_ids)]",
+        help="The payment method used by the payments in this batch.", tracking=True)
+    available_payment_method_ids = fields.Many2many(
+        comodel_name='account.payment.method',
+        compute='_compute_available_payment_method_ids')
+    payment_method_code = fields.Char(related='payment_method_id.code', tracking=True)
+    export_file_create_date = fields.Date(string='Generation Date', default=fields.Date.today, readonly=True, help="Creation date of the related export file.", copy=False)
+    export_file = fields.Binary(string='File', readonly=True, help="Export file related to this batch", copy=False)
+    export_filename = fields.Char(string='File Name', help="Name of the export file generated for this batch", store=True, copy=False)
+
+    file_generation_enabled = fields.Boolean(help="Whether or not this batch payment should display the 'Generate File' button instead of 'Print' in form view.", compute='_compute_file_generation_enabled')
+    invalid_sct_partners_ids = fields.Many2many('res.partner', compute='_compute_invalid_sct_partners_ids')
+
+    @api.depends('batch_type', 'journal_id', 'payment_method_id')
+    def _compute_payment_ids_domain(self):
+        for batch in self:
+            batch.payment_ids_domain = str([
+                ('batch_payment_id', '=', False),
+                ('state', 'in', self._valid_payment_states()),
+                ('is_sent', '=', False),
+                ('payment_method_id', '=', batch.payment_method_id.id),
+                ('journal_id', '=', batch.journal_id.id),
+                ('payment_type', '=', batch.batch_type),
+                ('amount', '!=', 0),
+            ])
+
+    def _valid_payment_states(self):
+        return ['in_process', 'paid'] if self.env['account.move']._get_invoice_in_payment_state() == 'paid' else ['in_process']
+
+    @api.depends('batch_type', 'journal_id', 'payment_ids')
+    def _compute_payment_method_id(self):
+        ''' Compute the 'payment_method_id' field.
+        This field is not computed in '_compute_available_payment_method_ids' because it's a stored editable one.
+        '''
+        for batch in self:
+            if batch.payment_ids:
+                batch.payment_method_id = batch.payment_ids.payment_method_line_id[0].payment_method_id
+                continue
+
+            if not batch.journal_id:
+                batch.available_payment_method_ids = False
+                batch.payment_method_id = False
+                continue
+
+            available_payment_method_lines = batch.journal_id._get_available_payment_method_lines(batch.batch_type)
+
+            batch.available_payment_method_ids = available_payment_method_lines.mapped('payment_method_id')
+
+            # Select the first available one by default.
+            if batch.available_payment_method_ids:
+                batch.payment_method_id = batch.available_payment_method_ids[0]._origin
+            else:
+                batch.payment_method_id = False
+
+    @api.depends('batch_type', 'journal_id')
+    def _compute_available_payment_method_ids(self):
+        for batch in self:
+            available_payment_method_lines = batch.journal_id._get_available_payment_method_lines(batch.batch_type)
+            batch.available_payment_method_ids = available_payment_method_lines.mapped('payment_method_id')
+
+    @api.depends('payment_ids.is_sent', 'payment_ids.is_matched')
+    def _compute_state(self):
+        for batch in self:
+            if batch.payment_ids and all(pay.is_matched and pay.is_sent for pay in batch.payment_ids.filtered(lambda p: p.state not in ('canceled', 'rejected'))):
+                batch.state = 'reconciled'
+            elif batch.payment_ids and all(pay.is_sent for pay in batch.payment_ids.filtered(lambda p: p.state not in ('canceled', 'rejected'))):
+                batch.state = 'sent'
+            else:
+                batch.state = 'draft'
+
+    @api.depends('payment_method_id')
+    def _compute_file_generation_enabled(self):
+        for record in self:
+            record.file_generation_enabled = record.payment_method_id.code in record._get_methods_generating_files()
+
+    def _get_methods_generating_files(self):
+        """ Hook for extension. Any payment method whose code stands in the list
+        returned by this function will see the "print" button disappear on batch
+        payments form when it gets selected and an 'Export file' appear instead.
+        """
+        return []
+
+    @api.depends('journal_id')
+    def _compute_currency(self):
+        for batch in self:
+            batch.currency_id = batch.journal_id.currency_id or batch.company_currency_id or self.env.company.currency_id
+
+    @api.depends('currency_id', 'payment_ids.amount', 'payment_ids.is_matched', 'payment_ids.state')
+    def _compute_from_payment_ids(self):
+        valid_payment_states = self._valid_payment_states()
+        for batch in self:
+            amount = 0.0
+            amount_residual = 0.0
+            amount_residual_currency = 0.0
+            for payment in batch.payment_ids:
+                if payment.move_id:
+                    liquidity_lines, _counterpart_lines, _writeoff_lines = payment._seek_for_lines()
+                    for line in liquidity_lines:
+                        if line.currency_id == batch.currency_id:
+                            amount += line.amount_currency
+                        elif batch.currency_id == line.company_currency_id:
+                            amount += line.balance
+                        else:
+                            amount += line.company_currency_id._convert(
+                                from_amount=line.balance,
+                                to_currency=batch.currency_id,
+                                company=line.company_id,
+                                date=line.date,
+                            )
+
+                        if payment.state in valid_payment_states:
+                            amount_residual += line.amount_residual
+                            if line.currency_id == batch.currency_id:
+                                amount_residual_currency += line.amount_residual_currency
+                            elif batch.currency_id == line.company_currency_id:
+                                amount_residual_currency += line.amount_residual
+                            else:
+                                amount_residual_currency += line.company_currency_id._convert(
+                                    from_amount=line.amount_residual,
+                                    to_currency=batch.currency_id,
+                                    company=line.company_id,
+                                    date=line.date,
+                                )
+                else:
+                    if payment.currency_id == batch.currency_id:
+                        payment_amount = payment.amount_signed
+                    elif batch.currency_id == payment.company_currency_id:
+                        payment_amount = payment.amount_company_currency_signed
+                    else:
+                        payment_amount = payment.company_currency_id._convert(
+                            from_amount=payment.amount_company_currency_signed,
+                            to_currency=batch.currency_id,
+                            company=payment.company_id,
+                            date=payment.date,
+                        )
+                    amount += payment_amount
+                    if payment.state in valid_payment_states:
+                        amount_residual_currency += payment_amount
+                        if payment.currency_id == batch.company_id.currency_id:
+                            amount_residual += payment.amount_signed
+                        elif batch.currency_id == payment.company_currency_id:
+                            amount_residual += payment.amount_company_currency_signed
+                        else:
+                            amount_residual += payment.company_currency_id._convert(
+                                from_amount=payment.amount_company_currency_signed,
+                                to_currency=batch.company_id.currency_id,
+                                company=payment.company_id,
+                                date=payment.date,
+                            )
+
+            batch.amount_residual = amount_residual
+            batch.amount = amount
+            batch.amount_residual_currency = amount_residual_currency
+
+    @api.constrains('batch_type', 'journal_id', 'payment_ids', 'payment_method_id')
+    def _check_payments_constrains(self):
+        for record in self:
+            if record.payment_ids and record.journal_id != record.payment_ids.journal_id:
+                raise ValidationError(_("The journal of the batch payment and of the payments it contains must be the same."))
+            all_types = set(record.payment_ids.mapped('payment_type'))
+            if all_types and record.batch_type not in all_types:
+                raise ValidationError(_("The batch must have the same type as the payments it contains."))
+            all_payment_methods = record.payment_ids.payment_method_id
+            if len(all_payment_methods) > 1:
+                raise ValidationError(_("All payments in the batch must share the same payment method."))
+            if all_payment_methods and record.payment_method_id not in all_payment_methods:
+                raise ValidationError(_("The batch must have the same payment method as the payments it contains."))
+            payment_null = record.payment_ids.filtered(lambda p: p.amount == 0)
+            if payment_null:
+                raise ValidationError(_('You cannot add payments with zero amount in a Batch Payment.'))
+
+    @api.model_create_multi
+    def create(self, vals_list):
+        today = fields.Date.context_today(self)
+        all_payment_ids = []
+        for vals in vals_list:
+            vals['name'] = self._get_batch_name(
+                vals.get('batch_type'),
+                vals.get('date', today),
+                vals)
+            if 'payment_ids' in vals:
+                payments = self.new({'payment_ids': vals['payment_ids']}).payment_ids
+                if payments._origin.batch_payment_id:
+                    raise ValidationError(_('You cannot create a batch with payments that are already in another batch.'))
+                # Collect all payment IDs
+                all_payment_ids.extend(payments.ids)
+
+        if len(all_payment_ids) != len(set(all_payment_ids)):
+            raise ValidationError(_('You cannot create batches with overlapping payments.'))
+        return super().create(vals_list)
+
+    def write(self, vals):
+        if 'batch_type' in vals:
+            vals['name'] = self.with_context(default_journal_id=self.journal_id.id)._get_batch_name(vals['batch_type'], self.date, vals)
+        if 'payment_ids' in vals:
+            if len(self) > 1:
+                raise ValidationError(_('You cannot add the same payment to multiple batches.'))
+            original_payments = self.new({'payment_ids': vals['payment_ids']}).payment_ids._origin
+            if original_payments.batch_payment_id - self:
+                raise ValidationError(_('You cannot create a batch with payments that are already in another batch.'))
+
+        rslt = super(AccountBatchPayment, self).write(vals)
+
+        return rslt
+
+    def unlink(self):
+        for batch in self:
+            for payment in batch.payment_ids:
+                payment.message_post(
+                    body=_('Payment removed from batch %s', batch._get_html_link(title=batch.name)),
+                    message_type='comment',
+                )
+        return super().unlink()
+
+    @api.model
+    def _get_batch_name(self, batch_type, sequence_date, vals):
+        if not vals.get('name'):
+            sequence_code = 'account.inbound.batch.payment'
+            if batch_type == 'outbound':
+                sequence_code = 'account.outbound.batch.payment'
+            return self.env['ir.sequence'].with_context(sequence_date=sequence_date).next_by_code(sequence_code)
+        return vals['name']
+
+    @api.depends('state')
+    def _compute_display_name(self):
+        state_values = dict(self._fields['state'].selection)
+        for batch in self:
+            batch.display_name = f'{batch.name} ({state_values.get(batch.state)})'
+
+    @api.depends('payment_method_id', 'payment_ids.partner_id.country_id', 'payment_ids.partner_id.city')
+    def _compute_invalid_sct_partners_ids(self):
+        sepa_batches = self.filtered(lambda b: b.payment_method_id.code == 'sepa_ct')
+        for batch in sepa_batches:
+            batch.invalid_sct_partners_ids = batch.payment_ids.partner_id.filtered(
+                lambda partner: not (partner.city and partner.country_id)
+            )
+        (self - sepa_batches).invalid_sct_partners_ids = self.env['res.partner']
+
+    def action_invalid_partners_from_sct(self):
+        return self.invalid_sct_partners_ids._get_records_action(name=_("Invalid Partners"))
+
+    def validate_batch(self):
+        """ Verifies the content of a batch and proceeds to its sending if possible.
+        If not, opens a wizard listing the errors and/or warnings encountered.
+        """
+        validate_action = self._check_batch_validity()
+        if validate_action:
+            return validate_action
+        return self._send_after_validation()
+
+    def _check_batch_validity(self):
+        self.ensure_one()
+        if not self.payment_ids:
+            raise UserError(_("Cannot validate an empty batch. Please add some payments to it first."))
+
+        errors = not self.export_file and self.check_payments_for_errors() or []  # We don't re-check for errors if we are regenerating the file (we know there aren't any)
+        warnings = self.check_payments_for_warnings()
+        if errors or warnings:
+            if len(errors) == 1 and not warnings:
+                raise RedirectWarning(
+                    message=errors[0]['title'] + '\n' + errors[0].get('help', ''),
+                    action=errors[0].get('records', self.env['account.payment'])._get_records_action(name=_('Payments in Error')),
+                    button_text=_('Check Payments')
+                )
+            return {
+                'type': 'ir.actions.act_window',
+                'view_mode': 'form',
+                'res_model': 'account.batch.error.wizard',
+                'target': 'new',
+                'res_id': self.env['account.batch.error.wizard'].create_from_errors_list(self, errors, warnings).id,
+            }
+
+    def validate_batch_button(self):
+        return self.validate_batch()
+
+    def _send_after_validation(self):
+        """ Sends the payments of a batch (possibly generating an export file)
+        once the batch has been validated.
+        """
+
+        self.ensure_one()
+        if self.payment_ids:
+            self.payment_ids.mark_as_sent()
+
+            if self.file_generation_enabled:
+                return self.export_batch_payment()
+
+    def check_payments_for_warnings(self):
+        """ Checks the payments of this batch and returns (if relevant) some
+        warnings about them. These warnings are not to be confused with errors,
+        they are only messgaes displayed to make sure the user is aware of some
+        specificities in the payments he's put in the batch. He will be able to
+        ignore them.
+
+        :return:    A list of dictionaries, each one corresponding to a distinct
+                    warning and containing the following keys:
+                    - 'title': A short name for the warning (mandatory)
+                    - 'records': The recordset of payments concerned by this warning (mandatory)
+                    - 'help': A help text to give the user further information
+                              on the reason this warning exists (optional)
+        """
+        return []
+
+    def check_payments_for_errors(self):
+        """ Goes through all the payments of the batches contained in this
+        record set, and returns the ones that would impeach batch validation,
+        in such a way that the payments impeaching validation for the same reason
+        are grouped under a common error message. This function is a hook for
+        extension for modules making a specific use of batch payments, such as SEPA
+        ones.
+
+        :return:    A list of dictionaries, each one corresponding to a distinct
+                    error and containing the following keys:
+                    - 'title': A short name for the error (mandatory)
+                    - 'records': The recordset of payments facing this error (mandatory)
+                    - 'help': A help text to give the user further information
+                              on how to solve the error (optional)
+        """
+        self.ensure_one()
+        #We first try to post all the draft batch payments
+        rslt = self._check_and_post_draft_payments(self.payment_ids.filtered(lambda x: x.state == 'draft'))
+
+        valid_payment_states = self._valid_payment_states()
+        wrong_state_payments = self.payment_ids.filtered(lambda x: x.state not in valid_payment_states)
+
+        if wrong_state_payments:
+            rslt.append({
+                'title': _("To validate the batch, payments must be in process. But some are already matched with a bank statement."),
+                'records': wrong_state_payments,
+                'help': _("Remove the payments from the batch or change their state.")
+            })
+
+        if self.batch_type == 'outbound':
+            not_allowed_payments = self.payment_ids.filtered(lambda x: x.partner_bank_id and not x.partner_bank_id.allow_out_payment)
+            if not_allowed_payments:
+                rslt.append({
+                    'code': 'out_payment_not_allowed',
+                    'title': _("Some recipient accounts do not allow out payments."),
+                    'records': not_allowed_payments,
+                    'help': _("Target another recipient account or allow sending money to the current one.")
+                })
+
+        sent_payments = self.payment_ids.filtered(lambda x: x.is_sent)
+        if sent_payments:
+            rslt.append({
+                'title': _("Some payments have already been sent."),
+                'records': sent_payments,
+            })
+
+        return rslt
+
+    def _check_and_post_draft_payments(self, draft_payments):
+        """ Tries posting each of the draft payments contained in this batch.
+        If it fails and raise a UserError, it is catched and the process continues
+        on the following payments. All the encountered errors are then returned
+        withing a dictionary, in the same fashion as check_payments_for_errors.
+        """
+        exceptions_mapping = {}
+        for payment in draft_payments:
+            try:
+                payment.action_post()
+            except UserError as e:
+                name = e.args[0]
+                if name in exceptions_mapping:
+                    exceptions_mapping[name] += payment
+                else:
+                    exceptions_mapping[name] = payment
+
+        return [{'title': error, 'records': pmts} for error, pmts in exceptions_mapping.items()]
+
+    def export_batch_payment(self):
+        #export and save the file for each batch payment
+        self.check_access('write')
+        for record in self.sudo():
+            record = record.with_company(record.journal_id.company_id)
+            export_file_data = record._generate_export_file()
+            record.export_file = export_file_data['file']
+            record.export_filename = export_file_data['filename']
+            record.export_file_create_date = fields.Date.today()
+            record.message_post(
+                attachments=[
+                    (record.export_filename, base64.decodebytes(record.export_file)),
+                ]
+            )
+
+    def print_batch_payment(self):
+        return self.env.ref('odex30_account_batch_payment.action_print_batch_payment').report_action(self, config=False)
+
+    def _generate_export_file(self):
+        """ To be overridden by modules adding support for different export format.
+            This function returns False if no export file could be generated
+            for this batch. Otherwise, it returns a dictionary containing the following keys:
+            - file: the content of the generated export file, in base 64.
+            - filename: the name of the generated file
+            - warning: (optional) the warning message to display
+
+        """
+        self.ensure_one()
+        return False
diff --git a/dev_odex30_accounting/odex30_account_batch_payment/models/account_journal.py b/dev_odex30_accounting/odex30_account_batch_payment/models/account_journal.py
new file mode 100644
index 0000000..49afcdd
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_batch_payment/models/account_journal.py
@@ -0,0 +1,58 @@
+# -*- coding: utf-8 -*-
+
+from odoo import models, api, _
+
+
+class AccountJournal(models.Model):
+    _inherit = "account.journal"
+
+    def _default_inbound_payment_methods(self):
+        res = super()._default_inbound_payment_methods()
+        if self._is_payment_method_available('batch_payment'):
+            res |= self.env.ref('odex30_account_batch_payment.account_payment_method_batch_deposit')
+        return res
+
+    @api.model
+    def _create_batch_payment_outbound_sequence(self):
+        IrSequence = self.env['ir.sequence']
+        if IrSequence.search_count([('code', '=', 'account.outbound.batch.payment')], limit=1):
+            return
+        return IrSequence.sudo().create({
+            'name': _("Outbound Batch Payments Sequence"),
+            'padding': 4,
+            'code': 'account.outbound.batch.payment',
+            'number_next': 1,
+            'number_increment': 1,
+            'use_date_range': True,
+            'prefix': 'BATCH/OUT/%(year)s/',
+            #by default, share the sequence for all companies
+            'company_id': False,
+        })
+
+    @api.model
+    def _create_batch_payment_inbound_sequence(self):
+        IrSequence = self.env['ir.sequence']
+        if IrSequence.search_count([('code', '=', 'account.inbound.batch.payment')], limit=1):
+            return
+        return IrSequence.sudo().create({
+            'name': _("Inbound Batch Payments Sequence"),
+            'padding': 4,
+            'code': 'account.inbound.batch.payment',
+            'number_next': 1,
+            'number_increment': 1,
+            'use_date_range': True,
+            'prefix': 'BATCH/IN/%(year)s/',
+            #by default, share the sequence for all companies
+            'company_id': False,
+        })
+
+    def open_action_batch_payment(self):
+        ctx = self._context.copy()
+        ctx.update({'journal_id': self.id, 'default_journal_id': self.id})
+        return {
+            'name': _('Create Batch Payment'),
+            'type': 'ir.actions.act_window',
+            'view_mode': 'form',
+            'res_model': 'account.batch.payment',
+            'context': ctx,
+        }
diff --git a/dev_odex30_accounting/odex30_account_batch_payment/models/account_payment.py b/dev_odex30_accounting/odex30_account_batch_payment/models/account_payment.py
new file mode 100644
index 0000000..5a24563
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_batch_payment/models/account_payment.py
@@ -0,0 +1,74 @@
+# -*- coding: utf-8 -*-
+
+from odoo import models, fields, api, _
+
+
+class AccountPayment(models.Model):
+    _inherit = "account.payment"
+
+    batch_payment_id = fields.Many2one('account.batch.payment', ondelete='set null', copy=False)
+    amount_signed = fields.Monetary(
+        currency_field='currency_id', compute='_compute_amount_signed',
+        help='Negative value of amount field if payment_type is outbound')
+    payment_method_name = fields.Char(related='payment_method_line_id.name')
+
+    @api.depends('amount', 'payment_type')
+    def _compute_amount_signed(self):
+        for payment in self:
+            if payment.payment_type == 'outbound':
+                payment.amount_signed = -payment.amount
+            else:
+                payment.amount_signed = payment.amount
+
+    @api.model
+    def create_batch_payment(self):
+        # We use self[0] to create the batch; the constrains on the model ensure
+        # the consistency of the generated data (same journal, same payment method, ...)
+        batch = self.env['account.batch.payment'].create({
+            'journal_id': self[0].journal_id.id,
+            'payment_ids': [(4, payment.id, None) for payment in self],
+            'payment_method_id': self[0].payment_method_id.id,
+            'batch_type': self[0].payment_type,
+        })
+
+        return {
+            "type": "ir.actions.act_window",
+            "res_model": "account.batch.payment",
+            "views": [[False, "form"]],
+            "res_id": batch.id,
+        }
+
+    def button_open_batch_payment(self):
+        ''' Redirect the user to the batch payments containing this payment.
+        :return:    An action on account.batch.payment.
+        '''
+        self.ensure_one()
+
+        return {
+            'name': _("Batch Payment"),
+            'type': 'ir.actions.act_window',
+            'res_model': 'account.batch.payment',
+            'context': {'create': False},
+            'view_mode': 'form',
+            'res_id': self.batch_payment_id.id,
+        }
+
+    def write(self, vals):
+        old_batch_payments = {payment: payment.batch_payment_id for payment in self}
+        result = super().write(vals)
+        if 'batch_payment_id' not in vals:
+            return result
+        batch_payment_id = vals.get('batch_payment_id')
+        batch_payment = self.env['account.batch.payment'].browse(batch_payment_id) if batch_payment_id else None
+        for payment in self:
+            if batch_payment:
+                payment.message_post(
+                    body=_('Payment added in batch %s', batch_payment._get_html_link(title=batch_payment.name)),
+                    message_type='comment',
+                )
+            elif old_batch_payments.get(payment):
+                payment.message_post(
+                    body=_('Payment removed from batch %s', old_batch_payments[payment]._get_html_link(title=old_batch_payments[payment].name)),
+                    message_type='comment',
+                )
+        return result
diff --git a/dev_odex30_accounting/odex30_account_batch_payment/models/account_payment_method.py b/dev_odex30_accounting/odex30_account_batch_payment/models/account_payment_method.py
new file mode 100644
index 0000000..9ea5a88
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_batch_payment/models/account_payment_method.py
@@ -0,0 +1,13 @@
+# -*- coding: utf-8 -*-
+
+from odoo import api, models
+
+
+class AccountPaymentMethod(models.Model):
+    _inherit = 'account.payment.method'
+
+    @api.model
+    def _get_payment_method_information(self):
+        res = super()._get_payment_method_information()
+        res['batch_payment'] = {'mode': 'multi', 'type': ('bank',)}
+        return res
diff --git a/dev_odex30_accounting/odex30_account_batch_payment/models/sepa_mapping.py b/dev_odex30_accounting/odex30_account_batch_payment/models/sepa_mapping.py
new file mode 100644
index 0000000..a49d3c5
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_batch_payment/models/sepa_mapping.py
@@ -0,0 +1,175 @@
+import re
+from xml.sax.saxutils import escape
+
+
+def sanitize_communication(communication, size=140):
+    """ Returns a sanitized version of the communication given in parameter,
+        so that:
+            - it contains only latin characters
+            - it does not contain any //
+            - it does not start or end with /
+            - it is maximum 140 characters long
+        (these are the SEPA compliance criteria)
+    """
+    # This function must be called before replacing the '/', as the
+    # character replacement could result in a non-compliant string.
+    communication = _replace_characters_SEPA(communication, size)
+    while '//' in communication:
+        communication = communication.replace('//', '/')
+    if communication.startswith('/'):
+        communication = communication[1:]
+    if communication.endswith('/'):
+        communication = communication[:-1]
+    return communication
+
+
+def _replace_characters_SEPA(string, size=None):
+    """
+    Replace non-latin characters according to the official SEPA mapping.
+    See https://www.europeanpaymentscouncil.eu/document-library/guidance-documents/sepa-requirements-extended-character-set-unicode-subset-best
+    """
+    string_array = [character for character in string]
+    for match in re.finditer('[^-A-Za-z0-9/?:().,\'&<>+ ]', string):
+        match_index = match.start()
+        string_array[match_index] = sepa_mapping.get(string_array[match_index], '')
+    string = ''.join(string_array)
+
+    if size:
+        string = string[:size]
+        i = 0
+        while len(escape(string)) > size:
+            i += 1
+            string = string[:size - i]
+
+    return string
+
+sepa_mapping = {
+    "\u0021": "\u002E", "\u0023": "\u002E", "\u0024": "\u002E", "\u0025": "\u002E", "\u002A": "\u002E", "\u003B": "\u002C", "\u003C": "\u002E", "\u003D": "\u002E",
+    "\u003E": "\u002E", "\u0040": "\u002E", "\u005B": "\u0028", "\u005C": "\u002F", "\u005D": "\u0029", "\u005E": "\u002E", "\u005F": "\u002D", "\u0060": "\u0027",
+    "\u007B": "\u0028", "\u007C": "\u002F", "\u007D": "\u0029", "\u007E": "\u002D", "\u007F": "\u002E", "\u0080": "\u002E", "\u0081": "\u002E", "\u0082": "\u002E",
+    "\u0083": "\u002E", "\u0084": "\u002E", "\u0085": "\u002E", "\u0086": "\u002E", "\u0087": "\u002E", "\u0088": "\u002E", "\u0089": "\u002E", "\u008A": "\u002E",
+    "\u008B": "\u002E", "\u008C": "\u002E", "\u008D": "\u002E", "\u008E": "\u002E", "\u008F": "\u002E", "\u0090": "\u002E", "\u0091": "\u002E", "\u0092": "\u002E",
+    "\u0093": "\u002E", "\u0094": "\u002E", "\u0095": "\u002E", "\u0096": "\u002E", "\u0097": "\u002E", "\u0098": "\u002E", "\u0099": "\u002E", "\u009A": "\u002E",
+    "\u009B": "\u002E", "\u009C": "\u002E", "\u009D": "\u002E", "\u009E": "\u002E", "\u009F": "\u002E", "\u00A0": "\u0020", "\u00A1": "\u002E", "\u00A2": "\u002E",
+    "\u00A3": "\u002E", "\u00A4": "\u002E", "\u00A5": "\u002E", "\u00A6": "\u002E", "\u00A7": "\u002E", "\u045E": "\u002E", "\u045F": "\u002E", "\u20AC": "\u0045",
+    "\u00A8": "\u002E", "\u00A9": "\u002E", "\u00AA": "\u002E", "\u00AB": "\u002E", "\u00AC": "\u002E", "\u00AD": "\u002E", "\u00AE": "\u002E", "\u00AF": "\u002E",
+    "\u00B0": "\u002E", "\u00B1": "\u002E", "\u00B2": "\u002E", "\u00B3": "\u002E", "\u00B4": "\u002E", "\u00B5": "\u002E", "\u00B6": "\u002E", "\u00B7": "\u002E",
+    "\u00B8": "\u002E", "\u00B9": "\u002E", "\u00BA": "\u002E", "\u00BB": "\u002E", "\u00BC": "\u002E", "\u00BD": "\u002E", "\u00BE": "\u002E", "\u00BF": "\u003F",
+    "\u00C0": "\u0041", "\u00C1": "\u0041", "\u00C2": "\u0041", "\u00C3": "\u0041", "\u00C4": "\u0041", "\u00C5": "\u0041", "\u00C6": "\u0041", "\u00C7": "\u0043",
+    "\u00C8": "\u0045", "\u00C9": "\u0045", "\u00CA": "\u0045", "\u00CB": "\u0045", "\u00CC": "\u0049", "\u00CD": "\u0049", "\u00CE": "\u0049", "\u00CF": "\u0049",
+    "\u00D0": "\u002E", "\u00D1": "\u004E", "\u00D2": "\u004F", "\u00D3": "\u004F", "\u00D4": "\u004F", "\u00D5": "\u004F", "\u00D6": "\u004F", "\u00D7": "\u002E",
+    "\u00D8": "\u004F", "\u00D9": "\u0055", "\u00DA": "\u0055", "\u00DB": "\u0055", "\u00DC": "\u0055", "\u00DD": "\u0059", "\u00DE": "\u0054\u0048", "\u00DF": "\u0073",
+    "\u00E0": "\u0061", "\u00E1": "\u0061", "\u00E2": "\u0061", "\u00E3": "\u0061", "\u00E4": "\u0061", "\u00E5": "\u0061", "\u00E6": "\u0061", "\u00E7": "\u0063",
+    "\u00E8": "\u0065", "\u00E9": "\u0065", "\u00EA": "\u0065", "\u00EB": "\u0065", "\u00EC": "\u0069", "\u00ED": "\u0069", "\u00EE": "\u0069", "\u00EF": "\u0069",
+    "\u00F0": "\u002E", "\u00F1": "\u006E", "\u00F2": "\u006F", "\u00F3": "\u006F", "\u00F4": "\u006F", "\u00F5": "\u006F", "\u00F6": "\u006F", "\u00F7": "\u002E",
+    "\u00F8": "\u006F", "\u00F9": "\u0075", "\u00FA": "\u0075", "\u00FB": "\u0075", "\u00FC": "\u0075", "\u00FD": "\u0079", "\u00FE": "\u0074", "\u00FF": "\u0079",
+    "\u0100": "\u0041", "\u0101": "\u0061", "\u0102": "\u0041", "\u0103": "\u0061", "\u0104": "\u0041", "\u0105": "\u0061", "\u0106": "\u0043", "\u0107": "\u0063",
+    "\u0108": "\u0043", "\u0109": "\u0063", "\u010A": "\u0043", "\u010B": "\u0063", "\u010C": "\u0043", "\u010D": "\u0063", "\u010E": "\u0044", "\u010F": "\u0064",
+    "\u0110": "\u0044", "\u0111": "\u0064", "\u0112": "\u0045", "\u0113": "\u0065", "\u0114": "\u0045", "\u0115": "\u0065", "\u0116": "\u0045", "\u0117": "\u0065",
+    "\u0118": "\u0045", "\u0119": "\u0065", "\u011A": "\u0045", "\u011B": "\u0065", "\u011C": "\u0047", "\u011D": "\u0067", "\u011E": "\u0047", "\u011F": "\u0067",
+    "\u0120": "\u0047", "\u0121": "\u0067", "\u0122": "\u0047", "\u0123": "\u0067", "\u0124": "\u0048", "\u0125": "\u0069", "\u0126": "\u0048", "\u0127": "\u0069",
+    "\u0128": "\u0049", "\u0129": "\u0069", "\u012A": "\u0049", "\u012B": "\u0069", "\u012C": "\u0049", "\u012D": "\u0069", "\u012E": "\u0049", "\u012F": "\u0069",
+    "\u0130": "\u0049", "\u0131": "\u0069", "\u0132": "\u0049", "\u0133": "\u0069", "\u0134": "\u004A", "\u0135": "\u006A", "\u0136": "\u004B", "\u0137": "\u006B",
+    "\u0138": "\u002E", "\u0139": "\u004C", "\u013A": "\u006C", "\u013B": "\u004C", "\u013C": "\u006C", "\u013D": "\u004C", "\u013E": "\u006C", "\u013F": "\u004C",
+    "\u0140": "\u006C", "\u0141": "\u004C", "\u0142": "\u006C", "\u0143": "\u004E", "\u0144": "\u006E", "\u0145": "\u004E", "\u0146": "\u006E", "\u0147": "\u004E",
+    "\u0148": "\u006E", "\u0149": "\u002E", "\u014A": "\u002E", "\u014B": "\u002E", "\u014C": "\u002E", "\u014D": "\u002E", "\u014E": "\u002E", "\u014F": "\u002E",
+    "\u0150": "\u004F", "\u0151": "\u006F", "\u0152": "\u004F", "\u0153": "\u006F", "\u0154": "\u0052", "\u0155": "\u0072", "\u0156": "\u0052", "\u0157": "\u0072",
+    "\u0158": "\u0052", "\u0159": "\u0072", "\u015A": "\u0053", "\u015B": "\u0073", "\u015C": "\u0053", "\u015D": "\u0073", "\u015E": "\u0053", "\u015F": "\u0073",
+    "\u0160": "\u0053", "\u0161": "\u0073", "\u0162": "\u0054", "\u0163": "\u0074", "\u0164": "\u0054", "\u0165": "\u0074", "\u0166": "\u0054", "\u0167": "\u0074",
+    "\u0168": "\u0055", "\u0169": "\u0075", "\u016A": "\u0055", "\u016B": "\u0075", "\u016C": "\u0055", "\u016D": "\u0075", "\u016E": "\u0055", "\u016F": "\u0075",
+    "\u0170": "\u0055", "\u0171": "\u0075", "\u0172": "\u0055", "\u0173": "\u0075", "\u0174": "\u0057", "\u0175": "\u0077", "\u0176": "\u0059", "\u0177": "\u0079",
+    "\u0178": "\u0059", "\u0179": "\u005A", "\u017A": "\u007A", "\u017B": "\u005A", "\u017C": "\u007A", "\u017D": "\u005A", "\u017E": "\u007A", "\u017F": "\u002E",
+    "\u0180": "\u002E", "\u0181": "\u002E", "\u0182": "\u002E", "\u0183": "\u002E", "\u0184": "\u002E", "\u0185": "\u002E", "\u0186": "\u002E", "\u0187": "\u002E",
+    "\u0188": "\u002E", "\u0189": "\u002E", "\u018A": "\u002E", "\u018B": "\u002E", "\u018C": "\u002E", "\u018D": "\u002E", "\u018E": "\u002E", "\u018F": "\u002E",
+    "\u0190": "\u002E", "\u0191": "\u002E", "\u0192": "\u002E", "\u0193": "\u002E", "\u0194": "\u002E", "\u0195": "\u002E", "\u0196": "\u002E", "\u0197": "\u002E",
+    "\u0198": "\u002E", "\u0199": "\u002E", "\u019A": "\u002E", "\u019B": "\u002E", "\u019C": "\u002E", "\u019D": "\u002E", "\u019E": "\u002E", "\u019F": "\u002E",
+    "\u01A0": "\u002E", "\u01A1": "\u002E", "\u01A2": "\u002E", "\u01A3": "\u002E", "\u01A4": "\u002E", "\u01A5": "\u002E", "\u01A6": "\u002E", "\u01A7": "\u002E",
+    "\u01A8": "\u002E", "\u01A9": "\u002E", "\u01AA": "\u002E", "\u01AB": "\u002E", "\u01AC": "\u002E", "\u01AD": "\u002E", "\u01AE": "\u002E", "\u01AF": "\u002E",
+    "\u01B0": "\u002E", "\u01B1": "\u002E", "\u01B2": "\u002E", "\u01B3": "\u002E", "\u01B4": "\u002E", "\u01B5": "\u002E", "\u01B6": "\u002E", "\u01B7": "\u002E",
+    "\u01B8": "\u002E", "\u01B9": "\u002E", "\u01BA": "\u002E", "\u01BB": "\u002E", "\u01BC": "\u002E", "\u01BD": "\u002E", "\u01BE": "\u002E", "\u01BF": "\u002E",
+    "\u01C0": "\u002E", "\u01C1": "\u002E", "\u01C2": "\u002E", "\u01C3": "\u002E", "\u01C4": "\u002E", "\u01C5": "\u002E", "\u01C6": "\u002E", "\u01C7": "\u002E",
+    "\u01C8": "\u002E", "\u01C9": "\u002E", "\u01CA": "\u002E", "\u01CB": "\u002E", "\u01CC": "\u002E", "\u01CD": "\u002E", "\u01CE": "\u002E", "\u01CF": "\u002E",
+    "\u01D0": "\u002E", "\u01D1": "\u002E", "\u01D2": "\u002E", "\u01D3": "\u002E", "\u01D4": "\u002E", "\u01D5": "\u002E", "\u01D6": "\u002E", "\u01D7": "\u002E",
+    "\u01D8": "\u002E", "\u01D9": "\u002E", "\u01DA": "\u002E", "\u01DB": "\u002E", "\u01DC": "\u002E", "\u01DD": "\u002E", "\u01DE": "\u002E", "\u01DF": "\u002E",
+    "\u01E0": "\u002E", "\u01E1": "\u002E", "\u01E2": "\u002E", "\u01E3": "\u002E", "\u01E4": "\u002E", "\u01E5": "\u002E", "\u01E6": "\u002E", "\u01E7": "\u002E",
+    "\u01E8": "\u002E", "\u01E9": "\u002E", "\u01EA": "\u002E", "\u01EB": "\u002E", "\u01EC": "\u002E", "\u01ED": "\u002E", "\u01EE": "\u002E", "\u01EF": "\u002E",
+    "\u01F0": "\u002E", "\u01F1": "\u002E", "\u01F2": "\u002E", "\u01F3": "\u002E", "\u01F4": "\u002E", "\u01F5": "\u002E", "\u01F6": "\u002E", "\u01F7": "\u002E",
+    "\u01F8": "\u002E", "\u01F9": "\u002E", "\u01FA": "\u002E", "\u01FB": "\u002E", "\u01FC": "\u002E", "\u01FD": "\u002E", "\u01FE": "\u002E", "\u01FF": "\u002E",
+    "\u0200": "\u002E", "\u0201": "\u002E", "\u0202": "\u002E", "\u0203": "\u002E", "\u0204": "\u002E", "\u0205": "\u002E", "\u0206": "\u002E", "\u0207": "\u002E",
+    "\u0208": "\u002E", "\u0209": "\u002E", "\u020A": "\u002E", "\u020B": "\u002E", "\u020C": "\u002E", "\u020D": "\u002E", "\u020E": "\u002E", "\u020F": "\u002E",
+    "\u0210": "\u002E", "\u0211": "\u002E", "\u0212": "\u002E", "\u0213": "\u002E", "\u0214": "\u002E", "\u0215": "\u002E", "\u0216": "\u002E", "\u0217": "\u002E",
+    "\u0218": "\u0053", "\u0219": "\u0073", "\u021A": "\u0054", "\u021B": "\u0074", "\u021C": "\u002E", "\u021D": "\u002E", "\u021E": "\u002E", "\u021F": "\u002E",
+    "\u0220": "\u002E", "\u0221": "\u002E", "\u0222": "\u002E", "\u0223": "\u002E", "\u0224": "\u002E", "\u0225": "\u002E", "\u0226": "\u002E", "\u0227": "\u002E",
+    "\u0228": "\u002E", "\u0229": "\u002E", "\u022A": "\u002E", "\u022B": "\u002E", "\u022C": "\u002E", "\u022D": "\u002E", "\u022E": "\u002E", "\u022F": "\u002E",
+    "\u0230": "\u002E", "\u0231": "\u002E", "\u0232": "\u002E", "\u0233": "\u002E", "\u0234": "\u002E", "\u0235": "\u002E", "\u0236": "\u002E", "\u0237": "\u002E",
+    "\u0238": "\u002E", "\u0239": "\u002E", "\u023A": "\u002E", "\u023B": "\u002E", "\u023C": "\u002E", "\u023D": "\u002E", "\u023E": "\u002E", "\u023F": "\u002E",
+    "\u0240": "\u002E", "\u0241": "\u002E", "\u0242": "\u002E", "\u0243": "\u002E", "\u0244": "\u002E", "\u0245": "\u002E", "\u0246": "\u002E", "\u0247": "\u002E",
+    "\u0248": "\u002E", "\u0249": "\u002E", "\u024A": "\u002E", "\u024B": "\u002E", "\u024C": "\u002E", "\u024D": "\u002E", "\u024E": "\u002E", "\u024F": "\u002E",
+    "\u0250": "\u002E", "\u0251": "\u002E", "\u0252": "\u002E", "\u0253": "\u002E", "\u0254": "\u002E", "\u0255": "\u002E", "\u0256": "\u002E", "\u0257": "\u002E",
+    "\u0258": "\u002E", "\u0259": "\u002E", "\u025A": "\u002E", "\u025B": "\u002E", "\u025C": "\u002E", "\u025D": "\u002E", "\u025E": "\u002E", "\u025F": "\u002E",
+    "\u0260": "\u002E", "\u0261": "\u002E", "\u0262": "\u002E", "\u0263": "\u002E", "\u0264": "\u002E", "\u0265": "\u002E", "\u0266": "\u002E", "\u0267": "\u002E",
+    "\u0268": "\u002E", "\u0269": "\u002E", "\u026A": "\u002E", "\u026B": "\u002E", "\u026C": "\u002E", "\u026D": "\u002E", "\u026E": "\u002E", "\u026F": "\u002E",
+    "\u0270": "\u002E", "\u0271": "\u002E", "\u0272": "\u002E", "\u0273": "\u002E", "\u0274": "\u002E", "\u0275": "\u002E", "\u0276": "\u002E", "\u0277": "\u002E",
+    "\u0278": "\u002E", "\u0279": "\u002E", "\u027A": "\u002E", "\u027B": "\u002E", "\u027C": "\u002E", "\u027D": "\u002E", "\u027E": "\u002E", "\u027F": "\u002E",
+    "\u0280": "\u002E", "\u0281": "\u002E", "\u0282": "\u002E", "\u0283": "\u002E", "\u0284": "\u002E", "\u0285": "\u002E", "\u0286": "\u002E", "\u0287": "\u002E",
+    "\u0288": "\u002E", "\u0289": "\u002E", "\u028A": "\u002E", "\u028B": "\u002E", "\u028C": "\u002E", "\u028D": "\u002E", "\u028E": "\u002E", "\u028F": "\u002E",
+    "\u0290": "\u002E", "\u0291": "\u002E", "\u0292": "\u002E", "\u0293": "\u002E", "\u0294": "\u002E", "\u0295": "\u002E", "\u0296": "\u002E", "\u0297": "\u002E",
+    "\u0298": "\u002E", "\u0299": "\u002E", "\u029A": "\u002E", "\u029B": "\u002E", "\u029C": "\u002E", "\u029D": "\u002E", "\u029E": "\u002E", "\u029F": "\u002E",
+    "\u02A0": "\u002E", "\u02A1": "\u002E", "\u02A2": "\u002E", "\u02A3": "\u002E", "\u02A4": "\u002E", "\u02A5": "\u002E", "\u02A6": "\u002E", "\u02A7": "\u002E",
+    "\u02A8": "\u002E", "\u02A9": "\u002E", "\u02AA": "\u002E", "\u02AB": "\u002E", "\u02AC": "\u002E", "\u02AD": "\u002E", "\u02AE": "\u002E", "\u02AF": "\u002E",
+    "\u02B0": "\u002E", "\u02B1": "\u002E", "\u02B2": "\u002E", "\u02B3": "\u002E", "\u02B4": "\u002E", "\u02B5": "\u002E", "\u02B6": "\u002E", "\u02B7": "\u002E",
+    "\u02B8": "\u002E", "\u02B9": "\u002E", "\u02BA": "\u002E", "\u02BB": "\u002E", "\u02BC": "\u002E", "\u02BD": "\u002E", "\u02BE": "\u002E", "\u02BF": "\u002E",
+    "\u02C0": "\u002E", "\u02C1": "\u002E", "\u02C2": "\u002E", "\u02C3": "\u002E", "\u02C4": "\u002E", "\u02C5": "\u002E", "\u02C6": "\u002E", "\u02C7": "\u002E",
+    "\u02C8": "\u002E", "\u02C9": "\u002E", "\u02CA": "\u002E", "\u02CB": "\u002E", "\u02CC": "\u002E", "\u02CD": "\u002E", "\u02CE": "\u002E", "\u02CF": "\u002E",
+    "\u02D0": "\u002E", "\u02D1": "\u002E", "\u02D2": "\u002E", "\u02D3": "\u002E", "\u02D4": "\u002E", "\u02D5": "\u002E", "\u02D6": "\u002E", "\u02D7": "\u002E",
+    "\u02D8": "\u002E", "\u02D9": "\u002E", "\u02DA": "\u002E", "\u02DB": "\u002E", "\u02DC": "\u002E", "\u02DD": "\u002E", "\u02DE": "\u002E", "\u02DF": "\u002E",
+    "\u02E0": "\u002E", "\u02E1": "\u002E", "\u02E2": "\u002E", "\u02E3": "\u002E", "\u02E4": "\u002E", "\u02E5": "\u002E", "\u02E6": "\u002E", "\u02E7": "\u002E",
+    "\u02E8": "\u002E", "\u02E9": "\u002E", "\u02EA": "\u002E", "\u02EB": "\u002E", "\u02EC": "\u002E", "\u02ED": "\u002E", "\u02EE": "\u002E", "\u02EF": "\u002E",
+    "\u02F0": "\u002E", "\u02F1": "\u002E", "\u02F2": "\u002E", "\u02F3": "\u002E", "\u02F4": "\u002E", "\u02F5": "\u002E", "\u02F6": "\u002E", "\u02F7": "\u002E",
+    "\u02F8": "\u002E", "\u02F9": "\u002E", "\u02FA": "\u002E", "\u02FB": "\u002E", "\u02FC": "\u002E", "\u02FD": "\u002E", "\u02FE": "\u002E", "\u02FF": "\u002E",
+    "\u0300": "\u002E", "\u0301": "\u002E", "\u0302": "\u002E", "\u0303": "\u002E", "\u0304": "\u002E", "\u0305": "\u002E", "\u0306": "\u002E", "\u0307": "\u002E",
+    "\u0308": "\u002E", "\u0309": "\u002E", "\u030A": "\u002E", "\u030B": "\u002E", "\u030C": "\u002E", "\u030D": "\u002E", "\u030E": "\u002E", "\u030F": "\u002E",
+    "\u0310": "\u002E", "\u0311": "\u002E", "\u0312": "\u002E", "\u0313": "\u002E", "\u0314": "\u002E", "\u0315": "\u002E", "\u0316": "\u002E", "\u0317": "\u002E",
+    "\u0318": "\u002E", "\u0319": "\u002E", "\u031A": "\u002E", "\u031B": "\u002E", "\u031C": "\u002E", "\u031D": "\u002E", "\u031E": "\u002E", "\u031F": "\u002E",
+    "\u0320": "\u002E", "\u0321": "\u002E", "\u0322": "\u002E", "\u0323": "\u002E", "\u0324": "\u002E", "\u0325": "\u002E", "\u0326": "\u002E", "\u0327": "\u002E",
+    "\u0328": "\u002E", "\u0329": "\u002E", "\u032A": "\u002E", "\u032B": "\u002E", "\u032C": "\u002E", "\u032D": "\u002E", "\u032E": "\u002E", "\u032F": "\u002E",
+    "\u0330": "\u002E", "\u0331": "\u002E", "\u0332": "\u002E", "\u0333": "\u002E", "\u0334": "\u002E", "\u0335": "\u002E", "\u0336": "\u002E", "\u0337": "\u002E",
+    "\u0338": "\u002E", "\u0339": "\u002E", "\u033A": "\u002E", "\u033B": "\u002E", "\u033C": "\u002E", "\u033D": "\u002E", "\u033E": "\u002E", "\u033F": "\u002E",
+    "\u0340": "\u002E", "\u0341": "\u002E", "\u0342": "\u002E", "\u0343": "\u002E", "\u0344": "\u002E", "\u0345": "\u002E", "\u0346": "\u002E", "\u0347": "\u002E",
+    "\u0348": "\u002E", "\u0349": "\u002E", "\u034A": "\u002E", "\u034B": "\u002E", "\u034C": "\u002E", "\u034D": "\u002E", "\u034E": "\u002E", "\u034F": "\u002E",
+    "\u0350": "\u002E", "\u0351": "\u002E", "\u0352": "\u002E", "\u0353": "\u002E", "\u0354": "\u002E", "\u0355": "\u002E", "\u0356": "\u002E", "\u0357": "\u002E",
+    "\u0358": "\u002E", "\u0359": "\u002E", "\u035A": "\u002E", "\u035B": "\u002E", "\u035C": "\u002E", "\u035D": "\u002E", "\u035E": "\u002E", "\u035F": "\u002E",
+    "\u0360": "\u002E", "\u0361": "\u002E", "\u0362": "\u002E", "\u0363": "\u002E", "\u0364": "\u002E", "\u0365": "\u002E", "\u0366": "\u002E", "\u0367": "\u002E",
+    "\u0368": "\u002E", "\u0369": "\u002E", "\u036A": "\u002E", "\u036B": "\u002E", "\u036C": "\u002E", "\u036D": "\u002E", "\u036E": "\u002E", "\u036F": "\u002E",
+    "\u0370": "\u002E", "\u0371": "\u002E", "\u0372": "\u002E", "\u0373": "\u002E", "\u0374": "\u002E", "\u0375": "\u002E", "\u0376": "\u002E", "\u0377": "\u002E",
+    "\u0378": "\u002E", "\u0379": "\u002E", "\u037A": "\u002E", "\u037B": "\u002E", "\u037C": "\u002E", "\u037D": "\u002E", "\u037E": "\u002E", "\u037F": "\u002E",
+    "\u0380": "\u002E", "\u0381": "\u002E", "\u0382": "\u002E", "\u0383": "\u002E", "\u0384": "\u002E", "\u0385": "\u002E", "\u0386": "\u0041", "\u0387": "\u002E",
+    "\u0388": "\u0045", "\u0389": "\u0049", "\u038A": "\u0049", "\u038B": "\u002E", "\u038C": "\u004F", "\u038D": "\u002E", "\u038E": "\u0059", "\u038F": "\u004F",
+    "\u0390": "\u0069", "\u0391": "\u0041", "\u0392": "\u0056", "\u0393": "\u0047", "\u0394": "\u0044", "\u0395": "\u0045", "\u0396": "\u005A", "\u0397": "\u0049",
+    "\u0398": "\u0054\u0048", "\u0399": "\u0049", "\u039A": "\u004B", "\u039B": "\u004C", "\u039C": "\u004D", "\u039D": "\u004E", "\u039E": "\u0058", "\u039F": "\u004F",
+    "\u03A0": "\u0050", "\u03A1": "\u0052", "\u03A2": "\u002E", "\u03A3": "\u0053", "\u03A4": "\u0054", "\u03A5": "\u0059", "\u03A6": "\u0046", "\u03A7": "\u0043\u0048",
+    "\u03A8": "\u0050\u0053", "\u03A9": "\u004F", "\u03AA": "\u0049", "\u03AB": "\u0059", "\u03AC": "\u0061", "\u03AD": "\u0065", "\u03AE": "\u0069", "\u03AF": "\u0069",
+    "\u03B0": "\u0079", "\u03B1": "\u0061", "\u03B2": "\u0076", "\u03B3": "\u0067", "\u03B4": "\u0064", "\u03B5": "\u0065", "\u03B6": "\u007A", "\u03B7": "\u0069",
+    "\u03B8": "\u0074\u0068", "\u03B9": "\u0069", "\u03BA": "\u006B", "\u03BB": "\u006C", "\u03BC": "\u006D", "\u03BD": "\u006E", "\u03BE": "\u0078", "\u03BF": "\u006F",
+    "\u03C0": "\u0070", "\u03C1": "\u0072", "\u03C2": "\u0073", "\u03C3": "\u0073", "\u03C4": "\u0074", "\u03C5": "\u0079", "\u03C6": "\u0066", "\u03C7": "\u0063\u0068",
+    "\u03C8": "\u0070\u0073", "\u03C9": "\u006F", "\u03CA": "\u0069", "\u03CB": "\u0079", "\u03CC": "\u006F", "\u03CD": "\u0079", "\u03CE": "\u006F", "\u03CF": "\u002E",
+    "\u03D0": "\u002E", "\u03D1": "\u002E", "\u03D2": "\u002E", "\u03D3": "\u002E", "\u03D4": "\u002E", "\u03D5": "\u002E", "\u03D6": "\u002E", "\u03D7": "\u002E",
+    "\u03D8": "\u002E", "\u03D9": "\u002E", "\u03DA": "\u002E", "\u03DB": "\u002E", "\u03DC": "\u002E", "\u03DD": "\u002E", "\u03DE": "\u002E", "\u03DF": "\u002E",
+    "\u03E0": "\u002E", "\u03E1": "\u002E", "\u03E2": "\u002E", "\u03E3": "\u002E", "\u03E4": "\u002E", "\u03E5": "\u002E", "\u03E6": "\u002E", "\u03E7": "\u002E",
+    "\u03E8": "\u002E", "\u03E9": "\u002E", "\u03EA": "\u002E", "\u03EB": "\u002E", "\u03EC": "\u002E", "\u03ED": "\u002E", "\u03EE": "\u002E", "\u03EF": "\u002E",
+    "\u03F0": "\u002E", "\u03F1": "\u002E", "\u03F2": "\u002E", "\u03F3": "\u002E", "\u03F4": "\u002E", "\u03F5": "\u002E", "\u03F6": "\u002E", "\u03F7": "\u002E",
+    "\u03F8": "\u002E", "\u03F9": "\u002E", "\u03FA": "\u002E", "\u03FB": "\u002E", "\u03FC": "\u002E", "\u03FD": "\u002E", "\u03FE": "\u002E", "\u03FF": "\u002E",
+    "\u0400": "\u002E", "\u0401": "\u002E", "\u0402": "\u002E", "\u0403": "\u002E", "\u0404": "\u002E", "\u0405": "\u002E", "\u0406": "\u002E", "\u0407": "\u002E",
+    "\u0408": "\u002E", "\u0409": "\u002E", "\u040A": "\u002E", "\u040B": "\u002E", "\u040C": "\u002E", "\u040D": "\u002E", "\u040E": "\u002E", "\u040F": "\u002E",
+    "\u0410": "\u0041", "\u0411": "\u0042", "\u0412": "\u0056", "\u0413": "\u0047", "\u0414": "\u0044", "\u0415": "\u0045", "\u0416": "\u005A\u0048", "\u0417": "\u005A",
+    "\u0418": "\u0049", "\u0419": "\u0059", "\u041A": "\u004B", "\u041B": "\u004C", "\u041C": "\u004D", "\u041D": "\u004E", "\u041E": "\u004F", "\u041F": "\u0050",
+    "\u0420": "\u0052", "\u0421": "\u0053", "\u0422": "\u0054", "\u0423": "\u0055", "\u0424": "\u0046", "\u0425": "\u0048", "\u0426": "\u0054\u0053",
+    "\u0427": "\u0043\u0048", "\u0428": "\u0053\u0048", "\u0429": "\u0053\u0048\u0054", "\u042A": "\u0041", "\u042B": "\u002E", "\u042C": "\u0059", "\u042D": "\u002E",
+    "\u042E": "\u0059\u0055", "\u042F": "\u0059\u0041", "\u0430": "\u0061", "\u0431": "\u0062", "\u0432": "\u0076", "\u0433": "\u0067", "\u0434": "\u0064",
+    "\u0435": "\u0065", "\u0436": "\u007A\u0068", "\u0437": "\u007A", "\u0438": "\u0069", "\u0439": "\u0079", "\u043A": "\u006B", "\u043B": "\u006C", "\u043C": "\u006D",
+    "\u043D": "\u006E", "\u043E": "\u006F", "\u043F": "\u0070", "\u0440": "\u0072", "\u0441": "\u0073", "\u0442": "\u0074", "\u0443": "\u0075", "\u0444": "\u0066",
+    "\u0445": "\u0068", "\u0446": "\u0074\u0073", "\u0447": "\u0063\u0068", "\u0448": "\u0073\u0068", "\u0449": "\u0073\u0068\u0074", "\u044A": "\u0061",
+    "\u044B": "\u002E", "\u044C": "\u0079", "\u044D": "\u002E", "\u044E": "\u0079\u0075", "\u044F": "\u0079\u0061", "\u0450": "\u002E", "\u0451": "\u002E",
+    "\u0452": "\u002E", "\u0453": "\u002E", "\u0454": "\u002E", "\u0455": "\u002E", "\u0456": "\u002E", "\u0457": "\u002E", "\u0458": "\u002E", "\u0459": "\u002E",
+    "\u045A": "\u002E", "\u045B": "\u002E", "\u045C": "\u002E", "\u045D": "\u002E",
+}
diff --git a/dev_odex30_accounting/odex30_account_batch_payment/report/__init__.py b/dev_odex30_accounting/odex30_account_batch_payment/report/__init__.py
new file mode 100644
index 0000000..9ac3f1a
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_batch_payment/report/__init__.py
@@ -0,0 +1,3 @@
+# -*- coding: utf-8 -*-
+
+from . import account_batch_payment_report
diff --git a/dev_odex30_accounting/odex30_account_batch_payment/report/__pycache__/__init__.cpython-311.pyc b/dev_odex30_accounting/odex30_account_batch_payment/report/__pycache__/__init__.cpython-311.pyc
new file mode 100644
index 0000000..76984a8
Binary files /dev/null and b/dev_odex30_accounting/odex30_account_batch_payment/report/__pycache__/__init__.cpython-311.pyc differ
diff --git a/dev_odex30_accounting/odex30_account_batch_payment/report/__pycache__/account_batch_payment_report.cpython-311.pyc b/dev_odex30_accounting/odex30_account_batch_payment/report/__pycache__/account_batch_payment_report.cpython-311.pyc
new file mode 100644
index 0000000..5c9d28d
Binary files /dev/null and b/dev_odex30_accounting/odex30_account_batch_payment/report/__pycache__/account_batch_payment_report.cpython-311.pyc differ
diff --git a/dev_odex30_accounting/odex30_account_batch_payment/report/account_batch_payment_report.py b/dev_odex30_accounting/odex30_account_batch_payment/report/account_batch_payment_report.py
new file mode 100644
index 0000000..5a7f866
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_batch_payment/report/account_batch_payment_report.py
@@ -0,0 +1,19 @@
+# -*- coding: utf-8 -*-
+
+from odoo import api, models
+
+
+class PrintBatchPayment(models.AbstractModel):
+    _name = 'report.account_batch_payment.print_batch_payment'
+    _template = 'odex30_account_batch_payment.print_batch_payment'
+    _description = 'Batch Deposit Report'
+
+    @api.model
+    def _get_report_values(self, docids, data=None):
+        report_name = 'odex30_account_batch_payment.print_batch_payment'
+        report = self.env['ir.actions.report']._get_report_from_name(report_name)
+        return {
+            'doc_ids': docids,
+            'doc_model': report.model,
+            'docs': self.env[report.model].browse(docids),
+        }
diff --git a/dev_odex30_accounting/odex30_account_batch_payment/report/account_batch_payment_report_templates.xml b/dev_odex30_accounting/odex30_account_batch_payment/report/account_batch_payment_report_templates.xml
new file mode 100644
index 0000000..48bbccb
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_batch_payment/report/account_batch_payment_report_templates.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+<template id="print_batch_payment">
+    <t t-call="web.basic_layout">
+        <t t-foreach="docs" t-as="o">
+            <div class="page page_batch_payment">
+                <div class="oe_structure"></div>
+                <div class="row batch_details">
+                    <div class="col-6"><span t-out="o.journal_id.company_id.name">Odoo Payments LLC</span></div>
+                    <div class="col-6 text-end"><span t-out="o.journal_id.name">Bank Transfer</span> : <span t-out="o.name">Monthly Payment</span></div>
+                </div>
+                <div class="oe_structure"></div>
+                <div class="row batch_details">
+                    <div class="col-6"><span t-out="o.date">2023-08-14</span></div>
+                </div>
+                <div class="oe_structure"></div>
+                <div class="row batch_details">
+                    <div t-if="o.journal_id.bank_acc_number" class="col-6" style="font-size:18px;">Issuing bank account : <span t-out="o.journal_id.bank_acc_number">3956012345678</span></div>
+                </div>
+                <div class="oe_structure"></div>
+                <table class="table table-bordered table-sm">
+                    <thead>
+                        <tr>
+                            <th t-if="o.batch_type == 'outbound'" class="text-start">Vendor</th>
+                            <th t-if="o.batch_type == 'inbound'" class="text-start">Customer</th>
+                            <th t-if="o.batch_type == 'outbound'" class="text-start">Account Holder Name</th>
+                            <th class="text-start">Date</th>
+                            <th class="text-start">Memo</th>
+                            <th class="text-start">Recipient Bank Account</th>
+                            <th class="text-end">Amount</th>
+                        </tr>
+                    </thead>
+                    <tr t-foreach="o.payment_ids" t-as="payment">
+                        <td class="text-start"><span t-out="payment.partner_id.name">ABC Suppliers</span></td>
+                        <td t-if="o.batch_type == 'outbound'" class="text-start"><span t-out="payment.partner_bank_id.acc_holder_name"> ABC Holder Name</span></td>
+                        <td class="text-start"><span t-out="payment.date" t-options='{"widget": "date"}'>2023-08-15</span></td>
+                        <td class="text-start"><span t-out="payment.memo">Demo Ref</span></td>
+                        <td class="text-start"><span t-out="payment.partner_bank_id.acc_number">3956012345678</span></td>
+                        <td class="text-end"><span t-out="payment.amount" t-options="{'widget': 'monetary', 'display_currency': payment.currency_id}">$1000.0</span></td>
+                    </tr>
+                    <tr>
+                        <td style="font-weight: bold;">TOTAL</td>
+                        <td t-if="o.batch_type == 'outbound'"></td>
+                        <td></td>
+                        <td></td>
+                        <td></td>
+                        <td class="text-end" style="font-weight: bold;"><span t-out="o.amount" t-options="{'widget': 'monetary', 'display_currency': o.currency_id}">$1000.0</span></td>
+                    </tr>
+                </table>
+                <div class="oe_structure"></div>
+            </div>
+        </t>
+    </t>
+</template>
+</odoo>
diff --git a/dev_odex30_accounting/odex30_account_batch_payment/report/account_batch_payment_reports.xml b/dev_odex30_accounting/odex30_account_batch_payment/report/account_batch_payment_reports.xml
new file mode 100644
index 0000000..204b849
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_batch_payment/report/account_batch_payment_reports.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <record id="action_print_batch_payment" model="ir.actions.report">
+        <field name="name">Print Batch Payment</field>
+        <field name="model">account.batch.payment</field>
+        <field name="report_type">qweb-pdf</field>
+        <field name="report_name">odex30_account_batch_payment.print_batch_payment</field>
+        <field name="report_file">odex30_account_batch_payment.print_batch_payment</field>
+        <field name="paperformat_id" ref="base.paperformat_batch_deposit"/>
+        <field name="binding_model_id" ref="model_account_batch_payment"/>
+        <field name="binding_type">report</field>
+    </record>
+</odoo>
\ No newline at end of file
diff --git a/dev_odex30_accounting/odex30_account_batch_payment/security/account_batch_payment_security.xml b/dev_odex30_accounting/odex30_account_batch_payment/security/account_batch_payment_security.xml
new file mode 100644
index 0000000..2d4e997
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_batch_payment/security/account_batch_payment_security.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo noupdate="1">
+
+    <record model="ir.rule" id="account_batch_payment_comp_rule">
+        <field name="name">Account batch payment company rule</field>
+        <field name="model_id" ref="model_account_batch_payment"/>
+        <field name="domain_force">['|',('journal_id.company_id','=',False),('journal_id.company_id','parent_of', company_ids)]</field>
+    </record>
+
+</odoo>
diff --git a/dev_odex30_accounting/odex30_account_batch_payment/security/ir.model.access.csv b/dev_odex30_accounting/odex30_account_batch_payment/security/ir.model.access.csv
new file mode 100644
index 0000000..ce0d688
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_batch_payment/security/ir.model.access.csv
@@ -0,0 +1,5 @@
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_account_batch_payment_readonly,account.batch.payment,model_account_batch_payment,account.group_account_readonly,1,0,0,0
+access_account_batch_payment,account.batch.payment,model_account_batch_payment,account.group_account_invoice,1,1,1,1
+access_account_batch_error_wizard,access.account.batch.error.wizard,model_account_batch_error_wizard,account.group_account_invoice,1,1,1,0
+access_account_batch_error_wizard_line,access.account.batch.error.wizard.line,model_account_batch_error_wizard_line,account.group_account_invoice,1,1,1,0
diff --git a/dev_odex30_accounting/odex30_account_batch_payment/static/description/icon.png b/dev_odex30_accounting/odex30_account_batch_payment/static/description/icon.png
new file mode 100644
index 0000000..2ee6057
Binary files /dev/null and b/dev_odex30_accounting/odex30_account_batch_payment/static/description/icon.png differ
diff --git a/dev_odex30_accounting/odex30_account_batch_payment/static/description/icon.svg b/dev_odex30_accounting/odex30_account_batch_payment/static/description/icon.svg
new file mode 100644
index 0000000..2ea414e
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_batch_payment/static/description/icon.svg
@@ -0,0 +1 @@
+<svg width="50" height="50" viewBox="0 0 50 50" xmlns="http://www.w3.org/2000/svg"><path d="M16.404 16.596a5.955 5.955 0 1 0-9.8-2.153C1.941 22.477 3.05 32.94 9.93 39.82l.043.043 3.94-3.94-.042-.043c-4.782-4.783-5.769-11.924-2.959-17.68a5.95 5.95 0 0 0 5.492-1.605Z" fill="#F9464C"/><path d="M9.975 39.863c5.845 5.812 14.258 7.476 21.574 4.992l-4.608-4.608a15.404 15.404 0 0 1-13.026-4.325l-3.94 3.94Z" fill="#FC868B"/><path d="M38.709 31.61a5.955 5.955 0 1 0 4.165 4.027c4.745-8.035 3.678-18.554-3.203-25.473l-3.94 3.94c4.71 4.747 5.702 11.791 2.978 17.507Z" fill="#088BF5"/><path d="m17.848 5.143 4.58 4.58a15.406 15.406 0 0 1 13.304 4.382l3.94-3.94-.042-.043c-5.891-5.891-14.41-7.55-21.782-4.98Z" fill="#2EBCFA"/></svg>
diff --git a/dev_odex30_accounting/odex30_account_batch_payment/static/src/scss/report_batch_payment.scss b/dev_odex30_accounting/odex30_account_batch_payment/static/src/scss/report_batch_payment.scss
new file mode 100644
index 0000000..ba8f328
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_batch_payment/static/src/scss/report_batch_payment.scss
@@ -0,0 +1,7 @@
+.page_batch_payment {
+    page-break-after: always;
+    .batch_details {
+        margin: 0.2in 0;
+        font-size: 1.5em;
+    }
+}
diff --git a/dev_odex30_accounting/odex30_account_batch_payment/tests/__init__.py b/dev_odex30_accounting/odex30_account_batch_payment/tests/__init__.py
new file mode 100644
index 0000000..a0cf368
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_batch_payment/tests/__init__.py
@@ -0,0 +1,4 @@
+# -*- coding: utf-8 -*-
+
+from . import test_account_batch_payment
+from . import test_sepa_mapping
diff --git a/dev_odex30_accounting/odex30_account_batch_payment/tests/test_account_batch_payment.py b/dev_odex30_accounting/odex30_account_batch_payment/tests/test_account_batch_payment.py
new file mode 100644
index 0000000..e534525
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_batch_payment/tests/test_account_batch_payment.py
@@ -0,0 +1,464 @@
+# -*- coding: utf-8 -*-
+from odoo import Command
+from odoo.addons.account.tests.common import AccountTestInvoicingCommon
+from odoo.tests import tagged
+from odoo.exceptions import RedirectWarning, ValidationError
+
+@tagged('post_install', '-at_install')
+class TestAccountBatchPayment(AccountTestInvoicingCommon):
+
+    @classmethod
+    def setUpClass(cls):
+        super().setUpClass()
+        cls.env.user.groups_id |= cls.env.ref('account.group_validate_bank_account')
+        cls.other_currency = cls.setup_other_currency('EUR')
+        cls.other_currency_2 = cls.setup_other_currency('CHF')
+
+        cls.payment_debit_account_id = cls.copy_account(cls.inbound_payment_method_line.payment_account_id)
+        cls.payment_credit_account_id = cls.copy_account(cls.outbound_payment_method_line.payment_account_id)
+
+        cls.partner_bank_account = cls.env['res.partner.bank'].create({
+            'acc_number': 'BE32707171912447',
+            'partner_id': cls.partner_a.id,
+            'allow_out_payment': True,
+            'acc_type': 'bank',
+        })
+
+    def _create_multi_company_payments_and_context(self, companies_dict, add_company_context=None):
+        payments = self.env['account.payment']
+        companies_context = self.env['res.company']
+        field_record = self.env['ir.model.fields']._get('res.partner', 'property_account_receivable_id')
+        property_account_receivable = self.env['ir.default'].search(
+            [('field_id', '=', field_record.id), ('company_id', '=', self.company_data['company'].id)], limit=1
+        )
+
+        for company, create_property_account_receivable in companies_dict.items():
+            if create_property_account_receivable:
+                # needed for computation of payment.destination_account_id
+                property_account_receivable.copy({'company_id': company.id})
+            payment = self.env['account.payment'].with_company(company).create({
+                'amount': 100.0,
+                'payment_type': 'inbound',
+                'partner_type': 'customer',
+                'partner_id': self.partner_a.id,
+            })
+            payment.action_post()
+            payments += payment
+            companies_context += company
+
+        if add_company_context:
+            companies_context += add_company_context
+
+        context = {
+            **self.env.context,
+            'allowed_company_ids': companies_context.ids,
+            'active_ids': payments.ids,
+            'active_model': 'account.payment',
+        }
+
+        return payments, context
+
+    def test_create_batch_payment_from_payment(self):
+        payments = self.env['account.payment']
+        for dummy in range(2):
+            payments += self.env['account.payment'].create({
+                'amount': 100.0,
+                'payment_type': 'outbound',
+                'partner_type': 'supplier',
+                'partner_id': self.partner_a.id,
+                'destination_account_id': self.partner_a.property_account_payable_id.id,
+                'currency_id': self.other_currency.id,
+                'partner_bank_id': self.partner_bank_account.id,
+            })
+
+        payments.action_post()
+        batch_payment_action = payments.create_batch_payment()
+        batch_payment_id = self.env['account.batch.payment'].browse(batch_payment_action.get('res_id'))
+        self.assertEqual(len(batch_payment_id.payment_ids), 2)
+
+    def test_change_payment_state(self):
+        """
+        Check if the amount is well computed when we change a payment state
+        """
+        payments = self.env['account.payment']
+        for _ in range(2):
+            payments += self.env['account.payment'].create({
+                'amount': 100.0,
+                'payment_type': 'inbound',
+                'partner_type': 'supplier',
+                'partner_id': self.partner_a.id,
+                'destination_account_id': self.partner_a.property_account_payable_id.id,
+                'partner_bank_id': self.partner_bank_account.id,
+            })
+        payments.action_post()
+
+        batch_payment = self.env['account.batch.payment'].create(
+            {
+                'journal_id': payments.journal_id.id,
+                'payment_method_id': payments.payment_method_id.id,
+                'payment_ids': [
+                    (6, 0, payments.ids)
+                ],
+            }
+        )
+
+        self.assertRecordValues(batch_payment, [{
+            'amount': 200.0,
+            'amount_residual': 200.0,
+            'amount_residual_currency': 200.0,
+        }])
+
+        payments[0].move_id.button_draft()
+
+        # Check that we still keep it
+        self.assertRecordValues(batch_payment, [{
+            'amount': 200.0,
+            'amount_residual': 200.0,
+            'amount_residual_currency': 200.0,
+        }])
+
+    def test_change_payment_state_valid(self):
+        """
+        Check if the amount is well computed when we change a payment state into a non valid payment status
+        """
+        if self.env['account.move']._get_invoice_in_payment_state() != 'in_payment':
+            self.skipTest('Accounting not installed')
+        payments = self.env['account.payment']
+        bank_journal_2 = self.company_data['default_journal_bank'].copy()
+        for _ in range(2):
+            payments += self.env['account.payment'].create({
+                'amount': 100.0,
+                'payment_type': 'inbound',
+                'partner_type': 'supplier',
+                'partner_id': self.partner_a.id,
+                'journal_id': bank_journal_2.id,
+            })
+        payments.action_post()
+
+        batch_payment = self.env['account.batch.payment'].create(
+            {
+                'journal_id': payments.journal_id.id,
+                'payment_method_id': payments.payment_method_id.id,
+                'payment_ids': [
+                    (6, 0, payments.ids)
+                ],
+            }
+        )
+
+        self.assertRecordValues(batch_payment, [{
+            'amount': 200.0,
+            'amount_residual': 200.0,
+            'amount_residual_currency': 200.0,
+        }])
+
+        # Change move state to 'paid', if accounting is installed it won't be a valid payment state for batches
+        payments[0].action_validate()
+
+        self.assertRecordValues(batch_payment, [{
+            'amount': 200.0,
+            'amount_residual': 100.0,
+            'amount_residual_currency': 100.0,
+        }])
+
+    def test_validate_batch(self):
+        """
+        Check that we can only validate a batch if all the payments are in progress
+        """
+        payments = self.env['account.payment']
+        for _ in range(2):
+            payments += self.env['account.payment'].create({
+                'amount': 100.0,
+                'payment_type': 'inbound',
+                'partner_type': 'supplier',
+                'partner_id': self.partner_a.id,
+                'destination_account_id': self.partner_a.property_account_payable_id.id,
+                'partner_bank_id': self.partner_bank_account.id,
+            })
+        payments.action_post()
+
+        batch_payment = self.env['account.batch.payment'].create(
+            {
+                'journal_id': payments.journal_id.id,
+                'payment_method_id': payments.payment_method_id.id,
+                'payment_ids': [Command.set(payments.ids)]
+            }
+        )
+        payments[0].action_validate()
+
+        # In accounting, we can only validate a batch if all the payments are in process
+        # While in enterprise invoicing, we can validate a batch even if some payments are paid
+        is_accounting_installed = self.env['account.move']._get_invoice_in_payment_state() == 'in_payment'
+        if is_accounting_installed:
+            with self.assertRaisesRegex(RedirectWarning, "To validate the batch, payments must be in process"):
+                batch_payment.validate_batch()
+            # Set payment to in process state
+            payments[0].action_draft()
+            payments[0].action_post()
+        action = batch_payment.validate_batch()
+        self.assertFalse(action)
+
+    def test_batch_payment_sub_company(self):
+        """Test the creation of a batch payment from a sub company"""
+        self.company_data['company'].write({'child_ids': [Command.create({'name': 'Good Company'})]})
+        child_comp = self.company_data['company'].child_ids[0]
+
+        payment, context = self._create_multi_company_payments_and_context({child_comp: True})
+
+        batch = self.env['account.batch.payment'].with_context(context).create({
+            'journal_id': payment.journal_id.id,
+        })
+        self.assertTrue(batch)
+
+    def test_batch_payment_branches(self):
+        """
+        Test the creation of a batch payment with branches. When all payments are branches of
+        a common head office, a batch payment should be allowed to be created.
+        """
+        main_company = self.company_data['company']
+        main_company.vat = '123'
+        branch_1 = self.env['res.company'].create({'name': "Branch 1", 'parent_id': main_company.id})
+        branch_2 = self.env['res.company'].create({'name': "Branch 2", 'parent_id': main_company.id, 'vat': '456'})
+        branch_2_1 = self.env['res.company'].create({'name': "Branch 2 sub-branch 1", 'parent_id': branch_2.id})
+
+        payments, context = self._create_multi_company_payments_and_context({branch_1: True, branch_2: True, branch_2_1: True})
+
+        batch = self.env['account.batch.payment'].with_context(context).create({
+            'journal_id': payments[0].journal_id.id,
+            'payment_ids': payments.ids,
+        })
+        self.assertTrue(batch)
+
+    def test_batch_payment_different_companies(self):
+        """ Payments from different companies not belonging to the same head company should raise an error. """
+        main_company = self.company_data['company']
+        company_b = self.setup_other_company()['company']
+
+        payments, context = self._create_multi_company_payments_and_context({main_company: False, company_b: False}, main_company)
+
+        with self.assertRaisesRegex(ValidationError, "The journal of the batch payment and of the payments it contains must be the same."):
+            self.env['account.batch.payment'].with_context(context).create({
+                'journal_id': payments[0].journal_id.id,
+                'payment_ids': payments.ids,
+            })
+
+    def test_batch_payment_foreign_currency(self):
+        """
+        Make sure that payments in foreign currency are converted for the total amount to be displayed
+            currency rate = 1$:10€
+            amount_company_currency = 100$
+            amount_foreign_currency = 100€ -> 10$
+            => batch.amount = 110$
+        """
+        payments = self.env['account.payment']
+        company_currency = self.env.company.currency_id
+        foreign_currency = self.other_currency
+
+        self.env['res.currency.rate'].create({
+            'name': '2024-05-14',
+            'rate': 10,
+            'currency_id': foreign_currency.id,
+            'company_id': self.env.company.id,
+        })
+
+        for currency in (company_currency, foreign_currency):
+            payments += self.env['account.payment'].create({
+                'amount': 100.0,
+                'payment_type': 'inbound',
+                'partner_type': 'supplier',
+                'partner_id': self.partner_a.id,
+                'currency_id': currency.id,
+                'date': '2024-05-14',
+            })
+
+        payments.action_post()
+        batch_payment_action = payments.create_batch_payment()
+        batch_payment = self.env['account.batch.payment'].browse(batch_payment_action.get('res_id'))
+        self.assertRecordValues(batch_payment, [{
+            'amount': 110.0,
+            'amount_residual': 110.0,
+            'amount_residual_currency': 110.0,
+        }])
+
+    def test_batch_payment_move_different_currencies(self):
+        """
+        Make sure that payments linked to a move in foreign currency 1 are converted correctly when
+        the batch is in foreign currency 2
+        """
+        payments = self.env['account.payment']
+        bank_journal_2 = self.company_data['default_journal_bank'].copy({'currency_id': self.other_currency_2.id})
+
+        outstanding_payment_B = self.inbound_payment_method_line.payment_account_id.copy()
+        bank_journal_2.inbound_payment_method_line_ids.payment_account_id = outstanding_payment_B
+
+        for currency, rate in [(self.other_currency, 10), (self.other_currency_2, 20)]:
+            self.env['res.currency.rate'].create({
+                'name': '2024-05-14',
+                'rate': rate,
+                'currency_id': currency.id,
+                'company_id': self.env.company.id,
+            })
+
+        for amount in (100.0, 15.0):
+            payments += self.env['account.payment'].create({
+                'amount': amount,
+                'payment_type': 'inbound',
+                'partner_type': 'supplier',
+                'partner_id': self.partner_a.id,
+                'currency_id': self.other_currency.id,
+                'journal_id': bank_journal_2.id,
+                'date': '2024-05-14',
+            })
+
+        payments.action_post()
+        batch_payment_action = payments.create_batch_payment()
+        batch_payment = self.env['account.batch.payment'].browse(batch_payment_action.get('res_id'))
+        self.assertRecordValues(batch_payment, [{
+            'amount': 230.0,
+            'amount_residual': 11.5,
+            'amount_residual_currency': 230.0,
+        }])
+
+    def test_foreign_currency_batch_payment(self):
+        """
+        Make sure that payments in company_currency are converted when the batch is in
+        foreign currency
+        """
+        payments = self.env['account.payment']
+        foreign_currency = self.other_currency
+
+        bank_journal_2 = self.company_data['default_journal_bank'].copy()
+
+        self.env['res.currency.rate'].create({
+            'name': '2024-05-14',
+            'rate': 10,
+            'currency_id': foreign_currency.id,
+            'company_id': self.env.company.id,
+        })
+
+        for amount in (100, 15):
+            payments += self.env['account.payment'].create({
+                'amount': amount,
+                'payment_type': 'inbound',
+                'partner_type': 'supplier',
+                'partner_id': self.partner_a.id,
+                'currency_id': self.other_currency.id,
+                'date': '2024-05-14',
+                'journal_id': bank_journal_2.id,
+            })
+
+        payments.action_post()
+        batch_payment_action = payments.create_batch_payment()
+        batch_payment = self.env['account.batch.payment'].browse(batch_payment_action.get('res_id'))
+        self.assertRecordValues(batch_payment, [{
+            'amount': 11.5,
+            'amount_residual': 11.5,
+            'amount_residual_currency': 11.5,
+        }])
+
+    def test_batch_payment_journal_foreign_currency(self):
+        """
+        Test that, if a bank journal is set in a foreign currency, the batch payment will be correctly converted
+        currency rate = 1$:10€
+        payment of 100€ -> 100☺
+        payment of 100$ -> 1000☺
+        Total -> 1100
+        """
+        payments = self.env['account.payment']
+        company_currency = self.env.company.currency_id
+        foreign_currency = self.other_currency
+
+        self.env['res.currency.rate'].create({
+            'name': '2024-05-14',
+            'rate': 10,
+            'currency_id': foreign_currency.id,
+            'company_id': self.env.company.id,
+        })
+        bank_journal_foreign = self.env['account.journal'].create({
+            'name': 'Bank2',
+            'type': 'bank',
+            'code': 'BNK2',
+            'currency_id': foreign_currency.id,
+        })
+
+        for currency in (company_currency, foreign_currency):
+            payments += self.env['account.payment'].create({
+                'amount': 100.0,
+                'payment_type': 'inbound',
+                'partner_type': 'supplier',
+                'partner_id': self.partner_a.id,
+                'currency_id': currency.id,
+                'date': '2024-05-14',
+                'journal_id': bank_journal_foreign.id
+            })
+
+        payments.action_post()
+        batch_payment_action = payments.create_batch_payment()
+        batch_payment = self.env['account.batch.payment'].browse(batch_payment_action.get('res_id'))
+        self.assertRecordValues(batch_payment, [{
+            'amount': 1100.0,
+            'amount_residual': 110.0,
+            'amount_residual_currency': 1100.0,
+        }])
+
+    def test_create_batch_from_payment_already_in_batch(self):
+        payment = self.env['account.payment'].create({
+            'amount': 100.0,
+            'payment_type': 'outbound',
+            'partner_type': 'supplier',
+            'partner_id': self.partner_a.id,
+            'destination_account_id': self.partner_a.property_account_payable_id.id,
+            'currency_id': self.other_currency.id,
+            'partner_bank_id': self.partner_bank_account.id,
+        })
+        payment.action_post()
+        batch_payment_action = payment.create_batch_payment()
+        batch_payment_id = self.env['account.batch.payment'].browse(batch_payment_action.get('res_id'))
+        batch_payment_id.validate_batch()
+        with self.assertRaises(ValidationError):
+            payment.create_batch_payment()
+
+    def test_amount_in_paid_state(self):
+        """
+            Verify that the batch payment amount is correctly computed when the payment state is 'paid'.
+        """
+        payments = self.env['account.payment']
+
+        # Create two inbound payments of 100€ each
+        for _ in range(2):
+            payments += self.env['account.payment'].create({
+                'amount': 100.0,
+                'payment_type': 'inbound',
+                'partner_type': 'supplier',
+                'partner_id': self.partner_a.id,
+                'destination_account_id': self.partner_a.property_account_payable_id.id,
+                'partner_bank_id': self.partner_bank_account.id,
+            })
+        # Post the payments to validate them
+        payments.action_post()
+
+         # Update payment states to 'paid'
+        payments.write({'state': 'paid'})
+
+        # Ensure all payments are now in the 'paid' state
+        self.assertTrue(all(payment.state == 'paid' for payment in payments), "Payments should be in 'paid' state")
+
+        # Create a batch payment including the two payments
+        batch_payment = self.env['account.batch.payment'].create(
+            {
+                'journal_id': payments.journal_id.id,
+                'payment_method_id': payments.payment_method_id.id,
+                'payment_ids': [Command.set(payments.ids)],
+            }
+        )
+
+        # Ensure the amount remains correct after recomputation
+        # When accountant is not installed, payments with paid state
+        # should be counted when recomputing amount_residual 
+        if self.env['ir.module.module']._get('accountant').state == 'installed':
+            self.assertEqual(batch_payment.amount_residual, 0)
+            self.assertEqual(batch_payment.amount_residual_currency, 0)
+        else:
+            self.assertEqual(batch_payment.amount_residual, 200)
+            self.assertEqual(batch_payment.amount_residual_currency, 200)
+        self.assertEqual(batch_payment.amount, 200)
+
diff --git a/dev_odex30_accounting/odex30_account_batch_payment/tests/test_sepa_mapping.py b/dev_odex30_accounting/odex30_account_batch_payment/tests/test_sepa_mapping.py
new file mode 100644
index 0000000..0bf1d54
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_batch_payment/tests/test_sepa_mapping.py
@@ -0,0 +1,15 @@
+from odoo.addons.odex30_account_batch_payment.models.sepa_mapping import sanitize_communication
+from odoo.tests.common import TransactionCase
+
+
+class TestSepaMapping(TransactionCase):
+    def test_sepa_mapping(self):
+        self.assertEqual(sanitize_communication("Hello/world", 5), "Hello")
+        self.assertEqual(sanitize_communication("Hello / World"), "Hello / World")
+        self.assertEqual(sanitize_communication("Hello // World"), "Hello / World")
+        self.assertEqual(sanitize_communication("Hello //// W//orld"), "Hello / W/orld")
+        self.assertEqual(sanitize_communication("/Hello / World/"), "Hello / World")
+        self.assertEqual(sanitize_communication("Hello / World /"), "Hello / World ")
+        self.assertEqual(sanitize_communication("\u1F9E/Hello"), "Hello")
+        self.assertEqual(sanitize_communication("Hello/\u1F9E"), "Hello")
+        self.assertEqual(sanitize_communication("Hello/\u1F9E/ World"), "Hello/ World")
diff --git a/dev_odex30_accounting/odex30_account_batch_payment/views/account_batch_payment_views.xml b/dev_odex30_accounting/odex30_account_batch_payment/views/account_batch_payment_views.xml
new file mode 100644
index 0000000..79021b1
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_batch_payment/views/account_batch_payment_views.xml
@@ -0,0 +1,180 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+        <record model="ir.actions.server" id="action_account_create_batch_payment">
+            <field name="name">Create batch payment</field>
+            <field name="model_id" ref="account.model_account_payment"/>
+            <field name="binding_model_id" ref="account.model_account_payment"/>
+            <field name="binding_view_types">list</field>
+            <field name="state">code</field>
+            <field name="code">
+if records:
+    action = records.create_batch_payment()
+            </field>
+        </record>
+
+        <record id="view_batch_payment_form" model="ir.ui.view">
+            <field name="name">account.batch.payment.form</field>
+            <field name="model">account.batch.payment</field>
+            <field name="arch" type="xml">
+                <form string="Batch Payment">
+                <header>
+                    <field name="id" invisible="1"/>
+                    <field name="file_generation_enabled" invisible="1"/>
+                    <button id="print_button" name="print_batch_payment" string="Print" type="object" invisible="state != 'sent'"/>
+                    <button id="regenerate_file_button" name="validate_batch_button" string="Re-generate Export File" type="object" invisible="not file_generation_enabled or state != 'sent' or not payment_ids"/>
+                    <button id="validate_button" name="validate_batch_button" class="oe_highlight" string="Validate" type="object" invisible="state != 'draft' or not payment_ids"/>
+                    <field name="state" widget="statusbar"/>
+                </header>
+                <field name="invalid_sct_partners_ids" invisible="1"/>
+                <div class="alert alert-danger" invisible="not invalid_sct_partners_ids" role="alert">
+                    The country or city of <a type="object" name="action_invalid_partners_from_sct">these partners</a>
+                    is not set, which could cause the file to be refused by the bank.
+                </div>
+                <sheet>
+                    <group>
+                        <group>
+                            <field name="batch_type" readonly="payment_ids.length" force_save="1"/>
+                            <field name="journal_id" domain="[('type', '=', 'bank')]" options="{'no_open': True, 'no_create': True}" readonly="state != 'draft'"/>
+                            <field name="currency_id" invisible="1"/>
+                            <field name="available_payment_method_ids" invisible="1"/>
+                            <field name="payment_method_id" options="{'no_create': True, 'no_open': True}"
+                                   required="1"
+                                   readonly="state != 'draft' or payment_ids"/>
+                            <field name="payment_method_code" invisible="1"/> <!--For use in modules depending on this one-->
+                        </group><group>
+                            <field name="date" readonly="state != 'draft'"/>
+                            <field name="name" placeholder="Leave empty to generate automatically..." required="0" readonly="state != 'draft'"/>
+                        </group>
+                    </group>
+
+                    <notebook>
+                        <page string="Batch Content" name="batch_content">
+                            <field name="payment_ids"
+                                   readonly="state != 'draft'"
+                                   force_save="1"
+                                   widget="many2many"
+                                   domain="payment_ids_domain"
+                                   options="{'no_create': True}">
+                                <list string="Payments" decoration-muted="state == 'draft'" decoration-danger="state in ('rejected', 'canceled')" create="false" editable="top" open_form_view="True">
+                                    <field name="name" readonly="1"/>
+                                    <field name="date" readonly="1"/>
+                                    <field name="partner_id" readonly="1"/>
+                                    <field name="memo" readonly="1"/>
+                                    <field name="payment_method_name" optional="hide" string="Payment method" readonly="1"/>
+                                    <field name="amount_signed" sum="Total" string="Amount" readonly="1"/>
+                                    <field name="currency_id" column_invisible="True"/>
+                                    <field name="state" column_invisible="True"/>
+                                    <field name="payment_method_id" column_invisible="True"/>
+                                </list>
+                            </field>
+                        </page>
+                    </notebook>
+                </sheet>
+                <chatter/>
+                </form>
+            </field>
+        </record>
+
+        <record id="view_batch_payment_search" model="ir.ui.view">
+            <field name="name">account.batch.payment.search</field>
+            <field name="model">account.batch.payment</field>
+            <field name="arch" type="xml">
+                <search string="Batch Payment">
+                    <field name="journal_id" />
+                    <field name="name" />
+                    <field name="amount" />
+                    <filter string="Unreconciled" domain="[('state','!=','reconciled')]" name="open"/>
+
+                    <group expand="0" string="Group By">
+                        <filter name="group_by_journal_id" string="Bank Journal" context="{'group_by':'journal_id'}"/>
+                        <filter name="group_by_state" string="State" context="{'group_by':'state'}"/>
+                    </group>
+                </search>
+            </field>
+        </record>
+
+        <record id="view_batch_payment_tree" model="ir.ui.view">
+            <field name="name">account.batch.payment.list</field>
+            <field name="model">account.batch.payment</field>
+            <field name="arch" type="xml">
+                <list decoration-muted="state == 'reconciled'" decoration-info="state == 'draft'" sample="1">
+                    <field name="name" readonly="state != 'draft'"/>
+                    <field name="journal_id" readonly="state != 'draft'"/>
+                    <field name="date" readonly="state != 'draft'"/>
+                    <field name="amount"/>
+                    <field name="activity_ids" widget="list_activity" optional="show"/>
+                    <field name="currency_id" column_invisible="True"/>
+                    <field name="state" widget="badge" decoration-info="state == 'draft'" decoration-success="state == 'sent'" />
+                </list>
+            </field>
+        </record>
+
+        <record id="action_batch_payment_in" model="ir.actions.act_window">
+            <field name="name">Customer Batch Payments</field>
+            <field name="res_model">account.batch.payment</field>
+            <field name="view_mode">list,form,kanban,activity</field>
+            <field name="view_id" ref="view_batch_payment_tree"/>
+            <field name="search_view_id" ref="view_batch_payment_search"/>
+            <field name="domain">[('batch_type', '=', 'inbound')]</field>
+            <field name="context">{'search_default_open': 1, 'default_batch_type': 'inbound'}</field>
+            <field name="help" type="html">
+                <p class="o_view_nocontent_smiling_face">
+                    Create a new customer batch payment
+                </p><p>
+                    Batch payments allow you grouping different payments to ease
+                    reconciliation. They are also useful when depositing checks
+                    to the bank.
+                </p>
+            </field>
+        </record>
+
+        <record id="action_batch_payment_out" model="ir.actions.act_window">
+            <field name="name">Vendor Batch Payments</field>
+            <field name="res_model">account.batch.payment</field>
+            <field name="view_mode">list,form,kanban,activity</field>
+            <field name="view_id" ref="view_batch_payment_tree"/>
+            <field name="search_view_id" ref="view_batch_payment_search"/>
+            <field name="domain">[('batch_type', '=', 'outbound')]</field>
+            <field name="context">{'search_default_open': 1, 'default_batch_type': 'outbound'}</field>
+            <field name="help" type="html">
+                <p class="o_view_nocontent_smiling_face">
+                    Create a new vendor batch payment
+                </p><p>
+                    Batch payments allow you grouping different payments to ease
+                    reconciliation. They are also useful when depositing checks
+                    to the bank.
+                </p>
+            </field>
+        </record>
+
+         <record id="view_account_move_kanban" model="ir.ui.view">
+            <field name="name">account.batch.payment.move.kanban</field>
+            <field name="model">account.batch.payment</field>
+            <field name="arch" type="xml">
+                <kanban class="o_kanban_mobile" sample="1" js_class="account_documents_kanban">
+                    <field name="currency_id"/>
+                    <templates>
+                        <t t-name="card">
+                            <div class="row mb4 fw-bold">
+                                <field name="name" class="col-6" readonly="state != 'draft'"/>
+                                <div class="col-6 text-end">
+                                    <i class="fa fa-clock-o" aria-label="Date" role="img" title="Date"/> <field name="date"/>
+                                </div>
+                            </div>
+                            <div class="row">
+                                <field name="amount" class="col-6" widget='monetary'/>
+                                <div class="col-6">
+                                    <field name="state" class="float-end" widget="label_selection" options="{'classes': {'new': 'default', 'sent': 'default', 'reconciled': 'success'}}"/>
+                                </div>
+                            </div>
+                        </t>
+                    </templates>
+                </kanban>
+            </field>
+        </record>
+
+        <menuitem action="action_batch_payment_in" name="Batch Payments" id="menu_batch_payment_sales" parent="account.menu_finance_receivables" sequence="18" groups="account.group_account_basic,account.group_account_readonly"/>
+        <menuitem action="action_batch_payment_out" name="Batch Payments" id="menu_batch_payment_purchases" parent="account.menu_finance_payables" sequence="21" groups="account.group_account_basic,account.group_account_readonly"/>
+
+</odoo>
diff --git a/dev_odex30_accounting/odex30_account_batch_payment/views/account_journal_views.xml b/dev_odex30_accounting/odex30_account_batch_payment/views/account_journal_views.xml
new file mode 100644
index 0000000..c8bc579
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_batch_payment/views/account_journal_views.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+        <record id="account_journal_dashboard_kanban_view_inherited" model="ir.ui.view">
+            <field name="name">account.journal.dashboard.kanban.inherited</field>
+            <field name="model">account.journal</field>
+            <field name="inherit_id" ref="account.account_journal_dashboard_kanban_view" />
+            <field name="arch" type="xml">
+                <xpath expr="//t[@t-name='menu']//div[@name='kanban_manage_new']" position="inside">
+                    <div t-if="journal_type == 'bank'">
+                        <a type="object" name="open_action_batch_payment">Batch Deposit</a>
+                    </div>
+                </xpath>
+            </field>
+        </record>
+</odoo>
\ No newline at end of file
diff --git a/dev_odex30_accounting/odex30_account_batch_payment/views/account_payment_views.xml b/dev_odex30_accounting/odex30_account_batch_payment/views/account_payment_views.xml
new file mode 100644
index 0000000..0669d99
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_batch_payment/views/account_payment_views.xml
@@ -0,0 +1,97 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <data>
+
+        <!-- VIEWS -->
+
+        <record id="view_account_payment_search_inherit_account_batch_payment" model="ir.ui.view">
+            <field name="name">account.payment.search.inherit.account_batch_payment</field>
+            <field name="model">account.payment</field>
+            <field name="inherit_id" ref="account.view_account_payment_search" />
+            <field name="arch" type="xml">
+
+                <!-- Filter on batch payments -->
+                <filter name="outbound_filter" position="after">
+                    <separator/>
+                    <filter string="Batch Payments"
+                            name="batch_payments_filter"
+                            domain="[('batch_payment_id', '!=', False)]"/>
+                    <filter string="Not Batch Payments"
+                            name="batch_payments_filter"
+                            domain="[('batch_payment_id', '=', False)]"/>
+                    <separator/>
+                </filter>
+                <!-- Group by batch payments -->
+                <filter name="paymentmethodline" position="after">
+                    <filter string="Batch Payments"
+                            name="batch_payments"
+                            context="{'group_by': 'batch_payment_id'}"/>
+                </filter>
+
+                <filter name="reconciled" position="after">
+                    <filter string="Not reconciled" name="not_reconciled" domain="[('is_reconciled', '=', False)]"/>
+                </filter>
+
+            </field>
+        </record>
+
+        <record id="view_account_payment_tree_inherit_account_batch_payment" model="ir.ui.view">
+            <field name="name">account.payment.list.inherit.account_batch_payment</field>
+            <field name="model">account.payment</field>
+            <field name="inherit_id" ref="account.view_account_payment_tree" />
+            <field name="arch" type="xml">
+                <header position="inside">
+                    <button name="%(action_account_create_batch_payment)d" type="action" string="Create Batch" groups="account.group_account_user"/>
+                </header>
+                <field name="partner_id" position="after">
+                    <field name="batch_payment_id"/>
+                </field>
+                <field name="partner_id" position="replace">
+                    <field name="partner_id" string="Partner"/>
+                </field>
+            </field>
+        </record>
+
+        <record id="view_account_payment_form_inherit_account_batch_payment" model="ir.ui.view">
+            <field name="name">account.payment.form.inherit.account_batch_payment</field>
+            <field name="model">account.payment</field>
+            <field name="inherit_id" ref="account.view_account_payment_form" />
+            <field name="arch" type="xml">
+
+                <div name="button_box" position="inside">
+                    <!-- Batch payment stat button -->
+                    <field name="batch_payment_id" invisible="1"/>
+                    <button name="button_open_batch_payment" type="object"
+                            class="oe_stat_button" icon="fa-bars"
+                            invisible="not batch_payment_id">
+                        <span>Batch Payment</span>
+                    </button>
+                </div>
+
+            </field>
+        </record>
+
+        <record id="view_account_payment_tree_popup_inherit_account_batch_payment" model="ir.ui.view">
+            <field name="name">account.payment.list.popup.inherit.account_batch_payment</field>
+            <field name="model">account.payment</field>
+            <field name="inherit_id" ref="account.view_account_payment_tree"/>
+            <field name="mode">primary</field>
+            <field name="priority">10</field>
+            <field name="arch" type="xml">
+                <xpath expr="//header/button[@name='%(action_account_create_batch_payment)d']" position="attributes">
+                    <attribute name="invisible">1</attribute>
+                </xpath>
+                <xpath expr="//field[@name='journal_id']" position="attributes">
+                    <attribute name="optional">hide</attribute>
+                </xpath>
+                <xpath expr="//field[@name='payment_method_line_id']" position="attributes">
+                    <attribute name="optional">hide</attribute>
+                </xpath>
+                <xpath expr="//field[@name='batch_payment_id']" position="attributes">
+                    <attribute name="optional">hide</attribute>
+                </xpath>
+            </field>
+        </record>
+
+    </data>
+</odoo>
diff --git a/dev_odex30_accounting/odex30_account_batch_payment/wizard/__init__.py b/dev_odex30_accounting/odex30_account_batch_payment/wizard/__init__.py
new file mode 100644
index 0000000..0a172cf
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_batch_payment/wizard/__init__.py
@@ -0,0 +1,3 @@
+# -*- coding: utf-8 -*-
+
+from . import batch_error
diff --git a/dev_odex30_accounting/odex30_account_batch_payment/wizard/__pycache__/__init__.cpython-311.pyc b/dev_odex30_accounting/odex30_account_batch_payment/wizard/__pycache__/__init__.cpython-311.pyc
new file mode 100644
index 0000000..96204e8
Binary files /dev/null and b/dev_odex30_accounting/odex30_account_batch_payment/wizard/__pycache__/__init__.cpython-311.pyc differ
diff --git a/dev_odex30_accounting/odex30_account_batch_payment/wizard/__pycache__/batch_error.cpython-311.pyc b/dev_odex30_accounting/odex30_account_batch_payment/wizard/__pycache__/batch_error.cpython-311.pyc
new file mode 100644
index 0000000..d3a79d4
Binary files /dev/null and b/dev_odex30_accounting/odex30_account_batch_payment/wizard/__pycache__/batch_error.cpython-311.pyc differ
diff --git a/dev_odex30_accounting/odex30_account_batch_payment/wizard/batch_error.py b/dev_odex30_accounting/odex30_account_batch_payment/wizard/batch_error.py
new file mode 100644
index 0000000..5791cf2
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_batch_payment/wizard/batch_error.py
@@ -0,0 +1,63 @@
+# -*- coding: utf-8 -*-
+
+from odoo import api, models, fields, _
+
+
+class BatchErrorWizard(models.TransientModel):
+    _name = 'account.batch.error.wizard'
+    _description = "Batch payments error reporting wizard"
+
+    batch_payment_id = fields.Many2one(comodel_name='account.batch.payment', required=True, help="The batch payment generating the errors and warnings displayed in this wizard.")
+    error_line_ids = fields.One2many(comodel_name='account.batch.error.wizard.line', inverse_name='error_wizard_id')
+    warning_line_ids = fields.One2many(comodel_name='account.batch.error.wizard.line', inverse_name='warning_wizard_id')
+    show_remove_options = fields.Boolean(required=True, help="True if and only if the options to remove the payments causing the errors or warnings from the batch should be shown")
+
+    @api.model
+    def create_from_errors_list(self, batch, errors_list, warnings_list):
+        rslt = self.create({'batch_payment_id': batch.id, 'show_remove_options': batch.export_file})
+        self._create_error_wizard_lines(rslt.id, 'error_wizard_id', errors_list)
+        self._create_error_wizard_lines(rslt.id, 'warning_wizard_id', warnings_list)
+        return rslt
+
+    @api.model
+    def _create_error_wizard_lines(self, wizard_id, wizard_link_field, entries):
+        wizard_line = self.env['account.batch.error.wizard.line']
+        for entry in entries:
+            wizard_line.create({
+                wizard_link_field: wizard_id,
+                'description': entry['title'],
+                'help_message': entry.get('help', None),
+                'payment_ids': [(6, False, entry['records'].ids)],
+            })
+
+    def proceed_with_validation(self):
+        self.ensure_one()
+        return self.batch_payment_id._send_after_validation()
+
+class BatchErrorWizardLine(models.TransientModel):
+    _name = 'account.batch.error.wizard.line'
+    _description = "Batch payments error reporting wizard line"
+
+    description = fields.Char(string="Description", required=True)
+    help_message = fields.Char(string="Help")
+    payment_ids = fields.Many2many(string='Payments', comodel_name='account.payment', required=True)
+    error_wizard_id = fields.Many2one(comodel_name='account.batch.error.wizard')
+    warning_wizard_id = fields.Many2one(comodel_name='account.batch.error.wizard')
+    # Whether or not this line should display a button allowing to remove its related payments from the batch
+    show_remove_button = fields.Boolean(compute="_compute_show_remove_button")
+
+    def _compute_show_remove_button(self):
+        for record in self:
+            record.show_remove_button = record.error_wizard_id.show_remove_options or record.warning_wizard_id.show_remove_options
+
+    def open_payments(self):
+        return self.payment_ids._get_records_action(name=_('Payments in Error'))
+
+    def remove_payments_from_batch(self):
+        for payment in self.payment_ids:
+            payment.batch_payment_id = None
+
+        # We try revalidating the batch if we still have payments for it (we hence do nothing for empty batches)
+        batch = (self.error_wizard_id or self.warning_wizard_id).batch_payment_id
+        if batch.payment_ids:
+            return batch.validate_batch()
diff --git a/dev_odex30_accounting/odex30_account_batch_payment/wizard/batch_error_views.xml b/dev_odex30_accounting/odex30_account_batch_payment/wizard/batch_error_views.xml
new file mode 100644
index 0000000..71c88d1
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_batch_payment/wizard/batch_error_views.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <data>
+
+        <record model="ir.ui.view" id="batch_error_wizard_form">
+            <field name="name">account.batch.error.wizard.form</field>
+            <field name="model">account.batch.error.wizard</field>
+            <field name="arch" type="xml">
+                <form>
+                    <sheet>
+                        <div invisible="not error_line_ids">
+                            <div role="alert" class="alert alert-danger">
+                                The batch could not be validated
+                            </div>
+
+                            <strong>The following errors occurred</strong>
+
+                            <field name="error_line_ids"/>
+
+                            <strong invisible="not warning_line_ids">The following warnings were also raised; they do not impeach validation</strong>
+                        </div>
+
+                        <div invisible="error_line_ids">
+                            <div role="alert" class="alert alert-success">
+                                The batch cannot be validated.
+                            </div>
+
+                            <strong>Please first consider the following warnings</strong>
+                        </div>
+
+                        <field name="warning_line_ids" invisible="not warning_line_ids"/>
+                    </sheet>
+                    <footer>
+                        <button string="Close" class="btn-secondary" special="cancel" data-hotkey="x"/>
+                        <button string="Proceed with validation" type="object" name="proceed_with_validation" class="btn btn-primary" invisible="error_line_ids" data-hotkey="q"/>
+                    </footer>
+                </form>
+            </field>
+        </record>
+
+        <record model="ir.ui.view" id="batch_error_wizard_line_tree">
+            <field name="name">account.batch.error.wizard.line.list</field>
+            <field name="model">account.batch.error.wizard.line</field>
+            <field name="arch" type="xml">
+                <list create="0" delete="0" editable="bottom">
+                    <field name="show_remove_button" column_invisible="True"/>
+                    <field name="description" readonly="1"/>
+                    <field name="help_message" readonly="1"/>
+                    <button string="Show" name="open_payments" type="object" class="btn-link"/>
+                    <button string="Exclude Payments" name="remove_payments_from_batch" type="object" invisible="not show_remove_button" class="oe_highlight"/>
+                </list>
+            </field>
+        </record>
+
+    </data>
+</odoo>
diff --git a/dev_odex30_accounting/odex30_account_budget/__init__.py b/dev_odex30_accounting/odex30_account_budget/__init__.py
new file mode 100644
index 0000000..a6174fc
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_budget/__init__.py
@@ -0,0 +1,10 @@
+# -*- coding: utf-8 -*-
+
+from . import models
+from . import reports
+from . import wizards
+
+
+def post_init_hook(env):
+    """ Create analytic plan field on budget analytic line and report for existing plans """
+    env['account.analytic.plan'].search([])._sync_all_plan_column()
diff --git a/dev_odex30_accounting/odex30_account_budget/__manifest__.py b/dev_odex30_accounting/odex30_account_budget/__manifest__.py
new file mode 100644
index 0000000..2c7bab7
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_budget/__manifest__.py
@@ -0,0 +1,24 @@
+
+{
+    'name': 'Budget Management',
+    'category': 'Odex30 Accounting/Accounting',
+    'description': """
+Use budgets to compare actual with expected revenues and costs
+--------------------------------------------------------------
+""",
+    'website': "http://www.exp-sa.com",
+    'author': "Expert Co. Ltd.",
+    'depends': [ 'purchase'],
+    'data': [
+        'security/ir.model.access.csv',
+        'security/account_budget_security.xml',
+        'wizards/budget_split_wizard_view.xml',
+        'views/budget_analytic_views.xml',
+        'views/budget_line_view.xml',
+        'views/account_analytic_account_views.xml',
+        'views/purchase_views.xml',
+        'reports/budget_report_view.xml',
+    ],
+    'demo': ['data/account_budget_demo.xml'],
+    'post_init_hook': 'post_init_hook',
+}
diff --git a/dev_odex30_accounting/odex30_account_budget/__pycache__/__init__.cpython-311.pyc b/dev_odex30_accounting/odex30_account_budget/__pycache__/__init__.cpython-311.pyc
new file mode 100644
index 0000000..3eb9122
Binary files /dev/null and b/dev_odex30_accounting/odex30_account_budget/__pycache__/__init__.cpython-311.pyc differ
diff --git a/dev_odex30_accounting/odex30_account_budget/data/account_budget_demo.xml b/dev_odex30_accounting/odex30_account_budget/data/account_budget_demo.xml
new file mode 100644
index 0000000..8e91611
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_budget/data/account_budget_demo.xml
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+    <!-- Budgets -->
+    <data noupdate="1">
+        <record id="budget_analytic_optimistic" model="budget.analytic">
+            <field name="name" eval="'Budget Optimistic '+str(datetime.now().year)"/>
+            <field name="date_from" eval="str(datetime.now().year)+'-01-01'"/>
+            <field name="state" eval="&quot;&quot;&quot;draft&quot;&quot;&quot;"/>
+            <field name="date_to" eval="str(datetime.now().year)+'-12-31'"/>
+            <field name="user_id" ref="base.user_admin"/>
+            <field name="budget_line_ids">
+                <record id="budget_line_optimistic_1" model="budget.line">
+                    <field name="account_id" ref="analytic.analytic_active_account"/>
+                    <field name="budget_amount">2000</field>
+                </record>
+                <record id="budget_line_optimistic_2" model="budget.line">
+                    <field name="account_id" ref="analytic.analytic_partners_camp_to_camp"/>
+                    <field name="budget_amount">8000</field>
+
+                </record>
+                <record id="budget_line_optimistic_3" model="budget.line">
+                    <field name="account_id" ref="analytic.analytic_think_big_systems"/>
+                    <field name="budget_amount">4000</field>
+
+                </record>
+            </field>
+        </record>
+
+        <record id="budget_analytic_pessimistic" model="budget.analytic">
+            <field name="name" eval="'Budget Pessimistic '+str(datetime.now().year)"/>
+            <field name="date_from" eval="str(datetime.now().year)+'-01-01'"/>
+            <field name="state" eval="&quot;&quot;&quot;draft&quot;&quot;&quot;"/>
+            <field name="date_to" eval="str(datetime.now().year)+'-12-31'"/>
+            <field name="user_id" ref="base.user_admin"/>
+            <field name="budget_line_ids">
+                <record id="budget_line_pessimistic_1" model="budget.line">
+                    <field name="account_id" ref="analytic.analytic_active_account"/>
+                    <field name="budget_amount">3000</field>
+
+                </record>
+                <record id="budget_line_pessimistic_2" model="budget.line">
+                    <field name="account_id" ref="analytic.analytic_partners_camp_to_camp"/>
+                    <field name="budget_amount">10000</field>
+
+                </record>
+                <record id="budget_line_pessimistic_3" model="budget.line">
+                    <field name="account_id" ref="analytic.analytic_think_big_systems"/>
+                    <field name="budget_amount">5000</field>
+
+                </record>
+            </field>
+        </record>
+
+        <function model="budget.analytic" name="action_budget_confirm" eval="[ref('budget_analytic_optimistic')]"/>
+        <function model="budget.analytic" name="action_budget_confirm" eval="[ref('budget_analytic_pessimistic')]"/>
+
+        <!-- Purchase -->
+
+        <function model="purchase.order.line" name="write">
+            <value model="purchase.order.line" search="[('product_id', 'in', [ref('product.product_product_8'), ref('product.product_delivery_01')]), ('order_id', '=', ref('purchase.purchase_order_9'))]"/>
+            <value eval="{'analytic_distribution': {ref('analytic.analytic_active_account'): 100}}"/>
+        </function>
+    </data>
+</odoo>
diff --git a/dev_odex30_accounting/odex30_account_budget/i18n/ar.po b/dev_odex30_accounting/odex30_account_budget/i18n/ar.po
new file mode 100644
index 0000000..647a5d2
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_budget/i18n/ar.po
@@ -0,0 +1,773 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# 	* odex30_account_budget
+#
+# Translators:
+# Wil Odoo, 2024
+# Malaz Abuidris <msea@odoo.com>, 2025
+# 
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 18.0+e\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2024-10-25 09:13+0000\n"
+"PO-Revision-Date: 2024-09-25 09:43+0000\n"
+"Last-Translator: Malaz Abuidris <msea@odoo.com>, 2025\n"
+"Language-Team: Arabic (https://app.transifex.com/odoo/teams/41243/ar/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Language: ar\n"
+"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
+
+#. module: odex30_account_budget
+#: model_terms:ir.ui.view,arch_db:odex30_account_budget.view_budget_analytic_kanban
+msgid "<i class=\"fa fa-clock-o me-1\" role=\"img\" aria-label=\"Period\" title=\"Period\"/>"
+msgstr ""
+"<i class=\"fa fa-clock-o me-1\" role=\"img\" aria-label=\"Period\" "
+"title=\"الفترة \"/> "
+
+#. module: odex30_account_budget
+#: model_terms:ir.ui.view,arch_db:odex30_account_budget.budget_split_wizard_form_view
+#: model_terms:ir.ui.view,arch_db:odex30_account_budget.view_budget_analytic_form
+msgid "<i class=\"fa fa-long-arrow-right mx-2\" aria-label=\"to\" title=\"to\"/>"
+msgstr "<i class=\"fa fa-long-arrow-right mx-2\" aria-label=\"to\" title=\"إلى \"/>"
+
+#. module: odex30_account_budget
+#: model_terms:ir.ui.view,arch_db:odex30_account_budget.budget_report_view_search
+msgid "Account"
+msgstr "الحساب "
+
+#. module: odex30_account_budget
+#: model:ir.model.fields,field_description:odex30_account_budget.field_budget_line__achieved_amount
+#: model:ir.model.fields,field_description:odex30_account_budget.field_budget_report__achieved
+#: model:ir.model.fields.selection,name:odex30_account_budget.selection__budget_report__line_type__achieved
+#: model_terms:ir.ui.view,arch_db:odex30_account_budget.budget_report_view_search
+#: model_terms:ir.ui.view,arch_db:odex30_account_budget.view_budget_analytic_form
+#: model_terms:ir.ui.view,arch_db:odex30_account_budget.view_budget_line_pivot
+msgid "Achieved"
+msgstr "مؤرشف "
+
+#. module: odex30_account_budget
+#: model:ir.model.fields,field_description:odex30_account_budget.field_budget_line__achieved_percentage
+msgid "Achieved (%)"
+msgstr "ما تم تحقيقه (%) "
+
+#. module: odex30_account_budget
+#: model:ir.model.fields,field_description:odex30_account_budget.field_budget_analytic__message_needaction
+msgid "Action Needed"
+msgstr "إجراء مطلوب"
+
+#. module: odex30_account_budget
+#: model:ir.model.fields,field_description:odex30_account_budget.field_budget_analytic__activity_ids
+msgid "Activities"
+msgstr "الأنشطة"
+
+#. module: odex30_account_budget
+#: model:ir.model.fields,field_description:odex30_account_budget.field_budget_analytic__activity_exception_decoration
+msgid "Activity Exception Decoration"
+msgstr "زخرفة استثناء النشاط"
+
+#. module: odex30_account_budget
+#: model:ir.model.fields,field_description:odex30_account_budget.field_budget_analytic__activity_state
+msgid "Activity State"
+msgstr "حالة النشاط"
+
+#. module: odex30_account_budget
+#: model:ir.model.fields,field_description:odex30_account_budget.field_budget_analytic__activity_type_icon
+msgid "Activity Type Icon"
+msgstr "أيقونة نوع النشاط"
+
+#. module: odex30_account_budget
+#: model:ir.model.fields,help:odex30_account_budget.field_budget_line__committed_amount
+msgid "Already Billed amount + Confirmed purchase orders."
+msgstr "المبلغ الذي تمت فوترته بالفعل + أوامر الشراء المؤكدة. "
+
+#. module: odex30_account_budget
+#: model:ir.model.fields,help:odex30_account_budget.field_budget_line__achieved_amount
+msgid "Amount Billed/Invoiced."
+msgstr "المبلغ المفوتر "
+
+#. module: odex30_account_budget
+#: model:ir.model.fields,help:odex30_account_budget.field_budget_line__theoritical_amount
+msgid ""
+"Amount supposed to be Billed/Invoiced, formula = (Budget Amount / Budget "
+"Days) x Budget Days Completed"
+msgstr ""
+"المبلغ المفترض أن يتم إصدار فواتير مورّدين/فواتير عملاء به، المعادلة = (مبلغ"
+" الميزانية / أيام الميزانية) × أيام الميزانية المنجزة "
+
+#. module: odex30_account_budget
+#: model:ir.model,name:odex30_account_budget.model_account_analytic_account
+#: model:ir.model.fields,field_description:odex30_account_budget.field_budget_line__auto_account_id
+#: model:ir.model.fields,field_description:odex30_account_budget.field_budget_report__auto_account_id
+msgid "Analytic Account"
+msgstr "الحساب التحليلي"
+
+#. module: odex30_account_budget
+#: model:ir.ui.menu,name:odex30_account_budget.menu_act_budget_analytic_view
+msgid "Analytic Budget"
+msgstr "الميزانية التحليلية "
+
+#. module: odex30_account_budget
+#: model:ir.model.fields,field_description:odex30_account_budget.field_purchase_order_line__analytic_json
+msgid "Analytic JSON"
+msgstr "JSON التحليلي "
+
+#. module: odex30_account_budget
+#: model:ir.model.fields,field_description:odex30_account_budget.field_budget_split_wizard__analytical_plan_ids
+msgid "Analytic Plans"
+msgstr "الخطط التحليلية "
+
+#. module: odex30_account_budget
+#: model:ir.model.fields,field_description:odex30_account_budget.field_budget_analytic__message_attachment_count
+msgid "Attachment Count"
+msgstr "عدد المرفقات"
+
+#. module: odex30_account_budget
+#: model:ir.model.fields.selection,name:odex30_account_budget.selection__budget_analytic__budget_type__both
+msgid "Both"
+msgstr "كلاهما"
+
+#. module: odex30_account_budget
+#: model:ir.model,name:odex30_account_budget.model_budget_analytic
+#: model:ir.model.fields,field_description:odex30_account_budget.field_budget_report__budget
+#: model:ir.model.fields.selection,name:odex30_account_budget.selection__budget_report__line_type__budget
+#: model_terms:ir.ui.view,arch_db:odex30_account_budget.budget_report_view_search
+#: model_terms:ir.ui.view,arch_db:odex30_account_budget.purchase_order_form_account_budget
+#: model_terms:ir.ui.view,arch_db:odex30_account_budget.view_budget_analytic_form
+#: model_terms:ir.ui.view,arch_db:odex30_account_budget.view_budget_analytic_search
+#: model_terms:ir.ui.view,arch_db:odex30_account_budget.view_budget_analytic_tree
+#: model_terms:ir.ui.view,arch_db:odex30_account_budget.view_budget_line_graph
+#: model_terms:ir.ui.view,arch_db:odex30_account_budget.view_budget_line_pivot
+msgid "Budget"
+msgstr "الميزانية "
+
+#. module: odex30_account_budget
+#. odoo-python
+#: code:addons/odex30_account_budget/wizards/budget_split_wizard.py:0
+msgid "Budget %s"
+msgstr "الميزانية %s "
+
+#. module: odex30_account_budget
+#: model:ir.model.fields,field_description:odex30_account_budget.field_budget_line__budget_analytic_id
+#: model:ir.model.fields,field_description:odex30_account_budget.field_budget_report__budget_analytic_id
+msgid "Budget Analytic"
+msgstr "تحليل الميزانيات "
+
+#. module: odex30_account_budget
+#: model:ir.model,name:odex30_account_budget.model_budget_line
+#: model:ir.model.fields,field_description:odex30_account_budget.field_account_analytic_account__budget_line_ids
+#: model:ir.model.fields,field_description:odex30_account_budget.field_budget_report__budget_line_id
+msgid "Budget Line"
+msgstr "بند الميزانية "
+
+#. module: odex30_account_budget
+#. odoo-python
+#: code:addons/odex30_account_budget/models/budget_analytic.py:0
+#: model:ir.model.fields,field_description:odex30_account_budget.field_budget_analytic__budget_line_ids
+#: model:ir.model.fields,field_description:odex30_account_budget.field_purchase_order_line__budget_line_ids
+#: model_terms:ir.ui.view,arch_db:odex30_account_budget.view_budget_analytic_form
+#: model_terms:ir.ui.view,arch_db:odex30_account_budget.view_budget_analytic_tree
+#: model_terms:ir.ui.view,arch_db:odex30_account_budget.view_budget_line_form
+#: model_terms:ir.ui.view,arch_db:odex30_account_budget.view_budget_line_graph
+#: model_terms:ir.ui.view,arch_db:odex30_account_budget.view_budget_line_pivot
+#: model_terms:ir.ui.view,arch_db:odex30_account_budget.view_budget_line_search
+#: model_terms:ir.ui.view,arch_db:odex30_account_budget.view_budget_line_tree
+msgid "Budget Lines"
+msgstr "بنود الميزانية "
+
+#. module: odex30_account_budget
+#: model:ir.model.fields,field_description:odex30_account_budget.field_budget_analytic__name
+#: model:ir.model.fields,field_description:odex30_account_budget.field_budget_line__name
+msgid "Budget Name"
+msgstr "اسم الميزانية "
+
+#. module: odex30_account_budget
+#: model:ir.actions.act_window,name:odex30_account_budget.budget_report_action
+#: model:ir.model,name:odex30_account_budget.model_budget_report
+#: model:ir.ui.menu,name:odex30_account_budget.budget_report_menu
+#: model_terms:ir.ui.view,arch_db:odex30_account_budget.budget_report_view_graph
+#: model_terms:ir.ui.view,arch_db:odex30_account_budget.budget_report_view_pivot
+#: model_terms:ir.ui.view,arch_db:odex30_account_budget.budget_report_view_search
+#: model_terms:ir.ui.view,arch_db:odex30_account_budget.budget_report_view_tree
+msgid "Budget Report"
+msgstr "تقرير الميزانية "
+
+#. module: odex30_account_budget
+#: model:ir.model,name:odex30_account_budget.model_budget_split_wizard
+msgid "Budget Split Wizard"
+msgstr "معالج تقسيم الميزانية "
+
+#. module: odex30_account_budget
+#: model:ir.model.fields,field_description:odex30_account_budget.field_budget_line__budget_analytic_state
+msgid "Budget State"
+msgstr "حالة الميزانية "
+
+#. module: odex30_account_budget
+#: model:ir.model.fields,field_description:odex30_account_budget.field_budget_analytic__budget_type
+msgid "Budget Type"
+msgstr "نوع الميزانية "
+
+#. module: odex30_account_budget
+#: model:ir.model.fields,field_description:odex30_account_budget.field_budget_line__budget_amount
+msgid "Budgeted"
+msgstr "مدرجة في الميزانية "
+
+#. module: odex30_account_budget
+#. odoo-python
+#: code:addons/odex30_account_budget/wizards/budget_split_wizard.py:0
+#: model:ir.actions.act_window,name:odex30_account_budget.act_budget_analytic_view
+#: model_terms:ir.ui.view,arch_db:odex30_account_budget.view_account_analytic_account_form_inherit_budget
+#: model_terms:ir.ui.view,arch_db:odex30_account_budget.view_budget_line_search
+msgid "Budgets"
+msgstr "الميزانيات "
+
+#. module: odex30_account_budget
+#: model:ir.actions.act_window,name:odex30_account_budget.act_budget_lines_view
+msgid "Budgets Analysis"
+msgstr "تحليل الميزانيات "
+
+#. module: odex30_account_budget
+#: model_terms:ir.ui.view,arch_db:odex30_account_budget.budget_split_wizard_form_view
+msgid "Cancel"
+msgstr "إلغاء "
+
+#. module: odex30_account_budget
+#: model_terms:ir.ui.view,arch_db:odex30_account_budget.view_budget_analytic_form
+msgid "Cancel Budget"
+msgstr "إلغاء الميزانية "
+
+#. module: odex30_account_budget
+#: model:ir.model.fields.selection,name:odex30_account_budget.selection__budget_analytic__state__canceled
+msgid "Canceled"
+msgstr "تم الإلغاء "
+
+#. module: odex30_account_budget
+#: model_terms:ir.actions.act_window,help:odex30_account_budget.act_budget_analytic_view
+msgid "Click to create a new budget."
+msgstr "اضغط لإنشاء ميزانية جديدة. "
+
+#. module: odex30_account_budget
+#: model:ir.model.fields,field_description:odex30_account_budget.field_budget_line__committed_amount
+#: model:ir.model.fields,field_description:odex30_account_budget.field_budget_report__committed
+#: model:ir.model.fields.selection,name:odex30_account_budget.selection__budget_report__line_type__committed
+#: model_terms:ir.ui.view,arch_db:odex30_account_budget.budget_report_view_search
+#: model_terms:ir.ui.view,arch_db:odex30_account_budget.view_budget_analytic_form
+msgid "Committed"
+msgstr "ملتزم "
+
+#. module: odex30_account_budget
+#: model:ir.model.fields,field_description:odex30_account_budget.field_budget_line__committed_percentage
+msgid "Committed (%)"
+msgstr "الملتزمون (٪) "
+
+#. module: odex30_account_budget
+#: model:ir.model.fields,field_description:odex30_account_budget.field_budget_analytic__company_id
+#: model:ir.model.fields,field_description:odex30_account_budget.field_budget_line__company_id
+#: model:ir.model.fields,field_description:odex30_account_budget.field_budget_report__company_id
+msgid "Company"
+msgstr "الشركة "
+
+#. module: odex30_account_budget
+#: model:ir.model.fields,field_description:odex30_account_budget.field_budget_analytic__create_uid
+#: model:ir.model.fields,field_description:odex30_account_budget.field_budget_line__create_uid
+#: model:ir.model.fields,field_description:odex30_account_budget.field_budget_split_wizard__create_uid
+msgid "Created by"
+msgstr "أنشئ بواسطة"
+
+#. module: odex30_account_budget
+#: model:ir.model.fields,field_description:odex30_account_budget.field_budget_analytic__create_date
+#: model:ir.model.fields,field_description:odex30_account_budget.field_budget_line__create_date
+#: model:ir.model.fields,field_description:odex30_account_budget.field_budget_split_wizard__create_date
+msgid "Created on"
+msgstr "أنشئ في"
+
+#. module: odex30_account_budget
+#: model:ir.model.fields,field_description:odex30_account_budget.field_budget_line__currency_id
+msgid "Currency"
+msgstr "العملة"
+
+#. module: odex30_account_budget
+#: model:ir.model.fields,field_description:odex30_account_budget.field_budget_report__date
+#: model_terms:ir.ui.view,arch_db:odex30_account_budget.budget_report_view_search
+#: model_terms:ir.ui.view,arch_db:odex30_account_budget.view_budget_line_search
+msgid "Date"
+msgstr "التاريخ"
+
+#. module: odex30_account_budget
+#. odoo-python
+#: code:addons/odex30_account_budget/models/budget_analytic.py:0
+msgid "Deletion is only allowed in the Draft and Canceled stages."
+msgstr "يمكنك الحذف فقط إذا كانت في حالة المسودة أو ملغية "
+
+#. module: odex30_account_budget
+#: model:ir.model.fields,field_description:odex30_account_budget.field_budget_report__description
+msgid "Description"
+msgstr "الوصف"
+
+#. module: odex30_account_budget
+#: model_terms:ir.ui.view,arch_db:odex30_account_budget.view_budget_analytic_form
+msgid "Details..."
+msgstr "التفاصيل... "
+
+#. module: odex30_account_budget
+#: model:ir.model.fields,field_description:odex30_account_budget.field_budget_analytic__display_name
+#: model:ir.model.fields,field_description:odex30_account_budget.field_budget_line__display_name
+#: model:ir.model.fields,field_description:odex30_account_budget.field_budget_report__display_name
+#: model:ir.model.fields,field_description:odex30_account_budget.field_budget_split_wizard__display_name
+msgid "Display Name"
+msgstr "اسم العرض "
+
+#. module: odex30_account_budget
+#: model:ir.model.fields,field_description:odex30_account_budget.field_budget_report__res_id
+msgid "Document"
+msgstr "المستند "
+
+#. module: odex30_account_budget
+#: model:ir.model.fields.selection,name:odex30_account_budget.selection__budget_analytic__state__done
+#: model_terms:ir.ui.view,arch_db:odex30_account_budget.view_budget_analytic_form
+msgid "Done"
+msgstr "منتهي "
+
+#. module: odex30_account_budget
+#: model:ir.model.fields.selection,name:odex30_account_budget.selection__budget_analytic__state__draft
+#: model_terms:ir.ui.view,arch_db:odex30_account_budget.view_budget_analytic_search
+msgid "Draft"
+msgstr "مسودة"
+
+#. module: odex30_account_budget
+#: model_terms:ir.ui.view,arch_db:odex30_account_budget.view_budget_analytic_search
+msgid "Draft Budgets"
+msgstr "ميزانية بحالة المسودة "
+
+#. module: odex30_account_budget
+#: model:ir.model.fields,field_description:odex30_account_budget.field_budget_analytic__date_to
+#: model:ir.model.fields,field_description:odex30_account_budget.field_budget_line__date_to
+#: model:ir.model.fields,field_description:odex30_account_budget.field_budget_split_wizard__date_to
+msgid "End Date"
+msgstr "تاريخ الانتهاء"
+
+#. module: odex30_account_budget
+#: model:ir.model.fields.selection,name:odex30_account_budget.selection__budget_analytic__budget_type__expense
+msgid "Expense"
+msgstr "النفقة "
+
+#. module: odex30_account_budget
+#: model:ir.model.fields,field_description:odex30_account_budget.field_budget_analytic__message_follower_ids
+msgid "Followers"
+msgstr "المتابعين"
+
+#. module: odex30_account_budget
+#: model:ir.model.fields,field_description:odex30_account_budget.field_budget_analytic__message_partner_ids
+msgid "Followers (Partners)"
+msgstr "المتابعين (الشركاء) "
+
+#. module: odex30_account_budget
+#: model:ir.model.fields,help:odex30_account_budget.field_budget_analytic__activity_type_icon
+msgid "Font awesome icon e.g. fa-tasks"
+msgstr "أيقونة من Font awesome مثال: fa-tasks "
+
+#. module: odex30_account_budget
+#: model_terms:ir.ui.view,arch_db:odex30_account_budget.budget_split_wizard_form_view
+msgid "From"
+msgstr "من"
+
+#. module: odex30_account_budget
+#: model_terms:ir.ui.view,arch_db:odex30_account_budget.view_budget_analytic_search
+msgid "Future Activities"
+msgstr "الأنشطة المستقبلية"
+
+#. module: odex30_account_budget
+#: model_terms:ir.ui.view,arch_db:odex30_account_budget.view_budget_analytic_tree
+msgid "Generate"
+msgstr "إنشاء"
+
+#. module: odex30_account_budget
+#: model:ir.actions.act_window,name:odex30_account_budget.budget_split_wizard_action
+#: model_terms:ir.ui.view,arch_db:odex30_account_budget.budget_split_wizard_form_view
+msgid "Generate Budget"
+msgstr "إنشاء ميزانية "
+
+#. module: odex30_account_budget
+#: model_terms:ir.ui.view,arch_db:odex30_account_budget.budget_report_view_search
+#: model_terms:ir.ui.view,arch_db:odex30_account_budget.view_budget_line_search
+msgid "Group By"
+msgstr "تجميع حسب"
+
+#. module: odex30_account_budget
+#: model:ir.model.fields,field_description:odex30_account_budget.field_budget_analytic__has_message
+msgid "Has Message"
+msgstr "يحتوي على رسالة "
+
+#. module: odex30_account_budget
+#: model:ir.model.fields,field_description:odex30_account_budget.field_budget_analytic__id
+#: model:ir.model.fields,field_description:odex30_account_budget.field_budget_line__id
+#: model:ir.model.fields,field_description:odex30_account_budget.field_budget_report__id
+#: model:ir.model.fields,field_description:odex30_account_budget.field_budget_split_wizard__id
+msgid "ID"
+msgstr "المُعرف"
+
+#. module: odex30_account_budget
+#: model:ir.model.fields,field_description:odex30_account_budget.field_budget_analytic__activity_exception_icon
+msgid "Icon"
+msgstr "الأيقونة"
+
+#. module: odex30_account_budget
+#: model:ir.model.fields,help:odex30_account_budget.field_budget_analytic__activity_exception_icon
+msgid "Icon to indicate an exception activity."
+msgstr "الأيقونة للإشارة إلى النشاط المستثنى. "
+
+#. module: odex30_account_budget
+#: model:ir.model.fields,help:odex30_account_budget.field_budget_analytic__message_needaction
+msgid "If checked, new messages require your attention."
+msgstr "إذا كان محددًا، فهناك رسائل جديدة عليك رؤيتها. "
+
+#. module: odex30_account_budget
+#: model:ir.model.fields,help:odex30_account_budget.field_budget_analytic__message_has_error
+#: model:ir.model.fields,help:odex30_account_budget.field_budget_analytic__message_has_sms_error
+msgid "If checked, some messages have a delivery error."
+msgstr "إذا كان محددًا، فقد حدث خطأ في تسليم بعض الرسائل."
+
+#. module: odex30_account_budget
+#: model_terms:ir.ui.view,arch_db:odex30_account_budget.budget_report_view_search
+msgid "In a Budget"
+msgstr "في ميزانية "
+
+#. module: odex30_account_budget
+#: model:ir.model.fields,field_description:odex30_account_budget.field_budget_line__is_above_budget
+#: model:ir.model.fields,field_description:odex30_account_budget.field_purchase_order__is_above_budget
+#: model:ir.model.fields,field_description:odex30_account_budget.field_purchase_order_line__is_above_budget
+msgid "Is Above Budget"
+msgstr "يتخطى الميزانية "
+
+#. module: odex30_account_budget
+#: model:ir.model.fields,field_description:odex30_account_budget.field_purchase_order__is_analytic
+msgid "Is Analytic"
+msgstr "تحليلي "
+
+#. module: odex30_account_budget
+#: model:ir.model.fields,field_description:odex30_account_budget.field_budget_analytic__message_is_follower
+msgid "Is Follower"
+msgstr "متابع"
+
+#. module: odex30_account_budget
+#: model:ir.model.fields,field_description:odex30_account_budget.field_budget_analytic__write_uid
+#: model:ir.model.fields,field_description:odex30_account_budget.field_budget_line__write_uid
+#: model:ir.model.fields,field_description:odex30_account_budget.field_budget_split_wizard__write_uid
+msgid "Last Updated by"
+msgstr "آخر تحديث بواسطة"
+
+#. module: odex30_account_budget
+#: model:ir.model.fields,field_description:odex30_account_budget.field_budget_analytic__write_date
+#: model:ir.model.fields,field_description:odex30_account_budget.field_budget_line__write_date
+#: model:ir.model.fields,field_description:odex30_account_budget.field_budget_split_wizard__write_date
+msgid "Last Updated on"
+msgstr "آخر تحديث في"
+
+#. module: odex30_account_budget
+#: model_terms:ir.ui.view,arch_db:odex30_account_budget.view_budget_analytic_search
+msgid "Late Activities"
+msgstr "الأنشطة المتأخرة"
+
+#. module: odex30_account_budget
+#: model:ir.model.fields,field_description:odex30_account_budget.field_budget_analytic__message_has_error
+msgid "Message Delivery error"
+msgstr "خطأ في تسليم الرسائل"
+
+#. module: odex30_account_budget
+#: model:ir.model.fields,field_description:odex30_account_budget.field_budget_analytic__message_ids
+msgid "Messages"
+msgstr "الرسائل"
+
+#. module: odex30_account_budget
+#: model:ir.model.fields,field_description:odex30_account_budget.field_budget_report__res_model
+msgid "Model"
+msgstr "النموذج "
+
+#. module: odex30_account_budget
+#: model:ir.model.fields.selection,name:odex30_account_budget.selection__budget_split_wizard__period__month
+msgid "Month"
+msgstr "الشهر"
+
+#. module: odex30_account_budget
+#: model:ir.model.fields,field_description:odex30_account_budget.field_budget_analytic__my_activity_date_deadline
+msgid "My Activity Deadline"
+msgstr "الموعد النهائي لنشاطاتي "
+
+#. module: odex30_account_budget
+#. odoo-python
+#: code:addons/odex30_account_budget/models/budget_analytic.py:0
+msgid "New revision"
+msgstr "مراجعة جديدة "
+
+#. module: odex30_account_budget
+#: model:ir.model.fields,field_description:odex30_account_budget.field_budget_analytic__activity_calendar_event_id
+msgid "Next Activity Calendar Event"
+msgstr "الفعالية التالية في تقويم الأنشطة "
+
+#. module: odex30_account_budget
+#: model:ir.model.fields,field_description:odex30_account_budget.field_budget_analytic__activity_date_deadline
+msgid "Next Activity Deadline"
+msgstr "الموعد النهائي للنشاط التالي"
+
+#. module: odex30_account_budget
+#: model:ir.model.fields,field_description:odex30_account_budget.field_budget_analytic__activity_summary
+msgid "Next Activity Summary"
+msgstr "ملخص النشاط التالي"
+
+#. module: odex30_account_budget
+#: model:ir.model.fields,field_description:odex30_account_budget.field_budget_analytic__activity_type_id
+msgid "Next Activity Type"
+msgstr "نوع النشاط التالي"
+
+#. module: odex30_account_budget
+#: model_terms:ir.ui.view,arch_db:odex30_account_budget.view_budget_line_search
+msgid "Not Cancelled"
+msgstr "غير ملغي "
+
+#. module: odex30_account_budget
+#: model:ir.model.fields,field_description:odex30_account_budget.field_budget_analytic__message_needaction_counter
+msgid "Number of Actions"
+msgstr "عدد الإجراءات"
+
+#. module: odex30_account_budget
+#: model:ir.model.fields,field_description:odex30_account_budget.field_budget_analytic__message_has_error_counter
+msgid "Number of errors"
+msgstr "عدد الأخطاء "
+
+#. module: odex30_account_budget
+#: model:ir.model.fields,help:odex30_account_budget.field_budget_analytic__message_needaction_counter
+msgid "Number of messages requiring action"
+msgstr "عدد الرسائل التي تتطلب اتخاذ إجراء"
+
+#. module: odex30_account_budget
+#: model:ir.model.fields,help:odex30_account_budget.field_budget_analytic__message_has_error_counter
+msgid "Number of messages with delivery error"
+msgstr "عدد الرسائل الحادث بها خطأ في التسليم"
+
+#. module: odex30_account_budget
+#: model:ir.model.fields.selection,name:odex30_account_budget.selection__budget_analytic__state__confirmed
+#: model_terms:ir.ui.view,arch_db:odex30_account_budget.view_budget_analytic_form
+msgid "Open"
+msgstr "فتح "
+
+#. module: odex30_account_budget
+#: model_terms:ir.ui.view,arch_db:odex30_account_budget.budget_report_view_search
+msgid "Open Budget"
+msgstr "ميزانية مفتوحة "
+
+#. module: odex30_account_budget
+#: model:ir.model.fields,field_description:odex30_account_budget.field_budget_split_wizard__period
+#: model_terms:ir.ui.view,arch_db:odex30_account_budget.view_budget_analytic_form
+msgid "Period"
+msgstr "الفترة"
+
+#. module: odex30_account_budget
+#: model_terms:ir.ui.view,arch_db:odex30_account_budget.view_budget_line_graph
+msgid "Practical amount"
+msgstr "المبلغ الفعلي"
+
+#. module: odex30_account_budget
+#: model:ir.model.fields,field_description:odex30_account_budget.field_budget_line__account_id
+#: model:ir.model.fields,field_description:odex30_account_budget.field_budget_report__account_id
+msgid "Project Account"
+msgstr "حساب المشروع "
+
+#. module: odex30_account_budget
+#: model:ir.model,name:odex30_account_budget.model_purchase_order
+msgid "Purchase Order"
+msgstr "أمر شراء "
+
+#. module: odex30_account_budget
+#: model:ir.model,name:odex30_account_budget.model_purchase_order_line
+msgid "Purchase Order Line"
+msgstr "بند أمر الشراء"
+
+#. module: odex30_account_budget
+#: model:ir.model.fields.selection,name:odex30_account_budget.selection__budget_split_wizard__period__quarter
+msgid "Quarter"
+msgstr "ربع السنة"
+
+#. module: odex30_account_budget
+#. odoo-python
+#: code:addons/odex30_account_budget/models/budget_analytic.py:0
+msgid "REV %s"
+msgstr "REV %s"
+
+#. module: odex30_account_budget
+#: model:ir.model.fields,field_description:odex30_account_budget.field_budget_analytic__rating_ids
+msgid "Ratings"
+msgstr "التقييمات "
+
+#. module: odex30_account_budget
+#: model_terms:ir.ui.view,arch_db:odex30_account_budget.view_budget_analytic_form
+msgid "Reset to Draft"
+msgstr "إعادة التعيين كمسودة "
+
+#. module: odex30_account_budget
+#: model:ir.model.fields,field_description:odex30_account_budget.field_budget_analytic__user_id
+msgid "Responsible"
+msgstr "المسؤول "
+
+#. module: odex30_account_budget
+#: model:ir.model.fields,field_description:odex30_account_budget.field_budget_analytic__activity_user_id
+msgid "Responsible User"
+msgstr "المستخدم المسؤول"
+
+#. module: odex30_account_budget
+#: model:ir.model.fields.selection,name:odex30_account_budget.selection__budget_analytic__budget_type__revenue
+msgid "Revenue"
+msgstr "الإيرادات "
+
+#. module: odex30_account_budget
+#: model_terms:ir.ui.view,arch_db:odex30_account_budget.view_budget_analytic_form
+msgid "Revise"
+msgstr "مراجعة "
+
+#. module: odex30_account_budget
+#: model:ir.model.fields.selection,name:odex30_account_budget.selection__budget_analytic__state__revised
+msgid "Revised"
+msgstr "تمت المراجعة "
+
+#. module: odex30_account_budget
+#: model:ir.model.fields,field_description:odex30_account_budget.field_budget_analytic__parent_id
+msgid "Revision Of"
+msgstr "مراجعة "
+
+#. module: odex30_account_budget
+#: model:ir.model.fields,field_description:odex30_account_budget.field_budget_analytic__children_ids
+msgid "Revisions"
+msgstr "مراجعات "
+
+#. module: odex30_account_budget
+#: model:ir.model.fields,field_description:odex30_account_budget.field_budget_analytic__message_has_sms_error
+msgid "SMS Delivery error"
+msgstr "خطأ في تسليم الرسائل النصية القصيرة "
+
+#. module: odex30_account_budget
+#: model:ir.model.fields,field_description:odex30_account_budget.field_budget_line__sequence
+msgid "Sequence"
+msgstr "تسلسل "
+
+#. module: odex30_account_budget
+#: model_terms:ir.ui.view,arch_db:odex30_account_budget.view_budget_analytic_search
+msgid "Show all records which has next action date is before today"
+msgstr ""
+"عرض كافة السجلات التي يسبق تاريخ الإجراء التالي فيها تاريخ اليوم الجاري "
+
+#. module: odex30_account_budget
+#: model_terms:ir.ui.view,arch_db:odex30_account_budget.budget_split_wizard_form_view
+msgid "Split"
+msgstr "تقسيم"
+
+#. module: odex30_account_budget
+#: model:ir.model.fields,field_description:odex30_account_budget.field_budget_analytic__date_from
+#: model:ir.model.fields,field_description:odex30_account_budget.field_budget_line__date_from
+#: model:ir.model.fields,field_description:odex30_account_budget.field_budget_split_wizard__date_from
+msgid "Start Date"
+msgstr "تاريخ البدء "
+
+#. module: odex30_account_budget
+#: model:ir.model.fields,field_description:odex30_account_budget.field_budget_analytic__state
+msgid "Status"
+msgstr "الحالة"
+
+#. module: odex30_account_budget
+#: model:ir.model.fields,help:odex30_account_budget.field_budget_analytic__activity_state
+msgid ""
+"Status based on activities\n"
+"Overdue: Due date is already passed\n"
+"Today: Activity date is today\n"
+"Planned: Future activities."
+msgstr ""
+"الأنشطة المعتمدة على الحالة\n"
+"المتأخرة: تاريخ الاستحقاق مر\n"
+"اليوم: تاريخ النشاط هو اليوم\n"
+"المخطط: الأنشطة المستقبلية."
+
+#. module: odex30_account_budget
+#. odoo-python
+#: code:addons/odex30_account_budget/models/budget_line.py:0
+msgid "The 'End Date' must be greater than or equal to 'Start Date'."
+msgstr "يجب أن يكون 'تاريخ الانتهاء' أكبر من أو يساوي 'تاريخ البدء'. "
+
+#. module: odex30_account_budget
+#: model:ir.model.fields,field_description:odex30_account_budget.field_budget_line__theoritical_amount
+#: model_terms:ir.ui.view,arch_db:odex30_account_budget.view_budget_analytic_form
+msgid "Theoretical"
+msgstr "نظري "
+
+#. module: odex30_account_budget
+#: model:ir.model.fields,field_description:odex30_account_budget.field_budget_line__theoritical_percentage
+msgid "Theoretical (%)"
+msgstr "نظري (%) "
+
+#. module: odex30_account_budget
+#: model_terms:ir.ui.view,arch_db:odex30_account_budget.view_budget_analytic_search
+msgid "Today Activities"
+msgstr "أنشطة اليوم "
+
+#. module: odex30_account_budget
+#: model_terms:ir.ui.view,arch_db:odex30_account_budget.budget_report_view_tree
+msgid "Total Achieved"
+msgstr "إجمالي ما تمت أرشفته "
+
+#. module: odex30_account_budget
+#: model_terms:ir.ui.view,arch_db:odex30_account_budget.budget_report_view_tree
+msgid "Total Budget"
+msgstr "إجمالي الميزانية "
+
+#. module: odex30_account_budget
+#: model_terms:ir.ui.view,arch_db:odex30_account_budget.budget_report_view_tree
+msgid "Total Committed"
+msgstr "إجمالي ما تم الإلتزام به "
+
+#. module: odex30_account_budget
+#: model:ir.model.fields,field_description:odex30_account_budget.field_budget_report__line_type
+#: model_terms:ir.ui.view,arch_db:odex30_account_budget.budget_report_view_search
+msgid "Type"
+msgstr "النوع"
+
+#. module: odex30_account_budget
+#: model:ir.model.fields,help:odex30_account_budget.field_budget_analytic__activity_exception_decoration
+msgid "Type of the exception activity on record."
+msgstr "نوع النشاط المستثنى في السجل. "
+
+#. module: odex30_account_budget
+#: model_terms:ir.actions.act_window,help:odex30_account_budget.act_budget_analytic_view
+msgid "Use budgets to compare actual with expected revenues and costs"
+msgstr ""
+"استخدم الميزانيات لمقارنة الإيرادات الفعلية مع الإيرادات المتوقعة والتكاليف "
+
+#. module: odex30_account_budget
+#: model:ir.model.fields,field_description:odex30_account_budget.field_budget_report__user_id
+#: model_terms:ir.ui.view,arch_db:odex30_account_budget.budget_report_view_search
+msgid "User"
+msgstr "المستخدم"
+
+#. module: odex30_account_budget
+#: model:ir.model.fields,field_description:odex30_account_budget.field_budget_analytic__website_message_ids
+msgid "Website Messages"
+msgstr "رسائل الموقع الإلكتروني "
+
+#. module: odex30_account_budget
+#: model:ir.model.fields,help:odex30_account_budget.field_budget_analytic__website_message_ids
+msgid "Website communication history"
+msgstr "سجل تواصل الموقع الإلكتروني "
+
+#. module: odex30_account_budget
+#: model:ir.model.fields.selection,name:odex30_account_budget.selection__budget_split_wizard__period__year
+msgid "Year"
+msgstr "السنة"
+
+#. module: odex30_account_budget
+#. odoo-python
+#: code:addons/odex30_account_budget/models/budget_analytic.py:0
+msgid "You cannot create recursive revision of budget."
+msgstr "لا يمكنك إنشاء مراجعات متداخلة للميزانية "
+
+#. module: odex30_account_budget
+#: model_terms:ir.ui.view,arch_db:odex30_account_budget.view_budget_analytic_form
+msgid "e.g. Budget 2023"
+msgstr "مثال: ميزانية 2023 "
diff --git a/dev_odex30_accounting/odex30_account_budget/models/__init__.py b/dev_odex30_accounting/odex30_account_budget/models/__init__.py
new file mode 100644
index 0000000..9b537be
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_budget/models/__init__.py
@@ -0,0 +1,7 @@
+# -*- coding: utf-8 -*-
+
+from . import account_analytic_account
+from . import budget_analytic
+from . import budget_line
+from . import purchase_order
+from . import purchase_order_line
diff --git a/dev_odex30_accounting/odex30_account_budget/models/__pycache__/__init__.cpython-311.pyc b/dev_odex30_accounting/odex30_account_budget/models/__pycache__/__init__.cpython-311.pyc
new file mode 100644
index 0000000..a6b4842
Binary files /dev/null and b/dev_odex30_accounting/odex30_account_budget/models/__pycache__/__init__.cpython-311.pyc differ
diff --git a/dev_odex30_accounting/odex30_account_budget/models/__pycache__/account_analytic_account.cpython-311.pyc b/dev_odex30_accounting/odex30_account_budget/models/__pycache__/account_analytic_account.cpython-311.pyc
new file mode 100644
index 0000000..2b01e15
Binary files /dev/null and b/dev_odex30_accounting/odex30_account_budget/models/__pycache__/account_analytic_account.cpython-311.pyc differ
diff --git a/dev_odex30_accounting/odex30_account_budget/models/__pycache__/budget_analytic.cpython-311.pyc b/dev_odex30_accounting/odex30_account_budget/models/__pycache__/budget_analytic.cpython-311.pyc
new file mode 100644
index 0000000..6743eb0
Binary files /dev/null and b/dev_odex30_accounting/odex30_account_budget/models/__pycache__/budget_analytic.cpython-311.pyc differ
diff --git a/dev_odex30_accounting/odex30_account_budget/models/__pycache__/budget_line.cpython-311.pyc b/dev_odex30_accounting/odex30_account_budget/models/__pycache__/budget_line.cpython-311.pyc
new file mode 100644
index 0000000..66b0af2
Binary files /dev/null and b/dev_odex30_accounting/odex30_account_budget/models/__pycache__/budget_line.cpython-311.pyc differ
diff --git a/dev_odex30_accounting/odex30_account_budget/models/__pycache__/purchase_order.cpython-311.pyc b/dev_odex30_accounting/odex30_account_budget/models/__pycache__/purchase_order.cpython-311.pyc
new file mode 100644
index 0000000..df04168
Binary files /dev/null and b/dev_odex30_accounting/odex30_account_budget/models/__pycache__/purchase_order.cpython-311.pyc differ
diff --git a/dev_odex30_accounting/odex30_account_budget/models/__pycache__/purchase_order_line.cpython-311.pyc b/dev_odex30_accounting/odex30_account_budget/models/__pycache__/purchase_order_line.cpython-311.pyc
new file mode 100644
index 0000000..af3d60c
Binary files /dev/null and b/dev_odex30_accounting/odex30_account_budget/models/__pycache__/purchase_order_line.cpython-311.pyc differ
diff --git a/dev_odex30_accounting/odex30_account_budget/models/account_analytic_account.py b/dev_odex30_accounting/odex30_account_budget/models/account_analytic_account.py
new file mode 100644
index 0000000..d3e5f89
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_budget/models/account_analytic_account.py
@@ -0,0 +1,12 @@
+
+from odoo import fields, models
+
+
+class AccountAnalyticAccount(models.Model):
+    _inherit = "account.analytic.account"
+
+    budget_line_ids = fields.One2many('budget.line', 'auto_account_id', readonly=False)
+
+    def _get_view(self, view_id=None, view_type='form', **options):
+        arch, view = super()._get_view(view_id, view_type, **options)
+        return self.env['analytic.plan.fields.mixin']._patch_view(arch, view, view_type)  # patch the budget line list view
diff --git a/dev_odex30_accounting/odex30_account_budget/models/budget_analytic.py b/dev_odex30_accounting/odex30_account_budget/models/budget_analytic.py
new file mode 100644
index 0000000..c8a232e
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_budget/models/budget_analytic.py
@@ -0,0 +1,103 @@
+
+from markupsafe import Markup
+
+from odoo import api, fields, models, _
+from odoo.exceptions import UserError, ValidationError
+
+
+class BudgetAnalytic(models.Model):
+    _name = "budget.analytic"
+    _description = "Budget"
+    _inherit = ['mail.thread', 'mail.activity.mixin']
+
+    name = fields.Char('Budget Name', required=True)
+    parent_id = fields.Many2one(
+        string="Revision Of",
+        comodel_name='budget.analytic',
+        ondelete='cascade',
+    )
+    children_ids = fields.One2many(
+        string="Revisions",
+        comodel_name='budget.analytic',
+        inverse_name='parent_id',
+    )
+    user_id = fields.Many2one('res.users', 'Responsible', default=lambda self: self.env.user)
+    date_from = fields.Date('Start Date', required=True)
+    date_to = fields.Date('End Date', required=True)
+    state = fields.Selection(
+        string="Status",
+        selection=[
+            ('draft', "Draft"),
+            ('confirmed', "Open"),
+            ('revised', "Revised"),
+            ('done', "Done"),
+            ('canceled', "Canceled")
+        ],
+        required=True, default='draft',
+        readonly=True,
+        copy=False,
+        tracking=True,
+    )
+    budget_type = fields.Selection(
+        string="Budget Type",
+        selection=[
+            ('revenue', "Revenue"),
+            ('expense', "Expense"),
+            ('both', "Both"),
+        ],
+        required=True, default='expense',
+        copy=False,
+    )
+    budget_line_ids = fields.One2many('budget.line', 'budget_analytic_id', 'Budget Lines', copy=True)
+    company_id = fields.Many2one('res.company', 'Company', default=lambda self: self.env.company)
+
+    @api.constrains('parent_id')
+    def _check_parent_id(self):
+        for budget in self:
+            if budget._has_cycle():
+                raise ValidationError(_('You cannot create recursive revision of budget.'))
+
+    @api.ondelete(at_uninstall=False)
+    def _unlink_except_draft_or_cancel(self):
+        if any(budget.state not in ('draft', 'canceled') for budget in self):
+            raise UserError(_("Deletion is only allowed in the Draft and Canceled stages."))
+
+    def action_budget_confirm(self):
+        self.parent_id.filtered(lambda b: b.state == 'confirmed').state = 'revised'
+        for budget in self:
+            budget.state = 'revised' if budget.children_ids else 'confirmed'
+
+    def action_budget_draft(self):
+        self.state = 'draft'
+
+    def action_budget_cancel(self):
+        self.state = 'canceled'
+
+    def action_budget_done(self):
+        self.state = 'done'
+
+    def create_revised_budget(self):
+        revised = self.browse()
+        for budget in self:
+            revised_budget = budget.copy(default={'name': _('REV %s', budget.name), 'parent_id': budget.id, 'budget_type': budget.budget_type})
+            revised += revised_budget
+            budget.message_post(
+                body=Markup("%s: <a href='#' data-oe-model='budget.analytic' data-oe-id='%s'>%s</a>") % (
+                    _("New revision"),
+                    revised_budget.id,
+                    revised_budget.name,
+                ))
+        return revised._get_records_action()
+
+    def action_open_budget_lines(self):
+        return {
+            'type': 'ir.actions.act_window',
+            'name': _('Budget Lines'),
+            'res_model': 'budget.line',
+            'view_mode': 'list,pivot,graph',
+            'domain': [('budget_analytic_id', 'in', self.ids)],
+        }
+
+    def _get_view(self, view_id=None, view_type='form', **options):
+        arch, view = super()._get_view(view_id, view_type, **options)
+        return self.env['analytic.plan.fields.mixin']._patch_view(arch, view, view_type)  # patch the budget lines list view
diff --git a/dev_odex30_accounting/odex30_account_budget/models/budget_line.py b/dev_odex30_accounting/odex30_account_budget/models/budget_line.py
new file mode 100644
index 0000000..328f86c
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_budget/models/budget_line.py
@@ -0,0 +1,116 @@
+
+from datetime import timedelta
+
+from odoo import api, fields, models, _
+from odoo.exceptions import ValidationError
+
+
+class BudgetLine(models.Model):
+    _name = 'budget.line'
+    _inherit = 'analytic.plan.fields.mixin'
+    _description = "Budget Line"
+    _order = 'sequence, id'
+
+    name = fields.Char(related='budget_analytic_id.name', string='Budget Name')
+    sequence = fields.Integer('Sequence', default=10)
+    budget_analytic_id = fields.Many2one('budget.analytic', 'Budget Analytic', ondelete='cascade', index=True, required=True)
+    date_from = fields.Date('Start Date', related='budget_analytic_id.date_from', store=True)
+    date_to = fields.Date('End Date', related='budget_analytic_id.date_to', store=True)
+    currency_id = fields.Many2one('res.currency', related='company_id.currency_id', readonly=True)
+    budget_amount = fields.Monetary(
+        string='Budgeted')
+    achieved_amount = fields.Monetary(
+        compute='_compute_all',
+        string='Achieved',
+        help="Amount Billed/Invoiced.")
+    achieved_percentage = fields.Float(
+        compute='_compute_all',
+        string='Achieved (%)')
+    committed_amount = fields.Monetary(
+        compute='_compute_all',
+        string='Committed',
+        help="Already Billed amount + Confirmed purchase orders.")
+    committed_percentage = fields.Float(
+        compute='_compute_all',
+        string='Committed (%)')
+    theoritical_amount = fields.Monetary(
+        compute='_compute_theoritical_amount',
+        string='Theoretical',
+        help="Amount supposed to be Billed/Invoiced, formula = (Budget Amount / Budget Days) x Budget Days Completed")
+    theoritical_percentage = fields.Float(
+        compute='_compute_theoritical_amount',
+        string='Theoretical (%)',
+        aggregator='avg')
+    company_id = fields.Many2one(related='budget_analytic_id.company_id', comodel_name='res.company', string='Company', store=True, readonly=True)
+    is_above_budget = fields.Boolean(compute='_compute_above_budget')
+    budget_analytic_state = fields.Selection(related='budget_analytic_id.state', string='Budget State', store=True, readonly=True)
+
+    @api.constrains('date_from', 'date_to')
+    def _check_date_range(self):
+        for line in self:
+            if line.date_from and line.date_to and line.date_to < line.date_from:
+                raise ValidationError(_("The 'End Date' must be greater than or equal to 'Start Date'."))
+
+    @api.depends('achieved_amount', 'budget_amount')
+    def _compute_above_budget(self):
+        for line in self:
+            line.is_above_budget = line.achieved_amount > line.budget_amount
+
+    def _compute_all(self):
+        grouped = {
+            line: (committed, achieved)
+            for line, committed, achieved in self.env['budget.report']._read_group(
+                domain=[('budget_line_id', 'in', self.ids)],
+                groupby=['budget_line_id'],
+                aggregates=['committed:sum', 'achieved:sum'],
+            )
+        }
+        for line in self:
+            committed, achieved = grouped.get(line, (0, 0))
+            line.committed_amount = committed
+            line.achieved_amount = achieved
+            line.committed_percentage = line.budget_amount and (line.committed_amount / line.budget_amount)
+            line.achieved_percentage = line.budget_amount and (line.achieved_amount / line.budget_amount)
+
+    @api.depends('date_from', 'date_to')
+    def _compute_theoritical_amount(self):
+        today = fields.Date.context_today(self)
+        for line in self:
+            if not line.date_from or not line.date_to:
+                line.theoritical_amount = 0
+                line.theoritical_percentage = 0
+                continue
+
+            line_timedelta = line.date_to - line.date_from + timedelta(days=1)
+            elapsed_timedelta = min(max(today, line.date_from), line.date_to) - line.date_from + timedelta(days=1)
+            line.theoritical_amount = line_timedelta and (elapsed_timedelta.total_seconds() / line_timedelta.total_seconds()) * line.budget_amount
+            line.theoritical_percentage = line.budget_amount and (line.theoritical_amount / line.budget_amount)
+
+    def _read_group_select(self, aggregate_spec, query):
+        # flag achieved_amount/theoritical_amount as aggregatable
+        # and manually sum the values from the records in the group
+        if aggregate_spec in ('achieved_amount:sum', 'theoritical_amount:sum', 'theoritical_percentage:avg'):
+            return super()._read_group_select('id:recordset', query)
+        return super()._read_group_select(aggregate_spec, query)
+
+    def _read_group_postprocess_aggregate(self, aggregate_spec, raw_values):
+        if aggregate_spec in ('achieved_amount:sum', 'theoritical_amount:sum', 'theoritical_percentage:avg'):
+            field_name, op = aggregate_spec.split(':')
+            column = super()._read_group_postprocess_aggregate('id:recordset', raw_values)
+            if op == 'sum':
+                return (sum(records.mapped(field_name)) for records in column)
+            if op == 'avg':
+                return (sum(records.mapped(field_name)) / len(records) for records in column)
+        return super()._read_group_postprocess_aggregate(aggregate_spec, raw_values)
+
+    def action_open_budget_entries(self):
+        project_plan, other_plans = self.env['account.analytic.plan']._get_all_plans()
+        all_plan = project_plan + other_plans
+        domain = [('budget_analytic_id', '=', self.budget_analytic_id.id), ('budget_line_id', '=', self.id)]
+        for plan in all_plan:
+            fname = plan._column_name()
+            if self[fname]:
+                domain += [(fname, 'in', self[fname].ids)]
+        action = self.env['ir.actions.act_window']._for_xml_id('odex30_account_budget.budget_report_action')
+        action['domain'] = domain
+        return action
diff --git a/dev_odex30_accounting/odex30_account_budget/models/purchase_order.py b/dev_odex30_accounting/odex30_account_budget/models/purchase_order.py
new file mode 100644
index 0000000..b1f66e4
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_budget/models/purchase_order.py
@@ -0,0 +1,37 @@
+from odoo import fields, models, api
+
+
+class PurchaseOrder(models.Model):
+    _inherit = "purchase.order"
+
+    is_above_budget = fields.Boolean('Is Above Budget', compute='_compute_above_budget')
+    is_analytic = fields.Boolean('Is Analytic', compute='_compute_is_analytic')
+
+    @api.depends('order_line.analytic_distribution')
+    def _compute_is_analytic(self):
+        for order in self:
+            order.is_analytic = any(order.order_line.mapped('analytic_distribution'))
+
+    @api.depends('order_line.budget_line_ids', 'order_line.price_unit', 'order_line.product_qty', 'order_line.qty_invoiced', 'state')
+    def _compute_above_budget(self):
+        for order in self:
+            uncommitted_amount = sum(
+                line.price_unit * (line.product_qty - line.qty_invoiced)
+                for line in order.order_line if line.budget_line_ids
+            ) if order.state not in ('purchase', 'done') else 0
+            order.is_above_budget = any(
+                budget.committed_amount + uncommitted_amount > budget.budget_amount
+                for budget in order.order_line.mapped('budget_line_ids')
+            )
+
+    def action_budget(self):
+        self.ensure_one()
+        analytic_account_ids = [
+            int(account)
+            for line in self.order_line
+            for account_ids in (line.analytic_distribution or {})
+            for account in account_ids.split(',')
+        ]
+        action = self.env["ir.actions.actions"]._for_xml_id("odex30_account_budget.budget_report_action")
+        action['domain'] = [('auto_account_id', 'in', analytic_account_ids), ('budget_analytic_id.budget_type', '!=', 'revenue')]
+        return action
diff --git a/dev_odex30_accounting/odex30_account_budget/models/purchase_order_line.py b/dev_odex30_accounting/odex30_account_budget/models/purchase_order_line.py
new file mode 100644
index 0000000..e03d69a
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_budget/models/purchase_order_line.py
@@ -0,0 +1,62 @@
+from odoo import api, fields, models
+
+
+class PurchaseOrderLine(models.Model):
+    _inherit = "purchase.order.line"
+
+    analytic_json = fields.Json('Analytic JSON', compute='_compute_analytic_json', store=True)
+    is_above_budget = fields.Boolean('Is Above Budget', compute='_compute_above_budget')
+    budget_line_ids = fields.One2many('budget.line', compute='_compute_budget_line_ids', string='Budget Lines')
+
+    @api.depends('analytic_distribution')
+    def _compute_analytic_json(self):
+        for line in self:
+            distribution = []
+            for analytic_account_ids, percentage in (line.analytic_distribution or {}).items():
+                dist_dict = {'rate': float(percentage) / 100}
+                for analytic_account in self.env['account.analytic.account'].browse(map(int, analytic_account_ids.split(","))).exists():
+                    root_plan = analytic_account.root_plan_id
+                    dist_dict[root_plan._column_name()] = analytic_account.id
+                distribution.append(dist_dict)
+            line.analytic_json = distribution
+
+    @api.depends('analytic_distribution')
+    def _compute_budget_line_ids(self):
+        def get_domain(line):
+            if not self.env['budget.analytic'].has_access('read'):
+                return False
+            if line.analytic_json and line.product_qty - line.qty_received > 0:
+                project_plan, other_plans = self.env['account.analytic.plan']._get_all_plans()
+                domain_to_add = set()
+                for plan in project_plan + other_plans:
+                    domain_to_add.add(plan._column_name())
+
+                for json in line.analytic_json:
+                    domain = [
+                        ('budget_analytic_id', 'any', (
+                            ('budget_type', '!=', 'revenue'),
+                            ('state', '=', 'confirmed'),
+                        )),
+                        ('date_from', '<=', line.order_id.date_order),
+                        ('date_to', '>=', line.order_id.date_order),
+                    ]
+                    for key, value in json.items():
+                        if key in self.env['budget.line']._fields:
+                            domain += [(key, '=', value)]
+                            domain_to_add.discard(key)
+                    for key in domain_to_add:
+                        domain += [(key, '=', False)]
+                    return tuple(domain)
+
+        for domain, lines in self.grouped(get_domain).items():
+            budget_lines = bool(domain) and self.env['budget.line'].search(list(domain))
+            for line in lines:
+                line.budget_line_ids = budget_lines
+
+    @api.depends('budget_line_ids', 'price_unit', 'product_qty', 'qty_invoiced')
+    def _compute_above_budget(self):
+        for line in self:
+            uncommitted_amount = 0
+            if line.order_id.state not in ('purchase', 'done'):
+                uncommitted_amount = line.price_unit * (line.product_qty - line.qty_invoiced)
+            line.is_above_budget = any(budget.committed_amount + uncommitted_amount > budget.budget_amount for budget in line.budget_line_ids)
diff --git a/dev_odex30_accounting/odex30_account_budget/reports/__init__.py b/dev_odex30_accounting/odex30_account_budget/reports/__init__.py
new file mode 100644
index 0000000..dce707c
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_budget/reports/__init__.py
@@ -0,0 +1,3 @@
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+from . import budget_report
diff --git a/dev_odex30_accounting/odex30_account_budget/reports/__pycache__/__init__.cpython-311.pyc b/dev_odex30_accounting/odex30_account_budget/reports/__pycache__/__init__.cpython-311.pyc
new file mode 100644
index 0000000..2cdd43c
Binary files /dev/null and b/dev_odex30_accounting/odex30_account_budget/reports/__pycache__/__init__.cpython-311.pyc differ
diff --git a/dev_odex30_accounting/odex30_account_budget/reports/__pycache__/budget_report.cpython-311.pyc b/dev_odex30_accounting/odex30_account_budget/reports/__pycache__/budget_report.cpython-311.pyc
new file mode 100644
index 0000000..ee2a99d
Binary files /dev/null and b/dev_odex30_accounting/odex30_account_budget/reports/__pycache__/budget_report.cpython-311.pyc differ
diff --git a/dev_odex30_accounting/odex30_account_budget/reports/budget_report.py b/dev_odex30_accounting/odex30_account_budget/reports/budget_report.py
new file mode 100644
index 0000000..78dfcdc
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_budget/reports/budget_report.py
@@ -0,0 +1,192 @@
+from odoo import fields, models
+from odoo.tools import SQL
+
+
+class BudgetReport(models.Model):
+    _name = 'budget.report'
+    _inherit = 'analytic.plan.fields.mixin'
+    _description = "Budget Report"
+    _auto = False
+    _order = False
+
+    date = fields.Date('Date')
+    res_model = fields.Char('Model', readonly=True)
+    res_id = fields.Many2oneReference('Document', model_field='res_model', readonly=True)
+    description = fields.Char('Description', readonly=True)
+    company_id = fields.Many2one('res.company', 'Company', readonly=True)
+    user_id = fields.Many2one('res.users', 'User', readonly=True)
+    line_type = fields.Selection([('budget', 'Budget'), ('committed', 'Committed'), ('achieved', 'Achieved')], 'Type', readonly=True)
+    budget = fields.Float('Budget', readonly=True)
+    committed = fields.Float('Committed', readonly=True)
+    achieved = fields.Float('Achieved', readonly=True)
+    budget_analytic_id = fields.Many2one('budget.analytic', 'Budget Analytic', readonly=True)
+    budget_line_id = fields.Many2one('budget.line', 'Budget Line', readonly=True)
+
+    def _get_bl_query(self, plan_fnames):
+        return SQL(
+            """
+            SELECT CONCAT('bl', bl.id::TEXT) AS id,
+                   bl.budget_analytic_id AS budget_analytic_id,
+                   bl.id AS budget_line_id,
+                   'budget.analytic' AS res_model,
+                   bl.budget_analytic_id AS res_id,
+                   bl.date_from AS date,
+                   ba.name AS description,
+                   bl.company_id AS company_id,
+                   NULL AS user_id,
+                   'budget' AS line_type,
+                   bl.budget_amount AS budget,
+                   0 AS committed,
+                   0 AS achieved,
+                   %(plan_fields)s
+              FROM budget_line bl
+              JOIN budget_analytic ba ON ba.id = bl.budget_analytic_id
+            """,
+            plan_fields=SQL(', ').join(self.env['budget.line']._field_to_sql('bl', fname) for fname in plan_fnames)
+        )
+
+    def _get_aal_query(self, plan_fnames):
+        return SQL(
+            """
+            SELECT CONCAT('aal', aal.id::TEXT) AS id,
+                   bl.budget_analytic_id AS budget_analytic_id,
+                   bl.id AS budget_line_id,
+                   'account.analytic.line' AS res_model,
+                   aal.id AS res_id,
+                   aal.date AS date,
+                   aal.name AS description,
+                   aal.company_id AS company_id,
+                   aal.user_id AS user_id,
+                   'achieved' AS line_type,
+                   0 AS budget,
+                   aal.amount * CASE WHEN ba.budget_type = 'expense' THEN -1 ELSE 1 END AS committed,
+                   aal.amount * CASE WHEN ba.budget_type = 'expense' THEN -1 ELSE 1 END AS achieved,
+                   %(analytic_fields)s
+              FROM account_analytic_line aal
+         LEFT JOIN budget_line bl ON (bl.company_id IS NULL OR aal.company_id = bl.company_id)
+                                 AND aal.date >= bl.date_from
+                                 AND aal.date <= bl.date_to
+                                 AND %(condition)s
+         LEFT JOIN account_account aa ON aa.id = aal.general_account_id
+         LEFT JOIN budget_analytic ba ON ba.id = bl.budget_analytic_id
+             WHERE CASE
+                       WHEN ba.budget_type = 'expense' THEN (
+                           SPLIT_PART(aa.account_type, '_', 1) = 'expense'
+                           OR (aa.account_type IS NULL AND aal.category NOT IN ('invoice', 'other'))
+                           OR (aa.account_type IS NULL AND aal.category = 'other' AND aal.amount < 0)
+                       )
+                       WHEN ba.budget_type = 'revenue' THEN (
+                           SPLIT_PART(aa.account_type, '_', 1) = 'income'
+                           OR (aa.account_type IS NULL AND aal.category = 'other' AND aal.amount > 0)
+                       )
+                       ELSE TRUE
+                   END
+                   AND (SPLIT_PART(aa.account_type, '_', 1) IN ('income', 'expense') OR aa.account_type IS NULL)
+            """,
+            analytic_fields=SQL(', ').join(self.env['account.analytic.line']._field_to_sql('aal', fname) for fname in plan_fnames),
+            condition=SQL(' AND ').join(SQL(
+                "(%(bl)s IS NULL OR %(aal)s = %(bl)s)",
+                bl=self.env['budget.line']._field_to_sql('bl', fname),
+                aal=self.env['budget.line']._field_to_sql('aal', fname),
+            ) for fname in plan_fnames)
+        )
+
+    def _get_pol_query(self, plan_fnames):
+        qty_invoiced_table = SQL(
+            """
+               SELECT SUM(
+                          CASE WHEN COALESCE(uom_aml.id != uom_pol.id, FALSE)
+                               THEN ROUND((aml.quantity / uom_aml.factor) * uom_pol.factor, -LOG(uom_pol.rounding)::integer)
+                               ELSE COALESCE(aml.quantity, 0)
+                          END
+                          * CASE WHEN am.move_type = 'in_invoice' THEN 1
+                                 WHEN am.move_type = 'in_refund' THEN -1
+                                 ELSE 0 END
+                      ) AS qty_invoiced,
+                      pol.id AS pol_id
+                 FROM purchase_order po
+            LEFT JOIN purchase_order_line pol ON pol.order_id = po.id
+            LEFT JOIN account_move_line aml ON aml.purchase_line_id = pol.id
+            LEFT JOIN account_move am ON aml.move_id = am.id
+            LEFT JOIN uom_uom uom_aml ON uom_aml.id = aml.product_uom_id
+            LEFT JOIN uom_uom uom_pol ON uom_pol.id = pol.product_uom
+            LEFT JOIN uom_category uom_category_aml ON uom_category_aml.id = uom_pol.category_id
+            LEFT JOIN uom_category uom_category_pol ON uom_category_pol.id = uom_pol.category_id
+                WHERE aml.parent_state = 'posted'
+             GROUP BY pol.id
+        """)
+        return SQL(
+            """
+            SELECT (pol.id::TEXT || '-' || ROW_NUMBER() OVER (PARTITION BY pol.id ORDER BY pol.id)) AS id,
+                   bl.budget_analytic_id AS budget_analytic_id,
+                   bl.id AS budget_line_id,
+                   'purchase.order' AS res_model,
+                   po.id AS res_id,
+                   po.date_order AS date,
+                   pol.name AS description,
+                   pol.company_id AS company_id,
+                   po.user_id AS user_id,
+                   'committed' AS line_type,
+                   0 AS budget,
+                   COALESCE(pol.price_subtotal::FLOAT, pol.price_unit::FLOAT * pol.product_qty)
+                        / COALESCE(NULLIF(pol.product_qty, 0), 1)
+                        * (pol.product_qty - COALESCE(qty_invoiced_table.qty_invoiced, 0))
+                        / po.currency_rate
+                        * (a.rate)
+                        * CASE WHEN ba.budget_type = 'both' THEN -1 ELSE 1 END AS committed,
+                   0 AS achieved,
+                   %(analytic_fields)s
+              FROM purchase_order_line pol
+         LEFT JOIN (%(qty_invoiced_table)s) qty_invoiced_table ON qty_invoiced_table.pol_id = pol.id
+              JOIN purchase_order po ON pol.order_id = po.id AND po.state in ('purchase', 'done')
+        CROSS JOIN JSONB_TO_RECORDSET(pol.analytic_json) AS a(rate FLOAT, %(field_cast)s)
+         LEFT JOIN budget_line bl ON (bl.company_id IS NULL OR po.company_id = bl.company_id)
+                                 AND po.date_order >= bl.date_from
+                                 AND date_trunc('day', po.date_order) <= bl.date_to
+                                 AND %(condition)s
+         LEFT JOIN budget_analytic ba ON ba.id = bl.budget_analytic_id
+             WHERE pol.product_qty > COALESCE(qty_invoiced_table.qty_invoiced, 0)
+               AND ba.budget_type != 'revenue'
+            """,
+            analytic_fields=SQL(', ').join(self.env['account.analytic.line']._field_to_sql('a', fname) for fname in plan_fnames),
+            qty_invoiced_table=qty_invoiced_table,
+            field_cast=SQL(', ').join(SQL('%s FLOAT', SQL.identifier(fname)) for fname in plan_fnames),
+            condition=SQL(' AND ').join(SQL(
+                "(%(bl)s IS NULL OR %(a)s = %(bl)s)",
+                bl=self.env['budget.line']._field_to_sql('bl', fname),
+                a=self.env['budget.line']._field_to_sql('a', fname),
+            ) for fname in plan_fnames)
+        )
+
+    @property
+    def _table_query(self):
+        self.env['account.move.line'].flush_model()
+        self.env['budget.line'].flush_model()
+        self.env['account.analytic.line'].flush_model()
+        self.env['purchase.order'].flush_model()
+        self.env['purchase.order.line'].flush_model()
+        project_plan, other_plans = self.env['account.analytic.plan']._get_all_plans()
+        plan_fnames = [
+            fname
+            for plan in project_plan | other_plans
+            if (fname := plan._column_name()) in self
+        ]
+        return SQL(
+            "%s UNION ALL %s UNION ALL %s",
+            self._get_bl_query(plan_fnames),
+            self._get_aal_query(plan_fnames),
+            self._get_pol_query(plan_fnames),
+        )
+
+    def action_open_reference(self):
+        self.ensure_one()
+        if self.res_model == 'account.analytic.line':
+            analytical_line = self.env['account.analytic.line'].browse(self.res_id)
+            if analytical_line.move_line_id:
+                return analytical_line.move_line_id.action_open_business_doc()
+        return {
+            'type': 'ir.actions.act_window',
+            'res_model': self.res_model,
+            'view_mode': 'form',
+            'res_id': self.res_id,
+        }
diff --git a/dev_odex30_accounting/odex30_account_budget/reports/budget_report_view.xml b/dev_odex30_accounting/odex30_account_budget/reports/budget_report_view.xml
new file mode 100644
index 0000000..985bb9c
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_budget/reports/budget_report_view.xml
@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <data>
+
+        <record id="budget_report_view_tree" model="ir.ui.view">
+            <field name="name">budget.report.view.list</field>
+            <field name="model">budget.report</field>
+            <field name="arch" type="xml">
+                <list string="Budget Report" create="0" action="action_open_reference" type="object">
+                    <field name="date"/>
+                    <field name="description"/>
+                    <field name="account_id"/>
+                    <field name="company_id" optional="hide"/>
+                    <field name="user_id" optional="hide"/>
+                    <field name="line_type" optional="hide"/>
+                    <field name="budget" sum="Total Budget"/>
+                    <field name="committed" sum="Total Committed"/>
+                    <field name="achieved" sum="Total Achieved"/>
+                </list>
+            </field>
+        </record>
+
+        <record id="budget_report_view_search" model="ir.ui.view">
+            <field name="name">budget.report.view.search</field>
+            <field name="model">budget.report</field>
+            <field name="arch" type="xml">
+                <search string="Budget Report">
+                    <field name="budget_analytic_id"/>
+                    <field name="description"/>
+                    <field name="user_id"/>
+                    <field name="account_id"/>
+                    <field name="company_id"/>
+                    <field name="date"/>
+                    <filter string="Budget" name="budget" domain="[('line_type','=','budget')]"/>
+                    <filter string="Achieved" name="achieved" domain="[('line_type','=','achieved')]"/>
+                    <filter string="Committed" name="committed" domain="[('line_type','=','committed')]"/>
+                    <separator/>
+                    <filter string="In a Budget" name="in_a_budget" domain="[('budget_analytic_id', '=', False)]"/>
+                    <filter string="Open Budget" name="open_budget" domain="[('budget_analytic_id.state', '=', 'confirmed')]"/>
+                    <separator/>
+                    <group expand="0" string="Group By">
+                        <filter string="Date" name="date" context="{'group_by':'date'}"/>
+                        <filter string="Type" name="line_type" context="{'group_by':'line_type'}"/>
+                        <filter string="Budget" name="budget_analytic_id" context="{'group_by':'budget_analytic_id'}"/>
+                        <separator/>
+                        <filter string="Account" name="account_id" context="{'group_by':'account_id'}"/>
+                        <separator/>
+                        <filter string="User" name="user_id" context="{'group_by':'user_id'}"/>
+                    </group>
+                </search>
+            </field>
+        </record>
+
+        <record id="budget_report_view_graph" model="ir.ui.view">
+            <field name="name">budget.report.view.graph</field>
+            <field name="model">budget.report</field>
+            <field name="arch" type="xml">
+                <graph string="Budget Report" type="line">
+                    <field name="date" type="row"/>
+                    <field name="account_id" type="col"/>
+                    <field name="committed" type="measure"/>
+                </graph>
+            </field>
+        </record>
+
+        <record id="budget_report_view_pivot" model="ir.ui.view">
+            <field name="name">budget.report.view.pivot</field>
+            <field name="model">budget.report</field>
+            <field name="arch" type="xml">
+                <pivot string="Budget Report">
+                    <field name="budget_analytic_id" type="col"/>
+                    <field name="account_id"/>  <!-- do not copy the `type` with _patch_view -->
+                    <field name="account_id" type="row"/>
+                    <field name="budget" type="measure"/>
+                    <field name="committed" type="measure"/>
+                    <field name="achieved" type="measure"/>
+                </pivot>
+            </field>
+        </record>
+
+        <record id="budget_report_action" model="ir.actions.act_window">
+            <field name="name">Budget Report</field>
+            <field name="res_model">budget.report</field>
+            <field name="view_mode">pivot,list,graph</field>
+            <field name="context">{"search_default_open_budget":1}</field>
+        </record>
+
+        <menuitem id="budget_report_menu" name="Budget Report"
+                  groups="account.group_account_readonly"
+                  parent="account.account_reports_management_menu" action="budget_report_action"/>
+    </data>
+</odoo>
diff --git a/dev_odex30_accounting/odex30_account_budget/security/account_budget_security.xml b/dev_odex30_accounting/odex30_account_budget/security/account_budget_security.xml
new file mode 100644
index 0000000..20e314a
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_budget/security/account_budget_security.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo noupdate="1">
+
+    <record id="budget_comp_rule" model="ir.rule">
+        <field name="name">Budget multi-company</field>
+        <field name="model_id" ref="model_budget_analytic"/>
+        <field eval="True" name="global"/>
+        <field name="domain_force">['|', ('company_id', 'in', company_ids), ('company_id', '=', False)]</field>
+    </record>
+
+    <record id="budget_lines_comp_rule" model="ir.rule">
+        <field name="name">Budget lines multi-company</field>
+        <field name="model_id" ref="model_budget_line"/>
+        <field eval="True" name="global"/>
+        <field name="domain_force">['|', ('company_id', 'in', company_ids), ('company_id', '=', False)]</field>
+    </record>
+
+    <record id="budget_report_comp_rule" model="ir.rule">
+        <field name="name">Budget report multi-company</field>
+        <field name="model_id" ref="model_budget_report"/>
+        <field name="domain_force">['|', ('company_id', 'in', company_ids), ('company_id', '=', False)]</field>
+    </record>
+
+    <record model="res.users" id="base.user_root">
+        <field eval="[(4,ref('analytic.group_analytic_accounting'))]" name="groups_id"/>
+    </record>
+
+    <record model="res.users" id="base.user_admin">
+        <field eval="[(4,ref('analytic.group_analytic_accounting'))]" name="groups_id"/>
+    </record>
+
+</odoo>
diff --git a/dev_odex30_accounting/odex30_account_budget/security/ir.model.access.csv b/dev_odex30_accounting/odex30_account_budget/security/ir.model.access.csv
new file mode 100644
index 0000000..56d56aa
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_budget/security/ir.model.access.csv
@@ -0,0 +1,8 @@
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_budget_analytic,budget.analytic,model_budget_analytic,account.group_account_readonly,1,0,0,0
+access_budget_analytic_accountant,budget.analytic accountant,model_budget_analytic,account.group_account_user,1,1,1,1
+access_budget_readonly,budget.line manager,model_budget_line,account.group_account_readonly,1,0,0,0
+access_budget_line_accountant,budget.line accountant,model_budget_line,account.group_account_user,1,1,1,1
+access_budget,budget.line manager,model_budget_line,base.group_user,1,1,1,0
+account_budget.access_budget_report,access_budget_report,odex30_account_budget.model_budget_report,base.group_user,1,0,0,0
+access_budget_split_wizard,budget.split.wizard,model_budget_split_wizard,account.group_account_user,1,1,1,1
diff --git a/dev_odex30_accounting/odex30_account_budget/tests/__init__.py b/dev_odex30_accounting/odex30_account_budget/tests/__init__.py
new file mode 100644
index 0000000..5fc37d4
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_budget/tests/__init__.py
@@ -0,0 +1,9 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+from . import common
+from . import test_account_budget
+from . import test_commited_achieved_amount
+from . import test_purchase_order
+from . import test_theoreticalamount
+from . import test_uncommitted_amount
diff --git a/dev_odex30_accounting/odex30_account_budget/tests/common.py b/dev_odex30_accounting/odex30_account_budget/tests/common.py
new file mode 100644
index 0000000..4d1080e
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_budget/tests/common.py
@@ -0,0 +1,207 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+from odoo.addons.account.tests.common import AccountTestInvoicingCommon
+from odoo.fields import Command
+
+
+class TestAccountBudgetCommon(AccountTestInvoicingCommon):
+
+    @classmethod
+    def setUpClass(cls):
+        super().setUpClass()
+
+        # ==== Products ====
+        cls.product_a = cls.env['product.product'].create({
+            'name': 'product_a',
+            'standard_price': 100.0,
+            'supplier_taxes_id': False
+        })
+        cls.product_b = cls.env['product.product'].create({
+            'name': 'product_b',
+            'standard_price': 100.0,
+            'supplier_taxes_id': False
+        })
+
+        # ==== Analytic accounts ====
+
+        cls.analytic_plan_projects = cls.env['account.analytic.plan'].create({'name': 'Projects'})
+        cls.analytic_plan_departments = cls.env['account.analytic.plan'].create({'name': 'Departments test'})
+
+        cls.project_column_name = cls.analytic_plan_projects._column_name()
+        cls.department_column_name = cls.analytic_plan_departments._column_name()
+
+        cls.analytic_account_partner_a = cls.env['account.analytic.account'].create({
+            'name': 'analytic_account_partner_a',
+            'partner_id': cls.partner_a.id,
+            'plan_id': cls.analytic_plan_projects.id,
+        })
+        cls.analytic_account_partner_b = cls.env['account.analytic.account'].create({
+            'name': 'analytic_account_partner_b',
+            'partner_id': cls.partner_b.id,
+            'plan_id': cls.analytic_plan_projects.id,
+        })
+        cls.analytic_account_administratif = cls.env['account.analytic.account'].create({
+            'name': 'analytic_account_administratif',
+            'plan_id': cls.analytic_plan_departments.id,
+        })
+        cls.analytic_account_administratif_2 = cls.env['account.analytic.account'].create({
+            'name': 'analytic_account_administratif_2',
+            'plan_id': cls.analytic_plan_departments.id,
+        })
+
+        # ==== Budget Analytic ====
+
+        cls.budget_analytic_revenue = cls.env['budget.analytic'].create({
+            'name': 'Budget 2019: Revenue',
+            'date_from': '2019-01-01',
+            'date_to': '2019-12-31',
+            'budget_type': 'revenue',
+            'state': 'draft',
+            'user_id': cls.env.ref('base.user_admin').id,
+            'budget_line_ids': [
+                Command.create({
+                    'budget_amount': 35000,
+                    cls.project_column_name: cls.analytic_account_partner_a.id,
+                }),
+                Command.create({
+                    'budget_amount': 10000,
+                    cls.project_column_name: cls.analytic_account_partner_b.id,
+                }),
+                Command.create({
+                    cls.project_column_name: cls.analytic_account_partner_b.id,
+                    cls.department_column_name: cls.analytic_account_administratif.id,
+                    'budget_amount': 10000.0,
+                }),
+            ]
+        })
+
+        cls.budget_analytic_expense = cls.env['budget.analytic'].create({
+            'name': 'Budget 2019: Expense',
+            'date_from': '2019-01-01',
+            'date_to': '2019-12-31',
+            'budget_type': 'expense',
+            'state': 'draft',
+            'user_id': cls.env.ref('base.user_admin').id,
+            'budget_line_ids': [
+                Command.create({
+                    'budget_amount': 55000,
+                    cls.project_column_name: cls.analytic_account_partner_a.id,
+                }),
+                Command.create({
+                    'budget_amount': 9000,
+                    cls.project_column_name: cls.analytic_account_partner_b.id,
+                }),
+                Command.create({
+                    cls.project_column_name: cls.analytic_account_partner_b.id,
+                    cls.department_column_name: cls.analytic_account_administratif.id,
+                    'budget_amount': 10000.0,
+                }),
+            ]
+        })
+
+        cls.budget_analytic_both = cls.env['budget.analytic'].create({
+            'name': 'Budget 2019: Both',
+            'date_from': '2019-01-01',
+            'date_to': '2019-12-31',
+            'budget_type': 'both',
+            'state': 'draft',
+            'user_id': cls.env.ref('base.user_admin').id,
+            'budget_line_ids': [
+                Command.create({
+                    'budget_amount': 20000,
+                    cls.project_column_name: cls.analytic_account_partner_a.id,
+                }),
+                Command.create({
+                    'budget_amount': 5000,
+                    cls.project_column_name: cls.analytic_account_partner_b.id,
+                }),
+                Command.create({
+                    cls.project_column_name: cls.analytic_account_partner_b.id,
+                    cls.department_column_name: cls.analytic_account_administratif.id,
+                    'budget_amount': 10000.0,
+                }),
+            ]
+        })
+
+        # ==== Purchase Order ====
+
+        purchase_order = cls.env['purchase.order'].create({
+            'partner_id': cls.partner_a.id,
+            'date_order': '2019-01-10',
+            'order_line': [
+                Command.create({
+                    'product_id': cls.product_a.id,
+                    'product_qty': 10,
+                    'analytic_distribution': {cls.analytic_account_partner_a.id: 100},
+                }),
+                Command.create({
+                    'product_id': cls.product_a.id,
+                    'product_qty': 10,
+                    'analytic_distribution': {"%s,%s" % (cls.analytic_account_partner_a.id, cls.analytic_account_administratif.id): 100},
+                }),
+                Command.create({
+                    'product_id': cls.product_b.id,
+                    'product_qty': 10,
+                    'analytic_distribution': {cls.analytic_account_partner_b.id: 100},
+                }),
+                Command.create({
+                    'product_id': cls.product_b.id,
+                    'product_qty': 10,
+                    'analytic_distribution': {"%s,%s" % (cls.analytic_account_partner_b.id, cls.analytic_account_administratif.id): 100},
+                }),
+            ]
+        })
+        purchase_order.order_line._compute_analytic_json()
+        purchase_order.button_confirm()
+        purchase_order.write({
+            'order_line': [
+                Command.update(purchase_order.order_line.sorted()[0].id, {'qty_received': 1}),
+                Command.update(purchase_order.order_line.sorted()[1].id, {'qty_received': 3}),
+                Command.update(purchase_order.order_line.sorted()[2].id, {'qty_received': 6}),
+                Command.update(purchase_order.order_line.sorted()[3].id, {'qty_received': 5}),
+            ]
+        })
+        purchase_order.action_create_invoice()
+        purchase_order.invoice_ids.write({'invoice_date': '2019-01-10'})
+        cls.purchase_order = purchase_order
+
+        account = cls.company_data['default_account_revenue']
+        cls.out_invoice = cls.env['account.move'].create({
+            'move_type': 'out_invoice',
+            'partner_id': cls.partner_a.id,
+            'invoice_date': '2019-01-10',
+            'invoice_line_ids': [
+                Command.create({
+                    'product_id': cls.product_a.id,
+                    'analytic_distribution': {cls.analytic_account_partner_a.id: 100},
+                    'quantity': 2,
+                    'price_unit': 100,
+                    'account_id': account.id,
+                }),
+                Command.create({
+                    'product_id': cls.product_a.id,
+                    'analytic_distribution': {"%s,%s" % (cls.analytic_account_partner_a.id, cls.analytic_account_administratif.id): 100},
+                    'quantity': 4,
+                    'price_unit': 100,
+                    'account_id': account.id,
+                }),
+                Command.create({
+                    'product_id': cls.product_b.id,
+                    'analytic_distribution': {cls.analytic_account_partner_b.id: 100},
+                    'quantity': 7,
+                    'price_unit': 100,
+                    'account_id': account.id,
+                }),
+                Command.create({
+                    'product_id': cls.product_b.id,
+                    'analytic_distribution': {"%s,%s" % (cls.analytic_account_partner_b.id, cls.analytic_account_administratif.id): 100},
+                    'quantity': 6,
+                    'price_unit': 100,
+                    'account_id': account.id,
+                }),
+            ]
+        })
+
+    def assertBudgetLine(self, budget_line, *, committed, achieved):
+        budget_line.invalidate_recordset(['achieved_amount', 'committed_amount'])
+        self.assertRecordValues(budget_line, [{'committed_amount': committed, 'achieved_amount': achieved}])
diff --git a/dev_odex30_accounting/odex30_account_budget/tests/test_account_budget.py b/dev_odex30_accounting/odex30_account_budget/tests/test_account_budget.py
new file mode 100644
index 0000000..114ebc1
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_budget/tests/test_account_budget.py
@@ -0,0 +1,68 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+from .common import TestAccountBudgetCommon
+from odoo.tests import tagged
+from itertools import product
+
+
+@tagged('post_install', '-at_install')
+class TestAccountBudget(TestAccountBudgetCommon):
+
+    def test_account_budget(self):
+
+        budget = self.budget_analytic_revenue
+
+        self.assertRecordValues(budget, [{'state': 'draft'}])
+
+        # I pressed the confirm button to confirm the Budget
+        # Performing an action confirm on module budget.analytic
+        budget.action_budget_confirm()
+
+        # I check that budget is in "Confirmed" state
+        self.assertRecordValues(budget, [{'state': 'confirmed'}])
+
+        # I pressed the validate button to validate the Budget
+        # Performing an action validate on module budget.analytic
+        budget.action_budget_confirm()
+
+        # I check that budget is in "Validated" state
+        self.assertRecordValues(budget, [{'state': 'confirmed'}])
+
+        # I pressed the revise button to set the Budget to "Revised" state
+        # Performing an action revise on module budget.analytic
+        budget.create_revised_budget()
+
+        revised_budget = self.env['budget.analytic'].search([('parent_id', '=', budget.id)])
+        self.assertTrue(revised_budget, "The revised budget should have been created")
+
+        # I pressed the confirm button to confirm the Budget
+        # Performing an action confirm on module budget.analytic
+        revised_budget.action_budget_confirm()
+
+        # I check that revised_budget is in "Confirmed" state and budget is in "Revised" state
+        self.assertRecordValues(revised_budget, [{'state': 'confirmed'}])
+        self.assertRecordValues(budget, [{'state': 'revised'}])
+
+        # I pressed the done button to set the Revised Budget to "Done" state
+        # Performing an action done on module budget.analytic
+        revised_budget.action_budget_done()
+
+        # I check that revised_budget is in "Done" state
+        self.assertRecordValues(revised_budget, [{'state': 'done'}])
+
+    def test_budget_split(self):
+        # I created a budget split wizard with a date range and a period and a list of analytic plans
+        res = self.env['budget.split.wizard'].create({
+            'date_from': '2019-01-01',
+            'date_to': '2019-12-31',
+            'period': 'month',
+            'analytical_plan_ids': [(6, 0, self.analytic_plan_projects.ids + self.analytic_plan_departments.ids)]
+        }).action_budget_split()
+        self.assertTrue(res.get('domain'), "The budget split wizard should have created and returned a domain of budget.line records")
+        budget_lines = self.env['budget.line'].search(res.get('domain'))
+        account_dict = {rec._column_name(): rec.account_ids.ids for rec in self.analytic_plan_projects + self.analytic_plan_departments}
+        account_combinations = [dict(zip(account_dict.keys(), combination)) for combination in product(*account_dict.values())]
+        for line, combination in zip(budget_lines, account_combinations):
+            for column in combination:
+                self.assertEqual(line[column].id, combination[column], "The budget line should have the correct accounts set")
diff --git a/dev_odex30_accounting/odex30_account_budget/tests/test_commited_achieved_amount.py b/dev_odex30_accounting/odex30_account_budget/tests/test_commited_achieved_amount.py
new file mode 100644
index 0000000..8c5ced7
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_budget/tests/test_commited_achieved_amount.py
@@ -0,0 +1,669 @@
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+from odoo import Command
+from .common import TestAccountBudgetCommon
+from odoo.tests import tagged
+
+
+@tagged('post_install', '-at_install')
+class TestCommittedAchievedAmount(TestAccountBudgetCommon):
+
+    def create_other_category_aal(self):
+        self.env['account.analytic.line'].create({
+            'name': 'aal 1',
+            'date': '2019-01-10',
+            self.project_column_name: self.analytic_account_partner_a.id,
+            'amount': 200,
+        })
+        self.env['account.analytic.line'].create({
+            'name': 'aal 2',
+            'date': '2019-01-10',
+            self.project_column_name: self.analytic_account_partner_b.id,
+            'amount': 200,
+        })
+        self.env['account.analytic.line'].create({
+            'name': 'aal 3',
+            'date': '2019-01-10',
+            self.project_column_name: self.analytic_account_partner_a.id,
+            'amount': -100,
+        })
+        self.env['account.analytic.line'].create({
+            'name': 'aal 4',
+            'date': '2019-01-10',
+            self.project_column_name: self.analytic_account_partner_b.id,
+            'amount': -100,
+        })
+
+    def test_budget_revenue_committed_achieved_amount(self):
+        plan_a_line, plan_b_line, plan_b_admin_line = self.budget_analytic_revenue.budget_line_ids
+        self.assertEqual(plan_a_line.achieved_amount, 0)
+        self.assertEqual(plan_b_line.achieved_amount, 0)
+        self.assertEqual(plan_b_admin_line.achieved_amount, 0)
+        bill = self.purchase_order.invoice_ids
+
+        # Post Purchase order's bill also to make sure this doesn't affect the revenue budget
+        (bill + self.out_invoice).action_post()
+
+        self.env['purchase.order'].invalidate_model(['currency_rate'])
+        self.env['purchase.order.line'].invalidate_model(['qty_received', 'qty_invoiced', 'price_unit'])
+        self.env['budget.line'].invalidate_model(['achieved_amount', 'committed_amount'])
+        self.create_other_category_aal()
+
+        # 2 analytic lines with analytic_account_partner_a in an income account:
+        # {invoice line[0]: 200, invoice line[1]: 400}
+        # 1 positive analytic line with analytic_account_partner_a, "other" category and without a fiscal account:
+        # {aal 1: 200}
+        # Total Achieved = 800
+        self.assertEqual(plan_a_line.achieved_amount, 800.0)
+        # Committed should be same as budget type is revenue
+        self.assertEqual(plan_a_line.committed_amount, 800.0)
+
+        # 2 analytic lines with analytic_account_partner_b in an income account:
+        # {invoice line[2]: 700, invoice line[3]: 600}
+        # 1 positive analytic line with analytic_account_partner_b, "other" category and without a fiscal account:
+        # {aal 2: 200}
+        # Total Achieved = 1500
+        self.assertEqual(plan_b_line.achieved_amount, 1500.0)
+        # Committed should be same as budget type is revenue
+        self.assertEqual(plan_b_line.committed_amount, 1500.0)
+
+        # 1 analytic line with accounts analytic_account_partner_b and analytic_account_administratif
+        # invoice line[3]: 600
+        self.assertEqual(plan_b_admin_line.achieved_amount, 600.0)
+        # Committed should be same as budget type is revenue
+        self.assertEqual(plan_b_admin_line.committed_amount, 600.0)
+
+    def test_budget_analytic_expense_committed_achieved_amount(self):
+        plan_a_line, plan_b_line, plan_b_admin_line = self.budget_analytic_expense.budget_line_ids
+        self.assertEqual(plan_a_line.achieved_amount, 0)
+        self.assertEqual(plan_b_line.achieved_amount, 0)
+        self.assertEqual(plan_b_admin_line.achieved_amount, 0)
+        bill = self.purchase_order.invoice_ids
+        bill.write({'invoice_date': '2019-01-10'})
+        bill.action_post()
+
+        self.env['purchase.order'].invalidate_model(['currency_rate'])
+        self.env['purchase.order.line'].invalidate_model(['qty_received', 'qty_invoiced', 'price_unit'])
+        self.env['budget.line'].invalidate_model(['achieved_amount', 'committed_amount'])
+        self.create_other_category_aal()
+
+        # 2 analytic lines with account analytic_account_partner_a in an expense account:
+        # Bill line[0]: -100, line[1]: -300
+        # 1 negative analytic line with analytic_account_partner_a, "other" category and without a fiscal account:
+        # {aal 3: -100}
+        # Total Achieved = 500
+        self.assertEqual(plan_a_line.achieved_amount, 500.0)
+
+        # Product A have 2 PO lines with account analytic_account_partner_a in an expense account:
+        # - one for line[0] with 10 ordered at price 100
+        # - one for line[1] with 10 ordered at price 100
+        # Also, there's 1 negative analytic line with analytic_account_partner_a, "other" category and
+        # without a fiscal account that is not linked to a PO (aal 3: -100)
+        self.assertEqual(plan_a_line.committed_amount, 2100.0)
+
+        # 2 analytic lines with account analytic_account_partner_b in an expense account:
+        # Bill line[2]: -600, line[3]: -500
+        # 1 negative analytic line with analytic_account_partner_b, "other" category and without a fiscal account:
+        # {aal 4: -100}
+        # Total Achieved = 1200
+        self.assertEqual(plan_b_line.achieved_amount, 1200.0)
+
+        # Product B have 2 PO lines with account analytic_account_partner_b in an expense account:
+        # - one for line[2] with 10 ordered at price 100
+        # - one for line[3] with 10 ordered at price 100
+        # Also, there's 1 negative analytic line with analytic_account_partner_b, "other" category and
+        # without a fiscal account that is not linked to a PO (aal 4: -100)
+        self.assertEqual(plan_b_line.committed_amount, 2100.0)
+
+        # 1 analytic line with accounts analytic_account_partner_b and analytic_account_administratif
+        # in an expense account
+        # Bill line[3]: -500,
+        self.assertEqual(plan_b_admin_line.achieved_amount, 500.0)
+
+        # Product B have 1 PO line line[3] with 10 ordered at price 100 with analytic_account_partner_b
+        # and analytic_account_administratif in an expense account
+        self.assertEqual(plan_b_admin_line.committed_amount, 1000.0)
+
+        # A bill should impact the budget even if it is not linked to a PO
+        no_po_bill = self.env['account.move'].create({
+            'move_type': 'in_invoice',
+            'partner_id': self.partner_a.id,
+            'invoice_date': '2019-01-11',
+            'invoice_line_ids': [
+                Command.create({
+                    'product_id': self.product_a.id,
+                    'analytic_distribution': {self.analytic_account_partner_a.id: 100},
+                    'quantity': 3,
+                    'price_unit': 100,
+                    'account_id': self.company_data['default_account_expense'].id,
+                }),
+            ]
+        })
+        no_po_bill.action_post()
+        self.env['budget.line'].invalidate_model(['achieved_amount', 'committed_amount'])
+        self.assertEqual(plan_a_line.achieved_amount, 800.0)
+        self.assertEqual(plan_a_line.committed_amount, 2400.0)
+
+    def test_budget_analytic_expense_committed_amount_draft_bill(self):
+        """ Test that the committed amount stays correct while a PO has a bill which is still unposted.
+        The amount should not be 0.
+        """
+        # Draft the test purchase order.
+        self.purchase_order.button_draft()
+        # Create a new purchase order
+        purchase_order = self.env['purchase.order'].create({
+            'partner_id': self.partner_a.id,
+            'date_order': '2019-01-10',
+            'order_line': [
+                Command.create({
+                    'product_id': self.product_a.id,
+                    'product_qty': 1,
+                    'analytic_distribution': {self.analytic_account_partner_a.id: 100},
+                }),
+            ]
+        })
+        purchase_order.button_confirm()
+        purchase_order.order_line.qty_received = 1
+
+        # The confirmed purchase order should impact the analytic line committed amount.
+        plan_a_line = self.budget_analytic_expense.budget_line_ids[0]
+        # One PO line with an amount of 100 should be committed.
+        self.assertBudgetLine(plan_a_line, committed=100, achieved=0)
+
+        # Create the bill for the PO but do not post it. Committed amount should still be 100.
+        bill = self.env['account.move'].browse(purchase_order.action_create_invoice()['res_id'])
+        bill.invoice_date = '2019-01-10'
+        self.assertBudgetLine(plan_a_line, committed=100, achieved=0)
+
+        # Finally we post the bill. Committed amount AND achieved amount should be 100.
+        purchase_order.invoice_ids.action_post()
+        self.assertBudgetLine(plan_a_line, committed=100, achieved=100)
+
+    def test_budget_analytic_discount_and_included_tax_amounts(self):
+        """ Test that the committed and achieved amounts do not include discounts and included taxes """
+        # Draft the test purchase order.
+        self.purchase_order.button_draft()
+        # Adapt a tax for price_include testing
+        self.tax_purchase_a.price_include = True
+        self.tax_purchase_a.amount_type = 'division'
+        # Create a new purchase order
+        purchase_order = self.env['purchase.order'].create({
+            'partner_id': self.partner_a.id,
+            'date_order': '2019-01-10',
+            'order_line': [
+                Command.create({
+                    'product_id': self.product_a.id,
+                    'product_qty': 2,
+                    'discount': 10,
+                    'analytic_distribution': {self.analytic_account_partner_a.id: 100},
+                    'taxes_id': self.tax_purchase_a.ids,
+                }),
+            ]
+        })
+        purchase_order.button_confirm()
+        purchase_order.order_line.qty_received = 2
+
+        # The confirmed purchase order should impact the analytic line committed amount.
+        plan_a_line = self.budget_analytic_expense.budget_line_ids[0]
+        # One PO line with an amount of 153 should be committed.
+        self.assertBudgetLine(plan_a_line, committed=153, achieved=0)
+
+        # Create the bill for the PO but do not post it. Committed amount should still be 153.
+        bill = self.env['account.move'].browse(purchase_order.action_create_invoice()['res_id'])
+        bill.invoice_date = '2019-01-10'
+        self.assertBudgetLine(plan_a_line, committed=153, achieved=0)
+
+        # Finally we post the bill. Committed amount AND achieved amount should be 153.
+        purchase_order.invoice_ids.action_post()
+        self.assertBudgetLine(plan_a_line, committed=153, achieved=153)
+
+    def test_budget_multi_currency(self):
+        currency = self.setup_other_currency('EUR')
+        self.purchase_order.button_draft()
+        purchase_order = self.env['purchase.order'].create({
+            'partner_id': self.partner_a.id,
+            'date_order': '2019-01-10',
+            'currency_id': currency.id,
+            'order_line': [
+                Command.create({
+                    'product_id': self.product_a.id,
+                    'product_qty': 10,
+                    'analytic_distribution': {self.analytic_account_partner_a.id: 100},
+                }),
+            ]
+        })
+        purchase_order.button_confirm()
+        self.assertRecordValues(purchase_order, [{
+            'currency_rate': 2,
+            'amount_total': 2000,  # 10 * 100 * 2
+        }])
+
+        plan_a_line = self.budget_analytic_expense.budget_line_ids[0]
+        self.assertBudgetLine(plan_a_line, committed=1000, achieved=0)
+
+        purchase_order.order_line.qty_received = 2
+        bill = self.env['account.move'].browse(purchase_order.action_create_invoice()['res_id'])
+        self.assertRecordValues(bill, [{
+            'currency_id': currency.id,
+            'amount_total': 400,  # 2/10 of 2000, or 2 * 100 * 2
+            'amount_total_signed': -200
+        }])
+        bill.invoice_date = '2019-01-10'
+        bill.action_post()
+        self.assertBudgetLine(plan_a_line, committed=1000, achieved=200)
+
+    def test_budget_analytic_multiple_bills_from_po(self):
+        """ Test with multiple bills linked to a PO. """
+        # Draft the test purchase order.
+        self.purchase_order.button_draft()
+        # Create a new purchase order
+        purchase_order = self.env['purchase.order'].create({
+            'partner_id': self.partner_a.id,
+            'date_order': '2019-01-10',
+            'order_line': [
+                Command.create({
+                    'product_id': self.product_a.id,
+                    'product_qty': 10,
+                    'analytic_distribution': {self.analytic_account_partner_a.id: 100},
+                }),
+            ]
+        })
+        purchase_order.button_confirm()
+        plan_a_line = self.budget_analytic_expense.budget_line_ids[0]
+        self.assertBudgetLine(plan_a_line, committed=1000, achieved=0)
+
+        # Create bill for 5 units
+        purchase_order.order_line.qty_received = 5
+        bill = self.env['account.move'].browse(purchase_order.action_create_invoice()['res_id'])
+        bill.invoice_date = '2019-01-10'
+        self.assertBudgetLine(plan_a_line, committed=1000, achieved=0)
+        bill.action_post()
+        self.assertBudgetLine(plan_a_line, committed=1000, achieved=500)
+
+        # Create another bill for another 2 units
+        purchase_order.order_line.qty_received = 7
+        bill = self.env['account.move'].browse(purchase_order.action_create_invoice()['res_id'])
+        bill.invoice_date = '2019-01-10'
+        bill.action_post()
+        self.assertBudgetLine(plan_a_line, committed=1000, achieved=700)
+
+    def test_multiple_bills_from_po_multiple_uom(self):
+        """ Test with multiple bills linked to a PO and multiple UoM. """
+        self.purchase_order.button_draft()
+        gravel_ton = self.env['product.product'].create({
+            'name': 'Gravel 1T',
+            'uom_id': self.env.ref('uom.product_uom_ton').id,
+            'uom_po_id': self.env.ref('uom.product_uom_ton').id,
+            'standard_price': 1000,
+        })
+        gravel_kilo = self.env['product.product'].create({
+            'name': 'Gravel 1kg',
+            'uom_id': self.env.ref('uom.product_uom_kgm').id,
+            'uom_po_id': self.env.ref('uom.product_uom_kgm').id,
+            'standard_price': 1,
+        })
+        # Create a new purchase order
+        purchase_order = self.env['purchase.order'].create({
+            'partner_id': self.partner_a.id,
+            'date_order': '2019-01-10',
+            'order_line': [
+                Command.create({
+                    'product_id': gravel_ton.id,
+                    'product_qty': 3.5,
+                    'analytic_distribution': {self.analytic_account_partner_a.id: 100},
+                }),
+            ]
+        })
+        purchase_order.button_confirm()
+        plan_a_line = self.budget_analytic_expense.budget_line_ids[0]
+        self.assertBudgetLine(plan_a_line, committed=3500, achieved=0)
+
+        # Create bill for 2 tons
+        purchase_order.order_line.qty_received = 2
+        bill = self.env['account.move'].browse(purchase_order.action_create_invoice()['res_id'])
+        bill.invoice_date = '2019-01-10'
+        bill.action_post()
+        self.assertBudgetLine(plan_a_line, committed=3500, achieved=2000)
+
+        # Create another bill for 1500 kg
+        purchase_order.order_line.qty_received = 3.5
+        bill = self.env['account.move'].browse(purchase_order.action_create_invoice()['res_id'])
+        bill.invoice_line_ids.write({
+            'product_id': gravel_kilo.id,
+            'quantity': 1500,
+        })
+        bill.invoice_date = '2019-01-10'
+        self.assertBudgetLine(plan_a_line, committed=3500, achieved=2000)
+        bill.action_post()
+        self.assertBudgetLine(plan_a_line, committed=3500, achieved=3500)
+
+    def test_budget_analytic_both_committed_achieved_amount(self):
+        plan_a_line, plan_b_line, plan_b_admin_line = self.budget_analytic_both.budget_line_ids
+        self.assertEqual(plan_a_line.achieved_amount, 0)
+        self.assertEqual(plan_b_line.achieved_amount, 0)
+        self.assertEqual(plan_b_admin_line.achieved_amount, 0)
+        bill = self.purchase_order.invoice_ids
+        bill.write({'invoice_date': '2019-01-10'})
+
+        (bill + self.out_invoice).action_post()
+
+        self.env['purchase.order'].invalidate_model(['currency_rate'])
+        self.env['purchase.order.line'].invalidate_model(['qty_received', 'qty_invoiced', 'price_unit'])
+        self.env['budget.line'].invalidate_model(['achieved_amount', 'committed_amount'])
+        self.create_other_category_aal()
+
+        # 3 Negative and 3 Positive analytic lines positive with account analytic_account_partner_a:
+        # Bill line[0]: -100, line[1]: -300, Invoice line[0]: 200, line[1]: 400, aal 1: 200, aal 3: -100
+        # Total Achieved = (-100 + (-300) + 200 + 400 + 200 + (-100)) = 300
+        self.assertEqual(plan_a_line.achieved_amount, 300)
+
+        # Product A have 2 PO lines, one for line[0] with 10 order and 1 received and one for line[1] with 10 order and 3 received with account analytic_account_partner_a
+        # Committed = ((order - received) * price) + achieved = ((10-1) + (10-3)) * -100 + 300 = -1300
+        self.assertEqual(plan_a_line.committed_amount, -1300)
+
+        # 3 Negative and 3 Positive analytic lines positive with account analytic_account_partner_a:
+        # Bill line[2]: -600, line[3]: -500, Out Invoice line[2]: 700, line[3]: 600, aal 2: 200, aal 4: -100
+        # Total Achieved = ((-600) + (-500) + 700 + 600 + 200 + (-100)) = 300
+        self.assertEqual(plan_b_line.achieved_amount, 300)
+
+        # Product B have 2 PO lines, one for line[2] with 10 order and 6 received and one for line[3] with 10 order and 5 received with account analytic_account_partner_b
+        # Committed = ((order - received) * price) + achieved = ((10-6) + (10-5)) * -100 + 300 = -600
+        self.assertEqual(plan_b_line.committed_amount, -600)
+
+        # 1 Negative and 1 Positive lines with accounts analytic_account_partner_b and analytic_account_administratif
+        # Bill line[3]: -500 Out Bill line[3]: 600
+        # Total Achieved = ((-500) + 600) = 100
+        self.assertEqual(plan_b_admin_line.achieved_amount, 100)
+
+        # Product B have 1 PO line line[3] with 10 order and 5 received with analytic_account_partner_b and analytic_account_administratif
+        # Committed = ((order - received) * price) + achieved = ((10-5) * -100 + 100 = -400
+        self.assertEqual(plan_b_admin_line.committed_amount, -400)
+
+    def test_budget_analytic_misc_entry(self):
+        """ Even if an analytic distribution is set, only the accounts with type 'income'/'expense' should be taken
+        into account for the budgets.
+        """
+        self.purchase_order.button_draft()
+        journal_entry = self.env['account.move'].create({
+            'move_type': 'entry',
+            'partner_id': self.partner_a.id,
+            'invoice_date': '2019-01-10',
+            'date': '2019-01-10',
+            'invoice_line_ids': [
+                Command.create({
+                    'partner_id': self.partner_a.id,
+                    'account_id': self.company_data['default_account_expense'].id,
+                    'analytic_distribution': {self.analytic_account_partner_a.id: 100},
+                    'debit': 100,
+                }),
+                Command.create({
+                    'partner_id': self.partner_a.id,
+                    'account_id': self.company_data['default_account_assets'].id,
+                    'analytic_distribution': {self.analytic_account_partner_a.id: 100},
+                    'credit': 70,
+                }),
+                Command.create({
+                    'partner_id': self.partner_a.id,
+                    'account_id': self.company_data['default_account_assets'].id,
+                    'credit': 30,
+                }),
+            ],
+        })
+        journal_entry.action_post()
+
+        budget_both_line_a = self.budget_analytic_both.budget_line_ids[0]
+        self.assertEqual((budget_both_line_a.committed_amount, budget_both_line_a.achieved_amount), (-100, -100))
+
+        budget_expense_line_a = self.budget_analytic_expense.budget_line_ids[0]
+        self.assertEqual((budget_expense_line_a.committed_amount, budget_expense_line_a.achieved_amount), (100, 100))
+
+    def test_budget_analytic_expense_with_credit_note(self):
+        """ Test that credit note are taken into account. """
+        plan_a_line, plan_b_line, plan_b_admin_line = self.budget_analytic_expense.budget_line_ids
+        self.assertBudgetLine(plan_a_line, committed=2000, achieved=0)
+        self.assertBudgetLine(plan_b_line, committed=2000, achieved=0)
+        self.assertBudgetLine(plan_b_admin_line, committed=1000, achieved=0)
+        # Create a bill from PO
+        bill = self.purchase_order.invoice_ids
+        bill.write({'invoice_date': '2019-01-10'})
+        bill.action_post()
+        self.assertBudgetLine(plan_a_line, committed=2000, achieved=400)
+        self.assertBudgetLine(plan_b_line, committed=2000, achieved=1100)
+        self.assertBudgetLine(plan_b_admin_line, committed=1000, achieved=500)
+        # Create a credit note
+        reversal_wizard = self.env['account.move.reversal'].with_context(active_model='account.move', active_ids=bill.ids).create({
+            'journal_id': bill.journal_id.id,
+            'date': '2019-01-11'
+        })
+        reversal = reversal_wizard.reverse_moves()
+        self.env['account.move'].browse(reversal['res_id']).action_post()
+        self.assertBudgetLine(plan_a_line, committed=2000, achieved=0)
+        self.assertBudgetLine(plan_b_line, committed=2000, achieved=0)
+        self.assertBudgetLine(plan_b_admin_line, committed=1000, achieved=0)
+
+    def test_budget_analytic_purchase_order_last_budget_day(self):
+        """
+        Test that the committed amount is well computed when a PO is created on the last day of the budget range.
+        """
+        plan_a_line, plan_b_line, plan_b_admin_line = self.budget_analytic_expense.budget_line_ids
+        self.assertBudgetLine(plan_a_line, committed=2000, achieved=0)
+
+        # Create a PO on the last day of the budget range
+        purchase_order = self.env['purchase.order'].create({
+            'partner_id': self.partner_a.id,
+            'date_order': '2019-12-31 21:00:00',
+            'order_line': [
+                Command.create({
+                    'product_id': self.product_a.id,
+                    'product_qty': 10,
+                    'analytic_distribution': {self.analytic_account_partner_a.id: 100},
+                }),
+            ],
+        })
+        purchase_order.button_confirm()
+
+        self.assertBudgetLine(plan_a_line, committed=3000, achieved=0)
+
+        # Ensure that PO from next day does not impact the budget
+        purchase_order.button_cancel()
+        purchase_order.button_draft()
+        purchase_order.date_order = '2020-01-01 00:00:00'
+        purchase_order.button_confirm()
+
+        self.assertBudgetLine(plan_a_line, committed=2000, achieved=0)
+
+    def test_budget_report_with_purchase_order(self):
+        """ Test PO linked to analytic budget with budget_type = 'both' """
+        # Draft the test purchase order.
+        self.purchase_order.button_draft()
+        # Create a new purchase order
+        purchase_order = self.env['purchase.order'].create({
+            'partner_id': self.partner_a.id,
+            'date_order': '2019-01-10',
+            'order_line': [
+                Command.create({
+                    'product_id': self.product_a.id,
+                    'product_qty': 10,
+                    'analytic_distribution': {self.analytic_account_partner_a.id: 100},
+                }),
+            ]
+        })
+        purchase_order.button_confirm()
+        plan_a_line = self.budget_analytic_both.budget_line_ids[0]
+        self.assertBudgetLine(plan_a_line, committed=-1000, achieved=0)
+
+    def test_account_budget_company_shared(self):
+        """
+        Ensure that a shared budget aggregates values across companies,
+        and that filtering by company scopes it correctly.
+        """
+        # === Create shared budget ===
+        budget = self.env['budget.analytic'].create({
+            'name': 'Budget Shared',
+            'date_from': '2025-01-01',
+            'date_to': '2025-12-31',
+            'company_id': False,
+            'budget_line_ids': [
+                Command.create({
+                    'budget_amount': 2000,
+                    self.project_column_name: self.analytic_account_partner_a.id,
+                }),
+            ]
+        })
+        budget.action_budget_confirm()
+        line = budget.budget_line_ids[0]
+
+        # === Setup: Two companies ===
+        company_a = self.env.ref('base.main_company')
+        company_b = self.env['res.company'].search([('id', '!=', company_a.id)])[0]
+
+        # Ensure test user has access to both companies
+        self.env.user.write({
+            'company_ids': [(6, 0, [company_a.id, company_b.id])],
+            'company_id': company_a.id,
+        })
+
+        # === PO and Bill for Company A ===
+        po_a = self.env['purchase.order'].create({
+            'partner_id': self.partner_a.id,
+            'company_id': company_a.id,
+            'date_order': '2025-01-10',
+            'order_line': [
+                Command.create({
+                    'product_id': self.product_a.id,
+                    'product_qty': 1,
+                    'price_unit': 1000,
+                    'analytic_distribution': {self.analytic_account_partner_a.id: 100},
+                }),
+            ]
+        })
+        po_a.button_confirm()
+
+        # === PO and Bill for Company B ===
+        po_b = self.env['purchase.order'].create({
+            'partner_id': self.partner_a.id,
+            'company_id': company_b.id,
+            'date_order': '2025-01-10',
+            'order_line': [
+                Command.create({
+                    'product_id': self.product_a.id,
+                    'product_qty': 1,
+                    'price_unit': 1000,
+                    'analytic_distribution': {self.analytic_account_partner_a.id: 100},
+                }),
+            ]
+        })
+        po_b.button_confirm()
+        # === Check shared totals ===
+        self.assertEqual(line.committed_amount, 2000.0, "Shared committed should be 2000")
+        self.assertEqual(line.achieved_amount, 0.0, "Shared achieved should be 1000")
+
+        po_a.order_line.qty_received = 0.5
+        bill_a = self.env['account.move'].browse(po_a.action_create_invoice()['res_id'])
+        bill_a.invoice_date = '2025-01-15'
+        bill_a.sudo().action_post()
+
+        po_b.order_line.qty_received = 0.5
+        bill_b = self.env['account.move'].with_company(company_b).browse(po_b.action_create_invoice()['res_id'])
+        bill_b.invoice_date = '2025-01-15'
+        bill_b.action_post()
+
+        self.env['budget.line'].invalidate_model(['committed_amount', 'achieved_amount'])
+        # === Check shared totals ===
+        self.assertEqual(line.committed_amount, 2000.0, "Shared committed should be 2000")
+        self.assertEqual(line.achieved_amount, 1000.0, "Shared achieved should be 1000")
+
+        # === Filter to Company A only ===
+        budget.company_id = company_a.id
+        self.env['budget.line'].invalidate_model(['committed_amount', 'achieved_amount'])
+
+        # === Check filtered totals ===
+        self.assertEqual(line.committed_amount, 1000.0, "Company A committed should be 1000")
+        self.assertEqual(line.achieved_amount, 500.0, "Company A committed should be 1000")
+
+    def test_budget_analytic_expense_committed_amount_negative_price(self):
+        """ Test that po lines with negative unit price does not create committed amount
+            in budget report
+        """
+        # Reset to draft the existing purchase order
+        self.purchase_order.button_draft()
+        purchase_order = self.env['purchase.order'].create({
+            'partner_id': self.partner_a.id,
+            'date_order': '2019-01-10',
+            'order_line': [
+                Command.create({
+                    'product_id': self.product_a.id,
+                    'price_unit': 100,
+                    'analytic_distribution': {self.analytic_account_partner_a.id: 100},
+                }),
+                Command.create({
+                    'product_id': self.product_b.id,
+                    'price_unit': -10,
+                    'analytic_distribution': {self.analytic_account_partner_a.id: 100},
+                })],
+        })
+        purchase_order.button_confirm()
+        purchase_order.write({
+            'order_line': [
+                Command.update(purchase_order.order_line[0].id, {'qty_received': 1}),
+                Command.update(purchase_order.order_line[1].id, {'qty_received': 1}),
+            ]
+        })
+        purchase_order.action_create_invoice()
+        purchase_order.invoice_ids.write({'invoice_date': '2019-01-10'})
+        purchase_order.invoice_ids.action_post()
+
+        # The discount line should impact both amounts of the budget line
+        plan_a_line = self.budget_analytic_expense.budget_line_ids[0]
+        self.assertBudgetLine(plan_a_line, committed=90, achieved=90)
+
+    def test_account_budget_overlapping_accounts(self):
+        """
+        Ensure that committed and achieved amounts in budget report are not collected
+        twice when the analytic distribution contains both accounts defined in separate
+        budget lines
+        """
+
+        # Create a budget with 2 lines having different plan and analytic account
+        budget = self.env['budget.analytic'].create({
+            'name': 'Test Budget',
+            'date_from': '2025-01-01',
+            'date_to': '2025-12-31',
+            'budget_line_ids': [
+                Command.create({
+                    'budget_amount': 500,
+                    self.project_column_name: self.analytic_account_partner_a.id,
+                }),
+                Command.create({
+                    'budget_amount': 600,
+                    self.department_column_name: self.analytic_account_administratif.id,
+                }),
+            ]
+        })
+        budget.action_budget_confirm()
+        line = budget.budget_line_ids[0]
+
+        # Create a bill having both analytic accounts assigned to the same line
+        bill = self.env['account.move'].create({
+            'move_type': 'in_invoice',
+            'partner_id': self.partner_a.id,
+            'invoice_date': '2025-01-10',
+            'invoice_line_ids': [
+                Command.create({
+                    'product_id': self.product_a.id,
+                    'analytic_distribution': {
+                        f'{self.analytic_account_partner_a.id}, {self.analytic_account_administratif.id}': 100,
+                    },
+                    'quantity': 1,
+                    'price_unit': 100,
+                    'account_id': self.company_data['default_account_expense'].id,
+                }),
+            ]
+        })
+        bill.action_post()
+
+        self.assertBudgetLine(line, committed=100.0, achieved=100.0)
+
+        # Ensure amount in budget line report is equal to line amount
+        action = line.action_open_budget_entries()
+        report_lines = self.env['budget.report'].search(action['domain'])
+        self.assertEqual(sum(line.committed for line in report_lines), 100.0)
diff --git a/dev_odex30_accounting/odex30_account_budget/tests/test_purchase_order.py b/dev_odex30_accounting/odex30_account_budget/tests/test_purchase_order.py
new file mode 100644
index 0000000..90b1919
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_budget/tests/test_purchase_order.py
@@ -0,0 +1,75 @@
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+from .common import TestAccountBudgetCommon
+from odoo import Command
+from odoo.tests import tagged
+
+
+@tagged('post_install', '-at_install')
+class TestPurchaseOrder(TestAccountBudgetCommon):
+
+    def test_access_purchase_order(self):
+        """ Make sure a purchase manager can access a purchase order linked to a budget. """
+
+        self.budget_analytic_expense.action_budget_confirm()
+        purchase_partner = self.env['res.partner'].create({'name': 'Purchaser'})
+        purchase_user = self.env['res.users'].create({
+            'login': 'Purchaser',
+            'partner_id': purchase_partner.id,
+            'groups_id': [Command.set(self.env.ref('purchase.group_purchase_manager').ids)],
+        })
+
+        self.assertFalse(
+            self.purchase_order.with_user(purchase_user).order_line.budget_line_ids,
+            " Purchase Order should be accessible by purchase manager even without accounting rights. "
+        )
+
+    def test_purchase_order_is_above_budget(self):
+        """ Test that is_above_budget field is computed correctly """
+        # budget amount of 10000.0 for "analytic_account_partner_b" and "analytic_account_administratif"
+        self.budget_analytic_expense.action_budget_confirm()
+        # PO that is not above budget
+        po_1 = self.env['purchase.order'].create({
+            'partner_id': self.partner_a.id,
+            'date_order': '2019-01-10',
+            'order_line': [
+                # the first line should be ignored as one of the analytic account is missing
+                Command.create({
+                    'product_id': self.product_a.id,
+                    'price_unit': 1000.0,
+                    'product_qty': 100,
+                    'analytic_distribution': {self.analytic_account_administratif.id: 100},
+                }),
+                Command.create({
+                    'product_id': self.product_b.id,
+                    'price_unit': 1000.0,
+                    'product_qty': 1,
+                    'analytic_distribution': {"%s,%s" % (self.analytic_account_partner_b.id, self.analytic_account_administratif.id): 100},
+                }),
+            ]
+        })
+        self.assertFalse(po_1.is_above_budget)
+        self.assertFalse(po_1.order_line[0].is_above_budget)
+        self.assertFalse(po_1.order_line[1].is_above_budget)
+        # PO that is above budget
+        po_2 = self.env['purchase.order'].create({
+            'partner_id': self.partner_a.id,
+            'date_order': '2019-01-10',
+            'order_line': [
+                Command.create({
+                    'product_id': self.product_a.id,
+                    'price_unit': 1000.0,
+                    'product_qty': 100,
+                    'analytic_distribution': {"%s,%s" % (self.analytic_account_partner_b.id, self.analytic_account_administratif.id): 100},
+                }),
+                Command.create({
+                    'product_id': self.product_b.id,
+                    'price_unit': 1000.0,
+                    'product_qty': 1,
+                    'analytic_distribution': {"%s,%s" % (self.analytic_account_partner_b.id, self.analytic_account_administratif.id): 100},
+                }),
+            ]
+        })
+        self.assertTrue(po_2.is_above_budget)
+        self.assertTrue(po_2.order_line[0].is_above_budget)
+        self.assertFalse(po_2.order_line[1].is_above_budget)
diff --git a/dev_odex30_accounting/odex30_account_budget/tests/test_theoreticalamount.py b/dev_odex30_accounting/odex30_account_budget/tests/test_theoreticalamount.py
new file mode 100644
index 0000000..7303542
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_budget/tests/test_theoreticalamount.py
@@ -0,0 +1,52 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+from .common import TestAccountBudgetCommon
+from odoo.tests import tagged
+
+from freezegun import freeze_time
+
+
+@tagged('post_install', '-at_install')
+class TestTheoreticalAmount(TestAccountBudgetCommon):
+    
+    @classmethod
+    def setUpClass(cls):
+        super().setUpClass()
+        cls.budget_analytic = cls.env['budget.analytic'].create({
+            'name': 'test budget name',
+            'date_from': '2018-01-01',
+            'date_to': '2018-12-31',
+        })
+
+    def assertTheoricalAmountAt(self, budget_line, frozen_date, expected_amount):
+        with freeze_time(frozen_date):
+            self.assertRecordValues(budget_line, [{'theoritical_amount': expected_amount}])
+            budget_line.invalidate_model(['theoritical_amount'])
+
+    def test_aggregates(self):
+        model = self.env['budget.line']
+        field_names = ['achieved_amount', 'theoritical_amount', 'theoritical_percentage']
+        self.assertEqual(
+            model.fields_get(field_names, ['aggregator']),
+            {
+                'achieved_amount': {'aggregator': 'sum'},
+                'theoritical_amount': {'aggregator': 'sum'},
+                'theoritical_percentage': {'aggregator': 'avg'}
+            },
+            f"Fields {', '.join(map(repr, field_names))} must be flagged as aggregatable.",
+        )
+
+    def test_theoritical_amount(self):
+        line = self.env['budget.line'].create({
+            'budget_analytic_id': self.budget_analytic.id,
+            'date_from': '2018-01-01',
+            'date_to': '2018-12-31',
+            'budget_amount': 365,
+        })
+
+        self.assertTheoricalAmountAt(line, '2018-01-01', 1.0)
+        self.assertTheoricalAmountAt(line, '2018-01-02', 2.0)
+        self.assertTheoricalAmountAt(line, '2018-01-03', 3.0)
+        self.assertTheoricalAmountAt(line, '2018-01-11', 11.0)
+        self.assertTheoricalAmountAt(line, '2018-02-20', 51.0)
+        self.assertTheoricalAmountAt(line, '2018-12-31', 365.0)
diff --git a/dev_odex30_accounting/odex30_account_budget/tests/test_uncommitted_amount.py b/dev_odex30_accounting/odex30_account_budget/tests/test_uncommitted_amount.py
new file mode 100644
index 0000000..3eb11c4
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_budget/tests/test_uncommitted_amount.py
@@ -0,0 +1,66 @@
+from odoo import Command
+from .common import TestAccountBudgetCommon
+from odoo.tests import tagged
+
+
+@tagged('post_install', '-at_install')
+class TestUncommittedAmount(TestAccountBudgetCommon):
+
+    @classmethod
+    def setUpClass(cls):
+        super().setUpClass()
+
+        cls.one_thousand_budget = cls.env['budget.analytic'].create({
+            'name': '1.000$ Budget',
+            'date_from': '2025-01-01',
+            'date_to': '2025-12-31',
+            'budget_type': 'expense',
+            'state': 'draft',
+            'user_id': cls.env.ref('base.user_admin').id,
+            'budget_line_ids': [
+                Command.create({
+                    'budget_amount': 1000,
+                    cls.project_column_name: cls.analytic_account_partner_a.id,
+                }),
+            ]
+        })
+        cls.one_thousand_budget.action_budget_confirm()
+
+    def test_uncommited_amount_is_above_budget(self):
+        po = self.env['purchase.order'].create({
+            'partner_id': self.partner_a.id,
+            'date_order': '2025-01-11',
+            'order_line': [
+                Command.create({
+                    'product_id': self.product_a.id,
+                    'analytic_distribution': {self.analytic_account_partner_a.id: 100},
+                    'product_qty': 1,
+                    'price_unit': 200,
+                }),
+                Command.create({
+                    'product_id': self.product_a.id,
+                    'analytic_distribution': {self.analytic_account_partner_a.id: 100},
+                    'product_qty': 1,
+                    'price_unit': 200,
+                }),
+                Command.create({
+                    'product_id': self.product_a.id,
+                    'analytic_distribution': {self.analytic_account_partner_a.id: 100},
+                    'product_qty': 1,
+                    'price_unit': 200,
+                }),
+            ]
+        })
+
+        self.assertFalse(po.is_above_budget, "The purchase order should not be above budget")
+        self.assertFalse(po.order_line.filtered('is_above_budget'), "No purchase order line should be above budget")
+
+        po.order_line.price_unit = 600
+        self.env['purchase.order.line'].invalidate_model(['is_above_budget'])
+        self.assertTrue(po.is_above_budget, "The purchase order should be exceeding budget now.")
+        self.assertFalse(po.order_line.filtered('is_above_budget'), "No purchase order line should be above budget")
+
+        po.order_line[2].price_unit = 2000
+        self.env['purchase.order.line'].invalidate_model(['is_above_budget'])
+        self.assertTrue(po.is_above_budget, "The purchase order should still be exceeding budget.")
+        self.assertEqual(po.order_line.mapped('is_above_budget'), [False, False, True], "The first purchase order line should go above budget on its own.")
diff --git a/dev_odex30_accounting/odex30_account_budget/views/account_analytic_account_views.xml b/dev_odex30_accounting/odex30_account_budget/views/account_analytic_account_views.xml
new file mode 100644
index 0000000..97a13f7
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_budget/views/account_analytic_account_views.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <record id="view_account_analytic_account_form_inherit_budget" model="ir.ui.view">
+        <field name="name">account.analytic.account.form.inherit</field>
+        <field name="model">account.analytic.account</field>
+        <field name="inherit_id" ref="analytic.view_account_analytic_account_form"/>
+        <field name="arch" type="xml">
+            <xpath expr="//notebook" position="inside">
+                <page string="Budgets">
+                    <field name="budget_line_ids" widget="one2many">
+                        <list create="0" delete="0" editable="bottom">
+                            <field name="currency_id" column_invisible="True"/>
+                            <field name="budget_analytic_id" readonly="1" optional="show"/>
+                            <field name="account_id" groups="analytic.group_analytic_accounting" optional="show" readonly="1"/>
+                            <field name="company_id" groups="base.group_multi_company" readonly="1"/>
+                            <field name="date_from" readonly="1"/>
+                            <field name="date_to" readonly="1"/>
+                            <field name="budget_amount" readonly="budget_analytic_state != 'draft'"/>
+                            <field name="committed_amount" readonly="1"/>
+                            <field name="achieved_amount" readonly="1"/>
+                            <field name="budget_analytic_state" optional="show"/>
+                        </list>
+                    </field>
+                </page>
+            </xpath>
+        </field>
+    </record>
+</odoo>
diff --git a/dev_odex30_accounting/odex30_account_budget/views/budget_analytic_views.xml b/dev_odex30_accounting/odex30_account_budget/views/budget_analytic_views.xml
new file mode 100644
index 0000000..f944fea
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_budget/views/budget_analytic_views.xml
@@ -0,0 +1,169 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <record model="ir.ui.view" id="view_budget_analytic_form">
+        <field name="name">budget.analytic.view.form</field>
+        <field name="model">budget.analytic</field>
+        <field name="arch" type="xml">
+            <form string="Budget">
+                <header>
+                    <button string="Reset to Draft" name="action_budget_draft" invisible="state == 'draft'" type="object"
+                            class="btn-primary"/>
+                    <button string="Open" name="action_budget_confirm" invisible="state != 'draft'" type="object"
+                            class="btn-primary"/>
+                    <button string="Revise" name="create_revised_budget" invisible="state != 'confirmed'" type="object"
+                            class="btn-secondary"/>
+                    <button string="Done" name="action_budget_done" invisible="state != 'confirmed'" type="object"
+                            class="btn-secondary"/>
+                    <button string="Cancel Budget" name="action_budget_cancel" invisible="state != 'draft'" type="object"
+                            class="btn-secondary"/>
+                    <field name="state" widget="statusbar" statusbar_visible="draft,confirmed,done"/>
+                </header>
+                <sheet string="Budget">
+                    <div class="oe_title">
+                        <label for="name"/>
+                        <h1>
+                            <field name="name" readonly="state != 'draft'" placeholder="e.g. Budget 2023"/>
+                        </h1>
+                    </div>
+                    <group>
+                        <group>
+                            <field name="user_id" readonly="state != 'draft'" domain="[('share', '=', False)]" widget="many2one_avatar" options="{'no_create': True}"/>
+                            <field name="parent_id" readonly="state != 'draft'" invisible="not parent_id"/>
+                            <field name="budget_type" readonly="state != 'draft'"/>
+                        </group>
+                        <group>
+                            <label for="date_from" string="Period"/>
+                            <div class="o_row">
+                                <field name="date_from" nolabel="1" class="oe_inline" readonly="state != 'draft'"/>
+                                <i class="fa fa-long-arrow-right mx-2" aria-label="to" title="to"/>
+                                <field name="date_to" nolabel="1" class="oe_inline" readonly="state != 'draft'"/>
+                            </div>
+                            <field name="company_id" groups="base.group_multi_company" options="{'no_create': True, 'no_open': True}"/>
+                        </group>
+                    </group>
+                    <notebook>
+                        <page string="Budget Lines" name="budget_lines">
+                            <field name="budget_line_ids" colspan="4"
+                                   nolabel="1" readonly="state != 'draft'">
+                                <list string="Budget Lines" editable="bottom">
+                                    <field name="sequence" widget="handle"/>
+                                    <field name="account_id" optional="show"/>
+                                    <field name="currency_id" column_invisible="True"/>
+                                    <field name="budget_amount" sum="Budget"/>
+                                    <field name="committed_amount" decoration-danger="(committed_amount > budget_amount) and parent.budget_type in ('expense', 'both')" sum="Committed" optional="show" column_invisible="parent.budget_type == 'revenue' or parent.state in ('draft','canceled')"/>
+                                    <field name="achieved_amount" decoration-danger="(achieved_amount > budget_amount) and parent.budget_type in ('expense', 'both')" sum="Achieved" column_invisible="parent.state in ('draft','canceled')"/>
+                                    <field name="theoritical_amount" sum="Theoretical" optional="hide" column_invisible="parent.state in ('draft','canceled')"/>
+                                    <field name="committed_percentage" widget="percentage" optional="hide" column_invisible="parent.budget_type == 'revenue' or parent.state in ('draft','canceled')"/>
+                                    <field name="achieved_percentage" widget="percentage" optional="hide" column_invisible="parent.state in ('draft','canceled')"/>
+                                    <field name="theoritical_percentage" widget="percentage" optional="hide" column_invisible="parent.state in ('draft','canceled')"/>
+
+                                    <button type="object" name="action_open_budget_entries" string="Details..."
+                                            icon="fa-arrow-circle-o-right" column_invisible="parent.state in ('draft','canceled')"/>
+                                    <field name="company_id" column_invisible="1"/>
+                                </list>
+                            </field>
+                        </page>
+                    </notebook>
+                </sheet>
+                <chatter/>
+            </form>
+        </field>
+    </record>
+
+    <record model="ir.ui.view" id="view_budget_analytic_tree">
+        <field name="name">budget.analytic.view.list</field>
+        <field name="model">budget.analytic</field>
+        <field name="arch" type="xml">
+            <list decoration-info="state == 'draft'" decoration-muted="state in ('done','canceled', 'revised')" string="Budget">
+                <header>
+                    <button display="always" class="btn btn-secondary" string="Generate" type="action"
+                            name="%(odex30_account_budget.budget_split_wizard_action)d"/>
+                    <button string="Budget Lines" type="object" name="action_open_budget_lines" class="oe_highlight"
+                            groups="analytic.group_analytic_accounting"/>
+                </header>
+                <field name="name" colspan="1" readonly="state == 'done'"/>
+                <field name="date_from" readonly="state == 'done'" optional="show"/>
+                <field name="date_to" readonly="state == 'done'" optional="hide"/>
+                <field name="company_id" options="{'no_create': True}" groups="base.group_multi_company" optional="hide"/>
+                <field name="user_id" options="{'no_create': True}"/>
+                <field name="activity_ids" widget="list_activity" optional="show"/>
+                <field name="state"/>
+                <field name="activity_exception_decoration" widget="activity_exception"/>
+            </list>
+        </field>
+    </record>
+
+    <record id="view_budget_analytic_kanban" model="ir.ui.view">
+        <field name="name">budget.analytic.kanban</field>
+        <field name="model">budget.analytic</field>
+        <field name="arch" type="xml">
+            <kanban class="o_kanban_mobile">
+                <templates>
+                    <t t-name="card">
+                        <div class="row mb4">
+                            <field name="name" class="fw-bold fs-5 col-8" readonly="state == 'done'"/>
+                            <div class="col-4">
+                                <field name="state" class="float-end" widget="label_selection"
+                                        options="{'classes': {'draft': 'default', 'done': 'success'}}"/>
+                            </div>
+                        </div>
+                        <div class="row">
+                            <div class="col-10">
+                                <i class="fa fa-clock-o me-1" role="img" aria-label="Period" title="Period"/>
+                                <field name="date_from"/> -
+                                <field name="date_to"/>
+                            </div>
+                            <div class="col-2">
+                                <field name="user_id" class="float-end" widget="many2one_avatar_user"/>
+                            </div>
+                        </div>
+                    </t>
+                </templates>
+            </kanban>
+        </field>
+    </record>
+
+    <record id="view_budget_analytic_search" model="ir.ui.view">
+        <field name="name">budget.analytic.search</field>
+        <field name="model">budget.analytic</field>
+        <field name="arch" type="xml">
+            <search string="Budget">
+                <field name="name" string="Budget"/>
+                <field name="date_from"/>
+                <field name="date_to"/>
+                <filter string="Draft" name="draft" domain="[('state', '=', 'draft')]" help="Draft Budgets"/>
+                <separator/>
+                <filter invisible="1" string="Late Activities" name="activities_overdue"
+                    domain="[('my_activity_date_deadline', '&lt;', context_today().strftime('%Y-%m-%d'))]"
+                    help="Show all records which has next action date is before today"/>
+                <filter invisible="1" string="Today Activities" name="activities_today"
+                    domain="[('my_activity_date_deadline', '=', context_today().strftime('%Y-%m-%d'))]"/>
+                <filter invisible="1" string="Future Activities" name="activities_upcoming_all"
+                    domain="[('my_activity_date_deadline', '&gt;', context_today().strftime('%Y-%m-%d'))]"/>
+            </search>
+        </field>
+    </record>
+
+    <record model="ir.actions.act_window" id="act_budget_analytic_view">
+        <field name="name">Budgets</field>
+        <field name="res_model">budget.analytic</field>
+        <field name="view_mode">list,kanban,form,activity</field>
+        <field name="view_id" ref="view_budget_analytic_tree"/>
+        <field name="search_view_id" ref="view_budget_analytic_search"/>
+         <field name="help" type="html">
+            <p class="o_view_nocontent_smiling_face">
+                Click to create a new budget.
+            </p>
+            <p>
+                Use budgets to compare actual with expected revenues and costs
+            </p>
+        </field>
+    </record>
+
+    <menuitem parent="account.menu_finance_entries"
+              id="menu_act_budget_analytic_view"
+              name="Analytic Budget"
+              action="act_budget_analytic_view" sequence="55"
+              groups="account.group_account_manager"/>
+
+</odoo>
diff --git a/dev_odex30_accounting/odex30_account_budget/views/budget_line_view.xml b/dev_odex30_accounting/odex30_account_budget/views/budget_line_view.xml
new file mode 100644
index 0000000..fd02080
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_budget/views/budget_line_view.xml
@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+    <record model="ir.ui.view" id="view_budget_line_search">
+        <field name="name">account.budget.line.search</field>
+        <field name="model">budget.line</field>
+        <field name="arch" type="xml">
+            <search string="Budget Lines">
+                <field name="account_id" groups="analytic.group_analytic_accounting"/>
+                <field name="budget_analytic_id"/>
+                <filter name="filter_not_cancelled" string="Not Cancelled" domain="[('budget_analytic_id.state', '!=', 'canceled')]"/>
+                <separator/>
+                <filter string="Date" name="filter_date_from" date="date_from"/>
+                <group expand="0" string="Group By">
+                    <filter name="group_budget_analytic_id" string="Budgets" domain="[]" context="{'group_by': 'budget_analytic_id'}"/>
+                </group>
+            </search>
+        </field>
+    </record>
+
+    <record model="ir.ui.view" id="view_budget_line_tree">
+        <field name="name">budget.line.list</field>
+        <field name="model">budget.line</field>
+        <field name="arch" type="xml">
+            <list string="Budget Lines" create="0" delete="0" multi_edit="1">
+                <field name="currency_id" column_invisible="True"/>
+                <field name="budget_analytic_id" optional="show"/>
+                <field name="budget_analytic_state" optional="hide"/>
+                <field name="account_id" groups="analytic.group_analytic_accounting" optional="show" readonly="1"/>
+                <field name="company_id" groups="base.group_multi_company" readonly="1"/>
+                <field name="date_from" readonly="1"/>
+                <field name="date_to" readonly="1"/>
+                <field name="budget_amount" readonly="budget_analytic_state != 'draft'"/>
+                <field name="committed_amount" readonly="1"/>
+                <field name="achieved_amount" readonly="1"/>
+            </list>
+        </field>
+    </record>
+
+    <record model="ir.ui.view" id="view_budget_line_form">
+        <field name="name">budget.line.form</field>
+        <field name="model">budget.line</field>
+        <field name="arch" type="xml">
+            <form string="Budget Lines">
+                <sheet>
+                    <group col="4">
+                        <field name="budget_analytic_state" invisible="1"/>
+                        <field name="budget_analytic_id"  readonly="budget_analytic_state != 'draft'"/>
+                        <field name="account_id" domain="['|', ('company_id', '=', company_id), ('company_id', '=', False)]" readonly="budget_analytic_state != 'draft'" groups="analytic.group_analytic_accounting"/>
+                        <field name="date_from"  readonly="budget_analytic_state != 'draft'"/>
+                        <field name="date_to"  readonly="budget_analytic_state != 'draft'"/>
+                        <field name="budget_amount" readonly="budget_analytic_state != 'draft'"/>
+                        <field name="achieved_amount" readonly="budget_analytic_state != 'draft'"/>
+                        <field name="theoritical_amount" readonly="budget_analytic_state != 'draft'"/>
+                        <field name="company_id" options="{'no_create': True}" groups="base.group_multi_company" readonly="budget_analytic_state != 'draft'"/>
+                    </group>
+                </sheet>
+            </form>
+        </field>
+    </record>
+
+    <record model="ir.ui.view" id="view_budget_line_pivot">
+        <field name="name">budget.line.pivot</field>
+        <field name="model">budget.line</field>
+        <field name="arch" type="xml">
+            <pivot string="Budget Lines" sample="1">
+                <field name="budget_analytic_id" type="row"/>
+                <field name="achieved_amount" type="measure" string="Achieved"/>
+                <field name="budget_amount"  type="measure" string="Budget"/>
+            </pivot>
+        </field>
+    </record>
+
+    <record model="ir.ui.view" id="view_budget_line_graph">
+        <field name="name">budget.line.graph</field>
+        <field name="model">budget.line</field>
+        <field name="arch" type="xml">
+            <graph string="Budget Lines" sample="1">
+                <field name="budget_analytic_id" type="row"/>
+                <field name="budget_amount" type="measure" string="Budget"/>
+                <field name="achieved_amount" type="measure" string="Practical amount"/>
+            </graph>
+        </field>
+    </record>
+
+    <record model="ir.actions.act_window" id="act_budget_lines_view">
+        <field name="name">Budgets Analysis</field>
+        <field name="res_model">budget.line</field>
+        <field name="view_mode">list,form,pivot,graph</field>
+        <field name="view_id" eval="False"/>
+        <field name="context"></field>
+    </record>
+
+</odoo>
diff --git a/dev_odex30_accounting/odex30_account_budget/views/purchase_views.xml b/dev_odex30_accounting/odex30_account_budget/views/purchase_views.xml
new file mode 100644
index 0000000..be371c9
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_budget/views/purchase_views.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<odoo>
+
+    <record id="purchase_order_form_account_budget" model="ir.ui.view">
+        <field name="name">purchase.order.form.inherit.account.budget</field>
+        <field name="model">purchase.order</field>
+        <field name="inherit_id" ref="purchase.purchase_order_form"/>
+        <field name="arch" type="xml">
+            <xpath expr="//div[hasclass('oe_button_box')]" position="inside">
+                <button name="action_budget" string="Budget" type="object"
+                        icon="fa-bar-chart" invisible="not is_analytic or is_above_budget"/>
+                <button name="action_budget" string="Budget" type="object" class="text-danger"
+                        icon="fa-bar-chart" invisible="not is_analytic or not is_above_budget"/>
+                <field name="is_above_budget" invisible="1"/>
+            </xpath>
+            <xpath expr="//page[@name='products']/field[@name='order_line']/list" position="inside">
+                <field name="is_above_budget" column_invisible="1"/>
+            </xpath>
+            <xpath expr="//page[@name='products']/field[@name='order_line']/list" position="attributes">
+                <attribute name="decoration-danger">is_above_budget</attribute>
+            </xpath>
+        </field>
+    </record>
+
+</odoo>
diff --git a/dev_odex30_accounting/odex30_account_budget/wizards/__init__.py b/dev_odex30_accounting/odex30_account_budget/wizards/__init__.py
new file mode 100644
index 0000000..b50e0e0
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_budget/wizards/__init__.py
@@ -0,0 +1,2 @@
+
+from . import budget_split_wizard
diff --git a/dev_odex30_accounting/odex30_account_budget/wizards/__pycache__/__init__.cpython-311.pyc b/dev_odex30_accounting/odex30_account_budget/wizards/__pycache__/__init__.cpython-311.pyc
new file mode 100644
index 0000000..5f66dcc
Binary files /dev/null and b/dev_odex30_accounting/odex30_account_budget/wizards/__pycache__/__init__.cpython-311.pyc differ
diff --git a/dev_odex30_accounting/odex30_account_budget/wizards/__pycache__/budget_split_wizard.cpython-311.pyc b/dev_odex30_accounting/odex30_account_budget/wizards/__pycache__/budget_split_wizard.cpython-311.pyc
new file mode 100644
index 0000000..d09e0ce
Binary files /dev/null and b/dev_odex30_accounting/odex30_account_budget/wizards/__pycache__/budget_split_wizard.cpython-311.pyc differ
diff --git a/dev_odex30_accounting/odex30_account_budget/wizards/budget_split_wizard.py b/dev_odex30_accounting/odex30_account_budget/wizards/budget_split_wizard.py
new file mode 100644
index 0000000..b629b9b
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_budget/wizards/budget_split_wizard.py
@@ -0,0 +1,64 @@
+from dateutil.relativedelta import relativedelta
+
+from odoo import fields, models, _
+from odoo.tools import date_utils, format_date
+from itertools import product
+from functools import partial
+
+
+class BudgetSplitWizard(models.TransientModel):
+    _name = 'budget.split.wizard'
+    _description = 'Budget Split Wizard'
+
+    date_from = fields.Date(string='Start Date', required=True)
+    date_to = fields.Date(string='End Date', required=True)
+    period = fields.Selection([
+        ('month', 'Month'),
+        ('quarter', 'Quarter'),
+        ('year', 'Year')
+    ], string='Period', required=True, default='year')
+    analytical_plan_ids = fields.Many2many('account.analytic.plan', string='Analytic Plans', required=True)
+
+    def default_get(self, fields_list):
+        defaults = super().default_get(fields_list)
+        if 'date_from' in fields_list and not defaults.get('date_from'):
+            defaults['date_from'] = date_utils.start_of(fields.Date.context_today(self), 'year')
+        if 'date_to' in fields_list and not defaults.get('date_to'):
+            defaults['date_to'] = date_utils.end_of(fields.Date.context_today(self), 'year')
+        return defaults
+
+    def action_budget_split(self):
+        self.ensure_one()
+        account_dict = {rec._column_name(): rec.account_ids.ids for rec in self.analytical_plan_ids}
+        budget_lines = [(0, 0, line) for line in [dict(zip(account_dict.keys(), combination)) for combination in product(*account_dict.values())]]
+        if self.period == 'year':
+            name = partial(format_date, self.env, date_format='yyyy')
+            step = relativedelta(years=1)
+        elif self.period == 'month':
+            name = partial(format_date, self.env, date_format='MMMM yyyy')
+            step = relativedelta(months=1)
+        elif self.period == 'quarter':
+            name = partial(format_date, self.env, date_format='QQQ yyyy')
+            step = relativedelta(months=3)
+
+        budget_vals = []
+        for date_from in date_utils.date_range(self.date_from, self.date_to, step):
+            date_to = date_from + step - relativedelta(days=1)
+            if date_to > self.date_to:
+                break
+            budget_vals.append({
+                'name': _('Budget %s', name(date_from)),
+                'date_from': date_from,
+                'date_to': date_to,
+                'budget_type': 'expense',
+                'budget_line_ids': budget_lines,
+            })
+        budgets = self.env['budget.analytic'].create(budget_vals)
+        return {
+            'name': _('Budgets'),
+            'view_mode': 'list',
+            'res_model': 'budget.line',
+            'type': 'ir.actions.act_window',
+            'domain': [('id', 'in', budgets.budget_line_ids.ids)],
+            'context': {'group_by': 'budget_analytic_id'},
+        }
diff --git a/dev_odex30_accounting/odex30_account_budget/wizards/budget_split_wizard_view.xml b/dev_odex30_accounting/odex30_account_budget/wizards/budget_split_wizard_view.xml
new file mode 100644
index 0000000..176812c
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_budget/wizards/budget_split_wizard_view.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <record id="budget_split_wizard_form_view" model="ir.ui.view">
+        <field name="name">account_budget.budget_split_wizard.form</field>
+        <field name="model">budget.split.wizard</field>
+        <field name="arch" type="xml">
+            <form string="Generate Budget">
+                <sheet>
+                    <group>
+                        <label for="date_from" string="From"/>
+                        <div class="o_row">
+                            <field name="date_from" nolabel="1" class="oe_inline"/>
+                            <i class="fa fa-long-arrow-right mx-2" aria-label="to" title="to"/>
+                            <field name="date_to" nolabel="1" class="oe_inline"/>
+                        </div>
+                    </group>
+                    <group>
+                        <field name="period" widget="radio"/>
+                        <field name="analytical_plan_ids" widget="many2many_tags"/>
+                    </group>
+                </sheet>
+                <footer>
+                    <button name="action_budget_split" string="Split" type="object" class="btn-primary"/>
+                    <button string="Cancel" class="btn-default" special="cancel"/>
+                </footer>
+            </form>
+        </field>
+    </record>
+
+    <record id="budget_split_wizard_action" model="ir.actions.act_window">
+        <field name="name">Generate Budget</field>
+        <field name="type">ir.actions.act_window</field>
+        <field name="res_model">budget.split.wizard</field>
+        <field name="view_mode">form</field>
+        <field name="target">new</field>
+        <field name="context">{'dialog_size': 'medium'}</field>
+    </record>
+</odoo>
diff --git a/dev_odex30_accounting/odex30_account_followup/__init__.py b/dev_odex30_accounting/odex30_account_followup/__init__.py
new file mode 100644
index 0000000..2ae6446
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_followup/__init__.py
@@ -0,0 +1,5 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+from . import models
+from . import wizard
diff --git a/dev_odex30_accounting/odex30_account_followup/__manifest__.py b/dev_odex30_accounting/odex30_account_followup/__manifest__.py
new file mode 100644
index 0000000..b02471e
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_followup/__manifest__.py
@@ -0,0 +1,61 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+{
+    'name': 'Payment Follow-up Management',
+    'version': '1.1',
+    'category': 'Accounting/Accounting',
+    'description': """
+Module to automate letters for unpaid invoices, with multi-level recalls.
+=========================================================================
+
+You can define your multiple levels of recall through the menu:
+---------------------------------------------------------------
+    Configuration / Follow-up / Follow-up Levels
+
+Once it is defined, you can automatically print recalls every day through simply clicking on the menu:
+------------------------------------------------------------------------------------------------------
+    Payment Follow-Up / Send Email and letters
+
+It will generate a PDF / send emails / set activities according to the different levels
+of recall defined. You can define different policies for different companies.
+
+""",
+    'website': 'https://www.odoo.com/app/invoicing',
+    'depends': ['mail', 'sms', 'odex30_account_reports'],
+    'data': [
+        'security/account_followup_security.xml',
+        'security/ir.model.access.csv',
+        'security/sms_security.xml',
+        'data/account_followup_data.xml',
+        'data/cron.xml',
+        'wizard/followup_manual_reminder_views.xml',
+        'wizard/followup_missing_information.xml',
+        'views/account_followup_views.xml',
+        'views/account_followup_line_views.xml',
+        'views/partner_view.xml',
+        'views/report_followup.xml',
+        ],
+    'demo': [
+        'demo/account_followup_demo.xml'
+    ],
+    'installable': True,
+    'auto_install': True,
+    'license': 'OEEL-1',
+    'assets': {
+        'odex30_account_followup.assets_followup_report': [
+            ('include', 'web._assets_helpers'),
+            'web/static/src/scss/pre_variables.scss',
+            'web/static/lib/bootstrap/scss/_variables.scss',
+            'web/static/lib/bootstrap/scss/_variables-dark.scss',
+            'web/static/lib/bootstrap/scss/_maps.scss',
+            ('include', 'web._assets_bootstrap_backend'),
+            'web/static/fonts/fonts.scss',
+        ],
+        'web.assets_backend': [
+            'odex30_account_followup/static/src/components/**/*.js',
+            'odex30_account_followup/static/src/components/**/*.scss',
+            'odex30_account_followup/static/src/components/**/*.xml',
+        ],
+    }
+}
diff --git a/dev_odex30_accounting/odex30_account_followup/__pycache__/__init__.cpython-311.pyc b/dev_odex30_accounting/odex30_account_followup/__pycache__/__init__.cpython-311.pyc
new file mode 100644
index 0000000..d270da8
Binary files /dev/null and b/dev_odex30_accounting/odex30_account_followup/__pycache__/__init__.cpython-311.pyc differ
diff --git a/dev_odex30_accounting/odex30_account_followup/data/account_followup_data.xml b/dev_odex30_accounting/odex30_account_followup/data/account_followup_data.xml
new file mode 100644
index 0000000..07df78d
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_followup/data/account_followup_data.xml
@@ -0,0 +1,103 @@
+<?xml version="1.0"?>
+<odoo>
+    <!-- Mail template is done in a NOUPDATE block
+         so users can freely customize/delete them -->
+    <data noupdate="1">
+        <!--Email template -->
+        <record id="email_template_followup_1" model="mail.template">
+            <field name="name">Payment Reminder</field>
+            <field name="model_id" ref="base.model_res_partner"/>
+            <field name="email_from">{{ object._get_followup_responsible().email_formatted }}</field>
+            <field name="subject">{{ (object.company_id or object._get_followup_responsible().company_id).name }} Payment Reminder - {{ object.commercial_company_name }}</field>
+            <field name="body_html" type="html">
+                <div style="margin: 0px; padding: 0px;">
+                    <p style="margin: 0px; padding: 0px;">
+                        <t t-if="object.id != object.commercial_partner_id.id">Dear <t t-out="object.name or ''"/> (<t t-out="object.commercial_partner_id.name or ''"/>),</t>
+                        <t t-else="">Dear <t t-out="object.name or ''"/>,</t>
+                        <br/>
+                        It has come to our attention that you have an outstanding balance of <t t-out="format_amount(object.total_overdue, object.currency_id) or ''"/>
+                        <br/>
+                        We kindly request that you take necessary action to settle this amount within the next 8 days.
+                        <br/>
+                        <div t-if="object._show_pay_now_button()" class="d-flex">
+                            <a t-att-href="'/my/invoices/overdue'" class="btn btn-primary">Pay now</a>
+                        </div>
+                        If you have already made the payment after receiving this message, please disregard it.
+                        Our accounting department is available if you require any assistance or have any questions.
+                        <br/>
+                        Thank you for your cooperation.
+                        <br/>
+                        Sincerely,
+                        <t t-if="not is_html_empty(object._get_followup_responsible().signature)">
+                            <br/>
+                            <t t-out="object._get_followup_responsible().signature"/>
+                        </t>
+                        <t t-else="">
+                            <br/>
+                            --
+                            <br/>
+                            <t t-out="object._get_followup_responsible().name"/>
+                        </t>
+                    </p>
+                </div>
+            </field>
+            <field name="lang">{{ object.lang }}</field>
+            <field name="auto_delete" eval="False"/>
+        </record>
+
+        <record id="demo_followup_line1" model="account_followup.followup.line" forcecreate="False">
+            <field name="name">15 Days</field>
+            <field name="delay">15</field>
+            <field name="company_id" ref="base.main_company"/>
+            <field name="send_email">True</field>
+            <field name="mail_template_id" ref="email_template_followup_1"/>
+        </record>
+        <record id="demo_followup_email_template_2" model="mail.template" forcecreate="False">
+            <field name="name">Second reminder followup</field>
+            <field name="model_id" ref="base.model_res_partner"/>
+            <field name="email_from">{{ object._get_followup_responsible().email_formatted }}</field>
+            <field name="subject">{{ (object.company_id or object._get_followup_responsible().company_id).name }} Payment Reminder - {{ object.commercial_company_name }}</field>
+            <field name="body_html" type="html">
+                <div style="margin: 0px; padding: 0px;">
+                    <p>
+                        <t t-if="object.id != object.commercial_partner_id.id">Dear <t t-out="object.name or ''"/> (<t t-out="object.commercial_partner_id.name or ''"/>),</t>
+                        <t t-else="">Dear <t t-out="object.name or ''"/>,</t>
+                        <br/>
+                        We are disappointed to see that despite sending a reminder, that your account is now seriously overdue.
+                        <br/>
+                        It is essential that immediate payment is made, otherwise we will have to consider placing a stop on your account which means that we will no longer be able to supply your company with (goods/services). Please, take appropriate measures in order to carry out this payment in the next 8 days.
+                        <br/>
+                        If there is a problem with paying invoice that we are not aware of, do not hesitate to contact our accounting department, so that we can resolve the matter quickly.
+                        <br/>
+                        Details of due payments is printed below.
+                        <br/>
+                        Best Regards,
+                        <t t-if="not is_html_empty(object._get_followup_responsible().signature)">
+                            <br/>
+                            <t t-out="object._get_followup_responsible().signature"/>
+                        </t>
+                        <t t-else="">
+                            <br/>
+                            --
+                            <br/>
+                            <t t-out="object._get_followup_responsible().name"/>
+                        </t>
+                    </p>
+                </div>
+            </field>
+        </record>
+        <record id="demo_followup_line2" model="account_followup.followup.line" forcecreate="False">
+            <field name="name">30 Days</field>
+            <field name="delay">30</field>
+            <field name="company_id" ref="base.main_company"/>
+            <field name="send_email">True</field>
+            <field name="mail_template_id" ref="account_followup.demo_followup_email_template_2"/>
+        </record>
+
+        <record id="action_account_followup" model="ir.actions.client">
+            <field name="name">Customers Statement</field>
+            <field name="tag">account_report_followup</field>
+            <field name="context">{'model': 'account.followup.report'}</field>
+        </record>
+    </data>
+</odoo>
diff --git a/dev_odex30_accounting/odex30_account_followup/data/cron.xml b/dev_odex30_accounting/odex30_account_followup/data/cron.xml
new file mode 100644
index 0000000..4299a0f
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_followup/data/cron.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <record id="ir_cron_auto_post_draft_entry" model="ir.cron">
+        <field name="name">Account Report Followup; Execute followup</field>
+        <field name="interval_number">1</field>
+        <field name="interval_type">days</field>
+        <field name="nextcall" eval="(DateTime.now().replace(hour=2, minute=0) + timedelta(days=1)).strftime('%Y-%m-%d %H:%M:%S')" />
+        <field name="model_id" ref="model_res_partner"/>
+        <field name="code">model._cron_execute_followup()</field>
+        <field name="state">code</field>
+    </record>
+</odoo>
diff --git a/dev_odex30_accounting/odex30_account_followup/demo/account_followup_demo.xml b/dev_odex30_accounting/odex30_account_followup/demo/account_followup_demo.xml
new file mode 100644
index 0000000..a8182b9
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_followup/demo/account_followup_demo.xml
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <data noupdate="1">
+        <record id="demo_followup_line3" model="account_followup.followup.line">
+            <field name="name">40 Days</field>
+            <field name="delay">40</field>
+            <field name="company_id" ref="base.main_company"/>
+            <field eval="False" name="send_email"/>
+            <field name="create_activity">True</field>
+            <field name="activity_type_id" ref="mail.mail_activity_data_call"/>
+            <field name="activity_summary">Call the customer on the phone!</field>
+            <field name="activity_note">
+Urge the customer to pay overdue invoices, still not settled despite several reminders.
+
+Give 8 days for full payment, or legal action for the recovery of the debt will be taken without further notice.
+            </field>
+        </record>
+        <record id="demo_followup_email_template_4" model="mail.template">
+            <field name="name">Fourth reminder followup</field>
+            <field name="model_id" ref="base.model_res_partner"/>
+            <field name="email_from">{{ object._get_followup_responsible().email_formatted }}</field>
+            <field name="subject">{{ (object.company_id or object._get_followup_responsible().company_id).name }} Payment Reminder - {{ object.commercial_company_name }}</field>
+            <field name="body_html" type="html">
+                <div style="margin: 0px; padding: 0px;">
+                    <p>
+                        <t t-if="object.id != object.commercial_partner_id.id">Dear <t t-out="object.name or ''"/> (<t t-out="object.commercial_partner_id.name or ''"/>),</t>
+                        <t t-else="">Dear <t t-out="object.name or ''"/>,</t>
+                        <br />
+                        Despite several reminders, your account is still not settled.
+                        Unless full payment is made in next 8 days, then legal action for the recovery of the debt will be taken without further notice.
+                        I trust that this action will prove unnecessary and details of due payments is printed below.
+                        In case of any queries concerning this matter, do not hesitate to contact our accounting department.
+                        <br />
+                        Best Regards,
+                        <br />
+                        <t t-if="not is_html_empty(object._get_followup_responsible().signature)">
+                            <br />
+                            <t t-out="object._get_followup_responsible().signature"/>
+                        </t>
+                        <t t-else="">
+                            <br />
+                            --
+                            <br />
+                            <t t-out="object._get_followup_responsible().name"/>
+                        </t>
+                    </p>
+                </div>
+            </field>
+        </record>
+        <record id="demo_followup_line4" model="account_followup.followup.line">
+            <field name="name">50 Days</field>
+            <field name="delay">50</field>
+            <field name="company_id" ref="base.main_company"/>
+            <field name="send_email">True</field>
+            <field name="mail_template_id" ref="odex30_account_followup.demo_followup_email_template_4"/>
+        </record>
+        <record id="demo_followup_line5" model="account_followup.followup.line">
+            <field name="name">60 Days</field>
+            <field name="delay">60</field>
+            <field name="company_id" ref="base.main_company"/>
+            <field eval="False" name="send_email"/>
+        </record>
+    </data>
+</odoo>
diff --git a/dev_odex30_accounting/odex30_account_followup/i18n/account_followup.pot b/dev_odex30_accounting/odex30_account_followup/i18n/account_followup.pot
new file mode 100644
index 0000000..d3d3809
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_followup/i18n/account_followup.pot
@@ -0,0 +1,975 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# 	* odex30_account_followup
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 18.0+e\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2025-11-21 18:47+0000\n"
+"PO-Revision-Date: 2025-11-21 18:47+0000\n"
+"Last-Translator: \n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: odex30_account_followup
+#. odoo-python
+#: code:addons/odex30_account_followup/models/odex30_account_followup_report.py:0
+msgid "%(company)s Payment Reminder - %(partner)s"
+msgstr ""
+
+#. module: odex30_account_followup
+#. odoo-python
+#: code:addons/odex30_account_followup/models/odex30_account_followup.py:0
+msgid "%(delay)s days (copy of %(name)s)"
+msgstr ""
+
+#. module: odex30_account_followup
+#: model:ir.actions.report,print_report_name:odex30_account_followup.action_report_followup
+msgid "'Follow-up ' + object.display_name"
+msgstr ""
+
+#. module: odex30_account_followup
+#: model:odex30_account_followup.followup.line,name:odex30_account_followup.demo_followup_line1
+msgid "15 Days"
+msgstr ""
+
+#. module: odex30_account_followup
+#: model_terms:ir.ui.view,arch_db:odex30_account_followup.followup_filter_info_template
+msgid "2023-09-06"
+msgstr ""
+
+#. module: odex30_account_followup
+#: model:odex30_account_followup.followup.line,name:odex30_account_followup.demo_followup_line2
+msgid "30 Days"
+msgstr ""
+
+#. module: odex30_account_followup
+#: model:odex30_account_followup.followup.line,name:odex30_account_followup.demo_followup_line3
+msgid "40 Days"
+msgstr ""
+
+#. module: odex30_account_followup
+#: model:odex30_account_followup.followup.line,name:odex30_account_followup.demo_followup_line4
+msgid "50 Days"
+msgstr ""
+
+#. module: odex30_account_followup
+#: model:odex30_account_followup.followup.line,name:odex30_account_followup.demo_followup_line5
+msgid "60 Days"
+msgstr ""
+
+#. module: odex30_account_followup
+#: model:mail.template,body_html:odex30_account_followup.email_template_followup_1
+msgid ""
+"<div style=\"margin: 0px; padding: 0px;\">\n"
+"                    <p style=\"margin: 0px; padding: 0px;\">\n"
+"                        <t t-if=\"object.id != object.commercial_partner_id.id\">Dear <t t-out=\"object.name or ''\"/> (<t t-out=\"object.commercial_partner_id.name or ''\"/>),</t>\n"
+"                        <t t-else=\"\">Dear <t t-out=\"object.name or ''\"/>,</t>\n"
+"                        <br/>\n"
+"                        It has come to our attention that you have&nbsp;an outstanding balance of <t t-out=\"format_amount(object.total_overdue_followup, object.currency_id) or ''\"/>\n"
+"                        <br/>\n"
+"                        We kindly request that you take necessary action to settle this amount within the next 8 days.\n"
+"                        <br/>\n"
+"                        </p><div t-if=\"object._show_pay_now_button()\" class=\"d-flex\">\n"
+"                            <a t-att-href=\"'/my/invoices/overdue'\" class=\"btn btn-primary\">Pay now</a>\n"
+"                        </div>\n"
+"                        If you have already made the payment after receiving this message, please disregard it.\n"
+"                        Our accounting department is available if you require any assistance or have any questions.\n"
+"                        <br/>\n"
+"                        Thank you for your cooperation.\n"
+"                        <br/>\n"
+"                        Sincerely,\n"
+"                        <t t-if=\"not is_html_empty(object._get_followup_responsible().signature)\">\n"
+"                            <br/>\n"
+"                            <t t-out=\"object._get_followup_responsible().signature\"/>\n"
+"                        </t>\n"
+"                        <t t-else=\"\">\n"
+"                            <br/>\n"
+"                            --\n"
+"                            <br/>\n"
+"                            <t t-out=\"object._get_followup_responsible().name\"/>\n"
+"                        </t>\n"
+"                    \n"
+"                </div>\n"
+"            "
+msgstr ""
+
+#. module: odex30_account_followup
+#: model:mail.template,body_html:odex30_account_followup.demo_followup_email_template_4
+msgid ""
+"<div style=\"margin: 0px; padding: 0px;\">\n"
+"                    <p>\n"
+"                        <t t-if=\"object.id != object.commercial_partner_id.id\">Dear <t t-out=\"object.name or ''\"/> (<t t-out=\"object.commercial_partner_id.name or ''\"/>),</t>\n"
+"                        <t t-else=\"\">Dear <t t-out=\"object.name or ''\"/>,</t>\n"
+"                        <br/>\n"
+"                        Despite several reminders, your account is still not settled.\n"
+"                        Unless full payment is made in next 8 days, then legal action for the recovery of the debt will be taken without further notice.\n"
+"                        I trust that this action will prove unnecessary and details of due payments is printed below.\n"
+"                        In case of any queries concerning this matter, do not hesitate to contact our accounting department.\n"
+"                        <br/>\n"
+"                        Best Regards,\n"
+"                        <br/>\n"
+"                        <t t-if=\"not is_html_empty(object._get_followup_responsible().signature)\">\n"
+"                            <br/>\n"
+"                            <t t-out=\"object._get_followup_responsible().signature\"/>\n"
+"                        </t>\n"
+"                        <t t-else=\"\">\n"
+"                            <br/>\n"
+"                            --\n"
+"                            <br/>\n"
+"                            <t t-out=\"object._get_followup_responsible().name\"/>\n"
+"                        </t>\n"
+"                    </p>\n"
+"                </div>\n"
+"            "
+msgstr ""
+
+#. module: odex30_account_followup
+#: model:mail.template,body_html:odex30_account_followup.demo_followup_email_template_2
+msgid ""
+"<div style=\"margin: 0px; padding: 0px;\">\n"
+"                    <p>\n"
+"                        <t t-if=\"object.id != object.commercial_partner_id.id\">Dear <t t-out=\"object.name or ''\"/> (<t t-out=\"object.commercial_partner_id.name or ''\"/>),</t>\n"
+"                        <t t-else=\"\">Dear <t t-out=\"object.name or ''\"/>,</t>\n"
+"                        <br/>\n"
+"                        We are disappointed to see that despite sending a reminder, that your account is now seriously overdue.\n"
+"                        <br/>\n"
+"                        It is essential that immediate payment is made, otherwise we will have to consider placing a stop on your account which means that we will no longer be able to supply your company with (goods/services). Please, take appropriate measures in order to carry out this payment in the next 8 days.\n"
+"                        <br/>\n"
+"                        If there is a problem with paying invoice that we are not aware of, do not hesitate to contact our accounting department, so that we can resolve the matter quickly.\n"
+"                        <br/>\n"
+"                        Details of due payments is printed below.\n"
+"                        <br/>\n"
+"                        Best Regards,\n"
+"                        <t t-if=\"not is_html_empty(object._get_followup_responsible().signature)\">\n"
+"                            <br/>\n"
+"                            <t t-out=\"object._get_followup_responsible().signature\"/>\n"
+"                        </t>\n"
+"                        <t t-else=\"\">\n"
+"                            <br/>\n"
+"                            --\n"
+"                            <br/>\n"
+"                            <t t-out=\"object._get_followup_responsible().name\"/>\n"
+"                        </t>\n"
+"                    </p>\n"
+"                </div>\n"
+"            "
+msgstr ""
+
+#. module: odex30_account_followup
+#: model_terms:ir.ui.view,arch_db:odex30_account_followup.res_partner_view_form
+msgid "<span class=\"o_stat_text\">Customer Statement</span>"
+msgstr ""
+
+#. module: odex30_account_followup
+#: model_terms:ir.ui.view,arch_db:odex30_account_followup.res_partner_view_form
+msgid ""
+"<span>Preferred address for follow-up reports. Selected by default when you "
+"send reminders about overdue invoices.</span>"
+msgstr ""
+
+#. module: odex30_account_followup
+#: model_terms:ir.ui.view,arch_db:odex30_account_followup.template_followup_report
+msgid ""
+"<strong>\n"
+"                                Pending Invoices\n"
+"                            </strong>"
+msgstr ""
+
+#. module: odex30_account_followup
+#: model:ir.model.constraint,message:odex30_account_followup.constraint_odex30_account_followup_followup_line_uniq_name
+msgid ""
+"A follow-up action name must be unique. This name is already set to another "
+"action."
+msgstr ""
+
+#. module: odex30_account_followup
+#: model:ir.model.fields.selection,name:odex30_account_followup.selection__odex30_account_followup_followup_line__activity_default_responsible_type__account_manager
+msgid "Account Manager"
+msgstr ""
+
+#. module: odex30_account_followup
+#: model:ir.actions.server,name:odex30_account_followup.ir_cron_auto_post_draft_entry_ir_actions_server
+msgid "Account Report Followup; Execute followup"
+msgstr ""
+
+#. module: odex30_account_followup
+#: model_terms:ir.ui.view,arch_db:odex30_account_followup.view_odex30_account_followup_followup_line_form
+msgid "Actions"
+msgstr ""
+
+#. module: odex30_account_followup
+#: model_terms:ir.ui.view,arch_db:odex30_account_followup.view_odex30_account_followup_followup_line_form
+#: model_terms:ir.ui.view,arch_db:odex30_account_followup.view_odex30_account_followup_followup_line_tree
+msgid "Activity"
+msgstr ""
+
+#. module: odex30_account_followup
+#: model_terms:ir.ui.view,arch_db:odex30_account_followup.view_odex30_account_followup_followup_line_form
+msgid "Activity Notes"
+msgstr ""
+
+#. module: odex30_account_followup
+#: model:ir.model.fields,field_description:odex30_account_followup.field_odex30_account_followup_followup_line__activity_type_id
+msgid "Activity Type"
+msgstr ""
+
+#. module: odex30_account_followup
+#: model_terms:ir.ui.view,arch_db:odex30_account_followup.template_followup_report
+msgid "Add a note"
+msgstr ""
+
+#. module: odex30_account_followup
+#: model_terms:ir.ui.view,arch_db:odex30_account_followup.manual_reminder_view_form
+msgid "Add contacts to notify..."
+msgstr ""
+
+#. module: odex30_account_followup
+#: model:ir.model.fields,field_description:odex30_account_followup.field_odex30_account_followup_followup_line__additional_follower_ids
+msgid "Add followers"
+msgstr ""
+
+#. module: odex30_account_followup
+#: model_terms:ir.ui.view,arch_db:odex30_account_followup.followup_filter_info_template
+msgid "Address"
+msgstr ""
+
+#. module: odex30_account_followup
+#: model:ir.model.fields,field_description:odex30_account_followup.field_res_partner__type
+#: model:ir.model.fields,field_description:odex30_account_followup.field_res_users__type
+msgid "Address Type"
+msgstr ""
+
+#. module: odex30_account_followup
+#: model:ir.model.fields,field_description:odex30_account_followup.field_odex30_account_followup_followup_line__join_invoices
+#: model:ir.model.fields,field_description:odex30_account_followup.field_odex30_account_followup_manual_reminder__join_invoices
+msgid "Attach Invoices"
+msgstr ""
+
+#. module: odex30_account_followup
+#: model:ir.model.fields,field_description:odex30_account_followup.field_odex30_account_followup_manual_reminder__attachment_ids
+msgid "Attachment"
+msgstr ""
+
+#. module: odex30_account_followup
+#: model:ir.model.fields,field_description:odex30_account_followup.field_odex30_account_followup_followup_line__auto_execute
+#: model:ir.model.fields.selection,name:odex30_account_followup.selection__res_partner__followup_reminder_type__automatic
+#: model_terms:ir.ui.view,arch_db:odex30_account_followup.view_odex30_account_followup_line_filter
+msgid "Automatic"
+msgstr ""
+
+#. module: odex30_account_followup
+#: model:ir.model.fields,field_description:odex30_account_followup.field_odex30_account_followup_manual_reminder__body_has_template_value
+msgid "Body content is the same as the template"
+msgstr ""
+
+#. module: odex30_account_followup
+#: model:ir.model.fields,field_description:odex30_account_followup.field_odex30_account_followup_manual_reminder__can_edit_body
+msgid "Can Edit Body"
+msgstr ""
+
+#. module: odex30_account_followup
+#: model_terms:ir.ui.view,arch_db:odex30_account_followup.manual_reminder_view_form
+msgid "Cancel"
+msgstr ""
+
+#. module: odex30_account_followup
+#: model_terms:ir.ui.view,arch_db:odex30_account_followup.missing_information_view_form
+msgid "Close"
+msgstr ""
+
+#. module: odex30_account_followup
+#. odoo-python
+#: code:addons/odex30_account_followup/models/odex30_account_followup_report.py:0
+msgid "Communication"
+msgstr ""
+
+#. module: odex30_account_followup
+#: model:ir.model.fields,field_description:odex30_account_followup.field_odex30_account_followup_followup_line__company_id
+msgid "Company"
+msgstr ""
+
+#. module: odex30_account_followup
+#: model:ir.model,name:odex30_account_followup.model_res_partner
+msgid "Contact"
+msgstr ""
+
+#. module: odex30_account_followup
+#: model_terms:ir.ui.view,arch_db:odex30_account_followup.manual_reminder_view_form
+#: model_terms:ir.ui.view,arch_db:odex30_account_followup.view_odex30_account_followup_followup_line_form
+msgid "Content Template"
+msgstr ""
+
+#. module: odex30_account_followup
+#: model:ir.model.fields,field_description:odex30_account_followup.field_odex30_account_followup_manual_reminder__body
+msgid "Contents"
+msgstr ""
+
+#. module: odex30_account_followup
+#: model:ir.model.fields,field_description:odex30_account_followup.field_odex30_account_followup_followup_line__create_uid
+#: model:ir.model.fields,field_description:odex30_account_followup.field_odex30_account_followup_manual_reminder__create_uid
+#: model:ir.model.fields,field_description:odex30_account_followup.field_odex30_account_followup_missing_information_wizard__create_uid
+msgid "Created by"
+msgstr ""
+
+#. module: odex30_account_followup
+#: model:ir.model.fields,field_description:odex30_account_followup.field_odex30_account_followup_followup_line__create_date
+#: model:ir.model.fields,field_description:odex30_account_followup.field_odex30_account_followup_manual_reminder__create_date
+#: model:ir.model.fields,field_description:odex30_account_followup.field_odex30_account_followup_missing_information_wizard__create_date
+msgid "Created on"
+msgstr ""
+
+#. module: odex30_account_followup
+#: model_terms:ir.ui.view,arch_db:odex30_account_followup.followup_filter_info_template
+msgid "Customer ref:"
+msgstr ""
+
+#. module: odex30_account_followup
+#: model:ir.actions.client,name:odex30_account_followup.action_odex30_account_followup
+msgid "Customers Statement"
+msgstr ""
+
+#. module: odex30_account_followup
+#. odoo-python
+#: code:addons/odex30_account_followup/models/odex30_account_followup_report.py:0
+msgid "Date"
+msgstr ""
+
+#. module: odex30_account_followup
+#: model_terms:ir.ui.view,arch_db:odex30_account_followup.followup_filter_info_template
+msgid "Date:"
+msgstr ""
+
+#. module: odex30_account_followup
+#: model:ir.model.constraint,message:odex30_account_followup.constraint_odex30_account_followup_followup_line_days_uniq
+msgid "Days of the follow-up lines must be different per company"
+msgstr ""
+
+#. module: odex30_account_followup
+#. odoo-python
+#: code:addons/odex30_account_followup/models/odex30_account_followup_report.py:0
+msgid ""
+"Dear %s,\n"
+"\n"
+"\n"
+"Exception made if there was a mistake of ours, it seems that the following amount stays unpaid. Please, take appropriate measures in order to carry out this payment in the next 8 days.\n"
+"\n"
+"Would your payment have been carried out after this mail was sent, please ignore this message. Do not hesitate to contact our accounting department.\n"
+"\n"
+"Best Regards,\n"
+"\n"
+msgstr ""
+
+#. module: odex30_account_followup
+#. odoo-python
+#: code:addons/odex30_account_followup/models/odex30_account_followup_report.py:0
+msgid ""
+"Dear client, we kindly remind you that you still have unpaid invoices. "
+"Please check them and take appropriate action. %s"
+msgstr ""
+
+#. module: odex30_account_followup
+#: model_terms:ir.actions.act_window,help:odex30_account_followup.action_odex30_account_followup_line_definition_form
+msgid "Define follow-up levels and their related actions"
+msgstr ""
+
+#. module: odex30_account_followup
+#: model_terms:ir.ui.view,arch_db:odex30_account_followup.followup_filter_info_template
+msgid "Demo Ref"
+msgstr ""
+
+#. module: odex30_account_followup
+#: model:ir.model.fields,field_description:odex30_account_followup.field_odex30_account_followup_followup_line__name
+msgid "Description"
+msgstr ""
+
+#. module: odex30_account_followup
+#: model:ir.model.fields,help:odex30_account_followup.field_odex30_account_followup_followup_line__activity_default_responsible_type
+msgid ""
+"Determine who will be assigned to the activity:\n"
+"- Follow-up Responsible (default)\n"
+"- Salesperson: Sales Person defined on the invoice\n"
+"- Account Manager: Sales Person defined on the customer"
+msgstr ""
+
+#. module: odex30_account_followup
+#: model:ir.model.fields,field_description:odex30_account_followup.field_odex30_account_followup_followup_line__display_name
+#: model:ir.model.fields,field_description:odex30_account_followup.field_odex30_account_followup_manual_reminder__display_name
+#: model:ir.model.fields,field_description:odex30_account_followup.field_odex30_account_followup_missing_information_wizard__display_name
+msgid "Display Name"
+msgstr ""
+
+#. module: odex30_account_followup
+#. odoo-python
+#: code:addons/odex30_account_followup/models/odex30_account_followup_report.py:0
+msgid "Due Date"
+msgstr ""
+
+#. module: odex30_account_followup
+#: model:ir.model.fields,field_description:odex30_account_followup.field_odex30_account_followup_followup_line__delay
+msgid "Due Days"
+msgstr ""
+
+#. module: odex30_account_followup
+#: model:ir.model.fields,field_description:odex30_account_followup.field_odex30_account_followup_manual_reminder__email
+msgid "Email"
+msgstr ""
+
+#. module: odex30_account_followup
+#: model_terms:ir.ui.view,arch_db:odex30_account_followup.manual_reminder_view_form
+msgid "Email Recipients"
+msgstr ""
+
+#. module: odex30_account_followup
+#: model_terms:ir.ui.view,arch_db:odex30_account_followup.manual_reminder_view_form
+msgid "Email Subject"
+msgstr ""
+
+#. module: odex30_account_followup
+#: model:ir.model.fields,field_description:odex30_account_followup.field_odex30_account_followup_manual_reminder__email_recipient_ids
+msgid "Extra Recipients"
+msgstr ""
+
+#. module: odex30_account_followup
+#. odoo-python
+#: code:addons/odex30_account_followup/models/res_partner.py:0
+msgid "Follow-up %(partner)s - %(date)s.pdf"
+msgstr ""
+
+#. module: odex30_account_followup
+#: model:ir.model.fields.selection,name:odex30_account_followup.selection__res_partner__type__followup
+msgid "Follow-up Address"
+msgstr ""
+
+#. module: odex30_account_followup
+#: model:ir.model,name:odex30_account_followup.model_odex30_account_followup_followup_line
+msgid "Follow-up Criteria"
+msgstr ""
+
+#. module: odex30_account_followup
+#: model:ir.model.fields,field_description:odex30_account_followup.field_account_move_line__followup_line_id
+#: model:ir.model.fields,field_description:odex30_account_followup.field_res_partner__followup_line_id
+#: model:ir.model.fields,field_description:odex30_account_followup.field_res_users__followup_line_id
+msgid "Follow-up Level"
+msgstr ""
+
+#. module: odex30_account_followup
+#: model:ir.actions.act_window,name:odex30_account_followup.action_odex30_account_followup_line_definition_form
+#: model:ir.ui.menu,name:odex30_account_followup.odex30_account_followup_menu
+msgid "Follow-up Levels"
+msgstr ""
+
+#. module: odex30_account_followup
+#: model:ir.model,name:odex30_account_followup.model_odex30_account_followup_report
+msgid "Follow-up Report"
+msgstr ""
+
+#. module: odex30_account_followup
+#: model:ir.model.fields.selection,name:odex30_account_followup.selection__odex30_account_followup_followup_line__activity_default_responsible_type__followup
+msgid "Follow-up Responsible"
+msgstr ""
+
+#. module: odex30_account_followup
+#: model:ir.model.fields,field_description:odex30_account_followup.field_res_partner__followup_status
+#: model:ir.model.fields,field_description:odex30_account_followup.field_res_users__followup_status
+msgid "Follow-up Status"
+msgstr ""
+
+#. module: odex30_account_followup
+#: model_terms:ir.ui.view,arch_db:odex30_account_followup.view_odex30_account_followup_followup_line_form
+#: model_terms:ir.ui.view,arch_db:odex30_account_followup.view_odex30_account_followup_followup_line_tree
+msgid "Follow-up Steps"
+msgstr ""
+
+#. module: odex30_account_followup
+#: model_terms:ir.ui.view,arch_db:odex30_account_followup.report_followup_print_all
+msgid "Follow-up details"
+msgstr ""
+
+#. module: odex30_account_followup
+#. odoo-python
+#: code:addons/odex30_account_followup/models/odex30_account_followup_report.py:0
+msgid "Follow-up letter generated"
+msgstr ""
+
+#. module: odex30_account_followup
+#: model:ir.model,name:odex30_account_followup.model_odex30_account_followup_missing_information_wizard
+msgid "Followup missing information wizard"
+msgstr ""
+
+#. module: odex30_account_followup
+#: model_terms:ir.actions.act_window,help:odex30_account_followup.action_odex30_account_followup_line_definition_form
+msgid ""
+"For each step, specify the actions to be taken and delay in days. It is\n"
+"            possible to use print and e-mail templates to send specific messages to\n"
+"            the customer."
+msgstr ""
+
+#. module: odex30_account_followup
+#: model:mail.template,name:odex30_account_followup.demo_followup_email_template_4
+msgid "Fourth reminder followup"
+msgstr ""
+
+#. module: odex30_account_followup
+#: model:ir.model.fields,field_description:odex30_account_followup.field_res_partner__has_moves
+#: model:ir.model.fields,field_description:odex30_account_followup.field_res_users__has_moves
+msgid "Has Moves"
+msgstr ""
+
+#. module: odex30_account_followup
+#: model:ir.model.fields,field_description:odex30_account_followup.field_odex30_account_followup_followup_line__id
+#: model:ir.model.fields,field_description:odex30_account_followup.field_odex30_account_followup_manual_reminder__id
+#: model:ir.model.fields,field_description:odex30_account_followup.field_odex30_account_followup_missing_information_wizard__id
+msgid "ID"
+msgstr ""
+
+#. module: odex30_account_followup
+#: model:ir.model.fields,help:odex30_account_followup.field_odex30_account_followup_followup_line__additional_follower_ids
+msgid ""
+"If set, those users will be added as followers on the partner and receive "
+"notifications about any email reply made by the partner on the reminder "
+"email."
+msgstr ""
+
+#. module: odex30_account_followup
+#: model:ir.model.fields.selection,name:odex30_account_followup.selection__res_partner__followup_status__in_need_of_action
+msgid "In need of action"
+msgstr ""
+
+#. module: odex30_account_followup
+#: model_terms:ir.ui.view,arch_db:odex30_account_followup.view_partner_property_form_followup
+msgid "Invoice Follow-ups"
+msgstr ""
+
+#. module: odex30_account_followup
+#: model_terms:ir.ui.view,arch_db:odex30_account_followup.template_followup_report
+msgid "Invoices Analysis"
+msgstr ""
+
+#. module: odex30_account_followup
+#: model:ir.model.fields,field_description:odex30_account_followup.field_odex30_account_followup_manual_reminder__is_mail_template_editor
+msgid "Is Editor"
+msgstr ""
+
+#. module: odex30_account_followup
+#: model:ir.model,name:odex30_account_followup.model_account_move_line
+msgid "Journal Item"
+msgstr ""
+
+#. module: odex30_account_followup
+#: model_terms:ir.ui.view,arch_db:odex30_account_followup.manual_reminder_view_form
+msgid "Kind reminder!"
+msgstr ""
+
+#. module: odex30_account_followup
+#: model:ir.model.fields,field_description:odex30_account_followup.field_odex30_account_followup_manual_reminder__lang
+msgid "Language"
+msgstr ""
+
+#. module: odex30_account_followup
+#: model:ir.model.fields,field_description:odex30_account_followup.field_odex30_account_followup_followup_line__write_uid
+#: model:ir.model.fields,field_description:odex30_account_followup.field_odex30_account_followup_manual_reminder__write_uid
+#: model:ir.model.fields,field_description:odex30_account_followup.field_odex30_account_followup_missing_information_wizard__write_uid
+msgid "Last Updated by"
+msgstr ""
+
+#. module: odex30_account_followup
+#: model:ir.model.fields,field_description:odex30_account_followup.field_odex30_account_followup_followup_line__write_date
+#: model:ir.model.fields,field_description:odex30_account_followup.field_odex30_account_followup_manual_reminder__write_date
+#: model:ir.model.fields,field_description:odex30_account_followup.field_odex30_account_followup_missing_information_wizard__write_date
+msgid "Last Updated on"
+msgstr ""
+
+#. module: odex30_account_followup
+#: model_terms:ir.ui.view,arch_db:odex30_account_followup.manual_reminder_view_form
+msgid "Letter/Email Content"
+msgstr ""
+
+#. module: odex30_account_followup
+#: model:ir.model.fields,field_description:odex30_account_followup.field_odex30_account_followup_followup_line__mail_template_id
+#: model:ir.model.fields,field_description:odex30_account_followup.field_odex30_account_followup_manual_reminder__template_id
+msgid "Mail Template"
+msgstr ""
+
+#. module: odex30_account_followup
+#: model:ir.model.fields.selection,name:odex30_account_followup.selection__res_partner__followup_reminder_type__manual
+#: model_terms:ir.ui.view,arch_db:odex30_account_followup.view_odex30_account_followup_line_filter
+msgid "Manual"
+msgstr ""
+
+#. module: odex30_account_followup
+#. odoo-python
+#: code:addons/odex30_account_followup/models/res_partner.py:0
+#: code:addons/odex30_account_followup/wizard/followup_missing_information.py:0
+msgid "Missing information"
+msgstr ""
+
+#. module: odex30_account_followup
+#: model_terms:ir.ui.view,arch_db:odex30_account_followup.line_template
+msgid "Name"
+msgstr ""
+
+#. module: odex30_account_followup
+#. odoo-python
+#: code:addons/odex30_account_followup/models/res_partner.py:0
+msgid "Next Reminder Date set to %s"
+msgstr ""
+
+#. module: odex30_account_followup
+#: model:ir.model.fields,field_description:odex30_account_followup.field_res_partner__followup_next_action_date
+#: model:ir.model.fields,field_description:odex30_account_followup.field_res_users__followup_next_action_date
+msgid "Next reminder"
+msgstr ""
+
+#. module: odex30_account_followup
+#: model:ir.model.fields.selection,name:odex30_account_followup.selection__res_partner__followup_status__no_action_needed
+msgid "No action needed"
+msgstr ""
+
+#. module: odex30_account_followup
+#: model:ir.model.fields,help:odex30_account_followup.field_res_partner__followup_next_action_date
+#: model:ir.model.fields,help:odex30_account_followup.field_res_users__followup_next_action_date
+msgid ""
+"No follow-up action will be taken before this date.\n"
+"                Sending a reminder will set this date depending on the levels configuration, and you can change it manually."
+msgstr ""
+
+#. module: odex30_account_followup
+#: model:ir.model.fields,field_description:odex30_account_followup.field_odex30_account_followup_followup_line__activity_note
+msgid "Note"
+msgstr ""
+
+#. module: odex30_account_followup
+#: model_terms:ir.ui.view,arch_db:odex30_account_followup.view_odex30_account_followup_followup_line_form
+msgid "Notification"
+msgstr ""
+
+#. module: odex30_account_followup
+#: model:ir.model.fields,help:odex30_account_followup.field_odex30_account_followup_manual_reminder__lang
+msgid ""
+"Optional translation language (ISO code) to select when sending out an "
+"email. If not set, the english version will be used. This should usually be "
+"a placeholder expression that provides the appropriate language, e.g. {{ "
+"object.partner_id.lang }}."
+msgstr ""
+
+#. module: odex30_account_followup
+#: model_terms:ir.ui.view,arch_db:odex30_account_followup.view_odex30_account_followup_followup_line_form
+msgid "Options"
+msgstr ""
+
+#. module: odex30_account_followup
+#. odoo-python
+#: code:addons/odex30_account_followup/models/odex30_account_followup_report.py:0
+#: model:ir.model.fields,field_description:odex30_account_followup.field_account_move_line__invoice_origin
+msgid "Origin"
+msgstr ""
+
+#. module: odex30_account_followup
+#. odoo-python
+#: code:addons/odex30_account_followup/models/res_partner.py:0
+#: model_terms:ir.ui.view,arch_db:odex30_account_followup.customer_statements_search_view
+#: model_terms:ir.ui.view,arch_db:odex30_account_followup.view_partner_property_form_followup
+msgid "Overdue Invoices"
+msgstr ""
+
+#. module: odex30_account_followup
+#: model:ir.model.fields,field_description:odex30_account_followup.field_odex30_account_followup_manual_reminder__partner_id
+msgid "Partner"
+msgstr ""
+
+#. module: odex30_account_followup
+#: model:mail.template,name:odex30_account_followup.email_template_followup_1
+msgid "Payment Reminder"
+msgstr ""
+
+#. module: odex30_account_followup
+#: model:ir.model.fields,field_description:odex30_account_followup.field_odex30_account_followup_manual_reminder__print
+#: model_terms:ir.ui.view,arch_db:odex30_account_followup.manual_reminder_view_form
+msgid "Print"
+msgstr ""
+
+#. module: odex30_account_followup
+#: model:ir.actions.report,name:odex30_account_followup.action_report_followup
+msgid "Print Follow-up Letter"
+msgstr ""
+
+#. module: odex30_account_followup
+#: model:ir.actions.server,name:odex30_account_followup.action_account_reports_customer_statements_do_followup
+msgid "Process Follow-ups"
+msgstr ""
+
+#. module: odex30_account_followup
+#. odoo-python
+#: code:addons/odex30_account_followup/models/odex30_account_followup_report.py:0
+msgid "Reference"
+msgstr ""
+
+#. module: odex30_account_followup
+#: model_terms:ir.ui.view,arch_db:odex30_account_followup.view_odex30_account_followup_followup_line_form
+msgid "Remind"
+msgstr ""
+
+#. module: odex30_account_followup
+#: model:ir.model.fields,field_description:odex30_account_followup.field_res_partner__followup_reminder_type
+#: model:ir.model.fields,field_description:odex30_account_followup.field_res_users__followup_reminder_type
+msgid "Reminders"
+msgstr ""
+
+#. module: odex30_account_followup
+#: model:ir.model.fields,field_description:odex30_account_followup.field_odex30_account_followup_manual_reminder__render_model
+msgid "Rendering Model"
+msgstr ""
+
+#. module: odex30_account_followup
+#: model:ir.model,name:odex30_account_followup.model_ir_actions_report
+msgid "Report Action"
+msgstr ""
+
+#. module: odex30_account_followup
+#: model_terms:ir.ui.view,arch_db:odex30_account_followup.customer_statements_search_view
+msgid "Requires Follow-up"
+msgstr ""
+
+#. module: odex30_account_followup
+#: model:ir.model.fields,field_description:odex30_account_followup.field_odex30_account_followup_followup_line__activity_default_responsible_type
+#: model:ir.model.fields,field_description:odex30_account_followup.field_res_partner__followup_responsible_id
+#: model:ir.model.fields,field_description:odex30_account_followup.field_res_users__followup_responsible_id
+msgid "Responsible"
+msgstr ""
+
+#. module: odex30_account_followup
+#: model_terms:ir.ui.view,arch_db:odex30_account_followup.manual_reminder_view_form
+msgid "SMS"
+msgstr ""
+
+#. module: odex30_account_followup
+#: model:ir.model.fields.selection,name:odex30_account_followup.selection__odex30_account_followup_followup_line__activity_default_responsible_type__salesperson
+msgid "Salesperson"
+msgstr ""
+
+#. module: odex30_account_followup
+#: model:ir.model.fields,field_description:odex30_account_followup.field_odex30_account_followup_followup_line__create_activity
+msgid "Schedule Activity"
+msgstr ""
+
+#. module: odex30_account_followup
+#: model_terms:ir.ui.view,arch_db:odex30_account_followup.view_odex30_account_followup_line_filter
+msgid "Search Follow-up"
+msgstr ""
+
+#. module: odex30_account_followup
+#: model:mail.template,name:odex30_account_followup.demo_followup_email_template_2
+msgid "Second reminder followup"
+msgstr ""
+
+#. module: odex30_account_followup
+#: model_terms:ir.ui.view,arch_db:odex30_account_followup.manual_reminder_view_form
+#: model_terms:ir.ui.view,arch_db:odex30_account_followup.view_partner_property_form_followup
+msgid "Send"
+msgstr ""
+
+#. module: odex30_account_followup
+#: model_terms:ir.ui.view,arch_db:odex30_account_followup.manual_reminder_view_form
+msgid "Send & Print"
+msgstr ""
+
+#. module: odex30_account_followup
+#: model:ir.model.fields,field_description:odex30_account_followup.field_odex30_account_followup_followup_line__send_email
+msgid "Send Email"
+msgstr ""
+
+#. module: odex30_account_followup
+#: model:ir.model.fields,field_description:odex30_account_followup.field_odex30_account_followup_followup_line__send_sms
+msgid "Send SMS Message"
+msgstr ""
+
+#. module: odex30_account_followup
+#: model:ir.actions.act_window,name:odex30_account_followup.manual_reminder_action
+msgid "Send and Print"
+msgstr ""
+
+#. module: odex30_account_followup
+#: model:ir.model.fields,field_description:odex30_account_followup.field_odex30_account_followup_manual_reminder__sms
+msgid "Sms"
+msgstr ""
+
+#. module: odex30_account_followup
+#: model:ir.model.fields,field_description:odex30_account_followup.field_odex30_account_followup_manual_reminder__sms_body
+msgid "Sms Body"
+msgstr ""
+
+#. module: odex30_account_followup
+#: model_terms:ir.ui.view,arch_db:odex30_account_followup.manual_reminder_view_form
+msgid "Sms Content"
+msgstr ""
+
+#. module: odex30_account_followup
+#: model:ir.model.fields,field_description:odex30_account_followup.field_odex30_account_followup_followup_line__sms_template_id
+#: model:ir.model.fields,field_description:odex30_account_followup.field_odex30_account_followup_manual_reminder__sms_template_id
+msgid "Sms Template"
+msgstr ""
+
+#. module: odex30_account_followup
+#: model:ir.model.fields,field_description:odex30_account_followup.field_odex30_account_followup_manual_reminder__subject
+msgid "Subject"
+msgstr ""
+
+#. module: odex30_account_followup
+#: model:ir.model.fields,field_description:odex30_account_followup.field_odex30_account_followup_followup_line__activity_summary
+msgid "Summary"
+msgstr ""
+
+#. module: odex30_account_followup
+#: model_terms:ir.ui.view,arch_db:odex30_account_followup.table_header_template_followup_report
+msgid "Table Header"
+msgstr ""
+
+#. module: odex30_account_followup
+#: model_terms:ir.ui.view,arch_db:odex30_account_followup.line_template
+msgid "Table Value"
+msgstr ""
+
+#. module: odex30_account_followup
+#: model:ir.model.fields,help:odex30_account_followup.field_account_move_line__invoice_origin
+msgid "The document(s) that generated the invoice."
+msgstr ""
+
+#. module: odex30_account_followup
+#: model:ir.model.fields,help:odex30_account_followup.field_odex30_account_followup_followup_line__delay
+msgid ""
+"The number of days after the due date of the invoice to wait before sending "
+"the reminder. Can be negative if you want to send the reminder before the "
+"invoice due date."
+msgstr ""
+
+#. module: odex30_account_followup
+#: model:ir.model.fields,help:odex30_account_followup.field_res_partner__followup_responsible_id
+#: model:ir.model.fields,help:odex30_account_followup.field_res_users__followup_responsible_id
+msgid ""
+"The responsible assigned to manual followup activities, if defined in the "
+"level."
+msgstr ""
+
+#. module: odex30_account_followup
+#: model_terms:ir.ui.view,arch_db:odex30_account_followup.customer_statements_tree_view
+msgid "Total"
+msgstr ""
+
+#. module: odex30_account_followup
+#: model:ir.model.fields,field_description:odex30_account_followup.field_res_partner__total_all_due
+#: model:ir.model.fields,field_description:odex30_account_followup.field_res_users__total_all_due
+msgid "Total All Due"
+msgstr ""
+
+#. module: odex30_account_followup
+#: model:ir.model.fields,field_description:odex30_account_followup.field_res_partner__total_all_overdue
+#: model:ir.model.fields,field_description:odex30_account_followup.field_res_users__total_all_overdue
+msgid "Total All Overdue"
+msgstr ""
+
+#. module: odex30_account_followup
+#. odoo-python
+#: code:addons/odex30_account_followup/models/odex30_account_followup_report.py:0
+#: model:ir.model.fields,field_description:odex30_account_followup.field_res_partner__total_due
+#: model:ir.model.fields,field_description:odex30_account_followup.field_res_users__total_due
+msgid "Total Due"
+msgstr ""
+
+#. module: odex30_account_followup
+#. odoo-python
+#: code:addons/odex30_account_followup/models/odex30_account_followup_report.py:0
+#: model:ir.model.fields,field_description:odex30_account_followup.field_res_partner__total_overdue
+#: model:ir.model.fields,field_description:odex30_account_followup.field_res_users__total_overdue
+msgid "Total Overdue"
+msgstr ""
+
+#. module: odex30_account_followup
+#: model:ir.model.fields,field_description:odex30_account_followup.field_res_partner__unpaid_invoice_ids
+#: model:ir.model.fields,field_description:odex30_account_followup.field_res_users__unpaid_invoice_ids
+msgid "Unpaid Invoice"
+msgstr ""
+
+#. module: odex30_account_followup
+#: model:ir.model.fields,field_description:odex30_account_followup.field_res_partner__unpaid_invoices_count
+#: model:ir.model.fields,field_description:odex30_account_followup.field_res_users__unpaid_invoices_count
+msgid "Unpaid Invoices Count"
+msgstr ""
+
+#. module: odex30_account_followup
+#: model:ir.model.fields,field_description:odex30_account_followup.field_res_partner__unreconciled_aml_ids
+#: model:ir.model.fields,field_description:odex30_account_followup.field_res_users__unreconciled_aml_ids
+msgid "Unreconciled Aml"
+msgstr ""
+
+#. module: odex30_account_followup
+#: model_terms:ir.ui.view,arch_db:odex30_account_followup.missing_information_view_form
+msgid "View partners"
+msgstr ""
+
+#. module: odex30_account_followup
+#: model_terms:ir.ui.view,arch_db:odex30_account_followup.missing_information_view_form
+msgid ""
+"We were not able to process some of the automated follow-up actions due to "
+"missing information on the partners."
+msgstr ""
+
+#. module: odex30_account_followup
+#: model:ir.model.fields.selection,name:odex30_account_followup.selection__res_partner__followup_status__with_overdue_invoices
+msgid "With overdue invoices"
+msgstr ""
+
+#. module: odex30_account_followup
+#: model:ir.model,name:odex30_account_followup.model_odex30_account_followup_manual_reminder
+msgid "Wizard for sending manual reminders to clients"
+msgstr ""
+
+#. module: odex30_account_followup
+#: model_terms:ir.ui.view,arch_db:odex30_account_followup.manual_reminder_view_form
+msgid "Write your message here..."
+msgstr ""
+
+#. module: odex30_account_followup
+#. odoo-python
+#: code:addons/odex30_account_followup/models/odex30_account_followup_report.py:0
+msgid ""
+"You are trying to send an Email, but no follow-up contact has any email "
+"address set for customer '%s'"
+msgstr ""
+
+#. module: odex30_account_followup
+#. odoo-python
+#: code:addons/odex30_account_followup/models/odex30_account_followup_report.py:0
+msgid ""
+"You are trying to send an SMS, but no follow-up contact has any mobile/phone"
+" number set for customer '%s'"
+msgstr ""
+
+#. module: odex30_account_followup
+#: model_terms:ir.ui.view,arch_db:odex30_account_followup.view_odex30_account_followup_followup_line_form
+msgid "days after due date"
+msgstr ""
+
+#. module: odex30_account_followup
+#: model_terms:ir.ui.view,arch_db:odex30_account_followup.view_odex30_account_followup_followup_line_form
+msgid "e.g. First Reminder Email"
+msgstr ""
+
+#. module: odex30_account_followup
+#. odoo-python
+#: code:addons/odex30_account_followup/models/odex30_account_followup_report.py:0
+msgid "payment reminder"
+msgstr ""
+
+#. module: odex30_account_followup
+#: model:mail.template,subject:odex30_account_followup.demo_followup_email_template_2
+#: model:mail.template,subject:odex30_account_followup.demo_followup_email_template_4
+#: model:mail.template,subject:odex30_account_followup.email_template_followup_1
+msgid ""
+"{{ (object.company_id or object._get_followup_responsible().company_id).name"
+" }} Payment Reminder - {{ object.commercial_company_name }}"
+msgstr ""
diff --git a/dev_odex30_accounting/odex30_account_followup/i18n/ar.po b/dev_odex30_accounting/odex30_account_followup/i18n/ar.po
new file mode 100644
index 0000000..3e7966e
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_followup/i18n/ar.po
@@ -0,0 +1,1235 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# 	* odex30_account_followup
+#
+# Translators:
+# Wil Odoo, 2024
+# Malaz Abuidris <msea@odoo.com>, 2025
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 18.0+e\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2025-11-21 18:47+0000\n"
+"PO-Revision-Date: 2024-09-25 09:44+0000\n"
+"Last-Translator: Malaz Abuidris <msea@odoo.com>, 2025\n"
+"Language-Team: Arabic (https://app.transifex.com/odoo/teams/41243/ar/)\n"
+"Language: ar\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 "
+"&& n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
+
+#. module: odex30_account_followup
+#. odoo-python
+#: code:addons/odex30_account_followup/models/odex30_account_followup_report.py:0
+msgid "%(company)s Payment Reminder - %(partner)s"
+msgstr "%(company)s تذكير الدفع - %(partner)s "
+
+#. module: odex30_account_followup
+#. odoo-python
+#: code:addons/odex30_account_followup/models/odex30_account_followup.py:0
+msgid "%(delay)s days (copy of %(name)s)"
+msgstr "%(delay)s أيام (نسخة من %(name)s) "
+
+#. module: odex30_account_followup
+#: model:ir.actions.report,print_report_name:odex30_account_followup.action_report_followup
+msgid "'Follow-up ' + object.display_name"
+msgstr "'المتابعة' + object.display_name "
+
+#. module: odex30_account_followup
+#: model:odex30_account_followup.followup.line,name:odex30_account_followup.demo_followup_line1
+msgid "15 Days"
+msgstr "15 يوماً"
+
+#. module: odex30_account_followup
+#: model_terms:ir.ui.view,arch_db:odex30_account_followup.followup_filter_info_template
+msgid "2023-09-06"
+msgstr "2023-09-06"
+
+#. module: odex30_account_followup
+#: model:odex30_account_followup.followup.line,name:odex30_account_followup.demo_followup_line2
+msgid "30 Days"
+msgstr "30 يوماً"
+
+#. module: odex30_account_followup
+#: model:odex30_account_followup.followup.line,name:odex30_account_followup.demo_followup_line3
+msgid "40 Days"
+msgstr "40 يوم "
+
+#. module: odex30_account_followup
+#: model:odex30_account_followup.followup.line,name:odex30_account_followup.demo_followup_line4
+msgid "50 Days"
+msgstr "50 يوم "
+
+#. module: odex30_account_followup
+#: model:odex30_account_followup.followup.line,name:odex30_account_followup.demo_followup_line5
+msgid "60 Days"
+msgstr "60 يوم "
+
+#. module: odex30_account_followup
+#: model:mail.template,body_html:odex30_account_followup.email_template_followup_1
+msgid ""
+"<div style=\"margin: 0px; padding: 0px;\">\n"
+"                    <p style=\"margin: 0px; padding: 0px;\">\n"
+"                        <t t-if=\"object.id != "
+"object.commercial_partner_id.id\">Dear <t t-out=\"object.name or ''\"/> (<t "
+"t-out=\"object.commercial_partner_id.name or ''\"/>),</t>\n"
+"                        <t t-else=\"\">Dear <t t-out=\"object.name or ''\"/>,"
+"</t>\n"
+"                        <br/>\n"
+"                        It has come to our attention that you have&nbsp;an "
+"outstanding balance of <t t-"
+"out=\"format_amount(object.total_overdue_followup, object.currency_id) or "
+"''\"/>\n"
+"                        <br/>\n"
+"                        We kindly request that you take necessary action to "
+"settle this amount within the next 8 days.\n"
+"                        <br/>\n"
+"                        </p><div t-if=\"object._show_pay_now_button()\" "
+"class=\"d-flex\">\n"
+"                            <a t-att-href=\"'/my/invoices/overdue'\" "
+"class=\"btn btn-primary\">Pay now</a>\n"
+"                        </div>\n"
+"                        If you have already made the payment after receiving "
+"this message, please disregard it.\n"
+"                        Our accounting department is available if you "
+"require any assistance or have any questions.\n"
+"                        <br/>\n"
+"                        Thank you for your cooperation.\n"
+"                        <br/>\n"
+"                        Sincerely,\n"
+"                        <t t-if=\"not "
+"is_html_empty(object._get_followup_responsible().signature)\">\n"
+"                            <br/>\n"
+"                            <t t-"
+"out=\"object._get_followup_responsible().signature\"/>\n"
+"                        </t>\n"
+"                        <t t-else=\"\">\n"
+"                            <br/>\n"
+"                            --\n"
+"                            <br/>\n"
+"                            <t t-"
+"out=\"object._get_followup_responsible().name\"/>\n"
+"                        </t>\n"
+"                    \n"
+"                </div>\n"
+"            "
+msgstr ""
+
+#. module: odex30_account_followup
+#: model:mail.template,body_html:odex30_account_followup.demo_followup_email_template_4
+msgid ""
+"<div style=\"margin: 0px; padding: 0px;\">\n"
+"                    <p>\n"
+"                        <t t-if=\"object.id != "
+"object.commercial_partner_id.id\">Dear <t t-out=\"object.name or ''\"/> (<t "
+"t-out=\"object.commercial_partner_id.name or ''\"/>),</t>\n"
+"                        <t t-else=\"\">Dear <t t-out=\"object.name or ''\"/>,"
+"</t>\n"
+"                        <br/>\n"
+"                        Despite several reminders, your account is still not "
+"settled.\n"
+"                        Unless full payment is made in next 8 days, then "
+"legal action for the recovery of the debt will be taken without further "
+"notice.\n"
+"                        I trust that this action will prove unnecessary and "
+"details of due payments is printed below.\n"
+"                        In case of any queries concerning this matter, do "
+"not hesitate to contact our accounting department.\n"
+"                        <br/>\n"
+"                        Best Regards,\n"
+"                        <br/>\n"
+"                        <t t-if=\"not "
+"is_html_empty(object._get_followup_responsible().signature)\">\n"
+"                            <br/>\n"
+"                            <t t-"
+"out=\"object._get_followup_responsible().signature\"/>\n"
+"                        </t>\n"
+"                        <t t-else=\"\">\n"
+"                            <br/>\n"
+"                            --\n"
+"                            <br/>\n"
+"                            <t t-"
+"out=\"object._get_followup_responsible().name\"/>\n"
+"                        </t>\n"
+"                    </p>\n"
+"                </div>\n"
+"            "
+msgstr ""
+"<div style=\"margin: 0px; padding: 0px;\">\n"
+"                    <p>\n"
+"                        <t t-if=\"object.id != "
+"object.commercial_partner_id.id\">عزيزنا <t t-out=\"object.name or ''\"/> "
+"(<t t-out=\"object.commercial_partner_id.name or ''\"/>)،</t>\n"
+"                        <t t-else=\"\">عزيزنا <t t-out=\"object.name or ''\"/"
+">،</t>\n"
+"                        <br/>\n"
+"                        على الرغم من التذكيرات العديدة، لا يزال الحساب غير "
+"مسوى.\n"
+"                        سيتم اتخاذ الإجراءات القانونية لتحصيل الدين دون أي "
+"إشعارات إضافية، إلا في حال دفع المبلغ كاملاً خلال الـ8 أيام القادمة.\n"
+"                        نحن على ثقة من عدم حاجتنا إلى اتخاذ ذلك الإجراء، "
+"وستجد تفاصيل الدفع مطبوعة أدناه.\n"
+"                        لا تتردد في النواصل مع قسم المحاسبة إذا كانت لديك أي "
+"أسئلة أو استفسارات متعلقة بالأمر.\n"
+"                        <br/>\n"
+"                        مع أطيب التحيات،\n"
+"                        <br/>\n"
+"                        <t t-if=\"not "
+"is_html_empty(object._get_followup_responsible().signature)\">\n"
+"                            <br/>\n"
+"                            <t t-"
+"out=\"object._get_followup_responsible().signature\"/>\n"
+"                        </t>\n"
+"                        <t t-else=\"\">\n"
+"                            <br/>\n"
+"                            --\n"
+"                            <br/>\n"
+"                            <t t-"
+"out=\"object._get_followup_responsible().name\"/>\n"
+"                        </t>\n"
+"                    </p>\n"
+"                </div>\n"
+"            "
+
+#. module: odex30_account_followup
+#: model:mail.template,body_html:odex30_account_followup.demo_followup_email_template_2
+msgid ""
+"<div style=\"margin: 0px; padding: 0px;\">\n"
+"                    <p>\n"
+"                        <t t-if=\"object.id != "
+"object.commercial_partner_id.id\">Dear <t t-out=\"object.name or ''\"/> (<t "
+"t-out=\"object.commercial_partner_id.name or ''\"/>),</t>\n"
+"                        <t t-else=\"\">Dear <t t-out=\"object.name or ''\"/>,"
+"</t>\n"
+"                        <br/>\n"
+"                        We are disappointed to see that despite sending a "
+"reminder, that your account is now seriously overdue.\n"
+"                        <br/>\n"
+"                        It is essential that immediate payment is made, "
+"otherwise we will have to consider placing a stop on your account which "
+"means that we will no longer be able to supply your company with (goods/"
+"services). Please, take appropriate measures in order to carry out this "
+"payment in the next 8 days.\n"
+"                        <br/>\n"
+"                        If there is a problem with paying invoice that we "
+"are not aware of, do not hesitate to contact our accounting department, so "
+"that we can resolve the matter quickly.\n"
+"                        <br/>\n"
+"                        Details of due payments is printed below.\n"
+"                        <br/>\n"
+"                        Best Regards,\n"
+"                        <t t-if=\"not "
+"is_html_empty(object._get_followup_responsible().signature)\">\n"
+"                            <br/>\n"
+"                            <t t-"
+"out=\"object._get_followup_responsible().signature\"/>\n"
+"                        </t>\n"
+"                        <t t-else=\"\">\n"
+"                            <br/>\n"
+"                            --\n"
+"                            <br/>\n"
+"                            <t t-"
+"out=\"object._get_followup_responsible().name\"/>\n"
+"                        </t>\n"
+"                    </p>\n"
+"                </div>\n"
+"            "
+msgstr ""
+"<div style=\"margin: 0px; padding: 0px;\">\n"
+"                    <p>\n"
+"                        <t t-if=\"object.id != "
+"object.commercial_partner_id.id\">عزيزنا <t t-out=\"object.name or ''\"/> "
+"(<t t-out=\"object.commercial_partner_id.name or ''\"/>)،</t>\n"
+"                        <t t-else=\"\">عزيزنا <t t-out=\"object.name or ''\"/"
+">،</t>\n"
+"                        <br/>\n"
+"                        يؤسفنا أن نرى أنه على الرغم من التذكير الذي قمنا "
+"بإرساله، لا يزال حسابك متأخر الدفع كثيراً.\n"
+"                        <br/>\n"
+"                        يجب أن تتم عملية الدفع فوراً وإلا سنضطر إلى إيقاف "
+"حسابك، مما يعني أننا لن نكون قادرين على تزويد شركتك (بالبضائع/الخدمات).يرجى "
+"اتخاذ الإجراءات اللازمة لدفع ذلك المبلغ خلال الـ 8 أيام المقبلة.\n"
+"                        <br/>\n"
+"                        إذا كنت تواجه مشكلة لا نعلم عنها في دفع الفاتورة، لا "
+"تتردد في التواصل مع قسم المحاسبة لدينا حتى نتمكن من حل المشكلة بسرعة.\n"
+"                        <br/>\n"
+"                        تفاصيل الدفع المتأخر مطبوعة أدناه.\n"
+"                        <br/>\n"
+"                        مع أطيب التحيات،\n"
+"                        <t t-if=\"not "
+"is_html_empty(object._get_followup_responsible().signature)\">\n"
+"                            <br/>\n"
+"                            <t t-"
+"out=\"object._get_followup_responsible().signature\"/>\n"
+"                        </t>\n"
+"                        <t t-else=\"\">\n"
+"                            <br/>\n"
+"                            --\n"
+"                            <br/>\n"
+"                            <t t-"
+"out=\"object._get_followup_responsible().name\"/>\n"
+"                        </t>\n"
+"                    </p>\n"
+"                </div>\n"
+"            "
+
+#. module: odex30_account_followup
+#: model_terms:ir.ui.view,arch_db:odex30_account_followup.res_partner_view_form
+msgid "<span class=\"o_stat_text\">Customer Statement</span>"
+msgstr "<span class=\"o_stat_text\">كشف حساب العميل</span> "
+
+#. module: odex30_account_followup
+#: model_terms:ir.ui.view,arch_db:odex30_account_followup.res_partner_view_form
+msgid ""
+"<span>Preferred address for follow-up reports. Selected by default when you "
+"send reminders about overdue invoices.</span>"
+msgstr ""
+"<span>العنوان المفضل لتقارير المتابعة. يتم اختياره افتراضياً عندما تقوم "
+"بإرسال تذكيرات حول الفواتير المتأخرة.</span> "
+
+#. module: odex30_account_followup
+#: model_terms:ir.ui.view,arch_db:odex30_account_followup.template_followup_report
+msgid ""
+"<strong>\n"
+"                                Pending Invoices\n"
+"                            </strong>"
+msgstr ""
+"<strong>\n"
+"                                فواتير قيد الانتظار\n"
+"                            </strong>"
+
+#. module: odex30_account_followup
+#: model:ir.model.constraint,message:odex30_account_followup.constraint_odex30_account_followup_followup_line_uniq_name
+msgid ""
+"A follow-up action name must be unique. This name is already set to another "
+"action."
+msgstr ""
+"يجب أن يكون اسم إجراء المتابعة فريداً. هذا الاسم مستخدَم في إجراء آخر بالفعل. "
+
+#. module: odex30_account_followup
+#: model:ir.model.fields.selection,name:odex30_account_followup.selection__odex30_account_followup_followup_line__activity_default_responsible_type__account_manager
+msgid "Account Manager"
+msgstr "إدارة حساب المستخدم"
+
+#. module: odex30_account_followup
+#: model:ir.actions.server,name:odex30_account_followup.ir_cron_auto_post_draft_entry_ir_actions_server
+msgid "Account Report Followup; Execute followup"
+msgstr "متابعة تقرير الحساب؛ لتنفيذ المتابعة "
+
+#. module: odex30_account_followup
+#: model_terms:ir.ui.view,arch_db:odex30_account_followup.view_odex30_account_followup_followup_line_form
+msgid "Actions"
+msgstr "الإجراءات"
+
+#. module: odex30_account_followup
+#: model_terms:ir.ui.view,arch_db:odex30_account_followup.view_odex30_account_followup_followup_line_form
+#: model_terms:ir.ui.view,arch_db:odex30_account_followup.view_odex30_account_followup_followup_line_tree
+msgid "Activity"
+msgstr "النشاط"
+
+#. module: odex30_account_followup
+#: model_terms:ir.ui.view,arch_db:odex30_account_followup.view_odex30_account_followup_followup_line_form
+msgid "Activity Notes"
+msgstr "ملاحظات النشاط "
+
+#. module: odex30_account_followup
+#: model:ir.model.fields,field_description:odex30_account_followup.field_odex30_account_followup_followup_line__activity_type_id
+msgid "Activity Type"
+msgstr "نوع النشاط"
+
+#. module: odex30_account_followup
+#: model_terms:ir.ui.view,arch_db:odex30_account_followup.template_followup_report
+msgid "Add a note"
+msgstr "إضافة ملاحظة"
+
+#. module: odex30_account_followup
+#: model_terms:ir.ui.view,arch_db:odex30_account_followup.manual_reminder_view_form
+msgid "Add contacts to notify..."
+msgstr "إضافة جهات اتصال لإشعارهم..."
+
+#. module: odex30_account_followup
+#: model:ir.model.fields,field_description:odex30_account_followup.field_odex30_account_followup_followup_line__additional_follower_ids
+msgid "Add followers"
+msgstr "إضافة متابعين "
+
+#. module: odex30_account_followup
+#: model_terms:ir.ui.view,arch_db:odex30_account_followup.followup_filter_info_template
+msgid "Address"
+msgstr "العنوان"
+
+#. module: odex30_account_followup
+#: model:ir.model.fields,field_description:odex30_account_followup.field_res_partner__type
+#: model:ir.model.fields,field_description:odex30_account_followup.field_res_users__type
+msgid "Address Type"
+msgstr "نوع العنوان"
+
+#. module: odex30_account_followup
+#: model:ir.model.fields,field_description:odex30_account_followup.field_odex30_account_followup_followup_line__join_invoices
+#: model:ir.model.fields,field_description:odex30_account_followup.field_odex30_account_followup_manual_reminder__join_invoices
+msgid "Attach Invoices"
+msgstr "إرفاق الفواتير "
+
+#. module: odex30_account_followup
+#: model:ir.model.fields,field_description:odex30_account_followup.field_odex30_account_followup_manual_reminder__attachment_ids
+msgid "Attachment"
+msgstr "مرفق"
+
+#. module: odex30_account_followup
+#: model:ir.model.fields,field_description:odex30_account_followup.field_odex30_account_followup_followup_line__auto_execute
+#: model:ir.model.fields.selection,name:odex30_account_followup.selection__res_partner__followup_reminder_type__automatic
+#: model_terms:ir.ui.view,arch_db:odex30_account_followup.view_odex30_account_followup_line_filter
+msgid "Automatic"
+msgstr "تلقائي"
+
+#. module: odex30_account_followup
+#: model:ir.model.fields,field_description:odex30_account_followup.field_odex30_account_followup_manual_reminder__body_has_template_value
+msgid "Body content is the same as the template"
+msgstr "محتوى المتن هو نفس القالب "
+
+#. module: odex30_account_followup
+#: model:ir.model.fields,field_description:odex30_account_followup.field_odex30_account_followup_manual_reminder__can_edit_body
+msgid "Can Edit Body"
+msgstr "يمكن تحرير النص "
+
+#. module: odex30_account_followup
+#: model_terms:ir.ui.view,arch_db:odex30_account_followup.manual_reminder_view_form
+msgid "Cancel"
+msgstr "إلغاء"
+
+#. module: odex30_account_followup
+#: model_terms:ir.ui.view,arch_db:odex30_account_followup.missing_information_view_form
+msgid "Close"
+msgstr "إغلاق"
+
+#. module: odex30_account_followup
+#. odoo-python
+#: code:addons/odex30_account_followup/models/odex30_account_followup_report.py:0
+msgid "Communication"
+msgstr "التواصل "
+
+#. module: odex30_account_followup
+#: model:ir.model.fields,field_description:odex30_account_followup.field_odex30_account_followup_followup_line__company_id
+msgid "Company"
+msgstr "الشركة "
+
+#. module: odex30_account_followup
+#: model:ir.model,name:odex30_account_followup.model_res_partner
+msgid "Contact"
+msgstr "جهة الاتصال"
+
+#. module: odex30_account_followup
+#: model_terms:ir.ui.view,arch_db:odex30_account_followup.manual_reminder_view_form
+#: model_terms:ir.ui.view,arch_db:odex30_account_followup.view_odex30_account_followup_followup_line_form
+msgid "Content Template"
+msgstr "قالب المحتوى "
+
+#. module: odex30_account_followup
+#: model:ir.model.fields,field_description:odex30_account_followup.field_odex30_account_followup_manual_reminder__body
+msgid "Contents"
+msgstr "المحتويات"
+
+#. module: odex30_account_followup
+#: model:ir.model.fields,field_description:odex30_account_followup.field_odex30_account_followup_followup_line__create_uid
+#: model:ir.model.fields,field_description:odex30_account_followup.field_odex30_account_followup_manual_reminder__create_uid
+#: model:ir.model.fields,field_description:odex30_account_followup.field_odex30_account_followup_missing_information_wizard__create_uid
+msgid "Created by"
+msgstr "أنشئ بواسطة"
+
+#. module: odex30_account_followup
+#: model:ir.model.fields,field_description:odex30_account_followup.field_odex30_account_followup_followup_line__create_date
+#: model:ir.model.fields,field_description:odex30_account_followup.field_odex30_account_followup_manual_reminder__create_date
+#: model:ir.model.fields,field_description:odex30_account_followup.field_odex30_account_followup_missing_information_wizard__create_date
+msgid "Created on"
+msgstr "أنشئ في"
+
+#. module: odex30_account_followup
+#: model_terms:ir.ui.view,arch_db:odex30_account_followup.followup_filter_info_template
+msgid "Customer ref:"
+msgstr "مرجع العميل: "
+
+#. module: odex30_account_followup
+#: model:ir.actions.client,name:odex30_account_followup.action_odex30_account_followup
+msgid "Customers Statement"
+msgstr "كشوفات حسابات العملاء "
+
+#. module: odex30_account_followup
+#. odoo-python
+#: code:addons/odex30_account_followup/models/odex30_account_followup_report.py:0
+msgid "Date"
+msgstr "التاريخ"
+
+#. module: odex30_account_followup
+#: model_terms:ir.ui.view,arch_db:odex30_account_followup.followup_filter_info_template
+msgid "Date:"
+msgstr "التاريخ:"
+
+#. module: odex30_account_followup
+#: model:ir.model.constraint,message:odex30_account_followup.constraint_odex30_account_followup_followup_line_days_uniq
+msgid "Days of the follow-up lines must be different per company"
+msgstr "يجب أن تكون أيام بنود المتابعة مختلفة لدى كل شركة "
+
+#. module: odex30_account_followup
+#. odoo-python
+#: code:addons/odex30_account_followup/models/odex30_account_followup_report.py:0
+msgid ""
+"Dear %s,\n"
+"\n"
+"\n"
+"Exception made if there was a mistake of ours, it seems that the following "
+"amount stays unpaid. Please, take appropriate measures in order to carry out "
+"this payment in the next 8 days.\n"
+"\n"
+"Would your payment have been carried out after this mail was sent, please "
+"ignore this message. Do not hesitate to contact our accounting department.\n"
+"\n"
+"Best Regards,\n"
+"\n"
+msgstr ""
+"عزيزنا %s،\n"
+"\n"
+"\n"
+"يبدو أن المبلغ التالي لا يزال غير مدفوع، إلا إذا كان الخطأ من طرفنا. الرجاء "
+"اتخاذ الإجراءات المناسبة لترحيل هذا الدفع في غضون الـ8 أيام القادمة.\n"
+"\n"
+"إذا تم ترحيل الدفع بعد أن تم إرسال هذا البريد الإلكتروني، رجاءً تجاهَل هذه "
+"الرسالة. لا تتردد في التواصل مع قسم المحاسبة لدينا.\n"
+"\n"
+"مع أطيب التحيات،\n"
+"\n"
+
+#. module: odex30_account_followup
+#. odoo-python
+#: code:addons/odex30_account_followup/models/odex30_account_followup_report.py:0
+msgid ""
+"Dear client, we kindly remind you that you still have unpaid invoices. "
+"Please check them and take appropriate action. %s"
+msgstr ""
+"عزيزنا العميل، نود تذكيرك بأنه لا تزال لديك فواتير غير مدفوعة. يرجى التحقق "
+"منها ثم اتخاذ الإجراء اللازم. %s "
+
+#. module: odex30_account_followup
+#: model_terms:ir.actions.act_window,help:odex30_account_followup.action_odex30_account_followup_line_definition_form
+msgid "Define follow-up levels and their related actions"
+msgstr "قم بتحديد مستويات المتابعة والإجراءات المتعلقة بها "
+
+#. module: odex30_account_followup
+#: model_terms:ir.ui.view,arch_db:odex30_account_followup.followup_filter_info_template
+msgid "Demo Ref"
+msgstr "المرجع التجريبي "
+
+#. module: odex30_account_followup
+#: model:ir.model.fields,field_description:account_followup.field_odex30_account_followup_followup_line__name
+msgid "Description"
+msgstr "الوصف"
+
+#. module: odex30_account_followup
+#: model:ir.model.fields,help:odex30_account_followup.field_odex30_account_followup_followup_line__activity_default_responsible_type
+msgid ""
+"Determine who will be assigned to the activity:\n"
+"- Follow-up Responsible (default)\n"
+"- Salesperson: Sales Person defined on the invoice\n"
+"- Account Manager: Sales Person defined on the customer"
+msgstr ""
+"قم بتحديد من سيتم تعيينه للقيام بالنشاط: \n"
+"- مسؤول المتابعة (افتراضي) \n"
+"- مندوب المبيعات: مندوب المبيعات المحدد في الفاتورة \n"
+"- مدير الحساب: مندوب المبيعات المحدد لدى العميل "
+
+#. module: odex30_account_followup
+#: model:ir.model.fields,field_description:odex30_account_followup.field_odex30_account_followup_followup_line__display_name
+#: model:ir.model.fields,field_description:odex30_account_followup.field_odex30_account_followup_manual_reminder__display_name
+#: model:ir.model.fields,field_description:odex30_account_followup.field_odex30_account_followup_missing_information_wizard__display_name
+msgid "Display Name"
+msgstr "اسم العرض "
+
+#. module: odex30_account_followup
+#. odoo-python
+#: code:addons/odex30_account_followup/models/odex30_account_followup_report.py:0
+msgid "Due Date"
+msgstr "موعد إجراء المكالمة "
+
+#. module: odex30_account_followup
+#: model:ir.model.fields,field_description:odex30_account_followup.field_odex30_account_followup_followup_line__delay
+msgid "Due Days"
+msgstr "أيام الاستحقاق"
+
+#. module: odex30_account_followup
+#: model:ir.model.fields,field_description:odex30_account_followup.field_odex30_account_followup_manual_reminder__email
+msgid "Email"
+msgstr "البريد الإلكتروني"
+
+#. module: odex30_account_followup
+#: model_terms:ir.ui.view,arch_db:odex30_account_followup.manual_reminder_view_form
+msgid "Email Recipients"
+msgstr "مستلمو البريد الإلكتروني "
+
+#. module: odex30_account_followup
+#: model_terms:ir.ui.view,arch_db:odex30_account_followup.manual_reminder_view_form
+msgid "Email Subject"
+msgstr "موضوع البريد الإلكتروني "
+
+#. module: odex30_account_followup
+#: model:ir.model.fields,field_description:odex30_account_followup.field_odex30_account_followup_manual_reminder__email_recipient_ids
+msgid "Extra Recipients"
+msgstr "المستلمون الإضافيون "
+
+#. module: odex30_account_followup
+#. odoo-python
+#: code:addons/odex30_account_followup/models/res_partner.py:0
+msgid "Follow-up %(partner)s - %(date)s.pdf"
+msgstr "%(partner)s المتابعة - %(date)s.pdf "
+
+#. module: odex30_account_followup
+#: model:ir.model.fields.selection,name:odex30_account_followup.selection__res_partner__type__followup
+msgid "Follow-up Address"
+msgstr "عنوان المتابعة "
+
+#. module: odex30_account_followup
+#: model:ir.model,name:odex30_account_followup.model_odex30_account_followup_followup_line
+msgid "Follow-up Criteria"
+msgstr "معايير المتابعة"
+
+#. module: odex30_account_followup
+#: model:ir.model.fields,field_description:odex30_account_followup.field_account_move_line__followup_line_id
+#: model:ir.model.fields,field_description:odex30_account_followup.field_res_partner__followup_line_id
+#: model:ir.model.fields,field_description:odex30_account_followup.field_res_users__followup_line_id
+msgid "Follow-up Level"
+msgstr "مستوى المتابعة"
+
+#. module: odex30_account_followup
+#: model:ir.actions.act_window,name:odex30_account_followup.action_odex30_account_followup_line_definition_form
+#: model:ir.ui.menu,name:odex30_account_followup.odex30_account_followup_menu
+msgid "Follow-up Levels"
+msgstr "مستويات المتابعة"
+
+#. module: odex30_account_followup
+#: model:ir.model,name:odex30_account_followup.model_odex30_account_followup_report
+msgid "Follow-up Report"
+msgstr "تقرير المتابعة"
+
+#. module: odex30_account_followup
+#: model:ir.model.fields.selection,name:odex30_account_followup.selection__odex30_account_followup_followup_line__activity_default_responsible_type__followup
+msgid "Follow-up Responsible"
+msgstr "مسؤول المتابعة"
+
+#. module: odex30_account_followup
+#: model:ir.model.fields,field_description:odex30_account_followup.field_res_partner__followup_status
+#: model:ir.model.fields,field_description:odex30_account_followup.field_res_users__followup_status
+msgid "Follow-up Status"
+msgstr "حالة المتابعة "
+
+#. module: odex30_account_followup
+#: model_terms:ir.ui.view,arch_db:odex30_account_followup.view_odex30_account_followup_followup_line_form
+#: model_terms:ir.ui.view,arch_db:odex30_account_followup.view_odex30_account_followup_followup_line_tree
+msgid "Follow-up Steps"
+msgstr "خطوات المتابعة"
+
+#. module: odex30_account_followup
+#: model_terms:ir.ui.view,arch_db:odex30_account_followup.report_followup_print_all
+msgid "Follow-up details"
+msgstr "تفاصيل المتابعة "
+
+#. module: odex30_account_followup
+#. odoo-python
+#: code:addons/odex30_account_followup/models/odex30_account_followup_report.py:0
+msgid "Follow-up letter generated"
+msgstr "تم إنشاء خطاب المتابعة "
+
+#. module: odex30_account_followup
+#: model:ir.model,name:odex30_account_followup.model_odex30_account_followup_missing_information_wizard
+msgid "Followup missing information wizard"
+msgstr "معالج متابعة المعلومات الناقصة "
+
+#. module: odex30_account_followup
+#: model_terms:ir.actions.act_window,help:odex30_account_followup.action_odex30_account_followup_line_definition_form
+msgid ""
+"For each step, specify the actions to be taken and delay in days. It is\n"
+"            possible to use print and e-mail templates to send specific "
+"messages to\n"
+"            the customer."
+msgstr ""
+"لكل خطوة، حدد الإجراءات التي يجب اتخاذها ومهلة التأخير بالأيام.\n"
+"            من الممكن استخدام قوالب الطباعة والبريد الإلكتروني لإرسال رسائل "
+"محددة\n"
+"            للعميل. "
+
+#. module: odex30_account_followup
+#: model:mail.template,name:odex30_account_followup.demo_followup_email_template_4
+msgid "Fourth reminder followup"
+msgstr "متابعة التذكير الرابع "
+
+#. module: odex30_account_followup
+#: model:ir.model.fields,field_description:odex30_account_followup.field_res_partner__has_moves
+#: model:ir.model.fields,field_description:odex30_account_followup.field_res_users__has_moves
+msgid "Has Moves"
+msgstr "يحتوي على تحركات "
+
+#. module: odex30_account_followup
+#: model:ir.model.fields,field_description:odex30_account_followup.field_odex30_account_followup_followup_line__id
+#: model:ir.model.fields,field_description:odex30_account_followup.field_odex30_account_followup_manual_reminder__id
+#: model:ir.model.fields,field_description:odex30_account_followup.field_odex30_account_followup_missing_information_wizard__id
+msgid "ID"
+msgstr "المُعرف"
+
+#. module: odex30_account_followup
+#: model:ir.model.fields,help:odex30_account_followup.field_odex30_account_followup_followup_line__additional_follower_ids
+msgid ""
+"If set, those users will be added as followers on the partner and receive "
+"notifications about any email reply made by the partner on the reminder "
+"email."
+msgstr ""
+"إذا تم تعيينه، فستتم إضافة هؤلاء المستخدمين كمتابعين للوكيل وسيتلقون إشعارات "
+"حول أي رد عبر البريد الإلكتروني يرسله الوكيل على رسالة التذكير الإلكترونية. "
+
+#. module: odex30_account_followup
+#: model:ir.model.fields.selection,name:odex30_account_followup.selection__res_partner__followup_status__in_need_of_action
+msgid "In need of action"
+msgstr "بحاجة إلى اتخاذ إجراء "
+
+#. module: odex30_account_followup
+#: model_terms:ir.ui.view,arch_db:odex30_account_followup.view_partner_property_form_followup
+msgid "Invoice Follow-ups"
+msgstr "المتابعة بشأن الفواتير "
+
+#. module: odex30_account_followup
+#: model_terms:ir.ui.view,arch_db:odex30_account_followup.template_followup_report
+msgid "Invoices Analysis"
+msgstr "تحليل الفواتير"
+
+#. module: odex30_account_followup
+#: model:ir.model.fields,field_description:odex30_account_followup.field_odex30_account_followup_manual_reminder__is_mail_template_editor
+msgid "Is Editor"
+msgstr "محرر "
+
+#. module: odex30_account_followup
+#: model:ir.model,name:odex30_account_followup.model_account_move_line
+msgid "Journal Item"
+msgstr "عنصر اليومية"
+
+#. module: odex30_account_followup
+#: model_terms:ir.ui.view,arch_db:odex30_account_followup.manual_reminder_view_form
+msgid "Kind reminder!"
+msgstr "تذكير! "
+
+#. module: odex30_account_followup
+#: model:ir.model.fields,field_description:odex30_account_followup.field_odex30_account_followup_manual_reminder__lang
+msgid "Language"
+msgstr "اللغة"
+
+#. module: odex30_account_followup
+#: model:ir.model.fields,field_description:odex30_account_followup.field_odex30_account_followup_followup_line__write_uid
+#: model:ir.model.fields,field_description:odex30_account_followup.field_odex30_account_followup_manual_reminder__write_uid
+#: model:ir.model.fields,field_description:odex30_account_followup.field_odex30_account_followup_missing_information_wizard__write_uid
+msgid "Last Updated by"
+msgstr "آخر تحديث بواسطة"
+
+#. module: odex30_account_followup
+#: model:ir.model.fields,field_description:odex30_account_followup.field_odex30_account_followup_followup_line__write_date
+#: model:ir.model.fields,field_description:odex30_account_followup.field_odex30_account_followup_manual_reminder__write_date
+#: model:ir.model.fields,field_description:odex30_account_followup.field_odex30_account_followup_missing_information_wizard__write_date
+msgid "Last Updated on"
+msgstr "آخر تحديث في"
+
+#. module: odex30_account_followup
+#: model_terms:ir.ui.view,arch_db:odex30_account_followup.manual_reminder_view_form
+msgid "Letter/Email Content"
+msgstr "محتوى الرسالة/البريد الإلكتروني "
+
+#. module: odex30_account_followup
+#: model:ir.model.fields,field_description:odex30_account_followup.field_odex30_account_followup_followup_line__mail_template_id
+#: model:ir.model.fields,field_description:odex30_account_followup.field_odex30_account_followup_manual_reminder__template_id
+msgid "Mail Template"
+msgstr "قالب البريد الإلكتروني "
+
+#. module: odex30_account_followup
+#: model:ir.model.fields.selection,name:odex30_account_followup.selection__res_partner__followup_reminder_type__manual
+#: model_terms:ir.ui.view,arch_db:odex30_account_followup.view_odex30_account_followup_line_filter
+msgid "Manual"
+msgstr "يدوي"
+
+#. module: odex30_account_followup
+#. odoo-python
+#: code:addons/odex30_account_followup/models/res_partner.py:0
+#: code:addons/odex30_account_followup/wizard/followup_missing_information.py:0
+msgid "Missing information"
+msgstr "المعلومات الناقصة "
+
+#. module: odex30_account_followup
+#: model_terms:ir.ui.view,arch_db:odex30_account_followup.line_template
+msgid "Name"
+msgstr "الاسم"
+
+#. module: odex30_account_followup
+#. odoo-python
+#: code:addons/odex30_account_followup/models/res_partner.py:0
+msgid "Next Reminder Date set to %s"
+msgstr "تم تعيين تاريخ التذكير التالي لـ %s"
+
+#. module: odex30_account_followup
+#: model:ir.model.fields,field_description:odex30_account_followup.field_res_partner__followup_next_action_date
+#: model:ir.model.fields,field_description:odex30_account_followup.field_res_users__followup_next_action_date
+msgid "Next reminder"
+msgstr "التذكير التالي"
+
+#. module: odex30_account_followup
+#: model:ir.model.fields.selection,name:odex30_account_followup.selection__res_partner__followup_status__no_action_needed
+msgid "No action needed"
+msgstr "لا حاجة لاتخاذ إجراء "
+
+#. module: odex30_account_followup
+#: model:ir.model.fields,help:odex30_account_followup.field_res_partner__followup_next_action_date
+#: model:ir.model.fields,help:odex30_account_followup.field_res_users__followup_next_action_date
+msgid ""
+"No follow-up action will be taken before this date.\n"
+"                Sending a reminder will set this date depending on the "
+"levels configuration, and you can change it manually."
+msgstr ""
+"لن يتم اتخاذ أي إجراء متابعة قبل هذا التاريخ.\n"
+"                سيؤدي إرسال تذكير إلى تعيين هذا التاريخ بناءً على تهيئة "
+"المستويات، ويمكنك تغييره يدوياً.  "
+
+#. module: odex30_account_followup
+#: model:ir.model.fields,field_description:odex30_account_followup.field_odex30_account_followup_followup_line__activity_note
+msgid "Note"
+msgstr "الملاحظات"
+
+#. module: odex30_account_followup
+#: model_terms:ir.ui.view,arch_db:odex30_account_followup.view_odex30_account_followup_followup_line_form
+msgid "Notification"
+msgstr "إشعار "
+
+#. module: odex30_account_followup
+#: model:ir.model.fields,help:odex30_account_followup.field_odex30_account_followup_manual_reminder__lang
+msgid ""
+"Optional translation language (ISO code) to select when sending out an "
+"email. If not set, the english version will be used. This should usually be "
+"a placeholder expression that provides the appropriate language, e.g. "
+"{{ object.partner_id.lang }}."
+msgstr ""
+"لغة الترجمة الاختيارية (كود ISO) لاختيارها عند إرسال بريد إلكتروني. إذا لم "
+"يتم تعيينها، سوف تُستخدم النسخة باللغة الإنجليزية. عادة ما يكون ذلك تمثيلاً "
+"للعنصر النائب المسؤول عن التزويد باللغة المناسبة، مثال: "
+"{{ object.partner_id.lang }}. "
+
+#. module: odex30_account_followup
+#: model_terms:ir.ui.view,arch_db:odex30_account_followup.view_odex30_account_followup_followup_line_form
+msgid "Options"
+msgstr "الخيارات"
+
+#. module: odex30_account_followup
+#. odoo-python
+#: code:addons/odex30_account_followup/models/odex30_account_followup_report.py:0
+#: model:ir.model.fields,field_description:odex30_account_followup.field_account_move_line__invoice_origin
+msgid "Origin"
+msgstr "الأصل "
+
+#. module: odex30_account_followup
+#. odoo-python
+#: code:addons/odex30_account_followup/models/res_partner.py:0
+#: model_terms:ir.ui.view,arch_db:odex30_account_followup.customer_statements_search_view
+#: model_terms:ir.ui.view,arch_db:odex30_account_followup.view_partner_property_form_followup
+msgid "Overdue Invoices"
+msgstr "الفواتير المتأخرة "
+
+#. module: odex30_account_followup
+#: model:ir.model.fields,field_description:odex30_account_followup.field_odex30_account_followup_manual_reminder__partner_id
+msgid "Partner"
+msgstr "الشريك"
+
+#. module: odex30_account_followup
+#: model:mail.template,name:odex30_account_followup.email_template_followup_1
+msgid "Payment Reminder"
+msgstr "تذكير الدفع "
+
+#. module: odex30_account_followup
+#: model:ir.model.fields,field_description:odex30_account_followup.field_odex30_account_followup_manual_reminder__print
+#: model_terms:ir.ui.view,arch_db:odex30_account_followup.manual_reminder_view_form
+msgid "Print"
+msgstr "طباعة"
+
+#. module: odex30_account_followup
+#: model:ir.actions.report,name:odex30_account_followup.action_report_followup
+msgid "Print Follow-up Letter"
+msgstr "طباعة رسالة المتابعة"
+
+#. module: odex30_account_followup
+#: model:ir.actions.server,name:odex30_account_followup.action_account_reports_customer_statements_do_followup
+msgid "Process Follow-ups"
+msgstr "المتابعة بشأن العملية "
+
+#. module: odex30_account_followup
+#. odoo-python
+#: code:addons/odex30_account_followup/models/odex30_account_followup_report.py:0
+msgid "Reference"
+msgstr "الرقم المرجعي "
+
+#. module: odex30_account_followup
+#: model_terms:ir.ui.view,arch_db:odex30_account_followup.view_odex30_account_followup_followup_line_form
+msgid "Remind"
+msgstr "تذكير "
+
+#. module: odex30_account_followup
+#: model:ir.model.fields,field_description:odex30_account_followup.field_res_partner__followup_reminder_type
+#: model:ir.model.fields,field_description:odex30_account_followup.field_res_users__followup_reminder_type
+msgid "Reminders"
+msgstr "التذكيرات"
+
+#. module: odex30_account_followup
+#: model:ir.model.fields,field_description:odex30_account_followup.field_odex30_account_followup_manual_reminder__render_model
+msgid "Rendering Model"
+msgstr "نموذج التكوين "
+
+#. module: odex30_account_followup
+#: model:ir.model,name:odex30_account_followup.model_ir_actions_report
+msgid "Report Action"
+msgstr "إجراء التقرير"
+
+#. module: odex30_account_followup
+#: model_terms:ir.ui.view,arch_db:odex30_account_followup.customer_statements_search_view
+msgid "Requires Follow-up"
+msgstr "يتطلب المتابعة "
+
+#. module: odex30_account_followup
+#: model:ir.model.fields,field_description:odex30_account_followup.field_odex30_account_followup_followup_line__activity_default_responsible_type
+#: model:ir.model.fields,field_description:odex30_account_followup.field_res_partner__followup_responsible_id
+#: model:ir.model.fields,field_description:odex30_account_followup.field_res_users__followup_responsible_id
+msgid "Responsible"
+msgstr "المسؤول "
+
+#. module: odex30_account_followup
+#: model_terms:ir.ui.view,arch_db:odex30_account_followup.manual_reminder_view_form
+msgid "SMS"
+msgstr "الرسائل النصية القصيرة "
+
+#. module: odex30_account_followup
+#: model:ir.model.fields.selection,name:odex30_account_followup.selection__odex30_account_followup_followup_line__activity_default_responsible_type__salesperson
+msgid "Salesperson"
+msgstr "مندوب المبيعات "
+
+#. module: odex30_account_followup
+#: model:ir.model.fields,field_description:odex30_account_followup.field_odex30_account_followup_followup_line__create_activity
+msgid "Schedule Activity"
+msgstr "جدولة نشاط "
+
+#. module: odex30_account_followup
+#: model_terms:ir.ui.view,arch_db:odex30_account_followup.view_odex30_account_followup_line_filter
+msgid "Search Follow-up"
+msgstr "البحث عن المتابعات "
+
+#. module: odex30_account_followup
+#: model:mail.template,name:odex30_account_followup.demo_followup_email_template_2
+msgid "Second reminder followup"
+msgstr "متابعة التذكير الثاني "
+
+#. module: odex30_account_followup
+#: model_terms:ir.ui.view,arch_db:odex30_account_followup.manual_reminder_view_form
+#: model_terms:ir.ui.view,arch_db:odex30_account_followup.view_partner_property_form_followup
+msgid "Send"
+msgstr "إرسال"
+
+#. module: odex30_account_followup
+#: model_terms:ir.ui.view,arch_db:odex30_account_followup.manual_reminder_view_form
+msgid "Send & Print"
+msgstr "إرسال وطباعة"
+
+#. module: odex30_account_followup
+#: model:ir.model.fields,field_description:odex30_account_followup.field_odex30_account_followup_followup_line__send_email
+msgid "Send Email"
+msgstr "إرسال بريد إلكتروني"
+
+#. module: odex30_account_followup
+#: model:ir.model.fields,field_description:odex30_account_followup.field_odex30_account_followup_followup_line__send_sms
+msgid "Send SMS Message"
+msgstr "إرسال رسالة نصية قصيرة "
+
+#. module: odex30_account_followup
+#: model:ir.actions.act_window,name:odex30_account_followup.manual_reminder_action
+msgid "Send and Print"
+msgstr "إرسال وطباعة"
+
+#. module: odex30_account_followup
+#: model:ir.model.fields,field_description:odex30_account_followup.field_odex30_account_followup_manual_reminder__sms
+msgid "Sms"
+msgstr "رسالة نصية قصيرة "
+
+#. module: odex30_account_followup
+#: model:ir.model.fields,field_description:odex30_account_followup.field_odex30_account_followup_manual_reminder__sms_body
+msgid "Sms Body"
+msgstr "متن الرسالة النصية القصيرة "
+
+#. module: odex30_account_followup
+#: model_terms:ir.ui.view,arch_db:odex30_account_followup.manual_reminder_view_form
+msgid "Sms Content"
+msgstr "محتوى الرسالة النصية القصيرة "
+
+#. module: odex30_account_followup
+#: model:ir.model.fields,field_description:odex30_account_followup.field_odex30_account_followup_followup_line__sms_template_id
+#: model:ir.model.fields,field_description:odex30_account_followup.field_odex30_account_followup_manual_reminder__sms_template_id
+msgid "Sms Template"
+msgstr "قالب الرسائل النصية القصيرة "
+
+#. module: odex30_account_followup
+#: model:ir.model.fields,field_description:odex30_account_followup.field_odex30_account_followup_manual_reminder__subject
+msgid "Subject"
+msgstr "الموضوع "
+
+#. module: odex30_account_followup
+#: model:ir.model.fields,field_description:odex30_account_followup.field_odex30_account_followup_followup_line__activity_summary
+msgid "Summary"
+msgstr "الملخص"
+
+#. module: odex30_account_followup
+#: model_terms:ir.ui.view,arch_db:odex30_account_followup.table_header_template_followup_report
+msgid "Table Header"
+msgstr "ترويسة الجدول "
+
+#. module: odex30_account_followup
+#: model_terms:ir.ui.view,arch_db:odex30_account_followup.line_template
+msgid "Table Value"
+msgstr "قيمة الجدول "
+
+#. module: odex30_account_followup
+#: model:ir.model.fields,help:odex30_account_followup.field_account_move_line__invoice_origin
+msgid "The document(s) that generated the invoice."
+msgstr "المستند (المستندات) التي أنشأت الفاتورة. "
+
+#. module: odex30_account_followup
+#: model:ir.model.fields,help:odex30_account_followup.field_odex30_account_followup_followup_line__delay
+msgid ""
+"The number of days after the due date of the invoice to wait before sending "
+"the reminder. Can be negative if you want to send the reminder before the "
+"invoice due date."
+msgstr ""
+"أقصى مهلة من الأيام بعد تاريخ استحقاق الفاتورة قبل إرسال رسالة التذكير. يمكن "
+"أن تكون القيمة سالبة إذا أردت إرسال تذكير قبل تاريخ استحقاق الفاتورة. "
+
+#. module: odex30_account_followup
+#: model:ir.model.fields,help:odex30_account_followup.field_res_partner__followup_responsible_id
+#: model:ir.model.fields,help:odex30_account_followup.field_res_users__followup_responsible_id
+msgid ""
+"The responsible assigned to manual followup activities, if defined in the "
+"level."
+msgstr ""
+"المسؤول الذي تم تعيينه لأنشطة المتابعة اليدوية، إذا كان محدداً في المستوى. "
+
+#. module: odex30_account_followup
+#: model_terms:ir.ui.view,arch_db:odex30_account_followup.customer_statements_tree_view
+msgid "Total"
+msgstr "الإجمالي"
+
+#. module: odex30_account_followup
+#: model:ir.model.fields,field_description:odex30_account_followup.field_res_partner__total_all_due
+#: model:ir.model.fields,field_description:odex30_account_followup.field_res_users__total_all_due
+msgid "Total All Due"
+msgstr "إجمالي المستحقات "
+
+#. module: odex30_account_followup
+#: model:ir.model.fields,field_description:odex30_account_followup.field_res_partner__total_all_overdue
+#: model:ir.model.fields,field_description:odex30_account_followup.field_res_users__total_all_overdue
+msgid "Total All Overdue"
+msgstr "إجمالي المستحقات المتأخرة "
+
+#. module: odex30_account_followup
+#. odoo-python
+#: code:addons/odex30_account_followup/models/odex30_account_followup_report.py:0
+#: model:ir.model.fields,field_description:odex30_account_followup.field_res_partner__total_due
+#: model:ir.model.fields,field_description:odex30_account_followup.field_res_users__total_due
+msgid "Total Due"
+msgstr "الإجمالي المستحق"
+
+#. module: odex30_account_followup
+#. odoo-python
+#: code:addons/odex30_account_followup/models/odex30_account_followup_report.py:0
+#: model:ir.model.fields,field_description:odex30_account_followup.field_res_partner__total_overdue
+#: model:ir.model.fields,field_description:odex30_account_followup.field_res_users__total_overdue
+msgid "Total Overdue"
+msgstr "الإجمالي المتأخر"
+
+#. module: odex30_account_followup
+#: model:ir.model.fields,field_description:odex30_account_followup.field_res_partner__unpaid_invoice_ids
+#: model:ir.model.fields,field_description:odex30_account_followup.field_res_users__unpaid_invoice_ids
+msgid "Unpaid Invoice"
+msgstr "فاتورة غير مدفوعة"
+
+#. module: odex30_account_followup
+#: model:ir.model.fields,field_description:odex30_account_followup.field_res_partner__unpaid_invoices_count
+#: model:ir.model.fields,field_description:odex30_account_followup.field_res_users__unpaid_invoices_count
+msgid "Unpaid Invoices Count"
+msgstr "عدد الفواتير غير المدفوعة "
+
+#. module: odex30_account_followup
+#: model:ir.model.fields,field_description:odex30_account_followup.field_res_partner__unreconciled_aml_ids
+#: model:ir.model.fields,field_description:odex30_account_followup.field_res_users__unreconciled_aml_ids
+msgid "Unreconciled Aml"
+msgstr "المبلغ غير المسوى "
+
+#. module: odex30_account_followup
+#: model_terms:ir.ui.view,arch_db:odex30_account_followup.missing_information_view_form
+msgid "View partners"
+msgstr "عرض الشركاء "
+
+#. module: odex30_account_followup
+#: model_terms:ir.ui.view,arch_db:odex30_account_followup.missing_information_view_form
+msgid ""
+"We were not able to process some of the automated follow-up actions due to "
+"missing information on the partners."
+msgstr ""
+"لم نتمكن من معالجة بعض إجراءات المتابعة المؤتمتة نظراً لبعض المعلومات الناقصة "
+"لدى الشركاء. "
+
+#. module: odex30_account_followup
+#: model:ir.model.fields.selection,name:odex30_account_followup.selection__res_partner__followup_status__with_overdue_invoices
+msgid "With overdue invoices"
+msgstr "مع الفواتير المتأخرة"
+
+#. module: odex30_account_followup
+#: model:ir.model,name:odex30_account_followup.model_odex30_account_followup_manual_reminder
+msgid "Wizard for sending manual reminders to clients"
+msgstr "معالج لإرسال التذكيرات اليدوية إلى العملاء "
+
+#. module: odex30_account_followup
+#: model_terms:ir.ui.view,arch_db:odex30_account_followup.manual_reminder_view_form
+msgid "Write your message here..."
+msgstr "اكتب رسالتك هنا... "
+
+#. module: odex30_account_followup
+#. odoo-python
+#: code:addons/odex30_account_followup/models/odex30_account_followup_report.py:0
+msgid ""
+"You are trying to send an Email, but no follow-up contact has any email "
+"address set for customer '%s'"
+msgstr ""
+"أنت تحاول إرسال بريد إلكتروني، ولكن ليس لجهات اتصال المتابعة عناوين بريد "
+"إلكتروني معدّة للعميل \"%s\" "
+
+#. module: odex30_account_followup
+#. odoo-python
+#: code:addons/odex30_account_followup/models/odex30_account_followup_report.py:0
+msgid ""
+"You are trying to send an SMS, but no follow-up contact has any mobile/phone "
+"number set for customer '%s'"
+msgstr ""
+"أنت تحاول إرسال رسالة نصية قصيرة، ولكن ليس لجهات اتصال المتابعة أرقام هواتف "
+"معدّة للعميل \"%s\" "
+
+#. module: odex30_account_followup
+#: model_terms:ir.ui.view,arch_db:odex30_account_followup.view_odex30_account_followup_followup_line_form
+msgid "days after due date"
+msgstr "أيام بعد تاريخ الاستحقاق "
+
+#. module: odex30_account_followup
+#: model_terms:ir.ui.view,arch_db:odex30_account_followup.view_odex30_account_followup_followup_line_form
+msgid "e.g. First Reminder Email"
+msgstr "مثال: البريد الإلكتروني التذكيري الأول "
+
+#. module: odex30_account_followup
+#. odoo-python
+#: code:addons/odex30_account_followup/models/odex30_account_followup_report.py:0
+msgid "payment reminder"
+msgstr "تذكير بالدفع "
+
+#. module: odex30_account_followup
+#: model:mail.template,subject:odex30_account_followup.demo_followup_email_template_2
+#: model:mail.template,subject:odex30_account_followup.demo_followup_email_template_4
+#: model:mail.template,subject:odex30_account_followup.email_template_followup_1
+msgid ""
+"{{ (object.company_id or "
+"object._get_followup_responsible().company_id).name }} Payment Reminder - "
+"{{ object.commercial_company_name }}"
+msgstr ""
+"{{ (object.company_id or "
+"object._get_followup_responsible().company_id).name }} Payment Reminder - "
+"{{ object.commercial_company_name }}"
+
+#~ msgid ""
+#~ "<div style=\"margin: 0px; padding: 0px;\">\n"
+#~ "                    <p style=\"margin: 0px; padding: 0px;\">\n"
+#~ "                        <t t-if=\"object.id != "
+#~ "object.commercial_partner_id.id\">Dear <t t-out=\"object.name or ''\"/> "
+#~ "(<t t-out=\"object.commercial_partner_id.name or ''\"/>),</t>\n"
+#~ "                        <t t-else=\"\">Dear <t t-out=\"object.name or "
+#~ "''\"/>,</t>\n"
+#~ "                        <br/>\n"
+#~ "                        It has come to our attention that you "
+#~ "have&nbsp;an outstanding balance of <t t-"
+#~ "out=\"format_amount(object.total_overdue, object.currency_id) or ''\"/>\n"
+#~ "                        <br/>\n"
+#~ "                        We kindly request that you take necessary action "
+#~ "to settle this amount within the next 8 days.\n"
+#~ "                        <br/>\n"
+#~ "                        </p><div t-if=\"object._show_pay_now_button()\" "
+#~ "class=\"d-flex\">\n"
+#~ "                            <a t-att-href=\"'/my/invoices/overdue'\" "
+#~ "class=\"btn btn-primary\">Pay now</a>\n"
+#~ "                        </div>\n"
+#~ "                        If you have already made the payment after "
+#~ "receiving this message, please disregard it.\n"
+#~ "                        Our accounting department is available if you "
+#~ "require any assistance or have any questions.\n"
+#~ "                        <br/>\n"
+#~ "                        Thank you for your cooperation.\n"
+#~ "                        <br/>\n"
+#~ "                        Sincerely,\n"
+#~ "                        <t t-if=\"not "
+#~ "is_html_empty(object._get_followup_responsible().signature)\">\n"
+#~ "                            <br/>\n"
+#~ "                            <t t-"
+#~ "out=\"object._get_followup_responsible().signature\"/>\n"
+#~ "                        </t>\n"
+#~ "                        <t t-else=\"\">\n"
+#~ "                            <br/>\n"
+#~ "                            --\n"
+#~ "                            <br/>\n"
+#~ "                            <t t-"
+#~ "out=\"object._get_followup_responsible().name\"/>\n"
+#~ "                        </t>\n"
+#~ "                    \n"
+#~ "                </div>\n"
+#~ "            "
+#~ msgstr ""
+#~ "<div style=\"margin: 0px; padding: 0px;\">\n"
+#~ "                    <p style=\"margin: 0px; padding: 0px;\">\n"
+#~ "                        <t t-if=\"object.id != "
+#~ "object.commercial_partner_id.id\">عزيزنا <t t-out=\"object.name or ''\"/> "
+#~ "(<t t-out=\"object.commercial_partner_id.name or ''\"/>)،</t>\n"
+#~ "                        <t t-else=\"\">عزيزنا <t t-out=\"object.name or "
+#~ "''\"/>،</t>\n"
+#~ "                        <br/>\n"
+#~ "                        يبدو أنه لديك مبلغ مستحق قيمته <t t-"
+#~ "out=\"format_amount(object.total_overdue, object.currency_id) or ''\"/>\n"
+#~ "                        <br/>\n"
+#~ "                        نرجو منك أخذ الإجراءات اللازمة لتسوية هذا المبلغ "
+#~ "خلال الـ8 أيام القادمة.\n"
+#~ "                        <br/>\n"
+#~ "                        </p><div t-if=\"object._show_pay_now_button()\" "
+#~ "class=\"d-flex\">\n"
+#~ "                            <a t-att-href=\"'/my/invoices/overdue'\" "
+#~ "class=\"btn btn-primary\">قم بالدفع الآن</a>\n"
+#~ "                        </div>\n"
+#~ "                        إذا كنت قد دفعت بالفعل بعد استلامك لهذه الرسالة، "
+#~ "رجاءً تجاهلها.\n"
+#~ "                        إذا كانت لديك أي أسئلة أو استفسارات، فقسم "
+#~ "المحاسبة لدينا جاهز للمساعدة.\n"
+#~ "                        <br/>\n"
+#~ "                        شكراً لتعاونكم.\n"
+#~ "                        <br/>\n"
+#~ "                        مع أطيب التحيات،\n"
+#~ "                        <t t-if=\"not "
+#~ "is_html_empty(object._get_followup_responsible().signature)\">\n"
+#~ "                            <br/>\n"
+#~ "                            <t t-"
+#~ "out=\"object._get_followup_responsible().signature\"/>\n"
+#~ "                        </t>\n"
+#~ "                        <t t-else=\"\">\n"
+#~ "                            <br/>\n"
+#~ "                            --\n"
+#~ "                            <br/>\n"
+#~ "                            <t t-"
+#~ "out=\"object._get_followup_responsible().name\"/>\n"
+#~ "                        </t>\n"
+#~ "                    \n"
+#~ "                </div>\n"
+#~ "            "
diff --git a/dev_odex30_accounting/odex30_account_followup/models/__init__.py b/dev_odex30_accounting/odex30_account_followup/models/__init__.py
new file mode 100644
index 0000000..09fdb8a
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_followup/models/__init__.py
@@ -0,0 +1,7 @@
+# -*- coding: utf-8 -*-
+
+from . import account_followup
+from . import account_followup_report
+from . import ir_actions_report
+from . import res_partner
+from . import account_move_line
diff --git a/dev_odex30_accounting/odex30_account_followup/models/__pycache__/__init__.cpython-311.pyc b/dev_odex30_accounting/odex30_account_followup/models/__pycache__/__init__.cpython-311.pyc
new file mode 100644
index 0000000..3d673e1
Binary files /dev/null and b/dev_odex30_accounting/odex30_account_followup/models/__pycache__/__init__.cpython-311.pyc differ
diff --git a/dev_odex30_accounting/odex30_account_followup/models/__pycache__/account_followup.cpython-311.pyc b/dev_odex30_accounting/odex30_account_followup/models/__pycache__/account_followup.cpython-311.pyc
new file mode 100644
index 0000000..6fbf52e
Binary files /dev/null and b/dev_odex30_accounting/odex30_account_followup/models/__pycache__/account_followup.cpython-311.pyc differ
diff --git a/dev_odex30_accounting/odex30_account_followup/models/__pycache__/account_followup_report.cpython-311.pyc b/dev_odex30_accounting/odex30_account_followup/models/__pycache__/account_followup_report.cpython-311.pyc
new file mode 100644
index 0000000..315d9e3
Binary files /dev/null and b/dev_odex30_accounting/odex30_account_followup/models/__pycache__/account_followup_report.cpython-311.pyc differ
diff --git a/dev_odex30_accounting/odex30_account_followup/models/__pycache__/account_move_line.cpython-311.pyc b/dev_odex30_accounting/odex30_account_followup/models/__pycache__/account_move_line.cpython-311.pyc
new file mode 100644
index 0000000..5a01ef1
Binary files /dev/null and b/dev_odex30_accounting/odex30_account_followup/models/__pycache__/account_move_line.cpython-311.pyc differ
diff --git a/dev_odex30_accounting/odex30_account_followup/models/__pycache__/ir_actions_report.cpython-311.pyc b/dev_odex30_accounting/odex30_account_followup/models/__pycache__/ir_actions_report.cpython-311.pyc
new file mode 100644
index 0000000..03377c3
Binary files /dev/null and b/dev_odex30_accounting/odex30_account_followup/models/__pycache__/ir_actions_report.cpython-311.pyc differ
diff --git a/dev_odex30_accounting/odex30_account_followup/models/__pycache__/res_partner.cpython-311.pyc b/dev_odex30_accounting/odex30_account_followup/models/__pycache__/res_partner.cpython-311.pyc
new file mode 100644
index 0000000..bfcfd31
Binary files /dev/null and b/dev_odex30_accounting/odex30_account_followup/models/__pycache__/res_partner.cpython-311.pyc differ
diff --git a/dev_odex30_accounting/odex30_account_followup/models/account_followup.py b/dev_odex30_accounting/odex30_account_followup/models/account_followup.py
new file mode 100644
index 0000000..ef3fd50
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_followup/models/account_followup.py
@@ -0,0 +1,106 @@
+# -*- coding: utf-8 -*-
+
+from odoo import api, fields, models, _
+from datetime import timedelta
+
+
+class FollowupLine(models.Model):
+    _name = 'account_followup.followup.line'
+    _description = 'Follow-up Criteria'
+    _order = 'delay asc'
+    _check_company_auto = True
+
+    name = fields.Char('Description', required=True, translate=True)
+    delay = fields.Integer('Due Days', required=True,
+                           help="The number of days after the due date of the invoice to wait before sending the reminder. "
+                                "Can be negative if you want to send the reminder before the invoice due date.")
+    company_id = fields.Many2one('res.company', 'Company', required=True, default=lambda self: self.env.company)
+
+    mail_template_id = fields.Many2one(comodel_name='mail.template', domain="[('model', '=', 'res.partner')]")
+    send_email = fields.Boolean('Send Email', default=True)
+    join_invoices = fields.Boolean(string="Attach Invoices", default=True)
+    additional_follower_ids = fields.Many2many(string="Add followers", comodel_name='res.users',
+                                               help="If set, those users will be added as followers on the partner and receive notifications about any email reply made by the partner on the reminder email.")
+
+    sms_template_id = fields.Many2one(comodel_name='sms.template', domain="[('model', '=', 'res.partner')]")
+    send_sms = fields.Boolean('Send SMS Message')
+
+    create_activity = fields.Boolean(string='Schedule Activity')
+    activity_summary = fields.Char(string='Summary')
+    activity_note = fields.Text(string='Note')
+    activity_type_id = fields.Many2one(comodel_name='mail.activity.type', string='Activity Type', default=False)
+    activity_default_responsible_type = fields.Selection([('followup', 'Follow-up Responsible'), ('salesperson', 'Salesperson'), ('account_manager', 'Account Manager')],
+                                                         string='Responsible', default='followup', required=True,
+                                                         help="Determine who will be assigned to the activity:\n"
+                                                              "- Follow-up Responsible (default)\n"
+                                                              "- Salesperson: Sales Person defined on the invoice\n"
+                                                              "- Account Manager: Sales Person defined on the customer")
+
+    auto_execute = fields.Boolean(string="Automatic", default=False)
+
+    _sql_constraints = [
+        ('days_uniq', 'unique(company_id, delay)', 'Days of the follow-up lines must be different per company'),
+        ('uniq_name', 'unique(company_id, name)', 'A follow-up action name must be unique. This name is already set to another action.'),
+    ]
+
+    def copy_data(self, default=None):
+        vals_list = super().copy_data(default=default)
+        default = dict(default or {})
+        company_ids = [self.company_id.id]
+        if 'company_id' in default:
+            company_ids += default['company_id']
+
+        highest_delay_per_company_id = {
+            row['company_id'][0]: row['delay']
+            for row in self.read_group(
+                domain=[('company_id', 'in', company_ids)],
+                fields=['company_id', 'delay:max'],
+                groupby='company_id',
+            )
+        }
+        for line, vals in zip(self, vals_list):
+            if 'delay' not in default:
+                # If several records from the same company are copied in batch, we need to ensure that their delay aren't
+                # set to the same value, we offset it by highest existing delay + 15 arbitrary days (cumulative).
+                company_id = default.get('company_id', line.company_id.id)
+                highest_delay_per_company_id[company_id] += 15
+                vals['delay'] = highest_delay_per_company_id[company_id]
+            vals['name'] = default.get(
+                'name',
+                 _("%(delay)s days (copy of %(name)s)", delay=vals['delay'], name=line.name),
+             )
+        return vals_list
+
+    @api.onchange('auto_execute')
+    def _onchange_auto_execute(self):
+        if self.auto_execute:
+            self.create_activity = False
+
+    def _get_next_date(self):
+        """ Computes the next date used to set a next_followup_action_date for a partner
+
+        The next date will be typically set in (next level delay - current level delay) days
+        There are 3 exceptions to this:
+        - no next level -> next date set in (current level delay - previous level delay) days
+        - no next level AND only 1 level -> next date set in (current level delay) days
+        - no level at all -> next date not set (handled by partner, this method won't be called)
+        """
+        self.ensure_one()
+        next_followup = self._get_next_followup()
+        if next_followup:
+            delay = next_followup.delay - self.delay
+        else:
+            previous_followup = self._get_previous_followup()
+            if previous_followup:
+                delay = self.delay - previous_followup.delay
+            else:
+                delay = self.delay
+        return fields.Date.context_today(self) + timedelta(days=delay)
+
+    def _get_next_followup(self):
+        self.ensure_one()
+        return self.env['account_followup.followup.line'].search([('delay', '>', self.delay), ('company_id', '=', self.env.company.id)], order="delay asc", limit=1)
+
+    def _get_previous_followup(self):
+        self.ensure_one()
+        return self.env['account_followup.followup.line'].search([('delay', '<', self.delay), ('company_id', '=', self.env.company.id)], order="delay desc", limit=1)
diff --git a/dev_odex30_accounting/odex30_account_followup/models/account_followup_report.py b/dev_odex30_accounting/odex30_account_followup/models/account_followup_report.py
new file mode 100644
index 0000000..58edb23
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_followup/models/account_followup_report.py
@@ -0,0 +1,441 @@
+# -*- coding: utf-8 -*-
+
+import markupsafe
+
+from odoo import models, fields, api
+from odoo.exceptions import UserError
+from odoo.tools.misc import formatLang, format_date, get_lang
+from odoo.tools.translate import _
+from odoo.tools import html2plaintext, plaintext2html
+
+
+class AccountFollowupReport(models.AbstractModel):
+    _name = 'account.followup.report'
+    _description = "Follow-up Report"
+
+    ####################################################
+    # REPORT COMPUTATION - TEMPLATE RENDERING
+    ####################################################
+
+    def get_followup_report_html(self, options):
+        """
+        Return the html of the followup report, based on the report options.
+        """
+        template = 'odex30_account_followup.template_followup_report'
+        partner = self.env['res.partner'].browse(options['partner_id'])
+        render_values = {
+            'doc': partner,
+            'lang': partner.lang or get_lang(self.env).code,
+            'options': options,
+            'context': self.env.context,
+        }
+        return self.env['ir.qweb']._render(template, render_values)
+
+    def _get_followup_report_options(self, partner, options=None):
+        """
+        Compute the report options for a given partner.
+        """
+        options = options or {}
+        options.update({
+            'partner_id': partner.id,
+            'followup_line': options.get('followup_line', partner.followup_line_id),
+            'context': self.env.context,
+        })
+        return options
+
+    def _get_followup_report_lines(self, options):
+        """
+        Compute and return the lines of the columns of the follow-ups report.
+        """
+        # Get date format for the lang
+        partner = options.get('partner_id') and self.env['res.partner'].browse(options['partner_id']) or False
+        if not partner:
+            return []
+
+        lang_code = partner.lang
+        lines = []
+        res = {}
+        today = fields.Date.today()
+        line_num = 0
+        for l in partner.unreconciled_aml_ids.sorted().filtered(lambda aml: not aml.currency_id.is_zero(aml.amount_residual_currency)):
+            if l.company_id in self.env.company.search([('id', 'child_of', self.env.context.get('allowed_company_ids', self.env.company.id))]):
+                currency = l.currency_id or l.company_id.currency_id
+                if currency not in res:
+                    res[currency] = []
+                res[currency].append(l)
+        for currency, aml_recs in res.items():
+            total = 0
+            total_issued = 0
+            for aml in aml_recs:
+                amount = aml.amount_residual_currency if aml.currency_id else aml.amount_residual
+                invoice_date = {
+                    'name': format_date(self.env, aml.move_id.invoice_date or aml.date, lang_code=lang_code),
+                    'class': 'date',
+                    'style': 'white-space:nowrap;text-align:left;',
+                    'template': 'odex30_account_followup.line_template',
+                }
+                date_due = format_date(self.env, aml.date_maturity, lang_code=lang_code)
+                total += amount or 0
+                is_overdue = today > aml.date_maturity if aml.date_maturity else False
+                is_payment = aml.payment_id
+                if is_overdue or is_payment:
+                    total_issued += amount or 0
+                date_due = {
+                    'name': date_due, 'class': 'date',
+                    'style': 'white-space:nowrap;text-align:left;',
+                    'template': 'odex30_account_followup.line_template',
+                }
+                if is_overdue:
+                    date_due['style'] += 'color: red;'
+                if is_payment:
+                    date_due = ''
+                move_line_name = {
+                    'name': self._followup_report_format_aml_name(aml.name, aml.move_id.ref),
+                    'style': 'text-align:left; white-space:normal;',
+                    'template': 'odex30_account_followup.line_template',
+                }
+                amount = {
+                    'name': formatLang(self.env, amount, currency_obj=currency),
+                    'style': 'text-align:right; white-space:normal;',
+                    'template': 'odex30_account_followup.line_template',
+                }
+                line_num += 1
+                invoice_origin = aml.move_id.invoice_origin or ''
+                if len(invoice_origin) > 43:
+                    invoice_origin = invoice_origin[:40] + '...'
+                invoice_origin = {
+                    'name': invoice_origin,
+                    'style': 'text-align:center; white-space:normal;',
+                    'template': 'account_followup.line_template',
+                }
+                columns = [
+                    invoice_date,
+                    date_due,
+                    invoice_origin,
+                    move_line_name,
+                    amount,
+                ]
+                lines.append({
+                    'id': aml.id,
+                    'account_move': aml.move_id,
+                    'name': aml.move_id.name,
+                    'move_id': aml.move_id.id,
+                    'type': is_payment and 'payment' or 'unreconciled_aml',
+                    'unfoldable': False,
+                    'columns': [isinstance(v, dict) and v or {'name': v, 'template': 'account_followup.line_template'} for v in columns],
+                })
+            total_due = formatLang(self.env, total, currency_obj=currency)
+            line_num += 1
+
+            cols = \
+                [{
+                    'name': v,
+                    'template': 'account_followup.line_template',
+                } for v in [''] * 3] + \
+                [{
+                    'name': v,
+                    'style': 'text-align:right; white-space:normal; font-weight: bold;',
+                    'template': 'account_followup.line_template',
+                } for v in [total >= 0 and _('Total Due') or '', total_due]]
+
+            lines.append({
+                'id': line_num,
+                'name': '',
+                'class': 'total',
+                'style': 'border-top-style: double',
+                'unfoldable': False,
+                'level': 3,
+                'columns': cols,
+            })
+            if total_issued > 0:
+                total_issued = formatLang(self.env, total_issued, currency_obj=currency)
+                line_num += 1
+
+                cols = \
+                    [{
+                        'name': v,
+                        'template': 'account_followup.line_template',
+                    } for v in [''] * 3] + \
+                    [{
+                        'name': v,
+                        'style': 'text-align:right; white-space:normal; font-weight: bold;',
+                        'template': 'account_followup.line_template',
+                    } for v in [_('Total Overdue'), total_issued]]
+
+                lines.append({
+                    'id': line_num,
+                    'name': '',
+                    'class': 'total',
+                    'unfoldable': False,
+                    'level': 3,
+                    'columns': cols,
+                })
+            # Add an empty line after the total to make a space between two currencies
+            line_num += 1
+            lines.append({
+                'id': line_num,
+                'name': '',
+                'class': '',
+                'style': 'border-bottom-style: none',
+                'unfoldable': False,
+                'level': 0,
+                'columns': [{'template': 'odex30_account_followup.line_template'} for col in columns],
+            })
+        # Remove the last empty line
+        if lines:
+            lines.pop()
+
+        # Catch negative numbers when present
+        for line in lines:
+            for col in line['columns']:
+                if self.env.company.currency_id.compare_amounts(col.get('no_format', 0.0), 0.0) == -1:
+                    col['class'] = 'number color-red'
+
+        return lines
+
+    @api.model
+    def _followup_report_format_aml_name(self, line_name, move_ref, move_name=None):
+        """ Format the display of an account.move.line record. As its very costly to fetch the account.move.line
+        records, only line_name, move_ref, move_name are passed as parameters to deal with sql-queries more easily.
+
+        :param line_name:   The name of the account.move.line record.
+        :param move_ref:    The reference of the account.move record.
+        :param move_name:   The name of the account.move record.
+        :return:            The formatted name of the account.move.line record.
+        """
+        names = []
+        if move_name is not None and move_name != '/':
+            names.append(move_name)
+        if move_ref and move_ref != '/':
+            names.append(move_ref)
+        if line_name and line_name != move_name and line_name != '/':
+            names.append(line_name)
+        name = '-'.join(names)
+        return name
+
+    ####################################################
+    # DEFAULT BODY AND EMAIL SUBJECT
+    ####################################################
+
+    @api.model
+    def _get_rendered_body(self, partner_id, template_src, default_body, **kwargs):
+        """ Returns the body that can be rendered by the template_src, or if None, returns the default_body.
+        kwargs can contain any keyword argument supported by the *_render_template* function
+        """
+        if template_src:
+            return self.env['mail.composer.mixin'].sudo()._render_template(template_src, 'res.partner', [partner_id], **kwargs)[partner_id]
+
+        return default_body
+
+    @api.model
+    def _get_sms_body(self, options):
+        # Manual follow-up: return body from options
+        if options.get('sms_body'):
+            return options.get('sms_body')
+
+        partner = self.env['res.partner'].browse(options.get('partner_id'))
+        followup_line = options.get('followup_line', partner.followup_line_id)
+        sms_template = options.get('sms_template') or followup_line.sms_template_id
+        template_src = sms_template.with_context(lang=partner.lang or self.env.user.lang).body
+
+        partner_followup_responsible_id = partner._get_followup_responsible()
+        responsible_signature = html2plaintext(partner_followup_responsible_id.signature or partner_followup_responsible_id.name)
+        self = self.with_context(lang=partner.lang or self.env.user.lang)
+        default_body = _("Dear client, we kindly remind you that you still have unpaid invoices. Please check them and take appropriate action. %s", responsible_signature)
+
+        return self._get_rendered_body(partner.id, template_src, default_body, options={'post_process': True})
+
+    @api.model
+    def _get_email_from(self, options):
+        partner = self.env['res.partner'].browse(options.get('partner_id'))
+        # For manual followups, get the email_from from the selected template in the send & print wizard.
+        if options.get('email_from'):
+            followup_email_from = options['email_from']
+        # For automatic followups, get it from mail template on the followup line.
+        else:
+            followup_line = options.get('followup_line') or partner.followup_line_id
+            mail_template = options.get('mail_template') or followup_line.mail_template_id
+            followup_email_from = mail_template.email_from
+        # The _render_template() function formats the email content. It handles cases where the email_from value
+        # is a template that needs evaluation. For instance, "{{ object._get_followup_responsible().email_formatted }}".
+        return self.env['mail.composer.mixin'].sudo()._render_template(followup_email_from, 'res.partner', [partner.id])[partner.id] or None
+
+    @api.model
+    def _get_email_reply_to(self, options):
+        partner = self.env['res.partner'].browse(options.get('partner_id'))
+        followup_line = options.get('followup_line', partner.followup_line_id)
+        mail_template = options.get('mail_template', followup_line.mail_template_id)
+        # if template has no reply-to set, fall back to default reply-to, otherwise
+        # it will be set to False and behave unexpectedly
+        if mail_template.reply_to:
+            followup_reply_to = mail_template.reply_to
+        else:
+            followup_reply_to = self._notify_get_reply_to()[False]
+        return followup_reply_to
+
+    @api.model
+    def _get_main_body(self, options):
+        # Manual follow-up: return body from options
+        if options.get('body'):
+            return options.get('body')
+
+        partner = self.env['res.partner'].browse(options.get('partner_id'))
+        followup_line = options.get('followup_line', partner.followup_line_id)
+        mail_template = options.get('mail_template', followup_line.mail_template_id)
+        template_src = None
+        if mail_template:
+            template_src = mail_template.with_context(lang=partner.lang or self.env.user.lang).body_html
+
+        partner_followup_responsible_id = partner._get_followup_responsible()
+        responsible_signature = partner_followup_responsible_id.signature or partner_followup_responsible_id.name
+        self = self.with_context(lang=partner.lang or self.env.user.lang)
+        default_body = _("""Dear %s,
+
+
+Exception made if there was a mistake of ours, it seems that the following amount stays unpaid. Please, take appropriate measures in order to carry out this payment in the next 8 days.
+
+Would your payment have been carried out after this mail was sent, please ignore this message. Do not hesitate to contact our accounting department.
+
+Best Regards,
+
+""", partner.name)
+
+        default_body_html = plaintext2html(default_body) + responsible_signature  # responsible_signature is an html field
+        return self._get_rendered_body(partner.id, template_src, default_body_html, engine='qweb', options={'post_process': True})
+
+    @api.model
+    def _get_email_subject(self, options):
+        # Manual follow-up: return body from options
+        if options.get('email_subject'):
+            return options.get('email_subject')
+
+        partner = self.env['res.partner'].browse(options.get('partner_id'))
+        followup_line = options.get('followup_line', partner.followup_line_id)
+        mail_template = options.get('mail_template', followup_line.mail_template_id)
+        template_src = None
+        if mail_template:
+            template_src = mail_template.with_context(lang=partner.lang or self.env.user.lang).subject
+
+        partner_name = partner.name
+        company_name = self.env.company.name
+        self = self.with_context(lang=partner.lang or self.env.user.lang)
+        default_body = _("%(company)s Payment Reminder - %(partner)s", company=company_name, partner=partner_name)
+
+        return self._get_rendered_body(partner.id, template_src, default_body, options={'post_process': True})
+
+    @api.model
+    def _get_email_recipients(self, options):
+        if options.get('email_recipient_ids'):
+            return options.get('email_recipient_ids')
+
+        partner = self.env['res.partner'].browse(options.get('partner_id'))
+        recipients = partner._get_all_followup_contacts() or partner
+        followup_line = options.get('followup_line', recipients.followup_line_id)
+        mail_template = options.get('mail_template', followup_line.mail_template_id)
+        if mail_template:
+            rendered_values = mail_template._generate_template_recipients(
+                [partner.id],
+                {'partner_to', 'email_cc', 'email_to'},
+                True)[partner.id]
+            recipients |= partner.browse(rendered_values.get('partner_ids'))
+        return recipients
+
+    ####################################################
+    # REPORT DATA
+    ####################################################
+
+    def _get_followup_report_columns_name(self):
+        """
+        Return the name of the columns of the follow-ups report
+        """
+        return [
+            {'name': _('Reference'), 'style': 'text-align:center; white-space:nowrap;'},
+            {'name': _('Date'), 'class': 'date', 'style': 'text-align:center; white-space:nowrap;'},
+            {'name': _('Due Date'), 'class': 'date', 'style': 'text-align:center; white-space:nowrap;'},
+            {'name': _('Origin'), 'style': 'text-align:center; white-space:nowrap;'},
+            {'name': _('Communication'), 'style': 'text-align:center; white-space:nowrap;'},
+            {'name': _('Total Due'), 'class': 'number o_price_total', 'style': 'text-align:center; white-space:nowrap;'},
+        ]
+
+    ####################################################
+    # EXPORT
+    ####################################################
+
+    @api.model
+    def _send_sms(self, options):
+        """
+        Send by SMS the followup to the customer
+        """
+        partner = self.env['res.partner'].browse(options.get('partner_id'))
+        followup_contacts = partner._get_all_followup_contacts() or partner
+        sent_at_least_once = False
+        for to_send_partner in followup_contacts:
+            sms_number = to_send_partner.mobile or to_send_partner.phone
+            if sms_number:
+                sms_body = self.with_context(lang=partner.lang or self.env.user.lang)._get_sms_body(options)
+                partner._message_sms(
+                    body=sms_body,
+                    partner_ids=partner.ids,
+                    sms_pid_to_number={partner.id: sms_number},
+                )
+                sent_at_least_once = True
+        if not sent_at_least_once:
+            raise UserError(_("You are trying to send an SMS, but no follow-up contact has any mobile/phone number set for customer '%s'", partner.name))
+
+    @api.model
+    def _send_email(self, options):
+        """
+        Send by email the followup to the customer's followup contacts
+        """
+        partner = self.env['res.partner'].browse(options.get('partner_id'))
+        followup_line = options.get('followup_line', partner.followup_line_id)
+        sent_at_least_once = False
+        for to_send_partner in self._get_email_recipients(options):
+            email = to_send_partner.email
+            if email and email.strip():
+                self = self.with_context(lang=partner.lang or self.env.user.lang)
+                body_html = self.with_context(mail=True).get_followup_report_html(options)
+
+                # Should contain the followup report and invoice attachments if join_invoices is True.
+                attachment_ids = options.get('attachment_ids')
+
+                # If the follow-up was executed manually, the author_id will be set to the ID of the current logged-in user.
+                # Otherwise, if the follow-up is automatic, the author_id will be the followup responsible or OdooBot.
+                author_id = options.get('author_id', partner._get_followup_responsible().partner_id.id)
+
+                partner.with_context(mail_post_autofollow=True, mail_notify_author=True, lang=partner.lang or self.env.user.lang).message_post(
+                    partner_ids=[to_send_partner.id],
+                    author_id=author_id,
+                    email_from=self._get_email_from(options),
+                    body=body_html,
+                    subject=self._get_email_subject(options),
+                    reply_to=self._get_email_reply_to(options),
+                    model_description=_('payment reminder'),
+                    email_layout_xmlid='mail.mail_notification_light',
+                    attachment_ids=attachment_ids,
+                    subtype_id=self.env['ir.model.data']._xmlid_to_res_id('mail.mt_note'),
+                )
+                sent_at_least_once = True
+
+                # add additional followers to the partner's chatter
+                if followup_line and followup_line.additional_follower_ids:
+                    partner.message_subscribe(followup_line.additional_follower_ids.partner_id.ids)
+        if not sent_at_least_once:
+            raise UserError(_("You are trying to send an Email, but no follow-up contact has any email address set for customer '%s'", partner.name))
+
+    @api.model
+    def _print_followup_letter(self, partner, options=None):
+        """Generate the followup letter for the given partner.
+        The letter is saved as ir.attachment and linked in the chatter.
+
+        Returns a client action downloading this letter and closing the wizard.
+        """
+        attachment = partner._get_followup_report_attachment(options)
+        partner.message_post(body=_('Follow-up letter generated'), attachment_ids=[attachment.id])
+        return {
+            'type': 'ir.actions.client',
+            'tag': 'close_followup_wizard',
+            'params': {
+                'url': '/web/content/%s?download=1' % attachment.id,
+            }
+        }
diff --git a/dev_odex30_accounting/odex30_account_followup/models/account_move_line.py b/dev_odex30_accounting/odex30_account_followup/models/account_move_line.py
new file mode 100644
index 0000000..c7eaa78
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_followup/models/account_move_line.py
@@ -0,0 +1,30 @@
+# -*- coding: utf-8 -*-
+
+from odoo import models, fields
+from odoo.tools import Query, SQL
+
+
+class AccountMoveLine(models.Model):
+    _inherit = 'account.move.line'
+
+    followup_line_id = fields.Many2one('account_followup.followup.line', 'Follow-up Level', copy=False)
+    invoice_origin = fields.Char(related='move_id.invoice_origin')
+
+    def _read_group_groupby(self, groupby_spec: str, query: Query) -> SQL:
+        if groupby_spec != 'followup_overdue':
+            return super()._read_group_groupby(groupby_spec, query)
+        return SQL(
+            "%(date_maturity)s IS NOT NULL AND %(date_maturity)s < %(current_date)s",
+            date_maturity=self._field_to_sql(self._table, 'date_maturity', query),
+            current_date=fields.Date.context_today(self),
+        )
+
+    def _read_group_empty_value(self, spec):
+        if spec != 'followup_overdue':
+            return super()._read_group_empty_value(spec)
+        return False
+
+    def _read_group_postprocess_groupby(self, groupby_spec, raw_values):
+        if groupby_spec != 'followup_overdue':
+            return super()._read_group_postprocess_groupby(groupby_spec, raw_values)
+        return ((value or False) for value in raw_values)
diff --git a/dev_odex30_accounting/odex30_account_followup/models/ir_actions_report.py b/dev_odex30_accounting/odex30_account_followup/models/ir_actions_report.py
new file mode 100644
index 0000000..09e132d
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_followup/models/ir_actions_report.py
@@ -0,0 +1,53 @@
+import io
+from odoo import models
+from odoo.tools.parse_version import parse_version
+from odoo.tools.pdf import OdooPdfFileReader, OdooPdfFileWriter, to_pdf_stream
+
+class IrActionsReport(models.Model):
+    _inherit = 'ir.actions.report'
+
+    def _render_qweb_pdf_prepare_streams(self, report_ref, data, res_ids=None):
+        # OVERRIDE
+        res = super()._render_qweb_pdf_prepare_streams(report_ref, data, res_ids)
+        report = self._get_report(report_ref)
+        if not res_ids or report.report_name != 'account_followup.report_followup_print_all':
+            return res
+
+        # TODO: Remove this check in master
+        # This makes sure the report template is upgraded to a version compatible with this function.
+        # Note: field latest_version of model ir.module.module is the installed version
+        installed_module_version = self.sudo().env.ref('base.module_account_followup').latest_version
+        if parse_version(installed_module_version)[2:] < parse_version('1.1'):
+            return res
+
+        options = data.get('options', {})
+        for partner_id in res_ids:
+            partner = self.env['res.partner'].browse(partner_id)
+            join_invoices = options.get('join_invoices', partner.followup_line_id.join_invoices)
+            if not join_invoices and not options.get('report_attachment_id'):
+                continue
+
+            if options.get('attachment_ids'):
+                attachments = self.env['ir.attachment'].browse(options.get('attachment_ids'))
+            else:
+                invoices = partner._get_invoices_to_print(options)
+                attachments = invoices.message_main_attachment_id  # existence guaranteed by _get_invoices_to_print
+
+            writer = OdooPdfFileWriter()
+
+            # Fill writer with the followup report followed by the invoices
+            followup_stream = res[partner_id]['stream']
+            input_streams = [followup_stream] + [to_pdf_stream(attachment) for attachment in self._prepare_local_attachments(attachments)
+                                                 if attachment.mimetype == 'application/pdf']
+            for stream in input_streams:
+                reader = OdooPdfFileReader(stream, strict=False)
+                writer.appendPagesFromReader(reader)
+
+            # Generate the output stream from writer and close the input streams
+            output_stream = io.BytesIO()
+            writer.write(output_stream)
+            res[partner_id]['stream'] = output_stream
+            for stream in input_streams:
+                stream.close()
+
+        return res
diff --git a/dev_odex30_accounting/odex30_account_followup/models/res_partner.py b/dev_odex30_accounting/odex30_account_followup/models/res_partner.py
new file mode 100644
index 0000000..ce039eb
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_followup/models/res_partner.py
@@ -0,0 +1,698 @@
+import ast
+import logging
+
+from collections import defaultdict
+from datetime import datetime
+
+from odoo import _, api, fields, models
+from odoo.exceptions import UserError
+from odoo.tools import DEFAULT_SERVER_DATE_FORMAT, SQL
+from odoo.tools.misc import format_date, get_lang
+
+_logger = logging.getLogger(__name__)
+
+
+class ResPartner(models.Model):
+    _inherit = 'res.partner'
+
+    followup_next_action_date = fields.Date(
+        string='Next reminder',
+        copy=False,
+        company_dependent=True,
+        help='''No follow-up action will be taken before this date.
+                Sending a reminder will set this date depending on the levels configuration, and you can change it manually.''',
+    )
+
+    # readonly=False in order to be able to edit it directly in the view form, without having to click on 'Edit'
+    # It's mainly used for usability purposes to easily include/exclude unreconciled move lines
+    unreconciled_aml_ids = fields.One2many('account.move.line', compute='_compute_total_due', readonly=False)
+
+    unpaid_invoice_ids = fields.One2many('account.move', compute='_compute_unpaid_invoices')
+    unpaid_invoices_count = fields.Integer(compute='_compute_unpaid_invoices')
+    # These two fields are meant to receive the due and overdue amounts, including asset_receivable AND liability_payable accounts
+    # In opposition to the total_due and total_overdue fields which only take into account asset_receivable accounts
+    # To be renamed in master
+    total_all_due = fields.Monetary(
+        compute='_compute_total_due',
+        groups='account.group_account_readonly,account.group_account_invoice')
+    total_all_overdue = fields.Monetary(
+        compute='_compute_total_due',
+        groups='account.group_account_readonly,account.group_account_invoice')
+    total_due = fields.Monetary(
+        compute='_compute_total_due',
+        groups='account.group_account_readonly,account.group_account_invoice')
+    total_overdue = fields.Monetary(
+        compute='_compute_total_due',
+        groups='account.group_account_readonly,account.group_account_invoice')
+    followup_status = fields.Selection(
+        [('in_need_of_action', 'In need of action'), ('with_overdue_invoices', 'With overdue invoices'), ('no_action_needed', 'No action needed')],
+        compute='_compute_followup_status',
+        string='Follow-up Status',
+        search='_search_status',
+        groups='account.group_account_readonly,account.group_account_invoice',
+    )
+    followup_line_id = fields.Many2one(
+        comodel_name='account_followup.followup.line',
+        string="Follow-up Level",
+        compute='_compute_followup_status',
+        inverse='_set_followup_line_on_unreconciled_amls',
+        search='_search_followup_line',
+        groups='account.group_account_readonly,account.group_account_invoice',
+    )
+    followup_reminder_type = fields.Selection([('automatic', 'Automatic'), ('manual', 'Manual')], string="Reminders", default='automatic')
+    type = fields.Selection(selection_add=[('followup', 'Follow-up Address'), ('other',)])
+    followup_responsible_id = fields.Many2one(
+        comodel_name='res.users',
+        string='Responsible',
+        help="The responsible assigned to manual followup activities, if defined in the level.",
+        tracking=True,
+        copy=False,
+        company_dependent=True,
+        groups='account.group_account_readonly,account.group_account_invoice',
+    )
+    has_moves = fields.Boolean(compute='_compute_has_moves')
+
+    @property
+    def _complete_name_displayed_types(self):
+        return super()._complete_name_displayed_types + ('followup',)
+
+    def _search_status(self, operator, value):
+        """
+        Compute the search on the field 'followup_status'
+        """
+        if isinstance(value, str):
+            value = [value]
+        if operator not in ('in', '=') or not value:
+            return []
+        value = [v for v in value if v in ['in_need_of_action', 'with_overdue_invoices', 'no_action_needed']]
+
+        followup_data = self._query_followup_data(all_partners=True)
+
+        return [('id', 'in', [
+            d['partner_id']
+            for d in followup_data.values()
+            if d['followup_status'] in value
+        ])]
+
+    def _search_followup_line(self, operator, value):
+        company_domain = [('company_id', 'parent_of', self.env.company.id)]
+        if isinstance(value, str):
+            domain = [('name', operator, value)]
+        elif isinstance(value, (int, list, tuple)):
+            domain = [('id', operator, value)]
+
+        line_ids = set(self.env['account_followup.followup.line'].search(domain+company_domain).ids)
+
+        followup_data = self._query_followup_data(all_partners=True)
+
+        return [('id', 'in', [
+            d['partner_id']
+            for d in followup_data.values()
+            if d['followup_line_id'] in line_ids
+        ])]
+
+    @api.depends('unreconciled_aml_ids', 'followup_next_action_date')
+    @api.depends_context('company', 'allowed_company_ids')
+    def _compute_followup_status(self):
+        all_data = self._query_followup_data()
+        for partner in self:
+            partner_data = all_data.get(partner._origin.id, {'followup_status': 'no_action_needed', 'followup_line_id': False})
+            partner.followup_status = partner_data['followup_status']
+            partner.followup_line_id = partner_data['followup_line_id']
+
+    def _compute_unpaid_invoices(self):
+        partners_unpaid_receivable_lines = self.env['account.move.line'].search([
+            ('company_id', 'child_of', self.env.company.id),
+            ('move_id.commercial_partner_id', 'in', self.ids),
+            ('parent_state', '=', 'posted'),
+            ('move_id.payment_state', 'in', ('not_paid', 'partial')),
+            ('move_id.move_type', 'in', self.env['account.move'].get_sale_types()),
+            ('account_id.account_type', '=', 'asset_receivable'),
+        ]).grouped(lambda line: line.move_id.commercial_partner_id.id)
+        for partner in self:
+            unpaid_receivable_lines = partners_unpaid_receivable_lines.get(partner.id, self.env['account.move.line'])
+            unpaid_invoices = unpaid_receivable_lines.move_id
+            partner.unpaid_invoice_ids = unpaid_invoices
+            partner.unpaid_invoices_count = len(unpaid_invoices)
+
+    def action_view_unpaid_invoices(self):
+        self.ensure_one()
+        action = self.env["ir.actions.actions"]._for_xml_id("account.action_move_out_invoice_type")
+        action['domain'] = [('id', 'in', self.unpaid_invoice_ids.ids)]
+        action['context'] = {
+            'default_move_type': 'out_invoice',
+            'move_type': 'out_invoice',
+            'journal_type': 'sale',
+            'partner_id': self.id
+        }
+        return action
+
+    def action_open_overdue_entries(self):
+        self.ensure_one()
+        return {
+            'type': 'ir.actions.act_window',
+            'name': _("Overdue Invoices"),
+            'res_model': 'account.move',
+            'domain': [('commercial_partner_id', '=', self.id), ('move_type', 'in', ('out_invoice', 'out_refund'))],
+            'view_mode': 'list,form',
+            'context': {'search_default_late': True},
+        }
+
+    def action_open_unreconciled_partner(self):
+        action_values = self.env["ir.actions.actions"]._for_xml_id("account_accountant.action_move_line_posted_unreconciled")
+        domain = ast.literal_eval(action_values['domain'])
+        domain.append(('partner_id', 'in', self.ids))
+        action_values['domain'] = domain
+        return action_values
+
+    @api.depends('invoice_ids')
+    @api.depends_context('company', 'allowed_company_ids')
+    def _compute_total_due(self):
+        due_data = defaultdict(float)
+        overdue_data = defaultdict(float)
+        receivable_due_data = defaultdict(float)
+        receivable_overdue_data = defaultdict(float)
+        unreconciled_aml_ids = defaultdict(list)
+        for account_type, overdue, partner, amount_residual_sum, aml_ids in self.env['account.move.line']._read_group(
+            domain=self._get_unreconciled_aml_domain(),
+            groupby=['account_type', 'followup_overdue', 'partner_id'],
+            aggregates=['amount_residual:sum', 'id:array_agg'],
+        ):
+            if account_type == 'asset_receivable':
+                unreconciled_aml_ids[partner] += aml_ids
+                receivable_due_data[partner] += amount_residual_sum
+                if overdue:
+                    receivable_overdue_data[partner] += amount_residual_sum
+            due_data[partner] += amount_residual_sum
+            if overdue:
+                overdue_data[partner] += amount_residual_sum
+
+        for partner in self:
+            partner.total_all_due = due_data.get(partner, 0.0)
+            partner.total_all_overdue = overdue_data.get(partner, 0.0)
+            partner.total_due = receivable_due_data.get(partner, 0.0)
+            partner.total_overdue = receivable_overdue_data.get(partner, 0.0)
+            partner.unreconciled_aml_ids = self.env['account.move.line'].browse(unreconciled_aml_ids.get(partner, []))
+
+    def _set_followup_line_on_unreconciled_amls(self):
+        today = fields.Date.context_today(self)
+        for partner in self:
+            current_followup_line = partner.followup_line_id
+            previous_followup_line = self.env['account_followup.followup.line'].search([('delay', '<', current_followup_line.delay), ('company_id', 'parent_of', self.env.company.id)], order='delay desc', limit=1)
+            for unreconciled_aml in partner.unreconciled_aml_ids:
+                unreconciled_aml.followup_line_id = previous_followup_line
+
+    def _get_unreconciled_aml_domain(self):
+        return [
+            ('reconciled', '=', False),
+            ('account_id.account_type', 'in', ('asset_receivable', 'liability_payable')),
+            ('parent_state', '=', 'posted'),
+            ('partner_id', 'in', self.ids),
+            ('company_id', 'child_of', self.env.company.id),
+        ]
+
+    def _get_followup_responsible(self):
+        self.ensure_one()
+
+        responsible_type = self.followup_line_id.activity_default_responsible_type
+        if responsible_type == 'account_manager' and self.user_id:
+            return self.user_id
+
+        most_delayed_aml = self._included_unreconciled_aml_max_followup().get('most_delayed_aml')
+
+        candidates = [
+            (responsible_type == 'salesperson' and most_delayed_aml and most_delayed_aml.move_id.invoice_user_id),
+            self.followup_responsible_id,
+            self.user_id,
+            (most_delayed_aml and most_delayed_aml.move_id.invoice_user_id),
+        ]
+        return next((u for u in candidates if u and u.active), super()._get_followup_responsible())
+
+    def _get_all_followup_contacts(self):
+        """ Returns every contact of type 'followup' in the children of self.
+        If no followup contacts are found, use the billing address
+        and default to contact if there isn't any for invoice
+        """
+        self.ensure_one()
+        followup_contacts = self.child_ids.filtered(lambda partner: partner.type == 'followup')
+        if not followup_contacts:
+            followup_contacts = self.env['res.partner'].browse(self.address_get(['invoice'])['invoice'])
+        return followup_contacts
+
+    def _included_unreconciled_aml_max_followup(self):
+        """ Computes the maximum delay in days and the highest level of followup (followup line with highest delay) of all the unreconciled amls included.
+        Also returns the delay for the next level (after the highest_followup_line), the most delayed aml and a boolean specifying if any invoice is overdue.
+        :return dict with key/values: most_delayed_aml, max_delay, highest_followup_line, next_followup_delay, has_overdue_invoices
+        """
+        self.ensure_one()
+        today = fields.Date.context_today(self)
+        highest_followup_line = None
+        most_delayed_aml = self.env['account.move.line']
+        first_followup_line = self._get_first_followup_level()
+        # Minimum value for delay, will always be smaller than any other delay
+        max_delay = first_followup_line.delay - 1
+        has_overdue_invoices = False
+        for aml in self.unreconciled_aml_ids.filtered('date_maturity'):
+            aml_delay = (today - aml.date_maturity).days
+
+            is_overdue = aml_delay > 0
+            if is_overdue:
+                has_overdue_invoices = True
+
+            if self.env.company in aml.company_id.parent_ids:
+                if aml.followup_line_id and aml.followup_line_id.delay >= (highest_followup_line or first_followup_line).delay:
+                    highest_followup_line = aml.followup_line_id
+                max_delay = max(max_delay, aml_delay)
+                if most_delayed_aml.amount_residual < aml.amount_residual:
+                    most_delayed_aml = aml
+        followup_lines_info = self._get_followup_lines_info()
+        next_followup_delay = None
+        if followup_lines_info:
+            key = highest_followup_line.id if highest_followup_line else None
+            current_followup_line_info = followup_lines_info.get(key)
+            next_followup_delay = current_followup_line_info.get('next_delay')
+        return {
+            'most_delayed_aml': most_delayed_aml,
+            'max_delay': max_delay,
+            'highest_followup_line': highest_followup_line,
+            'next_followup_delay': next_followup_delay,
+            'has_overdue_invoices': has_overdue_invoices,
+        }
+
+    def _get_invoices_to_print(self, options):
+        self.ensure_one()
+        if not options:
+            options = {}
+        if not options.get('join_invoices', options.get('followup_line', self.followup_line_id).join_invoices):
+            return self.env['account.move']
+        invoices_to_print = self.unreconciled_aml_ids.move_id.filtered(lambda l: l.is_invoice(include_receipts=True))
+        if options.get('manual_followup'):
+            # For manual reminders, only print invoices with the selected attachments
+            return invoices_to_print.filtered(lambda inv: inv.message_main_attachment_id.id in options.get('attachment_ids', []))
+        return invoices_to_print.filtered(lambda inv: inv.message_main_attachment_id)
+
+    @api.model
+    def _get_first_followup_level(self):
+        return self.env['account_followup.followup.line'].search([('company_id', 'parent_of', self.env.company.id)], order='delay asc', limit=1)
+
+    def _update_next_followup_action_date(self, followup_line):
+        """Updates the followup_next_action_date of the right account move lines
+        """
+        self.ensure_one()
+        if followup_line:
+            next_date = followup_line._get_next_date()
+            self.followup_next_action_date = datetime.strftime(next_date, DEFAULT_SERVER_DATE_FORMAT)
+            msg = _('Next Reminder Date set to %s', format_date(self.env, self.followup_next_action_date))
+            self.message_post(body=msg)
+
+        today = fields.Date.context_today(self)
+        previous_levels = self.env['account_followup.followup.line'].search([('delay', '<=', followup_line.delay), ('company_id', '=', self.env.company.id)])
+        for aml in self.unreconciled_aml_ids.filtered('date_maturity'):
+            eligible_levels = previous_levels.filtered(lambda level: (today - aml.date_maturity).days >= level.delay)
+            if eligible_levels:
+                aml.followup_line_id = max(eligible_levels, key=lambda level: level.delay)
+
+    def send_followup_email(self, options):
+        """
+        Send a follow-up report by email to customers in self
+        """
+        for record in self:
+            options['partner_id'] = record.id
+            self.env['account.followup.report']._send_email(options)
+
+    def send_followup_sms(self, options):
+        """
+        Send a follow-up report by sms to customers in self
+        """
+        for partner in self:
+            options['partner_id'] = partner.id
+            self.env['account.followup.report']._send_sms(options)
+
+    def get_followup_html(self, options=None):
+        """
+        Return the content of the follow-up report in HTML
+        """
+        if options is None:
+            options = {}
+        options.update({
+            'partner_id': self.id,
+            'followup_line_id': self.followup_line_id,
+        })
+        return self.env['account.followup.report'].with_context(print_mode=True, lang=self.lang or self.env.user.lang).get_followup_report_html(options)
+
+    def _get_followup_lines_info(self):
+        """ returns the followup plan of the current user's company
+        in the form of a dictionary with
+         * keys being the different possible lines of followup for account.move.line's (None or IDs of account_followup.followup.line)
+         * values being a dict of 2 elements:
+           - 'next_followup_line_id': the followup ID of the next followup line
+           - 'next_delay': the delay in days of the next followup line
+        """
+        followup_lines = self.env['account_followup.followup.line'].search([('company_id', 'parent_of', self.env.company.id)], order="delay asc")
+
+        previous_line_id = None
+        followup_lines_info = {}
+        for line in followup_lines:
+            delay_in_days = line.delay
+            followup_lines_info[previous_line_id] = {
+                'next_followup_line_id': line.id,
+                'next_delay': delay_in_days,
+            }
+            previous_line_id = line.id
+        if previous_line_id:
+            followup_lines_info[previous_line_id] = {
+                'next_followup_line_id': previous_line_id,
+                'next_delay': delay_in_days,
+            }
+        return followup_lines_info
+
+    def _get_all_followup_data(self):
+        if 'res_partner_all_followup' in self.env.cr.cache:
+            return self.env.cr.cache['res_partner_all_followup']
+
+        # Put the data in a cache in the cursor to avoid running costly query multiple times in same transaction.
+        # Only do it if the table doesn't exist yet.
+        query, params = self._get_followup_data_query()
+        self.env.cr.execute(query, params)
+        self.env.cr.cache['res_partner_all_followup'] = {
+            r['partner_id']: r for r in self.env.cr.dictfetchall()
+        }
+        return self.env.cr.cache['res_partner_all_followup']
+
+    def _query_followup_data(self, all_partners=False):
+        if all_partners:
+            return self._get_all_followup_data()
+        if not self.ids:
+            return {}
+        if 'res_partner_all_followup' in self.env.cr.cache:
+            cache_dict = self.env.cr.cache['res_partner_all_followup']
+            return {id_: cache_dict[id_] for id_ in self.ids if id_ in cache_dict}
+        query, params = self._get_followup_data_query(self.ids)
+        self.env.cr.execute(query, params)
+        return {r['partner_id']: r for r in self.env.cr.dictfetchall()}
+
+    def _get_followup_data_query(self, partner_ids=None):
+        self.env['account.move.line'].check_access('read')
+        self.env['account.move.line'].flush_model()
+        self.env['res.partner'].flush_model()
+        self.env['account_followup.followup.line'].flush_model()
+        ResPartner = self.env['res.partner']
+        extra_join_conditions = self._get_followup_data_query_extra_join_conditions()
+        return f"""
+            SELECT partner.id as partner_id,
+                   ful.id as followup_line_id,
+                   CASE WHEN partner.balance <= 0 THEN 'no_action_needed'
+                        WHEN in_need_of_action_aml.id IS NOT NULL AND (followup_next_action_date IS NULL OR followup_next_action_date <= %(current_date)s) THEN 'in_need_of_action'
+                        WHEN exceeded_unreconciled_aml.id IS NOT NULL THEN 'with_overdue_invoices'
+                        ELSE 'no_action_needed' END as followup_status
+            FROM (
+          SELECT partner.id,
+                 {self.env.cr.mogrify(ResPartner._field_to_sql('partner', 'followup_next_action_date')).decode(self.env.cr.connection.encoding)} AS followup_next_action_date,
+                 MAX(COALESCE(next_ful.delay, ful.delay)) as followup_delay,
+                 SUM(aml.balance) as balance
+            FROM res_partner partner
+            JOIN account_move_line aml ON aml.partner_id = partner.id
+            JOIN account_account account ON account.id = aml.account_id
+       LEFT JOIN account_followup_followup_line ful ON ful.id = aml.followup_line_id
+       LEFT JOIN account_followup_followup_line next_ful ON next_ful.id = (
+                    SELECT next_ful.id
+                      FROM account_followup_followup_line next_ful
+                     WHERE next_ful.delay > COALESCE(ful.delay, %(min_delay)s - 1)
+                       AND next_ful.company_id = %(company_id)s
+                  ORDER BY next_ful.delay ASC
+                     LIMIT 1
+                 )
+           WHERE account.deprecated IS NOT TRUE
+             AND account.account_type = 'asset_receivable'
+             AND aml.parent_state = 'posted'
+             AND aml.reconciled IS NOT TRUE
+             AND aml.company_id = ANY(%(company_ids)s)
+             {"" if partner_ids is None else "AND aml.partner_id IN %(partner_ids)s"}
+        GROUP BY partner.id
+            ) partner
+            LEFT JOIN account_followup_followup_line ful ON ful.delay = partner.followup_delay AND ful.company_id = %(company_id)s
+            -- Get the followup status data
+            LEFT OUTER JOIN LATERAL (
+                SELECT line.id
+                  FROM account_move_line line
+                  JOIN account_account account ON line.account_id = account.id
+             LEFT JOIN account_followup_followup_line ful ON ful.id = line.followup_line_id
+                 WHERE line.partner_id = partner.id
+                   AND account.account_type = 'asset_receivable'
+                   AND account.deprecated IS NOT TRUE
+                   AND line.parent_state = 'posted'
+                   AND line.reconciled IS NOT TRUE
+                   AND line.balance > 0
+                   AND line.company_id = ANY(%(company_ids)s)
+                   AND COALESCE(ful.delay, %(min_delay)s - 1) < partner.followup_delay
+                   AND line.date_maturity IS NOT NULL
+                   AND line.date_maturity + COALESCE(ful.delay, %(min_delay)s - 1) < %(current_date)s
+                   {extra_join_conditions}
+                 LIMIT 1
+            ) in_need_of_action_aml ON true
+            LEFT OUTER JOIN LATERAL (
+                SELECT line.id
+                  FROM account_move_line line
+                  JOIN account_account account ON line.account_id = account.id
+                 WHERE line.partner_id = partner.id
+                   AND account.account_type = 'asset_receivable'
+                   AND account.deprecated IS NOT TRUE
+                   AND line.parent_state = 'posted'
+                   AND line.reconciled IS NOT TRUE
+                   AND line.balance > 0
+                   AND line.company_id = ANY(%(company_ids)s)
+                   AND line.date_maturity IS NOT NULL
+                   AND line.date_maturity < %(current_date)s
+                   {extra_join_conditions}
+                 LIMIT 1
+            ) exceeded_unreconciled_aml ON true
+        """, {
+            'company_ids': self.env.company.search([('id', 'child_of', self.env.company.id)]).ids,
+            'company_id': self.env.company.id,
+            'partner_ids': tuple(partner_ids or []),
+            'current_date': fields.Date.context_today(self),  # Allow mocking the current day for testing purpose.
+            'min_delay': self._get_first_followup_level().delay or 0,
+        }
+
+    def _get_followup_data_query_extra_join_conditions(self):
+        """ Hook method to add extra join conditions. """
+        return ''
+
+    def _send_followup(self, options):
+        """ Send the follow-up to the partner, depending on selected options.
+        Can be overridden to include more ways of sending the follow-up.
+        """
+        self.ensure_one()
+        followup_line = options.get('followup_line')
+        if options.get('email', followup_line.send_email):
+            self.send_followup_email(options)
+        if options.get('sms', followup_line.send_sms):
+            self.send_followup_sms(options)
+
+    def _get_followup_report(self, options):
+        followup_report = (
+                self.env.ref('odex30_account_reports.followup_report', raise_if_not_found=False)
+                or self.env.ref('odex30_account_reports.customer_statement_report', raise_if_not_found=False)
+                or self.env.ref('odex30_account_reports.partner_ledger_report')
+        )
+        return self._get_partner_account_report_attachment(followup_report).id
+
+    def _get_followup_attachments(self, options):
+        attachment_ids = options.setdefault('attachment_ids', [])
+        followup_line = options.get('followup_line')
+        if not options.get('join_invoices', followup_line.join_invoices):
+            # Ignore all attachments if join_invoices is False
+            attachment_ids.clear()
+
+        # Add the Follow-up report
+        options['report_attachment_id'] = self._get_followup_report(options)
+        attachment_ids.append(options['report_attachment_id'])
+
+        # Add the attachments from the template
+        if template_id := options.get('template_id', followup_line.mail_template_id):
+            template_attachments = template_id._generate_template_attachments(self.ids, {'attachment_ids', 'report_template_ids'})[self.id]
+            attachment_ids += template_attachments['attachment_ids']
+
+            attachments_to_create = []
+            for dynamic_report in template_attachments['attachments']:
+                attachments_to_create.append({
+                    'name': dynamic_report[0],
+                    'datas': dynamic_report[1],
+                    'res_model': self._name,
+                    'res_id': self.id,
+                })
+            dynamic_attachments = self.env['ir.attachment'].create(attachments_to_create)
+            attachment_ids += dynamic_attachments.ids
+
+        if not options.get('join_invoices', followup_line.join_invoices):
+            return
+
+        # Add the PDFs from overdue invoices
+        invoice_attachment_ids = self._get_invoices_to_print(options).message_main_attachment_id.ids
+        attachment_ids += invoice_attachment_ids
+
+    def _execute_followup_partner(self, options=None):
+        """ Execute the actions to do with follow-ups for this partner (apart from printing).
+        This is either called when processing the follow-ups manually (wizard), or automatically (cron).
+        Automatic follow-ups can also be triggered manually with *action_manually_process_automatic_followups*.
+        When processing automatically, options is None.
+
+        Returns True if any action was processed, False otherwise
+        """
+        self.ensure_one()
+        if options is None:
+            options = {}
+        if options.get('manual_followup', self.followup_status == 'in_need_of_action'):
+            followup_line = self.followup_line_id or self._get_first_followup_level()
+
+            if followup_line.create_activity:
+                # log a next activity for today
+                self.activity_schedule(
+                    activity_type_id=followup_line.activity_type_id and followup_line.activity_type_id.id or self._default_activity_type().id,
+                    note=followup_line.activity_note,
+                    summary=followup_line.activity_summary,
+                    user_id=(self._get_followup_responsible()).id
+                )
+            options['followup_line'] = followup_line
+            self._update_next_followup_action_date(followup_line)
+
+            self._get_followup_attachments(options)
+
+            self._send_followup(options)
+
+            return True
+        return False
+
+    def execute_followup(self, options):
+        """ Execute the actions to do with follow-ups for this partner.
+        This is called when processing the follow-ups manually, via the wizard.
+
+        options is a dictionary containing at least the following information:
+            - 'partner_id': id of partner (self)
+            - 'email': boolean to trigger the sending of email or not
+            - 'email_subject': subject of email
+            - 'followup_contacts': partners (contacts) to send the followup to
+            - 'body': email body
+            - 'attachment_ids': invoice attachments to join to email/letter
+            - 'sms': boolean to trigger the sending of sms or not
+            - 'sms_body': sms body
+            - 'print': boolean to trigger the printing of pdf letter or not
+            - 'manual_followup': boolean to indicate whether this followup is triggered via the manual reminder wizard
+        """
+        self.ensure_one()
+        to_print = self._execute_followup_partner(options=options)
+        if options.get('print') and to_print:
+            return self.env['account.followup.report']._print_followup_letter(self, options)
+
+    def _create_followup_missing_information_wizard(self):
+        """ Returns a wizard containing all the partners with missing information.
+        """
+
+        return {
+            'type': 'ir.actions.act_window',
+            'name': _("Missing information"),
+            'view_mode': 'form',
+            'res_model': 'account_followup.missing.information.wizard',
+            'target': 'new',
+            'context': {'default_partner_ids': self.ids},
+        }
+
+    def _has_missing_followup_info(self):
+        self.ensure_one()
+
+        followup_contacts = self._get_all_followup_contacts() or self
+
+        if self.followup_line_id.send_email and not any(followup_contacts.mapped('email')):
+            return True
+
+        if self.followup_line_id.send_sms and not (any(followup_contacts.mapped('mobile'))
+                                            or any(followup_contacts.mapped('phone'))):
+            return True
+        return False
+
+    def action_manually_process_automatic_followups(self):
+        partners_with_missing_info = self.env['res.partner']
+
+        for partner in self:
+            if partner.followup_status != 'in_need_of_action':
+                continue
+
+            # Skip partner with missing info.
+            if partner._has_missing_followup_info():
+                partners_with_missing_info |= partner
+                continue
+
+            partner._execute_followup_partner()
+
+        # If one or more partners are missing information, open a wizard listing them.
+        if partners_with_missing_info:
+            return partners_with_missing_info._create_followup_missing_information_wizard()
+
+    def _cron_execute_followup_company(self):
+        followup_data = self._query_followup_data(all_partners=True)
+        in_need_of_action = self.env['res.partner'].browse([d['partner_id'] for d in followup_data.values() if d['followup_status'] == 'in_need_of_action'])
+        in_need_of_action_auto = in_need_of_action.filtered(lambda p: p.followup_line_id.auto_execute and p.followup_reminder_type == 'automatic')
+        for partner in in_need_of_action_auto[:1000]:
+            try:
+                partner._execute_followup_partner()
+            except UserError as e:
+                # followup may raise exception due to configuration issues
+                # i.e. partner missing email
+                partner._message_log(body=e)
+                _logger.warning(e, exc_info=True)
+
+    def _cron_execute_followup(self):
+        for company in self.env["res.company"].search([]):
+            # Since the cache is done by database and not by company, we need to invalidate in this special case
+            # where the context is changing in the same transaction
+            self.env.cr.cache.pop('res_partner_all_followup', None)
+            self.with_context(allowed_company_ids=company.ids)._cron_execute_followup_company()
+
+    def _show_pay_now_button(self):
+        invoice_online_payment = bool(self.env['ir.config_parameter'].sudo().get_param('account_payment.enable_portal_payment'))
+        payment_method_available = bool(self.env['payment.method'].sudo().search_count([('active', '=', 'True')]))
+        return invoice_online_payment and payment_method_available
+
+    def _compute_has_moves(self):
+        query = self.env['res.partner']._search([('id', 'in', self.ids)])
+        account_move_query = self.env["account.move"]._search(
+            [
+                ("company_id", "in", self.env.companies.ids),
+                "|",
+                ("partner_id", "=", SQL.identifier(query.table, "id")),
+                "|",
+                ("partner_shipping_id", "=", SQL.identifier(query.table, "id")),
+                ("commercial_partner_id", "=", SQL.identifier(query.table, "id")),
+            ]
+        )
+        result = dict(self.env.execute_query(query.select(
+            "id",
+            SQL(
+                "EXISTS (%s) AS has_moves",
+                account_move_query.subselect(SQL.identifier(account_move_query.table, "id")),
+            ),
+        )))
+
+        for partner in self:
+            partner.has_moves = result.get(partner.id, False)
+
+    def _get_followup_report_attachment(self, options):
+        """
+        Generate the follow-up report and returns it as an attachment.
+        """
+        tz_date_str = format_date(self.env, fields.Date.today(), lang_code=self.env.user.lang or get_lang(self.env).code)
+        # To avoid having dots in the name of the file.
+        tz_date_str = tz_date_str.replace('.', '-')
+        followup_letter_name = _("Follow-up %(partner)s - %(date)s.pdf", partner=self.display_name, date=tz_date_str)
+
+        action = self.env.ref('account_followup.action_report_followup')
+        followup_letter = action.with_context(lang=self.lang or self.env.user.lang)._render_qweb_pdf('account_followup.report_followup_print_all', self.id, data={'options': options or {}})[0]
+
+        return self.env['ir.attachment'].create({
+            'name': followup_letter_name,
+            'raw': followup_letter,
+            'res_id': self.id,
+            'res_model': 'res.partner',
+            'type': 'binary',
+            'mimetype': 'application/pdf',
+        })
diff --git a/dev_odex30_accounting/odex30_account_followup/security/account_followup_security.xml b/dev_odex30_accounting/odex30_account_followup/security/account_followup_security.xml
new file mode 100644
index 0000000..617074d
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_followup/security/account_followup_security.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo noupdate="1">
+
+        <record id="account_followup_comp_rule" model="ir.rule">
+            <field name="name">Account Follow-up multi company rule</field>
+            <field name="model_id" ref="model_account_followup_followup_line"/>
+            <field eval="True" name="global"/>
+            <field name="domain_force">['|',('company_id','=',False),('company_id', 'parent_of', company_ids)]</field>
+        </record>
+
+</odoo>
diff --git a/dev_odex30_accounting/odex30_account_followup/security/ir.model.access.csv b/dev_odex30_accounting/odex30_account_followup/security/ir.model.access.csv
new file mode 100644
index 0000000..f3fc750
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_followup/security/ir.model.access.csv
@@ -0,0 +1,8 @@
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_account_followup_followup_line_readonly,account_followup.followup.line,model_account_followup_followup_line,account.group_account_readonly,1,0,0,0
+access_account_followup_followup_line,account_followup.followup.line,model_account_followup_followup_line,account.group_account_invoice,1,0,0,0
+access_account_followup_followup_line_manager,account_followup.followup.line.manager,model_account_followup_followup_line,account.group_account_manager,1,1,1,1
+access_sms_template_account_manager,access.sms.template.account.manager,sms.model_sms_template,account.group_account_manager,1,1,1,1
+access_account_followup_manual_reminder_account_basic,account_followup.manual_reminder.account.basic,model_account_followup_manual_reminder,account.group_account_basic,1,1,1,0
+access_account_followup_manual_reminder_account_manager,account_followup.manual_reminder.account.manager,model_account_followup_manual_reminder,account.group_account_manager,1,1,1,0
+access_account_followup_missing_information,access_account_followup_missing_information,model_account_followup_missing_information_wizard,account.group_account_manager,1,1,1,0
diff --git a/dev_odex30_accounting/odex30_account_followup/security/sms_security.xml b/dev_odex30_accounting/odex30_account_followup/security/sms_security.xml
new file mode 100644
index 0000000..db88709
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_followup/security/sms_security.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo noupdate="1">
+    <record id="ir_rule_sms_template_account_manager" model="ir.rule">
+        <field name="name">SMS Template: account manager CUD on partner templates</field>
+        <field name="model_id" ref="sms.model_sms_template"/>
+        <field name="groups" eval="[(4, ref('account.group_account_manager'))]"/>
+        <field name="domain_force">[('model_id.model', '=', 'res.partner')]</field>
+        <field name="perm_read" eval="False"/>
+    </record>
+</odoo>
diff --git a/dev_odex30_accounting/odex30_account_followup/static/src/components/change_trust_widget/followup_trust_widget.js b/dev_odex30_accounting/odex30_account_followup/static/src/components/change_trust_widget/followup_trust_widget.js
new file mode 100644
index 0000000..44394d8
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_followup/static/src/components/change_trust_widget/followup_trust_widget.js
@@ -0,0 +1,52 @@
+/** @odoo-module **/
+
+import { registry } from "@web/core/registry";
+import { usePopover } from "@web/core/popover/popover_hook";
+import { localization } from "@web/core/l10n/localization";
+import { Component } from "@odoo/owl";
+import { standardFieldProps } from "@web/views/fields/standard_field_props";
+
+class FollowupTrustPopOver extends Component {
+    static template = "odex30_account_followup.FollowupTrustPopOver";
+    static props = {
+        record: Object,
+        widget: Object,
+        close: { optional: true, type: Function },
+    };
+}
+
+class FollowupTrustWidget extends Component {
+    static template = "odex30_account_followup.FollowupTrustWidget";
+    static props = {...standardFieldProps};
+    setup() {
+        super.setup();
+        const position = localization.direction === "rtl" ? "bottom" : "right";
+        this.popover = usePopover(FollowupTrustPopOver, { position });
+    }
+
+    displayTrust() {
+        var selections = this.props.record.fields.trust.selection;
+        var trust = this.props.record.data[this.props.name];
+        for (var i=0; i < selections.length; i++) {
+            if (selections[i][0] == trust) {
+                return selections[i][1];
+            }
+        }
+    }
+
+    onTrustClick(ev) {
+        this.popover.open(ev.currentTarget, {
+            record: this.props.record,
+            widget: this,
+        });
+    }
+
+    async setTrust(trust) {
+        this.props.record.update({ [this.props.name]: trust });
+        this.popover.close();
+    }
+}
+
+registry.category("fields").add("followup_trust_widget", {
+    component: FollowupTrustWidget,
+});
diff --git a/dev_odex30_accounting/odex30_account_followup/static/src/components/change_trust_widget/followup_trust_widget.scss b/dev_odex30_accounting/odex30_account_followup/static/src/components/change_trust_widget/followup_trust_widget.scss
new file mode 100644
index 0000000..7bfe829
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_followup/static/src/components/change_trust_widget/followup_trust_widget.scss
@@ -0,0 +1,9 @@
+.oe-account_followup-trust-good {
+    color: green;
+}
+.oe-account_followup-trust-normal {
+    color: grey;
+}
+.oe-account_followup-trust-bad {
+    color: red;
+}
diff --git a/dev_odex30_accounting/odex30_account_followup/static/src/components/change_trust_widget/followup_trust_widget.xml b/dev_odex30_accounting/odex30_account_followup/static/src/components/change_trust_widget/followup_trust_widget.xml
new file mode 100644
index 0000000..4e98d7f
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_followup/static/src/components/change_trust_widget/followup_trust_widget.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<templates xml:space="preserve">
+    <t t-name="odex30_account_followup.FollowupTrustWidget">
+        <t t-set="label" t-value="this.displayTrust()"/>
+        <t t-set="trust_value" t-value="this.props.record.data[this.props.name]"/>
+        <i t-attf-class="fa fa-circle oe-account_followup-trust-#{trust_value}"
+           role="img"
+           t-att-aria-label="label"
+           t-att-title="label"
+           t-on-click="(ev) => this.onTrustClick(ev)"/>
+    </t>
+
+    <t t-name="odex30_account_followup.FollowupTrustPopOver">
+        <div class="account_payment_popover">
+            <t t-foreach="this.props.record.fields.trust.selection" t-as="trust_level" t-key="trust_level_index">
+                <t t-set="trust_value" t-value="trust_level[0]"/>
+                <t t-set="trust_display_name" t-value="trust_level[1]"/>
+                <a role="menuitem" href="#" class="dropdown-item ps-4" t-on-click="() => this.props.widget.setTrust(trust_value)">
+                    <i t-attf-class="fa fa-circle oe-account_followup-trust-#{trust_value}"
+                       role="img"
+                       t-att-aria-label="trust_display_name"
+                       t-att-title="trust_display_name"/> <t t-out="trust_display_name"/>
+                </a>
+            </t>
+        </div>
+    </t>
+</templates>
diff --git a/dev_odex30_accounting/odex30_account_followup/static/src/components/download_close_wizard_action/download_close_wizard_action.js b/dev_odex30_accounting/odex30_account_followup/static/src/components/download_close_wizard_action/download_close_wizard_action.js
new file mode 100644
index 0000000..d8a621b
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_followup/static/src/components/download_close_wizard_action/download_close_wizard_action.js
@@ -0,0 +1,16 @@
+/** @odoo-module **/
+
+import { browser } from "@web/core/browser/browser";
+import { registry } from "@web/core/registry";
+
+export async function downloadAndCloseFollowupWizardAction(env, action) {
+    const url = action.params.url
+    try {
+        browser.open(url);
+    }
+    finally {
+        return { type: "ir.actions.act_window_close" };
+    }
+}
+
+registry.category("actions").add("close_followup_wizard", downloadAndCloseFollowupWizardAction);
diff --git a/dev_odex30_accounting/odex30_account_followup/tests/__init__.py b/dev_odex30_accounting/odex30_account_followup/tests/__init__.py
new file mode 100644
index 0000000..bd8f67d
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_followup/tests/__init__.py
@@ -0,0 +1,5 @@
+# -*- coding: utf-8 -*-
+
+from . import common
+from . import test_account_followup
+from . import test_followup_report
diff --git a/dev_odex30_accounting/odex30_account_followup/tests/common.py b/dev_odex30_accounting/odex30_account_followup/tests/common.py
new file mode 100644
index 0000000..4ee50a1
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_followup/tests/common.py
@@ -0,0 +1,14 @@
+from odoo.addons.account.tests.common import AccountTestInvoicingCommon
+
+
+class TestAccountFollowupCommon(AccountTestInvoicingCommon):
+    def assertPartnerFollowup(self, partner, status, line):
+        partner.invalidate_recordset(['followup_status', 'followup_line_id'])
+        # Since we are querying multiple times with data changes in the same transaction (for the purpose of tests),
+        # we need to invalidated the cache in database
+        self.env.cr.cache.pop('res_partner_all_followup', None)
+        res = partner._query_followup_data()
+        self.assertEqual(res.get(partner.id, {}).get('followup_status'), status)
+        self.assertEqual(res.get(partner.id, {}).get('followup_line_id'), line.id if line else None)
+        self.assertEqual(partner.followup_status, status or 'no_action_needed')
+        self.assertEqual(partner.followup_line_id.id if partner.followup_line_id else None, line.id if line else None)
diff --git a/dev_odex30_accounting/odex30_account_followup/tests/test_account_followup.py b/dev_odex30_accounting/odex30_account_followup/tests/test_account_followup.py
new file mode 100644
index 0000000..df72c8b
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_followup/tests/test_account_followup.py
@@ -0,0 +1,530 @@
+# -*- coding: utf-8 -*-
+from unittest.mock import patch
+from freezegun import freeze_time
+from odoo import Command, fields
+from odoo.tests import tagged
+from odoo.addons.odex30_account_followup.tests.common import TestAccountFollowupCommon
+from odoo.addons.mail.tests.common import MailCommon
+from dateutil.relativedelta import relativedelta
+
+
+@tagged('post_install', '-at_install')
+class TestAccountFollowupReports(TestAccountFollowupCommon, MailCommon):
+
+    @classmethod
+    def setUpClass(cls):
+        super().setUpClass()
+        cls.env['account_followup.followup.line'].search([]).unlink()
+
+        wkhtmltopdf_patcher = patch.object(
+            cls.env.registry['ir.actions.report'],
+            '_run_wkhtmltopdf',
+            lambda *args, **kwargs: b"0"
+        )
+        wkhtmltopdf_patcher.start()
+        cls.addClassCleanup(wkhtmltopdf_patcher.stop)
+
+    def create_followup(self, delay):
+        return self.env['account_followup.followup.line'].create({
+            'name': f'followup {delay}',
+            'delay': delay,
+            'send_email': False,
+            'company_id': self.company_data['company'].id
+        })
+
+    def create_invoice(self, date, partner = None):
+        invoice = self.env['account.move'].create({
+            'move_type': 'out_invoice',
+            'invoice_date': date,
+            'invoice_date_due': date,
+            'partner_id': partner.id if partner else self.partner_a.id,
+            'invoice_line_ids': [Command.create({
+                'quantity': 1,
+                'price_unit': 500,
+                'tax_ids': [],
+            })]
+        })
+        invoice.action_post()
+        return invoice
+
+    def test_followup_responsible(self):
+        """
+        Test that the responsible is correctly set
+        """
+        self.first_followup_line = self.create_followup(delay=-10)
+
+        user1 = self.env['res.users'].create({
+            'name': 'A User',
+            'login': 'a_user',
+            'email': 'a@user.com',
+            'groups_id': [(6, 0, [self.env.ref('account.group_account_user').id])]
+        })
+        user2 = self.env['res.users'].create({
+            'name': 'Another User',
+            'login': 'another_user',
+            'email': 'another@user.com',
+            'groups_id': [(6, 0, [self.env.ref('account.group_account_user').id])]
+        })
+        # 1- no info, use current user
+        self.assertEqual(self.partner_a._get_followup_responsible(), self.env.user)
+
+        # 2- set invoice user
+        invoice1 = self.init_invoice('out_invoice', partner=self.partner_a,
+                                     invoice_date=fields.Date.from_string('2000-01-01'),
+                                     amounts=[2000])
+        invoice2 = self.init_invoice('out_invoice', partner=self.partner_a,
+                                     invoice_date=fields.Date.from_string('2000-01-01'),
+                                     amounts=[1000])
+        invoice1.invoice_user_id = user1
+        invoice2.invoice_user_id = user2
+        (invoice1 + invoice2).action_post()
+        # Should pick invoice_user_id of the most delayed move, with highest residual amount in case of tie (invoice1)
+        self.assertEqual(self.partner_a._get_followup_responsible(), user1)
+        # If user1 is archived, it shouldn't be selected as responsible
+        user1.active = False
+        self.assertEqual(self.partner_a._get_followup_responsible(), self.env.user)
+        user1.active = True
+
+        self.partner_a.followup_line_id = self.first_followup_line
+
+        # 3- A followup responsible user has been set on the partner
+        self.partner_a.followup_responsible_id = user2
+        self.assertEqual(self.partner_a._get_followup_responsible(), user2)
+
+        # 4- Modify the default responsible on followup level
+        self.partner_a.followup_line_id.activity_default_responsible_type = 'salesperson'
+        self.assertEqual(self.partner_a._get_followup_responsible(), user1)
+
+        self.partner_a.followup_line_id.activity_default_responsible_type = 'account_manager'
+        self.partner_a.user_id = user2
+        self.assertEqual(self.partner_a._get_followup_responsible(), self.partner_a.user_id)
+
+    def test_followup_line_and_status(self):
+        self.first_followup_line = self.create_followup(delay=-10)
+        self.second_followup_line = self.create_followup(delay=10)
+        self.third_followup_line = self.create_followup(delay=15)
+
+        self.create_invoice('2022-01-02')
+
+        with freeze_time('2021-12-20'):
+            # Today < due date + delay first followup level (negative delay -> reminder before due date)
+            self.assertPartnerFollowup(self.partner_a, 'no_action_needed', self.first_followup_line)
+
+        with freeze_time('2021-12-24'):
+            # Today = due date + delay first followup level
+            self.assertPartnerFollowup(self.partner_a, 'in_need_of_action', self.first_followup_line)
+
+            # followup_next_action_date not exceeded but no invoice is overdue,
+            # we should not be in status 'with_overdue_invoices' but 'no action needed'
+            self.partner_a.followup_next_action_date = fields.Date.from_string('2021-12-25')
+            self.assertPartnerFollowup(self.partner_a, 'no_action_needed', self.first_followup_line)
+
+        with freeze_time('2022-01-13'):
+            # Today > due date + delay second followup level but first followup level not processed yet
+            self.assertPartnerFollowup(self.partner_a, 'in_need_of_action', self.first_followup_line)
+
+            self.partner_a._execute_followup_partner(options={'snailmail': False})
+            # Due date exceeded but first followup level processed
+            # followup_next_action_date set in 20 days (delay 2nd level - delay 1st level = 10 - (-10) = 20)
+            self.assertPartnerFollowup(self.partner_a, 'with_overdue_invoices', self.second_followup_line)
+            self.assertEqual(self.partner_a.followup_next_action_date, fields.Date.from_string('2022-02-02'))
+
+        with freeze_time('2022-02-03'):
+            # followup_next_action_date exceeded and invoice not reconciled yet
+            self.assertPartnerFollowup(self.partner_a, 'in_need_of_action', self.second_followup_line)
+            # execute second followup
+            self.partner_a._execute_followup_partner(options={'snailmail': False})
+            self.assertPartnerFollowup(self.partner_a, 'with_overdue_invoices', self.third_followup_line)
+            self.assertEqual(self.partner_a.followup_next_action_date, fields.Date.from_string('2022-02-08'))
+
+        with freeze_time('2022-02-09'):
+            # followup_next_action_date exceeded and invoice not reconciled yet
+            self.assertPartnerFollowup(self.partner_a, 'in_need_of_action', self.third_followup_line)
+            # execute third followup
+            self.partner_a._execute_followup_partner(options={'snailmail': False})
+            self.assertPartnerFollowup(self.partner_a, 'with_overdue_invoices', self.third_followup_line)
+            self.assertEqual(self.partner_a.followup_next_action_date, fields.Date.from_string('2022-02-14'))
+
+        with freeze_time('2022-02-15'):
+            # followup_next_action_date exceeded and invoice not reconciled yet
+            self.assertPartnerFollowup(self.partner_a, 'with_overdue_invoices', self.third_followup_line)
+            # executing the third followup again should do nothing as all the aml are linked to it
+            followup_executed = self.partner_a._execute_followup_partner(options={'snailmail': False})
+            self.assertFalse(followup_executed)
+
+            # create a new overdue invoice
+            self.create_invoice('2022-01-03')
+            self.assertPartnerFollowup(self.partner_a, 'in_need_of_action', self.third_followup_line)
+            # the third followup should be executed
+            followup_executed = self.partner_a._execute_followup_partner(options={'snailmail': False})
+            self.assertTrue(followup_executed)
+            self.assertEqual(self.partner_a.followup_next_action_date, fields.Date.from_string('2022-02-20'))
+
+            self.env['account.payment.register'].create({
+                'line_ids': self.partner_a.unreconciled_aml_ids,
+            })._create_payments()
+            self.assertPartnerFollowup(self.partner_a, None, None)
+
+    def test_followup_multiple_invoices(self):
+        followup_10 = self.create_followup(delay=10)
+        followup_15 = self.create_followup(delay=15)
+        followup_30 = self.create_followup(delay=30)
+
+        self.create_invoice('2022-01-01')
+        self.create_invoice('2022-01-02')
+
+        # 9 days are not passed yet for the first followup level, current delay is 10-0=10
+        with freeze_time('2022-01-10'):
+            self.assertPartnerFollowup(self.partner_a, 'with_overdue_invoices', followup_10)
+
+        # 10 days passed, current delay is 10-0=10, need to take action
+        with freeze_time('2022-01-11'):
+            self.assertPartnerFollowup(self.partner_a, 'in_need_of_action', followup_10)
+            self.partner_a._execute_followup_partner(options={'snailmail': False})
+            self.assertPartnerFollowup(self.partner_a, 'with_overdue_invoices', followup_15)
+
+        # action taken 4 days ago, current delay is 15-10=5, nothing needed
+        with freeze_time('2022-01-15'):
+            self.assertPartnerFollowup(self.partner_a, 'with_overdue_invoices', followup_15)
+
+        # action taken 5 days ago, current delay is 15-10=5, need to take action
+        with freeze_time('2022-01-16'):
+            self.assertPartnerFollowup(self.partner_a, 'in_need_of_action', followup_15)
+            self.partner_a._execute_followup_partner(options={'snailmail': False})
+            self.assertPartnerFollowup(self.partner_a, 'with_overdue_invoices', followup_30)
+
+        # action taken 14 days ago, current delay is 30-15=15, nothing needed
+        with freeze_time('2022-01-30'):
+            self.assertPartnerFollowup(self.partner_a, 'with_overdue_invoices', followup_30)
+
+        # action taken 15 days ago, current delay is 30-15=15, need to take action
+        with freeze_time('2022-01-31'):
+            self.assertPartnerFollowup(self.partner_a, 'in_need_of_action', followup_30)
+            self.partner_a._execute_followup_partner(options={'snailmail': False})
+            self.assertPartnerFollowup(self.partner_a, 'with_overdue_invoices', followup_30)
+
+        # action taken 13 days ago, current delay is 15 (same on repeat), nothing needed
+        with freeze_time('2022-02-14'):
+            self.assertPartnerFollowup(self.partner_a, 'with_overdue_invoices', followup_30)
+
+        # action taken 14 days ago, current delay is 15 (same on repeat), need to take action
+        with freeze_time('2022-02-15'):
+            self.assertPartnerFollowup(self.partner_a, 'in_need_of_action', followup_30)
+            self.partner_a._execute_followup_partner(options={'snailmail': False})
+            self.assertPartnerFollowup(self.partner_a, 'with_overdue_invoices', followup_30)
+
+    def test_followup_multiple_invoices_with_first_payment(self):
+        # Test the behavior of multiple invoices when the first one is paid
+        followup_10 = self.create_followup(delay=10)
+        followup_15 = self.create_followup(delay=15)
+
+        invoice_01 = self.create_invoice('2022-01-01')
+        self.create_invoice('2022-01-02')
+
+        # 9 days are not passed yet for the first followup level, current delay is 10-0=10
+        with freeze_time('2022-01-10'):
+            self.assertPartnerFollowup(self.partner_a, 'with_overdue_invoices', followup_10)
+
+        # 10 days passed, current delay is 10-0=10, need to take action
+        with freeze_time('2022-01-11'):
+            self.assertPartnerFollowup(self.partner_a, 'in_need_of_action', followup_10)
+            # followup level for the second invoice shouldn't change since it's only 9 days overdue
+            self.partner_a._execute_followup_partner(options={'snailmail': False})
+            self.assertPartnerFollowup(self.partner_a, 'with_overdue_invoices', followup_15)
+
+            self.env['account.payment.register'].create({
+                'line_ids': invoice_01.line_ids.filtered(lambda l: l.display_type == 'payment_term'),
+            })._create_payments()
+
+            # partner followup level goes back to 10 days after paying the first invoice
+            self.assertPartnerFollowup(self.partner_a, 'with_overdue_invoices', followup_10)
+
+        # action taken 4 days ago, current delay is 15-10=5, nothing needed
+        with freeze_time('2022-01-15'):
+            self.assertPartnerFollowup(self.partner_a, 'with_overdue_invoices', followup_10)
+
+        # action taken 5 days ago, current delay is 15-10=5, need to take action
+        with freeze_time('2022-01-16'):
+            self.assertPartnerFollowup(self.partner_a, 'in_need_of_action', followup_10)
+            self.partner_a._execute_followup_partner(options={'snailmail': False})
+            self.assertPartnerFollowup(self.partner_a, 'with_overdue_invoices', followup_15)
+
+    def test_followup_multiple_invoices_with_last_payment(self):
+        # Test the behavior of multiple invoices when the last one is paid
+        # Should behave exactly like test_followup_multiple_invoices_with_first_payment
+        # because the followup is done at the same time.
+        followup_10 = self.create_followup(delay=10)
+        followup_15 = self.create_followup(delay=15)
+        followup_30 = self.create_followup(delay=30)
+
+        self.create_invoice('2022-01-01')
+        invoice_02 = self.create_invoice('2022-01-02')
+
+        # 9 days are not passed yet for the first followup level, current delay is 10-0=10
+        with freeze_time('2022-01-10'):
+            self.assertPartnerFollowup(self.partner_a, 'with_overdue_invoices', followup_10)
+
+        # 10 days passed, current delay is 10-0=10, need to take action
+        with freeze_time('2022-01-11'):
+            self.assertPartnerFollowup(self.partner_a, 'in_need_of_action', followup_10)
+            self.partner_a._execute_followup_partner(options={'snailmail': False})
+            self.assertPartnerFollowup(self.partner_a, 'with_overdue_invoices', followup_15)
+
+            self.env['account.payment.register'].create({
+                'line_ids': invoice_02.line_ids.filtered(lambda l: l.display_type == 'payment_term'),
+            })._create_payments()
+
+            self.assertPartnerFollowup(self.partner_a, 'with_overdue_invoices', followup_15)
+
+        # action taken 4 days ago, current delay is 15-10=5, nothing needed
+        with freeze_time('2022-01-15'):
+            self.assertPartnerFollowup(self.partner_a, 'with_overdue_invoices', followup_15)
+
+        # action taken 5 days ago, current delay is 15-10=5, need to take action
+        with freeze_time('2022-01-16'):
+            self.assertPartnerFollowup(self.partner_a, 'in_need_of_action', followup_15)
+            self.partner_a._execute_followup_partner(options={'snailmail': False})
+            self.assertPartnerFollowup(self.partner_a, 'with_overdue_invoices', followup_30)
+
+    def test_followup_status_entry_lines(self):
+        """
+            Creating an entry should not affect the followups as there is no concept of due date with this flow.
+        """
+        self.followup_line = self.create_followup(delay=10)
+
+        with freeze_time('2022-01-02'):
+            invoice = self.env['account.move'].create({
+                'move_type': 'entry',
+                'date': fields.Date.from_string('2022-01-02'),
+                'partner_id': self.partner_a.id,
+                'invoice_line_ids': [
+                    Command.create({
+                        'name': 'line1',
+                        'account_id': self.company_data['default_account_revenue'].id,
+                        'debit': 500.0,
+                        'credit': 0.0,
+                    }),
+                    Command.create({
+                        'name': 'counterpart line',
+                        'account_id': self.company_data['default_account_receivable'].id,
+                        'debit': 0.0,
+                        'credit': 500.0,
+                    })
+                ]
+            })
+            invoice.action_post()
+
+        with freeze_time('2022-01-13'):
+            self.assertPartnerFollowup(self.partner_a, 'no_action_needed', self.followup_line)
+
+    def test_followup_contacts(self):
+        followup_contacts = self.partner_a._get_all_followup_contacts()
+        billing_contact = self.env['res.partner'].browse(self.partner_a.address_get(['invoice'])['invoice'])
+        self.assertEqual(billing_contact, followup_contacts)
+
+        followup_partner_1 = self.env['res.partner'].create({
+            'name': 'followup partner 1',
+            'parent_id': self.partner_a.id,
+            'type': 'followup',
+        })
+        followup_partner_2 = self.env['res.partner'].create({
+            'name': 'followup partner 2',
+            'parent_id': self.partner_a.id,
+            'type': 'followup',
+        })
+        expected_partners = followup_partner_1 + followup_partner_2
+        followup_contacts = self.partner_a._get_all_followup_contacts()
+        self.assertEqual(expected_partners, followup_contacts)
+
+    def test_followup_cron(self):
+        cron = self.env.ref('account_followup.ir_cron_auto_post_draft_entry')
+        followup_10 = self.create_followup(delay=10)
+        followup_10.auto_execute = True
+
+        self.create_invoice('2022-01-01')
+
+        # Check that no followup is automatically done if there is no action needed
+        with freeze_time('2022-01-10'), patch.object(type(self.env['res.partner']), '_send_followup') as patched:
+            self.assertPartnerFollowup(self.partner_a, 'with_overdue_invoices', followup_10)
+            cron.method_direct_trigger()
+            patched.assert_not_called()
+            self.assertPartnerFollowup(self.partner_a, 'with_overdue_invoices', followup_10)
+
+        # Check that the action is taken one and only one time when there is an action needed
+        with freeze_time('2022-01-11'), patch.object(type(self.env['res.partner']), '_send_followup') as patched:
+            self.assertPartnerFollowup(self.partner_a, 'in_need_of_action', followup_10)
+            cron.method_direct_trigger()
+            patched.assert_called_once()
+            self.assertPartnerFollowup(self.partner_a, 'with_overdue_invoices', followup_10)
+
+    def test_onchange_residual_amount(self):
+        '''
+        Test residual onchange on account move lines: the residual amount is
+        computed using an sql query. This test makes sure the computation also
+        works properly during onchange (on records having a NewId).
+        '''
+        invoice = self.create_invoice('2016-01-01')
+        self.create_invoice('2016-01-02')
+
+        self.env['account.payment.register'].with_context(active_ids=invoice.ids, active_model='account.move').create({
+            'payment_date': invoice.date,
+            'amount': 100,
+        })._create_payments()
+
+        self.assertRecordValues(self.partner_a, [{'total_due': 900.0}])
+        self.assertRecordValues(self.partner_a.unreconciled_aml_ids.sorted(), [
+            {'amount_residual_currency': 500.0},
+            {'amount_residual_currency': 400.0},
+        ])
+
+        self.assertRecordValues(self.partner_a.unreconciled_aml_ids.sorted(), [
+            {'amount_residual_currency': 500.0},
+            {'amount_residual_currency': 400.0},
+        ])
+
+    def test_compute_total_due(self):
+        self.create_invoice('2016-01-01')
+        self.create_invoice('2017-01-01')
+        self.create_invoice(fields.Date.today() + relativedelta(months=1))
+        self.env['account.move'].create([{
+            'move_type': 'in_invoice',
+            'invoice_date': date,
+            'partner_id': self.partner_a.id,
+            'invoice_line_ids': [Command.create({
+                'quantity': 1,
+                'price_unit': 500,
+                'tax_ids': [],
+            })]
+        } for date in ('2016-01-01', '2017-01-01', fields.Date.today() + relativedelta(months=1))]).action_post()
+
+        self.assertRecordValues(self.partner_a, [{
+            'total_due': 1500.0,
+            'total_overdue': 1000.0,
+            'total_all_due': 0.0,
+            'total_all_overdue': 0.0,
+        }])
+
+    def test_send_followup_no_due_date(self):
+        """
+        test sending a followup report with an empty due date field
+        """
+        self.create_followup(delay=0)
+        self.create_invoice('2022-01-01')
+        self.partner_a.unreconciled_aml_ids.write({
+            'date_maturity': False,
+        })
+
+        self.partner_a._execute_followup_partner(options={
+            'partner_id': self.partner_a.id,
+            'manual_followup': True,
+            'snailmail': False,
+        })
+
+    def test_followup_copy_data(self):
+        """
+        Test followup report by:
+        - Duplicating a single record with no default
+        - Duplicating several records at the same time
+        """
+        followup_50 = self.create_followup(delay=50)
+        followup_60 = self.create_followup(delay=60)
+
+        # Duplicate single record with no default values
+        followup_50_duplicate = followup_50.copy()
+        self.assertTrue(followup_50_duplicate)
+        self.assertEqual(followup_50_duplicate.name, f'75 days (copy of {followup_50.name})')
+
+        # Duplicate multiple records at the same time with no default values
+        multiple_followup_records = followup_50 + followup_60
+        multiple_followup_records_duplicate = multiple_followup_records.copy()
+        self.assertTrue(multiple_followup_records_duplicate)
+        self.assertEqual(multiple_followup_records_duplicate[0].name, f'90 days (copy of {followup_50.name})')
+        self.assertEqual(multiple_followup_records_duplicate[1].name, f'105 days (copy of {followup_60.name})')
+
+    def test_manual_reminder_get_template_mail_addresses(self):
+        """
+        When opening account_followup.manual_reminder, the partner should always be in `email_recipients_ids`
+        When adding a template, the template's partner_to, email_cc and email_to should be added to `email_recipient_ids` as well
+        """
+        mail_partner = self.env['res.partner'].create({
+            'name': 'Mai Lang',
+            'email': 'mail.ang@test.com',
+        })
+        mail_cc = self.env['res.partner'].create({
+            'name': 'John Carmac',
+            'email': 'john.carmac@example.me',
+        })
+
+        mail_template = self.env['mail.template'].create({
+            'name': 'reminder',
+            'model_id': self.env['ir.model']._get_id('res.partner'),
+            'email_cc': mail_cc.email,
+        })
+
+        reminder = self.env['account_followup.manual_reminder'].with_context(
+            active_model='res.partner',
+            active_ids=mail_partner.id,
+        ).create({'template_id': mail_template.id})
+
+        self.assertTrue(mail_partner in reminder.email_recipient_ids, "Mai Lang should be in the Email Recipients List")
+
+        reminder.template_id = mail_template
+
+        self.assertTrue(mail_cc in reminder.email_recipient_ids, "John Carmac should be in the Email Recipients list.")
+        self.assertTrue(mail_partner in reminder.email_recipient_ids, "Mai Lang should still be in the Email Recipients List")
+
+    def test_overdue_invoices_action_domain_includes_children_partners(self):
+        """
+        When checking overdue invoices for a company (partner), the action [action_open_overdue_entries] domain should also include
+        the overdue invoices of its children partners.
+        """
+
+        # Step 1: Create contacts
+        parent_contact = self.env['res.partner'].create({
+            'name': 'Parent Contact',
+            'is_company': True,
+        })
+        child_contact = self.env['res.partner'].create({
+            'name': 'Child Contact',
+            'parent_id': parent_contact.id,
+        })
+
+        # Step 2: Create an invoice for the child contact
+        invoice_date = fields.Date.today() - relativedelta(months=1)
+        invoice = self.create_invoice(invoice_date, child_contact)
+        invoice.invoice_date_due = invoice_date
+
+        # Step 3: Verify follow-up status and overdue invoices of the parent contact
+        action = parent_contact.action_open_overdue_entries()
+        overdue_invoices = self.env['account.move'].search(action['domain'])
+        self.assertIn(invoice.id, overdue_invoices.ids)
+        self.assertEqual(parent_contact.followup_status, 'with_overdue_invoices')
+
+    def test_followup_template_recipients_with_cron(self):
+        """
+        tests that when a mail_cc is defined on a template,
+        even if the action is ran from a cron (and de facto from `res.partner.send_followup_email`)
+        the email is correctly sent
+        Completes `test_manual_reminder_get_template_mail_addresses`
+        """
+        self.partner_a.email = "test@test.com"
+        mail_cc = self.env['res.partner'].create({
+            'name': 'John Carmac',
+            'email': 'john.carmac@example.me',
+        })
+        mail_template = self.env['mail.template'].create({
+            'name': 'reminder',
+            'model_id': self.env['ir.model']._get_id('res.partner'),
+            'email_cc': mail_cc.email,
+        })
+        followup_10 = self.create_followup(delay=10)
+        followup_10.mail_template_id = mail_template
+        self.create_invoice('2025-05-01')
+
+        with freeze_time('2025-05-12'), self.mock_mail_gateway(mail_unlink_sent=False):
+            options = {
+                'followup_line': followup_10,
+                'partner_id': self.partner_a.id,
+            }
+            self.partner_a.send_followup_email(options=options)
+        self.assertMailMail(mail_cc, 'sent', author=self.env.user.partner_id)
diff --git a/dev_odex30_accounting/odex30_account_followup/tests/test_followup_report.py b/dev_odex30_accounting/odex30_account_followup/tests/test_followup_report.py
new file mode 100644
index 0000000..d7b5331
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_followup/tests/test_followup_report.py
@@ -0,0 +1,1113 @@
+# -*- coding: utf-8 -*-
+from contextlib import contextmanager
+from freezegun import freeze_time
+from unittest.mock import patch
+
+from odoo.tests import Form, tagged
+from odoo.addons.odex30_account_reports.tests.common import TestAccountReportsCommon
+from odoo.addons.odex30_account_followup.tests.common import TestAccountFollowupCommon
+from odoo.tools.misc import file_open
+from odoo import Command, fields
+
+
+@tagged('post_install', '-at_install')
+class TestAccountFollowupReports(TestAccountReportsCommon, TestAccountFollowupCommon):
+
+    @classmethod
+    def setUpClass(cls):
+        super().setUpClass()
+
+        cls.partner_a.email = 'partner_a@mypartners.xyz'
+        cls.report = cls.env.ref('odex30_account_reports.followup_report')
+
+    def test_followup_report(self):
+        ''' Test report lines when printing the follow-up report. '''
+        # Init options.
+        report = self.env['account.followup.report']
+        options = {
+            'partner_id': self.partner_a.id,
+            'multi_currency': True,
+        }
+
+        # 2016-01-01: First invoice, partially paid.
+
+        invoice_1 = self.env['account.move'].create({
+            'move_type': 'out_invoice',
+            'invoice_date': '2016-01-01',
+            'partner_id': self.partner_a.id,
+            'invoice_line_ids': [Command.create({
+                'quantity': 1,
+                'price_unit': 500,
+                'tax_ids': [],
+            })]
+        })
+        invoice_1.action_post()
+
+        payment_1 = self.env['account.move'].create({
+            # pylint: disable=C0326
+            'move_type': 'entry',
+            'date': '2016-01-01',
+            'journal_id': self.company_data['default_journal_misc'].id,
+            'line_ids': [
+                (0, 0, {'debit': 0.0,       'credit': 200.0,    'account_id': self.company_data['default_account_receivable'].id}),
+                (0, 0, {'debit': 200.0,     'credit': 0.0,      'account_id': self.company_data['default_journal_bank'].default_account_id.id}),
+            ],
+        })
+        payment_1.action_post()
+
+        (payment_1 + invoice_1).line_ids\
+            .filtered(lambda line: line.account_id == self.company_data['default_account_receivable'])\
+            .reconcile()
+
+        with freeze_time('2016-01-01'):
+            self.assertLinesValues(
+                # pylint: disable=C0326
+                report._get_followup_report_lines(options),
+                #   Name                                    Date,           Due Date,       Doc.      Total Due
+                [   0,                                      1,              2,              3,        5],
+                [
+                    ('INV/2016/00001',                      '01/01/2016',   '01/01/2016',   '',       300.0),
+                    ('',                                    '',             '',             '',       300.0),
+                ],
+                options,
+            )
+
+        # 2016-01-05: Credit note due at 2016-01-10.
+
+        invoice_2 = self.env['account.move'].create({
+            'move_type': 'out_refund',
+            'invoice_date': '2016-01-05',
+            'invoice_date_due': '2016-01-10',
+            'partner_id': self.partner_a.id,
+            'invoice_payment_term_id': False,
+            'invoice_line_ids': [Command.create({
+                'quantity': 1,
+                'price_unit': 200,
+                'tax_ids': [],
+            })]
+        })
+        invoice_2.action_post()
+
+        with freeze_time('2016-01-05'):
+            self.assertLinesValues(
+                # pylint: disable=C0326
+                report._get_followup_report_lines(options),
+                #   Name                                    Date,           Due Date,       Doc.      Total Due
+                [   0,                                      1,              2,              3,        5],
+                [
+                    ('RINV/2016/00001',                     '01/05/2016',   '01/10/2016',   '',      -200.0),
+                    ('INV/2016/00001',                      '01/01/2016',   '01/01/2016',   '',       300.0),
+                    ('',                                    '',             '',             '',       100.0),
+                    ('',                                    '',             '',             '',       300.0),
+                ],
+                options,
+            )
+
+        # 2016-01-15: Draft invoice + previous credit note reached the date_maturity + first invoice reached the delay
+        # of the first followup level.
+
+        self.env['account.move'].create({
+            'move_type': 'out_refund',
+            'invoice_date': '2016-01-15',
+            'partner_id': self.partner_a.id,
+            'invoice_line_ids': [Command.create({
+                'quantity': 1,
+                'price_unit': 1000,
+                'tax_ids': [],
+            })]
+        })
+
+        with freeze_time('2016-01-15'):
+            self.assertLinesValues(
+                # pylint: disable=C0326
+                report._get_followup_report_lines(options),
+                #   Name                                    Date,           Due Date,       Doc.      Total Due
+                [   0,                                      1,              2,              3,        5],
+                [
+                    ('RINV/2016/00001',                     '01/05/2016',   '01/10/2016',   '',      -200.0),
+                    ('INV/2016/00001',                      '01/01/2016',   '01/01/2016',   '',       300.0),
+                    ('',                                    '',             '',             '',       100.0),
+                    ('',                                    '',             '',             '',       100.0),
+                ],
+                options,
+            )
+
+        # Trigger the followup report notice.
+
+        invoice_attachments = self.env['ir.attachment']
+        for invoice in invoice_1 + invoice_2:
+            invoice_attachment = self.env['ir.attachment'].create({
+                'name': 'some_attachment.pdf',
+                'res_id': invoice.id,
+                'res_model': 'account.move',
+                'datas': 'test',
+                'type': 'binary',
+            })
+            invoice_attachments += invoice_attachment
+            invoice._message_set_main_attachment_id(invoice_attachment)
+
+        self.partner_a._compute_unpaid_invoices()
+        options.update(
+            attachment_ids=invoice_attachments.ids,
+            email=True,
+            manual_followup=True,
+            join_invoices=True,
+        )
+        with patch.object(type(self.env['mail.mail']), 'unlink', lambda self: None):
+            with patch.object(self.env.registry['account.report'], 'export_to_pdf', autospec=True, side_effect=lambda *args, **kwargs: {'file_name': 'fake_partner_ledger.pdf', 'file_content': b'', 'file_type': 'pdf'}):
+                self.partner_a.execute_followup(options)
+        sent_attachments = self.env['mail.message'].search([('partner_ids', '=', self.partner_a.id)]).attachment_ids
+        self.assertEqual(sent_attachments.mapped('name'), ['some_attachment.pdf', 'some_attachment.pdf', f'{self.partner_a.name} - fake_partner_ledger.pdf'])
+
+        options.update(
+            attachment_ids=[],
+            email=False,
+            join_invoices=False,
+        )
+        with (
+            patch.object(self.env.registry['mail.mail'], 'unlink', lambda self: None),
+            patch.object(
+                self.env.registry['res.partner'],
+                '_get_partner_account_report_attachment',
+                autospec=True,
+                side_effect=lambda *args, **kwargs: invoice_attachments[0],
+            ),
+        ):
+            self.partner_a.execute_followup(options)
+        self.assertEqual(options['attachment_ids'], [invoice_attachments.ids[0]], "The report attachment should be included regardless of join_invoices and email checkboxes.")
+
+        attachaments_domain = [('attachment_ids', '=', attachment.id) for attachment in invoice_attachments]
+        mail = self.env['mail.mail'].search([('recipient_ids', '=', self.partner_a.id)] + attachaments_domain)
+        self.assertTrue(mail, "A payment reminder email should have been sent.")
+
+    def test_followup_report_journal_option_disabled(self):
+        options = {
+            'partner_id': self.partner_a.id,
+            'manual_followup': True,
+        }
+
+        self.report.filter_journals = False
+        with patch.object(self.env.registry['account.report'], 'export_to_pdf', autospec=True, side_effect=lambda *args, **kwargs: {'file_name': 'fake_partner_ledger.pdf', 'file_content': b'', 'file_type': 'pdf'}):
+            self.partner_a.execute_followup(options)
+
+    def test_followup_lines_branches(self):
+        branch = self.env['res.company'].create({
+            'name': 'branch',
+            'parent_id': self.env.company.id
+        })
+        self.cr.precommit.run()  # load the COA
+
+        report = self.env['account.followup.report']
+        options = {
+            'partner_id': self.partner_a.id,
+        }
+
+        invoice = self.env['account.move'].create({
+            'move_type': 'out_invoice',
+            'invoice_date': '2016-01-01',
+            'partner_id': self.partner_a.id,
+            'company_id': branch.id,
+            'invoice_payment_term_id': self.pay_terms_a.id,
+            'invoice_line_ids': [Command.create({
+                'quantity': 1,
+                'price_unit': 500,
+                'tax_ids': [],
+            })]
+        })
+        invoice.action_post()
+
+        self.assertLinesValues(
+            # pylint: disable=C0326
+            report._get_followup_report_lines(options),
+            #   Name                                    Date,           Due Date,       Doc.      Total Due
+            [   0,                                      1,              2,              3,        5],
+            [
+                ('INV/2016/00001',                      '01/01/2016',   '01/01/2016',   '',       '$\xa0500.00'),
+                ('',                                    '',             '',             '',       '$\xa0500.00'),
+                ('',                                    '',             '',             '',       '$\xa0500.00'),
+            ],
+            options,
+        )
+
+    def test_followup_report_address_1(self):
+        ''' Test child contact priorities: the company will be used when there is no followup or billing contacts
+        '''
+
+        Partner = self.env['res.partner']
+        self.partner_a.is_company = True
+        options = {
+            'partner_id': self.partner_a.id,
+        }
+
+        child_partner = Partner.create({
+            'name': "Child contact",
+            'type': "contact",
+            'parent_id': self.partner_a.id,
+        })
+
+        mail = self.env['mail.mail'].search([('recipient_ids', '=', self.partner_a.id)])
+        self.init_invoice('out_invoice', partner=child_partner, invoice_date='2016-01-01', amounts=[500], post=True)
+        self.partner_a._compute_unpaid_invoices()
+        with patch.object(type(self.env['mail.mail']), 'unlink', lambda self: None):
+            with patch.object(self.env.registry['account.report'], 'export_to_pdf', autospec=True, side_effect=lambda *args, **kwargs: {'file_name': 'fake_partner_ledger.pdf', 'file_content': b'', 'file_type': 'pdf'}):
+                self.env['account.followup.report']._send_email(options)
+
+        mail = self.env['mail.mail'].search([('recipient_ids', '=', self.partner_a.id)])
+        self.assertTrue(mail, "The payment reminder email should have been sent to the company.")
+
+    def test_followup_report_address_2(self):
+        ''' Test child contact priorities: the follow up contact will be preferred over the billing contact
+        '''
+
+        Partner = self.env['res.partner']
+        self.partner_a.is_company = True
+        options = {
+            'partner_id': self.partner_a.id,
+        }
+
+        # Testing followup sent to billing address if used in invoice
+
+        child_partner = Partner.create({
+            'name': "Child contact",
+            'type': "contact",
+            'parent_id': self.partner_a.id,
+        })
+        invoice_partner = Partner.create({
+            'name' : "Child contact invoice",
+            'type' : "invoice",
+            'email' : "test-invoice@example.com",
+            'parent_id': child_partner.id,
+        })
+
+        self.init_invoice('out_invoice', partner=invoice_partner, invoice_date='2016-01-01', amounts=[500], post=True)
+
+        self.partner_a._compute_unpaid_invoices()
+        with patch.object(type(self.env['mail.mail']), 'unlink', lambda self: None):
+            with patch.object(self.env.registry['account.report'], 'export_to_pdf', autospec=True, side_effect=lambda *args, **kwargs: {'file_name': 'fake_partner_ledger.pdf', 'file_content': b'', 'file_type': 'pdf'}):
+                self.env['account.followup.report']._send_email(options)
+
+        mail = self.env['mail.mail'].search([('recipient_ids', '=', invoice_partner.id)])
+        self.assertTrue(mail, "The payment reminder email should have been sent to the invoice partner.")
+        mail.unlink()
+
+        # Testing followup partner priority
+
+        followup_partner = Partner.create({
+            'name' : "Child contact followup",
+            'type' : "followup",
+            'email' : "test-followup@example.com",
+            'parent_id': self.partner_a.id,
+        })
+
+        self.partner_a._compute_unpaid_invoices()
+        with patch.object(type(self.env['mail.mail']), 'unlink', lambda self: None):
+            with patch.object(self.env.registry['account.report'], 'export_to_pdf', autospec=True, side_effect=lambda *args, **kwargs: {'file_name': 'fake_partner_ledger.pdf', 'file_content': b'', 'file_type': 'pdf'}):
+                self.env['account.followup.report']._send_email(options)
+
+        mail = self.env['mail.mail'].search([('recipient_ids', '=', followup_partner.id)])
+        self.assertTrue(mail, "The payment reminder email should have been sent to the followup partner.")
+
+    def test_followup_invoice_no_amount(self):
+        # Init options.
+        report = self.env['account.followup.report']
+        options = {
+            'partner_id': self.partner_a.id,
+        }
+
+        invoice_move = self.env['account.move'].create({
+            'move_type': 'out_invoice',
+            'partner_id': self.partner_a.id,
+            'date': '2022-01-01',
+            'invoice_line_ids': [
+                (0, 0, {'quantity': 0, 'price_unit': 30}),
+            ],
+        })
+        invoice_move.action_post()
+
+        lines = report._get_followup_report_lines(options)
+        self.assertEqual(len(lines), 0, "There should be no line displayed")
+
+    def test_negative_followup_report(self):
+        ''' Test negative or null followup reports: if a contact has an overdue invoice but has a negative of null total due, no action is needed.
+        '''
+        followup_line = self.env['account_followup.followup.line'].create({
+            'company_id': self.env.company.id,
+            'name': 'First Reminder',
+            'delay': 15,
+            'send_email': False,
+        })
+        self.env['account.move'].create({
+            'move_type': 'out_invoice',
+            'invoice_date': '2016-01-01',
+            'partner_id': self.partner_a.id,
+            'invoice_line_ids': [Command.create({
+                'quantity': 1,
+                'price_unit': 500,
+                'tax_ids': [],
+            })]
+        }).action_post()
+
+        self.env['account.move'].create({
+            'move_type': 'out_refund',
+            'invoice_date': '2016-01-15',
+            'partner_id': self.partner_a.id,
+            'invoice_line_ids': [Command.create({
+                'quantity': 1,
+                'price_unit': 300,
+                'tax_ids': [],
+            })]
+        }).action_post()
+        self.assertEqual(self.partner_a.total_due, 200)
+        self.assertPartnerFollowup(self.partner_a, 'in_need_of_action', followup_line)
+
+        self.env['account.payment'].create({
+            'partner_id': self.partner_a.id,
+            'amount': 400,
+        }).action_post()
+        self.assertEqual(self.partner_a.total_due, -200)
+        self.assertPartnerFollowup(self.partner_a, 'no_action_needed', followup_line)
+
+    def test_followup_report_style(self):
+        """
+            This report is often broken in terms of styling, this test will check the styling of the lines.
+            (This test will not work if we modify the template it self)
+        """
+        report = self.env['account.followup.report']
+        options = {
+            'partner_id': self.partner_a.id,
+            'multi_currency': True,
+        }
+
+        # 2016-01-01: First invoice, partially paid.
+
+        invoice_1 = self.env['account.move'].create({
+            'move_type': 'out_invoice',
+            'invoice_date': '2016-01-01',
+            'partner_id': self.partner_a.id,
+            'invoice_line_ids': [Command.create({
+                'quantity': 1,
+                'price_unit': 500,
+                'tax_ids': [],
+            })]
+        })
+        invoice_1.action_post()
+
+        payment_1 = self.env['account.move'].create({
+            'move_type': 'entry',
+            'date': '2016-01-01',
+            'journal_id': self.company_data['default_journal_misc'].id,
+            'line_ids': [
+                Command.create({
+                    'debit': 0.0,
+                    'credit': 200.0,
+                    'account_id': self.company_data['default_account_receivable'].id
+                }),
+                Command.create({
+                    'debit': 200.0,
+                    'credit': 0.0,
+                    'account_id': self.company_data['default_journal_bank'].default_account_id.id
+                }),
+            ],
+        })
+        payment_1.action_post()
+
+        (payment_1 + invoice_1).line_ids \
+            .filtered(lambda line: line.account_id == self.company_data['default_account_receivable']) \
+            .reconcile()
+
+        lines = report._get_followup_report_lines(options)
+        # The variable lines is composed of 3 lines, the line of the move and two lines of total (due and overdue)
+        # First line
+        line_0_style = [
+            'white-space:nowrap;text-align:left;',
+            'white-space:nowrap;text-align:left;color: red;',
+            'text-align:center; white-space:normal;',
+            'text-align:left; white-space:normal;',
+            'text-align:right; white-space:normal;',
+        ]
+        for expected_style, column in zip(line_0_style, lines[0]['columns']):
+            self.assertEqual(expected_style, column['style'])
+
+        # Second line
+        self.assertEqual(lines[1]['columns'][3].get('style'), 'text-align:right; white-space:normal; font-weight: bold;') # Total due title
+        self.assertEqual(lines[1]['columns'][4].get('style'), 'text-align:right; white-space:normal; font-weight: bold;') # Total due value
+
+        # Third line
+        self.assertEqual(lines[2]['columns'][3].get('style'), 'text-align:right; white-space:normal; font-weight: bold;')  # Total overdue title
+        self.assertEqual(lines[2]['columns'][4].get('style'), 'text-align:right; white-space:normal; font-weight: bold;')  # Total overdue value
+
+        # Check template used
+        for line in lines:
+            for column in line['columns']:
+                self.assertEqual(column['template'], 'account_followup.line_template')
+
+    def test_followup_send_email(self):
+        """ Tests that the email address in the mail.template is used to send the followup email."""
+        self.env['account.move'].create({
+            'move_type': 'out_invoice',
+            'invoice_date': '2016-01-01',
+            'partner_id': self.partner_a.id,
+            'invoice_line_ids': [Command.create({
+                'quantity': 1,
+                'price_unit': 500,
+                'tax_ids': [],
+            })]
+        }).action_post()
+
+        @contextmanager
+        def create_and_send_email(email_from, subject):
+            """ Create a mail.template, open the followup wizard and send the followup email."""
+            mail_template = self.env['mail.template'].create({
+                'name': "Payment Reminder",
+                'model_id': self.env.ref('base.model_res_partner').id,
+                'email_from': email_from,
+                'partner_to': '{{ object.id }}',
+                'subject': subject,
+            })
+            wizard = self.env['account_followup.manual_reminder'].with_context(
+                active_model='res.partner',
+                active_ids=self.partner_a.ids,
+            ).create({})
+            wizard.email = True  # tick the 'email' checkbox
+            wizard.template_id = mail_template
+            with patch.object(self.env.registry['account.report'], 'export_to_pdf', autospec=True, side_effect=lambda *args, **kwargs: {'file_name': 'fake_partner_ledger.pdf', 'file_content': b'', 'file_type': 'pdf'}):
+                wizard.process_followup()
+            yield
+            self.assertEqual(len(message), 1)
+            self.assertEqual(message.author_id, self.env.user.partner_id)
+
+        # case 1: the email_from is dynamically set
+        with create_and_send_email(
+            email_from="{{ object._get_followup_responsible().email_formatted }}",
+            subject="{{ (object.company_id or object._get_followup_responsible().company_id).name }} Pay me now !",
+        ):
+            message = self.env['mail.message'].search([('subject', 'like', "Pay me now !")])
+            self.assertEqual(message.email_from, self.env.user.partner_id.email_formatted)
+
+        # case 2: the email_from is hardcoded in the template
+        with create_and_send_email(
+            email_from="test@odoo.com",
+            subject="{{ (object.company_id or object._get_followup_responsible().company_id).name }} Pay me noooow !",
+        ):
+            message = self.env['mail.message'].search([('subject', 'like', "Pay me noooow !")])
+            self.assertEqual(message.email_from, "test@odoo.com")
+
+    def test_process_automatic_followup_send_email(self):
+        """ Tests that the email address in the mail.template is used to send the followup email from the cron."""
+        self.env['account_followup.followup.line'].create({
+            'company_id': self.env.company.id,
+            'name': 'First Reminder',
+            'delay': 15,
+            'send_email': True,
+        })
+        self.env['account.move'].create({
+            'move_type': 'out_invoice',
+            'invoice_date': '2016-01-01',
+            'partner_id': self.partner_a.id,
+            'invoice_line_ids': [Command.create({
+                'quantity': 1,
+                'price_unit': 500,
+                'tax_ids': [],
+            })]
+        }).action_post()
+
+        @contextmanager
+        def create_and_send_email(email_from, subject):
+            """ Create a mail.template, link it with the followup line and execute followups."""
+            mail_template = self.env['mail.template'].create({
+                'name': "Payment Reminder",
+                'model_id': self.env.ref('base.model_res_partner').id,
+                'email_from': email_from,
+                'partner_to': '{{ object.id }}',
+                'subject': subject,
+            })
+            self.partner_a.followup_line_id.mail_template_id = mail_template
+            self.partner_a.followup_next_action_date = False
+            with patch.object(self.env.registry['account.report'], 'export_to_pdf', autospec=True, side_effect=lambda *args, **kwargs: {'file_name': 'fake_partner_ledger.pdf', 'file_content': b'', 'file_type': 'pdf'}):
+                self.partner_a._execute_followup_partner(options={'snailmail': False})
+            yield
+            self.assertEqual(len(message), 1)
+            self.assertEqual(message.author_id, self.partner_a._get_followup_responsible().partner_id, "Automatic followups should have the followup responsible as the author.")
+
+        # case 1: the email_from is dynamically set
+        with create_and_send_email(
+            email_from="{{ object._get_followup_responsible().email_formatted }}",
+            subject="{{ (object.company_id or object._get_followup_responsible().company_id).name }} Pay me now !",
+        ):
+            message = self.env['mail.message'].search([('subject', 'like', "Pay me now !")])
+            self.assertEqual(message.email_from, self.env.user.partner_id.email_formatted)
+
+        # we have to create a new overdue invoice to test the second case as the previous invoice
+        # will no longer trigger the followup
+        self.env['account.move'].create({
+            'move_type': 'out_invoice',
+            'invoice_date': '2016-01-01',
+            'partner_id': self.partner_a.id,
+            'invoice_line_ids': [Command.create({
+                'quantity': 1,
+                'price_unit': 600,
+                'tax_ids': [],
+            })]
+        }).action_post()
+
+        # case 2: the email_from is hardcoded in the template
+        with create_and_send_email(
+            email_from="test@odoo.com",
+            subject="{{ (object.company_id or object._get_followup_responsible().company_id).name }} Pay me noooow !",
+        ):
+            message = self.env['mail.message'].search([('subject', 'like', "Pay me noooow !")])
+            self.assertEqual(message.email_from, "test@odoo.com")
+
+    def test_compute_render_model(self):
+        with Form(self.env['account_followup.manual_reminder'].with_context(
+            active_model='res.partner',
+            active_ids=self.partner_a.ids,
+        )) as wizard:
+            self.assertEqual(wizard.render_model, "res.partner")
+
+    def test_followup_report_with_levels_on_main_company(self):
+        cron = self.env.ref('account_followup.ir_cron_auto_post_draft_entry')
+
+        self.env['account_followup.followup.line'].create([{
+            'company_id': self.company_data['company'].id,
+            'name': 'First Reminder',
+            'delay': 15,
+            'send_email': True,
+            'auto_execute': True,
+        }, {
+            'company_id': self.company_data['company'].id,
+            'name': 'Second Reminder',
+            'delay': 30,
+            'send_email': True,
+            'auto_execute': True,
+        }])
+
+        self.env['account.move'].create({
+            'move_type': 'out_invoice',
+            'invoice_date': '2016-01-01',
+            'invoice_date_due': '2016-01-01',
+            'date': '2016-01-01',
+            'partner_id': self.partner_a.id,
+            'invoice_line_ids': [Command.create({
+                'quantity': 1,
+                'price_unit': 500,
+            })]
+        }).action_post()
+
+        with (
+            freeze_time('2022-01-10'),
+            patch.object(self.env.registry['res.partner'], '_send_followup') as patched,
+            patch.object(self.env.registry['ir.actions.report'], '_run_wkhtmltopdf', return_value=b"0")
+        ):
+            cron.method_direct_trigger()
+            # For the same reason we clear the cache in assertPartnerFollowup, to avoid this test change the state of the cache,
+            # which could break other tests.
+            self.env.cr.cache.pop('res_partner_all_followup', None)
+            self.assertEqual(patched.call_count, 1)
+
+        count_mail = self.env['mail.message'].search_count([('record_company_id', '=', self.company_data['company'].id)])
+        # We should have 1 email :
+        # 1 for the main company
+        self.assertEqual(count_mail, 1)
+
+    def test_followup_report_with_levels_on_one_branch(self):
+        cron = self.env.ref('account_followup.ir_cron_auto_post_draft_entry')
+
+        branch_a, branch_b = self.env['res.company'].create([{
+            'name': 'Branch number 1',
+            'parent_id': self.company_data['company'].id,
+        }, {
+            'name': 'Branch number 2',
+            'parent_id': self.company_data['company'].id,
+        }])
+
+        self.cr.precommit.run()  # load the COA
+
+        self.env['account_followup.followup.line'].create([{
+            'company_id': branch_a.id,
+            'name': 'First Reminder (A)',
+            'delay': 15,
+            'send_email': True,
+            'auto_execute': True,
+        }, {
+            'company_id': branch_a.id,
+            'name': 'Second Reminder (A)',
+            'delay': 30,
+            'send_email': True,
+            'auto_execute': True,
+        }])
+
+        self.env['account.move'].create([{
+            'move_type': 'out_invoice',
+            'invoice_date': '2016-01-01',
+            'invoice_date_due': '2016-01-01',
+            'date': '2016-01-01',
+            'partner_id': self.partner_a.id,
+            'company_id': branch_a.id,
+            'invoice_line_ids': [Command.create({
+                'quantity': 1,
+                'price_unit': 400,
+            })]
+        }, {
+            'move_type': 'out_invoice',
+            'invoice_date': '2016-01-01',
+            'invoice_date_due': '2016-01-01',
+            'date': '2016-01-01',
+            'partner_id': self.partner_a.id,
+            'company_id': branch_b.id,
+            'invoice_line_ids': [Command.create({
+                'quantity': 1,
+                'price_unit': 800,
+            })]
+        }]).action_post()
+
+        with (
+            freeze_time('2022-01-10'),
+            patch.object(self.env.registry['res.partner'], '_send_followup') as patched,
+            patch.object(self.env.registry['ir.actions.report'], '_run_wkhtmltopdf', return_value=b"0")
+        ):
+            cron.method_direct_trigger()
+            # For the same reason we clear the cache in assertPartnerFollowup, to avoid this test change the state of the cache,
+            # which could break other tests.
+            self.env.cr.cache.pop('res_partner_all_followup', None)
+            self.assertEqual(patched.call_count, 1)
+
+        count_mail = self.env['mail.message'].search_count([('record_company_id', '=', branch_a.id)])
+        # We should have 1 email :
+        # 1 for the Branch number 1
+        self.assertEqual(count_mail, 1)
+
+    def test_followup_report_with_levels_on_branches_and_main_company(self):
+        cron = self.env.ref('account_followup.ir_cron_auto_post_draft_entry')
+
+        branch_a, branch_b = self.env['res.company'].create([{
+            'name': 'Branch number 1',
+            'parent_id': self.company_data['company'].id,
+        }, {
+            'name': 'Branch number 2',
+            'parent_id': self.company_data['company'].id,
+        }])
+
+        self.cr.precommit.run()  # load the COA
+
+        self.env['account_followup.followup.line'].create([{
+            'company_id': branch_a.id,
+            'name': 'First Reminder (A)',
+            'delay': 15,
+            'send_email': True,
+            'auto_execute': True,
+        }, {
+            'company_id': branch_a.id,
+            'name': 'Second Reminder (A)',
+            'delay': 30,
+            'send_email': True,
+            'auto_execute': True,
+        }, {
+            'company_id': branch_b.id,
+            'name': 'First Reminder (B)',
+            'delay': 10,
+            'send_email': True,
+            'auto_execute': True,
+        }, {
+            'company_id': branch_b.id,
+            'name': 'Second Reminder (B)',
+            'delay': 20,
+            'send_email': True,
+            'auto_execute': True,
+        }, {
+            'company_id': self.company_data['company'].id,
+            'name': 'First Reminder',
+            'delay': 20,
+            'send_email': True,
+            'auto_execute': True,
+        }, {
+            'company_id': self.company_data['company'].id,
+            'name': 'Second Reminder',
+            'delay': 40,
+            'send_email': True,
+            'auto_execute': True,
+        }])
+
+        self.env['account.move'].create([{
+            'move_type': 'out_invoice',
+            'invoice_date': '2016-01-01',
+            'invoice_date_due': '2016-01-01',
+            'date': '2016-01-01',
+            'partner_id': self.partner_a.id,
+            'company_id': branch_a.id,
+            'invoice_line_ids': [Command.create({
+                'quantity': 1,
+                'price_unit': 400,
+            })]
+        }, {
+            'move_type': 'out_invoice',
+            'invoice_date': '2016-01-01',
+            'invoice_date_due': '2016-01-01',
+            'date': '2016-01-01',
+            'partner_id': self.partner_a.id,
+            'company_id': branch_b.id,
+            'invoice_line_ids': [Command.create({
+                'quantity': 1,
+                'price_unit': 800,
+            })]
+        }, {
+            'move_type': 'out_invoice',
+            'invoice_date': '2016-01-01',
+            'invoice_date_due': '2016-01-01',
+            'date': '2016-01-01',
+            'partner_id': self.partner_a.id,
+            'company_id': self.company_data['company'].id,
+            'invoice_line_ids': [Command.create({
+                'quantity': 1,
+                'price_unit': 200,
+            })]
+        }]).action_post()
+
+        with (
+            freeze_time('2022-01-10'),
+            patch.object(self.env.registry['res.partner'], '_send_followup') as patched,
+            patch.object(self.env.registry['ir.actions.report'], '_run_wkhtmltopdf', return_value=b"0")
+        ):
+            cron.method_direct_trigger()
+            # For the same reason we clear the cache in assertPartnerFollowup, to avoid this test change the state of the cache,
+            # which could break other tests.
+            self.env.cr.cache.pop('res_partner_all_followup', None)
+            self.assertEqual(patched.call_count, 3)
+
+        count_mail = self.env['mail.message'].search_count([('record_company_id', 'in', [self.company_data['company'].id, branch_a.id, branch_b.id])])
+        # We should have 3 emails :
+        # 1 for the main company
+        # 1 for the Branch number 1
+        # 1 for the Branch number 2
+        self.assertEqual(count_mail, 3)
+
+        # Now we check the amounts overdue
+        # Expected : 200 (main_company) + 400 (branch_a) + 800 (branch_b)
+        self.assertEqual(self.partner_a.total_overdue, 1400)
+        # Expected : 400
+        self.assertEqual(self.partner_a.with_company(branch_a).total_overdue, 400)
+        # Expected : 800
+        self.assertEqual(self.partner_a.with_company(branch_b).total_overdue, 800)
+
+    def test_partner_total_due_with_payable(self):
+        """
+        Test that the total due for a partner also reflects payable accounts and is coherent with the customer statement report.
+        """
+        # Init options.
+        report = self.env.ref('odex30_account_reports.customer_statement_report')
+        default_options = {
+            'partner_id': self.partner_a.id,
+            'multi_currency': True,
+            'unfold_all': True,
+        }
+        options = self._generate_options(report, fields.Date.from_string('2016-01-01'), fields.Date.from_string('2016-12-31'), default_options=default_options)
+
+        self.init_invoice('out_invoice', self.partner_a, '2016-01-01', True, amounts=[500])
+
+        self.assertRecordValues(self.partner_a, [{'total_due': 500.0, 'total_all_due': 500.0}])
+
+        with freeze_time('2016-01-01'):
+            self.assertLinesValues(
+                # pylint: disable=C0326
+                report._get_lines(options),
+                #   Name                                        Date,        Due Date,  Amount,       Balance
+                [   0,                                      1,              2,       3,             5],
+                [
+                    ('partner_a',                                  '',             '',   500.0,         500.0),
+                    ('INV/2016/00001',                   '01/01/2016',   '01/01/2016',   500.0,         500.0),
+                    ('Total partner_a',                            '',             '',   500.0,         500.0),
+                    ('Total',                                      '',             '',   500.0,         500.0),
+                ],
+                options,
+            )
+
+        self.init_invoice('in_invoice', self.partner_a, '2016-01-01', True, amounts=[200])
+
+        self.assertRecordValues(self.partner_a, [{'total_due': 500.0, 'total_all_due': 300.0}])
+
+        with freeze_time('2016-01-01'):
+            self.assertLinesValues(
+                # pylint: disable=C0326
+                report._get_lines(options),
+                #   Name                                        Date,        Due Date,  Amount,       Balance
+                [   0,                                      1,              2,       3,             5],
+                [
+                    ('partner_a',                                  '',             '',   300.0,          300.0),
+                    ('INV/2016/00001',                   '01/01/2016',   '01/01/2016',   500.0,          500.0),
+                    ('BILL/2016/01/0001',                '01/01/2016',   '01/01/2016',  -200.0,          300.0),
+                    ('Total partner_a',                            '',             '',   300.0,          300.0),
+                    ('Total',                                      '',             '',   300.0,          300.0),
+                ],
+                options,
+            )
+
+    def test_automatic_followup_report_attachments(self):
+        followup_line = self.env['account_followup.followup.line'].create({
+            'company_id': self.env.company.id,
+            'name': 'First Reminder',
+            'delay': 15,
+            'send_email': True,
+        })
+        invoice = self.env['account.move'].create({
+            'move_type': 'out_invoice',
+            'invoice_date': '2016-01-01',
+            'partner_id': self.partner_a.id,
+            'invoice_line_ids': [Command.create({
+                'quantity': 1,
+                'price_unit': 500,
+                'tax_ids': [],
+            })]
+        })
+        invoice.action_post()
+
+        self.assertPartnerFollowup(self.partner_a, 'in_need_of_action', followup_line)
+
+        invoice_attachment = self.env['ir.attachment'].create({
+            'name': 'some_attachment.pdf',
+            'res_id': invoice.id,
+            'res_model': 'account.move',
+            'datas': 'test',
+            'type': 'binary',
+        })
+        invoice._message_set_main_attachment_id(invoice_attachment)
+
+        self.partner_a._compute_unpaid_invoices()
+        with patch.object(self.env.registry['account.report'], 'export_to_pdf', autospec=True, side_effect=lambda *args, **kwargs: {'file_name': 'fake_partner_ledger.pdf', 'file_content': b'', 'file_type': 'pdf'}):
+            self.partner_a.action_manually_process_automatic_followups()
+
+        sent_attachments = self.env['mail.message'].search([('partner_ids', '=', self.partner_a.id)]).attachment_ids
+        self.assertEqual(sent_attachments.mapped('name'), [f'{self.partner_a.name} - fake_partner_ledger.pdf', 'some_attachment.pdf'])
+
+    def test_manual_followup_report_invoices_removed(self):
+        followup_line = self.env['account_followup.followup.line'].create({
+            'company_id': self.env.company.id,
+            'name': 'First Reminder',
+            'delay': 15,
+            'send_email': True,
+        })
+        invoice = self.env['account.move'].create({
+            'move_type': 'out_invoice',
+            'invoice_date': '2016-01-01',
+            'partner_id': self.partner_a.id,
+            'invoice_line_ids': [Command.create({
+                'quantity': 1,
+                'price_unit': 500,
+                'tax_ids': [],
+            })]
+        })
+        invoice.action_post()
+
+        self.assertPartnerFollowup(self.partner_a, 'in_need_of_action', followup_line)
+
+        invoice_attachment = self.env['ir.attachment'].create({
+            'name': 'some_attachment.pdf',
+            'res_id': invoice.id,
+            'res_model': 'account.move',
+            'datas': 'test',
+            'type': 'binary',
+        })
+        invoice._message_set_main_attachment_id(invoice_attachment)
+
+        self.partner_a._compute_unpaid_invoices()
+        with patch.object(self.env.registry['account.report'], 'export_to_pdf', autospec=True, side_effect=lambda *args, **kwargs: {'file_name': 'fake_partner_ledger.pdf', 'file_content': b'', 'file_type': 'pdf'}):
+            self.partner_a._execute_followup_partner(options={
+                'partner_id': self.partner_a.id,
+                'manual_followup': True,
+                'snailmail': False,
+                'join_invoices': True,
+                'attachment_ids': [],
+            })
+
+        sent_attachments = self.env['mail.message'].search([('partner_ids', '=', self.partner_a.id)]).attachment_ids
+        self.assertEqual(sent_attachments.mapped('name'), [f'{self.partner_a.name} - fake_partner_ledger.pdf'])
+
+    def test_manual_followup_report_join_invoices(self):
+        followup_line = self.env['account_followup.followup.line'].create({
+            'company_id': self.env.company.id,
+            'name': 'First Reminder',
+            'delay': 15,
+            'send_email': True,
+        })
+        invoice = self.env['account.move'].create({
+            'move_type': 'out_invoice',
+            'invoice_date': '2016-01-01',
+            'partner_id': self.partner_a.id,
+            'invoice_line_ids': [Command.create({
+                'quantity': 1,
+                'price_unit': 500,
+                'tax_ids': [],
+            })]
+        })
+        invoice.action_post()
+
+        self.assertPartnerFollowup(self.partner_a, 'in_need_of_action', followup_line)
+
+        invoice_attachment = self.env['ir.attachment'].create({
+            'name': 'some_attachment.pdf',
+            'res_id': invoice.id,
+            'res_model': 'account.move',
+            'datas': 'test',
+            'type': 'binary',
+        })
+        invoice._message_set_main_attachment_id(invoice_attachment)
+
+        self.partner_a._compute_unpaid_invoices()
+        with patch.object(self.env.registry['account.report'], 'export_to_pdf', autospec=True, side_effect=lambda *args, **kwargs: {'file_name': 'fake_partner_ledger.pdf', 'file_content': b'', 'file_type': 'pdf'}):
+            self.partner_a._execute_followup_partner(options={
+                'partner_id': self.partner_a.id,
+                'manual_followup': True,
+                'snailmail': False,
+                'join_invoices': False,
+                'attachment_ids': invoice_attachment.ids,
+            })
+
+        sent_attachments = self.env['mail.message'].search([('partner_ids', '=', self.partner_a.id)]).attachment_ids
+        self.assertEqual(sent_attachments.mapped('name'), [f'{self.partner_a.name} - fake_partner_ledger.pdf'])
+
+    def test_followup_report_with_entries(self):
+        """
+            Entries shouldn't have a due date or be added to total_overdue on the followup report and on the partner.
+        """
+        report = self.env['account.followup.report']
+        options = {
+            'partner_id': self.partner_a.id,
+        }
+        with freeze_time('2016-01-02'):
+            invoice = self.env['account.move'].create({
+                'move_type': 'out_invoice',
+                'invoice_date': '2016-01-01',
+                'invoice_date_due': '2016-01-01',
+                'invoice_payment_term_id': False,
+                'partner_id': self.partner_a.id,
+                'invoice_line_ids': [Command.create({
+                    'quantity': 1,
+                    'price_unit': 300,
+                    'tax_ids': [],
+                })]
+            })
+            invoice.action_post()
+
+            entry = self.env['account.move'].create({
+                'move_type': 'entry',
+                'date': fields.Date.from_string('2016-01-02'),
+                'partner_id': self.partner_a.id,
+                'invoice_line_ids': [
+                    Command.create({
+                        'name': 'line1',
+                        'account_id': self.company_data['default_account_receivable'].id,
+                        'debit': 500.0,
+                        'credit': 0.0,
+                    }),
+                    Command.create({
+                        'name': 'counterpart line',
+                        'account_id': self.company_data['default_account_revenue'].id,
+                        'debit': 0.0,
+                        'credit': 500.0,
+                    })
+                ]
+            })
+            entry.action_post()
+
+        with freeze_time('2016-01-15'):
+            self.assertLinesValues(
+                # pylint: disable=C0326
+                report._get_followup_report_lines(options),
+                #   Name                                    Date,           Due Date,       Doc.      Total Due
+                [   0,                                      1,              2,              3,        5],
+                [
+                    ('MISC/2016/01/0001',                   '01/02/2016',   '',             '',       '$\xa0500.00'),
+                    ('INV/2016/00001',                      '01/01/2016',   '01/01/2016',   '',       '$\xa0300.00'),
+                    ('',                                    '',             '',             '',       '$\xa0800.00'),
+                    ('',                                    '',             '',             '',       '$\xa0300.00'),
+                ],
+                options,
+            )
+            self.assertEqual(self.partner_a.total_due, 800)
+            self.assertEqual(self.partner_a.total_overdue, 300)
+
+    def test_action_report_followup(self):
+        def _run_wkhtmltopdf(*args, **kwargs):
+            return file_open('base/tests/minimal.pdf', 'rb').read()
+
+        followup_line = self.env['account_followup.followup.line'].create({
+            'company_id': self.env.company.id,
+            'name': 'First Reminder',
+            'delay': 15,
+            'send_email': True,
+        })
+        invoice = self.env['account.move'].create({
+            'move_type': 'out_invoice',
+            'invoice_date': '2016-01-01',
+            'partner_id': self.partner_a.id,
+            'invoice_line_ids': [Command.create({
+                'quantity': 1,
+                'price_unit': 500,
+                'tax_ids': [],
+            })]
+        })
+        invoice.action_post()
+
+        self.assertPartnerFollowup(self.partner_a, 'in_need_of_action', followup_line)
+
+        with patch.object(self.env.registry['ir.actions.report'], '_run_wkhtmltopdf', _run_wkhtmltopdf):
+            followup_letter = self.env['ir.actions.report'].with_context(force_report_rendering=True)._render_qweb_pdf('odex30_account_followup.report_followup_print_all', self.partner_a.id)[0]
+        self.assertTrue(followup_letter)
+
+    def test_automatic_followup_report_attachments_from_template(self):
+        mail_template = self.env['mail.template'].create({
+            'name': 'reminder',
+            'model_id': self.env['ir.model']._get_id('res.partner'),
+            'email_cc': 'john.carmac@example.me',
+        })
+        template_attachment = self.env['ir.attachment'].create({
+            'name': 'template_attachment.pdf',
+            'res_id': mail_template.id,
+            'res_model': 'mail.template',
+            'datas': 'test',
+            'type': 'binary',
+        })
+        mail_template.attachment_ids = [template_attachment.id]
+
+        dynamic_report = self.env['ir.actions.report'].create({
+            'name': 'Test Report Partner',
+            'model': 'res.partner',
+            'report_name': 'odex30_account_followup.report_followup_print_all',
+            'print_report_name': "'followup_dynamic_report'",
+        })
+        mail_template.report_template_ids = [dynamic_report.id]
+
+        followup_line = self.env['account_followup.followup.line'].create({
+            'company_id': self.env.company.id,
+            'name': 'First Reminder',
+            'delay': 15,
+            'send_email': True,
+            'mail_template_id': mail_template.id,
+        })
+        invoice = self.env['account.move'].create({
+            'move_type': 'out_invoice',
+            'invoice_date': '2016-01-01',
+            'partner_id': self.partner_a.id,
+            'invoice_line_ids': [Command.create({
+                'quantity': 1,
+                'price_unit': 500,
+                'tax_ids': [],
+            })]
+        })
+        invoice.action_post()
+        self.assertPartnerFollowup(self.partner_a, 'in_need_of_action', followup_line)
+
+        invoice_attachment = self.env['ir.attachment'].create({
+            'name': 'invoice_attachment.pdf',
+            'res_id': invoice.id,
+            'res_model': 'account.move',
+            'datas': 'test',
+            'type': 'binary',
+        })
+        invoice._message_set_main_attachment_id(invoice_attachment)
+
+        self.partner_a._compute_unpaid_invoices()
+        with patch.object(self.env.registry['account.report'], 'export_to_pdf', autospec=True, side_effect=lambda *args, **kwargs: {'file_name': 'fake_partner_ledger.pdf', 'file_content': b'', 'file_type': 'pdf'}):
+            self.partner_a.action_manually_process_automatic_followups()
+
+        sent_attachments = self.env['mail.message'].search([('partner_ids', '=', self.partner_a.id)]).attachment_ids
+        self.assertEqual(sent_attachments.mapped('name'), ['followup_dynamic_report.html', f'{self.partner_a.name} - fake_partner_ledger.pdf', 'invoice_attachment.pdf', 'template_attachment.pdf'])
diff --git a/dev_odex30_accounting/odex30_account_followup/views/account_followup_line_views.xml b/dev_odex30_accounting/odex30_account_followup/views/account_followup_line_views.xml
new file mode 100644
index 0000000..7c42ac4
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_followup/views/account_followup_line_views.xml
@@ -0,0 +1,104 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<odoo>
+    <record id="view_account_followup_followup_line_tree" model="ir.ui.view">
+        <field name="name">account_followup.followup.line.list</field>
+        <field name="model">account_followup.followup.line</field>
+        <field name="arch" type="xml">
+            <list string="Follow-up Steps" >
+                <field name="name"/>
+                <field name="delay"/>
+                <field name="send_email"/>
+                <field name="send_sms"/>
+                <field name="auto_execute"/>
+                <field name="activity_type_id" string="Activity"/>
+                <field name="company_id"  groups="base.group_multi_company"/>
+            </list>
+        </field>
+    </record>
+
+    <record id="view_account_followup_followup_line_form" model="ir.ui.view">
+        <field name="name">account_followup.followup.line.form</field>
+        <field name="model">account_followup.followup.line</field>
+        <field name="arch" type="xml">
+            <form string="Follow-up Steps">
+                <sheet>
+                    <div class="oe_title">
+                        <label for="name"/>
+                        <h1><field name="name" placeholder="e.g. First Reminder Email"/></h1>
+                    </div>
+                    <div class="oe_inline">
+                        Remind <field name="delay" class="oe_inline"/> days after due date<label for="delay" string=""/>
+                    </div>
+                    <notebook>
+                        <page string="Notification" name="notification">
+                            <group col="3">
+                                <group string="Actions" name="actions" colspan="2" col="3">
+                                    <group colspan="1">
+                                        <field name="send_email"/>
+                                        <field name="send_sms"/>
+                                    </group>
+                                    <group colspan="2">
+                                        <field name="mail_template_id" string="Content Template" invisible="not send_email"/>
+                                        <field name="sms_template_id" invisible="not send_sms"/>
+                                    </group>
+                                </group>
+                                <group string="Options" name="options" colspan="1">
+                                    <field name="auto_execute"/>
+                                    <field name="join_invoices" invisible="not send_email"/>
+                                    <field name="additional_follower_ids" invisible="not send_email"
+                                           widget="many2many_tags_avatar"/>
+                                </group>
+                            </group>
+                        </page>
+                        <page string="Activity" name="activity">
+                            <group>
+                                <group name="options">
+                                    <field name="create_activity"/>
+                                    <field name="activity_default_responsible_type"
+                                           invisible="not create_activity"/>
+                                </group>
+                                <group name="notes" invisible="not create_activity">
+                                    <field name="activity_type_id" required="create_activity"/>
+                                    <field name="activity_summary" required="create_activity"/>
+                                </group>
+                                <field name="activity_note" nolabel="1" placeholder="Activity Notes"
+                                       invisible="not create_activity"/>
+                            </group>
+                        </page>
+                    </notebook>
+                </sheet>
+            </form>
+        </field>
+    </record>
+
+    <record id="view_account_followup_line_filter" model="ir.ui.view">
+        <field name="name">account.followup.line.select</field>
+        <field name="model">account_followup.followup.line</field>
+        <field name="arch" type="xml">
+            <search string="Search Follow-up">
+                <field name="company_id" groups="base.group_multi_company"/>
+                <filter string="Automatic" name="auto" domain="[('auto_execute', '=', True)]"/>
+                <filter string="Manual" name="manual" domain="[('auto_execute', '=', False)]"/>
+            </search>
+        </field>
+    </record>
+
+    <record id="action_account_followup_line_definition_form" model="ir.actions.act_window">
+        <field name="name">Follow-up Levels</field>
+        <field name="res_model">account_followup.followup.line</field>
+        <field name="search_view_id" ref="view_account_followup_line_filter"/>
+        <field name="view_mode">list,kanban,form</field>
+        <field name="help" type="html">
+          <p class="o_view_nocontent_smiling_face">
+            Define follow-up levels and their related actions
+          </p><p>
+            For each step, specify the actions to be taken and delay in days. It is
+            possible to use print and e-mail templates to send specific messages to
+            the customer.
+          </p>
+      </field>
+    </record>
+
+    <menuitem action="action_account_followup_line_definition_form" id="account_followup_menu" parent="account.account_invoicing_menu" name="Follow-up Levels" groups="account.group_account_manager" sequence="2"/>
+
+</odoo>
diff --git a/dev_odex30_accounting/odex30_account_followup/views/account_followup_views.xml b/dev_odex30_accounting/odex30_account_followup/views/account_followup_views.xml
new file mode 100644
index 0000000..0db61d6
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_followup/views/account_followup_views.xml
@@ -0,0 +1,53 @@
+<odoo>
+    <data>
+        <record model="ir.actions.server" id="action_account_reports_customer_statements_do_followup">
+            <field name="name">Process Follow-ups</field>
+            <field name="groups_id" eval="[(4, ref('account.group_account_invoice'))]"/>
+            <field name="model_id" ref="model_res_partner"/>
+            <field name="binding_model_id" ref="model_res_partner" />
+            <field name="state">code</field>
+            <field name="code">
+                if records:
+                    action = records.action_manually_process_automatic_followups()
+            </field>
+        </record>
+        <record id="customer_statements_tree_view" model="ir.ui.view">
+            <field name="name">customer.statements.list</field>
+            <field name="model">res.partner</field>
+            <field name="inherit_id" ref="base.view_partner_tree"/>
+            <field name="arch" type="xml">
+                <list position="inside">
+                    <field name="followup_responsible_id" widget="many2one_avatar_user" optional="hide"/>
+                    <field name="followup_reminder_type" optional="hide"/>
+                    <field name="followup_status" widget="badge"
+                           optional="hide"
+                           decoration-danger="followup_status == 'in_need_of_action'"
+                           decoration-warning="followup_status == 'with_overdue_invoices'"
+                           decoration-info="followup_status == 'no_action_needed'"/>
+                    <field name="followup_next_action_date" optional="hide" widget="remaining_days"/>
+                    <field name="followup_line_id" optional="hide"/>
+                    <field name="total_due" widget="monetary" options="{'currency_field': 'currency_id'}" sum="Total" optional="hide"/>
+                    <field name="total_overdue" widget="monetary" options="{'currency_field': 'currency_id'}" sum="Total" optional="hide"/>
+                </list>
+            </field>
+        </record>
+
+        <record id="customer_statements_search_view" model="ir.ui.view">
+            <field name="name">customer.statements.search</field>
+            <field name="model">res.partner</field>
+            <field name="inherit_id" ref="base.view_res_partner_filter"/>
+            <field name="arch" type="xml">
+                <xpath expr="//filter[@name='inactive']" position="before">
+                    <filter string="Overdue Invoices"
+                            name="filter_with_overdue_invoices"
+                            domain="[('followup_status', 'in', ('in_need_of_action', 'with_overdue_invoices'))]"/>
+                    <filter string="Requires Follow-up"
+                            name="filter_in_need_of_action"
+                            domain="[('followup_status', '=', 'in_need_of_action')]"/>
+                    <separator/>
+                </xpath>
+            </field>
+        </record>
+
+    </data>
+</odoo>
diff --git a/dev_odex30_accounting/odex30_account_followup/views/partner_view.xml b/dev_odex30_accounting/odex30_account_followup/views/partner_view.xml
new file mode 100644
index 0000000..24f3702
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_followup/views/partner_view.xml
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <data>
+        <record model="ir.ui.view" id="res_partner_view_form">
+            <field name="name">res.partner.view.form</field>
+            <field name="model">res.partner</field>
+            <field name="inherit_id" ref="base.view_partner_form"/>
+            <field name="priority" eval="5"/>
+            <field name="arch" type="xml">
+                <div name="button_box" position="inside">
+                    <button groups="account.group_account_invoice" type="object" class="oe_stat_button" name="open_customer_statement" icon="fa-list" invisible="not has_moves or total_due == 0">
+                        <div class="o_field_widget o_stat_info">
+                            <span class="o_stat_value">
+                                <field name="total_all_due" widget="monetary" options="{'currency_field': 'currency_id'}" invisible="total_all_due == 0 or total_all_overdue == 0" class="text-danger"/>
+                                <field name="total_all_due" widget="monetary" options="{'currency_field': 'currency_id'}" invisible="total_all_due == 0 or total_all_overdue != 0"/>
+                            </span>
+                            <span class="o_stat_text">Customer Statement</span>
+                        </div>
+                    </button>
+                </div>
+                <xpath expr="//field[@name='child_ids']//div[hasclass('oe_edit_only')]" position="inside">
+                    <p class="mb-0" invisible="type != 'followup'">
+                        <span>Preferred address for follow-up reports. Selected by default when you send reminders about overdue invoices.</span>
+                    </p>
+                </xpath>
+            </field>
+        </record>
+
+        <record model="ir.ui.view" id="view_partner_property_form_followup">
+            <field name="name">res.partner.property.form.followup</field>
+            <field name="model">res.partner</field>
+            <field name="inherit_id" ref="account.view_partner_property_form"/>
+            <field name="arch" type="xml">
+                <group name="banks" position="after">
+                    <group string="Invoice Follow-ups" name="invoice_followups" groups="account.group_account_invoice">
+                        <field name="company_id" invisible="1"/>
+                        <div colspan="2" invisible="not followup_line_id">
+                            <field name="followup_line_id" widget="statusbar" invisible="not unreconciled_aml_ids" options="{'clickable': '1'}" domain="[('company_id','=', current_company_id)]"/>
+                        </div>
+                        <label for="followup_status"/>
+                        <div class="o_row">
+                            <field name="followup_status"
+                                   widget="badge"
+                                   decoration-danger="followup_status == 'in_need_of_action'"
+                                   decoration-warning="followup_status == 'with_overdue_invoices'"
+                                   style="width: 50% !important"
+                                   class="fb-mincontent"
+                            />
+                            <a name="action_open_overdue_entries"
+                               invisible="followup_status not in ('in_need_of_action', 'with_overdue_invoices')"
+                               style="width: 50% !important"
+                               class="fw-bold"
+                               type="object"
+                            >
+                                Overdue Invoices
+                            </a>
+                        </div>
+                        <label for="followup_reminder_type"/>
+                        <div class="o_row">
+                            <field name="followup_reminder_type" widget="radio" style="width: 50% !important" options="{'horizontal': true}" class="fb-mincontent"/>
+                            <a class="fw-bold" name="%(manual_reminder_action)d" style="width: 50% !important" type="action">Send</a>
+                        </div>
+                        <field name="followup_next_action_date"/>
+                        <field name="followup_responsible_id"/>
+                    </group>
+                </group>
+            </field>
+        </record>
+    </data>
+</odoo>
diff --git a/dev_odex30_accounting/odex30_account_followup/views/report_followup.xml b/dev_odex30_accounting/odex30_account_followup/views/report_followup.xml
new file mode 100644
index 0000000..4e4db59
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_followup/views/report_followup.xml
@@ -0,0 +1,157 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <data>
+        <template id="template_followup_report">
+           <!-- doc is a 'res.partner' -->
+           <t t-set="report" t-value="doc.env['account.followup.report']"/>
+           <t t-set="options" t-value="report._get_followup_report_options(doc, options)"/>
+            <div class='o_account_reports_body'>
+                <div class="o_account_reports_page o_account_reports_no_print o_odex30_account_followup">
+                    <t t-call="odex30_account_followup.followup_filter_info_template"/>
+
+                    <div class="o_account_reports_header">
+                        <div class="print_only">
+                            <h2>
+                            <strong>
+                                Pending Invoices
+                            </strong>
+                            </h2>
+                        </div>
+                    </div>
+
+                    <div class="o_account_reports_summary">
+                        <t t-set="report_summary" t-value="report._get_main_body(options)"/>
+                        <div class="o_account_report_summary" role="alert">
+                            <span class="o_account_report_summary_content" t-att-style="'' if report_summary else 'display: none;'">
+                                <span t-out="report_summary">Invoices Analysis</span>
+                            </span>
+                            <span t-if="not report_summary and not context.get('print_mode')" class="o_account_report_summary_placeholder">
+                                Add a note
+                            </span>
+                        </div>
+                    </div>
+
+                    <div>
+                        <div class="oe_structure"></div>
+                    </div>
+                </div>
+            </div>
+        </template>
+
+        <template id="followup_filter_info_template">
+            <div t-if='context.get("mail") != True' class="print_only" style='margin-bottom: 20px;'>
+                <t t-set="invoice_address_id" t-value="doc.env['res.partner'].browse(doc.address_get(['invoice'])['invoice'])"/>
+                <t t-if="invoice_address_id" t-set="partner_addr" t-value="invoice_address_id"/>
+                <t t-else="" t-set="partner_addr" t-value="doc"/>
+
+                <t t-if="context.get('snailmail_layout')" t-set="contact_widget_fields" t-value="['address', 'name']"/>
+                <t t-else="" t-set="contact_widget_fields" t-value="['address', 'name', 'phone']"/>
+
+                <div class="oe_structure"></div>
+                <div class="row fallback_header">
+                    <div class="o_followup_address col-5 offset-7">
+                        <span t-field="partner_addr.self"
+                            t-options='{"widget": "contact", "fields": contact_widget_fields, "no_marker": True}'>Address</span>
+                        <span t-field="partner_addr.vat"/>
+                    </div>
+                </div>
+
+                <p style="margin-top: 35px;">
+                    Date: <span t-out="datetime.date.today()" t-options="{'widget': 'date'}">2023-09-06</span><br/>
+                    <span t-if='partner_addr.ref'>Customer ref: <span t-field="partner_addr.ref">Demo Ref</span></span>
+                </p>
+            </div>
+        </template>
+
+        <template id="table_header_template_followup_report">
+            <thead class="o_account_reports_header_hierarchy">
+                    <tr t-foreach="column_headers" t-as="header_line">
+                        <t t-foreach="header_line" t-as="cell">
+                            <th t-att-class="'acc_rep_column_header ' + (cell.get('class', ''))"
+                                t-att-style="cell.get('style', '')"
+                            >
+                                <div t-att-class="classes" t-att-style="style">
+                                    <t t-out="cell.get('name')">Table Header</t>
+                                </div>
+                            </th>
+                        </t>
+                    </tr>
+            </thead>
+        </template>
+
+        <template id="line_template">
+            <t t-foreach="lines" t-as="line">
+                <t t-set="trclass" t-value="'o_account_reports_default_style'"/>
+                <t t-set="domainClass" t-value="'o_account_reports_domain_line_2 acc_rep_line_name'"/>
+                <t t-if="line.get('level') != None">
+                    <t t-set="trclass" t-value="'o_account_searchable_line o_account_reports_level'+str(line['level'])"/>
+                    <t t-if="line.get('caret_options')">
+                        <t t-set="domainClass" t-value="'o_account_reports_domain_line_' + str(line['level']) + ' acc_rep_line_name'"/>
+                    </t>
+                </t>
+
+                <tr t-attf-class="#{trclass} #{line.get('class', '')} #{'o_js_account_report_parent_row_unfolded' if line.get('unfolded', False) else ''}"
+                    tabindex="0"
+                    t-att-data-parent-id="line.get('parent_id', False)"
+                    t-att="{k: v for k, v in line.items() if k.startswith('data-')}"
+                    t-att-style="line.get('style', '')">
+                    <td
+                        t-att-data-id="line['id']"
+                        t-att-class="'o_account_report_name_ellipsis o_account_report_line o_account_report_line_indent ' + (line.get('unfoldable') and 'js_account_report_foldable o_foldable_total' or '') + ' ps-2 pe-2' + line.get('name_class', '')"
+                        t-att-data-unfolded="line.get('unfolded', False)"
+                        t-att-data-groupby="line.get('groupby')"
+                        t-att-data-expand-function="line.get('expand_function')"
+                        t-att-data-offset="line.get('offset', 0)"
+                        t-att-data-progress="line.get('progress')"
+                        t-att-data-parent-id="line.get('parent_id')"
+                        t-att-colspan="line.get('colspan', '1')"
+                    >
+                        <span class="acc_rep_line_name" t-att-title="line.get('title_hover')">
+                            <t t-out="line.get('name')">Table Value</t>
+                        </span>
+                    </td>
+
+                    <t t-foreach="line.get('columns')" t-as="cell">
+                        <t t-set="cell_classes" t-value="(cell.get('class', '') + (line.get('unfoldable') and ' o_foldable_total' or ''))"/>
+                        <t t-set="style_classes" t-value="cell.get('style', '')"/>
+
+                        <td>
+                            <div t-att-style="style_classes" t-att-class="cell_classes + ' o_account_report_column_value ps-2 pe-2'">
+                                <span class="o_account_report_column_value" t-out="cell.get('name')">Name</span>
+                            </div>
+                        </td>
+                    </t>
+                </tr>
+            </t>
+        </template>
+
+        <template id="report_followup_print_all">
+            <t t-call="web.html_container">
+                <t t-set="company" t-value="docs.env.company"/>
+                <div class="oe_structure"></div>
+                <t t-foreach="docs" t-as="doc"> <!-- each doc is a 'res.partner', called doc for the 'web.external_layout' template -->
+                    <t t-call="web.external_layout">
+                        <t t-set="fallback_address" t-value="doc.browse(doc.address_get(['invoice'])['invoice']) or doc"/>
+                        <t t-call-assets="odex30_account_followup.assets_followup_report" />
+                        <div class="page">
+                            <span t-out="doc.get_followup_html(options)">Follow-up details</span>
+                        </div>
+                    </t>
+                    <div class="oe_structure"></div>
+                    <!-- The invoice PDFs are attached by extending function _render_qweb_pdf_prepare_streams of ir.actions.report -->
+                </t>
+            </t>
+        </template>
+
+        <record id="action_report_followup" model="ir.actions.report">
+            <field name="name">Print Follow-up Letter</field>
+            <field name="model">res.partner</field>
+            <field name="report_type">qweb-pdf</field>
+            <field name="report_name">odex30_account_followup.report_followup_print_all</field>
+            <field name="report_file">odex30_account_followup.report_followup_print_all</field>
+            <field name="print_report_name">'Follow-up ' + object.display_name</field>
+        </record>
+
+        <function model="ir.default" name="set" eval="('res.partner', 'followup_next_action_date', False)"/>
+    </data>
+</odoo>
diff --git a/dev_odex30_accounting/odex30_account_followup/wizard/__init__.py b/dev_odex30_accounting/odex30_account_followup/wizard/__init__.py
new file mode 100644
index 0000000..6e3f9fc
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_followup/wizard/__init__.py
@@ -0,0 +1,2 @@
+from . import followup_manual_reminder
+from . import followup_missing_information
diff --git a/dev_odex30_accounting/odex30_account_followup/wizard/__pycache__/__init__.cpython-311.pyc b/dev_odex30_accounting/odex30_account_followup/wizard/__pycache__/__init__.cpython-311.pyc
new file mode 100644
index 0000000..30384a4
Binary files /dev/null and b/dev_odex30_accounting/odex30_account_followup/wizard/__pycache__/__init__.cpython-311.pyc differ
diff --git a/dev_odex30_accounting/odex30_account_followup/wizard/__pycache__/followup_manual_reminder.cpython-311.pyc b/dev_odex30_accounting/odex30_account_followup/wizard/__pycache__/followup_manual_reminder.cpython-311.pyc
new file mode 100644
index 0000000..e86201a
Binary files /dev/null and b/dev_odex30_accounting/odex30_account_followup/wizard/__pycache__/followup_manual_reminder.cpython-311.pyc differ
diff --git a/dev_odex30_accounting/odex30_account_followup/wizard/__pycache__/followup_missing_information.cpython-311.pyc b/dev_odex30_accounting/odex30_account_followup/wizard/__pycache__/followup_missing_information.cpython-311.pyc
new file mode 100644
index 0000000..51ff027
Binary files /dev/null and b/dev_odex30_accounting/odex30_account_followup/wizard/__pycache__/followup_missing_information.cpython-311.pyc differ
diff --git a/dev_odex30_accounting/odex30_account_followup/wizard/followup_manual_reminder.py b/dev_odex30_accounting/odex30_account_followup/wizard/followup_manual_reminder.py
new file mode 100644
index 0000000..c939ce6
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_followup/wizard/followup_manual_reminder.py
@@ -0,0 +1,133 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+from odoo import api, fields, models, Command
+
+
+class FollowupManualReminder(models.TransientModel):
+    _name = 'account_followup.manual_reminder'
+    _inherit = 'mail.composer.mixin'
+    _description = "Wizard for sending manual reminders to clients"
+
+    def default_get(self, fields_list):
+        defaults = super().default_get(fields_list)
+        assert self.env.context['active_model'] == 'res.partner'
+        partner = self.env['res.partner'].browse(self.env.context['active_ids'])
+        partner.ensure_one()
+        followup_line = partner.followup_line_id
+        if followup_line:
+            defaults.update(self._get_defaults_from_followup_line(followup_line))
+        defaults.update(
+            partner_id=partner.id,
+            attachment_ids=[Command.set(partner.unreconciled_aml_ids.move_id.message_main_attachment_id.ids)],
+            render_model='res.partner'
+        )
+        return defaults
+
+    partner_id = fields.Many2one(comodel_name='res.partner')
+
+    # email fields
+    email = fields.Boolean()
+    email_recipient_ids = fields.Many2many(string="Extra Recipients", comodel_name='res.partner',
+                                           compute='_compute_email_recipient_ids', store=True, readonly=False,
+                                           relation='rel_followup_manual_reminder_res_partner')  # override
+
+    # sms fields
+    sms = fields.Boolean()
+    sms_body = fields.Char(compute='_compute_sms_body', readonly=False, store=True)
+    sms_template_id = fields.Many2one(comodel_name='sms.template', domain=[('model', '=', 'res.partner')])
+
+    # print fields
+    print = fields.Boolean(default=True)
+    join_invoices = fields.Boolean(string="Attach Invoices")
+
+    # attachments fields
+    attachment_ids = fields.Many2many(comodel_name='ir.attachment')
+
+    def _compute_render_model(self):
+        # OVERRIDES mail.renderer.mixin
+        self.render_model = 'res.partner'
+
+    def _get_defaults_from_followup_line(self, followup_line):
+        return {
+            'email': followup_line.send_email,
+            'sms': followup_line.send_sms,
+            'template_id': followup_line.mail_template_id.id,
+            'sms_template_id': followup_line.sms_template_id.id,
+            'join_invoices': followup_line.join_invoices,
+        }
+
+    @api.depends('template_id')
+    def _compute_subject(self):
+        for wizard in self:
+            options = {
+                'partner_id': wizard.partner_id.id,
+                'mail_template': wizard.template_id,
+            }
+            wizard.subject = self.env['account.followup.report']._get_email_subject(options)
+
+    @api.depends('template_id')
+    def _compute_body(self):
+        # OVERRIDES mail.composer.mixin
+        for wizard in self:
+            options = {
+                'partner_id': wizard.partner_id.id,
+                'mail_template': wizard.template_id,
+            }
+            wizard.body = self.env['account.followup.report']._get_main_body(options)
+
+    @api.depends('template_id')
+    def _compute_email_recipient_ids(self):
+        for wizard in self:
+            partner = wizard.partner_id
+            template = wizard.template_id
+            wizard.email_recipient_ids = partner._get_all_followup_contacts() or partner
+            if template:
+                rendered_values = template._generate_template_recipients(
+                    [partner.id],
+                    {'partner_to', 'email_cc', 'email_to'},
+                    True
+                )[partner.id]
+                if rendered_values.get('partner_ids'):
+                    wizard.email_recipient_ids = [Command.link(partner_id) for partner_id in rendered_values['partner_ids']]
+
+    @api.depends('sms_template_id')
+    def _compute_sms_body(self):
+        for wizard in self:
+            options = {
+                'partner_id': wizard.partner_id.id,
+                'sms_template': wizard.sms_template_id,
+            }
+            wizard.sms_body = self.env['account.followup.report']._get_sms_body(options)
+
+    def _get_wizard_options(self):
+        """ Returns a dictionary of options, containing values from this wizard that are needed to process the followup
+        """
+        return {
+            'partner_id': self.partner_id,
+            'email': self.email,
+            'email_from': self.template_id.email_from,
+            'email_subject': self.subject,
+            'email_recipient_ids': self.email_recipient_ids,
+            'body': self.body,
+            'attachment_ids': self.attachment_ids.ids,
+            'sms': self.sms,
+            'sms_body': self.sms_body,
+            'print': self.print,
+            'join_invoices': self.join_invoices,
+            'manual_followup': True,
+            'template_id': self.template_id,
+        }
+
+    def process_followup(self):
+        """ Method run by pressing the 'Send and Print' button in the wizard.
+        It will process the followup for the active partner, taking into account the fields from the wizard.
+        Send email/sms and print the followup letter (pdf) depending on which is activated.
+        Once the followup has been processed, we simply close the wizard.
+        """
+        options = self._get_wizard_options()
+        options['author_id'] = self.env.user.partner_id.id
+        action = self.partner_id.execute_followup(options)
+        return action or {
+            'type': 'ir.actions.act_window_close',
+        }
diff --git a/dev_odex30_accounting/odex30_account_followup/wizard/followup_manual_reminder_views.xml b/dev_odex30_accounting/odex30_account_followup/wizard/followup_manual_reminder_views.xml
new file mode 100644
index 0000000..ad4d673
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_followup/wizard/followup_manual_reminder_views.xml
@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<odoo>
+    <record id="manual_reminder_view_form" model="ir.ui.view">
+        <field name="name">account.followup.manual_reminder.view.form</field>
+        <field name="model">account_followup.manual_reminder</field>
+        <field name="arch" type="xml">
+            <form>
+                <field name="can_edit_body" invisible="1"/>
+                <field name="lang" invisible="1"/>
+                <field name="render_model" invisible="1"/>
+
+                <div class="mb-2" name="options">
+                     <field name="print" nolabel="1"/><label for="print"/>
+                     <field name="email" nolabel="1"/><label for="email"/>
+                     <field name="sms" nolabel="1"/><label for="sms"/>
+                </div>
+
+                <group name="email_header" invisible="not email">
+                    <group colspan="2" col="6">
+                        <group colspan="1">
+                            <label for="email_recipient_ids"/>
+                        </group>
+                        <group colspan="5">
+                            <field name="email_recipient_ids" string="Email Recipients" widget="many2many_tags_email"
+                                   placeholder="Add contacts to notify..." nolabel="1"
+                                   options="{'no_quick_create': True}"
+                                   context="{'show_email': True, 'form_view_ref': 'base.view_partner_simple_form'}"
+                                   colspan="2"/>
+                        </group>
+                    </group>
+                    <group colspan="2" col="6">
+                        <group colspan="1">
+                            <label for="subject"/>
+                        </group>
+                        <group colspan="5">
+                            <field name="subject" string="Email Subject" placeholder="Kind reminder!" nolabel="1"
+                                   required="email" colspan="2"/>
+                        </group>
+                    </group>
+                </group>
+
+                <group name="email_content" invisible="not email and not print">
+                    <group colspan="2">
+                        <label for="body" colspan="2"/>
+                        <field name="body" string="Letter/Email Content" class="oe-bordered-editor"
+                               placeholder="Write your message here..." force_save="1" nolabel="1"
+                               widget="html_mail"
+                            readonly="not can_edit_body" colspan="2"/>
+                    </group>
+                </group>
+
+                <group name="attachments" col="4" invisible="not email and not print">
+                    <group colspan="2">
+                        <field name="join_invoices"/>
+                    </group>
+                    <group colspan="2">
+                        <field name="template_id" string="Content Template" options="{'no_create': True}"
+                               context="{'default_model': 'res.partner', 'default_body': body, 'default_subject': subject}"/>
+                    </group>
+                    <group colspan="2">
+                        <field name="attachment_ids" widget="many2many_binary" nolabel="1"
+                               colspan="2" invisible="not join_invoices"/>
+                    </group>
+                </group>
+
+                <group string="SMS" name="sms" invisible="not sms">
+                    <field name="sms_template_id" options="{'no_create': True}"
+                           context="{'default_model': 'res.partner', 'default_body': sms_body}"/>
+                    <label for="sms_body"/>
+                    <field name="sms_body" string="Sms Content" class="oe-bordered-editor" widget="text"
+                           placeholder="Write your message here..." force_save="1" nolabel="1"
+                           readonly="not can_edit_body" colspan="2"/>
+                </group>
+
+                <footer>
+                    <button string="Send &amp; Print"
+                            invisible="not print or not email and not sms"
+                            name="process_followup" type="object" class="btn-primary" data-hotkey="q"/>
+                    <button string="Send"
+                            invisible="print or not email and not sms"
+                            name="process_followup" type="object" class="btn-primary" data-hotkey="q"/>
+                    <button string="Print"
+                            invisible="not print or email or sms"
+                            name="process_followup"
+                            type="object" class="btn-primary" data-hotkey="q"/>
+                    <button string="Cancel" class="btn-secondary" special="cancel" data-hotkey="x"/>
+                </footer>
+            </form>
+        </field>
+    </record>
+
+    <record id="manual_reminder_action" model="ir.actions.act_window">
+        <field name="name">Send and Print</field>
+        <field name="res_model">account_followup.manual_reminder</field>
+        <field name="view_mode">form</field>
+        <field name="target">new</field>
+    </record>
+</odoo>
diff --git a/dev_odex30_accounting/odex30_account_followup/wizard/followup_missing_information.py b/dev_odex30_accounting/odex30_account_followup/wizard/followup_missing_information.py
new file mode 100644
index 0000000..75c7d5f
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_followup/wizard/followup_missing_information.py
@@ -0,0 +1,20 @@
+from odoo import models, _
+
+
+class FollowupMissingInformation(models.TransientModel):
+    _name = "account_followup.missing.information.wizard"
+    _description = "Followup missing information wizard"
+
+    def view_partners_action(self):
+        """ Returns a list view containing all the partners with missing information with the option to edit in place.
+        """
+        view_id = self.env.ref('odex30_account_followup.missing_information_view_tree').id
+
+        return {
+            'name': _('Missing information'),
+            'res_model': 'res.partner',
+            'view_mode': 'list',
+            'views': [(view_id, 'list')],
+            'domain': [('id', 'in', self.env.context.get('default_partner_ids', []))],
+            'type': 'ir.actions.act_window',
+        }
diff --git a/dev_odex30_accounting/odex30_account_followup/wizard/followup_missing_information.xml b/dev_odex30_accounting/odex30_account_followup/wizard/followup_missing_information.xml
new file mode 100644
index 0000000..1ef9dc3
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_followup/wizard/followup_missing_information.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <record id="missing_information_view_form" model="ir.ui.view">
+        <field name="name">missing.information.view.form</field>
+        <field name="model">account_followup.missing.information.wizard</field>
+        <field name="arch" type="xml">
+            <form>
+                <p>We were not able to process some of the automated follow-up actions due to missing information on the partners.</p>
+                <footer>
+                    <button name="view_partners_action" type="object" string="View partners" class="oe_highlight"/>
+                    <button string="Close" class="btn-secondary" special="cancel"/>
+                </footer>
+            </form>
+        </field>
+    </record>
+
+    <record id="missing_information_view_tree" model="ir.ui.view">
+        <field name="name">missing.information.view.list</field>
+        <field name="model">res.partner</field>
+        <field name="arch" type="xml">
+            <list create="false" editable="bottom">
+                <field name="name" readonly="True"/>
+                <field name="email"/>
+                <field name="mobile"/>
+                <field name="phone"/>
+                <field name="street"/>
+                <field name="city"/>
+                <field name="zip"/>
+                <field name="country_id"/>
+            </list>
+        </field>
+    </record>
+</odoo>
diff --git a/dev_odex30_accounting/odex30_account_online_sync/__init__.py b/dev_odex30_accounting/odex30_account_online_sync/__init__.py
new file mode 100644
index 0000000..bbc5580
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_online_sync/__init__.py
@@ -0,0 +1,5 @@
+# -*- coding: utf-8 -*-
+
+from . import controllers
+from . import models
+from . import wizard
diff --git a/dev_odex30_accounting/odex30_account_online_sync/__manifest__.py b/dev_odex30_accounting/odex30_account_online_sync/__manifest__.py
new file mode 100644
index 0000000..5946b4a
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_online_sync/__manifest__.py
@@ -0,0 +1,51 @@
+# -*- coding: utf-8 -*-
+{
+    'name': "Online Bank Statement Synchronization",
+    'summary': """
+        This module is used for Online bank synchronization.""",
+
+    'description': """
+        This module is used for Online bank synchronization. It provides basic methods to synchronize bank statement.
+    """,
+    'author': "Expert Co. Ltd.",
+    'website': "http://www.exp-sa.com",
+    'category': 'Odex30-Accounting/Odex30-Accounting',
+    'version': '2.0',
+    'depends': ['odex30_account_accountant'],
+
+    'data': [
+        'data/config_parameter.xml',
+        'data/ir_cron.xml',
+        'data/mail_activity_type_data.xml',
+        'data/sync_reminder_email_template.xml',
+
+        'security/ir.model.access.csv',
+        'security/account_online_sync_security.xml',
+
+        'views/account_online_sync_views.xml',
+        'views/account_bank_statement_view.xml',
+        'views/account_journal_view.xml',
+        'views/account_online_sync_portal_templates.xml',
+        'views/account_journal_dashboard_view.xml',
+
+        'wizard/account_bank_selection_wizard.xml',
+        'wizard/account_journal_missing_transactions.xml',
+        'wizard/account_journal_duplicate_transactions.xml',
+        'wizard/account_bank_statement_line.xml',
+    ],
+    'license': 'OEEL-1',
+    'auto_install': True,
+    'assets': {
+        'web.assets_backend': [
+            'odex30_account_online_sync/static/src/components/**/*',
+            'odex30_account_online_sync/static/src/js/odoo_fin_connector.js',
+        ],
+        'web.assets_frontend': [
+            'odex30_account_online_sync/static/src/js/online_sync_portal.js',
+        ],
+        'web.qunit_suite_tests': [
+            'odex30_account_online_sync/static/tests/helpers/*.js',
+            'odex30_account_online_sync/static/tests/*.js',
+        ],
+    }
+}
diff --git a/dev_odex30_accounting/odex30_account_online_sync/__pycache__/__init__.cpython-311.pyc b/dev_odex30_accounting/odex30_account_online_sync/__pycache__/__init__.cpython-311.pyc
new file mode 100644
index 0000000..e37619d
Binary files /dev/null and b/dev_odex30_accounting/odex30_account_online_sync/__pycache__/__init__.cpython-311.pyc differ
diff --git a/dev_odex30_accounting/odex30_account_online_sync/controllers/__init__.py b/dev_odex30_accounting/odex30_account_online_sync/controllers/__init__.py
new file mode 100644
index 0000000..8c3feb6
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_online_sync/controllers/__init__.py
@@ -0,0 +1 @@
+from . import portal
diff --git a/dev_odex30_accounting/odex30_account_online_sync/controllers/__pycache__/__init__.cpython-311.pyc b/dev_odex30_accounting/odex30_account_online_sync/controllers/__pycache__/__init__.cpython-311.pyc
new file mode 100644
index 0000000..6439cb3
Binary files /dev/null and b/dev_odex30_accounting/odex30_account_online_sync/controllers/__pycache__/__init__.cpython-311.pyc differ
diff --git a/dev_odex30_accounting/odex30_account_online_sync/controllers/__pycache__/portal.cpython-311.pyc b/dev_odex30_accounting/odex30_account_online_sync/controllers/__pycache__/portal.cpython-311.pyc
new file mode 100644
index 0000000..28f9ba1
Binary files /dev/null and b/dev_odex30_accounting/odex30_account_online_sync/controllers/__pycache__/portal.cpython-311.pyc differ
diff --git a/dev_odex30_accounting/odex30_account_online_sync/controllers/portal.py b/dev_odex30_accounting/odex30_account_online_sync/controllers/portal.py
new file mode 100644
index 0000000..9556ea4
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_online_sync/controllers/portal.py
@@ -0,0 +1,58 @@
+import json
+
+from odoo import http
+from odoo.http import request
+from odoo.addons.portal.controllers.portal import CustomerPortal
+from odoo.tools import format_amount, format_date
+from odoo.exceptions import AccessError, MissingError, UserError
+
+
+class OnlineSynchronizationPortal(CustomerPortal):
+
+    @http.route(['/renew_consent/<int:journal_id>'], type='http', auth="public", website=True, sitemap=False)
+    def portal_online_sync_renew_consent(self, journal_id, access_token=None, **kw):
+        # Display a page to the user allowing to renew the consent for his bank sync.
+        # Requires the same rights as the button in odoo.
+        try:
+            journal_sudo = self._document_check_access('account.journal', journal_id, access_token)
+        except (AccessError, MissingError):
+            return request.redirect('/my')
+        values = self._prepare_portal_layout_values()
+        # Ignore the route if the journal isn't one using bank sync.
+        if not journal_sudo.account_online_account_id:
+            raise request.not_found()
+
+        balance = journal_sudo.account_online_account_id.balance
+        if journal_sudo.account_online_account_id.currency_id:
+            formatted_balance = format_amount(request.env, balance, journal_sudo.account_online_account_id.currency_id)
+        else:
+            formatted_balance = format_amount(request.env, balance, journal_sudo.currency_id or journal_sudo.company_id.currency_id)
+
+        values.update({
+            'bank': journal_sudo.bank_account_id.bank_name or journal_sudo.account_online_account_id.name,
+            'bank_account': journal_sudo.bank_account_id.acc_number,
+            'journal': journal_sudo.name,
+            'latest_balance_formatted': formatted_balance,
+            'latest_balance': balance,
+            'latest_sync': format_date(request.env, journal_sudo.account_online_account_id.last_sync, date_format="MMM dd, YYYY"),
+            'iframe_params': json.dumps(journal_sudo.action_extend_consent()),
+        })
+        return request.render("account_online_synchronization.portal_renew_consent", values)
+
+
+    @http.route(['/renew_consent/<int:journal_id>/complete'], type='http', auth="public", methods=['POST'], website=True)
+    def portal_online_sync_action_complete(self, journal_id, access_token=None, **kw):
+        # Complete the consent renewal process
+        try:
+            journal_sudo = self._document_check_access('account.journal', journal_id, access_token)
+        except (AccessError, MissingError):
+            return request.redirect('/my')
+        # Ignore the route if the journal isn't one using bank sync.
+        if not journal_sudo.account_online_link_id:
+            raise request.not_found()
+        try:
+            journal_sudo.account_online_link_id._update_connection_status()
+            journal_sudo.manual_sync()
+        except UserError:
+            pass
+        return request.make_response(json.dumps({'status': 'done'}))
diff --git a/dev_odex30_accounting/odex30_account_online_sync/data/config_parameter.xml b/dev_odex30_accounting/odex30_account_online_sync/data/config_parameter.xml
new file mode 100644
index 0000000..5a8a8fa
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_online_sync/data/config_parameter.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <data noupdate="1">
+        <record forcecreate="True" id="config_online_sync_proxy_mode" model="ir.config_parameter">
+            <field name="key">odex30_account_online_sync.proxy_mode</field>
+            <field name="value">production</field>
+        </record>
+        <record forcecreate="True" id="config_online_sync_request_timeout" model="ir.config_parameter">
+            <field name="key">odex30_account_online_sync.request_timeout</field>
+            <field name="value">60</field>
+        </record>
+    </data>
+</odoo>
diff --git a/dev_odex30_accounting/odex30_account_online_sync/data/ir_cron.xml b/dev_odex30_accounting/odex30_account_online_sync/data/ir_cron.xml
new file mode 100644
index 0000000..5ed932b
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_online_sync/data/ir_cron.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <data noupdate="1">
+        <!-- Cron to synchronize transaction -->
+        <record id="online_sync_cron" model="ir.cron">
+            <field name="name">Account: Journal online sync</field>
+            <field name="model_id" ref="account.model_account_journal"/>
+            <field name="state">code</field>
+            <field name="code">model._cron_fetch_online_transactions()</field>
+            <field name="active" eval="True"/>
+            <field name="user_id" ref="base.user_root"/>
+            <field name="interval_number">12</field>
+            <field name="interval_type">hours</field>
+        </record>
+        <record id="online_sync_cron_waiting_synchronization" model="ir.cron">
+            <field name="name">Account: Journal online Waiting Synchronization</field>
+            <field name="model_id" ref="account.model_account_journal"/>
+            <field name="state">code</field>
+            <field name="code">model._cron_fetch_waiting_online_transactions()</field>
+            <field name="active" eval="False"/>
+            <field name="user_id" ref="base.user_root"/>
+            <field name="interval_number">5</field>
+            <field name="interval_type">minutes</field>
+        </record>
+        <!-- Cron to handle sending of reminder email -->
+        <record id="online_sync_mail_cron" model="ir.cron">
+            <field name="name">Account: Journal online sync reminder</field>
+            <field name="model_id" ref="account.model_account_journal"/>
+            <field name="state">code</field>
+            <field name="code">model._cron_send_reminder_email()</field>
+            <field name="active" eval="True"/>
+            <field name="user_id" ref="base.user_root"/>
+            <field name="interval_number">1</field>
+            <field name="interval_type">days</field>
+        </record>
+        <!-- Cron to delete unused connections -->
+        <record id="online_sync_unused_connection_cron" model="ir.cron">
+            <field name="name">Account: Journal online sync cleanup unused connections</field>
+            <field name="model_id" ref="odex30_account_online_sync.model_account_online_link"/>
+            <field name="state">code</field>
+            <field name="code">model._cron_delete_unused_connection()</field>
+            <field name="active" eval="True"/>
+            <field name="user_id" ref="base.user_root"/>
+            <field name="interval_number">1</field>
+            <field name="interval_type">days</field>
+        </record>
+    </data>
+</odoo>
diff --git a/dev_odex30_accounting/odex30_account_online_sync/data/mail_activity_type_data.xml b/dev_odex30_accounting/odex30_account_online_sync/data/mail_activity_type_data.xml
new file mode 100644
index 0000000..0a96bcc
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_online_sync/data/mail_activity_type_data.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <data>
+        <record id="bank_sync_activity_update_consent" model="mail.activity.type">
+            <field name="name">Bank Synchronization: Update consent</field>
+            <field name="icon">fa-university</field>
+            <field name="decoration_type">warning</field>
+            <field name="res_model">account.journal</field>
+            <field name="delay_count">0</field>
+        </record>
+
+        <record id="bank_sync_consent_renewal" model="mail.message.subtype">
+            <field name="name">Consent Renewal</field>
+            <field name="default" eval="False"/>
+            <field name="hidden" eval="True"/>
+            <field name="res_model">account.journal</field>
+            <field name="sequence" eval="900"/>
+            <field name="track_recipients" eval="True"/>
+        </record>
+    </data>
+</odoo>
diff --git a/dev_odex30_accounting/odex30_account_online_sync/data/neutralize.sql b/dev_odex30_accounting/odex30_account_online_sync/data/neutralize.sql
new file mode 100644
index 0000000..465aaa7
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_online_sync/data/neutralize.sql
@@ -0,0 +1,4 @@
+-- disable bank synchronisation links
+UPDATE account_online_link
+   SET provider_data = '',
+       client_id = 'duplicate';
diff --git a/dev_odex30_accounting/odex30_account_online_sync/data/sync_reminder_email_template.xml b/dev_odex30_accounting/odex30_account_online_sync/data/sync_reminder_email_template.xml
new file mode 100644
index 0000000..abf2b28
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_online_sync/data/sync_reminder_email_template.xml
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <data>
+        <record id="email_template_sync_reminder" model="mail.template">
+            <field name="name">Bank connection expiration reminder</field>
+            <field name="subject">Your bank connection is expiring soon</field>
+            <field name="email_from">{{ object.company_id.email_formatted or user.email_formatted }}</field>
+            <field name="email_to">{{ object.renewal_contact_email }}</field>
+            <field name="model_id" ref="odex30_account_online_sync.model_account_journal"/>
+            <field name="auto_delete" eval="True"/>
+            <field name="body_html" type="html">
+                <table border="0" cellpadding="0" cellspacing="0" style="padding-top: 16px; background-color: #FFFFFF; font-family:Verdana, Arial,sans-serif; color: #454748; width: 100%; border-collapse:separate;">
+                    <tr>
+                        <td align="center">
+                            <table border="0" cellpadding="0" cellspacing="0" width="590" style="padding: 16px; background-color: #FFFFFF; color: #454748; border-collapse:separate;">
+                                <tbody>
+                                    <!-- CONTENT -->
+                                    <tr>
+                                        <td align="center" style="min-width: 590px;">
+                                            <table border="0" cellpadding="0" cellspacing="0" width="590" style="min-width: 590px; background-color: white; padding: 0px 8px 0px 8px; border-collapse:separate;">
+                                                <tr>
+                                                    <td valign="top" style="font-size: 13px;">
+                                                        <div>
+                                                            Hello,<br /><br />
+                                                            The connection between <b><a t-att-href='object.get_base_url()' t-out="object.get_base_url() or ''">https://yourcompany.odoo.com</a></b> and <t t-out="object.account_online_link_id.name or ''">Belfius</t> <t t-if="not object.expiring_synchronization_due_day">expired.</t><t t-else="">expires in <t t-out="object.expiring_synchronization_due_day or ''">10</t> days.</t><br/>
+                                                            <div style="margin: 16px 0px 16px 0px;">
+                                                                <a t-attf-href="{{ website_url }}/renew_consent/{{ object.id }}?access_token={{object.access_token}}"
+                                                                   style="background-color: #4caf50; padding: 8px 16px 8px 16px; text-decoration: none; color: #fff; border-radius: 5px; font-size:13px;">
+                                                                    Renew Consent
+                                                                </a>
+                                                            </div>
+                                                            Security Tip: Check that the domain name you are redirected to is: <b><a t-att-href='object.get_base_url()' t-out="object.get_base_url() or ''">https://yourcompany.odoo.com</a></b>
+                                                        </div>
+                                                    </td>
+                                                </tr>
+                                                <tr>
+                                                    <td style="text-align:center;">
+                                                        <hr width="100%" style="background-color:rgb(204,204,204);border:medium none;clear:both;display:block;font-size:0px;min-height:1px;line-height:0; margin: 16px 0px 16px 0px;"/>
+                                                    </td>
+                                                </tr>
+                                            </table>
+                                        </td>
+                                    </tr>
+                                </tbody>
+                            </table>
+                        </td>
+                    </tr>
+                    <!-- POWERED BY -->
+                    <tr>
+                        <td align="center" style="min-width: 590px;">
+                            <table border="0" cellpadding="0" cellspacing="0" width="590" style="min-width: 590px; background-color: #F1F1F1; color: #454748; padding: 8px; border-collapse:separate;">
+                                <tr>
+                                    <td style="text-align: center; font-size: 13px;">
+                                        Powered by <a target="_blank" href="https://www.odoo.com?utm_source=db&amp;utm_medium=auth" style="color: #875A7B;">Odoo</a>
+                                    </td>
+                                </tr>
+                            </table>
+                            <table border="0" cellpadding="0" cellspacing="0" width="590" style="min-width: 590px; color: #454748; padding: 8px; border-collapse:separate;">
+                                <tr>
+                                    <td style="text-align: center; font-size: 11px;">
+                                        PS: This is an automated email sent by Odoo Accounting to remind you before a bank sync consent expiration.
+                                    </td>
+                                </tr>
+                            </table>
+                        </td>
+                    </tr>
+                </table>
+            </field>
+        </record>
+    </data>
+</odoo>
diff --git a/dev_odex30_accounting/odex30_account_online_sync/i18n/account_online_synchronization.pot b/dev_odex30_accounting/odex30_account_online_sync/i18n/account_online_synchronization.pot
new file mode 100644
index 0000000..b437820
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_online_sync/i18n/account_online_synchronization.pot
@@ -0,0 +1,1322 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# 	* odex30_account_online_sync
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 18.0+e\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2025-07-11 18:50+0000\n"
+"PO-Revision-Date: 2025-07-11 18:50+0000\n"
+"Last-Translator: \n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: odex30_account_online_sync
+#. odoo-python
+#: code:addons/odex30_account_online_sync/models/account_online.py:0
+msgid ""
+"\n"
+"\n"
+"If you've already opened a ticket for this issue, don't report it again: a support agent will contact you shortly."
+msgstr ""
+
+#. module: odex30_account_online_sync
+#. odoo-python
+#: code:addons/odex30_account_online_sync/wizard/account_journal_duplicate_transactions.py:0
+msgid "%s duplicate transactions"
+msgstr ""
+
+#. module: odex30_account_online_sync
+#. odoo-javascript
+#: code:addons/odex30_account_online_sync/static/src/components/transient_bank_statement_line_list_view/transient_bank_statement_line_list_view.xml:0
+msgid ""
+").\n"
+"                    This might cause duplicate entries."
+msgstr ""
+
+#. module: odex30_account_online_sync
+#. odoo-javascript
+#: code:addons/odex30_account_online_sync/static/src/components/refresh_spin_journal_widget/refresh_spin_journal_widget.xml:0
+msgid "0 transaction fetched"
+msgstr ""
+
+#. module: odex30_account_online_sync
+#: model_terms:ir.ui.view,arch_db:account_online_synchronization.account_duplicate_transaction_wizard_view_form
+msgid "<i class=\"fa fa-trash me-1\"/> Delete Selected"
+msgstr ""
+
+#. module: odex30_account_online_sync
+#: model_terms:ir.ui.view,arch_db:account_online_synchronization.account_journal_form
+msgid "<i class=\"oi oi-arrow-right me-2\"/> Send Now"
+msgstr ""
+
+#. module: odex30_account_online_sync
+#: model:mail.template,body_html:account_online_synchronization.email_template_sync_reminder
+msgid ""
+"<table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" style=\"padding-top: 16px; background-color: #FFFFFF; font-family:Verdana, Arial,sans-serif; color: #454748; width: 100%; border-collapse:separate;\">\n"
+"                    <tr>\n"
+"                        <td align=\"center\">\n"
+"                            <table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" width=\"590\" style=\"padding: 16px; background-color: #FFFFFF; color: #454748; border-collapse:separate;\">\n"
+"                                <tbody>\n"
+"                                    <!-- CONTENT -->\n"
+"                                    <tr>\n"
+"                                        <td align=\"center\" style=\"min-width: 590px;\">\n"
+"                                            <table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" width=\"590\" style=\"min-width: 590px; background-color: white; padding: 0px 8px 0px 8px; border-collapse:separate;\">\n"
+"                                                <tr>\n"
+"                                                    <td valign=\"top\" style=\"font-size: 13px;\">\n"
+"                                                        <div>\n"
+"                                                            Hello,<br/><br/>\n"
+"                                                            The connection between <b><a t-att-href=\"object.get_base_url()\" t-out=\"object.get_base_url() or ''\">https://yourcompany.odoo.com</a></b> and <t t-out=\"object.account_online_link_id.name or ''\">Belfius</t> <t t-if=\"not object.expiring_synchronization_due_day\">expired.</t><t t-else=\"\">expires in <t t-out=\"object.expiring_synchronization_due_day or ''\">10</t> days.</t><br/>\n"
+"                                                            <div style=\"margin: 16px 0px 16px 0px;\">\n"
+"                                                                <a t-attf-href=\"{{ website_url }}/renew_consent/{{ object.id }}?access_token={{object.access_token}}\" style=\"background-color: #4caf50; padding: 8px 16px 8px 16px; text-decoration: none; color: #fff; border-radius: 5px; font-size:13px;\">\n"
+"                                                                    Renew Consent\n"
+"                                                                </a>\n"
+"                                                            </div>\n"
+"                                                            Security Tip: Check that the domain name you are redirected to is: <b><a t-att-href=\"object.get_base_url()\" t-out=\"object.get_base_url() or ''\">https://yourcompany.odoo.com</a></b>\n"
+"                                                        </div>\n"
+"                                                    </td>\n"
+"                                                </tr>\n"
+"                                                <tr>\n"
+"                                                    <td style=\"text-align:center;\">\n"
+"                                                        <hr width=\"100%\" style=\"background-color:rgb(204,204,204);border:medium none;clear:both;display:block;font-size:0px;min-height:1px;line-height:0; margin: 16px 0px 16px 0px;\"/>\n"
+"                                                    </td>\n"
+"                                                </tr>\n"
+"                                            </table>\n"
+"                                        </td>\n"
+"                                    </tr>\n"
+"                                </tbody>\n"
+"                            </table>\n"
+"                        </td>\n"
+"                    </tr>\n"
+"                    <!-- POWERED BY -->\n"
+"                    <tr>\n"
+"                        <td align=\"center\" style=\"min-width: 590px;\">\n"
+"                            <table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" width=\"590\" style=\"min-width: 590px; background-color: #F1F1F1; color: #454748; padding: 8px; border-collapse:separate;\">\n"
+"                                <tr>\n"
+"                                    <td style=\"text-align: center; font-size: 13px;\">\n"
+"                                        Powered by <a target=\"_blank\" href=\"https://www.odoo.com?utm_source=db&amp;utm_medium=auth\" style=\"color: #875A7B;\">Odoo</a>\n"
+"                                    </td>\n"
+"                                </tr>\n"
+"                            </table>\n"
+"                            <table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" width=\"590\" style=\"min-width: 590px; color: #454748; padding: 8px; border-collapse:separate;\">\n"
+"                                <tr>\n"
+"                                    <td style=\"text-align: center; font-size: 11px;\">\n"
+"                                        PS: This is an automated email sent by Odoo Accounting to remind you before a bank sync consent expiration.\n"
+"                                    </td>\n"
+"                                </tr>\n"
+"                            </table>\n"
+"                        </td>\n"
+"                    </tr>\n"
+"                </table>\n"
+"            "
+msgstr ""
+
+#. module: odex30_account_online_sync
+#: model:ir.model.fields,field_description:account_online_synchronization.field_account_online_link__access_token
+msgid "Access Token"
+msgstr ""
+
+#. module: odex30_account_online_sync
+#: model:ir.model.fields,field_description:account_online_synchronization.field_account_online_account__account_data
+msgid "Account Data"
+msgstr ""
+
+#. module: odex30_account_online_sync
+#: model:ir.model.fields,field_description:account_online_synchronization.field_account_online_account__name
+msgid "Account Name"
+msgstr ""
+
+#. module: odex30_account_online_sync
+#: model:ir.model.fields,help:account_online_synchronization.field_account_online_account__name
+msgid "Account Name as provided by third party provider"
+msgstr ""
+
+#. module: odex30_account_online_sync
+#: model:ir.model.fields,field_description:account_online_synchronization.field_account_bank_statement_line_transient__account_number
+#: model:ir.model.fields,field_description:account_online_synchronization.field_account_online_account__account_number
+msgid "Account Number"
+msgstr ""
+
+#. module: odex30_account_online_sync
+#: model:ir.model.fields,field_description:account_online_synchronization.field_account_bank_selection__account_online_account_ids
+#: model:ir.model.fields,field_description:account_online_synchronization.field_account_bank_statement_line_transient__online_account_id
+#: model:ir.model.fields,field_description:account_online_synchronization.field_account_journal__account_online_account_id
+#: model:ir.model.fields,field_description:account_online_synchronization.field_account_online_link__account_online_account_ids
+msgid "Account Online Account"
+msgstr ""
+
+#. module: odex30_account_online_sync
+#: model:ir.model.fields,field_description:account_online_synchronization.field_account_bank_selection__account_online_link_id
+#: model:ir.model.fields,field_description:account_online_synchronization.field_account_bank_statement_line__online_link_id
+#: model:ir.model.fields,field_description:account_online_synchronization.field_account_journal__account_online_link_id
+#: model:ir.model.fields,field_description:account_online_synchronization.field_account_online_account__account_online_link_id
+msgid "Account Online Link"
+msgstr ""
+
+#. module: odex30_account_online_sync
+#: model:ir.actions.server,name:account_online_synchronization.online_sync_cron_waiting_synchronization_ir_actions_server
+msgid "Account: Journal online Waiting Synchronization"
+msgstr ""
+
+#. module: odex30_account_online_sync
+#: model:ir.actions.server,name:account_online_synchronization.online_sync_cron_ir_actions_server
+msgid "Account: Journal online sync"
+msgstr ""
+
+#. module: odex30_account_online_sync
+#: model:ir.actions.server,name:account_online_synchronization.online_sync_unused_connection_cron_ir_actions_server
+msgid "Account: Journal online sync cleanup unused connections"
+msgstr ""
+
+#. module: odex30_account_online_sync
+#: model:ir.actions.server,name:account_online_synchronization.online_sync_mail_cron_ir_actions_server
+msgid "Account: Journal online sync reminder"
+msgstr ""
+
+#. module: odex30_account_online_sync
+#: model:ir.model.fields,field_description:account_online_synchronization.field_account_online_link__message_needaction
+msgid "Action Needed"
+msgstr ""
+
+#. module: odex30_account_online_sync
+#: model:ir.model.fields,field_description:account_online_synchronization.field_account_online_link__activity_ids
+msgid "Activities"
+msgstr ""
+
+#. module: odex30_account_online_sync
+#: model:ir.model.fields,field_description:account_online_synchronization.field_account_online_link__activity_exception_decoration
+msgid "Activity Exception Decoration"
+msgstr ""
+
+#. module: odex30_account_online_sync
+#: model:ir.model.fields,field_description:account_online_synchronization.field_account_online_link__activity_state
+msgid "Activity State"
+msgstr ""
+
+#. module: odex30_account_online_sync
+#: model:ir.model,name:account_online_synchronization.model_mail_activity_type
+msgid "Activity Type"
+msgstr ""
+
+#. module: odex30_account_online_sync
+#: model:ir.model.fields,field_description:account_online_synchronization.field_account_online_link__activity_type_icon
+msgid "Activity Type Icon"
+msgstr ""
+
+#. module: odex30_account_online_sync
+#: model:ir.model.fields,field_description:account_online_synchronization.field_account_bank_statement_line_transient__amount
+msgid "Amount"
+msgstr ""
+
+#. module: odex30_account_online_sync
+#: model:ir.model.fields,field_description:account_online_synchronization.field_account_bank_statement_line_transient__amount_currency
+msgid "Amount in Currency"
+msgstr ""
+
+#. module: odex30_account_online_sync
+#: model:ir.model.fields,field_description:account_online_synchronization.field_account_online_link__message_attachment_count
+msgid "Attachment Count"
+msgstr ""
+
+#. module: odex30_account_online_sync
+#: model:ir.model.fields,field_description:account_online_synchronization.field_account_online_link__auto_sync
+msgid "Automatic synchronization"
+msgstr ""
+
+#. module: odex30_account_online_sync
+#: model:ir.model.fields,field_description:account_online_synchronization.field_account_online_account__balance
+msgid "Balance"
+msgstr ""
+
+#. module: odex30_account_online_sync
+#: model:ir.model.fields,help:account_online_synchronization.field_account_online_account__balance
+msgid "Balance of the account sent by the third party provider"
+msgstr ""
+
+#. module: odex30_account_online_sync
+#: model_terms:ir.ui.view,arch_db:account_online_synchronization.portal_renew_consent
+msgid "Bank"
+msgstr ""
+
+#. module: odex30_account_online_sync
+#: model:ir.model,name:account_online_synchronization.model_account_online_link
+msgid "Bank Connection"
+msgstr ""
+
+#. module: odex30_account_online_sync
+#: model:ir.model,name:account_online_synchronization.model_account_bank_statement_line
+msgid "Bank Statement Line"
+msgstr ""
+
+#. module: odex30_account_online_sync
+#: model:mail.activity.type,name:account_online_synchronization.bank_sync_activity_update_consent
+msgid "Bank Synchronization: Update consent"
+msgstr ""
+
+#. module: odex30_account_online_sync
+#. odoo-python
+#: code:addons/odex30_account_online_sync/models/account_online.py:0
+msgid "Bank Synchronization: Update your consent"
+msgstr ""
+
+#. module: odex30_account_online_sync
+#: model:mail.template,name:account_online_synchronization.email_template_sync_reminder
+msgid "Bank connection expiration reminder"
+msgstr ""
+
+#. module: odex30_account_online_sync
+#: model:ir.model,name:account_online_synchronization.model_bank_rec_widget
+msgid "Bank reconciliation widget for a single statement line"
+msgstr ""
+
+#. module: odex30_account_online_sync
+#: model_terms:ir.ui.view,arch_db:account_online_synchronization.account_missing_transaction_wizard_view_form
+#: model_terms:ir.ui.view,arch_db:account_online_synchronization.view_account_bank_selection_form_wizard
+msgid "Cancel"
+msgstr ""
+
+#. module: odex30_account_online_sync
+#. odoo-python
+#: code:addons/odex30_account_online_sync/models/account_online.py:0
+msgid "Check the documentation"
+msgstr ""
+
+#. module: odex30_account_online_sync
+#: model_terms:ir.ui.view,arch_db:account_online_synchronization.account_duplicate_transaction_wizard_view_form
+msgid ""
+"Choose a date and a journal from which you want to check the transactions."
+msgstr ""
+
+#. module: odex30_account_online_sync
+#: model_terms:ir.ui.view,arch_db:account_online_synchronization.account_missing_transaction_wizard_view_form
+msgid "Choose a date and a journal from which you want to fetch transactions"
+msgstr ""
+
+#. module: odex30_account_online_sync
+#: model:ir.model.fields,field_description:account_online_synchronization.field_account_online_link__client_id
+msgid "Client"
+msgstr ""
+
+#. module: odex30_account_online_sync
+#: model_terms:ir.ui.view,arch_db:account_online_synchronization.account_online_link_view_form
+msgid "Client id"
+msgstr ""
+
+#. module: odex30_account_online_sync
+#: model:ir.model.fields,help:account_online_synchronization.field_account_journal__renewal_contact_email
+msgid ""
+"Comma separated list of email addresses to send consent renewal "
+"notifications 15, 3 and 1 days before expiry"
+msgstr ""
+
+#. module: odex30_account_online_sync
+#: model:ir.model,name:account_online_synchronization.model_res_company
+msgid "Companies"
+msgstr ""
+
+#. module: odex30_account_online_sync
+#: model:ir.model.fields,field_description:account_online_synchronization.field_account_bank_statement_line_transient__company_id
+#: model:ir.model.fields,field_description:account_online_synchronization.field_account_online_account__company_id
+#: model:ir.model.fields,field_description:account_online_synchronization.field_account_online_link__company_id
+msgid "Company"
+msgstr ""
+
+#. module: odex30_account_online_sync
+#: model_terms:ir.ui.view,arch_db:account_online_synchronization.account_online_link_view_form
+msgid "Connect"
+msgstr ""
+
+#. module: odex30_account_online_sync
+#: model_terms:ir.ui.view,arch_db:account_online_synchronization.view_account_bank_selection_form_wizard
+msgid "Connect Bank"
+msgstr ""
+
+#. module: odex30_account_online_sync
+#: model_terms:ir.ui.view,arch_db:account_online_synchronization.account_journal_dashboard_inherit_online_sync
+msgid "Connect bank"
+msgstr ""
+
+#. module: odex30_account_online_sync
+#: model_terms:ir.ui.view,arch_db:account_online_synchronization.portal_renew_consent
+msgid "Connect my Bank"
+msgstr ""
+
+#. module: odex30_account_online_sync
+#: model_terms:ir.ui.view,arch_db:account_online_synchronization.portal_renew_consent
+msgid "Connect your bank account to Odoo"
+msgstr ""
+
+#. module: odex30_account_online_sync
+#: model:ir.model.fields.selection,name:account_online_synchronization.selection__account_online_link__state__connected
+msgid "Connected"
+msgstr ""
+
+#. module: odex30_account_online_sync
+#. odoo-javascript
+#: code:addons/odex30_account_online_sync/static/src/components/connected_until_widget/connected_until_widget.xml:0
+msgid "Connected until"
+msgstr ""
+
+#. module: odex30_account_online_sync
+#: model:ir.model.fields,field_description:account_online_synchronization.field_account_journal__renewal_contact_email
+msgid "Connection Requests"
+msgstr ""
+
+#. module: odex30_account_online_sync
+#: model:ir.model.fields,field_description:account_online_synchronization.field_account_online_link__connection_state_details
+msgid "Connection State Details"
+msgstr ""
+
+#. module: odex30_account_online_sync
+#: model:mail.message.subtype,name:account_online_synchronization.bank_sync_consent_renewal
+msgid "Consent Renewal"
+msgstr ""
+
+#. module: odex30_account_online_sync
+#: model:ir.model,name:account_online_synchronization.model_res_partner
+msgid "Contact"
+msgstr ""
+
+#. module: odex30_account_online_sync
+#: model:ir.model.fields,field_description:account_online_synchronization.field_account_bank_selection__create_uid
+#: model:ir.model.fields,field_description:account_online_synchronization.field_account_bank_statement_line_transient__create_uid
+#: model:ir.model.fields,field_description:account_online_synchronization.field_account_duplicate_transaction_wizard__create_uid
+#: model:ir.model.fields,field_description:account_online_synchronization.field_account_missing_transaction_wizard__create_uid
+#: model:ir.model.fields,field_description:account_online_synchronization.field_account_online_account__create_uid
+#: model:ir.model.fields,field_description:account_online_synchronization.field_account_online_link__create_uid
+msgid "Created by"
+msgstr ""
+
+#. module: odex30_account_online_sync
+#: model:ir.model.fields,field_description:account_online_synchronization.field_account_bank_selection__create_date
+#: model:ir.model.fields,field_description:account_online_synchronization.field_account_bank_statement_line_transient__create_date
+#: model:ir.model.fields,field_description:account_online_synchronization.field_account_duplicate_transaction_wizard__create_date
+#: model:ir.model.fields,field_description:account_online_synchronization.field_account_missing_transaction_wizard__create_date
+#: model:ir.model.fields,field_description:account_online_synchronization.field_account_online_account__create_date
+#: model:ir.model.fields,field_description:account_online_synchronization.field_account_online_link__create_date
+msgid "Created on"
+msgstr ""
+
+#. module: odex30_account_online_sync
+#: model:ir.model.fields,field_description:account_online_synchronization.field_account_bank_statement_line_transient__currency_id
+#: model:ir.model.fields,field_description:account_online_synchronization.field_account_online_account__currency_id
+msgid "Currency"
+msgstr ""
+
+#. module: odex30_account_online_sync
+#: model:ir.model.fields,field_description:account_online_synchronization.field_account_bank_statement_line_transient__date
+msgid "Date"
+msgstr ""
+
+#. module: odex30_account_online_sync
+#: model:ir.model.fields,help:account_online_synchronization.field_account_journal__expiring_synchronization_date
+#: model:ir.model.fields,help:account_online_synchronization.field_account_online_link__expiring_synchronization_date
+msgid "Date when the consent for this connection expires"
+msgstr ""
+
+#. module: odex30_account_online_sync
+#: model:ir.model.fields,field_description:account_online_synchronization.field_account_bank_selection__display_name
+#: model:ir.model.fields,field_description:account_online_synchronization.field_account_bank_statement_line_transient__display_name
+#: model:ir.model.fields,field_description:account_online_synchronization.field_account_duplicate_transaction_wizard__display_name
+#: model:ir.model.fields,field_description:account_online_synchronization.field_account_missing_transaction_wizard__display_name
+#: model:ir.model.fields,field_description:account_online_synchronization.field_account_online_account__display_name
+#: model:ir.model.fields,field_description:account_online_synchronization.field_account_online_link__display_name
+msgid "Display Name"
+msgstr ""
+
+#. module: odex30_account_online_sync
+#: model:ir.model.fields.selection,name:account_online_synchronization.selection__account_online_account__fetching_status__done
+msgid "Done"
+msgstr ""
+
+#. module: odex30_account_online_sync
+#. odoo-python
+#: code:addons/odex30_account_online_sync/models/account_bank_statement.py:0
+#: model:ir.model.fields.selection,name:account_online_synchronization.selection__account_online_link__state__error
+msgid "Error"
+msgstr ""
+
+#. module: odex30_account_online_sync
+#: model:ir.model.fields,field_description:account_online_synchronization.field_account_journal__expiring_synchronization_date
+#: model:ir.model.fields,field_description:account_online_synchronization.field_account_online_link__expiring_synchronization_date
+msgid "Expiring Synchronization Date"
+msgstr ""
+
+#. module: odex30_account_online_sync
+#: model:ir.model.fields,field_description:account_online_synchronization.field_account_journal__expiring_synchronization_due_day
+msgid "Expiring Synchronization Due Day"
+msgstr ""
+
+#. module: odex30_account_online_sync
+#. odoo-javascript
+#: code:addons/odex30_account_online_sync/static/src/components/connected_until_widget/connected_until_widget.xml:0
+msgid "Extend Connection"
+msgstr ""
+
+#. module: odex30_account_online_sync
+#: model:ir.model.fields,help:account_online_synchronization.field_account_online_account__account_data
+msgid "Extra information needed by third party provider"
+msgstr ""
+
+#. module: odex30_account_online_sync
+#: model_terms:ir.ui.view,arch_db:account_online_synchronization.account_missing_transaction_wizard_view_form
+msgid "Fetch"
+msgstr ""
+
+#. module: odex30_account_online_sync
+#: model_terms:ir.ui.view,arch_db:account_online_synchronization.account_duplicate_transaction_wizard_view_form
+#: model_terms:ir.ui.view,arch_db:account_online_synchronization.account_missing_transaction_wizard_view_form
+msgid "Fetch Missing Bank Statements Wizard"
+msgstr ""
+
+#. module: odex30_account_online_sync
+#. odoo-javascript
+#: code:addons/odex30_account_online_sync/static/src/components/refresh_spin_journal_widget/refresh_spin_journal_widget.xml:0
+#: model_terms:ir.ui.view,arch_db:account_online_synchronization.account_online_link_view_form
+msgid "Fetch Transactions"
+msgstr ""
+
+#. module: odex30_account_online_sync
+#. odoo-python
+#: code:addons/odex30_account_online_sync/models/account_online.py:0
+msgid "Fetched Transactions"
+msgstr ""
+
+#. module: odex30_account_online_sync
+#: model:ir.model.fields,field_description:account_online_synchronization.field_account_journal__online_sync_fetching_status
+#: model:ir.model.fields,field_description:account_online_synchronization.field_account_online_account__fetching_status
+msgid "Fetching Status"
+msgstr ""
+
+#. module: odex30_account_online_sync
+#. odoo-javascript
+#: code:addons/odex30_account_online_sync/static/src/components/refresh_spin_journal_widget/refresh_spin_journal_widget.xml:0
+msgid "Fetching..."
+msgstr ""
+
+#. module: odex30_account_online_sync
+#. odoo-javascript
+#. odoo-python
+#: code:addons/odex30_account_online_sync/models/account_journal.py:0
+#: code:addons/odex30_account_online_sync/static/src/components/bank_reconciliation/find_duplicate_transactions_cog_menu.xml:0
+msgid "Find Duplicate Transactions"
+msgstr ""
+
+#. module: odex30_account_online_sync
+#. odoo-javascript
+#. odoo-python
+#: code:addons/odex30_account_online_sync/models/account_journal.py:0
+#: code:addons/odex30_account_online_sync/static/src/components/bank_reconciliation/fetch_missing_transactions_cog_menu.xml:0
+msgid "Find Missing Transactions"
+msgstr ""
+
+#. module: odex30_account_online_sync
+#: model:ir.model.fields,field_description:account_online_synchronization.field_account_duplicate_transaction_wizard__first_ids_in_group
+msgid "First Ids In Group"
+msgstr ""
+
+#. module: odex30_account_online_sync
+#: model:ir.model.fields,field_description:account_online_synchronization.field_account_online_link__message_follower_ids
+msgid "Followers"
+msgstr ""
+
+#. module: odex30_account_online_sync
+#: model:ir.model.fields,field_description:account_online_synchronization.field_account_online_link__message_partner_ids
+msgid "Followers (Partners)"
+msgstr ""
+
+#. module: odex30_account_online_sync
+#: model:ir.model.fields,help:account_online_synchronization.field_account_online_link__activity_type_icon
+msgid "Font awesome icon e.g. fa-tasks"
+msgstr ""
+
+#. module: odex30_account_online_sync
+#: model:ir.model.fields,field_description:account_online_synchronization.field_account_bank_statement_line_transient__foreign_currency_id
+msgid "Foreign Currency"
+msgstr ""
+
+#. module: odex30_account_online_sync
+#: model:ir.model.fields,field_description:account_online_synchronization.field_account_online_link__has_message
+msgid "Has Message"
+msgstr ""
+
+#. module: odex30_account_online_sync
+#: model:ir.model.fields,field_description:account_online_synchronization.field_account_online_link__has_unlinked_accounts
+msgid "Has Unlinked Accounts"
+msgstr ""
+
+#. module: odex30_account_online_sync
+#. odoo-python
+#: code:addons/odex30_account_online_sync/models/account_online.py:0
+msgid "Here"
+msgstr ""
+
+#. module: odex30_account_online_sync
+#: model:ir.model.fields,field_description:account_online_synchronization.field_account_bank_selection__id
+#: model:ir.model.fields,field_description:account_online_synchronization.field_account_bank_statement_line_transient__id
+#: model:ir.model.fields,field_description:account_online_synchronization.field_account_duplicate_transaction_wizard__id
+#: model:ir.model.fields,field_description:account_online_synchronization.field_account_missing_transaction_wizard__id
+#: model:ir.model.fields,field_description:account_online_synchronization.field_account_online_account__id
+#: model:ir.model.fields,field_description:account_online_synchronization.field_account_online_link__id
+msgid "ID"
+msgstr ""
+
+#. module: odex30_account_online_sync
+#: model:ir.model.fields,field_description:account_online_synchronization.field_account_online_link__activity_exception_icon
+msgid "Icon"
+msgstr ""
+
+#. module: odex30_account_online_sync
+#: model:ir.model.fields,help:account_online_synchronization.field_account_online_link__activity_exception_icon
+msgid "Icon to indicate an exception activity."
+msgstr ""
+
+#. module: odex30_account_online_sync
+#: model:ir.model.fields,help:account_online_synchronization.field_account_online_account__online_identifier
+msgid "Id used to identify account by third party provider"
+msgstr ""
+
+#. module: odex30_account_online_sync
+#: model:ir.model.fields,help:account_online_synchronization.field_account_online_link__message_needaction
+msgid "If checked, new messages require your attention."
+msgstr ""
+
+#. module: odex30_account_online_sync
+#: model:ir.model.fields,help:account_online_synchronization.field_account_online_link__message_has_error
+#: model:ir.model.fields,help:account_online_synchronization.field_account_online_link__message_has_sms_error
+msgid "If checked, some messages have a delivery error."
+msgstr ""
+
+#. module: odex30_account_online_sync
+#: model:ir.model.fields,help:account_online_synchronization.field_account_online_account__inverse_balance_sign
+msgid "If checked, the balance sign will be inverted"
+msgstr ""
+
+#. module: odex30_account_online_sync
+#: model:ir.model.fields,help:account_online_synchronization.field_account_online_account__inverse_transaction_sign
+msgid "If checked, the transaction sign will be inverted"
+msgstr ""
+
+#. module: odex30_account_online_sync
+#: model:ir.model.fields,help:account_online_synchronization.field_account_online_link__auto_sync
+msgid ""
+"If possible, we will try to automatically fetch new transactions for this record\n"
+"                \n"
+"If the automatic sync is disabled. that will be due to security policy on the bank's end. So, they have to launch the sync manually"
+msgstr ""
+
+#. module: odex30_account_online_sync
+#. odoo-javascript
+#: code:addons/odex30_account_online_sync/static/src/components/transient_bank_statement_line_list_view/transient_bank_statement_line_list_view.xml:0
+msgid "Import Transactions"
+msgstr ""
+
+#. module: odex30_account_online_sync
+#: model:ir.model.fields,help:account_online_synchronization.field_account_online_link__provider_data
+msgid "Information needed to interact with third party provider"
+msgstr ""
+
+#. module: odex30_account_online_sync
+#: model:ir.model.fields,help:account_online_synchronization.field_account_bank_selection__institution_name
+#: model:ir.model.fields,help:account_online_synchronization.field_account_online_link__name
+msgid "Institution Name"
+msgstr ""
+
+#. module: odex30_account_online_sync
+#. odoo-python
+#: code:addons/odex30_account_online_sync/models/account_online.py:0
+msgid "Internal Error"
+msgstr ""
+
+#. module: odex30_account_online_sync
+#. odoo-python
+#: code:addons/odex30_account_online_sync/models/account_online.py:0
+msgid "Invalid URL"
+msgstr ""
+
+#. module: odex30_account_online_sync
+#. odoo-python
+#: code:addons/odex30_account_online_sync/models/account_online.py:0
+msgid "Invalid value for proxy_mode config parameter."
+msgstr ""
+
+#. module: odex30_account_online_sync
+#: model:ir.model.fields,field_description:account_online_synchronization.field_account_online_account__inverse_balance_sign
+msgid "Inverse Balance Sign"
+msgstr ""
+
+#. module: odex30_account_online_sync
+#: model:ir.model.fields,field_description:account_online_synchronization.field_account_online_account__inverse_transaction_sign
+msgid "Inverse Transaction Sign"
+msgstr ""
+
+#. module: odex30_account_online_sync
+#: model:ir.model.fields,field_description:account_online_synchronization.field_account_online_link__message_is_follower
+msgid "Is Follower"
+msgstr ""
+
+#. module: odex30_account_online_sync
+#: model:ir.model,name:account_online_synchronization.model_account_journal
+#: model:ir.model.fields,field_description:account_online_synchronization.field_account_bank_statement_line_transient__journal_id
+#: model:ir.model.fields,field_description:account_online_synchronization.field_account_duplicate_transaction_wizard__journal_id
+#: model:ir.model.fields,field_description:account_online_synchronization.field_account_missing_transaction_wizard__journal_id
+#: model:ir.model.fields,field_description:account_online_synchronization.field_account_online_account__journal_ids
+#: model:ir.model.fields,field_description:account_online_synchronization.field_account_online_link__journal_ids
+#: model_terms:ir.ui.view,arch_db:account_online_synchronization.portal_renew_consent
+msgid "Journal"
+msgstr ""
+
+#. module: odex30_account_online_sync
+#. odoo-python
+#: code:addons/odex30_account_online_sync/models/account_online.py:0
+msgid ""
+"Journal %(journal_name)s has been set up with a different currency and "
+"already has existing entries. You can't link selected bank account in "
+"%(currency_name)s to it"
+msgstr ""
+
+#. module: odex30_account_online_sync
+#: model:ir.model.fields,field_description:account_online_synchronization.field_account_online_link__last_refresh
+msgid "Last Refresh"
+msgstr ""
+
+#. module: odex30_account_online_sync
+#: model:ir.model.fields,field_description:account_online_synchronization.field_account_bank_selection__write_uid
+#: model:ir.model.fields,field_description:account_online_synchronization.field_account_bank_statement_line_transient__write_uid
+#: model:ir.model.fields,field_description:account_online_synchronization.field_account_duplicate_transaction_wizard__write_uid
+#: model:ir.model.fields,field_description:account_online_synchronization.field_account_missing_transaction_wizard__write_uid
+#: model:ir.model.fields,field_description:account_online_synchronization.field_account_online_account__write_uid
+#: model:ir.model.fields,field_description:account_online_synchronization.field_account_online_link__write_uid
+msgid "Last Updated by"
+msgstr ""
+
+#. module: odex30_account_online_sync
+#: model:ir.model.fields,field_description:account_online_synchronization.field_account_bank_selection__write_date
+#: model:ir.model.fields,field_description:account_online_synchronization.field_account_bank_statement_line_transient__write_date
+#: model:ir.model.fields,field_description:account_online_synchronization.field_account_duplicate_transaction_wizard__write_date
+#: model:ir.model.fields,field_description:account_online_synchronization.field_account_missing_transaction_wizard__write_date
+#: model:ir.model.fields,field_description:account_online_synchronization.field_account_online_account__write_date
+#: model:ir.model.fields,field_description:account_online_synchronization.field_account_online_link__write_date
+msgid "Last Updated on"
+msgstr ""
+
+#. module: odex30_account_online_sync
+#: model_terms:ir.ui.view,arch_db:account_online_synchronization.account_online_link_view_form
+msgid "Last refresh"
+msgstr ""
+
+#. module: odex30_account_online_sync
+#: model:ir.model.fields,field_description:account_online_synchronization.field_account_online_account__last_sync
+msgid "Last synchronization"
+msgstr ""
+
+#. module: odex30_account_online_sync
+#: model_terms:ir.ui.view,arch_db:account_online_synchronization.portal_renew_consent
+msgid "Latest Balance"
+msgstr ""
+
+#. module: odex30_account_online_sync
+#: model:ir.model,name:account_online_synchronization.model_account_bank_selection
+msgid "Link a bank account to the selected journal"
+msgstr ""
+
+#. module: odex30_account_online_sync
+#. odoo-python
+#: code:addons/odex30_account_online_sync/wizard/account_journal_missing_transactions.py:0
+msgid "Manual Bank Statement Lines"
+msgstr ""
+
+#. module: odex30_account_online_sync
+#. odoo-python
+#: code:addons/odex30_account_online_sync/models/account_online.py:0
+msgid "Message"
+msgstr ""
+
+#. module: odex30_account_online_sync
+#: model:ir.model.fields,field_description:account_online_synchronization.field_account_online_link__message_has_error
+msgid "Message Delivery error"
+msgstr ""
+
+#. module: odex30_account_online_sync
+#: model:ir.model.fields,field_description:account_online_synchronization.field_account_online_link__message_ids
+msgid "Messages"
+msgstr ""
+
+#. module: odex30_account_online_sync
+#. odoo-python
+#: code:addons/odex30_account_online_sync/wizard/account_journal_missing_transactions.py:0
+msgid "Missing and Pending Transactions"
+msgstr ""
+
+#. module: odex30_account_online_sync
+#: model:ir.model.fields,field_description:account_online_synchronization.field_account_online_link__my_activity_date_deadline
+msgid "My Activity Deadline"
+msgstr ""
+
+#. module: odex30_account_online_sync
+#: model:ir.model.fields,field_description:account_online_synchronization.field_account_bank_selection__institution_name
+#: model:ir.model.fields,field_description:account_online_synchronization.field_account_online_link__name
+msgid "Name"
+msgstr ""
+
+#. module: odex30_account_online_sync
+#: model:ir.model.fields,field_description:account_online_synchronization.field_account_online_link__activity_calendar_event_id
+msgid "Next Activity Calendar Event"
+msgstr ""
+
+#. module: odex30_account_online_sync
+#: model:ir.model.fields,field_description:account_online_synchronization.field_account_online_link__activity_date_deadline
+msgid "Next Activity Deadline"
+msgstr ""
+
+#. module: odex30_account_online_sync
+#: model:ir.model.fields,field_description:account_online_synchronization.field_account_online_link__activity_summary
+msgid "Next Activity Summary"
+msgstr ""
+
+#. module: odex30_account_online_sync
+#: model:ir.model.fields,field_description:account_online_synchronization.field_account_online_link__activity_type_id
+msgid "Next Activity Type"
+msgstr ""
+
+#. module: odex30_account_online_sync
+#: model:ir.model.fields,field_description:account_online_synchronization.field_account_online_link__next_refresh
+msgid "Next synchronization"
+msgstr ""
+
+#. module: odex30_account_online_sync
+#: model:ir.model.fields.selection,name:account_online_synchronization.selection__account_online_link__state__disconnected
+msgid "Not Connected"
+msgstr ""
+
+#. module: odex30_account_online_sync
+#: model:ir.model.fields,field_description:account_online_synchronization.field_account_online_link__message_needaction_counter
+msgid "Number of Actions"
+msgstr ""
+
+#. module: odex30_account_online_sync
+#: model:ir.model.fields,field_description:account_online_synchronization.field_account_online_link__message_has_error_counter
+msgid "Number of errors"
+msgstr ""
+
+#. module: odex30_account_online_sync
+#: model:ir.model.fields,help:account_online_synchronization.field_account_online_link__message_needaction_counter
+msgid "Number of messages requiring action"
+msgstr ""
+
+#. module: odex30_account_online_sync
+#: model:ir.model.fields,help:account_online_synchronization.field_account_online_link__message_has_error_counter
+msgid "Number of messages with delivery error"
+msgstr ""
+
+#. module: odex30_account_online_sync
+#: model_terms:ir.ui.view,arch_db:account_online_synchronization.portal_renew_consent
+msgid "Odoo"
+msgstr ""
+
+#. module: odex30_account_online_sync
+#: model:ir.model.fields,field_description:account_online_synchronization.field_account_bank_statement_line__online_account_id
+msgid "Online Account"
+msgstr ""
+
+#. module: odex30_account_online_sync
+#: model_terms:ir.ui.view,arch_db:account_online_synchronization.account_online_link_view_form
+msgid "Online Accounts"
+msgstr ""
+
+#. module: odex30_account_online_sync
+#: model:ir.model.fields,field_description:account_online_synchronization.field_account_online_account__online_identifier
+msgid "Online Identifier"
+msgstr ""
+
+#. module: odex30_account_online_sync
+#: model:ir.model.fields,field_description:account_online_synchronization.field_account_journal__next_link_synchronization
+msgid "Online Link Next synchronization"
+msgstr ""
+
+#. module: odex30_account_online_sync
+#: model:ir.model.fields,field_description:account_online_synchronization.field_account_bank_statement_line__online_partner_information
+#: model:ir.model.fields,field_description:account_online_synchronization.field_res_partner__online_partner_information
+#: model:ir.model.fields,field_description:account_online_synchronization.field_res_users__online_partner_information
+msgid "Online Partner Information"
+msgstr ""
+
+#. module: odex30_account_online_sync
+#. odoo-python
+#: code:addons/odex30_account_online_sync/models/account_journal.py:0
+#: model:ir.actions.act_window,name:account_online_synchronization.action_account_online_link_form
+#: model:ir.ui.menu,name:account_online_synchronization.menu_action_online_link_account
+#: model_terms:ir.actions.act_window,help:account_online_synchronization.action_account_online_link_form
+msgid "Online Synchronization"
+msgstr ""
+
+#. module: odex30_account_online_sync
+#: model:ir.model.fields,field_description:account_online_synchronization.field_account_bank_statement_line__online_transaction_identifier
+#: model:ir.model.fields,field_description:account_online_synchronization.field_account_bank_statement_line_transient__online_transaction_identifier
+msgid "Online Transaction Identifier"
+msgstr ""
+
+#. module: odex30_account_online_sync
+#. odoo-python
+#: code:addons/odex30_account_online_sync/models/account_bank_statement.py:0
+msgid "Opening statement: first synchronization"
+msgstr ""
+
+#. module: odex30_account_online_sync
+#: model:ir.model.fields,field_description:account_online_synchronization.field_account_bank_statement_line_transient__partner_name
+msgid "Partner Name"
+msgstr ""
+
+#. module: odex30_account_online_sync
+#: model:ir.model.fields,field_description:account_online_synchronization.field_account_bank_statement_line_transient__payment_ref
+msgid "Payment Ref"
+msgstr ""
+
+#. module: odex30_account_online_sync
+#: model:ir.model.fields.selection,name:account_online_synchronization.selection__account_bank_statement_line_transient__state__pending
+msgid "Pending"
+msgstr ""
+
+#. module: odex30_account_online_sync
+#: model:ir.model.fields.selection,name:account_online_synchronization.selection__account_online_account__fetching_status__planned
+msgid "Planned"
+msgstr ""
+
+#. module: odex30_account_online_sync
+#. odoo-python
+#: code:addons/odex30_account_online_sync/wizard/account_journal_missing_transactions.py:0
+msgid "Please enter a valid Starting Date to continue."
+msgstr ""
+
+#. module: odex30_account_online_sync
+#. odoo-python
+#: code:addons/odex30_account_online_sync/models/account_online.py:0
+msgid "Please reconnect your online account."
+msgstr ""
+
+#. module: odex30_account_online_sync
+#. odoo-python
+#: code:addons/odex30_account_online_sync/wizard/account_bank_statement_line.py:0
+msgid "Please select first the transactions you wish to import."
+msgstr ""
+
+#. module: odex30_account_online_sync
+#: model:ir.model.fields.selection,name:account_online_synchronization.selection__account_bank_statement_line_transient__state__posted
+msgid "Posted"
+msgstr ""
+
+#. module: odex30_account_online_sync
+#: model_terms:ir.ui.view,arch_db:account_online_synchronization.missing_bank_statement_line_search
+msgid "Posted Transactions"
+msgstr ""
+
+#. module: odex30_account_online_sync
+#: model:ir.model.fields.selection,name:account_online_synchronization.selection__account_online_account__fetching_status__processing
+msgid "Processing"
+msgstr ""
+
+#. module: odex30_account_online_sync
+#: model:ir.model.fields,field_description:account_online_synchronization.field_account_online_link__provider_data
+msgid "Provider Data"
+msgstr ""
+
+#. module: odex30_account_online_sync
+#: model:ir.model.fields,field_description:account_online_synchronization.field_account_online_link__provider_type
+msgid "Provider Type"
+msgstr ""
+
+#. module: odex30_account_online_sync
+#: model:ir.model.fields,field_description:account_online_synchronization.field_account_online_link__rating_ids
+msgid "Ratings"
+msgstr ""
+
+#. module: odex30_account_online_sync
+#: model_terms:ir.ui.view,arch_db:account_online_synchronization.account_online_link_view_form
+msgid "Reconnect"
+msgstr ""
+
+#. module: odex30_account_online_sync
+#. odoo-javascript
+#: code:addons/odex30_account_online_sync/static/src/components/connected_until_widget/connected_until_widget.xml:0
+#: code:addons/odex30_account_online_sync/static/src/components/refresh_spin_journal_widget/refresh_spin_journal_widget.xml:0
+#: model_terms:ir.ui.view,arch_db:account_online_synchronization.account_journal_dashboard_inherit_online_sync
+msgid "Reconnect Bank"
+msgstr ""
+
+#. module: odex30_account_online_sync
+#. odoo-python
+#: code:addons/odex30_account_online_sync/models/account_online.py:0
+msgid "Redirect"
+msgstr ""
+
+#. module: odex30_account_online_sync
+#. odoo-javascript
+#: code:addons/odex30_account_online_sync/static/src/components/refresh_spin_journal_widget/refresh_spin_journal_widget.xml:0
+msgid "Refresh"
+msgstr ""
+
+#. module: odex30_account_online_sync
+#: model:ir.model.fields,field_description:account_online_synchronization.field_account_online_link__refresh_token
+msgid "Refresh Token"
+msgstr ""
+
+#. module: odex30_account_online_sync
+#. odoo-python
+#: code:addons/odex30_account_online_sync/models/account_journal.py:0
+msgid "Report Issue"
+msgstr ""
+
+#. module: odex30_account_online_sync
+#. odoo-python
+#: code:addons/odex30_account_online_sync/models/account_online.py:0
+msgid "Report issue"
+msgstr ""
+
+#. module: odex30_account_online_sync
+#: model:ir.model.fields,help:account_online_synchronization.field_account_online_link__client_id
+msgid "Represent a link for a given user towards a banking institution"
+msgstr ""
+
+#. module: odex30_account_online_sync
+#: model_terms:ir.ui.view,arch_db:account_online_synchronization.account_online_link_view_form
+msgid "Reset"
+msgstr ""
+
+#. module: odex30_account_online_sync
+#: model:ir.model.fields,field_description:account_online_synchronization.field_account_online_link__activity_user_id
+msgid "Responsible User"
+msgstr ""
+
+#. module: odex30_account_online_sync
+#: model:ir.model.fields,field_description:account_online_synchronization.field_account_online_link__message_has_sms_error
+msgid "SMS Delivery error"
+msgstr ""
+
+#. module: odex30_account_online_sync
+#. odoo-javascript
+#: code:addons/odex30_account_online_sync/static/src/components/bank_configure/bank_configure.xml:0
+msgid "Search over"
+msgstr ""
+
+#. module: odex30_account_online_sync
+#: model_terms:ir.ui.view,arch_db:account_online_synchronization.portal_renew_consent
+msgid ""
+"Security Tip: always check the domain name of this page, before clicking on "
+"the button."
+msgstr ""
+
+#. module: odex30_account_online_sync
+#. odoo-javascript
+#: code:addons/odex30_account_online_sync/static/src/components/refresh_spin_journal_widget/refresh_spin_journal_widget.xml:0
+msgid "See error"
+msgstr ""
+
+#. module: odex30_account_online_sync
+#. odoo-python
+#: code:addons/odex30_account_online_sync/models/account_online.py:0
+#: model_terms:ir.ui.view,arch_db:account_online_synchronization.view_account_bank_selection_form_wizard
+msgid "Select a Bank Account"
+msgstr ""
+
+#. module: odex30_account_online_sync
+#: model_terms:ir.ui.view,arch_db:account_online_synchronization.view_account_bank_selection_form_wizard
+msgid "Select the"
+msgstr ""
+
+#. module: odex30_account_online_sync
+#: model:ir.model.fields,field_description:account_online_synchronization.field_account_bank_selection__selected_account
+msgid "Selected Account"
+msgstr ""
+
+#. module: odex30_account_online_sync
+#: model:ir.model.fields,field_description:account_online_synchronization.field_account_bank_statement_line_transient__sequence
+msgid "Sequence"
+msgstr ""
+
+#. module: odex30_account_online_sync
+#: model:ir.model.fields,help:account_online_synchronization.field_account_online_account__account_number
+msgid "Set if third party provider has the full account number"
+msgstr ""
+
+#. module: odex30_account_online_sync
+#. odoo-javascript
+#: code:addons/odex30_account_online_sync/static/src/components/bank_configure/bank_configure.xml:0
+msgid "Setup Bank"
+msgstr ""
+
+#. module: odex30_account_online_sync
+#. odoo-python
+#: code:addons/odex30_account_online_sync/models/account_online.py:0
+msgid "Setup Bank Account"
+msgstr ""
+
+#. module: odex30_account_online_sync
+#: model:ir.model.fields,field_description:account_online_synchronization.field_account_online_link__show_sync_actions
+msgid "Show Sync Actions"
+msgstr ""
+
+#. module: odex30_account_online_sync
+#. odoo-javascript
+#: code:addons/odex30_account_online_sync/static/src/components/views/account_online_authorization_kanban_controller.xml:0
+msgid "Some transactions"
+msgstr ""
+
+#. module: odex30_account_online_sync
+#: model:ir.model.fields,field_description:account_online_synchronization.field_account_duplicate_transaction_wizard__date
+#: model:ir.model.fields,field_description:account_online_synchronization.field_account_missing_transaction_wizard__date
+msgid "Starting Date"
+msgstr ""
+
+#. module: odex30_account_online_sync
+#: model:ir.model.fields,field_description:account_online_synchronization.field_account_bank_statement_line_transient__state
+#: model:ir.model.fields,field_description:account_online_synchronization.field_account_journal__account_online_link_state
+#: model:ir.model.fields,field_description:account_online_synchronization.field_account_online_link__state
+msgid "State"
+msgstr ""
+
+#. module: odex30_account_online_sync
+#: model:ir.model.fields,help:account_online_synchronization.field_account_online_link__activity_state
+msgid ""
+"Status based on activities\n"
+"Overdue: Due date is already passed\n"
+"Today: Activity date is today\n"
+"Planned: Future activities."
+msgstr ""
+
+#. module: odex30_account_online_sync
+#: model_terms:ir.ui.view,arch_db:account_online_synchronization.portal_renew_consent
+msgid "Thank You!"
+msgstr ""
+
+#. module: odex30_account_online_sync
+#. odoo-python
+#: code:addons/odex30_account_online_sync/models/account_online.py:0
+msgid "The consent for the selected account has expired."
+msgstr ""
+
+#. module: odex30_account_online_sync
+#. odoo-python
+#: code:addons/odex30_account_online_sync/models/account_online.py:0
+msgid ""
+"The online synchronization service is not available at the moment. Please "
+"try again later."
+msgstr ""
+
+#. module: odex30_account_online_sync
+#: model:ir.model.fields,help:account_online_synchronization.field_account_online_link__provider_type
+msgid "Third Party Provider"
+msgstr ""
+
+#. module: odex30_account_online_sync
+#: model_terms:ir.ui.view,arch_db:account_online_synchronization.account_duplicate_transaction_wizard_view_form
+msgid ""
+"This action will delete all selected transactions. Are you sure you want to "
+"proceed?"
+msgstr ""
+
+#. module: odex30_account_online_sync
+#: model_terms:ir.ui.view,arch_db:account_online_synchronization.account_online_link_view_form
+msgid "This button will reset the fetching status"
+msgstr ""
+
+#. module: odex30_account_online_sync
+#. odoo-python
+#: code:addons/odex30_account_online_sync/models/account_online.py:0
+msgid ""
+"This version of Odoo appears to be outdated and does not support the '%s' "
+"sync mode. Installing the latest update might solve this."
+msgstr ""
+
+#. module: odex30_account_online_sync
+#: model_terms:ir.actions.act_window,help:account_online_synchronization.action_account_online_link_form
+msgid ""
+"To create a synchronization with your banking institution,<br>\n"
+"                please click on <b>Add a Bank Account</b>."
+msgstr ""
+
+#. module: odex30_account_online_sync
+#: model:ir.model.fields,help:account_online_synchronization.field_account_online_link__access_token
+msgid "Token used to access API."
+msgstr ""
+
+#. module: odex30_account_online_sync
+#: model:ir.model.fields,help:account_online_synchronization.field_account_online_link__refresh_token
+msgid "Token used to sign API request, Never disclose it"
+msgstr ""
+
+#. module: odex30_account_online_sync
+#: model:ir.model.fields,field_description:account_online_synchronization.field_account_duplicate_transaction_wizard__transaction_ids
+msgid "Transaction"
+msgstr ""
+
+#. module: odex30_account_online_sync
+#: model:ir.model.fields,field_description:account_online_synchronization.field_account_bank_statement_line_transient__transaction_details
+msgid "Transaction Details"
+msgstr ""
+
+#. module: odex30_account_online_sync
+#: model_terms:ir.ui.view,arch_db:account_online_synchronization.account_duplicate_transaction_wizard_view_form
+msgid "Transactions"
+msgstr ""
+
+#. module: odex30_account_online_sync
+#: model:ir.model,name:account_online_synchronization.model_account_bank_statement_line_transient
+msgid "Transient model for bank statement line"
+msgstr ""
+
+#. module: odex30_account_online_sync
+#: model:ir.model.fields,help:account_online_synchronization.field_account_online_link__has_unlinked_accounts
+msgid ""
+"True if that connection still has accounts that are not linked to an Odoo "
+"journal"
+msgstr ""
+
+#. module: odex30_account_online_sync
+#: model:ir.model.fields,help:account_online_synchronization.field_account_online_link__activity_exception_decoration
+msgid "Type of the exception activity on record."
+msgstr ""
+
+#. module: odex30_account_online_sync
+#: model_terms:ir.ui.view,arch_db:account_online_synchronization.account_online_link_view_form
+msgid "Update Credentials"
+msgstr ""
+
+#. module: odex30_account_online_sync
+#: model:ir.model.fields.selection,name:account_online_synchronization.selection__account_online_account__fetching_status__waiting
+msgid "Waiting"
+msgstr ""
+
+#. module: odex30_account_online_sync
+#: model:ir.model.fields,field_description:account_online_synchronization.field_account_online_link__website_message_ids
+msgid "Website Messages"
+msgstr ""
+
+#. module: odex30_account_online_sync
+#: model:ir.model.fields,help:account_online_synchronization.field_account_online_link__website_message_ids
+msgid "Website communication history"
+msgstr ""
+
+#. module: odex30_account_online_sync
+#: model:ir.model,name:account_online_synchronization.model_account_duplicate_transaction_wizard
+msgid "Wizard for duplicate transactions"
+msgstr ""
+
+#. module: odex30_account_online_sync
+#: model:ir.model,name:account_online_synchronization.model_account_missing_transaction_wizard
+msgid "Wizard for missing transactions"
+msgstr ""
+
+#. module: odex30_account_online_sync
+#. odoo-javascript
+#: code:addons/odex30_account_online_sync/static/src/components/transient_bank_statement_line_list_view/transient_bank_statement_line_list_view.xml:0
+msgid ""
+"You are importing transactions before the creation of your online synchronization\n"
+"                    ("
+msgstr ""
+
+#. module: odex30_account_online_sync
+#. odoo-python
+#: code:addons/odex30_account_online_sync/models/account_online.py:0
+msgid "You can contact Odoo support"
+msgstr ""
+
+#. module: odex30_account_online_sync
+#. odoo-python
+#: code:addons/odex30_account_online_sync/models/account_journal.py:0
+msgid "You can only execute this action for bank-synchronized journals."
+msgstr ""
+
+#. module: odex30_account_online_sync
+#. odoo-python
+#: code:addons/odex30_account_online_sync/models/account_journal.py:0
+#: code:addons/odex30_account_online_sync/wizard/account_journal_missing_transactions.py:0
+msgid ""
+"You can't find missing transactions for a journal that isn't connected."
+msgstr ""
+
+#. module: odex30_account_online_sync
+#. odoo-python
+#: code:addons/odex30_account_online_sync/models/account_journal.py:0
+#: code:addons/odex30_account_online_sync/models/account_online.py:0
+msgid "You cannot have two journals associated with the same Online Account."
+msgstr ""
+
+#. module: odex30_account_online_sync
+#. odoo-python
+#: code:addons/odex30_account_online_sync/wizard/account_bank_statement_line.py:0
+msgid "You cannot import pending transactions."
+msgstr ""
+
+#. module: odex30_account_online_sync
+#. odoo-javascript
+#: code:addons/odex30_account_online_sync/static/src/components/transient_bank_statement_line_list_view/transient_bank_statement_line_list_view.xml:0
+msgid "You have"
+msgstr ""
+
+#. module: odex30_account_online_sync
+#. odoo-python
+#: code:addons/odex30_account_online_sync/wizard/account_journal_missing_transactions.py:0
+msgid "You have to select one journal to continue."
+msgstr ""
+
+#. module: odex30_account_online_sync
+#: model:mail.template,subject:account_online_synchronization.email_template_sync_reminder
+msgid "Your bank connection is expiring soon"
+msgstr ""
+
+#. module: odex30_account_online_sync
+#: model_terms:ir.ui.view,arch_db:account_online_synchronization.view_account_bank_selection_form_wizard
+msgid "account to connect:"
+msgstr ""
+
+#. module: odex30_account_online_sync
+#. odoo-javascript
+#: code:addons/odex30_account_online_sync/static/src/components/bank_configure/bank_configure.xml:0
+msgid "banks"
+msgstr ""
+
+#. module: odex30_account_online_sync
+#. odoo-javascript
+#: code:addons/odex30_account_online_sync/static/src/components/transient_bank_statement_line_list_view/transient_bank_statement_line_list_view.xml:0
+msgid "entries"
+msgstr ""
+
+#. module: odex30_account_online_sync
+#. odoo-javascript
+#: code:addons/odex30_account_online_sync/static/src/components/bank_configure/bank_configure.xml:0
+msgid "loading..."
+msgstr ""
+
+#. module: odex30_account_online_sync
+#. odoo-javascript
+#: code:addons/odex30_account_online_sync/static/src/components/views/account_online_authorization_kanban_controller.xml:0
+msgid "may be duplicates."
+msgstr ""
+
+#. module: odex30_account_online_sync
+#: model_terms:ir.ui.view,arch_db:account_online_synchronization.portal_renew_consent
+msgid "on"
+msgstr ""
+
+#. module: odex30_account_online_sync
+#: model:ir.model,name:account_online_synchronization.model_account_online_account
+msgid "representation of an online bank account"
+msgstr ""
+
+#. module: odex30_account_online_sync
+#. odoo-javascript
+#: code:addons/odex30_account_online_sync/static/src/components/refresh_spin_journal_widget/refresh_spin_journal_widget.xml:0
+msgid "transactions fetched"
+msgstr ""
+
+#. module: odex30_account_online_sync
+#. odoo-javascript
+#: code:addons/odex30_account_online_sync/static/src/components/transient_bank_statement_line_list_view/transient_bank_statement_line_list_view.xml:0
+msgid ""
+"within this period that were not created using the online synchronization. "
+"This might cause duplicate entries."
+msgstr ""
diff --git a/dev_odex30_accounting/odex30_account_online_sync/i18n/ar.po b/dev_odex30_accounting/odex30_account_online_sync/i18n/ar.po
new file mode 100644
index 0000000..61d8a10
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_online_sync/i18n/ar.po
@@ -0,0 +1,1418 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# 	* odex30_account_online_sync
+# 
+# Translators:
+# Mustafa J. Kadhem <safi2266@gmail.com>, 2024
+# Malaz Abuidris <msea@odoo.com>, 2025
+# Wil Odoo, 2025
+# 
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 18.0+e\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2025-07-11 18:50+0000\n"
+"PO-Revision-Date: 2024-09-25 09:44+0000\n"
+"Last-Translator: Wil Odoo, 2025\n"
+"Language-Team: Arabic (https://app.transifex.com/odoo/teams/41243/ar/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Language: ar\n"
+"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
+
+#. module: odex30_account_online_sync
+#. odoo-python
+#: code:addons/odex30_account_online_sync/models/account_online.py:0
+msgid ""
+"\n"
+"\n"
+"If you've already opened a ticket for this issue, don't report it again: a support agent will contact you shortly."
+msgstr ""
+"\n"
+"\n"
+"إذا قمت بفتح تذكرة دعم لهذه المشكلة بالفعل، لا تقم بالإبلاغ عنها مجدداً: سيتواصل معك أحد موظفي الدعم عما قريب. "
+
+#. module: odex30_account_online_sync
+#. odoo-python
+#: code:addons/odex30_account_online_sync/wizard/account_journal_duplicate_transactions.py:0
+msgid "%s duplicate transactions"
+msgstr "%s معاملات مكررة "
+
+#. module: odex30_account_online_sync
+#. odoo-javascript
+#: code:addons/odex30_account_online_sync/static/src/components/transient_bank_statement_line_list_view/transient_bank_statement_line_list_view.xml:0
+msgid ""
+").\n"
+"                    This might cause duplicate entries."
+msgstr ""
+").\n"
+"                    قد يتسبب هذا في تكرار القيود. "
+
+#. module: odex30_account_online_sync
+#. odoo-javascript
+#: code:addons/odex30_account_online_sync/static/src/components/refresh_spin_journal_widget/refresh_spin_journal_widget.xml:0
+msgid "0 transaction fetched"
+msgstr "تم جلب 0 معاملات "
+
+#. module: odex30_account_online_sync
+#: model_terms:ir.ui.view,arch_db:odex30_account_online_sync.account_duplicate_transaction_wizard_view_form
+msgid "<i class=\"fa fa-trash me-1\"/> Delete Selected"
+msgstr "<i class=\"fa fa-trash me-1\"/> حذف العناصر المحددة "
+
+#. module: odex30_account_online_sync
+#: model_terms:ir.ui.view,arch_db:odex30_account_online_sync.account_journal_form
+msgid "<i class=\"oi oi-arrow-right me-2\"/> Send Now"
+msgstr "<i class=\"oi oi-arrow-right me-2\"/> إرسال الآن "
+
+#. module: odex30_account_online_sync
+#: model:mail.template,body_html:odex30_account_online_sync.email_template_sync_reminder
+msgid ""
+"<table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" style=\"padding-top: 16px; background-color: #FFFFFF; font-family:Verdana, Arial,sans-serif; color: #454748; width: 100%; border-collapse:separate;\">\n"
+"                    <tr>\n"
+"                        <td align=\"center\">\n"
+"                            <table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" width=\"590\" style=\"padding: 16px; background-color: #FFFFFF; color: #454748; border-collapse:separate;\">\n"
+"                                <tbody>\n"
+"                                    <!-- CONTENT -->\n"
+"                                    <tr>\n"
+"                                        <td align=\"center\" style=\"min-width: 590px;\">\n"
+"                                            <table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" width=\"590\" style=\"min-width: 590px; background-color: white; padding: 0px 8px 0px 8px; border-collapse:separate;\">\n"
+"                                                <tr>\n"
+"                                                    <td valign=\"top\" style=\"font-size: 13px;\">\n"
+"                                                        <div>\n"
+"                                                            Hello,<br/><br/>\n"
+"                                                            The connection between <b><a t-att-href=\"object.get_base_url()\" t-out=\"object.get_base_url() or ''\">https://yourcompany.odoo.com</a></b> and <t t-out=\"object.account_online_link_id.name or ''\">Belfius</t> <t t-if=\"not object.expiring_synchronization_due_day\">expired.</t><t t-else=\"\">expires in <t t-out=\"object.expiring_synchronization_due_day or ''\">10</t> days.</t><br/>\n"
+"                                                            <div style=\"margin: 16px 0px 16px 0px;\">\n"
+"                                                                <a t-attf-href=\"{{ website_url }}/renew_consent/{{ object.id }}?access_token={{object.access_token}}\" style=\"background-color: #4caf50; padding: 8px 16px 8px 16px; text-decoration: none; color: #fff; border-radius: 5px; font-size:13px;\">\n"
+"                                                                    Renew Consent\n"
+"                                                                </a>\n"
+"                                                            </div>\n"
+"                                                            Security Tip: Check that the domain name you are redirected to is: <b><a t-att-href=\"object.get_base_url()\" t-out=\"object.get_base_url() or ''\">https://yourcompany.odoo.com</a></b>\n"
+"                                                        </div>\n"
+"                                                    </td>\n"
+"                                                </tr>\n"
+"                                                <tr>\n"
+"                                                    <td style=\"text-align:center;\">\n"
+"                                                        <hr width=\"100%\" style=\"background-color:rgb(204,204,204);border:medium none;clear:both;display:block;font-size:0px;min-height:1px;line-height:0; margin: 16px 0px 16px 0px;\"/>\n"
+"                                                    </td>\n"
+"                                                </tr>\n"
+"                                            </table>\n"
+"                                        </td>\n"
+"                                    </tr>\n"
+"                                </tbody>\n"
+"                            </table>\n"
+"                        </td>\n"
+"                    </tr>\n"
+"                    <!-- POWERED BY -->\n"
+"                    <tr>\n"
+"                        <td align=\"center\" style=\"min-width: 590px;\">\n"
+"                            <table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" width=\"590\" style=\"min-width: 590px; background-color: #F1F1F1; color: #454748; padding: 8px; border-collapse:separate;\">\n"
+"                                <tr>\n"
+"                                    <td style=\"text-align: center; font-size: 13px;\">\n"
+"                                        Powered by <a target=\"_blank\" href=\"https://www.odoo.com?utm_source=db&amp;utm_medium=auth\" style=\"color: #875A7B;\">Odoo</a>\n"
+"                                    </td>\n"
+"                                </tr>\n"
+"                            </table>\n"
+"                            <table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" width=\"590\" style=\"min-width: 590px; color: #454748; padding: 8px; border-collapse:separate;\">\n"
+"                                <tr>\n"
+"                                    <td style=\"text-align: center; font-size: 11px;\">\n"
+"                                        PS: This is an automated email sent by Odoo Accounting to remind you before a bank sync consent expiration.\n"
+"                                    </td>\n"
+"                                </tr>\n"
+"                            </table>\n"
+"                        </td>\n"
+"                    </tr>\n"
+"                </table>\n"
+"            "
+msgstr ""
+"<table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" style=\"padding-top: 16px; background-color: #FFFFFF; font-family:Verdana, Arial,sans-serif; color: #454748; width: 100%; border-collapse:separate;\">\n"
+"                    <tr>\n"
+"                        <td align=\"center\">\n"
+"                            <table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" width=\"590\" style=\"padding: 16px; background-color: #FFFFFF; color: #454748; border-collapse:separate;\">\n"
+"                                <tbody>\n"
+"                                    <!-- CONTENT -->\n"
+"                                    <tr>\n"
+"                                        <td align=\"center\" style=\"min-width: 590px;\">\n"
+"                                            <table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" width=\"590\" style=\"min-width: 590px; background-color: white; padding: 0px 8px 0px 8px; border-collapse:separate;\">\n"
+"                                                <tr>\n"
+"                                                    <td valign=\"top\" style=\"font-size: 13px;\">\n"
+"                                                        <div>\n"
+"                                                            مرحباً،<br/><br/>\n"
+"                                                            الاتصال بين <b><a t-att-href=\"object.get_base_url()\" t-out=\"object.get_base_url() or ''\">https://yourcompany.odoo.com</a></b> و <t t-out=\"object.account_online_link_id.name or ''\">Belfius</t> <t t-if=\"not object.expiring_synchronization_due_day\">قد انتهت صلاحيته.</t><t t-else=\"\">تنتهي صلاحيته في <t t-out=\"object.expiring_synchronization_due_day or ''\">10</t> أيام.</t><br/>\n"
+"                                                            <div style=\"margin: 16px 0px 16px 0px;\">\n"
+"                                                                <a t-attf-href=\"{{ website_url }}/renew_consent/{{ object.id }}?access_token={{object.access_token}}\" style=\"background-color: #4caf50; padding: 8px 16px 8px 16px; text-decoration: none; color: #fff; border-radius: 5px; font-size:13px;\">\n"
+"                                                                    تجديد الإذن\n"
+"                                                                </a>\n"
+"                                                            </div>\n"
+"                                                            نصيحة للأمان: تحقق من أن اسم النطاق الذي تمت إعادة توجيهك إليه هو: <b><a t-att-href=\"object.get_base_url()\" t-out=\"object.get_base_url() or ''\">https://yourcompany.odoo.com</a></b>\n"
+"                                                        </div>\n"
+"                                                    </td>\n"
+"                                                </tr>\n"
+"                                                <tr>\n"
+"                                                    <td style=\"text-align:center;\">\n"
+"                                                        <hr width=\"100%\" style=\"background-color:rgb(204,204,204);border:medium none;clear:both;display:block;font-size:0px;min-height:1px;line-height:0; margin: 16px 0px 16px 0px;\"/>\n"
+"                                                    </td>\n"
+"                                                </tr>\n"
+"                                            </table>\n"
+"                                        </td>\n"
+"                                    </tr>\n"
+"                                </tbody>\n"
+"                            </table>\n"
+"                        </td>\n"
+"                    </tr>\n"
+"                    <!-- POWERED BY -->\n"
+"                    <tr>\n"
+"                        <td align=\"center\" style=\"min-width: 590px;\">\n"
+"                            <table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" width=\"590\" style=\"min-width: 590px; background-color: #F1F1F1; color: #454748; padding: 8px; border-collapse:separate;\">\n"
+"                                <tr>\n"
+"                                    <td style=\"text-align: center; font-size: 13px;\">\n"
+"                                        مشغل بواسطة <a target=\"_blank\" href=\"https://www.odoo.com?utm_source=db&amp;utm_medium=auth\" style=\"color: #875A7B;\">أودو</a>\n"
+"                                    </td>\n"
+"                                </tr>\n"
+"                            </table>\n"
+"                            <table border=\"0\" cellpadding=\"0\" cellspacing=\"0\" width=\"590\" style=\"min-width: 590px; color: #454748; padding: 8px; border-collapse:separate;\">\n"
+"                                <tr>\n"
+"                                    <td style=\"text-align: center; font-size: 11px;\">\n"
+"                                        ملاحظة: هذا البريد الإلكتروني التلقائي مرسل بواسطة محاسبة أودو لتذكيرك قبل انتهاء صلاحية إذن مزامنة البنك.\n"
+"                                    </td>\n"
+"                                </tr>\n"
+"                            </table>\n"
+"                        </td>\n"
+"                    </tr>\n"
+"                </table>\n"
+"            "
+
+#. module: odex30_account_online_sync
+#: model:ir.model.fields,field_description:odex30_account_online_sync.field_account_online_link__access_token
+msgid "Access Token"
+msgstr "رمز الوصول "
+
+#. module: odex30_account_online_sync
+#: model:ir.model.fields,field_description:odex30_account_online_sync.field_account_online_account__account_data
+msgid "Account Data"
+msgstr "بيانات الحساب "
+
+#. module: odex30_account_online_sync
+#: model:ir.model.fields,field_description:odex30_account_online_sync.field_account_online_account__name
+msgid "Account Name"
+msgstr "اسم الحساب"
+
+#. module: odex30_account_online_sync
+#: model:ir.model.fields,help:odex30_account_online_sync.field_account_online_account__name
+msgid "Account Name as provided by third party provider"
+msgstr "اسم الحساب حسب مزود الطرف الثالث "
+
+#. module: odex30_account_online_sync
+#: model:ir.model.fields,field_description:odex30_account_online_sync.field_account_bank_statement_line_transient__account_number
+#: model:ir.model.fields,field_description:odex30_account_online_sync.field_account_online_account__account_number
+msgid "Account Number"
+msgstr "رقم الحساب"
+
+#. module: odex30_account_online_sync
+#: model:ir.model.fields,field_description:odex30_account_online_sync.field_account_bank_selection__account_online_account_ids
+#: model:ir.model.fields,field_description:odex30_account_online_sync.field_account_bank_statement_line_transient__online_account_id
+#: model:ir.model.fields,field_description:odex30_account_online_sync.field_account_journal__account_online_account_id
+#: model:ir.model.fields,field_description:odex30_account_online_sync.field_account_online_link__account_online_account_ids
+msgid "Account Online Account"
+msgstr "حساب عبر الإنترنت "
+
+#. module: odex30_account_online_sync
+#: model:ir.model.fields,field_description:odex30_account_online_sync.field_account_bank_selection__account_online_link_id
+#: model:ir.model.fields,field_description:odex30_account_online_sync.field_account_bank_statement_line__online_link_id
+#: model:ir.model.fields,field_description:odex30_account_online_sync.field_account_journal__account_online_link_id
+#: model:ir.model.fields,field_description:odex30_account_online_sync.field_account_online_account__account_online_link_id
+msgid "Account Online Link"
+msgstr "ربط الحساب عبر الإنترنت "
+
+#. module: odex30_account_online_sync
+#: model:ir.actions.server,name:odex30_account_online_sync.online_sync_cron_waiting_synchronization_ir_actions_server
+msgid "Account: Journal online Waiting Synchronization"
+msgstr "الحساب: دفتر اليومية أونلاين بانتظار المزامنة "
+
+#. module: odex30_account_online_sync
+#: model:ir.actions.server,name:odex30_account_online_sync.online_sync_cron_ir_actions_server
+msgid "Account: Journal online sync"
+msgstr "الحساب: مزامنة دفتر اليومية عبر الإنترنت "
+
+#. module: odex30_account_online_sync
+#: model:ir.actions.server,name:odex30_account_online_sync.online_sync_unused_connection_cron_ir_actions_server
+msgid "Account: Journal online sync cleanup unused connections"
+msgstr "الحساب: مسح الاتصالات غير المستخدمة عند مزامنة دفتر اليومية أونلاين "
+
+#. module: odex30_account_online_sync
+#: model:ir.actions.server,name:odex30_account_online_sync.online_sync_mail_cron_ir_actions_server
+msgid "Account: Journal online sync reminder"
+msgstr "الحساب: تذكير مزامنة دفتر اليومية أونلاين "
+
+#. module: odex30_account_online_sync
+#: model:ir.model.fields,field_description:odex30_account_online_sync.field_account_online_link__message_needaction
+msgid "Action Needed"
+msgstr "إجراء مطلوب"
+
+#. module: odex30_account_online_sync
+#: model:ir.model.fields,field_description:odex30_account_online_sync.field_account_online_link__activity_ids
+msgid "Activities"
+msgstr "الأنشطة"
+
+#. module: odex30_account_online_sync
+#: model:ir.model.fields,field_description:odex30_account_online_sync.field_account_online_link__activity_exception_decoration
+msgid "Activity Exception Decoration"
+msgstr "زخرفة استثناء النشاط"
+
+#. module: odex30_account_online_sync
+#: model:ir.model.fields,field_description:odex30_account_online_sync.field_account_online_link__activity_state
+msgid "Activity State"
+msgstr "حالة النشاط"
+
+#. module: odex30_account_online_sync
+#: model:ir.model,name:odex30_account_online_sync.model_mail_activity_type
+msgid "Activity Type"
+msgstr "نوع النشاط"
+
+#. module: odex30_account_online_sync
+#: model:ir.model.fields,field_description:odex30_account_online_sync.field_account_online_link__activity_type_icon
+msgid "Activity Type Icon"
+msgstr "أيقونة نوع النشاط"
+
+#. module: odex30_account_online_sync
+#: model:ir.model.fields,field_description:odex30_account_online_sync.field_account_bank_statement_line_transient__amount
+msgid "Amount"
+msgstr "مبلغ"
+
+#. module: odex30_account_online_sync
+#: model:ir.model.fields,field_description:odex30_account_online_sync.field_account_bank_statement_line_transient__amount_currency
+msgid "Amount in Currency"
+msgstr "المبلغ بالعملة"
+
+#. module: odex30_account_online_sync
+#: model:ir.model.fields,field_description:odex30_account_online_sync.field_account_online_link__message_attachment_count
+msgid "Attachment Count"
+msgstr "عدد المرفقات"
+
+#. module: odex30_account_online_sync
+#: model:ir.model.fields,field_description:odex30_account_online_sync.field_account_online_link__auto_sync
+msgid "Automatic synchronization"
+msgstr "المزامنة الآلية "
+
+#. module: odex30_account_online_sync
+#: model:ir.model.fields,field_description:odex30_account_online_sync.field_account_online_account__balance
+msgid "Balance"
+msgstr "الرصيد"
+
+#. module: odex30_account_online_sync
+#: model:ir.model.fields,help:odex30_account_online_sync.field_account_online_account__balance
+msgid "Balance of the account sent by the third party provider"
+msgstr "رصيد الحساب الذي أرسله مزود الطرف الثالث "
+
+#. module: odex30_account_online_sync
+#: model_terms:ir.ui.view,arch_db:odex30_account_online_sync.portal_renew_consent
+msgid "Bank"
+msgstr "البنك"
+
+#. module: odex30_account_online_sync
+#: model:ir.model,name:odex30_account_online_sync.model_account_online_link
+msgid "Bank Connection"
+msgstr "اتصال البنك"
+
+#. module: odex30_account_online_sync
+#: model:ir.model,name:odex30_account_online_sync.model_account_bank_statement_line
+msgid "Bank Statement Line"
+msgstr "بند كشف الحساب البنكي"
+
+#. module: odex30_account_online_sync
+#: model:mail.activity.type,name:odex30_account_online_sync.bank_sync_activity_update_consent
+msgid "Bank Synchronization: Update consent"
+msgstr "مزامنة البنك: تحديث الإذن "
+
+#. module: odex30_account_online_sync
+#. odoo-python
+#: code:addons/odex30_account_online_sync/models/account_online.py:0
+msgid "Bank Synchronization: Update your consent"
+msgstr "مزامنة البنك: قم بتحديث الإذن "
+
+#. module: odex30_account_online_sync
+#: model:mail.template,name:odex30_account_online_sync.email_template_sync_reminder
+msgid "Bank connection expiration reminder"
+msgstr "تذكير انتهاء صلاحية اتصال البنك "
+
+#. module: odex30_account_online_sync
+#: model:ir.model,name:odex30_account_online_sync.model_bank_rec_widget
+msgid "Bank reconciliation widget for a single statement line"
+msgstr "أداة التسوية البنكية لبند كشف حساب واحد "
+
+#. module: odex30_account_online_sync
+#: model_terms:ir.ui.view,arch_db:odex30_account_online_sync.account_missing_transaction_wizard_view_form
+#: model_terms:ir.ui.view,arch_db:odex30_account_online_sync.view_account_bank_selection_form_wizard
+msgid "Cancel"
+msgstr "إلغاء"
+
+#. module: odex30_account_online_sync
+#. odoo-python
+#: code:addons/odex30_account_online_sync/models/account_online.py:0
+msgid "Check the documentation"
+msgstr "ألقِ نظرة على الوثائق "
+
+#. module: odex30_account_online_sync
+#: model_terms:ir.ui.view,arch_db:odex30_account_online_sync.account_duplicate_transaction_wizard_view_form
+msgid ""
+"Choose a date and a journal from which you want to check the transactions."
+msgstr "اختر التاريخ ودفتر اليومية الذي ترغب في التحقق من المعاملات فيه "
+
+#. module: odex30_account_online_sync
+#: model_terms:ir.ui.view,arch_db:odex30_account_online_sync.account_missing_transaction_wizard_view_form
+msgid "Choose a date and a journal from which you want to fetch transactions"
+msgstr "اختر التاريخ ودفتر اليومية الذي ترغب في جلب المعاملات منه "
+
+#. module: odex30_account_online_sync
+#: model:ir.model.fields,field_description:odex30_account_online_sync.field_account_online_link__client_id
+msgid "Client"
+msgstr "العميل"
+
+#. module: odex30_account_online_sync
+#: model_terms:ir.ui.view,arch_db:odex30_account_online_sync.account_online_link_view_form
+msgid "Client id"
+msgstr "معرف العميل "
+
+#. module: odex30_account_online_sync
+#: model:ir.model.fields,help:odex30_account_online_sync.field_account_journal__renewal_contact_email
+msgid ""
+"Comma separated list of email addresses to send consent renewal "
+"notifications 15, 3 and 1 days before expiry"
+msgstr ""
+"قائمة مفصولة بفواصل بعناوين البريد الإلكترونية لإرسال إشعارات تجديد الإذن "
+"قبل 15، 3، و1 يوم من تاريخ انتهاء الصلاحية "
+
+#. module: odex30_account_online_sync
+#: model:ir.model,name:odex30_account_online_sync.model_res_company
+msgid "Companies"
+msgstr "الشركات"
+
+#. module: odex30_account_online_sync
+#: model:ir.model.fields,field_description:odex30_account_online_sync.field_account_bank_statement_line_transient__company_id
+#: model:ir.model.fields,field_description:odex30_account_online_sync.field_account_online_account__company_id
+#: model:ir.model.fields,field_description:odex30_account_online_sync.field_account_online_link__company_id
+msgid "Company"
+msgstr "الشركة "
+
+#. module: odex30_account_online_sync
+#: model_terms:ir.ui.view,arch_db:odex30_account_online_sync.account_online_link_view_form
+msgid "Connect"
+msgstr "اتصل"
+
+#. module: odex30_account_online_sync
+#: model_terms:ir.ui.view,arch_db:odex30_account_online_sync.view_account_bank_selection_form_wizard
+msgid "Connect Bank"
+msgstr "توصيل البنك "
+
+#. module: odex30_account_online_sync
+#: model_terms:ir.ui.view,arch_db:odex30_account_online_sync.account_journal_dashboard_inherit_online_sync
+msgid "Connect bank"
+msgstr "توصيل البنك "
+
+#. module: odex30_account_online_sync
+#: model_terms:ir.ui.view,arch_db:odex30_account_online_sync.portal_renew_consent
+msgid "Connect my Bank"
+msgstr "توصيل بنكي "
+
+#. module: odex30_account_online_sync
+#: model_terms:ir.ui.view,arch_db:odex30_account_online_sync.portal_renew_consent
+msgid "Connect your bank account to Odoo"
+msgstr "قم بتوصيل حسابك البنكي بأودو "
+
+#. module: odex30_account_online_sync
+#: model:ir.model.fields.selection,name:odex30_account_online_sync.selection__account_online_link__state__connected
+msgid "Connected"
+msgstr "متصل "
+
+#. module: odex30_account_online_sync
+#. odoo-javascript
+#: code:addons/odex30_account_online_sync/static/src/components/connected_until_widget/connected_until_widget.xml:0
+msgid "Connected until"
+msgstr "متصل حتى "
+
+#. module: odex30_account_online_sync
+#: model:ir.model.fields,field_description:odex30_account_online_sync.field_account_journal__renewal_contact_email
+msgid "Connection Requests"
+msgstr "طلبات الاتصال "
+
+#. module: odex30_account_online_sync
+#: model:ir.model.fields,field_description:odex30_account_online_sync.field_account_online_link__connection_state_details
+msgid "Connection State Details"
+msgstr "تفاصيل حالة الاتصال "
+
+#. module: odex30_account_online_sync
+#: model:mail.message.subtype,name:odex30_account_online_sync.bank_sync_consent_renewal
+msgid "Consent Renewal"
+msgstr "تجديد الإذن "
+
+#. module: odex30_account_online_sync
+#: model:ir.model,name:odex30_account_online_sync.model_res_partner
+msgid "Contact"
+msgstr "جهة الاتصال"
+
+#. module: odex30_account_online_sync
+#: model:ir.model.fields,field_description:odex30_account_online_sync.field_account_bank_selection__create_uid
+#: model:ir.model.fields,field_description:odex30_account_online_sync.field_account_bank_statement_line_transient__create_uid
+#: model:ir.model.fields,field_description:odex30_account_online_sync.field_account_duplicate_transaction_wizard__create_uid
+#: model:ir.model.fields,field_description:odex30_account_online_sync.field_account_missing_transaction_wizard__create_uid
+#: model:ir.model.fields,field_description:odex30_account_online_sync.field_account_online_account__create_uid
+#: model:ir.model.fields,field_description:odex30_account_online_sync.field_account_online_link__create_uid
+msgid "Created by"
+msgstr "أنشئ بواسطة"
+
+#. module: odex30_account_online_sync
+#: model:ir.model.fields,field_description:odex30_account_online_sync.field_account_bank_selection__create_date
+#: model:ir.model.fields,field_description:odex30_account_online_sync.field_account_bank_statement_line_transient__create_date
+#: model:ir.model.fields,field_description:odex30_account_online_sync.field_account_duplicate_transaction_wizard__create_date
+#: model:ir.model.fields,field_description:odex30_account_online_sync.field_account_missing_transaction_wizard__create_date
+#: model:ir.model.fields,field_description:odex30_account_online_sync.field_account_online_account__create_date
+#: model:ir.model.fields,field_description:odex30_account_online_sync.field_account_online_link__create_date
+msgid "Created on"
+msgstr "أنشئ في"
+
+#. module: odex30_account_online_sync
+#: model:ir.model.fields,field_description:odex30_account_online_sync.field_account_bank_statement_line_transient__currency_id
+#: model:ir.model.fields,field_description:odex30_account_online_sync.field_account_online_account__currency_id
+msgid "Currency"
+msgstr "العملة"
+
+#. module: odex30_account_online_sync
+#: model:ir.model.fields,field_description:odex30_account_online_sync.field_account_bank_statement_line_transient__date
+msgid "Date"
+msgstr "التاريخ"
+
+#. module: odex30_account_online_sync
+#: model:ir.model.fields,help:odex30_account_online_sync.field_account_journal__expiring_synchronization_date
+#: model:ir.model.fields,help:odex30_account_online_sync.field_account_online_link__expiring_synchronization_date
+msgid "Date when the consent for this connection expires"
+msgstr "تاريخ انتهاء صلاحية إذن هذا الاتصال "
+
+#. module: odex30_account_online_sync
+#: model:ir.model.fields,field_description:odex30_account_online_sync.field_account_bank_selection__display_name
+#: model:ir.model.fields,field_description:odex30_account_online_sync.field_account_bank_statement_line_transient__display_name
+#: model:ir.model.fields,field_description:odex30_account_online_sync.field_account_duplicate_transaction_wizard__display_name
+#: model:ir.model.fields,field_description:odex30_account_online_sync.field_account_missing_transaction_wizard__display_name
+#: model:ir.model.fields,field_description:odex30_account_online_sync.field_account_online_account__display_name
+#: model:ir.model.fields,field_description:odex30_account_online_sync.field_account_online_link__display_name
+msgid "Display Name"
+msgstr "اسم العرض "
+
+#. module: odex30_account_online_sync
+#: model:ir.model.fields.selection,name:odex30_account_online_sync.selection__account_online_account__fetching_status__done
+msgid "Done"
+msgstr "منتهي "
+
+#. module: odex30_account_online_sync
+#. odoo-python
+#: code:addons/odex30_account_online_sync/models/account_bank_statement.py:0
+#: model:ir.model.fields.selection,name:odex30_account_online_sync.selection__account_online_link__state__error
+msgid "Error"
+msgstr "خطأ"
+
+#. module: odex30_account_online_sync
+#: model:ir.model.fields,field_description:odex30_account_online_sync.field_account_journal__expiring_synchronization_date
+#: model:ir.model.fields,field_description:odex30_account_online_sync.field_account_online_link__expiring_synchronization_date
+msgid "Expiring Synchronization Date"
+msgstr "تاريخ انتهاء صلاحية المزامنة "
+
+#. module: odex30_account_online_sync
+#: model:ir.model.fields,field_description:odex30_account_online_sync.field_account_journal__expiring_synchronization_due_day
+msgid "Expiring Synchronization Due Day"
+msgstr "التاريخ الذي ستنتهي فيه صلاحية المزامنة "
+
+#. module: odex30_account_online_sync
+#. odoo-javascript
+#: code:addons/odex30_account_online_sync/static/src/components/connected_until_widget/connected_until_widget.xml:0
+msgid "Extend Connection"
+msgstr "تمديد الإذن "
+
+#. module: odex30_account_online_sync
+#: model:ir.model.fields,help:odex30_account_online_sync.field_account_online_account__account_data
+msgid "Extra information needed by third party provider"
+msgstr "معلومات إضافية مطلوبة من قِبَل مزود الطرف الثالث "
+
+#. module: odex30_account_online_sync
+#: model_terms:ir.ui.view,arch_db:odex30_account_online_sync.account_missing_transaction_wizard_view_form
+msgid "Fetch"
+msgstr "جلب "
+
+#. module: odex30_account_online_sync
+#: model_terms:ir.ui.view,arch_db:odex30_account_online_sync.account_duplicate_transaction_wizard_view_form
+#: model_terms:ir.ui.view,arch_db:odex30_account_online_sync.account_missing_transaction_wizard_view_form
+msgid "Fetch Missing Bank Statements Wizard"
+msgstr "معالج جلب كشوفات الحسابات المفقودة "
+
+#. module: odex30_account_online_sync
+#. odoo-javascript
+#: code:addons/odex30_account_online_sync/static/src/components/refresh_spin_journal_widget/refresh_spin_journal_widget.xml:0
+#: model_terms:ir.ui.view,arch_db:odex30_account_online_sync.account_online_link_view_form
+msgid "Fetch Transactions"
+msgstr "جلب المعاملات "
+
+#. module: odex30_account_online_sync
+#. odoo-python
+#: code:addons/odex30_account_online_sync/models/account_online.py:0
+msgid "Fetched Transactions"
+msgstr "المعاملات التي تم جلبها "
+
+#. module: odex30_account_online_sync
+#: model:ir.model.fields,field_description:odex30_account_online_sync.field_account_journal__online_sync_fetching_status
+#: model:ir.model.fields,field_description:odex30_account_online_sync.field_account_online_account__fetching_status
+msgid "Fetching Status"
+msgstr "حالة الجلب "
+
+#. module: odex30_account_online_sync
+#. odoo-javascript
+#: code:addons/odex30_account_online_sync/static/src/components/refresh_spin_journal_widget/refresh_spin_journal_widget.xml:0
+msgid "Fetching..."
+msgstr "جري جلب... "
+
+#. module: odex30_account_online_sync
+#. odoo-javascript
+#. odoo-python
+#: code:addons/odex30_account_online_sync/models/account_journal.py:0
+#: code:addons/odex30_account_online_sync/static/src/components/bank_reconciliation/find_duplicate_transactions_cog_menu.xml:0
+msgid "Find Duplicate Transactions"
+msgstr "العثور على المعاملات المكررة "
+
+#. module: odex30_account_online_sync
+#. odoo-javascript
+#. odoo-python
+#: code:addons/odex30_account_online_sync/models/account_journal.py:0
+#: code:addons/odex30_account_online_sync/static/src/components/bank_reconciliation/fetch_missing_transactions_cog_menu.xml:0
+msgid "Find Missing Transactions"
+msgstr "العثور على المعاملات المفقودة "
+
+#. module: odex30_account_online_sync
+#: model:ir.model.fields,field_description:odex30_account_online_sync.field_account_duplicate_transaction_wizard__first_ids_in_group
+msgid "First Ids In Group"
+msgstr "المُعرّفات الأولى في المجموعة "
+
+#. module: odex30_account_online_sync
+#: model:ir.model.fields,field_description:odex30_account_online_sync.field_account_online_link__message_follower_ids
+msgid "Followers"
+msgstr "المتابعين"
+
+#. module: odex30_account_online_sync
+#: model:ir.model.fields,field_description:odex30_account_online_sync.field_account_online_link__message_partner_ids
+msgid "Followers (Partners)"
+msgstr "المتابعين (الشركاء) "
+
+#. module: odex30_account_online_sync
+#: model:ir.model.fields,help:odex30_account_online_sync.field_account_online_link__activity_type_icon
+msgid "Font awesome icon e.g. fa-tasks"
+msgstr "أيقونة من Font awesome مثال: fa-tasks "
+
+#. module: odex30_account_online_sync
+#: model:ir.model.fields,field_description:odex30_account_online_sync.field_account_bank_statement_line_transient__foreign_currency_id
+msgid "Foreign Currency"
+msgstr "عملة أجنبية "
+
+#. module: odex30_account_online_sync
+#: model:ir.model.fields,field_description:odex30_account_online_sync.field_account_online_link__has_message
+msgid "Has Message"
+msgstr "يحتوي على رسالة "
+
+#. module: odex30_account_online_sync
+#: model:ir.model.fields,field_description:odex30_account_online_sync.field_account_online_link__has_unlinked_accounts
+msgid "Has Unlinked Accounts"
+msgstr "يحتوي على حسابات غير مرتبطة "
+
+#. module: odex30_account_online_sync
+#. odoo-python
+#: code:addons/odex30_account_online_sync/models/account_online.py:0
+msgid "Here"
+msgstr "هنا "
+
+#. module: odex30_account_online_sync
+#: model:ir.model.fields,field_description:odex30_account_online_sync.field_account_bank_selection__id
+#: model:ir.model.fields,field_description:odex30_account_online_sync.field_account_bank_statement_line_transient__id
+#: model:ir.model.fields,field_description:odex30_account_online_sync.field_account_duplicate_transaction_wizard__id
+#: model:ir.model.fields,field_description:odex30_account_online_sync.field_account_missing_transaction_wizard__id
+#: model:ir.model.fields,field_description:odex30_account_online_sync.field_account_online_account__id
+#: model:ir.model.fields,field_description:odex30_account_online_sync.field_account_online_link__id
+msgid "ID"
+msgstr "المُعرف"
+
+#. module: odex30_account_online_sync
+#: model:ir.model.fields,field_description:odex30_account_online_sync.field_account_online_link__activity_exception_icon
+msgid "Icon"
+msgstr "الأيقونة"
+
+#. module: odex30_account_online_sync
+#: model:ir.model.fields,help:odex30_account_online_sync.field_account_online_link__activity_exception_icon
+msgid "Icon to indicate an exception activity."
+msgstr "الأيقونة للإشارة إلى النشاط المستثنى. "
+
+#. module: odex30_account_online_sync
+#: model:ir.model.fields,help:odex30_account_online_sync.field_account_online_account__online_identifier
+msgid "Id used to identify account by third party provider"
+msgstr "المعرف المستخدَم لتعرف الحساب من قِبَل مزود الطرف الثالث "
+
+#. module: odex30_account_online_sync
+#: model:ir.model.fields,help:odex30_account_online_sync.field_account_online_link__message_needaction
+msgid "If checked, new messages require your attention."
+msgstr "إذا كان محددًا، فهناك رسائل جديدة عليك رؤيتها. "
+
+#. module: odex30_account_online_sync
+#: model:ir.model.fields,help:odex30_account_online_sync.field_account_online_link__message_has_error
+#: model:ir.model.fields,help:odex30_account_online_sync.field_account_online_link__message_has_sms_error
+msgid "If checked, some messages have a delivery error."
+msgstr "إذا كان محددًا، فقد حدث خطأ في تسليم بعض الرسائل."
+
+#. module: odex30_account_online_sync
+#: model:ir.model.fields,help:odex30_account_online_sync.field_account_online_account__inverse_balance_sign
+msgid "If checked, the balance sign will be inverted"
+msgstr "إذا كان محدداً، سيتم عكس علامة الرصيد "
+
+#. module: odex30_account_online_sync
+#: model:ir.model.fields,help:odex30_account_online_sync.field_account_online_account__inverse_transaction_sign
+msgid "If checked, the transaction sign will be inverted"
+msgstr "إذا كان محدداً، سيتم عكس علامة المعاملة "
+
+#. module: odex30_account_online_sync
+#: model:ir.model.fields,help:odex30_account_online_sync.field_account_online_link__auto_sync
+msgid ""
+"If possible, we will try to automatically fetch new transactions for this record\n"
+"                \n"
+"If the automatic sync is disabled. that will be due to security policy on the bank's end. So, they have to launch the sync manually"
+msgstr ""
+"إذا أمكن، سنحاول جلب المعاملات الجديدة تلقائياً لهذا السجل\n"
+"                \n"
+"إذا كانت خاصية المزامنة التلقائية معطلة. سيكون ذلك بسبب سياسة الأمن التي يفرضها البنك. لذلك، سيتوجب عليهم تشغيل عملية المزامنة يدوياً "
+
+#. module: odex30_account_online_sync
+#. odoo-javascript
+#: code:addons/odex30_account_online_sync/static/src/components/transient_bank_statement_line_list_view/transient_bank_statement_line_list_view.xml:0
+msgid "Import Transactions"
+msgstr "استيراد المعاملات "
+
+#. module: odex30_account_online_sync
+#: model:ir.model.fields,help:odex30_account_online_sync.field_account_online_link__provider_data
+msgid "Information needed to interact with third party provider"
+msgstr "المعلومات المطلوبة للتفاعل مع مزود الطرف الثالث "
+
+#. module: odex30_account_online_sync
+#: model:ir.model.fields,help:odex30_account_online_sync.field_account_bank_selection__institution_name
+#: model:ir.model.fields,help:odex30_account_online_sync.field_account_online_link__name
+msgid "Institution Name"
+msgstr "اسم المنشأة "
+
+#. module: odex30_account_online_sync
+#. odoo-python
+#: code:addons/odex30_account_online_sync/models/account_online.py:0
+msgid "Internal Error"
+msgstr "خطأ داخلي "
+
+#. module: odex30_account_online_sync
+#. odoo-python
+#: code:addons/odex30_account_online_sync/models/account_online.py:0
+msgid "Invalid URL"
+msgstr "رابط URL غير صحيح "
+
+#. module: odex30_account_online_sync
+#. odoo-python
+#: code:addons/odex30_account_online_sync/models/account_online.py:0
+msgid "Invalid value for proxy_mode config parameter."
+msgstr "قيمة غير صالحة لمعيار تهيئة proxy_mode "
+
+#. module: odex30_account_online_sync
+#: model:ir.model.fields,field_description:odex30_account_online_sync.field_account_online_account__inverse_balance_sign
+msgid "Inverse Balance Sign"
+msgstr "علامة عكس الرصيد "
+
+#. module: odex30_account_online_sync
+#: model:ir.model.fields,field_description:odex30_account_online_sync.field_account_online_account__inverse_transaction_sign
+msgid "Inverse Transaction Sign"
+msgstr "عكس علامة المعاملة "
+
+#. module: odex30_account_online_sync
+#: model:ir.model.fields,field_description:odex30_account_online_sync.field_account_online_link__message_is_follower
+msgid "Is Follower"
+msgstr "متابع"
+
+#. module: odex30_account_online_sync
+#: model:ir.model,name:odex30_account_online_sync.model_account_journal
+#: model:ir.model.fields,field_description:odex30_account_online_sync.field_account_bank_statement_line_transient__journal_id
+#: model:ir.model.fields,field_description:odex30_account_online_sync.field_account_duplicate_transaction_wizard__journal_id
+#: model:ir.model.fields,field_description:odex30_account_online_sync.field_account_missing_transaction_wizard__journal_id
+#: model:ir.model.fields,field_description:odex30_account_online_sync.field_account_online_account__journal_ids
+#: model:ir.model.fields,field_description:odex30_account_online_sync.field_account_online_link__journal_ids
+#: model_terms:ir.ui.view,arch_db:odex30_account_online_sync.portal_renew_consent
+msgid "Journal"
+msgstr "دفتر اليومية"
+
+#. module: odex30_account_online_sync
+#. odoo-python
+#: code:addons/odex30_account_online_sync/models/account_online.py:0
+msgid ""
+"Journal %(journal_name)s has been set up with a different currency and "
+"already has existing entries. You can't link selected bank account in "
+"%(currency_name)s to it"
+msgstr ""
+"تم إعداد دفتر اليومية %(journal_name)s بعملة مختلفة ويحتوي بالفعل على قيود "
+"موجودة. لا يمكنك ربط الحساب البنكي المحدد %(currency_name)s به "
+
+#. module: odex30_account_online_sync
+#: model:ir.model.fields,field_description:odex30_account_online_sync.field_account_online_link__last_refresh
+msgid "Last Refresh"
+msgstr "التحديث الأخير"
+
+#. module: odex30_account_online_sync
+#: model:ir.model.fields,field_description:odex30_account_online_sync.field_account_bank_selection__write_uid
+#: model:ir.model.fields,field_description:odex30_account_online_sync.field_account_bank_statement_line_transient__write_uid
+#: model:ir.model.fields,field_description:odex30_account_online_sync.field_account_duplicate_transaction_wizard__write_uid
+#: model:ir.model.fields,field_description:odex30_account_online_sync.field_account_missing_transaction_wizard__write_uid
+#: model:ir.model.fields,field_description:odex30_account_online_sync.field_account_online_account__write_uid
+#: model:ir.model.fields,field_description:odex30_account_online_sync.field_account_online_link__write_uid
+msgid "Last Updated by"
+msgstr "آخر تحديث بواسطة"
+
+#. module: odex30_account_online_sync
+#: model:ir.model.fields,field_description:odex30_account_online_sync.field_account_bank_selection__write_date
+#: model:ir.model.fields,field_description:odex30_account_online_sync.field_account_bank_statement_line_transient__write_date
+#: model:ir.model.fields,field_description:odex30_account_online_sync.field_account_duplicate_transaction_wizard__write_date
+#: model:ir.model.fields,field_description:odex30_account_online_sync.field_account_missing_transaction_wizard__write_date
+#: model:ir.model.fields,field_description:odex30_account_online_sync.field_account_online_account__write_date
+#: model:ir.model.fields,field_description:odex30_account_online_sync.field_account_online_link__write_date
+msgid "Last Updated on"
+msgstr "آخر تحديث في"
+
+#. module: odex30_account_online_sync
+#: model_terms:ir.ui.view,arch_db:odex30_account_online_sync.account_online_link_view_form
+msgid "Last refresh"
+msgstr "آخر تحديث "
+
+#. module: odex30_account_online_sync
+#: model:ir.model.fields,field_description:odex30_account_online_sync.field_account_online_account__last_sync
+msgid "Last synchronization"
+msgstr "آخر مزامنة"
+
+#. module: odex30_account_online_sync
+#: model_terms:ir.ui.view,arch_db:odex30_account_online_sync.portal_renew_consent
+msgid "Latest Balance"
+msgstr "آخر رصيد "
+
+#. module: odex30_account_online_sync
+#: model:ir.model,name:odex30_account_online_sync.model_account_bank_selection
+msgid "Link a bank account to the selected journal"
+msgstr " قم بربط حساب بنكي واحد بدفتر اليومية المحدد "
+
+#. module: odex30_account_online_sync
+#. odoo-python
+#: code:addons/odex30_account_online_sync/wizard/account_journal_missing_transactions.py:0
+msgid "Manual Bank Statement Lines"
+msgstr "بنود كشف الحساب البنكي اليدوية "
+
+#. module: odex30_account_online_sync
+#. odoo-python
+#: code:addons/odex30_account_online_sync/models/account_online.py:0
+msgid "Message"
+msgstr "الرسالة"
+
+#. module: odex30_account_online_sync
+#: model:ir.model.fields,field_description:odex30_account_online_sync.field_account_online_link__message_has_error
+msgid "Message Delivery error"
+msgstr "خطأ في تسليم الرسائل"
+
+#. module: odex30_account_online_sync
+#: model:ir.model.fields,field_description:odex30_account_online_sync.field_account_online_link__message_ids
+msgid "Messages"
+msgstr "الرسائل"
+
+#. module: odex30_account_online_sync
+#. odoo-python
+#: code:addons/odex30_account_online_sync/wizard/account_journal_missing_transactions.py:0
+msgid "Missing and Pending Transactions"
+msgstr "المعاملات المفقودة وقيد الانتظار "
+
+#. module: odex30_account_online_sync
+#: model:ir.model.fields,field_description:odex30_account_online_sync.field_account_online_link__my_activity_date_deadline
+msgid "My Activity Deadline"
+msgstr "الموعد النهائي لنشاطاتي "
+
+#. module: odex30_account_online_sync
+#: model:ir.model.fields,field_description:odex30_account_online_sync.field_account_bank_selection__institution_name
+#: model:ir.model.fields,field_description:odex30_account_online_sync.field_account_online_link__name
+msgid "Name"
+msgstr "الاسم"
+
+#. module: odex30_account_online_sync
+#: model:ir.model.fields,field_description:odex30_account_online_sync.field_account_online_link__activity_calendar_event_id
+msgid "Next Activity Calendar Event"
+msgstr "الفعالية التالية في تقويم الأنشطة "
+
+#. module: odex30_account_online_sync
+#: model:ir.model.fields,field_description:odex30_account_online_sync.field_account_online_link__activity_date_deadline
+msgid "Next Activity Deadline"
+msgstr "الموعد النهائي للنشاط التالي"
+
+#. module: odex30_account_online_sync
+#: model:ir.model.fields,field_description:odex30_account_online_sync.field_account_online_link__activity_summary
+msgid "Next Activity Summary"
+msgstr "ملخص النشاط التالي"
+
+#. module: odex30_account_online_sync
+#: model:ir.model.fields,field_description:odex30_account_online_sync.field_account_online_link__activity_type_id
+msgid "Next Activity Type"
+msgstr "نوع النشاط التالي"
+
+#. module: odex30_account_online_sync
+#: model:ir.model.fields,field_description:odex30_account_online_sync.field_account_online_link__next_refresh
+msgid "Next synchronization"
+msgstr "المزامنة التالية"
+
+#. module: odex30_account_online_sync
+#: model:ir.model.fields.selection,name:odex30_account_online_sync.selection__account_online_link__state__disconnected
+msgid "Not Connected"
+msgstr "غير متصل "
+
+#. module: odex30_account_online_sync
+#: model:ir.model.fields,field_description:odex30_account_online_sync.field_account_online_link__message_needaction_counter
+msgid "Number of Actions"
+msgstr "عدد الإجراءات"
+
+#. module: odex30_account_online_sync
+#: model:ir.model.fields,field_description:odex30_account_online_sync.field_account_online_link__message_has_error_counter
+msgid "Number of errors"
+msgstr "عدد الأخطاء "
+
+#. module: odex30_account_online_sync
+#: model:ir.model.fields,help:odex30_account_online_sync.field_account_online_link__message_needaction_counter
+msgid "Number of messages requiring action"
+msgstr "عدد الرسائل التي تتطلب اتخاذ إجراء"
+
+#. module: odex30_account_online_sync
+#: model:ir.model.fields,help:odex30_account_online_sync.field_account_online_link__message_has_error_counter
+msgid "Number of messages with delivery error"
+msgstr "عدد الرسائل الحادث بها خطأ في التسليم"
+
+#. module: odex30_account_online_sync
+#: model_terms:ir.ui.view,arch_db:odex30_account_online_sync.portal_renew_consent
+msgid "Odoo"
+msgstr "أودو"
+
+#. module: odex30_account_online_sync
+#: model:ir.model.fields,field_description:odex30_account_online_sync.field_account_bank_statement_line__online_account_id
+msgid "Online Account"
+msgstr "حساب عبر الإنترنت "
+
+#. module: odex30_account_online_sync
+#: model_terms:ir.ui.view,arch_db:odex30_account_online_sync.account_online_link_view_form
+msgid "Online Accounts"
+msgstr "حسابات عبر الإنترنت "
+
+#. module: odex30_account_online_sync
+#: model:ir.model.fields,field_description:odex30_account_online_sync.field_account_online_account__online_identifier
+msgid "Online Identifier"
+msgstr "معرف عبر الإنترنت "
+
+#. module: odex30_account_online_sync
+#: model:ir.model.fields,field_description:odex30_account_online_sync.field_account_journal__next_link_synchronization
+msgid "Online Link Next synchronization"
+msgstr "ربط المزامنة التالية عبر الإنترنت "
+
+#. module: odex30_account_online_sync
+#: model:ir.model.fields,field_description:odex30_account_online_sync.field_account_bank_statement_line__online_partner_information
+#: model:ir.model.fields,field_description:odex30_account_online_sync.field_res_partner__online_partner_information
+#: model:ir.model.fields,field_description:odex30_account_online_sync.field_res_users__online_partner_information
+msgid "Online Partner Information"
+msgstr "معلومات الشريك عبر الإنترنت "
+
+#. module: odex30_account_online_sync
+#. odoo-python
+#: code:addons/odex30_account_online_sync/models/account_journal.py:0
+#: model:ir.actions.act_window,name:odex30_account_online_sync.action_account_online_link_form
+#: model:ir.ui.menu,name:odex30_account_online_sync.menu_action_online_link_account
+#: model_terms:ir.actions.act_window,help:odex30_account_online_sync.action_account_online_link_form
+msgid "Online Synchronization"
+msgstr "المزامنة عبر الإنترنت "
+
+#. module: odex30_account_online_sync
+#: model:ir.model.fields,field_description:odex30_account_online_sync.field_account_bank_statement_line__online_transaction_identifier
+#: model:ir.model.fields,field_description:odex30_account_online_sync.field_account_bank_statement_line_transient__online_transaction_identifier
+msgid "Online Transaction Identifier"
+msgstr "معرف المعاملات عبر الإنترنت "
+
+#. module: odex30_account_online_sync
+#. odoo-python
+#: code:addons/odex30_account_online_sync/models/account_bank_statement.py:0
+msgid "Opening statement: first synchronization"
+msgstr "البيان الافتتاحي: المزامنة الأولى"
+
+#. module: odex30_account_online_sync
+#: model:ir.model.fields,field_description:odex30_account_online_sync.field_account_bank_statement_line_transient__partner_name
+msgid "Partner Name"
+msgstr "اسم الشريك"
+
+#. module: odex30_account_online_sync
+#: model:ir.model.fields,field_description:odex30_account_online_sync.field_account_bank_statement_line_transient__payment_ref
+msgid "Payment Ref"
+msgstr "مرجع الدفع "
+
+#. module: odex30_account_online_sync
+#: model:ir.model.fields.selection,name:odex30_account_online_sync.selection__account_bank_statement_line_transient__state__pending
+msgid "Pending"
+msgstr "قيد الانتظار "
+
+#. module: odex30_account_online_sync
+#: model:ir.model.fields.selection,name:odex30_account_online_sync.selection__account_online_account__fetching_status__planned
+msgid "Planned"
+msgstr "المخطط له "
+
+#. module: odex30_account_online_sync
+#. odoo-python
+#: code:addons/odex30_account_online_sync/wizard/account_journal_missing_transactions.py:0
+msgid "Please enter a valid Starting Date to continue."
+msgstr "يرجى إدخال تاريخ بدء صالح للمتابعة. "
+
+#. module: odex30_account_online_sync
+#. odoo-python
+#: code:addons/odex30_account_online_sync/models/account_online.py:0
+msgid "Please reconnect your online account."
+msgstr "الرجاء إعادة توصيل حسابك عبر الإنترنت. "
+
+#. module: odex30_account_online_sync
+#. odoo-python
+#: code:addons/odex30_account_online_sync/wizard/account_bank_statement_line.py:0
+msgid "Please select first the transactions you wish to import."
+msgstr "يرجى أولاً تحديد المعاملات التي ترغب في استيرادها. "
+
+#. module: odex30_account_online_sync
+#: model:ir.model.fields.selection,name:odex30_account_online_sync.selection__account_bank_statement_line_transient__state__posted
+msgid "Posted"
+msgstr "مُرحّل "
+
+#. module: odex30_account_online_sync
+#: model_terms:ir.ui.view,arch_db:odex30_account_online_sync.missing_bank_statement_line_search
+msgid "Posted Transactions"
+msgstr "المعاملات التي تم ترحيلها "
+
+#. module: odex30_account_online_sync
+#: model:ir.model.fields.selection,name:odex30_account_online_sync.selection__account_online_account__fetching_status__processing
+msgid "Processing"
+msgstr "معالجة "
+
+#. module: odex30_account_online_sync
+#: model:ir.model.fields,field_description:odex30_account_online_sync.field_account_online_link__provider_data
+msgid "Provider Data"
+msgstr "بيانات المزود "
+
+#. module: odex30_account_online_sync
+#: model:ir.model.fields,field_description:odex30_account_online_sync.field_account_online_link__provider_type
+msgid "Provider Type"
+msgstr "نوع Plaid"
+
+#. module: odex30_account_online_sync
+#: model:ir.model.fields,field_description:odex30_account_online_sync.field_account_online_link__rating_ids
+msgid "Ratings"
+msgstr "التقييمات"
+
+#. module: odex30_account_online_sync
+#: model_terms:ir.ui.view,arch_db:odex30_account_online_sync.account_online_link_view_form
+msgid "Reconnect"
+msgstr "إعادة توصيل "
+
+#. module: odex30_account_online_sync
+#. odoo-javascript
+#: code:addons/odex30_account_online_sync/static/src/components/connected_until_widget/connected_until_widget.xml:0
+#: code:addons/odex30_account_online_sync/static/src/components/refresh_spin_journal_widget/refresh_spin_journal_widget.xml:0
+#: model_terms:ir.ui.view,arch_db:odex30_account_online_sync.account_journal_dashboard_inherit_online_sync
+msgid "Reconnect Bank"
+msgstr "إعادة توصيل البنك "
+
+#. module: odex30_account_online_sync
+#. odoo-python
+#: code:addons/odex30_account_online_sync/models/account_online.py:0
+msgid "Redirect"
+msgstr "إعادة توجيه"
+
+#. module: odex30_account_online_sync
+#. odoo-javascript
+#: code:addons/odex30_account_online_sync/static/src/components/refresh_spin_journal_widget/refresh_spin_journal_widget.xml:0
+msgid "Refresh"
+msgstr "تحديث "
+
+#. module: odex30_account_online_sync
+#: model:ir.model.fields,field_description:odex30_account_online_sync.field_account_online_link__refresh_token
+msgid "Refresh Token"
+msgstr "تحديث الرمز"
+
+#. module: odex30_account_online_sync
+#. odoo-python
+#: code:addons/odex30_account_online_sync/models/account_journal.py:0
+msgid "Report Issue"
+msgstr "إبلاغ عن إساءة "
+
+#. module: odex30_account_online_sync
+#. odoo-python
+#: code:addons/odex30_account_online_sync/models/account_online.py:0
+msgid "Report issue"
+msgstr "إبلاغ عن مشكلة "
+
+#. module: odex30_account_online_sync
+#: model:ir.model.fields,help:odex30_account_online_sync.field_account_online_link__client_id
+msgid "Represent a link for a given user towards a banking institution"
+msgstr "تقديم رابط لمستخدم معين إلى منشأة بنكية "
+
+#. module: odex30_account_online_sync
+#: model_terms:ir.ui.view,arch_db:odex30_account_online_sync.account_online_link_view_form
+msgid "Reset"
+msgstr "إعادة الضبط "
+
+#. module: odex30_account_online_sync
+#: model:ir.model.fields,field_description:odex30_account_online_sync.field_account_online_link__activity_user_id
+msgid "Responsible User"
+msgstr "المستخدم المسؤول"
+
+#. module: odex30_account_online_sync
+#: model:ir.model.fields,field_description:odex30_account_online_sync.field_account_online_link__message_has_sms_error
+msgid "SMS Delivery error"
+msgstr "خطأ في تسليم الرسائل النصية القصيرة "
+
+#. module: odex30_account_online_sync
+#. odoo-javascript
+#: code:addons/odex30_account_online_sync/static/src/components/bank_configure/bank_configure.xml:0
+msgid "Search over"
+msgstr "البحث "
+
+#. module: odex30_account_online_sync
+#: model_terms:ir.ui.view,arch_db:odex30_account_online_sync.portal_renew_consent
+msgid ""
+"Security Tip: always check the domain name of this page, before clicking on "
+"the button."
+msgstr ""
+"نصيحة للأمان: تحقق دائماً من اسم النطاق لهذه الصفحة، عن طريق الضغط على الزر."
+" "
+
+#. module: odex30_account_online_sync
+#. odoo-javascript
+#: code:addons/odex30_account_online_sync/static/src/components/refresh_spin_journal_widget/refresh_spin_journal_widget.xml:0
+msgid "See error"
+msgstr "انظر إلى الخطأ "
+
+#. module: odex30_account_online_sync
+#. odoo-python
+#: code:addons/odex30_account_online_sync/models/account_online.py:0
+#: model_terms:ir.ui.view,arch_db:odex30_account_online_sync.view_account_bank_selection_form_wizard
+msgid "Select a Bank Account"
+msgstr "تحديد حساب بنكي "
+
+#. module: odex30_account_online_sync
+#: model_terms:ir.ui.view,arch_db:odex30_account_online_sync.view_account_bank_selection_form_wizard
+msgid "Select the"
+msgstr "قم بتحديد "
+
+#. module: odex30_account_online_sync
+#: model:ir.model.fields,field_description:odex30_account_online_sync.field_account_bank_selection__selected_account
+msgid "Selected Account"
+msgstr "الحساب المحدد "
+
+#. module: odex30_account_online_sync
+#: model:ir.model.fields,field_description:odex30_account_online_sync.field_account_bank_statement_line_transient__sequence
+msgid "Sequence"
+msgstr "تسلسل "
+
+#. module: odex30_account_online_sync
+#: model:ir.model.fields,help:odex30_account_online_sync.field_account_online_account__account_number
+msgid "Set if third party provider has the full account number"
+msgstr "التعيين إذا كان لدى مزود الطرف الثالث رقم الحساب الكامل "
+
+#. module: odex30_account_online_sync
+#. odoo-javascript
+#: code:addons/odex30_account_online_sync/static/src/components/bank_configure/bank_configure.xml:0
+msgid "Setup Bank"
+msgstr "إعداد البنك "
+
+#. module: odex30_account_online_sync
+#. odoo-python
+#: code:addons/odex30_account_online_sync/models/account_online.py:0
+msgid "Setup Bank Account"
+msgstr "إعداد الحساب البنكي "
+
+#. module: odex30_account_online_sync
+#: model:ir.model.fields,field_description:odex30_account_online_sync.field_account_online_link__show_sync_actions
+msgid "Show Sync Actions"
+msgstr "عرض إجراءات المزامنة "
+
+#. module: odex30_account_online_sync
+#. odoo-javascript
+#: code:addons/odex30_account_online_sync/static/src/components/views/account_online_authorization_kanban_controller.xml:0
+msgid "Some transactions"
+msgstr "بعض المعاملات "
+
+#. module: odex30_account_online_sync
+#: model:ir.model.fields,field_description:odex30_account_online_sync.field_account_duplicate_transaction_wizard__date
+#: model:ir.model.fields,field_description:odex30_account_online_sync.field_account_missing_transaction_wizard__date
+msgid "Starting Date"
+msgstr "تاريخ البدء"
+
+#. module: odex30_account_online_sync
+#: model:ir.model.fields,field_description:odex30_account_online_sync.field_account_bank_statement_line_transient__state
+#: model:ir.model.fields,field_description:odex30_account_online_sync.field_account_journal__account_online_link_state
+#: model:ir.model.fields,field_description:odex30_account_online_sync.field_account_online_link__state
+msgid "State"
+msgstr "الحالة "
+
+#. module: odex30_account_online_sync
+#: model:ir.model.fields,help:odex30_account_online_sync.field_account_online_link__activity_state
+msgid ""
+"Status based on activities\n"
+"Overdue: Due date is already passed\n"
+"Today: Activity date is today\n"
+"Planned: Future activities."
+msgstr ""
+"الأنشطة المعتمدة على الحالة\n"
+"المتأخرة: تاريخ الاستحقاق مر\n"
+"اليوم: تاريخ النشاط هو اليوم\n"
+"المخطط: الأنشطة المستقبلية."
+
+#. module: odex30_account_online_sync
+#: model_terms:ir.ui.view,arch_db:odex30_account_online_sync.portal_renew_consent
+msgid "Thank You!"
+msgstr "شكرا لك! "
+
+#. module: odex30_account_online_sync
+#. odoo-python
+#: code:addons/odex30_account_online_sync/models/account_online.py:0
+msgid "The consent for the selected account has expired."
+msgstr "انتهت صلاحية الإذن للحساب المحدد. "
+
+#. module: odex30_account_online_sync
+#. odoo-python
+#: code:addons/odex30_account_online_sync/models/account_online.py:0
+msgid ""
+"The online synchronization service is not available at the moment. Please "
+"try again later."
+msgstr ""
+"خدمة المزامنة عبر الإنترنت غير متوفرة في الوقت الحالي. الرجاء المحاولة "
+"مجدداً لاحقاً "
+
+#. module: odex30_account_online_sync
+#: model:ir.model.fields,help:odex30_account_online_sync.field_account_online_link__provider_type
+msgid "Third Party Provider"
+msgstr "مزود الطرف الثالث "
+
+#. module: odex30_account_online_sync
+#: model_terms:ir.ui.view,arch_db:odex30_account_online_sync.account_duplicate_transaction_wizard_view_form
+msgid ""
+"This action will delete all selected transactions. Are you sure you want to "
+"proceed?"
+msgstr ""
+"سيؤدي هذا الإجراء إلى حذف كافة المعاملات المحددة. هل أنت متأكد أنك ترغب في "
+"المتابعة؟ "
+
+#. module: odex30_account_online_sync
+#: model_terms:ir.ui.view,arch_db:odex30_account_online_sync.account_online_link_view_form
+msgid "This button will reset the fetching status"
+msgstr "سيؤدي هذا الزر إلى إعادة ضبط حالة عملية البحث "
+
+#. module: odex30_account_online_sync
+#. odoo-python
+#: code:addons/odex30_account_online_sync/models/account_online.py:0
+msgid ""
+"This version of Odoo appears to be outdated and does not support the '%s' "
+"sync mode. Installing the latest update might solve this."
+msgstr ""
+"يبدو أن هذه النسخة من أودو قديمة ولا تدعم وضع المزامنة '%s'. قد يحل تثبيت "
+"آخر تحديث هذه المشكلة. "
+
+#. module: odex30_account_online_sync
+#: model_terms:ir.actions.act_window,help:odex30_account_online_sync.action_account_online_link_form
+msgid ""
+"To create a synchronization with your banking institution,<br>\n"
+"                please click on <b>Add a Bank Account</b>."
+msgstr ""
+"لإنشاء مزامنة مع المنشأة البنكية،<br>\n"
+"                يرجى الضغط على <b>إضافة حساب بنكي</b>. "
+
+#. module: odex30_account_online_sync
+#: model:ir.model.fields,help:odex30_account_online_sync.field_account_online_link__access_token
+msgid "Token used to access API."
+msgstr "الرمز المستخدَم للوصول إلى الواجهة البرمجية للتطبيق. "
+
+#. module: odex30_account_online_sync
+#: model:ir.model.fields,help:odex30_account_online_sync.field_account_online_link__refresh_token
+msgid "Token used to sign API request, Never disclose it"
+msgstr ""
+"الرمز المستخدَم للتوقيع على طلب الواجهة البرمجية للتطبيق، لا تقم بالإفصاح "
+"عنه أبداً "
+
+#. module: odex30_account_online_sync
+#: model:ir.model.fields,field_description:odex30_account_online_sync.field_account_duplicate_transaction_wizard__transaction_ids
+msgid "Transaction"
+msgstr "معاملة"
+
+#. module: odex30_account_online_sync
+#: model:ir.model.fields,field_description:odex30_account_online_sync.field_account_bank_statement_line_transient__transaction_details
+msgid "Transaction Details"
+msgstr "تفاصيل المعاملة "
+
+#. module: odex30_account_online_sync
+#: model_terms:ir.ui.view,arch_db:odex30_account_online_sync.account_duplicate_transaction_wizard_view_form
+msgid "Transactions"
+msgstr "المعاملات "
+
+#. module: odex30_account_online_sync
+#: model:ir.model,name:odex30_account_online_sync.model_account_bank_statement_line_transient
+msgid "Transient model for bank statement line"
+msgstr "Transient model for bank statement line"
+
+#. module: odex30_account_online_sync
+#: model:ir.model.fields,help:odex30_account_online_sync.field_account_online_link__has_unlinked_accounts
+msgid ""
+"True if that connection still has accounts that are not linked to an Odoo "
+"journal"
+msgstr ""
+"تكون القيمة صحيحة إذا كان الاتصال لا يزال يحتوي على حسابات غير مرتبطة بدفتر "
+"يومية أودو "
+
+#. module: odex30_account_online_sync
+#: model:ir.model.fields,help:odex30_account_online_sync.field_account_online_link__activity_exception_decoration
+msgid "Type of the exception activity on record."
+msgstr "نوع النشاط المستثنى في السجل. "
+
+#. module: odex30_account_online_sync
+#: model_terms:ir.ui.view,arch_db:odex30_account_online_sync.account_online_link_view_form
+msgid "Update Credentials"
+msgstr "تحديث بيانات الاعتماد"
+
+#. module: odex30_account_online_sync
+#: model:ir.model.fields.selection,name:odex30_account_online_sync.selection__account_online_account__fetching_status__waiting
+msgid "Waiting"
+msgstr "قيد الانتظار "
+
+#. module: odex30_account_online_sync
+#: model:ir.model.fields,field_description:odex30_account_online_sync.field_account_online_link__website_message_ids
+msgid "Website Messages"
+msgstr "رسائل الموقع الإلكتروني "
+
+#. module: odex30_account_online_sync
+#: model:ir.model.fields,help:odex30_account_online_sync.field_account_online_link__website_message_ids
+msgid "Website communication history"
+msgstr "سجل تواصل الموقع الإلكتروني "
+
+#. module: odex30_account_online_sync
+#: model:ir.model,name:odex30_account_online_sync.model_account_duplicate_transaction_wizard
+msgid "Wizard for duplicate transactions"
+msgstr "معالج للمعاملات المكررة "
+
+#. module: odex30_account_online_sync
+#: model:ir.model,name:odex30_account_online_sync.model_account_missing_transaction_wizard
+msgid "Wizard for missing transactions"
+msgstr "معالج للمعاملات المفقودة "
+
+#. module: odex30_account_online_sync
+#. odoo-javascript
+#: code:addons/odex30_account_online_sync/static/src/components/transient_bank_statement_line_list_view/transient_bank_statement_line_list_view.xml:0
+msgid ""
+"You are importing transactions before the creation of your online synchronization\n"
+"                    ("
+msgstr ""
+"أنت تقوم باستيراد المعاملات قبل إنشاء المزامنة عبر الإنترنت\n"
+"                    ("
+
+#. module: odex30_account_online_sync
+#. odoo-python
+#: code:addons/odex30_account_online_sync/models/account_online.py:0
+msgid "You can contact Odoo support"
+msgstr "يمكنك التواصل مع فريق الدعم لدى أودو "
+
+#. module: odex30_account_online_sync
+#. odoo-python
+#: code:addons/odex30_account_online_sync/models/account_journal.py:0
+msgid "You can only execute this action for bank-synchronized journals."
+msgstr "لا يمكنك تنفيذ هذا الإجراء إلا لدفاتر اليومية المتزامنة مع البنك. "
+
+#. module: odex30_account_online_sync
+#. odoo-python
+#: code:addons/odex30_account_online_sync/models/account_journal.py:0
+#: code:addons/odex30_account_online_sync/wizard/account_journal_missing_transactions.py:0
+msgid ""
+"You can't find missing transactions for a journal that isn't connected."
+msgstr "لا يمكنك العثور على المعاملات المفقودة لدفتر يومية غير متصل. "
+
+#. module: odex30_account_online_sync
+#. odoo-python
+#: code:addons/odex30_account_online_sync/models/account_journal.py:0
+#: code:addons/odex30_account_online_sync/models/account_online.py:0
+msgid "You cannot have two journals associated with the same Online Account."
+msgstr "لا يمكن أن يكون لديك حسابان مرتبطان بنفس الحساب عبر الإنترنت. "
+
+#. module: odex30_account_online_sync
+#. odoo-python
+#: code:addons/odex30_account_online_sync/wizard/account_bank_statement_line.py:0
+msgid "You cannot import pending transactions."
+msgstr "لا يمكنك استيراد المعاملات المعلقة. "
+
+#. module: odex30_account_online_sync
+#. odoo-javascript
+#: code:addons/odex30_account_online_sync/static/src/components/transient_bank_statement_line_list_view/transient_bank_statement_line_list_view.xml:0
+msgid "You have"
+msgstr "لديك"
+
+#. module: odex30_account_online_sync
+#. odoo-python
+#: code:addons/odex30_account_online_sync/wizard/account_journal_missing_transactions.py:0
+msgid "You have to select one journal to continue."
+msgstr "عليك تحديد دفتر يومية واحد للاستمرار. "
+
+#. module: odex30_account_online_sync
+#: model:mail.template,subject:odex30_account_online_sync.email_template_sync_reminder
+msgid "Your bank connection is expiring soon"
+msgstr "سوف ينتهي اتصال البنك الخاص بك قريباً "
+
+#. module: odex30_account_online_sync
+#: model_terms:ir.ui.view,arch_db:odex30_account_online_sync.view_account_bank_selection_form_wizard
+msgid "account to connect:"
+msgstr "الحساب لربطه: "
+
+#. module: odex30_account_online_sync
+#. odoo-javascript
+#: code:addons/odex30_account_online_sync/static/src/components/bank_configure/bank_configure.xml:0
+msgid "banks"
+msgstr "البنوك "
+
+#. module: odex30_account_online_sync
+#. odoo-javascript
+#: code:addons/odex30_account_online_sync/static/src/components/transient_bank_statement_line_list_view/transient_bank_statement_line_list_view.xml:0
+msgid "entries"
+msgstr "القيود"
+
+#. module: odex30_account_online_sync
+#. odoo-javascript
+#: code:addons/odex30_account_online_sync/static/src/components/bank_configure/bank_configure.xml:0
+msgid "loading..."
+msgstr "جاري التحميل..."
+
+#. module: odex30_account_online_sync
+#. odoo-javascript
+#: code:addons/odex30_account_online_sync/static/src/components/views/account_online_authorization_kanban_controller.xml:0
+msgid "may be duplicates."
+msgstr "قد تكون عناك نُسخ مكررة "
+
+#. module: odex30_account_online_sync
+#: model_terms:ir.ui.view,arch_db:odex30_account_online_sync.portal_renew_consent
+msgid "on"
+msgstr "في"
+
+#. module: odex30_account_online_sync
+#: model:ir.model,name:odex30_account_online_sync.model_account_online_account
+msgid "representation of an online bank account"
+msgstr "تمثيل لحساب بنكي عبر الإنترنت "
+
+#. module: odex30_account_online_sync
+#. odoo-javascript
+#: code:addons/odex30_account_online_sync/static/src/components/refresh_spin_journal_widget/refresh_spin_journal_widget.xml:0
+msgid "transactions fetched"
+msgstr "تم جلب المعاملات "
+
+#. module: odex30_account_online_sync
+#. odoo-javascript
+#: code:addons/odex30_account_online_sync/static/src/components/transient_bank_statement_line_list_view/transient_bank_statement_line_list_view.xml:0
+msgid ""
+"within this period that were not created using the online synchronization. "
+"This might cause duplicate entries."
+msgstr ""
+"خلال هذه الفترة والتي لم يتم إنشاؤها باستخدام المزامنة عبر الإنترنت. قد "
+"يتسبب هذا في استنساخ القيود. "
diff --git a/dev_odex30_accounting/odex30_account_online_sync/models/__init__.py b/dev_odex30_accounting/odex30_account_online_sync/models/__init__.py
new file mode 100644
index 0000000..fa59fc5
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_online_sync/models/__init__.py
@@ -0,0 +1,9 @@
+# -*- coding: utf-8 -*-
+
+from . import account_bank_statement
+from . import account_journal
+from . import account_online
+from . import company
+from . import mail_activity_type
+from . import partner
+from . import bank_rec_widget
diff --git a/dev_odex30_accounting/odex30_account_online_sync/models/__pycache__/__init__.cpython-311.pyc b/dev_odex30_accounting/odex30_account_online_sync/models/__pycache__/__init__.cpython-311.pyc
new file mode 100644
index 0000000..807c970
Binary files /dev/null and b/dev_odex30_accounting/odex30_account_online_sync/models/__pycache__/__init__.cpython-311.pyc differ
diff --git a/dev_odex30_accounting/odex30_account_online_sync/models/__pycache__/account_bank_statement.cpython-311.pyc b/dev_odex30_accounting/odex30_account_online_sync/models/__pycache__/account_bank_statement.cpython-311.pyc
new file mode 100644
index 0000000..161301f
Binary files /dev/null and b/dev_odex30_accounting/odex30_account_online_sync/models/__pycache__/account_bank_statement.cpython-311.pyc differ
diff --git a/dev_odex30_accounting/odex30_account_online_sync/models/__pycache__/account_journal.cpython-311.pyc b/dev_odex30_accounting/odex30_account_online_sync/models/__pycache__/account_journal.cpython-311.pyc
new file mode 100644
index 0000000..65ca1e2
Binary files /dev/null and b/dev_odex30_accounting/odex30_account_online_sync/models/__pycache__/account_journal.cpython-311.pyc differ
diff --git a/dev_odex30_accounting/odex30_account_online_sync/models/__pycache__/account_online.cpython-311.pyc b/dev_odex30_accounting/odex30_account_online_sync/models/__pycache__/account_online.cpython-311.pyc
new file mode 100644
index 0000000..eb8eff3
Binary files /dev/null and b/dev_odex30_accounting/odex30_account_online_sync/models/__pycache__/account_online.cpython-311.pyc differ
diff --git a/dev_odex30_accounting/odex30_account_online_sync/models/__pycache__/bank_rec_widget.cpython-311.pyc b/dev_odex30_accounting/odex30_account_online_sync/models/__pycache__/bank_rec_widget.cpython-311.pyc
new file mode 100644
index 0000000..23f8bc4
Binary files /dev/null and b/dev_odex30_accounting/odex30_account_online_sync/models/__pycache__/bank_rec_widget.cpython-311.pyc differ
diff --git a/dev_odex30_accounting/odex30_account_online_sync/models/__pycache__/company.cpython-311.pyc b/dev_odex30_accounting/odex30_account_online_sync/models/__pycache__/company.cpython-311.pyc
new file mode 100644
index 0000000..9dba055
Binary files /dev/null and b/dev_odex30_accounting/odex30_account_online_sync/models/__pycache__/company.cpython-311.pyc differ
diff --git a/dev_odex30_accounting/odex30_account_online_sync/models/__pycache__/mail_activity_type.cpython-311.pyc b/dev_odex30_accounting/odex30_account_online_sync/models/__pycache__/mail_activity_type.cpython-311.pyc
new file mode 100644
index 0000000..2aabcb1
Binary files /dev/null and b/dev_odex30_accounting/odex30_account_online_sync/models/__pycache__/mail_activity_type.cpython-311.pyc differ
diff --git a/dev_odex30_accounting/odex30_account_online_sync/models/__pycache__/odoofin_auth.cpython-311.pyc b/dev_odex30_accounting/odex30_account_online_sync/models/__pycache__/odoofin_auth.cpython-311.pyc
new file mode 100644
index 0000000..3a6a04c
Binary files /dev/null and b/dev_odex30_accounting/odex30_account_online_sync/models/__pycache__/odoofin_auth.cpython-311.pyc differ
diff --git a/dev_odex30_accounting/odex30_account_online_sync/models/__pycache__/partner.cpython-311.pyc b/dev_odex30_accounting/odex30_account_online_sync/models/__pycache__/partner.cpython-311.pyc
new file mode 100644
index 0000000..a501c7f
Binary files /dev/null and b/dev_odex30_accounting/odex30_account_online_sync/models/__pycache__/partner.cpython-311.pyc differ
diff --git a/dev_odex30_accounting/odex30_account_online_sync/models/account_bank_statement.py b/dev_odex30_accounting/odex30_account_online_sync/models/account_bank_statement.py
new file mode 100644
index 0000000..bade26e
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_online_sync/models/account_bank_statement.py
@@ -0,0 +1,114 @@
+# -*- coding: utf-8 -*-
+import threading
+import time
+import json
+
+from odoo import api, fields, models, SUPERUSER_ID, tools, _
+from odoo.tools import date_utils
+from odoo.exceptions import UserError, ValidationError
+
+STATEMENT_LINE_CREATION_BATCH_SIZE = 500  # When importing transactions, batch the process to commit after importing batch_size
+
+
+class AccountBankStatementLine(models.Model):
+    _inherit = 'account.bank.statement.line'
+
+    online_transaction_identifier = fields.Char("Online Transaction Identifier", readonly=True)
+    online_partner_information = fields.Char(readonly=True)
+    online_account_id = fields.Many2one(comodel_name='account.online.account', readonly=True)
+    online_link_id = fields.Many2one(
+        comodel_name='account.online.link',
+        related='online_account_id.account_online_link_id',
+        store=True,
+        readonly=True,
+    )
+
+    @api.model_create_multi
+    def create(self, vals_list):
+        """
+            Some transactions can be marked as "Zero Balancing",
+            which is a transaction used at the end of the day to summarize all the transactions
+            of the day. As we already manage the details of all the transactions, this one is not
+            useful and moreover create duplicates. To deal with that, we cancel the move and so
+            the bank statement line.
+        """
+        # EXTEND account
+        bank_statement_lines = super().create(vals_list)
+        moves_to_cancel = self.env['account.move']
+        for bank_statement_line in bank_statement_lines:
+            transaction_details = json.loads(bank_statement_line.transaction_details) if bank_statement_line.transaction_details else {}
+            if not transaction_details.get('is_zero_balancing'):
+                continue
+            moves_to_cancel |= bank_statement_line.move_id
+        moves_to_cancel.button_cancel()
+
+        return bank_statement_lines
+
+    @api.model
+    def _online_sync_bank_statement(self, transactions, online_account):
+        """
+         build bank statement lines from a list of transaction and post messages is also post in the online_account of the journal.
+         :param transactions: A list of transactions that will be created.
+             The format is : [{
+                 'id': online id,                  (unique ID for the transaction)
+                 'date': transaction date,         (The date of the transaction)
+                 'name': transaction description,  (The description)
+                 'amount': transaction amount,     (The amount of the transaction. Negative for debit, positive for credit)
+             }, ...]
+         :param online_account: The online account for this statement
+         Return: The number of imported transaction for the journal
+        """
+        start_time = time.time()
+        lines_to_reconcile = self.env['account.bank.statement.line']
+        try:
+            for journal in online_account.journal_ids:
+                # Since the synchronization succeeded, set it as the bank_statements_source of the journal
+                journal.sudo().write({'bank_statements_source': 'online_sync'})
+                if not transactions:
+                    continue
+
+                sorted_transactions = sorted(transactions, key=lambda transaction: transaction['date'])
+                total = self.env.context.get('transactions_total') or sum([transaction['amount'] for transaction in transactions])
+
+                # For first synchronization, an opening line is created to fill the missing bank statement data
+                any_st_line = self.search_count([('journal_id', '=', journal.id)], limit=1)
+                journal_currency = journal.currency_id or journal.company_id.currency_id
+                # If there are neither statement and the ending balance != 0, we create an opening bank statement at the day of the oldest transaction.
+                # We set the sequence to >1 to ensure the computed internal_index will force its display before any other statement with the same date.
+                if not any_st_line and not journal_currency.is_zero(online_account.balance - total):
+                    opening_st_line = self.with_context(skip_statement_line_cron_trigger=True).create({
+                        'date': sorted_transactions[0]['date'],
+                        'journal_id': journal.id,
+                        'payment_ref': _("Opening statement: first synchronization"),
+                        'amount': online_account.balance - total,
+                        'sequence': 2,
+                    })
+                    lines_to_reconcile += opening_st_line
+
+                filtered_transactions = online_account._get_filtered_transactions(sorted_transactions)
+
+                do_commit = not (hasattr(threading.current_thread(), 'testing') and threading.current_thread().testing)
+                if filtered_transactions:
+                    # split transactions import in batch and commit after each batch except in testing mode
+                    for index in range(0, len(filtered_transactions), STATEMENT_LINE_CREATION_BATCH_SIZE):
+                        lines_to_reconcile += self.with_user(SUPERUSER_ID).with_company(journal.company_id).with_context(skip_statement_line_cron_trigger=True).create(filtered_transactions[index:index + STATEMENT_LINE_CREATION_BATCH_SIZE])
+                        if do_commit:
+                            self.env.cr.commit()
+                    # Set last sync date as the last transaction date
+                    journal.account_online_account_id.sudo().write({'last_sync': filtered_transactions[-1]['date']})
+
+                if lines_to_reconcile:
+                    # 'limit_time_real_cron' defaults to -1.
+                    # Manual fallback applied for non-POSIX systems where this key is disabled (set to None).
+                    cron_limit_time = tools.config['limit_time_real_cron'] or -1
+                    limit_time = (cron_limit_time if cron_limit_time > 0 else 180) - (time.time() - start_time)
+                    if limit_time > 0:
+                        lines_to_reconcile._cron_try_auto_reconcile_statement_lines(limit_time=limit_time)
+        # Catch any configuration error that would prevent creating the entries, reset fetching_status flag and re-raise the error
+        # Otherwise flag is never reset and user is under the impression that we are still fetching transactions
+        except (UserError, ValidationError) as e:
+            self.env.cr.rollback()
+            online_account.account_online_link_id._log_information('error', subject=_("Error"), message=str(e))
+            self.env.cr.commit()
+            raise
+        return lines_to_reconcile
diff --git a/dev_odex30_accounting/odex30_account_online_sync/models/account_journal.py b/dev_odex30_accounting/odex30_account_online_sync/models/account_journal.py
new file mode 100644
index 0000000..afb0777
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_online_sync/models/account_journal.py
@@ -0,0 +1,380 @@
+# -*- coding: utf-8 -*-
+
+import logging
+import requests
+from dateutil.relativedelta import relativedelta
+from requests.exceptions import RequestException, Timeout
+
+from odoo import api, fields, models, tools, _
+from odoo.exceptions import UserError, ValidationError, RedirectWarning
+from odoo.tools import SQL
+
+_logger = logging.getLogger(__name__)
+
+
+class AccountJournal(models.Model):
+    _inherit = "account.journal"
+
+    def __get_bank_statements_available_sources(self):
+        rslt = super(AccountJournal, self).__get_bank_statements_available_sources()
+        rslt.append(("online_sync", _("Online Synchronization")))
+        return rslt
+
+    next_link_synchronization = fields.Datetime("Online Link Next synchronization", related='account_online_link_id.next_refresh')
+    expiring_synchronization_date = fields.Date(related='account_online_link_id.expiring_synchronization_date')
+    expiring_synchronization_due_day = fields.Integer(compute='_compute_expiring_synchronization_due_day')
+    account_online_account_id = fields.Many2one('account.online.account', copy=False, ondelete='set null')
+    account_online_link_id = fields.Many2one('account.online.link', related='account_online_account_id.account_online_link_id', readonly=True, store=True)
+    account_online_link_state = fields.Selection(related="account_online_link_id.state", readonly=True)
+    renewal_contact_email = fields.Char(
+        string='Connection Requests',
+        help='Comma separated list of email addresses to send consent renewal notifications 15, 3 and 1 days before expiry',
+        default=lambda self: self.env.user.email,
+    )
+    online_sync_fetching_status = fields.Selection(related="account_online_account_id.fetching_status", readonly=True)
+
+    def write(self, vals):
+        # When changing the bank_statement_source, unlink the connection if there is any
+        if 'bank_statements_source' in vals and vals.get('bank_statements_source') != 'online_sync':
+            for journal in self:
+                if journal.bank_statements_source == 'online_sync':
+                    # unlink current connection
+                    vals['account_online_account_id'] = False
+                    journal.account_online_link_id.has_unlinked_accounts = True
+        return super().write(vals)
+
+    @api.depends('expiring_synchronization_date')
+    def _compute_expiring_synchronization_due_day(self):
+        for record in self:
+            if record.expiring_synchronization_date:
+                due_day_delta = record.expiring_synchronization_date - fields.Date.context_today(record)
+                record.expiring_synchronization_due_day = due_day_delta.days
+            else:
+                record.expiring_synchronization_due_day = 0
+
+    def _fill_bank_cash_dashboard_data(self, dashboard_data):
+        super()._fill_bank_cash_dashboard_data(dashboard_data)
+        # Caching data to avoid one call per journal
+        self.browse(list(dashboard_data.keys())).fetch(['type', 'account_online_account_id'])
+        for journal_id, journal_data in dashboard_data.items():
+            journal = self.browse(journal_id)
+            journal_data['display_connect_bank_in_dashboard'] = journal.type in ('bank', 'credit') \
+                                                                and not journal.account_online_account_id \
+                                                                and journal.company_id.id == self.env.company.id
+
+    @api.constrains('account_online_account_id')
+    def _check_account_online_account_id(self):
+        for journal in self:
+            if len(journal.account_online_account_id.journal_ids) > 1:
+                raise ValidationError(_('You cannot have two journals associated with the same Online Account.'))
+
+    def _fetch_online_transactions(self):
+        for journal in self:
+            try:
+                journal.account_online_link_id._pop_connection_state_details(journal=journal)
+                journal.manual_sync()
+                # for cron jobs it is usually recommended committing after each iteration,
+                # so that a later error or job timeout doesn't discard previous work
+                self.env.cr.commit()
+            except (UserError, RedirectWarning):
+                # We need to rollback here otherwise the next iteration will still have the error when trying to commit
+                self.env.cr.rollback()
+
+    def fetch_online_sync_favorite_institutions(self):
+        self.ensure_one()
+        timeout = int(self.env['ir.config_parameter'].sudo().get_param('odex30_account_online_sync.request_timeout')) or 60
+        endpoint_url = self.env['account.online.link']._get_odoofin_url('/proxy/v1/get_dashboard_institutions')
+        params = {'country': self.sudo().company_id.account_fiscal_country_id.code, 'limit': 28}
+        try:
+            resp = requests.post(endpoint_url, json=params, timeout=timeout)
+            resp_dict = resp.json()['result']
+            for institution in resp_dict:
+                if institution['picture'].startswith('/'):
+                    institution['picture'] = self.env['account.online.link']._get_odoofin_url(institution['picture'])
+            return resp_dict
+        except (Timeout, ConnectionError, RequestException, ValueError) as e:
+            _logger.warning(e)
+            return []
+
+    @api.model
+    def _cron_fetch_waiting_online_transactions(self):
+        """ This method is only called when the user fetch transactions asynchronously.
+            We only fetch transactions on synchronizations that are in "waiting" status.
+            Once the synchronization is done, the status is changed for "done".
+            We have to that to avoid having too much logic in the same cron function to do
+            2 different things. This cron should only be used for asynchronous fetchs.
+        """
+
+        # 'limit_time_real_cron' and 'limit_time_real' default respectively to -1 and 120.
+        # Manual fallbacks applied for non-POSIX systems where this key is disabled (set to None).
+        limit_time = tools.config['limit_time_real_cron'] or -1
+        if limit_time <= 0:
+            limit_time = tools.config['limit_time_real'] or 120
+        journals = self.search([
+            '|',
+                ('online_sync_fetching_status', 'in', ('planned', 'waiting')),
+                '&',
+                    ('online_sync_fetching_status', '=', 'processing'),
+                    ('account_online_link_id.last_refresh', '<', fields.Datetime.now() - relativedelta(seconds=limit_time)),
+        ])
+        journals.with_context(cron=True)._fetch_online_transactions()
+
+    @api.model
+    def _cron_fetch_online_transactions(self):
+        """ This method is called by the cron (by default twice a day) to fetch (for all journals)
+            the new transactions.
+        """
+        journals = self.search([('account_online_account_id', '!=', False)])
+        journals.with_context(cron=True)._fetch_online_transactions()
+
+    @api.model
+    def _cron_send_reminder_email(self):
+        for journal in self.search([('account_online_account_id', '!=', False)]):
+            if journal.expiring_synchronization_due_day in {1, 3, 15}:
+                journal.action_send_reminder()
+
+    def manual_sync(self):
+        self.ensure_one()
+        if self.account_online_link_id:
+            account = self.account_online_account_id
+            return self.account_online_link_id._fetch_transactions(accounts=account)
+
+    def unlink(self):
+        """
+        Override of the unlink method.
+        That's useful to unlink account.online.account too.
+        """
+        if self.account_online_account_id:
+            self.account_online_account_id.unlink()
+        return super(AccountJournal, self).unlink()
+
+    def action_configure_bank_journal(self):
+        """
+        Override the "action_configure_bank_journal" and change the flow for the
+        "Configure" button in dashboard.
+        """
+        self.ensure_one()
+        return self.env['account.online.link'].action_new_synchronization()
+
+    def action_open_account_online_link(self):
+        self.ensure_one()
+        return {
+            'type': 'ir.actions.act_window',
+            'name': self.account_online_link_id.name,
+            'res_model': 'account.online.link',
+            'target': 'main',
+            'view_mode': 'form',
+            'views': [[False, 'form']],
+            'res_id': self.account_online_link_id.id,
+        }
+
+    def action_extend_consent(self):
+        """
+        Extend the consent of the user by redirecting him to update his credentials
+        """
+        self.ensure_one()
+        return self.account_online_link_id._open_iframe(
+            mode='updateCredentials',
+            include_param={
+                'account_online_identifier': self.account_online_account_id.online_identifier,
+            },
+        )
+
+    def action_reconnect_online_account(self):
+        self.ensure_one()
+        return self.account_online_link_id.action_reconnect_account()
+
+    def action_send_reminder(self):
+        self.ensure_one()
+        self._portal_ensure_token()
+        template = self.env.ref('odex30_account_online_sync.email_template_sync_reminder')
+        subtype = self.env.ref('odex30_account_online_sync.bank_sync_consent_renewal')
+        self.message_post_with_source(source_ref=template, subtype_id=subtype.id)
+
+    def action_open_missing_transaction_wizard(self):
+        """ This method allows to open the wizard to fetch the missing
+            transactions and the pending ones.
+            Depending on where the function is called, we'll receive
+            one journal or none of them.
+            If we receive more or less than one journal, we do not set
+            it on the wizard, the user should select it by himself.
+
+            :return: An action opening the wizard.
+        """
+        journal_id = None
+        if len(self) == 1:
+            if not self.account_online_account_id or self.account_online_link_state != 'connected':
+                raise UserError(_("You can't find missing transactions for a journal that isn't connected."))
+
+            journal_id = self.id
+
+        wizard = self.env['account.missing.transaction.wizard'].create({'journal_id': journal_id})
+        return {
+            'name': _("Find Missing Transactions"),
+            'type': 'ir.actions.act_window',
+            'res_model': 'account.missing.transaction.wizard',
+            'res_id': wizard.id,
+            'views': [(False, 'form')],
+            'target': 'new',
+        }
+
+    def action_open_duplicate_transaction_wizard(self, from_date=None):
+        """ This method allows to open the wizard to find duplicate transactions.
+            :param from_date: date from with we must check for duplicates.
+
+            :return: An action opening the wizard.
+        """
+        wizard = self.env['account.duplicate.transaction.wizard'].create({
+            'journal_id': self.id if len(self) == 1 else None,
+            **({'date': from_date} if from_date else {}),
+        })
+        return wizard._get_records_action(name=_("Find Duplicate Transactions"))
+
+    def _has_duplicate_transactions(self, date_from):
+        """ Has any transaction with
+               - same amount &
+               - same date &
+               - same account number
+            We do not check on online_transaction_identifier because this is called after the fetch
+            where transitions would already have been filtered on existing online_transaction_identifier.
+
+            :param from_date: date from with we must check for duplicates.
+        """
+        self.env.cr.execute(SQL.join(SQL(''), [
+            self._get_duplicate_amount_date_account_transactions_query(date_from),
+            SQL('LIMIT 1'),
+        ]))
+        return bool(self.env.cr.rowcount)
+
+    def _get_duplicate_transactions(self, date_from):
+        """Find all transaction with
+               - same amount &
+               - same date &
+               - same account number
+               or
+               - same transaction id
+
+            :param from_date: date from with we must check for duplicates.
+        """
+        query = SQL.join(SQL(''), [
+            self._get_duplicate_amount_date_account_transactions_query(date_from),
+            SQL('UNION'),
+            self._get_duplicate_online_transaction_identifier_transactions_query(date_from),
+            SQL('ORDER BY ids'),
+        ])
+        return [res[0] for res in self.env.execute_query(query)]
+
+    def _get_duplicate_amount_date_account_transactions_query(self, date_from):
+        self.ensure_one()
+        return SQL('''
+              SELECT ARRAY_AGG(st_line.id ORDER BY st_line.id) AS ids
+                FROM account_bank_statement_line st_line
+                JOIN account_move move ON move.id = st_line.move_id
+               WHERE st_line.journal_id = %(journal_id)s AND move.date >= %(date_from)s
+            GROUP BY st_line.currency_id, st_line.amount, st_line.account_number, move.date
+              HAVING count(st_line.id) > 1
+            ''',
+            journal_id=self.id,
+            date_from=date_from,
+        )
+
+    def _get_duplicate_online_transaction_identifier_transactions_query(self, date_from):
+        return SQL('''
+              SELECT ARRAY_AGG(st_line.id ORDER BY st_line.id) AS ids
+                FROM account_bank_statement_line st_line
+                JOIN account_move move ON move.id = st_line.move_id
+               WHERE st_line.journal_id = %(journal_id)s AND
+                     move.date >= %(prior_date)s AND
+                     st_line.online_transaction_identifier IS NOT NULL
+            GROUP BY st_line.online_transaction_identifier
+              HAVING count(st_line.id) > 1 AND BOOL_OR(move.date >= %(date_from)s)  -- at least one date is > date_from
+                ''',
+                journal_id=self.id,
+                date_from=date_from,
+                prior_date=date_from - relativedelta(months=3),  # allow 1 of duplicate statements to be older than "from" date
+            )
+
+    def action_open_dashboard_asynchronous_action(self):
+        """ This method allows to open action asynchronously
+            during the fetching process.
+            When a user clicks on the Fetch Transactions button in
+            the dashboard, we fetch the transactions asynchronously
+            and save connection state details on the synchronization.
+            This action allows the user to open the action saved in
+            the connection state details.
+        """
+        self.ensure_one()
+
+        if not self.account_online_account_id:
+            raise UserError(_("You can only execute this action for bank-synchronized journals."))
+
+        connection_state_details = self.account_online_link_id._pop_connection_state_details(journal=self)
+        if connection_state_details and connection_state_details.get('action'):
+            if connection_state_details.get('error_type') == 'redirect_warning':
+                self.env.cr.commit()
+                raise RedirectWarning(connection_state_details['error_message'], connection_state_details['action'], _('Report Issue'))
+            else:
+                return connection_state_details['action']
+
+        return {'type': 'ir.actions.client', 'tag': 'soft_reload'}
+
+    def _get_journal_dashboard_data_batched(self):
+        dashboard_data = super()._get_journal_dashboard_data_batched()
+        for journal in self.filtered(lambda j: j.type in ('bank', 'credit')):
+            if journal.account_online_account_id:
+                if journal.company_id.id not in self.env.companies.ids:
+                    continue
+                connection_state_details = journal.account_online_link_id._get_connection_state_details(journal=journal)
+                if not connection_state_details and journal.account_online_account_id.fetching_status in ('waiting', 'processing'):
+                    connection_state_details = {'status': 'fetching'}
+                dashboard_data[journal.id]['connection_state_details'] = connection_state_details
+                dashboard_data[journal.id]['show_sync_actions'] = journal.account_online_link_id.show_sync_actions
+        return dashboard_data
+
+    def get_related_connection_state_details(self):
+        """ This method allows JS widget to get the last connection state details
+            It's useful if the user wasn't on the dashboard when we send the message
+            by websocket that the asynchronous flow is finished.
+            In case we don't have a connection state details and if the fetching
+            status is set on "waiting" or "processing". We're returning that the sync
+            is currently fetching.
+        """
+        self.ensure_one()
+        connection_state_details = self.account_online_link_id._get_connection_state_details(journal=self)
+        if not connection_state_details and self.account_online_account_id.fetching_status in ('waiting', 'processing'):
+            connection_state_details = {'status': 'fetching'}
+        return connection_state_details
+
+    def _consume_connection_state_details(self):
+        self.ensure_one()
+        if self.account_online_link_id and self.env.user.has_group('account.group_account_manager'):
+            # In case we have a bank synchronization connected to the journal
+            # we want to remove the last connection state because it means that we
+            # have "mark as read" this state, and we don't want to display it again to
+            # the user.
+            self.account_online_link_id._pop_connection_state_details(journal=self)
+
+    def open_action(self):
+        # Extends 'account_accountant'
+        if not self._context.get('action_name') and self.type == 'bank' and self.bank_statements_source == 'online_sync':
+            self._consume_connection_state_details()
+            return self.env['account.bank.statement.line']._action_open_bank_reconciliation_widget(
+                default_context={'search_default_journal_id': self.id},
+            )
+        return super().open_action()
+
+    def action_open_reconcile(self):
+        # Extends 'account_accountant'
+        self._consume_connection_state_details()
+        return super().action_open_reconcile()
+
+    def action_open_bank_transactions(self):
+        # Extends 'account_accountant'
+        self._consume_connection_state_details()
+        return super().action_open_bank_transactions()
+
+    @api.model
+    def _toggle_asynchronous_fetching_cron(self):
+        cron = self.env.ref('odex30_account_online_sync.online_sync_cron_waiting_synchronization', raise_if_not_found=False)
+        if cron:
+            cron.sudo().toggle(model=self._name, domain=[('account_online_account_id', '!=', False)])
diff --git a/dev_odex30_accounting/odex30_account_online_sync/models/account_online.py b/dev_odex30_accounting/odex30_account_online_sync/models/account_online.py
new file mode 100644
index 0000000..63554d4
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_online_sync/models/account_online.py
@@ -0,0 +1,1170 @@
+# -*- coding: utf-8 -*-
+
+import base64
+import datetime
+import requests
+import logging
+import re
+import uuid
+import urllib.parse
+import odoo
+import odoo.release
+from dateutil.relativedelta import relativedelta
+from markupsafe import Markup
+
+from requests.exceptions import RequestException, Timeout, ConnectionError
+from odoo import api, fields, models, modules, tools
+from odoo.exceptions import UserError, CacheMiss, MissingError, ValidationError, RedirectWarning
+from odoo.http import request
+from odoo.addons.odex30_account_online_sync.models.odoofin_auth import OdooFinAuth
+from odoo.tools.misc import format_amount, format_date, get_lang
+from odoo.tools import _, LazyTranslate
+
+_lt = LazyTranslate(__name__)
+_logger = logging.getLogger(__name__)
+pattern = re.compile("^[a-z0-9-_]+$")
+runbot_pattern = re.compile(r"^https:\/\/[a-z0-9-_]+\.[a-z0-9-_]+\.odoo\.com$")
+
+class OdooFinRedirectException(UserError):
+    """ When we need to open the iframe in a given mode. """
+
+    def __init__(self, message=_lt('Redirect'), mode='link'):
+        self.mode = mode
+        super().__init__(message)
+
+class AccountOnlineAccount(models.Model):
+    _name = 'account.online.account'
+    _description = 'representation of an online bank account'
+
+    name = fields.Char(string="Account Name", help="Account Name as provided by third party provider")
+    online_identifier = fields.Char(help='Id used to identify account by third party provider', readonly=True)
+    balance = fields.Float(readonly=True, help='Balance of the account sent by the third party provider')
+    account_number = fields.Char(help='Set if third party provider has the full account number')
+    account_data = fields.Char(help='Extra information needed by third party provider', readonly=True)
+
+    account_online_link_id = fields.Many2one('account.online.link', readonly=True, ondelete='cascade')
+    journal_ids = fields.One2many('account.journal', 'account_online_account_id', string='Journal', domain="[('type', 'in', ('bank', 'credit')), ('company_id', '=', company_id)]")
+    last_sync = fields.Date("Last synchronization")
+    company_id = fields.Many2one('res.company', related='account_online_link_id.company_id')
+    currency_id = fields.Many2one('res.currency')
+    fetching_status = fields.Selection(
+        selection=[
+            ('planned', 'Planned'), # When all the transactions couldn't be imported in one go and is waiting for next batch
+            ('waiting', 'Waiting'),  # When waiting for the provider to fetch the transactions
+            ('processing', 'Processing'),  # When currently importing in odoo
+            ('done', 'Done'),  # When every transaction have been imported in odoo
+        ]
+    )
+
+    inverse_balance_sign = fields.Boolean(
+        string="Inverse Balance Sign",
+        help="If checked, the balance sign will be inverted",
+    )
+    inverse_transaction_sign = fields.Boolean(
+        string="Inverse Transaction Sign",
+        help="If checked, the transaction sign will be inverted",
+    )
+
+    @api.constrains('journal_ids')
+    def _check_journal_ids(self):
+        for online_account in self:
+            if len(online_account.journal_ids) > 1:
+                raise ValidationError(_('You cannot have two journals associated with the same Online Account.'))
+
+    @api.model_create_multi
+    def create(self, vals):
+        result = super().create(vals)
+        if any(data.get('fetching_status') in {'waiting', 'processing', 'planned'} for data in vals):
+            self.env['account.journal']._toggle_asynchronous_fetching_cron()
+        return result
+
+    def write(self, vals):
+        result = super().write(vals)
+        if vals.get('fetching_status') in {'waiting', 'processing', 'planned'}:
+            self.env['account.journal']._toggle_asynchronous_fetching_cron()
+        return result
+
+    def unlink(self):
+        result = super().unlink()
+        self.env['account.journal']._toggle_asynchronous_fetching_cron()
+        return result
+
+    def _assign_journal(self, swift_code=False):
+        """
+        This method allows to link an online account to a journal with the following heuristics
+        Also, Create and assign bank & swift/bic code if odoofin returns one
+        If a journal is present in the context (active_model = account.journal and active_id), we assume that
+        We started the journey from a journal and we assign the online_account to that particular journal.
+        Otherwise we will create a new journal on the fly and assign the online_account to it.
+        If an online_account was previously set on the journal, it will be removed and deleted.
+        This will also set the 'online_sync' source on the journal and create an activity for the consent renewal
+        The date to fetch transaction will also be set and have the following value:
+            date of the latest statement line on the journal
+            or date of the fiscalyear lock date
+            or False (we fetch transactions as far as possible)
+        """
+        currency_id = self.currency_id.id if not self.currency_id.is_current_company_currency else False
+        existing_journal = self.env['account.journal'].search([
+            ('bank_acc_number', '=', self.account_number),
+            ('currency_id', '=', currency_id),
+            ('type', '=', 'bank'),
+            ('account_online_account_id', '=', False),
+        ], limit=1)
+
+        self.ensure_one()
+        if (active_id := self.env.context.get('active_id')) and self.env.context.get('active_model') == 'account.journal':
+            journal = self.env['account.journal'].browse(active_id)
+            # If we already have a linked account on that journal, it means we are in the process of relinking
+            # it is due to an error that occured which require to redo the connection (can't fix it).
+            # Hence we delete the previously linked account.online.link to prevent showing multiple
+            # duplicate existing connections when opening the iframe
+            if journal.account_online_link_id:
+                journal.account_online_link_id.unlink()
+
+            # Ensure the journal's currency matches the bank account's currency.
+            if self.currency_id.id != journal.currency_id.id:
+                # If the journal already has entries in a different currency, raise an error.
+                statement_lines_in_other_currency = self.env['account.bank.statement.line'].search_count([
+                    ('journal_id', '=', journal.id),
+                    ('currency_id', 'not in', (False, self.currency_id.id)),
+                ], limit=1)
+                if statement_lines_in_other_currency:
+                    raise UserError(_("Journal %(journal_name)s has been set up with a different currency and already has existing entries. "
+                                      "You can't link selected bank account in %(currency_name)s to it",
+                                      journal_name=journal.name, currency_name=self.currency_id.name))
+                else:
+                    # If the journal's default bank account has entries in a differente currency, silently do nothing to avoid an error.
+                    move_lines_in_other_currency = self.env['account.move.line'].search_count([
+                        ('account_id', '=', journal.default_account_id.id),
+                        ('currency_id', '!=', self.currency_id.id),
+                    ], limit=1)
+                    if not move_lines_in_other_currency:
+                        # If not set yet and there are no conflicting entries, set it.
+                        journal.sudo().currency_id = self.currency_id.id
+        elif existing_journal:
+            journal = existing_journal
+        else:
+            journal = self.env['account.journal'].create({
+                'name': self.account_number or self.display_name,
+                'code': self.env['account.journal'].get_next_bank_cash_default_code('bank', self.env.company),
+                'type': 'bank',
+                'company_id': self.env.company.id,
+                'currency_id': currency_id,
+            })
+
+        self.sudo().journal_ids = journal
+
+        journal_vals = {
+            'bank_statements_source': 'online_sync',
+        }
+        if self.account_number and not self.journal_ids.bank_acc_number:
+            journal_vals['bank_acc_number'] = self.account_number
+        self.journal_ids.sudo().write(journal_vals)
+        # Update connection status and get consent expiration date and create an activity on related journal
+        self.account_online_link_id._update_connection_status()
+
+        # Set last_sync date (date of latest statement or one day after accounting lock date or False)
+        lock_date = self.env.company._get_user_fiscal_lock_date(journal)
+        last_sync = lock_date + relativedelta(days=1) if lock_date and lock_date > datetime.date.min else None
+        bnk_stmt_line = self.env['account.bank.statement.line'].search([('journal_id', 'in', self.journal_ids.ids)], order="date desc", limit=1)
+        if bnk_stmt_line:
+            last_sync = bnk_stmt_line.date
+        self.last_sync = last_sync
+
+        if swift_code:
+            if self.journal_ids.bank_account_id.bank_id:
+                if not self.journal_ids.bank_account_id.bank_id.bic:
+                    self.journal_ids.bank_account_id.bank_id.bic = swift_code
+            else:
+                bank_rec = self.env['res.bank'].search([('bic', '=', swift_code)], limit=1)
+                if not bank_rec:
+                    bank_rec = self.env['res.bank'].create({'name': self.account_online_link_id.display_name, 'bic': swift_code})
+                self.journal_ids.bank_account_id.bank_id = bank_rec.id
+
+    def _refresh(self):
+        """
+            This method is called on an online_account in order to check the current refresh status of the
+            account. If we are in manual mode and if the provider allows it, this will also trigger a
+            manual refresh on the provider side. Call to /proxy/v1/refresh will return a boolean
+            telling us if the refresh was successful or not. When not successful, we should avoid
+            trying to fetch transactions. Cases where we can receive an unsuccessful response are as follow
+            (non exhaustive list)
+            - Another refresh was made too early and provider/bank limit the number of refresh allowed
+            - Provider is in the process of importing the transactions so we should wait until he has
+                finished before fetching them in Odoo
+            :return: True if provider has refreshed the account and we can start fetching transactions
+        """
+        data = {'account_id': self.online_identifier}
+        while True:
+            # While this is kind of a bad practice to do, it can happen that provider_data/account_data change between
+            # 2 calls, the reason is that those field contains the encrypted information needed to access the provider
+            # and first call can result in an error due to the encrypted token inside provider_data being expired for example.
+            # In such a case, we renew the token with the provider and send back the newly encrypted token inside provider_data
+            # which result in the information having changed, henceforth why those fields are passed at every loop.
+            data.update({
+                'provider_data': self.account_online_link_id.provider_data,
+                'account_data': self.account_data,
+                'fetching_status': self.fetching_status,
+            })
+            resp_json = self.account_online_link_id._fetch_odoo_fin('/proxy/v1/refresh', data=data)
+            if resp_json.get('account_data'):
+                self.account_data = resp_json['account_data']
+            currently_fetching = resp_json.get('currently_fetching')
+            success = resp_json.get('success', True)
+            if currently_fetching:
+                # Provider has not finished fetching transactions, set status to waiting
+                self.fetching_status = 'waiting'
+            if not resp_json.get('next_data'):
+                break
+            data['next_data'] = resp_json.get('next_data') or {}
+        return {'success': not currently_fetching and success, 'data': resp_json.get('data', {})}
+
+    def _retrieve_transactions(self, date=None, include_pendings=False):
+        last_stmt_line = self.env['account.bank.statement.line'].search([
+                ('date', '<=', self.last_sync or fields.Date().today()),
+                ('online_transaction_identifier', '!=', False),
+                ('journal_id', 'in', self.journal_ids.ids),
+                ('online_account_id', '=', self.id)
+            ], order="date desc", limit=1)
+        transactions = []
+
+        start_date = date or last_stmt_line.date or self.last_sync
+        data = {
+            # If we are in a new sync, we do not give a start date; We will fetch as much as possible. Otherwise, the last sync is the start date.
+            'start_date': start_date and format_date(self.env, start_date, date_format='yyyy-MM-dd'),
+            'account_id': self.online_identifier,
+            'last_transaction_identifier': last_stmt_line.online_transaction_identifier if not include_pendings else None,
+            'currency_code': self.currency_id.name or self.journal_ids[0].currency_id.name or self.company_id.currency_id.name,
+            'include_pendings': include_pendings,
+            'include_foreign_currency': True,
+        }
+        pendings = []
+        while True:
+            # While this is kind of a bad practice to do, it can happen that provider_data/account_data change between
+            # 2 calls, the reason is that those field contains the encrypted information needed to access the provider
+            # and first call can result in an error due to the encrypted token inside provider_data being expired for example.
+            # In such a case, we renew the token with the provider and send back the newly encrypted token inside provider_data
+            # which result in the information having changed, henceforth why those fields are passed at every loop.
+            data.update({
+                'provider_data': self.account_online_link_id.provider_data,
+                'account_data': self.account_data,
+            })
+            resp_json = self.account_online_link_id._fetch_odoo_fin('/proxy/v1/transactions', data=data)
+            if resp_json.get('balance'):
+                sign = -1 if self.inverse_balance_sign else 1
+                self.balance = sign * resp_json['balance']
+            if resp_json.get('account_data'):
+                self.account_data = resp_json['account_data']
+            transactions += resp_json.get('transactions', [])
+            pendings += resp_json.get('pendings', [])
+            if not resp_json.get('next_data'):
+                break
+            data['next_data'] = resp_json.get('next_data') or {}
+
+        return {
+            'transactions': self._format_transactions(transactions),
+            'pendings': self._format_transactions(pendings),
+        }
+
+    def get_formatted_balances(self):
+        balances = {}
+        for account in self:
+            if account.currency_id:
+                formatted_balance = format_amount(self.env, account.balance, account.currency_id)
+            else:
+                formatted_balance = '%.2f' % account.balance
+            balances[account.id] = [formatted_balance, account.balance]
+        return balances
+
+    ###########
+    # HELPERS #
+    ###########
+
+    def _get_filtered_transactions(self, new_transactions):
+        """ This function will filter transaction to avoid duplicate transactions.
+            To do that, we're comparing the received online_transaction_identifier with
+            those in the database. If there is a match, the new transaction is ignored.
+        """
+        self.ensure_one()
+
+        journal_id = self.journal_ids[0]
+        existing_bank_statement_lines = self.env['account.bank.statement.line'].search_fetch(
+            [
+                ('journal_id', '=', journal_id.id),
+                ('online_transaction_identifier', 'in', [
+                    transaction['online_transaction_identifier']
+                    for transaction in new_transactions
+                    if transaction.get('online_transaction_identifier')
+                ]),
+            ],
+            ['online_transaction_identifier']
+        )
+        existing_online_transaction_identifier = set(existing_bank_statement_lines.mapped('online_transaction_identifier'))
+
+        filtered_transactions = []
+        # Remove transactions already imported in Odoo
+        for transaction in new_transactions:
+            if transaction_identifier := transaction['online_transaction_identifier']:
+                if transaction_identifier in existing_online_transaction_identifier:
+                    continue
+                existing_online_transaction_identifier.add(transaction_identifier)
+
+            filtered_transactions.append(transaction)
+        return filtered_transactions
+
+    def _format_transactions(self, new_transactions):
+        """ This function format transactions:
+            It will:
+             - Replace the foreign currency code with the corresponding currency id and activating the currencies that are not active
+             - Change inverse the transaction sign if the setting is activated
+             - Parsing the date
+             - Setting the account online account and the account journal
+        """
+        self.ensure_one()
+        transaction_sign = -1 if self.inverse_transaction_sign else 1
+        currencies = self.env['res.currency'].with_context(active_test=False).search([])
+        currency_code_mapping = {currency.name: currency for currency in currencies}
+
+        formatted_transactions = []
+        for transaction in new_transactions:
+            if transaction.get('foreign_currency_code'):
+                currency = currency_code_mapping.get(transaction.pop('foreign_currency_code'))
+                if currency:
+                    transaction.update({'foreign_currency_id': currency.id})
+                    if not currency.active:
+                        currency.active = True
+
+            formatted_transactions.append({
+                **transaction,
+                'amount': transaction['amount'] * transaction_sign,
+                'date': fields.Date.from_string(transaction['date']),
+                'online_account_id': self.id,
+                'journal_id': self.journal_ids[0].id,
+                'company_id': self.company_id.id,
+            })
+        return formatted_transactions
+
+    def action_reset_fetching_status(self):
+        """
+            This action will reset the fetching status to avoid the problem when there is an error during the
+            synchronisation that would block the customer with his connection since we block the fetch due that value.
+            With this he has a button that can reset the fetching status.
+        """
+        self.fetching_status = None
+
+
+class AccountOnlineLink(models.Model):
+    _name = 'account.online.link'
+    _description = 'Bank Connection'
+    _inherit = ['mail.thread', 'mail.activity.mixin']
+
+    def _compute_next_synchronization(self):
+        for rec in self:
+            rec.next_refresh = self.env['ir.cron'].sudo().search([('id', '=', self.env.ref('odex30_account_online_sync.online_sync_cron').id)], limit=1).nextcall
+
+    account_online_account_ids = fields.One2many('account.online.account', 'account_online_link_id')
+    last_refresh = fields.Datetime(readonly=True, default=fields.Datetime.now)
+    next_refresh = fields.Datetime("Next synchronization", compute='_compute_next_synchronization')
+    state = fields.Selection([('connected', 'Connected'), ('error', 'Error'), ('disconnected', 'Not Connected')],
+                             default='disconnected', tracking=True, required=True, readonly=True)
+    connection_state_details = fields.Json()
+    auto_sync = fields.Boolean(
+        default=True,
+        string="Automatic synchronization",
+        help="""If possible, we will try to automatically fetch new transactions for this record
+                \nIf the automatic sync is disabled. that will be due to security policy on the bank's end. So, they have to launch the sync manually""",
+    )
+    company_id = fields.Many2one('res.company', required=True, default=lambda self: self.env.company)
+    has_unlinked_accounts = fields.Boolean(default=True, help="True if that connection still has accounts that are not linked to an Odoo journal")
+    show_sync_actions = fields.Boolean(compute='_compute_show_sync_actions')
+
+    # Information received from OdooFin, should not be tampered with
+    name = fields.Char(help="Institution Name", readonly=True)
+    client_id = fields.Char(help="Represent a link for a given user towards a banking institution", readonly=True)
+    refresh_token = fields.Char(help="Token used to sign API request, Never disclose it",
+                                readonly=True, groups="base.group_system")
+    access_token = fields.Char(help="Token used to access API.", readonly=True, groups="account.group_account_basic")
+    provider_data = fields.Char(help="Information needed to interact with third party provider", readonly=True)
+    expiring_synchronization_date = fields.Date(help="Date when the consent for this connection expires",
+                                                readonly=True)
+    journal_ids = fields.One2many('account.journal', compute='_compute_journal_ids')
+    provider_type = fields.Char(help="Third Party Provider", readonly=True)
+
+    ###################
+    # Compute methods #
+    ###################
+
+    @api.depends('account_online_account_ids')
+    def _compute_journal_ids(self):
+        for online_link in self:
+            online_link.journal_ids = online_link.account_online_account_ids.journal_ids
+
+    @api.depends('company_id')
+    @api.depends_context('allowed_company_ids')
+    def _compute_show_sync_actions(self):
+        for online_link in self:
+            online_link.show_sync_actions = online_link.company_id in self.env.companies
+
+    ##########################
+    # Wizard opening actions #
+    ##########################
+    def create_new_bank_account_action(self, data=None):
+        self.ensure_one()
+        # We do return the bank account setup wizard if we don't have minimum info
+        if not data or not data.get('account_number'):
+            ctx = self.env.context
+            # if this was called from kanban box, active_model is in context
+            if ctx.get('active_model') == 'account.journal':
+                ctx = {**ctx, 'default_linked_journal_id': ctx.get('active_id', False), 'dialog_size': 'medium'}
+            return {
+                'type': 'ir.actions.act_window',
+                'name': _('Setup Bank Account'),
+                'res_model': 'account.setup.bank.manual.config',
+                'target': 'new',
+                'view_mode': 'form',
+                'context': ctx,
+                'views': [(False, 'form')],
+            }
+
+        bank = self.env['res.bank']
+        if data.get('name'):
+            bank = self.env['res.bank'].sudo().create({
+                'name': data['name'],
+                'bic': data.get('swift_code'),
+            })
+
+        bank_account = self.env['res.partner.bank'].sudo().create({
+            'acc_number': data.get('account_number'),
+            'bank_id': bank.id,
+            'partner_id': self.company_id.partner_id.id,
+        })
+
+        self.env['account.journal'].sudo().create({
+            'name': data.get('account_number'),
+            'type': data.get('journal_type') or 'bank',
+            'bank_account_id': bank_account.id,
+        })
+
+        return {'type': 'ir.actions.client', 'tag': 'soft_reload'}
+
+    def _link_accounts_to_journals_action(self, swift_code):
+        """
+        This method opens a wizard allowing the user to link
+        his bank accounts with new or existing journal.
+        :return: An action openning a wizard to link bank accounts with account journal.
+        """
+        self.ensure_one()
+        account_bank_selection_wizard = self.env['account.bank.selection'].create({
+            'account_online_link_id': self.id,
+        })
+
+        return {
+            "name": _("Select a Bank Account"),
+            "type": "ir.actions.act_window",
+            "res_model": "account.bank.selection",
+            "views": [[False, "form"]],
+            "target": "new",
+            "res_id": account_bank_selection_wizard.id,
+            'context': dict(self.env.context, swift_code=swift_code),
+        }
+
+    @api.model
+    def _show_fetched_transactions_action(self, stmt_line_ids, duplicates_from_date):
+        return self.env['account.bank.statement.line']._action_open_bank_reconciliation_widget(
+            extra_domain=[('id', 'in', stmt_line_ids.ids)],
+            name=_('Fetched Transactions'),
+            **({'default_context': {'duplicates_from_date': duplicates_from_date}} if duplicates_from_date else {}),
+        )
+
+    def _get_connection_state_details(self, journal):
+        self.ensure_one()
+        if self.connection_state_details and self.connection_state_details.get(str(journal.id)):
+            # We have to check that we have a key and a right value for this journal
+            # Because if we have an empty dict, the JS part will handle it as a Proxy object.
+            # To avoid that, we checked if we have a key in the dict and if the value is truthy.
+            return self.connection_state_details[str(journal.id)]
+        return None
+
+    def _pop_connection_state_details(self, journal):
+        self.ensure_one()
+        if journal_connection_state_details := self._get_connection_state_details(journal):
+            self._set_connection_state_details(journal, {})
+            return journal_connection_state_details
+        return None
+
+    def _set_connection_state_details(self, journal, connection_state_details):
+        self.ensure_one()
+        existing_connection_state_details = self.connection_state_details or {}
+        self.connection_state_details = {
+            **existing_connection_state_details,
+            str(journal.id): connection_state_details,
+        }
+
+    def _notify_connection_update(self, journal, connection_state_details):
+        """ The aim of this function is saving the last connection state details
+            (like if the status is success or in error) on the account.online.link
+            object. At the same moment, we're sending a websocket message to
+            accounting dashboard where we return the status of the connection.
+            To make sure that we don't return sensitive information, we filtered
+            the connection state details to only send by websocket information
+            like the connection status, how many transactions we fetched, and
+            the error type. In case of an error, the function is calling rollback
+            on the cursor and is committing the save on the account online link.
+            It's also usefull to commit in case of error to send the websocket message.
+            The commit is only called if we aren't in test mode and if the connection is
+            in error.
+
+            :param journal: The journal for which we want to save the connection state details.
+            :param connection_state_details: The information about the status of the connection (like how many transactions fetched, ...)
+        """
+        self.ensure_one()
+
+        connection_state_details_status = connection_state_details['status']  # We're always waiting for a status in the dict.
+        if connection_state_details_status == 'error':
+            # In case the connection status is in error, we roll back everything before saving the status.
+            self.env.cr.rollback()
+        if not (connection_state_details_status == 'success' and connection_state_details.get('nb_fetched_transactions', 0) == 0):
+            self._set_connection_state_details(
+                journal=journal,
+                connection_state_details=connection_state_details,
+            )
+        self.env.ref('account.group_account_user').users._bus_send(
+            'online_sync',
+            {
+                'id': journal.id,
+                'connection_state_details': {
+                    key: value
+                    for key, value in connection_state_details.items()
+                    if key in ('status', 'error_type', 'nb_fetched_transactions')
+                },
+            },
+        )
+        if connection_state_details_status == 'error' and not tools.config['test_enable'] and not modules.module.current_test:
+            # In case the status is in error, and we aren't in test mode, we commit to save the last connection state and to send the websocket message
+            self.env.cr.commit()
+
+    def _handle_odoofin_redirect_exception(self, mode='link'):
+        if mode == 'link':
+            return self.with_context({'redirect_reconnection': True}).action_new_synchronization()
+        return self.with_context({'redirect_reconnection': True})._open_iframe(mode=mode)
+
+    #######################################################
+    # Generic methods to contact server and handle errors #
+    #######################################################
+
+    @api.model
+    def _get_odoofin_url(self, url):
+        proxy_mode = self.env['ir.config_parameter'].sudo().get_param('odex30_account_online_sync.proxy_mode') or 'production'
+        if not pattern.match(proxy_mode) and not runbot_pattern.match(proxy_mode):
+            raise UserError(_('Invalid value for proxy_mode config parameter.'))
+        endpoint_url = 'https://%s.odoofin.com%s' % (proxy_mode, url)
+        if runbot_pattern.match(proxy_mode):
+            endpoint_url = '%s%s' % (proxy_mode, url)
+        return endpoint_url
+
+    def _fetch_odoo_fin(self, url, data=None, ignore_status=False):
+        """
+        Method used to fetch data from the Odoo Fin proxy.
+        :param url: Proxy's URL end point.
+        :param data: HTTP data request.
+        :return: A dict containing all data.
+        """
+        if not data:
+            data = {}
+        if self.state == 'disconnected' and not ignore_status:
+            raise UserError(_('Please reconnect your online account.'))
+        if not url.startswith('/'):
+            raise UserError(_('Invalid URL'))
+
+        timeout = int(self.env['ir.config_parameter'].sudo().get_param('odex30_account_online_sync.request_timeout')) or 60
+        endpoint_url = self._get_odoofin_url(url)
+        cron = self.env.context.get('cron', False)
+        data['utils'] = {
+            'request_timeout': timeout,
+            'lang': get_lang(self.env).code,
+            'server_version': odoo.release.serie,
+            'db_uuid': self.env['ir.config_parameter'].sudo().get_param('database.uuid'),
+            'cron': cron,
+        }
+        if request:
+            # many banking institutions require the end-user IP/user_agent for traceability
+            # of client-initiated actions. It won't be stored on odoofin side.
+            data['utils']['psu_info'] = {
+                'ip': request.httprequest.remote_addr,
+                'user_agent': request.httprequest.user_agent.string,
+            }
+
+        try:
+            # We have to use sudo to pass record as some fields are protected from read for common users.
+            resp = requests.post(url=endpoint_url, json=data, timeout=timeout, auth=OdooFinAuth(record=self.sudo()))
+            resp_json = resp.json()
+            return self._handle_response(resp_json, url, data, ignore_status)
+        except (Timeout, ConnectionError, RequestException, ValueError):
+            _logger.warning('synchronization error')
+            raise UserError(
+                _("The online synchronization service is not available at the moment. "
+                  "Please try again later."))
+
+    def _handle_response(self, resp_json, url, data, ignore_status=False):
+        # Response is a json-rpc response, therefore data is encapsulated inside error in case of error
+        # and inside result in case of success.
+        if not resp_json.get('error'):
+            result = resp_json.get('result')
+            state = result.get('odoofin_state') or False
+            message = result.get('display_message') or False
+            subject = message and _('Message') or False
+            self._log_information(state=state, message=message, subject=subject)
+            if result.get('provider_data'):
+                # Provider_data is extremely important and must be saved as soon as we received it
+                # as it contains encrypted credentials from external provider and if we loose them we
+                # loose access to the bank account, As it is possible that provider_data
+                # are received during a transaction containing multiple calls to the proxy, we ensure
+                # that provider_data is committed in database as soon as we received it.
+                self.provider_data = result.get('provider_data')
+                self.env.cr.commit()
+            return result
+        else:
+            error = resp_json.get('error')
+            # Not considered as error
+            if error.get('code') == 101:  # access token expired, not an error
+                self._get_access_token()
+                return self._fetch_odoo_fin(url, data, ignore_status)
+            elif error.get('code') == 102:  # refresh token expired, not an error
+                self._get_refresh_token()
+                self._get_access_token()
+                # We need to commit here because if we got a new refresh token, and a new access token
+                # It means that the token is active on the proxy and any further call resulting in an
+                # error would lose the new refresh_token hence blocking the account ad vitam eternam
+                self.env.cr.commit()
+                if self.journal_ids:  # We can't do it unless we already have a journal
+                    self._update_connection_status()
+                return self._fetch_odoo_fin(url, data, ignore_status)
+            elif error.get('code') == 300:  # redirect, not an error
+                raise OdooFinRedirectException(mode=error.get('data', {}).get('mode', 'link'))
+            # If we are in the process of deleting the record ignore code 100 (invalid signature), 104 (account deleted)
+            # 106 (provider_data corrupted) and allow user to delete his record from this side.
+            elif error.get('code') in (100, 104, 106) and self.env.context.get('delete_sync'):
+                return {'delete': True}
+            # Log and raise error
+            error_details = error.get('data')
+            subject = error.get('message')
+            message = error_details.get('message')
+            state = error_details.get('odoofin_state') or 'error'
+            ctx = self.env.context.copy()
+            ctx['error_reference'] = error_details.get('error_reference')
+            ctx['provider_type'] = error_details.get('provider_type')
+            ctx['redirect_warning_url'] = error_details.get('redirect_warning_url')
+
+            self.with_context(ctx)._log_information(state=state, subject=subject, message=message, reset_tx=True)
+
+    def _log_information(self, state, subject=None, message=None, reset_tx=False):
+        # If the reset_tx flag is passed, it means that we have an error, and we want to log it on the record
+        # and then raise the error to the end user. To do that we first roll back the current transaction,
+        # then we write the error on the record, we commit those changes, and finally we raise the error.
+        if reset_tx:
+            self.env.cr.rollback()
+        try:
+            # if state is disconnected, and new state is error: ignore it
+            if state == 'error' and self.state == 'disconnected':
+                state = 'disconnected'
+            if state and self.state != state:
+                self.write({'state': state})
+            if state in ('error', 'disconnected'):
+                self.account_online_account_ids.fetching_status = 'done'
+            if reset_tx:
+                context = self.env.context
+                button_label = url = None
+                if subject and message:
+                    message_post = message
+                    error_reference = context.get('error_reference')
+                    provider = context.get('provider_type')
+                    odoo_help_description = f'''ClientID: {self.client_id}\nInstitution: {self.name}\nError Reference: {error_reference}\nError Message: {message_post}\n'''
+                    odoo_help_summary = f'Bank sync error ref: {error_reference} - Provider: {provider} - Client ID: {self.client_id}'
+                    if context.get('redirect_warning_url'):
+                        if context['redirect_warning_url'] == 'odoo_support':
+                            url_params = urllib.parse.urlencode({'stage': 'bank_sync', 'summary': odoo_help_summary, 'description': odoo_help_description[:1500]})
+                            url = f'https://www.odoo.com/help?{url_params}'
+                            message += _("\n\nIf you've already opened a ticket for this issue, don't report it again: a support agent will contact you shortly.")
+                            message_post = Markup('%s<br>%s <a href="%s" >%s</a>') % (message, _("You can contact Odoo support"), url, _("Here"))
+                            button_label = _('Report issue')
+                        else:
+                            url = "https://www.odoo.com/documentation/18.0/applications/finance/accounting/bank/bank_synchronization.html#faq"
+                            message_post = Markup('%s<br>%s <a href="%s" >%s</a>') % (message_post, _("Check the documentation"), url, _("Here"))
+                            button_label = _('Check the documentation')
+                    self.message_post(body=message_post, subject=subject)
+                # In case of reset_tx, we commit the changes in order to have the message post saved
+                self.env.cr.commit()
+                # and then raise either a redirectWarning error so that customer can easily open an issue with Odoo,
+                # or eventually bring the user to the documentation if there's no need to contact the support.
+                if url:
+                    action_id = {
+                        "type": "ir.actions.act_url",
+                        "url": url,
+                    }
+                    raise RedirectWarning(message, action_id, button_label) #pylint: disable=E0601
+                # either a userError if there's no need to bother the support, or link to the doc.
+                raise UserError(message)
+        except (CacheMiss, MissingError):
+            # This exception can happen if record was created and rollbacked due to error in same transaction
+            # Therefore it is not possible to log information on it, in this case we just ignore it.
+            pass
+
+    ###############
+    # API methods #
+    ###############
+
+    def _get_access_token(self):
+        for link in self:
+            resp_json = link._fetch_odoo_fin('/proxy/v1/get_access_token', ignore_status=True)
+            link.access_token = resp_json.get('access_token', False)
+
+    def _get_refresh_token(self):
+        # Use sudo as refresh_token field is not accessible to most user
+        for link in self.sudo():
+            resp_json = link._fetch_odoo_fin('/proxy/v1/renew_token', ignore_status=True)
+            link.refresh_token = resp_json.get('refresh_token', False)
+
+    def unlink(self):
+        to_unlink = self.env['account.online.link']
+        for link in self:
+            try:
+                resp_json = link.with_context(delete_sync=True)._fetch_odoo_fin('/proxy/v1/delete_user', data={'provider_data': link.provider_data}, ignore_status=True)  # delete proxy user
+                if resp_json.get('delete', True) is True:
+                    to_unlink += link
+            except OdooFinRedirectException:
+                # Can happen that this call returns a redirect in mode link, in which case we delete the record
+                to_unlink += link
+                continue
+            except (UserError, RedirectWarning):
+                to_unlink += link
+                continue
+        result = super(AccountOnlineLink, to_unlink).unlink()
+        self.env['account.journal']._toggle_asynchronous_fetching_cron()
+        return result
+
+    def _fetch_accounts(self, online_identifier=False):
+        self.ensure_one()
+        if online_identifier:
+            matching_account = self.account_online_account_ids.filtered(lambda l: l.online_identifier == online_identifier)
+            # Ignore account that is already there and linked to a journal as there is no need to fetch information for that one
+            if matching_account and matching_account.journal_ids:
+                return matching_account
+            # If we have the account locally but didn't link it to a journal yet, delete it first.
+            # This way, we'll get the information back from the proxy with updated balances. Avoiding potential issues.
+            elif matching_account and not matching_account.journal_ids:
+                matching_account.unlink()
+        accounts = {}
+        data = {
+            'currency_code': self.company_id.currency_id.name,
+        }
+        swift_code = False
+        while True:
+            # While this is kind of a bad practice to do, it can happen that provider_data changes between
+            # 2 calls, the reason is that that field contains the encrypted information needed to access the provider
+            # and first call can result in an error due to the encrypted token inside provider_data being expired for example.
+            # In such a case, we renew the token with the provider and send back the newly encrypted token inside provider_data
+            # which result in the information having changed, henceforth why that field is passed at every loop.
+            data['provider_data'] = self.provider_data
+            # Retrieve information about a specific account
+            if online_identifier:
+                data['online_identifier'] = online_identifier
+
+            resp_json = self._fetch_odoo_fin('/proxy/v1/accounts', data)
+            for acc in resp_json.get('accounts', []):
+                acc['account_online_link_id'] = self.id
+                currency_id = self.env['res.currency'].with_context(active_test=False).search([('name', '=', acc.pop('currency_code', ''))], limit=1)
+                if currency_id:
+                    if not currency_id.active:
+                        currency_id.sudo().active = True
+                    acc['currency_id'] = currency_id.id
+                accounts[str(acc.get('online_identifier'))] = acc
+            swift_code = resp_json.get('swift_code')
+            if not resp_json.get('next_data'):
+                break
+            data['next_data'] = resp_json.get('next_data')
+
+        if accounts:
+            self.has_unlinked_accounts = True
+            return self.env['account.online.account'].create(accounts.values()), swift_code
+        return False, False
+
+    def _pre_check_fetch_transactions(self):
+        self.ensure_one()
+        # 'limit_time_real_cron' and 'limit_time_real' default respectively to -1 and 120.
+        # Manual fallbacks applied for non-POSIX systems where this key is disabled (set to None).
+        limit_time = tools.config['limit_time_real_cron'] or -1
+        if limit_time <= 0:
+            limit_time = tools.config['limit_time_real'] or 120
+        limit_time += 20  # Add 20 seconds to be sure that the process will have been killed
+        # if any account is actually creating entries and last_refresh was made less than cron_limit_time ago, skip fetching
+        if (self.account_online_account_ids.filtered(lambda account: account.fetching_status == 'processing') and
+                self.last_refresh + relativedelta(seconds=limit_time) > fields.Datetime.now()):
+            return False
+        # If not in the process of importing and auto_sync is not set, skip fetching
+        if (self.env.context.get('cron') and
+                not self.auto_sync and
+                not self.account_online_account_ids.filtered(lambda acc: acc.fetching_status in ('planned', 'waiting', 'processing'))):
+            return False
+        return True
+
+    def _fetch_transactions(self, refresh=True, accounts=False, check_duplicates=False):
+        self.ensure_one()
+        # return early if condition to fetch transactions are not met
+        if not self._pre_check_fetch_transactions():
+            return
+
+        is_cron_running = self.env.context.get('cron')
+        acc = (accounts or self.account_online_account_ids).filtered('journal_ids')
+        self.last_refresh = fields.Datetime.now()
+        try:
+            # When manually fetching, refresh must still be done in case a redirect occurs
+            # however since transactions are always fetched inside a cron, in case we are manually
+            # fetching, trigger the cron and redirect customer to accounting dashboard
+            accounts_to_synchronize = acc
+            if not is_cron_running:
+                accounts_not_to_synchronize = self.env['account.online.account']
+                account_to_reauth = False
+                for online_account in acc:
+                    # Only get transactions on account linked to a journal
+                    if refresh and online_account.fetching_status not in ('planned', 'processing'):
+                        refresh_res = online_account._refresh()
+                        if not refresh_res['success']:
+                            if refresh_res['data'].get('mode') == 'updateCredentials':
+                                account_to_reauth = online_account
+                            accounts_not_to_synchronize += online_account
+                            continue
+                    online_account.fetching_status = 'waiting'
+                if account_to_reauth:
+                    return self._open_iframe(
+                        mode='updateCredentials',
+                        include_param={
+                            'account_online_identifier': account_to_reauth.online_identifier,
+                        },
+                    )
+                accounts_to_synchronize = acc - accounts_not_to_synchronize
+                if not accounts_to_synchronize:
+                    return
+
+            def get_duplicates_from_date(statement_lines, journal):
+                if check_duplicates and statement_lines:
+                    from_date = fields.Date.to_string(statement_lines.sorted('date')[0].date)
+                    if journal._has_duplicate_transactions(from_date):
+                        return from_date
+
+            for online_account in accounts_to_synchronize:
+                journal = online_account.journal_ids[0]
+                online_account.fetching_status = 'processing'
+                # Committing here so that multiple thread calling this method won't execute in parallel and import duplicates transaction
+                self.env.cr.commit()
+                try:
+                    transactions = online_account._retrieve_transactions().get('transactions', [])
+                except RedirectWarning as redirect_warning:
+                    self._notify_connection_update(
+                        journal=journal,
+                        connection_state_details={
+                            'status': 'error',
+                            'error_type': 'redirect_warning',
+                            'error_message': redirect_warning.args[0],
+                            'action': redirect_warning.args[1],
+                        },
+                    )
+                    raise
+                except OdooFinRedirectException as redirect_exception:
+                    self._notify_connection_update(
+                        journal=journal,
+                        connection_state_details={
+                            'status': 'error',
+                            'error_type': 'odoofin_redirect',
+                            'action': self._handle_odoofin_redirect_exception(mode=redirect_exception.mode),
+                        },
+                    )
+                    raise
+
+                sorted_transactions = sorted(transactions, key=lambda transaction: transaction['date'])
+                if not is_cron_running:
+                    # we want to import the first 100 transaction, show them to the user
+                    # and import the rest asynchronously with the 'online_sync_cron_waiting_synchronization' cron
+                    total = sum([transaction['amount'] for transaction in transactions])
+                    statement_lines = self.env['account.bank.statement.line'].with_context(transactions_total=total)._online_sync_bank_statement(sorted_transactions[:100], online_account)
+                    online_account.fetching_status = 'planned' if len(transactions) > 100 else 'done'
+                    domain = None
+                    if statement_lines:
+                        domain = [('id', 'in', statement_lines.ids)]
+
+                    duplicates_from_date = get_duplicates_from_date(statement_lines, journal)
+                    return self.env['account.bank.statement.line']._action_open_bank_reconciliation_widget(
+                        extra_domain=domain,
+                        name=_('Fetched Transactions'),
+                        default_context={**self.env.context, 'default_journal_id': journal.id, 'duplicates_from_date': duplicates_from_date},
+                    )
+                else:
+                    statement_lines = self.env['account.bank.statement.line']._online_sync_bank_statement(sorted_transactions, online_account)
+                    online_account.fetching_status = 'done'
+                    duplicates_from_date = get_duplicates_from_date(statement_lines, journal)
+                    self._notify_connection_update(
+                        journal=journal,
+                        connection_state_details={
+                            'status': 'success',
+                            'nb_fetched_transactions': len(statement_lines),
+                            'action': self._show_fetched_transactions_action(statement_lines, duplicates_from_date),
+                        },
+                    )
+            return
+        except OdooFinRedirectException as e:
+            return self._handle_odoofin_redirect_exception(mode=e.mode)
+
+    def _get_consent_expiring_date(self, data=None):
+        self.ensure_one()
+        if not data:  # Small hack to avoid breaking the stable policy
+            data = self._fetch_odoo_fin('/proxy/v1/consent_expiring_date', ignore_status=True)
+
+        if data.get('consent_expiring_date'):
+            expiring_synchronization_date = fields.Date.to_date(data['consent_expiring_date'])
+            if expiring_synchronization_date != self.expiring_synchronization_date:
+                # TDE TODO: master: use generic activity mixin methods instead
+                bank_sync_activity_type_id = self.env.ref('odex30_account_online_sync.bank_sync_activity_update_consent')
+                account_journal_model_id = self.env['ir.model']._get_id('account.journal')
+
+                # Remove old activities
+                self.env['mail.activity'].search([
+                    ('res_id', 'in', self.journal_ids.ids),
+                    ('res_model_id', '=', account_journal_model_id),
+                    ('activity_type_id', '=', bank_sync_activity_type_id.id),
+                    ('date_deadline', '<=', self.expiring_synchronization_date),
+                    ('user_id', '=', self.env.user.id),
+                ]).unlink()
+
+                # Create a new activity for each journals for this synch
+                self.expiring_synchronization_date = expiring_synchronization_date
+                new_activity_vals = []
+                for journal in self.journal_ids:
+                    new_activity_vals.append({
+                        'res_id': journal.id,
+                        'res_model_id': account_journal_model_id,
+                        'date_deadline': self.expiring_synchronization_date,
+                        'summary': _("Bank Synchronization: Update your consent"),
+                        'note': data.get('activity_message') or '',
+                        'activity_type_id': bank_sync_activity_type_id.id,
+                    })
+                self.env['mail.activity'].create(new_activity_vals)
+        elif self.expiring_synchronization_date and self.expiring_synchronization_date < fields.Date.context_today(self):
+            # Avoid an infinite "expired synchro" if the provider
+            # doesn't send us a new consent expiring date
+            self.expiring_synchronization_date = None
+
+    def _update_connection_status(self):
+        self.ensure_one()
+        resp_json = self._fetch_odoo_fin('/proxy/v2/connection_status', ignore_status=True)
+
+        self._get_consent_expiring_date(resp_json)
+
+        # Returning what we receive from Odoo Fin to allow function extension
+        return resp_json
+
+    def _authorize_access(self, data_access_token):
+        """
+        This method is used to allow an existing connection to give temporary access
+        to a new connection in order to see the list of available unlinked accounts.
+        We pass as parameter the list of already linked account, so that if there are
+        no more accounts to link, we will receive a response telling us so and we won't
+        call authorize for that connection later on.
+        """
+        self.ensure_one()
+        data = {
+            'linked_accounts': self.account_online_account_ids.filtered('journal_ids').mapped('online_identifier'),
+            'record_access_token': data_access_token,
+        }
+        try:
+            resp_json = self._fetch_odoo_fin('/proxy/v1/authorize_access', data)
+            self.has_unlinked_accounts = resp_json.get('has_unlinked_accounts')
+        except UserError:
+            # We don't want to throw an error to the customer so ignore error
+            pass
+
+    @api.model
+    def _cron_delete_unused_connection(self):
+        account_online_links = self.search([
+            ('write_date', '<=', fields.Datetime.now() - relativedelta(months=1)),
+        ])
+        for link in account_online_links:
+            if not link.account_online_account_ids.filtered('journal_ids'):
+                link.unlink()
+
+    @api.returns('mail.message', lambda value: value.id)
+    def message_post(self, **kwargs):
+        """Override to log all message to the linked journal as well."""
+        for journal in self.journal_ids:
+            journal.message_post(**kwargs)
+        return super(AccountOnlineLink, self).message_post(**kwargs)
+
+    ################################
+    # Callback methods from iframe #
+    ################################
+
+    def success(self, mode, data):
+        if data:
+            self.write(data)
+            # Provider_data is extremely important and must be saved as soon as we received it
+            # as it contains encrypted credentials from external provider and if we loose them we
+            # loose access to the bank account, As it is possible that provider_data
+            # are received during a transaction containing multiple calls to the proxy, we ensure
+            # that provider_data is committed in database as soon as we received it.
+            if data.get('provider_data'):
+                self.env.cr.commit()
+
+            self._update_connection_status()
+        # if for some reason we just have to update the record without doing anything else, the mode will be set to 'none'
+        if mode == 'none':
+            return {'type': 'ir.actions.client', 'tag': 'reload'}
+        try:
+            method_name = '_success_%s' % mode
+            method = getattr(self, method_name)
+        except AttributeError:
+            message = _("This version of Odoo appears to be outdated and does not support the '%s' sync mode. "
+                        "Installing the latest update might solve this.", mode)
+            _logger.info('Online sync: %s' % (message,))
+            self.env.cr.rollback()
+            self._log_information(state='error', subject=_('Internal Error'), message=message, reset_tx=True)
+            raise UserError(message)
+        action = method()
+        return action or self.env['ir.actions.act_window']._for_xml_id('account.open_account_journal_dashboard_kanban')
+
+    @api.model
+    def connect_existing_account(self, data):
+        # extract client_id and online_identifier from data and retrieve the account detail from the connection.
+        # If we have a journal in context, assign to journal, otherwise create new journal then fetch transaction
+        client_id = data.get('client_id')
+        online_identifier = data.get('online_identifier')
+        if client_id and online_identifier:
+            online_link = self.search([('client_id', '=', client_id)], limit=1)
+            if not online_link:
+                return {'type': 'ir.actions.client', 'tag': 'reload'}
+            new_account, swift_code = online_link._fetch_accounts(online_identifier=online_identifier)
+            if new_account:
+                new_account._assign_journal(swift_code)
+                action = online_link._fetch_transactions(accounts=new_account, check_duplicates=True)
+                return action or self.env['ir.actions.act_window']._for_xml_id('account.open_account_journal_dashboard_kanban')
+            raise UserError(_("The consent for the selected account has expired."))
+        return {'type': 'ir.actions.client', 'tag': 'reload'}
+
+    def exchange_token(self, exchange_token):
+        self.ensure_one()
+        # Exchange token to retrieve client_id and refresh_token from proxy account
+        data = {
+            'exchange_token': exchange_token,
+            'company_id': self.env.company.id,
+            'user_id': self.env.user.id
+        }
+        resp_json = self._fetch_odoo_fin('/proxy/v1/exchange_token', data=data, ignore_status=True)
+        # Write in sudo mode as those fields are protected from users
+        self.sudo().write({
+            'client_id': resp_json.get('client_id'),
+            'refresh_token': resp_json.get('refresh_token'),
+            'access_token': resp_json.get('access_token')
+        })
+        return True
+
+    def _success_link(self):
+        self.ensure_one()
+        self._log_information(state='connected')
+        account_online_accounts, swift_code = self._fetch_accounts()
+        if account_online_accounts and len(account_online_accounts) == 1:
+            account_online_accounts._assign_journal(swift_code)
+            return self._fetch_transactions(accounts=account_online_accounts, check_duplicates=True)
+        return self._link_accounts_to_journals_action(swift_code)
+
+    def _success_updateCredentials(self):
+        self.ensure_one()
+        return self._fetch_transactions(refresh=False)
+
+    def _success_refreshAccounts(self):
+        self.ensure_one()
+        return self._fetch_transactions(refresh=False)
+
+    def _success_reconnect(self):
+        self.ensure_one()
+        self._log_information(state='connected')
+        return self._fetch_transactions(check_duplicates=True)
+
+    ##################
+    # action buttons #
+    ##################
+
+    def action_new_synchronization(self, preferred_inst=None, journal_id=False):
+        # Search for an existing link that was not fully connected
+        online_link = self
+        if not online_link or online_link.provider_data:
+            online_link = self.search([('account_online_account_ids', '=', False)], limit=1)
+        # If not found, create a new one
+        if not online_link or online_link.provider_data:
+            online_link = self.create({})
+        return online_link._open_iframe('link', preferred_institution=preferred_inst, journal_id=journal_id)
+
+    def action_update_credentials(self):
+        return self._open_iframe('updateCredentials')
+
+    def action_fetch_transactions(self):
+        self.account_online_account_ids.fetching_status = None
+        action = self._fetch_transactions()
+        return action or self.env['ir.actions.act_window']._for_xml_id('account.open_account_journal_dashboard_kanban')
+
+    def action_reconnect_account(self):
+        return self._open_iframe('reconnect')
+
+    def _open_iframe(self, mode='link', include_param=None, preferred_institution=False, journal_id=False):
+        self.ensure_one()
+        if self.client_id and self.sudo().refresh_token:
+            try:
+                self._get_access_token()
+            except OdooFinRedirectException:
+                # Delete record and open iframe in a new one
+                self.unlink()
+                return self.create({})._open_iframe('link')
+
+        proxy_mode = self.env['ir.config_parameter'].sudo().get_param('odex30_account_online_sync.proxy_mode') or 'production'
+        country = self.env['account.journal'].browse(journal_id).company_id.account_fiscal_country_id or self.env.company.country_id
+        action = {
+            'type': 'ir.actions.client',
+            'tag': 'odoo_fin_connector',
+            'id': self.id,
+            'params': {
+                'proxyMode': proxy_mode,
+                'clientId': self.client_id,
+                'accessToken': self.access_token,
+                'mode': mode,
+                'includeParam': {
+                    'lang': get_lang(self.env).code,
+                    'countryCode': country.code,
+                    'countryName': country.display_name,
+                    'redirect_reconnection': self.env.context.get('redirect_reconnection'),
+                    'serverVersion': odoo.release.serie,
+                    'mfa_type': self.env.user._mfa_type(),
+                }
+            },
+            'context': {
+                'dialog_size': 'medium',
+            },
+        }
+        if self.provider_data:
+            action['params']['providerData'] = self.provider_data
+        if preferred_institution:
+            action['params']['includeParam']['clickedInstitution'] = preferred_institution
+        if journal_id:
+            action['context']['active_model'] = 'account.journal'
+            action['context']['active_id'] = journal_id
+
+        if mode == 'link':
+            user_email = self.env.user.email or self.env.ref('base.user_admin').email or ''  # Necessary for some providers onboarding
+            action['params']['includeParam']['dbUuid'] = self.env['ir.config_parameter'].sudo().get_param('database.uuid')
+            action['params']['includeParam']['userEmail'] = user_email
+            # Compute a hash of a random string for each connection in success
+            existing_link = self.search([('state', '!=', 'disconnected'), ('has_unlinked_accounts', '=', True)])
+            if existing_link:
+                record_access_token = base64.b64encode(uuid.uuid4().bytes).decode('utf-8')
+                for link in existing_link:
+                    link._authorize_access(record_access_token)
+                action['params']['includeParam']['recordAccessToken'] = record_access_token
+
+        if include_param:
+            action['params']['includeParam'].update(include_param)
+        return action
diff --git a/dev_odex30_accounting/odex30_account_online_sync/models/bank_rec_widget.py b/dev_odex30_accounting/odex30_account_online_sync/models/bank_rec_widget.py
new file mode 100644
index 0000000..273c43f
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_online_sync/models/bank_rec_widget.py
@@ -0,0 +1,16 @@
+from odoo import models
+
+
+class BankRecWidget(models.Model):
+    _inherit = 'bank.rec.widget'
+
+    def _action_validate(self):
+        # EXTENDS account_accountant
+        super()._action_validate()
+        line = self.st_line_id
+        if line.partner_id and line.online_partner_information:
+            # write value for account and merchant on partner only if partner has no value,
+            # in case value are different write False
+            value_merchant = line.partner_id.online_partner_information or line.online_partner_information
+            value_merchant = value_merchant if value_merchant == line.online_partner_information else False
+            line.partner_id.online_partner_information = value_merchant
diff --git a/dev_odex30_accounting/odex30_account_online_sync/models/company.py b/dev_odex30_accounting/odex30_account_online_sync/models/company.py
new file mode 100644
index 0000000..84feee2
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_online_sync/models/company.py
@@ -0,0 +1,15 @@
+# -*- coding: utf-8 -*-
+
+from odoo import api, models
+
+
+class ResCompany(models.Model):
+    _inherit = "res.company"
+
+    @api.model
+    def setting_init_bank_account_action(self):
+        """
+        Override the "setting_init_bank_account_action" in accounting menu
+        and change the flow for the "Add a bank account" menu item in dashboard.
+        """
+        return self.env['account.online.link'].action_new_synchronization()
diff --git a/dev_odex30_accounting/odex30_account_online_sync/models/mail_activity_type.py b/dev_odex30_accounting/odex30_account_online_sync/models/mail_activity_type.py
new file mode 100644
index 0000000..93e61bf
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_online_sync/models/mail_activity_type.py
@@ -0,0 +1,14 @@
+from odoo import api, models
+
+
+class MailActivityType(models.Model):
+    _inherit = "mail.activity.type"
+
+    @api.model
+    def _get_model_info_by_xmlid(self):
+        info = super()._get_model_info_by_xmlid()
+        info['odex30_account_online_sync.bank_sync_activity_update_consent'] = {
+            'res_model': 'account.journal',
+            'unlink': False,
+        }
+        return info
diff --git a/dev_odex30_accounting/odex30_account_online_sync/models/odoofin_auth.py b/dev_odex30_accounting/odex30_account_online_sync/models/odoofin_auth.py
new file mode 100644
index 0000000..19288f6
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_online_sync/models/odoofin_auth.py
@@ -0,0 +1,46 @@
+import base64
+import hashlib
+import hmac
+import json
+import requests
+import time
+import werkzeug.urls
+
+
+class OdooFinAuth(requests.auth.AuthBase):
+
+    def __init__(self, record=None):
+        self.access_token = record and record.access_token or False
+        self.refresh_token = record and record.refresh_token or False
+        self.client_id = record and record.client_id or False
+
+    def __call__(self, request):
+        # We don't sign request that still don't have a client_id/refresh_token
+        if not self.client_id or not self.refresh_token:
+            return request
+        # craft the message (timestamp|url path|client_id|access_token|query params|body content)
+        msg_timestamp = int(time.time())
+        parsed_url = werkzeug.urls.url_parse(request.path_url)
+
+        body = request.body
+        if isinstance(body, bytes):
+            body = body.decode('utf-8')
+        body = json.loads(body)
+
+        message = '%s|%s|%s|%s|%s|%s' % (
+            msg_timestamp,  # timestamp
+            parsed_url.path,  # url path
+            self.client_id,
+            self.access_token,
+            json.dumps(werkzeug.urls.url_decode(parsed_url.query), sort_keys=True),  # url query params sorted by key
+            json.dumps(body, sort_keys=True))  # http request body
+
+        h = hmac.new(base64.b64decode(self.refresh_token), message.encode('utf-8'), digestmod=hashlib.sha256)
+
+        request.headers.update({
+            'odoofin-client-id': self.client_id,
+            'odoofin-access-token': self.access_token,
+            'odoofin-signature': base64.b64encode(h.digest()),
+            'odoofin-timestamp': msg_timestamp,
+        })
+        return request
diff --git a/dev_odex30_accounting/odex30_account_online_sync/models/partner.py b/dev_odex30_accounting/odex30_account_online_sync/models/partner.py
new file mode 100644
index 0000000..7cb6bc9
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_online_sync/models/partner.py
@@ -0,0 +1,7 @@
+from odoo import models, fields
+
+
+class ResPartner(models.Model):
+    _inherit = 'res.partner'
+
+    online_partner_information = fields.Char(readonly=True)
diff --git a/dev_odex30_accounting/odex30_account_online_sync/security/account_online_sync_security.xml b/dev_odex30_accounting/odex30_account_online_sync/security/account_online_sync_security.xml
new file mode 100644
index 0000000..9a4c704
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_online_sync/security/account_online_sync_security.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo noupdate="1">
+    <record model="ir.rule" id="account_online_sync_link_rule">
+        <field name="name">Account online link company rule</field>
+        <field name="model_id" ref="model_account_online_link"/>
+        <field name="global" eval="True"/>
+        <field name="domain_force">[('company_id', 'parent_of', company_ids)]</field>
+    </record>
+    <record model="ir.rule" id="account_online_sync_account_rule">
+        <field name="name">Online account company rule</field>
+        <field name="model_id" ref="model_account_online_account"/>
+        <field name="global" eval="True"/>
+        <field name="domain_force">[('account_online_link_id.company_id','parent_of', company_ids)]</field>
+    </record>
+</odoo>
diff --git a/dev_odex30_accounting/odex30_account_online_sync/security/ir.model.access.csv b/dev_odex30_accounting/odex30_account_online_sync/security/ir.model.access.csv
new file mode 100644
index 0000000..adca78d
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_online_sync/security/ir.model.access.csv
@@ -0,0 +1,12 @@
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_account_online_link_id,access_account_online_link_id,model_account_online_link,account.group_account_basic,1,1,1,0
+access_account_online_link_id_readonly,access_account_online_link_id_readonly,model_account_online_link,account.group_account_readonly,1,0,0,0
+access_account_online_link_id_manager,access_account_online_link_id manager,model_account_online_link,account.group_account_manager,1,1,1,1
+access_account_online_account_id,access_account_online_account_id,model_account_online_account,account.group_account_basic,1,1,1,0
+access_account_online_account_id_readonly,access_account_online_account_id_readonly,model_account_online_account,account.group_account_readonly,1,0,0,0
+access_account_online_account_id_manager,access_account_online_account_id manager,model_account_online_account,account.group_account_manager,1,1,1,1
+access_account_bank_selection_manager,access.account.bank.selection manager,model_account_bank_selection,account.group_account_manager,1,1,1,1
+access_account_bank_selection,access.account.bank.selection basic,model_account_bank_selection,account.group_account_basic,1,1,1,0
+access_account_bank_statement_line_transient,access_account_bank_statement_line_transient,model_account_bank_statement_line_transient,account.group_account_manager,1,1,1,1
+access_account_missing_transaction_wizard,access_account_missing_transaction_wizard,model_account_missing_transaction_wizard,account.group_account_manager,1,1,1,1
+access_account_duplicate_transaction_wizard,access_account_duplicate_transaction_wizard,model_account_duplicate_transaction_wizard,account.group_account_user,1,1,1,0
diff --git a/dev_odex30_accounting/odex30_account_online_sync/static/src/components/account_duplicate_transaction/account_duplicate_transaction_form.js b/dev_odex30_accounting/odex30_account_online_sync/static/src/components/account_duplicate_transaction/account_duplicate_transaction_form.js
new file mode 100644
index 0000000..403bbe4
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_online_sync/static/src/components/account_duplicate_transaction/account_duplicate_transaction_form.js
@@ -0,0 +1,37 @@
+import { formView } from "@web/views/form/form_view";
+import { FormController } from "@web/views/form/form_controller";
+import { registry } from "@web/core/registry";
+import { useCheckDuplicateService } from "./account_duplicate_transaction_hook";
+
+export class AccountDuplicateTransactionsFormController extends FormController {
+    setup() {
+        super.setup();
+        this.duplicateCheckService = useCheckDuplicateService();
+    }
+
+    async beforeExecuteActionButton(clickParams) {
+        if (clickParams.name === "delete_selected_transactions") {
+            const selected = this.duplicateCheckService.selectedLines;
+            if (selected.size) {
+                await this.orm.call(
+                    "account.bank.statement.line",
+                    "unlink",
+                    [Array.from(selected)],
+                );
+                this.env.services.action.doAction({type: 'ir.actions.client', tag: 'reload'});
+            }
+            return false;
+        }
+        return super.beforeExecuteActionButton(...arguments);
+    }
+
+    get cogMenuProps() {
+        const props = super.cogMenuProps;
+        props.items.action = [];
+        return props;
+    }
+}
+
+export const form = { ...formView, Controller: AccountDuplicateTransactionsFormController };
+
+registry.category("views").add("account_duplicate_transactions_form", form);
diff --git a/dev_odex30_accounting/odex30_account_online_sync/static/src/components/account_duplicate_transaction/account_duplicate_transaction_hook.js b/dev_odex30_accounting/odex30_account_online_sync/static/src/components/account_duplicate_transaction/account_duplicate_transaction_hook.js
new file mode 100644
index 0000000..64b1604
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_online_sync/static/src/components/account_duplicate_transaction/account_duplicate_transaction_hook.js
@@ -0,0 +1,6 @@
+import { useService } from "@web/core/utils/hooks";
+import { useState } from "@odoo/owl";
+
+export function useCheckDuplicateService() {
+    return useState(useService("odex30_account_online_sync.duplicate_check_service"));
+}
diff --git a/dev_odex30_accounting/odex30_account_online_sync/static/src/components/account_duplicate_transaction/account_duplicate_transaction_service.js b/dev_odex30_accounting/odex30_account_online_sync/static/src/components/account_duplicate_transaction/account_duplicate_transaction_service.js
new file mode 100644
index 0000000..b5571d2
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_online_sync/static/src/components/account_duplicate_transaction/account_duplicate_transaction_service.js
@@ -0,0 +1,21 @@
+import { registry } from "@web/core/registry";
+
+class AccountDuplicateTransactionsServiceModel {
+    constructor() {
+        this.selectedLines = new Set();
+    }
+
+    updateLIne(selected, id) {
+        this.selectedLines[selected ? "add" : "delete"](id);
+    }
+}
+
+const duplicateCheckService = {
+    start(env, services) {
+        return new AccountDuplicateTransactionsServiceModel();
+    },
+};
+
+registry
+    .category("services")
+    .add("odex30_account_online_sync.duplicate_check_service", duplicateCheckService);
diff --git a/dev_odex30_accounting/odex30_account_online_sync/static/src/components/account_duplicate_transaction/account_duplicate_transactions_x2many.js b/dev_odex30_accounting/odex30_account_online_sync/static/src/components/account_duplicate_transaction/account_duplicate_transactions_x2many.js
new file mode 100644
index 0000000..d1d2a8e
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_online_sync/static/src/components/account_duplicate_transaction/account_duplicate_transactions_x2many.js
@@ -0,0 +1,50 @@
+import { onMounted } from "@odoo/owl";
+import { registry } from "@web/core/registry";
+import { ListRenderer } from "@web/views/list/list_renderer";
+import { X2ManyField, x2ManyField } from "@web/views/fields/x2many/x2many_field";
+import { useCheckDuplicateService } from "./account_duplicate_transaction_hook";
+
+export class AccountDuplicateTransactionsListRenderer extends ListRenderer {
+    static template = "odex30_account_online_sync.AccountDuplicateTransactionsListRenderer";
+    static recordRowTemplate = "odex30_account_online_sync.AccountDuplicateTransactionsRecordRow";
+
+    setup() {
+        super.setup();
+        this.duplicateCheckService = useCheckDuplicateService();
+
+        onMounted(() => {
+            this.deleteButton = document.querySelector('button[name="delete_selected_transactions"]');
+            this.deleteButton.disabled = true;
+        });
+    }
+
+    toggleRecordSelection(selected, record) {
+        this.duplicateCheckService.updateLIne(selected, record.data.id);
+        this.deleteButton.disabled = this.duplicateCheckService.selectedLines.size === 0;
+    }
+
+    get hasSelectors() {
+        return true;
+    }
+
+    getRowClass(record) {
+        let classes = super.getRowClass(record);
+        const firstIdsInGroup = this.env.model.root.data.first_ids_in_group;
+        if (firstIdsInGroup instanceof Array && firstIdsInGroup.includes(record.data.id)) {
+            classes += " account_duplicate_transactions_lines_list_x2many_group_line";
+        }
+        return classes;
+    }
+}
+
+export class AccountDuplicateTransactionsLinesListX2ManyField extends X2ManyField {
+    static components = {
+        ...X2ManyField.components,
+        ListRenderer: AccountDuplicateTransactionsListRenderer,
+    };
+}
+
+registry.category("fields").add("account_duplicate_transactions_lines_list_x2many", {
+    ...x2ManyField,
+    component: AccountDuplicateTransactionsLinesListX2ManyField,
+});
diff --git a/dev_odex30_accounting/odex30_account_online_sync/static/src/components/account_duplicate_transaction/account_duplicate_transactions_x2many.scss b/dev_odex30_accounting/odex30_account_online_sync/static/src/components/account_duplicate_transaction/account_duplicate_transactions_x2many.scss
new file mode 100644
index 0000000..4b147a5
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_online_sync/static/src/components/account_duplicate_transaction/account_duplicate_transactions_x2many.scss
@@ -0,0 +1,3 @@
+.account_duplicate_transactions_lines_list_x2many_group_line {
+    border-top-width: thick;
+}
diff --git a/dev_odex30_accounting/odex30_account_online_sync/static/src/components/account_duplicate_transaction/account_duplicate_transactions_x2many.xml b/dev_odex30_accounting/odex30_account_online_sync/static/src/components/account_duplicate_transaction/account_duplicate_transactions_x2many.xml
new file mode 100644
index 0000000..52f66ff
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_online_sync/static/src/components/account_duplicate_transaction/account_duplicate_transactions_x2many.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<templates>
+    <t t-name="odex30_account_online_sync.AccountDuplicateTransactionsListRenderer" t-inherit="web.ListRenderer" t-inherit-mode="primary">
+        <xpath expr="//th[1]" position="replace"><th><i class="fa fa-trash"/></th></xpath>
+        <xpath expr="//tfoot" position="replace"></xpath>
+    </t>
+    <t t-name="odex30_account_online_sync.AccountDuplicateTransactionsRecordRow" t-inherit="web.ListRenderer.RecordRow" t-inherit-mode="primary">
+        <xpath expr="//td[1]" position="replace">
+            <td class="o_list_record_selector user-select-none" tabindex="-1">
+                <CheckBox className="'d-flex m-0'" onChange.bind="(selected) => this.toggleRecordSelection(selected, record)"/>
+            </td>
+        </xpath>
+    </t>
+</templates>
diff --git a/dev_odex30_accounting/odex30_account_online_sync/static/src/components/bank_configure/bank_configure.js b/dev_odex30_accounting/odex30_account_online_sync/static/src/components/bank_configure/bank_configure.js
new file mode 100644
index 0000000..0469a8d
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_online_sync/static/src/components/bank_configure/bank_configure.js
@@ -0,0 +1,84 @@
+/** @odoo-module */
+
+import { registry } from "@web/core/registry";
+import { standardWidgetProps } from "@web/views/widgets/standard_widget_props";
+import { useService, useBus } from "@web/core/utils/hooks";
+import { SIZES } from "@web/core/ui/ui_service";
+import { Component, useState, useRef, onWillStart } from "@odoo/owl";
+
+class BankConfigureWidget extends Component {
+    static template = "account.BankConfigureWidget";
+    static props = {
+        ...standardWidgetProps,
+    }
+    setup() {
+        this.container = useRef("container");
+        this.allInstitutions = [];
+        this.state = useState({
+            isLoading: true,
+            institutions: [],
+            gridStyle: "grid-template-columns: repeat(5, minmax(90px, 1fr));"
+        });
+        this.orm = useService("orm");
+        this.action = useService("action");
+        this.ui = useService("ui");
+        onWillStart(this.fetchInstitutions);
+        useBus(this.ui.bus, "resize", this.computeGrid);
+    }
+
+    computeGrid() {
+        if (this.allInstitutions.length > 4) {
+            let containerWidth = this.container.el ? this.container.el.offsetWidth - 32 : 0;
+            // when the container width can't be computed, use the screen size and number of journals.
+            if (!containerWidth) {
+                if (this.ui.size >= SIZES.XXL) {
+                    containerWidth = window.innerWidth / (this.props.record.model.root.count < 6 ? 2 : 3);
+                } else {
+                    containerWidth = Math.max(this.ui.size * 100, 400);
+                }
+            }
+            const canFit = Math.floor(containerWidth / 100);
+            const numberOfRows = (Math.floor((this.allInstitutions.length + 1) / 2) >= canFit) + 1;
+            this.state.gridStyle = `grid-template-columns: repeat(${canFit}, minmax(90px, 1fr));
+                                    grid-template-rows: repeat(${numberOfRows}, 1fr);
+                                    grid-auto-rows: 0px;
+                                   `;
+        }
+        this.state.institutions = this.allInstitutions;
+    }
+
+    async fetchInstitutions() {
+        this.orm.silent.call(this.props.record.resModel, "fetch_online_sync_favorite_institutions", [this.props.record.resId])
+        .then((response) => {
+            this.allInstitutions = response;
+        })
+        .finally(() => {
+            this.state.isLoading = false;
+            this.computeGrid();
+        });
+    }
+
+    async connectBank(institutionId=null) {
+        const action = await this.orm.call("account.online.link", "action_new_synchronization", [[]], {
+            preferred_inst: institutionId,
+            journal_id: this.props.record.resId,
+        })
+        this.action.doAction(action);
+    }
+
+    async fallbackConnectBank() {
+        const action = await this.orm.call('account.online.link', 'create_new_bank_account_action', [], {
+            context: {
+                active_model: 'account.journal',
+                active_id: this.props.record.resId,
+            }
+        });
+        this.action.doAction(action);
+    }
+}
+
+export const bankConfigureWidget = {
+    component: BankConfigureWidget,
+}
+
+registry.category("view_widgets").add("bank_configure", bankConfigureWidget);
diff --git a/dev_odex30_accounting/odex30_account_online_sync/static/src/components/bank_configure/bank_configure.scss b/dev_odex30_accounting/odex30_account_online_sync/static/src/components/bank_configure/bank_configure.scss
new file mode 100644
index 0000000..3b96ed6
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_online_sync/static/src/components/bank_configure/bank_configure.scss
@@ -0,0 +1,15 @@
+.bank_configure_container {
+    .d-grid {
+        overflow: hidden;
+        column-gap: 0.25rem;
+    }
+    .dashboard_bank {
+        aspect-ratio: 1 / 1;
+        .align-self-center {
+            background-color: $gray-100;
+            border: 1px solid $gray-100;
+        }
+        margin-bottom: 0.25rem;
+        overflow: hidden;
+    }
+}
diff --git a/dev_odex30_accounting/odex30_account_online_sync/static/src/components/bank_configure/bank_configure.xml b/dev_odex30_accounting/odex30_account_online_sync/static/src/components/bank_configure/bank_configure.xml
new file mode 100644
index 0000000..5068148
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_online_sync/static/src/components/bank_configure/bank_configure.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<template>
+    <t t-name="account.BankConfigureWidget">
+        <div class="bank_configure_container d-flex flex-wrap" t-ref="container">
+            <t t-if="state.isLoading">
+                loading...
+            </t>
+            <span t-elif="!state.institutions.length">
+                <button class="btn btn-primary" t-on-click="fallbackConnectBank" name="action_configure_bank_journal">Setup Bank</button>
+            </span>
+            <div class="d-grid" t-attf-style="{{state.gridStyle}}" t-if="!state.isLoading and state.institutions.length">
+                <div class="dashboard_bank" t-on-click="() => this.connectBank()">
+                    <button class="h-100 w-100 rounded btn btn-primary fw-normal" name="action_configure_bank_journal">
+                        <span class="img-fluid">Search over <span class="text-nowrap">26 000</span> banks</span>
+                    </button>
+                </div>
+                <div t-foreach="state.institutions" t-as="institution" t-key="institution.id"
+                     t-attf-class="dashboard_bank"
+                     t-on-click="() => this.connectBank(institution.id)"
+                >
+                    <button class="align-self-center h-100 w-100 rounded">
+                        <span t-if="institution.default_picture" t-out="institution.name"/>
+                        <img t-else="" class="img-fluid p-2" t-att-src="institution.picture" t-att-title="institution.name"/>
+                    </button>
+                </div>
+            </div>
+        </div>
+    </t>
+</template>
diff --git a/dev_odex30_accounting/odex30_account_online_sync/static/src/components/bank_reconciliation/fetch_missing_transactions_cog_menu.js b/dev_odex30_accounting/odex30_account_online_sync/static/src/components/bank_reconciliation/fetch_missing_transactions_cog_menu.js
new file mode 100644
index 0000000..6899842
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_online_sync/static/src/components/bank_reconciliation/fetch_missing_transactions_cog_menu.js
@@ -0,0 +1,68 @@
+/** @odoo-module **/
+
+import { Component } from "@odoo/owl";
+import { DropdownItem } from "@web/core/dropdown/dropdown_item";
+import { registry } from "@web/core/registry";
+import { useService } from "@web/core/utils/hooks";
+
+const cogMenuRegistry = registry.category("cogMenu");
+
+/**
+ * 'Fetch Missing Transactions' menu
+ *
+ * This component is used to open a wizard allowing the user to fetch their missing/pending
+ * transaction since a specific date.
+ * It's only available in the bank reconciliation widget.
+ * By default, if there is only one selected journal, this journal is directly selected.
+ * In case there is no selected journal or more than one, we let the user choose which
+ * journal he/she wants. This part is handled by the server.
+ * @extends Component
+ */
+export class FetchMissingTransactions extends Component {
+    static template = "odex30_account_online_sync.FetchMissingTransactions";
+    static components = { DropdownItem };
+    static props = {};
+
+    setup() {
+        this.action = useService("action");
+    }
+
+    //---------------------------------------------------------------------
+    // Protected
+    //---------------------------------------------------------------------
+
+    async openFetchMissingTransactionsWizard() {
+        const { context } = this.env.searchModel;
+        const activeModel = context.active_model;
+        let activeIds = [];
+        if (activeModel === "account.journal") {
+            activeIds = context.active_ids;
+        } else if (!!context.default_journal_id) {
+            activeIds = context.default_journal_id;
+        }
+        // We have to use this.env.services.orm.call instead of using useService
+        // for a specific reason. useService implies that function calls with
+        // are "protected", it means that if the component is closed the
+        // response will be pending and the code stop their execution.
+        // By passing directly from the env, this protection is not activated.
+        const action = await this.env.services.orm.call(
+            "account.journal",
+            "action_open_missing_transaction_wizard",
+            [activeIds]
+        );
+        return this.action.doAction(action);
+    }
+}
+
+export const fetchMissingTransactionItem = {
+    Component: FetchMissingTransactions,
+    groupNumber: 5,
+    isDisplayed: ({ config, isSmall }) => {
+        return !isSmall &&
+        config.actionType === "ir.actions.act_window" &&
+        ["kanban", "list"].includes(config.viewType) &&
+        ["bank_rec_widget_kanban", "bank_rec_list"].includes(config.viewSubType);
+    },
+};
+
+cogMenuRegistry.add("fetch-missing-transaction-menu", fetchMissingTransactionItem, { sequence: 1 });
diff --git a/dev_odex30_accounting/odex30_account_online_sync/static/src/components/bank_reconciliation/fetch_missing_transactions_cog_menu.xml b/dev_odex30_accounting/odex30_account_online_sync/static/src/components/bank_reconciliation/fetch_missing_transactions_cog_menu.xml
new file mode 100644
index 0000000..07256ff
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_online_sync/static/src/components/bank_reconciliation/fetch_missing_transactions_cog_menu.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<templates id="template" xml:space="preserve">
+    <t t-name="odex30_account_online_sync.FetchMissingTransactions">
+        <DropdownItem class="'o_import_menu'" onSelected.bind="openFetchMissingTransactionsWizard">
+            Find Missing Transactions
+        </DropdownItem>
+    </t>
+</templates>
diff --git a/dev_odex30_accounting/odex30_account_online_sync/static/src/components/bank_reconciliation/find_duplicate_transactions_cog_menu.js b/dev_odex30_accounting/odex30_account_online_sync/static/src/components/bank_reconciliation/find_duplicate_transactions_cog_menu.js
new file mode 100644
index 0000000..dc2968e
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_online_sync/static/src/components/bank_reconciliation/find_duplicate_transactions_cog_menu.js
@@ -0,0 +1,64 @@
+import { Component } from "@odoo/owl";
+import { DropdownItem } from "@web/core/dropdown/dropdown_item";
+import { registry } from "@web/core/registry";
+import { useService } from "@web/core/utils/hooks";
+
+/**
+ * 'Find Duplicate Transactions' menu
+ *
+ * This component is used to open a wizard allowing the user to find duplicate
+ * transactions since a specific date.
+ * It's only available in the bank reconciliation widget.
+ * By default, if there is only one selected journal, this journal is directly selected.
+ * In case there is no selected journal or more than one, we let the user choose.
+ * @extends Component
+ */
+export class FindDuplicateTransactions extends Component {
+    static template = "odex30_account_online_sync.FindDuplicateTransactions";
+    static components = { DropdownItem };
+    static props = {};
+
+    setup() {
+        this.action = useService("action");
+    }
+
+    //---------------------------------------------------------------------
+    // Protected
+    //---------------------------------------------------------------------
+
+    async openFindDuplicateTransactionsWizard() {
+        const { context } = this.env.searchModel;
+        const activeModel = context.active_model;
+        let activeIds = [];
+        if (activeModel === "account.journal") {
+            activeIds = context.active_ids;
+        } else if (context.default_journal_id) {
+            activeIds = context.default_journal_id;
+        }
+        return this.action.doActionButton({
+            type: "object",
+            resModel: "account.journal",
+            name:"action_open_duplicate_transaction_wizard",
+            resIds: activeIds,
+        })
+    }
+}
+
+export const findDuplicateTransactionItem = {
+    Component: FindDuplicateTransactions,
+    groupNumber: 5, // same group as fetch missing transactions
+    isDisplayed: ({ config, isSmall }) => {
+        return (
+            !isSmall &&
+            config.actionType === "ir.actions.act_window" &&
+            ["kanban", "list"].includes(config.viewType) &&
+            ["bank_rec_widget_kanban", "bank_rec_list"].includes(config.viewSubType)
+        )
+    },
+};
+
+registry.category("cogMenu").add(
+    "find-duplicate-transaction-menu",
+    findDuplicateTransactionItem,
+    { sequence: 3 }, // after fetch missing transactions
+);
diff --git a/dev_odex30_accounting/odex30_account_online_sync/static/src/components/bank_reconciliation/find_duplicate_transactions_cog_menu.xml b/dev_odex30_accounting/odex30_account_online_sync/static/src/components/bank_reconciliation/find_duplicate_transactions_cog_menu.xml
new file mode 100644
index 0000000..1e75c99
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_online_sync/static/src/components/bank_reconciliation/find_duplicate_transactions_cog_menu.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<templates id="template" xml:space="preserve">
+    <t t-name="odex30_account_online_sync.FindDuplicateTransactions">
+        <DropdownItem class="'o_import_menu'" onSelected.bind="openFindDuplicateTransactionsWizard">
+            Find Duplicate Transactions
+        </DropdownItem>
+    </t>
+</templates>
diff --git a/dev_odex30_accounting/odex30_account_online_sync/static/src/components/connected_until_widget/connected_until_widget.js b/dev_odex30_accounting/odex30_account_online_sync/static/src/components/connected_until_widget/connected_until_widget.js
new file mode 100644
index 0000000..4792386
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_online_sync/static/src/components/connected_until_widget/connected_until_widget.js
@@ -0,0 +1,61 @@
+/** @odoo-module **/
+
+import { registry } from "@web/core/registry";
+import { standardWidgetProps } from "@web/views/widgets/standard_widget_props";
+import { useService } from "@web/core/utils/hooks";
+import { Component, useState } from "@odoo/owl";
+
+class ConnectedUntil extends Component {
+    static template = "odex30_account_online_sync.ConnectedUntil";
+    static props = { ...standardWidgetProps };
+
+    setup() {
+        this.state = useState({
+            isHovered: false,
+            displayReconnectButton: false,
+        });
+
+        if (this.isConnectionExpiredIn(0)) {
+            this.state.displayReconnectButton = true;
+        }
+
+        this.action = useService("action");
+        this.orm = useService("orm");
+    }
+
+    get cssClasses() {
+        let cssClasses = "text-nowrap w-100";
+        if (this.isConnectionExpiredIn(7)) {
+            cssClasses += this.isConnectionExpiredIn(3) ? " text-danger" : " text-warning";
+        }
+        return cssClasses;
+    }
+
+    onMouseEnter() {
+        this.state.isHovered = true;
+    }
+
+    onMouseLeave() {
+        this.state.isHovered = false;
+    }
+
+    isConnectionExpiredIn(nbDays) {
+        return this.props.record.data.expiring_synchronization_due_day <= nbDays;
+    }
+
+    async extendConnection() {
+        const action = await this.orm.call(
+            "account.journal",
+            "action_extend_consent",
+            [this.props.record.resId],
+            {}
+        );
+        this.action.doAction(action);
+    }
+}
+
+export const connectedUntil = {
+    component: ConnectedUntil,
+};
+
+registry.category("view_widgets").add("connected_until_widget", connectedUntil);
diff --git a/dev_odex30_accounting/odex30_account_online_sync/static/src/components/connected_until_widget/connected_until_widget.xml b/dev_odex30_accounting/odex30_account_online_sync/static/src/components/connected_until_widget/connected_until_widget.xml
new file mode 100644
index 0000000..18714c9
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_online_sync/static/src/components/connected_until_widget/connected_until_widget.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<templates>
+    <t t-name="odex30_account_online_sync.ConnectedUntil">
+        <div t-on-mouseenter="onMouseEnter" t-on-mouseleave="onMouseLeave" t-att-class="cssClasses">
+            <t t-if="state.displayReconnectButton">
+                <button class="btn btn-danger" t-on-click="extendConnection">
+                    Reconnect Bank
+                </button>
+            </t>
+            <t t-else="">
+                <t t-if="!this.state.isHovered">
+                    <i class="fa fa-warning" t-if="isConnectionExpiredIn(3)"/>
+                    Connected until <t t-out="this.props.record.data.expiring_synchronization_date.toFormat('MMM dd')"/>
+                </t>
+                <t t-elif="this.state.isHovered">
+                    <a class="oe_inline oe_kanban_action" href="#" t-on-click="extendConnection">
+                        Extend Connection
+                    </a>
+                </t>
+            </t>
+        </div>
+    </t>
+</templates>
diff --git a/dev_odex30_accounting/odex30_account_online_sync/static/src/components/online_account_radio/online_account_radio.js b/dev_odex30_accounting/odex30_account_online_sync/static/src/components/online_account_radio/online_account_radio.js
new file mode 100644
index 0000000..a0e1aa0
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_online_sync/static/src/components/online_account_radio/online_account_radio.js
@@ -0,0 +1,41 @@
+/** @odoo-module **/
+
+import { onMounted, useState } from "@odoo/owl";
+import { registry } from "@web/core/registry";
+import { RadioField, radioField } from "@web/views/fields/radio/radio_field";
+import { useService } from '@web/core/utils/hooks';
+
+
+class OnlineAccountRadio extends RadioField {
+    static template = "odex30_account_online_sync.OnlineAccountRadio";
+    setup() {
+        super.setup();
+        this.orm = useService("orm");
+        this.state = useState({balances: {}});
+
+        onMounted(async () => {
+            this.state.balances = await this.loadData();
+            // Make sure the first option is selected by default.
+            this.onChange(this.items[0]);
+        });
+    }
+
+    async loadData() {
+        const ids = this.items.map(i => i[0]);
+        return await this.orm.call("account.online.account", "get_formatted_balances", [ids]);
+    }
+
+    getBalanceName(itemID) {
+        return this.state.balances?.[itemID]?.[0] ?? "Loading ...";
+    }
+
+    isNegativeAmount(itemID) {
+        // In case of the value is undefined, it will return false as intended.
+        return this.state.balances?.[itemID]?.[1] < 0;
+    }
+}
+
+registry.category("fields").add("online_account_radio", {
+    ...radioField,
+    component: OnlineAccountRadio,
+});
diff --git a/dev_odex30_accounting/odex30_account_online_sync/static/src/components/online_account_radio/online_account_radio.xml b/dev_odex30_accounting/odex30_account_online_sync/static/src/components/online_account_radio/online_account_radio.xml
new file mode 100644
index 0000000..2407b88
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_online_sync/static/src/components/online_account_radio/online_account_radio.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<templates xml:space="preserve">
+    <t t-name="odex30_account_online_sync.OnlineAccountRadio">
+        <div
+            role="radiogroup"
+            t-attf-class="o_{{ props.orientation }}"
+            t-att-aria-label="string"
+        >
+            <t t-foreach="items" t-as="item" t-key="item[0]">
+                <div class="form-check o_radio_item" aria-atomic="true">
+                    <input
+                        type="radio"
+                        class="form-check-input o_radio_input"
+                        t-att-checked="item[0] === value"
+                        t-att-disabled="props.readonly"
+                        t-att-name="id"
+                        t-att-data-value="item[0]"
+                        t-att-data-index="item_index"
+                        t-att-id="`${id}_${item[0]}`"
+                        t-on-change="() => this.onChange(item)"
+                    />
+                    <label class="form-check-label o_form_label" t-att-for="`${id}_${item[0]}`" t-out="item[1]" />
+                    <br/>
+                    <p t-out="this.getBalanceName(item[0])" t-att-class="this.isNegativeAmount(item[0]) ? 'text-danger' : ''"/>
+                </div>
+            </t>
+        </div>
+    </t>
+</templates>
diff --git a/dev_odex30_accounting/odex30_account_online_sync/static/src/components/refresh_spin_journal_widget/refresh_spin_journal_widget.js b/dev_odex30_accounting/odex30_account_online_sync/static/src/components/refresh_spin_journal_widget/refresh_spin_journal_widget.js
new file mode 100644
index 0000000..8944dfc
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_online_sync/static/src/components/refresh_spin_journal_widget/refresh_spin_journal_widget.js
@@ -0,0 +1,99 @@
+/** @odoo-module **/
+
+import { registry } from "@web/core/registry";
+import { standardWidgetProps } from "@web/views/widgets/standard_widget_props";
+import { useService } from "@web/core/utils/hooks";
+import { Component, useState, onWillStart, markup } from "@odoo/owl";
+
+class RefreshSpin extends Component {
+    static template = "odex30_account_online_sync.RefreshSpin";
+    static props = { ...standardWidgetProps };
+
+    setup() {
+        this.state = useState({
+            isHovered: false,
+            fetchingStatus: false,
+            connectionStateDetails: null,
+        });
+
+        this.actionService = useService("action");
+        this.busService = this.env.services.bus_service;
+        this.orm = useService("orm");
+        this.state.fetchingStatus = this.props.record.data.online_sync_fetching_status;
+
+        this.busService.subscribe("online_sync", (notification) => {
+            if (notification?.id === this.recordId && notification?.connection_state_details) {
+                this.state.connectionStateDetails = notification.connection_state_details;
+            }
+        });
+
+        onWillStart(() => {
+            this._initConnectionStateDetails();
+        });
+    }
+
+    refresh() {
+        this.actionService.restore(this.actionService.currentController.jsId);
+    }
+
+    onMouseEnter() {
+        this.state.isHovered = true;
+    }
+
+    onMouseLeave() {
+        this.state.isHovered = false;
+    }
+
+    async openAction() {
+        /**
+         * This function is used to open the action that the asynchronous process saved
+         * on the databsase. It allows users to call the action when they want and not when
+         * the process is over.
+         */
+        const action = await this.orm.call(
+            "account.journal",
+            "action_open_dashboard_asynchronous_action",
+            [this.recordId],
+        );
+        this.actionService.doAction(action);
+        this.state.connectionStateDetails = null;
+    }
+
+    async fetchTransactions() {
+        /**
+         * This function call the function to fetch transactions.
+         * In the main case, we don't do anything after calling the function.
+         * The idea is that websockets will update the status by themselves.
+         * In one specific case, we have to return an action to the user to open
+         * the Odoo Fin iframe to refresh the connection.
+         */
+        this.state.connectionStateDetails = { status: "fetching" };
+        const action = await this.orm.call("account.journal", "manual_sync", [this.recordId]);
+        if (action) {
+            action.help = markup(action.help);
+            this.actionService.doAction(action);
+        }
+    }
+
+    _initConnectionStateDetails() {
+        /**
+         * This function is used to get the last state of the connection (if there is one)
+         */
+        const kanbanDashboardData = JSON.parse(this.props.record.data.kanban_dashboard);
+        this.state.connectionStateDetails = kanbanDashboardData?.connection_state_details;
+    }
+
+    get recordId() {
+        return this.props.record.data.id;
+    }
+
+    get connectionStatus() {
+        return this.state.connectionStateDetails?.status;
+    }
+}
+
+export const refreshSpin = {
+    component: RefreshSpin,
+};
+
+registry.category("view_widgets").add("refresh_spin_widget", refreshSpin);
diff --git a/dev_odex30_accounting/odex30_account_online_sync/static/src/components/refresh_spin_journal_widget/refresh_spin_journal_widget.xml b/dev_odex30_accounting/odex30_account_online_sync/static/src/components/refresh_spin_journal_widget/refresh_spin_journal_widget.xml
new file mode 100644
index 0000000..869292b
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_online_sync/static/src/components/refresh_spin_journal_widget/refresh_spin_journal_widget.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+<templates>
+    <t t-name="odex30_account_online_sync.RefreshSpin">
+        <t t-if="this.connectionStatus === 'success'">
+            <div>
+                <t t-if="!!this.state.connectionStateDetails.nb_fetched_transactions" >
+                    <a href="#" t-on-click.prevent.stop="openAction">
+                        <t t-out="this.state.connectionStateDetails.nb_fetched_transactions"/> transactions fetched
+                    </a>
+                </t>
+                <t t-else="">
+                    0 transaction fetched
+                </t>
+            </div>
+        </t>
+        <t t-elif="this.connectionStatus === 'error'">
+            <div>
+                <a t-if="this.state.connectionStateDetails.error_type === 'redirect_warning'" class="text-danger" href="#" t-on-click.prevent.stop="openAction">
+                    <i class="fa fa-warning"/> See error
+                </a>
+                <button t-else="" class="btn btn-danger" t-on-click.prevent.stop="openAction">
+                    Reconnect Bank
+                </button>
+            </div>
+        </t>
+        <t t-elif="this.connectionStatus === 'fetching'">
+            <div t-on-mouseenter="onMouseEnter" t-on-mouseleave="onMouseLeave">
+                <t t-if="this.state.isHovered">
+                    <a class="oe_inline oe_kanban_action" href="#" t-on-click="refresh">Refresh</a>
+                </t>
+                <t t-else="">
+                    <span>Fetching... <i class='fa fa-spinner fa-spin'/></span>
+                </t>
+            </div>
+        </t>
+        <t t-else="">
+            <a href="#" t-on-click.prevent.stop="fetchTransactions" class="oe_inline">
+                Fetch Transactions
+            </a>
+        </t>
+    </t>
+</templates>
diff --git a/dev_odex30_accounting/odex30_account_online_sync/static/src/components/transient_bank_statement_line_list_view/transient_bank_statement_line_list_view.js b/dev_odex30_accounting/odex30_account_online_sync/static/src/components/transient_bank_statement_line_list_view/transient_bank_statement_line_list_view.js
new file mode 100644
index 0000000..6b9993e
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_online_sync/static/src/components/transient_bank_statement_line_list_view/transient_bank_statement_line_list_view.js
@@ -0,0 +1,51 @@
+/** @odoo-module **/
+
+import { ListRenderer } from "@web/views/list/list_renderer";
+import { ListController } from "@web/views/list/list_controller";
+import { registry } from "@web/core/registry";
+import { listView } from "@web/views/list/list_view";
+import { useService } from "@web/core/utils/hooks";
+
+export class TransientBankStatementLineListController extends ListController {
+
+    setup() {
+        super.setup();
+        this.orm = useService("orm");
+        this.action = useService("action");
+    }
+
+    async onClickImportTransactions() {
+        const resIds = await this.getSelectedResIds();
+        const resultAction = await this.orm.call("account.bank.statement.line.transient", "action_import_transactions", [resIds]);
+        this.action.doAction(resultAction);
+    }
+}
+
+export class TransientBankStatementLineListRenderer extends ListRenderer {
+
+    static template = "odex30_account_online_sync.TransientBankStatementLineRenderer";
+
+    setup() {
+        super.setup();
+        this.orm = useService("orm");
+        this.action = useService("action");
+    }
+
+    async openManualEntries() {
+        if (this.env.searchModel.context.active_model === "account.missing.transaction.wizard" && this.env.searchModel.context.active_ids) {
+            const activeIds = this.env.searchModel.context.active_ids;
+            const action = await this.orm.call("account.missing.transaction.wizard", "action_open_manual_bank_statement_lines", activeIds);
+            this.action.doAction(action);
+        }
+    }
+
+}
+
+export const TransientBankStatementLineListView = {
+    ...listView,
+    Renderer: TransientBankStatementLineListRenderer,
+    Controller: TransientBankStatementLineListController,
+    buttonTemplate: "TransientBankStatementLineButtonTemplate",
+}
+
+registry.category("views").add("transient_bank_statement_line_list_view", TransientBankStatementLineListView);
diff --git a/dev_odex30_accounting/odex30_account_online_sync/static/src/components/transient_bank_statement_line_list_view/transient_bank_statement_line_list_view.xml b/dev_odex30_accounting/odex30_account_online_sync/static/src/components/transient_bank_statement_line_list_view/transient_bank_statement_line_list_view.xml
new file mode 100644
index 0000000..1e9c17c
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_online_sync/static/src/components/transient_bank_statement_line_list_view/transient_bank_statement_line_list_view.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<templates xml:space="preserve">
+    <t t-name="odex30_account_online_sync.TransientBankStatementLineRenderer" t-inherit="web.ListRenderer" t-inherit-mode="primary">
+        <xpath expr="//table" position="before">
+            <t t-if="env.searchModel.context.has_manual_entries">
+                <div class="alert alert-warning text-center mb-0" role="alert">
+                    You have <a href="" t-on-click.prevent="() => this.openManualEntries()">entries</a>
+                    within this period that were not created using the online synchronization. This might cause duplicate entries.
+                </div>
+            </t>
+            <t t-if="env.searchModel.context.is_fetch_before_creation">
+                <div class="alert alert-warning text-center mb-0" role="alert">
+                    You are importing transactions before the creation of your online synchronization
+                    (<t t-out="env.searchModel.context.account_online_link_create_date"/>).
+                    This might cause duplicate entries.
+                </div>
+            </t>
+        </xpath>
+    </t>
+
+    <t t-name="TransientBankStatementLineButtonTemplate" t-inherit="web.ListView.Buttons" t-inherit-mode="primary">
+        <xpath expr="//div[hasclass('o_list_buttons')]" position="inside">
+            <button type="button" class="btn btn-primary" data-hotkey="i" t-on-click.stop="onClickImportTransactions">
+                Import Transactions
+            </button>
+        </xpath>
+    </t>
+</templates>
diff --git a/dev_odex30_accounting/odex30_account_online_sync/static/src/components/views/account_online_authorization_kanban.js b/dev_odex30_accounting/odex30_account_online_sync/static/src/components/views/account_online_authorization_kanban.js
new file mode 100644
index 0000000..bd42d29
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_online_sync/static/src/components/views/account_online_authorization_kanban.js
@@ -0,0 +1,19 @@
+import { patch } from "@web/core/utils/patch";
+import { BankRecKanbanController } from "@odex30_account_accountant/components/bank_reconciliation/kanban";
+
+patch(BankRecKanbanController.prototype, {
+    setup() {
+        super.setup();
+        this.displayDuplicateWarning = !!this.props.context.duplicates_from_date;
+    },
+    async onWarningClick () {
+        const { context } = this.env.searchModel;
+        return this.action.doActionButton({
+            type: "object",
+            resModel: "account.journal",
+            name:"action_open_duplicate_transaction_wizard",
+            resId: this.state.journalId,
+            args: JSON.stringify([context.duplicates_from_date]),
+        })
+    },
+})
diff --git a/dev_odex30_accounting/odex30_account_online_sync/static/src/components/views/account_online_authorization_kanban_controller.xml b/dev_odex30_accounting/odex30_account_online_sync/static/src/components/views/account_online_authorization_kanban_controller.xml
new file mode 100644
index 0000000..6cdfe99
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_online_sync/static/src/components/views/account_online_authorization_kanban_controller.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<templates xml:space="preserve">
+    <t t-name="odex30_account_online_sync.AOSKanbanView" t-inherit="account.BankRecoKanbanController" t-inherit-mode="extension">
+        <xpath expr="//Layout" position="before">
+            <t t-if="displayDuplicateWarning">
+                <div class="alert alert-warning text-center mb-0" role="alert">
+                    Some transactions <a class="alert-link" href="" t-on-click.prevent="onWarningClick">may be duplicates.</a>
+                </div>
+            </t>
+        </xpath>
+    </t>
+</templates>
diff --git a/dev_odex30_accounting/odex30_account_online_sync/static/src/js/odoo_fin_connector.js b/dev_odex30_accounting/odex30_account_online_sync/static/src/js/odoo_fin_connector.js
new file mode 100644
index 0000000..b8d18ca
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_online_sync/static/src/js/odoo_fin_connector.js
@@ -0,0 +1,86 @@
+/** @odoo-module **/
+
+import { registry } from "@web/core/registry";
+import { loadJS } from "@web/core/assets";
+import { cookie } from "@web/core/browser/cookie";
+import { markup } from "@odoo/owl";
+const actionRegistry = registry.category('actions');
+/* global OdooFin */
+
+function OdooFinConnector(parent, action) {
+    const orm = parent.services.orm;
+    const actionService = parent.services.action;
+    const notificationService = parent.services.notification;
+    const debugMode = parent.debug;
+
+    const id = action.id;
+    action.params.colorScheme = cookie.get("color_scheme");
+    let mode = action.params.mode || 'link';
+    // Ensure that the proxyMode is valid
+    const modeRegexp = /^[a-z0-9-_]+$/;
+    const runbotRegexp = /^https:\/\/[a-z0-9-_]+\.[a-z0-9-_]+\.odoo\.com$/;
+    if (!modeRegexp.test(action.params.proxyMode) && !runbotRegexp.test(action.params.proxyMode)) {
+        return;
+    }
+    let url = 'https://' + action.params.proxyMode + '.odoofin.com/proxy/v1/odoofin_link';
+    if (runbotRegexp.test(action.params.proxyMode)) {
+        url = action.params.proxyMode + '/proxy/v1/odoofin_link';
+    }
+    let actionResult = false;
+
+    loadJS(url)
+        .then(function () {
+            // Create and open the iframe
+            const params = {
+                data: action.params,
+                proxyMode: action.params.proxyMode,
+                onEvent: async function (event, data) {
+                    switch (event) {
+                        case 'close':
+                            return;
+                        case 'reload':
+                            return actionService.doAction({type: 'ir.actions.client', tag: 'reload'});
+                        case 'notification':
+                            notificationService.add(data.message, data);
+                            break;
+                        case 'exchange_token':
+                            await orm.call('account.online.link', 'exchange_token',
+                                [[id], data], {context: action.context});
+                            break;
+                        case 'success':
+                            mode = data.mode || mode;
+                            actionResult = await orm.call('account.online.link', 'success', [[id], mode, data], {context: action.context});
+                            actionResult.help = markup(actionResult.help)
+                            return actionService.doAction(actionResult);
+                        case 'connect_existing_account':
+                            actionResult = await orm.call('account.online.link', 'connect_existing_account', [data], {context: action.context});
+                            actionResult.help = markup(actionResult.help)
+                            return actionService.doAction(actionResult);
+                        default:
+                            return;
+                    }
+                },
+                onAddBank: async function (data) {
+                    // If the user doesn't find his bank
+                    actionResult = await orm.call(
+                        "account.online.link",
+                        "create_new_bank_account_action",
+                        [[id], data],
+                        { context: action.context }
+                    );
+                    return actionService.doAction(actionResult);
+                }
+            };
+            // propagate parent debug mode to iframe
+            if (typeof debugMode !== "undefined" && debugMode) {
+                params.data["debug"] = debugMode;
+            }
+            OdooFin.create(params);
+            OdooFin.open();
+        });
+    return;
+}
+
+actionRegistry.add('odoo_fin_connector', OdooFinConnector);
+
+export default OdooFinConnector;
diff --git a/dev_odex30_accounting/odex30_account_online_sync/static/src/js/online_sync_portal.js b/dev_odex30_accounting/odex30_account_online_sync/static/src/js/online_sync_portal.js
new file mode 100644
index 0000000..8dde787
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_online_sync/static/src/js/online_sync_portal.js
@@ -0,0 +1,57 @@
+/** @odoo-module **/
+
+    import publicWidget from "@web/legacy/js/public/public_widget";
+    import { loadJS } from "@web/core/assets";
+    /* global OdooFin */
+
+    publicWidget.registry.OnlineSyncPortal = publicWidget.Widget.extend({
+        selector: '.oe_online_sync',
+        events: Object.assign({}, {
+            'click #renew_consent_button': '_onRenewConsent',
+        }),
+
+        OdooFinConnector: function (parent, action) {
+            // Ensure that the proxyMode is valid
+            const modeRegexp = /^[a-z0-9-_]+$/i;
+            if (!modeRegexp.test(action.params.proxyMode)) {
+                return;
+            }
+            const url = 'https://' + action.params.proxyMode + '.odoofin.com/proxy/v1/odoofin_link';
+
+            loadJS(url)
+                .then(() => {
+                    // Create and open the iframe
+                    const params = {
+                        data: action.params,
+                        proxyMode: action.params.proxyMode,
+                        onEvent: function (event, data) {
+                            switch (event) {
+                                case 'success':
+                                    const processUrl = window.location.pathname + '/complete' + window.location.search;
+                                    $('.js_reconnect').toggleClass('d-none');
+                                    $.post(processUrl, {csrf_token: odoo.csrf_token});
+                                default:
+                                    return;
+                            }
+                        },
+                    };
+                    OdooFin.create(params);
+                    OdooFin.open();
+                });
+            return;
+        },
+
+        /**
+         * @private
+         * @param {Event} ev
+         */
+        _onRenewConsent: async function (ev) {
+            ev.preventDefault();
+            const action = JSON.parse($(ev.currentTarget).attr('iframe-params'));
+            return this.OdooFinConnector(this, action);
+        },
+    });
+
+    export default {
+        OnlineSyncPortal: publicWidget.registry.OnlineSyncPortal,
+    };
diff --git a/dev_odex30_accounting/odex30_account_online_sync/static/tests/helpers/model_definitions_setup.js b/dev_odex30_accounting/odex30_account_online_sync/static/tests/helpers/model_definitions_setup.js
new file mode 100644
index 0000000..6434c51
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_online_sync/static/tests/helpers/model_definitions_setup.js
@@ -0,0 +1,5 @@
+/** @odoo-module **/
+
+import { addModelNamesToFetch } from '@bus/../tests/helpers/model_definitions_helpers';
+
+addModelNamesToFetch(["account.online.link", "account.online.account", "account.bank.selection"]);
diff --git a/dev_odex30_accounting/odex30_account_online_sync/static/tests/online_account_radio_test.js b/dev_odex30_accounting/odex30_account_online_sync/static/tests/online_account_radio_test.js
new file mode 100644
index 0000000..3be8ad5
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_online_sync/static/tests/online_account_radio_test.js
@@ -0,0 +1,83 @@
+/* @odoo-module */
+
+import { startServer } from "@bus/../tests/helpers/mock_python_environment";
+
+import { openFormView, start } from "@mail/../tests/helpers/test_utils";
+
+import { click, contains } from "@web/../tests/utils";
+
+QUnit.module("Views", {}, function () {
+    QUnit.module("AccountOnlineSynchronizationAccountRadio");
+
+    QUnit.test("can be rendered", async () => {
+        const pyEnv = await startServer();
+        const onlineLink = pyEnv["account.online.link"].create([
+            {
+                state: "connected",
+                name: "Fake Bank",
+            },
+        ]);
+        pyEnv["account.online.account"].create([
+            {
+                name: "account_1",
+                online_identifier: "abcd",
+                balance: 10.0,
+                account_number: "account_number_1",
+                account_online_link_id: onlineLink,
+            },
+            {
+                name: "account_2",
+                online_identifier: "efgh",
+                balance: 20.0,
+                account_number: "account_number_2",
+                account_online_link_id: onlineLink,
+            },
+        ]);
+        const bankSelection = pyEnv["account.bank.selection"].create([
+            {
+                account_online_link_id: onlineLink,
+            },
+        ]);
+
+        const views = {
+            "account.bank.selection,false,form": `<form>
+                    <div>
+                        <field name="account_online_account_ids" invisible="1"/>
+                        <field name="selected_account" widget="online_account_radio" nolabel="1"/>
+                    </div>
+                </form>`,
+        };
+        await start({
+            serverData: { views },
+            mockRPC: function (route, args) {
+                if (
+                    route === "/web/dataset/call_kw/account.online.account/get_formatted_balances"
+                ) {
+                    return {
+                        1: ["$ 10.0", 10.0],
+                        2: ["$ 20.0", 20.0],
+                    };
+                }
+            },
+        });
+        await openFormView("account.bank.selection", bankSelection);
+        await contains(".o_radio_item", { count: 2 });
+        await contains(":nth-child(1 of .o_radio_item)", {
+            contains: [
+                ["p", { text: "$ 10.0" }],
+                ["label", { text: "account_1" }],
+                [".o_radio_input:checked"],
+            ],
+        });
+        await contains(":nth-child(2 of .o_radio_item)", {
+            contains: [
+                ["p", { text: "$ 20.0" }],
+                ["label", { text: "account_2" }],
+                [".o_radio_input:not(:checked)"],
+            ],
+        });
+        await click(":nth-child(2 of .o_radio_item) .o_radio_input");
+        await contains(":nth-child(1 of .o_radio_item) .o_radio_input:not(:checked)");
+        await contains(":nth-child(2 of .o_radio_item) .o_radio_input:checked");
+    });
+});
diff --git a/dev_odex30_accounting/odex30_account_online_sync/tests/__init__.py b/dev_odex30_accounting/odex30_account_online_sync/tests/__init__.py
new file mode 100644
index 0000000..eacefb9
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_online_sync/tests/__init__.py
@@ -0,0 +1,7 @@
+# -*- encoding: utf-8 -*-
+
+from . import common
+from . import test_account_online_account
+from . import test_online_sync_creation_statement
+from . import test_account_missing_transactions_wizard
+from . import test_online_sync_branch_companies
diff --git a/dev_odex30_accounting/odex30_account_online_sync/tests/common.py b/dev_odex30_accounting/odex30_account_online_sync/tests/common.py
new file mode 100644
index 0000000..ffcbc53
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_online_sync/tests/common.py
@@ -0,0 +1,110 @@
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+from odoo import Command, fields
+from odoo.addons.account.tests.common import AccountTestInvoicingCommon
+from odoo.tests import tagged
+from unittest.mock import MagicMock
+
+
+@tagged('post_install', '-at_install')
+class AccountOnlineSynchronizationCommon(AccountTestInvoicingCommon):
+
+    @classmethod
+    def setUpClass(cls):
+        super().setUpClass()
+        cls.other_currency = cls.setup_other_currency('EUR')
+
+        cls.euro_bank_journal = cls.env['account.journal'].create({
+            'name': 'Euro Bank Journal',
+            'type': 'bank',
+            'code': 'EURB',
+            'currency_id': cls.other_currency.id,
+        })
+        cls.account_online_link = cls.env['account.online.link'].create({
+            'name': 'Test Bank',
+            'client_id': 'client_id_1',
+            'refresh_token': 'refresh_token',
+            'access_token': 'access_token',
+        })
+        cls.account_online_account = cls.env['account.online.account'].create({
+            'name': 'MyBankAccount',
+            'account_online_link_id': cls.account_online_link.id,
+            'journal_ids': [Command.set(cls.euro_bank_journal.id)]
+        })
+        cls.BankStatementLine = cls.env['account.bank.statement.line']
+
+    def setUp(self):
+        super().setUp()
+        self.transaction_id = 1
+        self.account_online_account.balance = 0.0
+
+    def _create_one_online_transaction(self, transaction_identifier=None, date=None, payment_ref=None, amount=10.0, partner_name=None, foreign_currency_code=None, amount_currency=8.0):
+        """ This method allows to create an online transaction granularly
+
+            :param transaction_identifier: Online identifier of the transaction, by default transaction_id from the
+                                           setUp. If used, transaction_id is not incremented.
+            :param date: Date of the transaction, by default the date of today
+            :param payment_ref: Label of the transaction
+            :param amount: Amount of the transaction, by default equals 10.0
+            :param foreign_currency_code: Code of transaction's foreign currency
+            :param amount_currency: Amount of transaction in foreign currency, update transaction only if foreign_currency_code is given, by default equals 8.0
+            :return: A dictionnary representing an online transaction (not formatted)
+        """
+        transaction_identifier = transaction_identifier if transaction_identifier is not None else self.transaction_id
+        if date:
+            date = date if isinstance(date, str) else fields.Date.to_string(date)
+        else:
+            date = fields.Date.to_string(fields.Date.today())
+
+        payment_ref = payment_ref or f'transaction_{transaction_identifier}'
+        transaction = {
+            'online_transaction_identifier': transaction_identifier,
+            'date': date,
+            'payment_ref': payment_ref,
+            'amount': amount,
+            'partner_name': partner_name,
+        }
+        if foreign_currency_code:
+            transaction.update({
+                'foreign_currency_code': foreign_currency_code,
+                'amount_currency': amount_currency
+            })
+        return transaction
+
+    def _create_online_transactions(self, dates):
+        """ This method returns a list of transactions with the
+            given dates.
+            All amounts equals 10.0
+
+            :param dates: A list of dates, one transaction is created for each given date.
+            :return: A formatted list of transactions
+        """
+        transactions = []
+        for date in dates:
+            transactions.append(self._create_one_online_transaction(date=date))
+            self.transaction_id += 1
+        return self.account_online_account._format_transactions(transactions)
+
+    def _mock_odoofin_response(self, data=None):
+        if not data:
+            data = {}
+        mock_response = MagicMock()
+        mock_response.status_code = 200
+        mock_response.json.return_value = {
+            'result': data,
+        }
+        return mock_response
+
+    def _mock_odoofin_error_response(self, code=200, message='Default', data=None):
+        if not data:
+            data = {}
+        mock_response = MagicMock()
+        mock_response.status_code = 200
+        mock_response.json.return_value = {
+            'error': {
+                'code': code,
+                'message': message,
+                'data': data,
+            },
+        }
+        return mock_response
diff --git a/dev_odex30_accounting/odex30_account_online_sync/tests/test_account_missing_transactions_wizard.py b/dev_odex30_accounting/odex30_account_online_sync/tests/test_account_missing_transactions_wizard.py
new file mode 100644
index 0000000..1d9989f
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_online_sync/tests/test_account_missing_transactions_wizard.py
@@ -0,0 +1,45 @@
+from odoo import fields
+from odoo.addons.odex30_account_online_sync.tests.common import AccountOnlineSynchronizationCommon
+from odoo.tests import tagged
+from unittest.mock import patch
+
+
+@tagged('post_install', '-at_install')
+class TestAccountMissingTransactionsWizard(AccountOnlineSynchronizationCommon):
+    """ Tests the account journal missing transactions wizard. """
+
+    @patch('odoo.addons.odex30_account_online_sync.models.account_online.AccountOnlineLink._fetch_odoo_fin')
+    def test_fetch_missing_transaction(self, patched_fetch_odoofin):
+        self.account_online_link.state = 'connected'
+        patched_fetch_odoofin.side_effect = [{
+            'transactions': [
+                self._create_one_online_transaction(transaction_identifier='ABCD01', date='2023-07-06', foreign_currency_code='EGP', amount_currency=8.0),
+            ],
+            'pendings': [
+                self._create_one_online_transaction(transaction_identifier='ABCD02_pending', date='2023-07-25', foreign_currency_code='GBP', amount_currency=8.0),
+            ]
+        }]
+        start_date = fields.Date.from_string('2023-07-01')
+        wizard = self.env['account.missing.transaction.wizard'].new({
+            'date': start_date,
+            'journal_id': self.euro_bank_journal.id,
+        })
+
+        action = wizard.action_fetch_missing_transaction()
+        transient_transactions = self.env['account.bank.statement.line.transient'].search(domain=action['domain'])
+        egp_currency = self.env['res.currency'].search([('name', '=', 'EGP')])
+        gbp_currency = self.env['res.currency'].search([('name', '=', 'GBP')])
+
+        self.assertEqual(2, len(transient_transactions))
+        # Posted Transaction
+        self.assertEqual(transient_transactions[0]['online_transaction_identifier'], 'ABCD01')
+        self.assertEqual(transient_transactions[0]['date'], fields.Date.from_string('2023-07-06'))
+        self.assertEqual(transient_transactions[0]['state'], 'posted')
+        self.assertEqual(transient_transactions[0]['foreign_currency_id'], egp_currency)
+        self.assertEqual(transient_transactions[0]['amount_currency'], 8.0)
+        # Pending Transaction
+        self.assertEqual(transient_transactions[1]['online_transaction_identifier'], 'ABCD02_pending')
+        self.assertEqual(transient_transactions[1]['date'], fields.Date.from_string('2023-07-25'))
+        self.assertEqual(transient_transactions[1]['state'], 'pending')
+        self.assertEqual(transient_transactions[1]['foreign_currency_id'], gbp_currency)
+        self.assertEqual(transient_transactions[1]['amount_currency'], 8.0)
diff --git a/dev_odex30_accounting/odex30_account_online_sync/tests/test_account_online_account.py b/dev_odex30_accounting/odex30_account_online_sync/tests/test_account_online_account.py
new file mode 100644
index 0000000..35c5bcd
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_online_sync/tests/test_account_online_account.py
@@ -0,0 +1,491 @@
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+import logging
+from datetime import datetime, timedelta
+from freezegun import freeze_time
+from unittest.mock import patch
+
+from odoo import Command, fields, tools
+from odoo.addons.odex30_account_online_sync.tests.common import AccountOnlineSynchronizationCommon
+from odoo.tests import tagged
+
+_logger = logging.getLogger(__name__)
+
+@tagged('post_install', '-at_install')
+class TestAccountOnlineAccount(AccountOnlineSynchronizationCommon):
+
+    @classmethod
+    def setUpClass(cls):
+        super().setUpClass()
+
+        cls.bank_account_id = cls.env['account.account'].create({
+            'name': 'Bank Account',
+            'account_type': 'asset_cash',
+            'code': cls.env['account.account']._search_new_account_code('BNK100'),
+        })
+        cls.bank_journal = cls.env['account.journal'].create({
+            'name': 'A bank journal',
+            'default_account_id': cls.bank_account_id.id,
+            'type': 'bank',
+            'code': cls.env['account.journal'].get_next_bank_cash_default_code('bank', cls.company_data['company']),
+        })
+
+    @freeze_time('2023-08-01')
+    def test_get_filtered_transactions(self):
+        """ This test verifies that duplicate transactions are filtered """
+        self.BankStatementLine.with_context(skip_statement_line_cron_trigger=True).create({
+            'date': '2023-08-01',
+            'journal_id': self.euro_bank_journal.id,
+            'online_transaction_identifier': 'ABCD01',
+            'payment_ref': 'transaction_ABCD01',
+            'amount': 10.0,
+        })
+
+        transactions_to_filtered = [
+            self._create_one_online_transaction(transaction_identifier='ABCD01'),
+            self._create_one_online_transaction(transaction_identifier='ABCD02'),
+        ]
+
+        filtered_transactions = self.account_online_account._get_filtered_transactions(transactions_to_filtered)
+
+        self.assertEqual(
+            filtered_transactions,
+            [
+                {
+                    'payment_ref': 'transaction_ABCD02',
+                    'date': '2023-08-01',
+                    'online_transaction_identifier': 'ABCD02',
+                    'amount': 10.0,
+                    'partner_name': None,
+                }
+            ]
+        )
+
+    @freeze_time('2023-08-01')
+    def test_get_filtered_transactions_with_empty_transaction_identifier(self):
+        """ This test verifies that transactions without a transaction identifier
+            are not filtered due to their empty transaction identifier.
+        """
+        self.BankStatementLine.with_context(skip_statement_line_cron_trigger=True).create({
+            'date': '2023-08-01',
+            'journal_id': self.euro_bank_journal.id,
+            'online_transaction_identifier': '',
+            'payment_ref': 'transaction_ABCD01',
+            'amount': 10.0,
+        })
+
+        transactions_to_filtered = [
+            self._create_one_online_transaction(transaction_identifier=''),
+            self._create_one_online_transaction(transaction_identifier=''),
+        ]
+
+        filtered_transactions = self.account_online_account._get_filtered_transactions(transactions_to_filtered)
+
+        self.assertEqual(
+            filtered_transactions,
+            [
+                {
+                    'payment_ref': 'transaction_',
+                    'date': '2023-08-01',
+                    'online_transaction_identifier': '',
+                    'amount': 10.0,
+                    'partner_name': None,
+                },
+                {
+                    'payment_ref': 'transaction_',
+                    'date': '2023-08-01',
+                    'online_transaction_identifier': '',
+                    'amount': 10.0,
+                    'partner_name': None,
+                },
+            ]
+        )
+
+    @freeze_time('2023-08-01')
+    def test_format_transactions(self):
+        transactions_to_format = [
+            self._create_one_online_transaction(transaction_identifier='ABCD01'),
+            self._create_one_online_transaction(transaction_identifier='ABCD02'),
+        ]
+        formatted_transactions = self.account_online_account._format_transactions(transactions_to_format)
+        self.assertEqual(
+            formatted_transactions,
+            [
+                {
+                    'payment_ref': 'transaction_ABCD01',
+                    'date': fields.Date.from_string('2023-08-01'),
+                    'online_transaction_identifier': 'ABCD01',
+                    'amount': 10.0,
+                    'online_account_id': self.account_online_account.id,
+                    'journal_id': self.euro_bank_journal.id,
+                    'company_id': self.euro_bank_journal.company_id.id,
+                    'partner_name': None,
+                },
+                {
+                    'payment_ref': 'transaction_ABCD02',
+                    'date': fields.Date.from_string('2023-08-01'),
+                    'online_transaction_identifier': 'ABCD02',
+                    'amount': 10.0,
+                    'online_account_id': self.account_online_account.id,
+                    'journal_id': self.euro_bank_journal.id,
+                    'company_id': self.euro_bank_journal.company_id.id,
+                    'partner_name': None,
+                },
+            ]
+        )
+
+    @freeze_time('2023-08-01')
+    def test_format_transactions_invert_sign(self):
+        transactions_to_format = [
+            self._create_one_online_transaction(transaction_identifier='ABCD01', amount=25.0),
+        ]
+        self.account_online_account.inverse_transaction_sign = True
+        formatted_transactions = self.account_online_account._format_transactions(transactions_to_format)
+        self.assertEqual(
+            formatted_transactions,
+            [
+                {
+                    'payment_ref': 'transaction_ABCD01',
+                    'date': fields.Date.from_string('2023-08-01'),
+                    'online_transaction_identifier': 'ABCD01',
+                    'amount': -25.0,
+                    'online_account_id': self.account_online_account.id,
+                    'journal_id': self.euro_bank_journal.id,
+                    'company_id': self.euro_bank_journal.company_id.id,
+                    'partner_name': None,
+                },
+            ]
+        )
+
+    @freeze_time('2023-08-01')
+    def test_format_transactions_foreign_currency_code_to_id_with_activation(self):
+        """ This test ensures conversion of foreign currency code to foreign currency id and activates foreign currency if not already activate """
+        gbp_currency = self.env['res.currency'].with_context(active_test=False).search([('name', '=', 'GBP')])
+        egp_currency = self.env['res.currency'].with_context(active_test=False).search([('name', '=', 'EGP')])
+
+        transactions_to_format = [
+            self._create_one_online_transaction(transaction_identifier='ABCD01', foreign_currency_code='GBP'),
+            self._create_one_online_transaction(transaction_identifier='ABCD02', foreign_currency_code='EGP', amount_currency=500.0),
+        ]
+        formatted_transactions = self.account_online_account._format_transactions(transactions_to_format)
+
+        self.assertTrue(gbp_currency.active)
+        self.assertTrue(egp_currency.active)
+
+        self.assertEqual(
+            formatted_transactions,
+            [
+                {
+                    'payment_ref': 'transaction_ABCD01',
+                    'date': fields.Date.from_string('2023-08-01'),
+                    'online_transaction_identifier': 'ABCD01',
+                    'amount': 10.0,
+                    'online_account_id': self.account_online_account.id,
+                    'journal_id': self.euro_bank_journal.id,
+                    'company_id': self.euro_bank_journal.company_id.id,
+                    'partner_name': None,
+                    'foreign_currency_id': gbp_currency.id,
+                    'amount_currency': 8.0,
+                },
+                {
+                    'payment_ref': 'transaction_ABCD02',
+                    'date': fields.Date.from_string('2023-08-01'),
+                    'online_transaction_identifier': 'ABCD02',
+                    'amount': 10.0,
+                    'online_account_id': self.account_online_account.id,
+                    'journal_id': self.euro_bank_journal.id,
+                    'company_id': self.euro_bank_journal.company_id.id,
+                    'partner_name': None,
+                    'foreign_currency_id': egp_currency.id,
+                    'amount_currency': 500.0,
+                },
+            ]
+        )
+
+    @freeze_time('2023-07-25')
+    @patch('odoo.addons.odex30_account_online_sync.models.account_online.AccountOnlineLink._fetch_odoo_fin')
+    def test_retrieve_pending_transactions(self, patched_fetch_odoofin):
+        self.account_online_link.state = 'connected'
+        patched_fetch_odoofin.side_effect = [{
+            'transactions': [
+                self._create_one_online_transaction(transaction_identifier='ABCD01', date='2023-07-06'),
+                self._create_one_online_transaction(transaction_identifier='ABCD02', date='2023-07-22'),
+            ],
+            'pendings': [
+                self._create_one_online_transaction(transaction_identifier='ABCD03_pending', date='2023-07-25'),
+                self._create_one_online_transaction(transaction_identifier='ABCD04_pending', date='2023-07-25'),
+            ]
+        }]
+
+        start_date = fields.Date.from_string('2023-07-01')
+        result = self.account_online_account._retrieve_transactions(date=start_date, include_pendings=True)
+        self.assertEqual(
+            result,
+            {
+                'transactions': [
+                    {
+                        'payment_ref': 'transaction_ABCD01',
+                        'date': fields.Date.from_string('2023-07-06'),
+                        'online_transaction_identifier': 'ABCD01',
+                        'amount': 10.0,
+                        'partner_name': None,
+                        'online_account_id': self.account_online_account.id,
+                        'journal_id': self.euro_bank_journal.id,
+                        'company_id': self.euro_bank_journal.company_id.id,
+                    },
+                    {
+                        'payment_ref': 'transaction_ABCD02',
+                        'date': fields.Date.from_string('2023-07-22'),
+                        'online_transaction_identifier': 'ABCD02',
+                        'amount': 10.0,
+                        'partner_name': None,
+                        'online_account_id': self.account_online_account.id,
+                        'journal_id': self.euro_bank_journal.id,
+                        'company_id': self.euro_bank_journal.company_id.id,
+                    }
+                ],
+                'pendings': [
+                    {
+                        'payment_ref': 'transaction_ABCD03_pending',
+                        'date': fields.Date.from_string('2023-07-25'),
+                        'online_transaction_identifier': 'ABCD03_pending',
+                        'amount': 10.0,
+                        'partner_name': None,
+                        'online_account_id': self.account_online_account.id,
+                        'journal_id': self.euro_bank_journal.id,
+                        'company_id': self.euro_bank_journal.company_id.id,
+                    },
+                    {
+                        'payment_ref': 'transaction_ABCD04_pending',
+                        'date': fields.Date.from_string('2023-07-25'),
+                        'online_transaction_identifier': 'ABCD04_pending',
+                        'amount': 10.0,
+                        'partner_name': None,
+                        'online_account_id': self.account_online_account.id,
+                        'journal_id': self.euro_bank_journal.id,
+                        'company_id': self.euro_bank_journal.company_id.id,
+                    }
+                ]
+            }
+        )
+
+    @freeze_time('2023-01-01 01:10:15')
+    @patch('odoo.addons.odex30_account_online_sync.models.account_online.AccountOnlineAccount._retrieve_transactions', return_value={})
+    @patch('odoo.addons.odex30_account_online_sync.models.account_online.AccountOnlineAccount._refresh', return_value={'success': True, 'data': {}})
+    def test_basic_flow_manual_fetching_transactions(self, patched_refresh, patched_transactions):
+        self.addCleanup(self.env.registry.leave_test_mode)
+        # flush and clear everything for the new "transaction"
+        self.env.invalidate_all()
+
+        self.env.registry.enter_test_mode(self.cr)
+        with self.env.registry.cursor() as test_cr:
+            test_env = self.env(cr=test_cr)
+            test_link_account = self.account_online_link.with_env(test_env)
+            test_link_account.state = 'connected'
+            # Call fetch_transaction in manual mode and check that a call was made to refresh and to transaction
+            test_link_account._fetch_transactions()
+            patched_refresh.assert_called_once()
+            patched_transactions.assert_called_once()
+            self.assertEqual(test_link_account.account_online_account_ids[0].fetching_status, 'done')
+
+    @freeze_time('2023-01-01 01:10:15')
+    @patch('odoo.addons.odex30_account_online_sync.models.account_online.AccountOnlineAccount._retrieve_transactions', return_value={})
+    @patch('odoo.addons.odex30_account_online_sync.models.account_online.AccountOnlineLink._fetch_odoo_fin')
+    def test_refresh_incomplete_fetching_transactions(self, patched_refresh, patched_transactions):
+        patched_refresh.return_value = {'success': False}
+        # Call fetch_transaction and if call result is false, don't call transaction
+        self.account_online_link._fetch_transactions()
+        patched_transactions.assert_not_called()
+
+        patched_refresh.return_value = {'success': False, 'currently_fetching': True}
+        # Call fetch_transaction and if call result is false but in the process of fetching, don't call transaction
+        # and wait for the async cron to try again
+        self.account_online_link._fetch_transactions()
+        patched_transactions.assert_not_called()
+        self.assertEqual(self.account_online_account.fetching_status, 'waiting')
+
+    @freeze_time('2023-01-01 01:10:15')
+    @patch('odoo.addons.odex30_account_online_sync.models.account_online.AccountOnlineAccount._retrieve_transactions', return_value={})
+    @patch('odoo.addons.odex30_account_online_sync.models.account_online.AccountOnlineAccount._refresh', return_value={'success': True, 'data': {}})
+    def test_currently_processing_fetching_transactions(self, patched_refresh, patched_transactions):
+        self.account_online_account.fetching_status = 'processing'  # simulate the fact that we are currently creating entries in odoo
+        limit_time = tools.config['limit_time_real_cron'] if tools.config['limit_time_real_cron'] > 0 else tools.config['limit_time_real']
+        self.account_online_link.last_refresh = datetime.now()
+        with freeze_time(datetime.now() + timedelta(seconds=(limit_time - 10))):
+            # Call to fetch_transaction should be skipped, and the cron should not try to fetch either
+            self.account_online_link._fetch_transactions()
+            self.euro_bank_journal._cron_fetch_waiting_online_transactions()
+            patched_refresh.assert_not_called()
+            patched_transactions.assert_not_called()
+
+        self.addCleanup(self.env.registry.leave_test_mode)
+        # flush and clear everything for the new "transaction"
+        self.env.invalidate_all()
+
+        self.env.registry.enter_test_mode(self.cr)
+        with self.env.registry.cursor() as test_cr:
+            test_env = self.env(cr=test_cr)
+            with freeze_time(datetime.now() + timedelta(seconds=(limit_time + 100))):
+                # Call to fetch_transaction should be started by the cron when the time limit is exceeded and still in processing
+                self.euro_bank_journal.with_env(test_env)._cron_fetch_waiting_online_transactions()
+                patched_refresh.assert_not_called()
+                patched_transactions.assert_called_once()
+
+    @patch('odoo.addons.odex30_account_online_sync.models.account_online.requests')
+    def test_delete_with_redirect_error(self, patched_request):
+        # Use case being tested: call delete on a record, first call returns token expired exception
+        # Which trigger a call to get a new token, which result in a 104 user_deleted_error, since version 17,
+        # such error are returned as a OdooFinRedirectException with mode link to reopen the iframe and link with a new
+        # bank. In our case we don't want that and want to be able to delete the record instead.
+        # Such use case happen when db_uuid has changed as the check for db_uuid is done after the check for token_validity
+        account_online_link = self.env['account.online.link'].create({
+            'name': 'Test Delete',
+            'client_id': 'client_id_test',
+            'refresh_token': 'refresh_token',
+            'access_token': 'access_token',
+        })
+        first_call = self._mock_odoofin_error_response(code=102)
+        second_call = self._mock_odoofin_error_response(code=300, data={'mode': 'link'})
+        patched_request.post.side_effect = [first_call, second_call]
+        nb_connections = len(self.env['account.online.link'].search([]))
+        # Try to delete record
+        account_online_link.unlink()
+        # Record should be deleted
+        self.assertEqual(len(self.env['account.online.link'].search([])), nb_connections - 1)
+
+    @patch('odoo.addons.odex30_account_online_sync.models.account_online.requests')
+    def test_redirect_mode_link(self, patched_request):
+        # Use case being tested: Call to open the iframe which result in a OdoofinRedirectException in link mode
+        # This should not trigger a traceback but delete the current online.link and reopen the iframe
+        account_online_link = self.env['account.online.link'].create({
+            'name': 'Test Delete',
+            'client_id': 'client_id_test',
+            'refresh_token': 'refresh_token',
+            'access_token': 'access_token',
+        })
+        link_id = account_online_link.id
+        first_call = self._mock_odoofin_error_response(code=300, data={'mode': 'link'})
+        second_call = self._mock_odoofin_response(data={'delete': True})
+        patched_request.post.side_effect = [first_call, second_call]
+        # Try to open iframe with broken connection
+        action = account_online_link.action_new_synchronization()
+        # Iframe should open in mode link and with a different record (old one should have been deleted)
+        self.assertEqual(action['params']['mode'], 'link')
+        self.assertNotEqual(action['id'], link_id)
+        self.assertEqual(len(self.env['account.online.link'].search([('id', '=', link_id)])), 0)
+
+    @patch("odoo.addons.odex30_account_online_sync.models.account_online.AccountOnlineLink._update_connection_status", return_value={})
+    def test_assign_journal_with_currency_on_account_online_account(self, patched_update_connection_status):
+        self.env['account.move'].create([
+            {
+                'move_type': 'entry',
+                'date': fields.Date.from_string('2025-06-25'),
+                'journal_id': self.bank_journal.id,
+                'invoice_line_ids': [
+                    Command.create({
+                        'name': 'a line',
+                        'account_id': self.bank_account_id.id,
+                        'debit': 100,
+                        'currency_id': self.company_data['currency'].id,
+                    }),
+                    Command.create({
+                        'name': 'another line',
+                        'account_id': self.company_data['default_account_expense'].id,
+                        'credit': 100,
+                        'currency_id': self.company_data['currency'].id,
+                    }),
+                ],
+            },
+            {
+                'move_type': 'entry',
+                'date': fields.Date.from_string('2025-06-26'),
+                'journal_id': self.bank_journal.id,
+                'invoice_line_ids': [
+                    Command.create({
+                        'name': 'a line',
+                        'account_id': self.bank_account_id.id,
+                        'debit': 220,
+                        'currency_id': self.company_data['currency'].id,
+                    }),
+                    Command.create({
+                        'name': 'another line',
+                        'account_id': self.company_data['default_account_expense'].id,
+                        'credit': 220,
+                        'currency_id': self.company_data['currency'].id,
+                    }),
+                ],
+            },
+        ])
+
+        self.account_online_account.currency_id = self.company_data['currency'].id
+        self.account_online_account.with_context(active_id=self.bank_journal.id, active_model='account.journal')._assign_journal()
+        self.assertEqual(
+            self.bank_journal.currency_id.id,
+            self.company_data['currency'].id,
+        )
+        self.assertEqual(
+            self.bank_journal.default_account_id.currency_id.id,
+            self.company_data['currency'].id,
+        )
+
+    @patch("odoo.addons.odex30_account_online_sync.models.account_online.AccountOnlineLink._update_connection_status", return_value={})
+    def test_set_currency_on_journal_when_existing_currencies_on_move_lines(self, patched_update_connection_status):
+        bank_account_id = self.env['account.account'].create({
+            'name': 'Bank Account',
+            'account_type': 'asset_cash',
+            'code': self.env['account.account']._search_new_account_code('BNK100'),
+        })
+        bank_journal = self.env['account.journal'].create({
+            'name': 'A bank journal',
+            'default_account_id': bank_account_id.id,
+            'type': 'bank',
+            'code': self.env['account.journal'].get_next_bank_cash_default_code('bank', self.company_data['company']),
+        })
+
+        self.env['account.move'].create([
+            {
+                'move_type': 'entry',
+                'date': fields.Date.from_string('2025-06-25'),
+                'journal_id': bank_journal.id,
+                'invoice_line_ids': [
+                    Command.create({
+                        'name': 'a line',
+                        'account_id': bank_account_id.id,
+                        'debit': 100,
+                        'currency_id': self.other_currency.id,
+                    }),
+                    Command.create({
+                        'name': 'another line',
+                        'account_id': self.company_data['default_account_expense'].id,
+                        'credit': 100,
+                        'currency_id': self.other_currency.id,
+                    }),
+                ],
+            },
+            {
+                'move_type': 'entry',
+                'date': fields.Date.from_string('2025-06-26'),
+                'journal_id': bank_journal.id,
+                'invoice_line_ids': [
+                    Command.create({
+                        'name': 'a line',
+                        'account_id': bank_account_id.id,
+                        'debit': 220,
+                        'currency_id': self.company_data['currency'].id,
+                    }),
+                    Command.create({
+                        'name': 'another line',
+                        'account_id': self.company_data['default_account_expense'].id,
+                        'credit': 220,
+                        'currency_id': self.company_data['currency'].id,
+                    }),
+                ],
+            },
+        ])
+
+        self.account_online_account.currency_id = self.company_data['currency'].id
+        self.account_online_account.with_context(active_id=bank_journal.id, active_model='account.journal')._assign_journal()
+
+        # Silently ignore the error and don't set currency on the journal and on the account
+        self.assertEqual(bank_journal.currency_id.id, False)
+        self.assertEqual(bank_journal.default_account_id.currency_id.id, False)
diff --git a/dev_odex30_accounting/odex30_account_online_sync/tests/test_online_sync_branch_companies.py b/dev_odex30_accounting/odex30_account_online_sync/tests/test_online_sync_branch_companies.py
new file mode 100644
index 0000000..16cb0ef
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_online_sync/tests/test_online_sync_branch_companies.py
@@ -0,0 +1,86 @@
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+from odoo.addons.odex30_account_online_sync.tests.common import AccountOnlineSynchronizationCommon
+from odoo.tests import tagged
+
+
+@tagged('post_install', '-at_install')
+class TestSynchInBranches(AccountOnlineSynchronizationCommon):
+
+    @classmethod
+    def setUpClass(cls):
+        super().setUpClass()
+
+        cls.mother_company = cls.env['res.company'].create({'name': 'Mother company 2000'})
+        cls.branch_company = cls.env['res.company'].create({'name': 'Branch company', 'parent_id': cls.mother_company.id})
+
+        cls.mother_bank_journal = cls.env['account.journal'].create({
+            'name': 'Mother Bank Journal',
+            'type': 'bank',
+            'code': 'MBJ',
+            'company_id': cls.mother_company.id,
+        })
+        cls.mother_account_online_link = cls.env['account.online.link'].create({
+            'name': 'Test Bank',
+            'client_id': 'client_id_1',
+            'refresh_token': 'refresh_token',
+            'access_token': 'access_token',
+            'company_id': cls.mother_company.id,
+        })
+
+    def test_show_sync_actions(self):
+        """We test if the sync actions are correctly displayed based on the selected and enabled companies.
+
+        Let's have company A with an online link, and a branch of that company: company B.
+
+        - If we only have company A enabled and selected, the sync actions should be shown.
+        - If company A and B are enabled, no matter which company is selected, the sync actions should be shown.
+        - If we only have company B enabled and selected, the sync actions should be hidden.
+        """
+        self.assertTrue(
+            self.mother_account_online_link
+                .with_context(allowed_company_ids=(self.mother_company)._ids)
+                .with_company(self.mother_company)
+                .show_sync_actions
+        )
+
+        self.assertTrue(
+            self.mother_account_online_link
+                .with_context(allowed_company_ids=(self.branch_company + self.mother_company)._ids)
+                .with_company(self.mother_company)
+                .show_sync_actions
+        )
+
+        self.assertTrue(
+            self.mother_account_online_link
+                .with_context(allowed_company_ids=(self.branch_company + self.mother_company)._ids)
+                .with_company(self.branch_company)
+                .show_sync_actions
+        )
+
+        self.assertFalse(
+            self.mother_account_online_link
+                .with_context(allowed_company_ids=(self.branch_company)._ids)
+                .with_company(self.branch_company)
+                .show_sync_actions
+        )
+
+    def test_show_bank_connect(self):
+        """We test if the 'connect' bank button appears on the journal on the dashboard given the selected company.
+
+        Let's have company A with an bank journal, and a branch of that company: company B.
+
+        - On the dashboard of company A, the connect bank button should appear on the journal.
+        - On the dashboard of company B, the connect bank button should not appear on the journal, even with company A enabled.
+        """
+        dashboard_data = self.mother_bank_journal\
+            .with_context(allowed_company_ids=(self.mother_company)._ids)\
+            .with_company(self.mother_company)\
+            ._get_journal_dashboard_data_batched()
+        self.assertTrue(dashboard_data[self.mother_bank_journal.id].get('display_connect_bank_in_dashboard'))
+
+        dashboard_data = self.mother_bank_journal\
+            .with_context(allowed_company_ids=(self.branch_company + self.mother_company)._ids)\
+            .with_company(self.branch_company)\
+            ._get_journal_dashboard_data_batched()
+        self.assertFalse(dashboard_data[self.mother_bank_journal.id].get('display_connect_bank_in_dashboard'))
diff --git a/dev_odex30_accounting/odex30_account_online_sync/tests/test_online_sync_creation_statement.py b/dev_odex30_accounting/odex30_account_online_sync/tests/test_online_sync_creation_statement.py
new file mode 100644
index 0000000..a68e1da
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_online_sync/tests/test_online_sync_creation_statement.py
@@ -0,0 +1,374 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+from unittest.mock import MagicMock, patch
+
+from odoo.addons.base.models.res_bank import sanitize_account_number
+from odoo.addons.odex30_account_online_sync.tests.common import AccountOnlineSynchronizationCommon
+from odoo.exceptions import RedirectWarning
+from odoo.tests import tagged
+from odoo import fields, Command
+
+
+@tagged('post_install', '-at_install')
+class TestSynchStatementCreation(AccountOnlineSynchronizationCommon):
+
+    @classmethod
+    def setUpClass(cls):
+        super().setUpClass()
+
+        cls.account = cls.env['account.account'].create({
+            'name': 'Fixed Asset Account',
+            'code': 'AA',
+            'account_type': 'asset_fixed',
+        })
+
+    def reconcile_st_lines(self, st_lines):
+        for line in st_lines:
+            wizard = self.env['bank.rec.widget'].with_context(default_st_line_id=line.id).new({})
+            line = wizard.line_ids.filtered(lambda x: x.flag == 'auto_balance')
+            wizard._js_action_mount_line_in_edit(line.index)
+            line.name = "toto"
+            wizard._line_value_changed_name(line)
+            line.account_id = self.account
+            wizard._line_value_changed_account_id(line)
+            wizard._action_validate()
+
+    # Tests
+    def test_creation_initial_sync_statement(self):
+        transactions = self._create_online_transactions(['2016-01-01', '2016-01-03'])
+        self.account_online_account.balance = 1000
+        self.BankStatementLine._online_sync_bank_statement(transactions, self.account_online_account)
+        # Since ending balance is 1000$ and we only have 20$ of transactions and that it is the first statement
+        # it should create a statement before this one with the initial statement line
+        created_st_lines = self.BankStatementLine.search([('journal_id', '=', self.euro_bank_journal.id)], order='internal_index asc')
+        self.assertEqual(len(created_st_lines), 3, 'Should have created an initial bank statement line and two for the synchronization')
+        transactions = self._create_online_transactions(['2016-01-05'])
+        self.account_online_account.balance = 2000
+        self.BankStatementLine._online_sync_bank_statement(transactions, self.account_online_account)
+        created_st_lines = self.BankStatementLine.search([('journal_id', '=', self.euro_bank_journal.id)], order='internal_index asc')
+        self.assertRecordValues(
+            created_st_lines,
+            [
+                {'date': fields.Date.from_string('2016-01-01'), 'amount': 980.0},
+                {'date': fields.Date.from_string('2016-01-01'), 'amount': 10.0},
+                {'date': fields.Date.from_string('2016-01-03'), 'amount': 10.0},
+                {'date': fields.Date.from_string('2016-01-05'), 'amount': 10.0},
+            ]
+        )
+
+    def test_creation_initial_sync_statement_bis(self):
+        transactions = self._create_online_transactions(['2016-01-01', '2016-01-03'])
+        self.account_online_account.balance = 20
+        self.BankStatementLine._online_sync_bank_statement(transactions, self.account_online_account)
+        # Since ending balance is 20$ and we only have 20$ of transactions and that it is the first statement
+        # it should NOT create a initial statement before this one
+        created_st_lines = self.BankStatementLine.search([('journal_id', '=', self.euro_bank_journal.id)], order='internal_index asc')
+        self.assertRecordValues(
+            created_st_lines,
+            [
+                {'date': fields.Date.from_string('2016-01-01'), 'amount': 10.0},
+                {'date': fields.Date.from_string('2016-01-03'), 'amount': 10.0},
+            ]
+        )
+
+    def test_creation_initial_sync_statement_invert_sign(self):
+        self.account_online_account.balance = -20
+        self.account_online_account.inverse_transaction_sign = True
+        self.account_online_account.inverse_balance_sign = True
+        transactions = self._create_online_transactions(['2016-01-01', '2016-01-03'])
+        self.BankStatementLine._online_sync_bank_statement(transactions, self.account_online_account)
+        # Since ending balance is 1000$ and we only have 20$ of transactions and that it is the first statement
+        # it should create a statement before this one with the initial statement line
+        created_st_lines = self.BankStatementLine.search([('journal_id', '=', self.euro_bank_journal.id)], order='internal_index asc')
+        self.assertEqual(len(created_st_lines), 2, 'Should have created two bank statement lines for the synchronization')
+        transactions = self._create_online_transactions(['2016-01-05'])
+        self.account_online_account.balance = -30
+        self.BankStatementLine._online_sync_bank_statement(transactions, self.account_online_account)
+        created_st_lines = self.BankStatementLine.search([('journal_id', '=', self.euro_bank_journal.id)], order='internal_index asc')
+        self.assertRecordValues(
+            created_st_lines,
+            [
+                {'date': fields.Date.from_string('2016-01-01'), 'amount': -10.0},
+                {'date': fields.Date.from_string('2016-01-03'), 'amount': -10.0},
+                {'date': fields.Date.from_string('2016-01-05'), 'amount': -10.0},
+            ]
+        )
+
+    @patch('odoo.addons.odex30_account_online_sync.models.account_online.AccountOnlineLink._fetch_transactions')
+    @patch('odoo.addons.odex30_account_online_sync.models.account_online.AccountOnlineLink._update_connection_status')
+    def test_automatic_journal_assignment(self, patched_update_connection_status, patched_fetch_transactions):
+        def create_online_account(name, link_id, iban, currency_id):
+            return self.env['account.online.account'].create({
+                'name': name,
+                'account_online_link_id': link_id,
+                'account_number': iban,
+                'currency_id' : currency_id,
+            })
+
+        def create_bank_account(account_number, partner_id):
+            return self.env['res.partner.bank'].create({
+                'acc_number': account_number,
+                'partner_id': partner_id,
+            })
+
+        def create_journal(name, journal_type, code, currency_id=False, bank_account_id=False):
+            return self.env['account.journal'].create({
+                'name': name,
+                'type': journal_type,
+                'code': code,
+                'currency_id': currency_id,
+                'bank_account_id': bank_account_id,
+            })
+
+        bank_account_1 = create_bank_account('BE48485444456727', self.company_data['company'].partner_id.id)
+        bank_account_2 = create_bank_account('BE23798242487491', self.company_data['company'].partner_id.id)
+
+        bank_journal_with_account_gol = create_journal('Bank with account', 'bank', 'BJWA1', self.other_currency.id)
+        bank_journal_with_account_usd = create_journal('Bank with account USD', 'bank', 'BJWA3', self.env.ref('base.USD').id, bank_account_2.id)
+
+        online_account_1 = create_online_account('OnlineAccount1', self.account_online_link.id, 'BE48485444456727', self.other_currency.id)
+        online_account_2 = create_online_account('OnlineAccount2', self.account_online_link.id, 'BE61954856342317', self.other_currency.id)
+        online_account_3 = create_online_account('OnlineAccount3', self.account_online_link.id, 'BE23798242487495', self.other_currency.id)
+
+        patched_fetch_transactions.return_value = True
+        patched_update_connection_status.return_value = {
+            'consent_expiring_date': None,
+            'is_payment_enabled': False,
+            'is_payment_activated': False,
+        }
+
+        account_link_journal_wizard = self.env['account.bank.selection'].create({'account_online_link_id': self.account_online_link.id})
+        account_link_journal_wizard.with_context(active_model='account.journal', active_id=bank_journal_with_account_gol.id).sync_now()
+        self.assertEqual(
+            online_account_1.id, bank_journal_with_account_gol.account_online_account_id.id,
+            "The wizard should have linked the online account to the journal with the same account."
+        )
+        self.assertEqual(bank_journal_with_account_gol.bank_account_id, bank_account_1, "Account should be set on the journal")
+
+        # Test with no context present, should create a new journal
+        previous_number = self.env['account.journal'].search_count([])
+        account_link_journal_wizard.selected_account = online_account_2
+        account_link_journal_wizard.sync_now()
+        actual_number = self.env['account.journal'].search_count([])
+        self.assertEqual(actual_number, previous_number+1, "should have created a new journal")
+        self.assertEqual(online_account_2.journal_ids.currency_id, self.other_currency)
+        self.assertEqual(online_account_2.journal_ids.bank_account_id.sanitized_acc_number, sanitize_account_number('BE61954856342317'))
+
+        # Test assigning to a journal in another currency
+        account_link_journal_wizard.selected_account = online_account_3
+        account_link_journal_wizard.with_context(active_model='account.journal', active_id=bank_journal_with_account_usd.id).sync_now()
+        self.assertEqual(online_account_3.id, bank_journal_with_account_usd.account_online_account_id.id)
+        self.assertEqual(bank_journal_with_account_usd.bank_account_id, bank_account_2, "Bank Account should not have changed")
+        self.assertEqual(bank_journal_with_account_usd.currency_id, self.other_currency, "Currency should have changed")
+
+    @patch('odoo.addons.odex30_account_online_sync.models.account_online.AccountOnlineLink._fetch_odoo_fin')
+    def test_fetch_transaction_date_start(self, patched_fetch):
+        """ This test verifies that the start_date params used when fetching transaction is correct """
+        patched_fetch.return_value = {'transactions': []}
+        # Since no transactions exists in db, we should fetch transactions without a starting_date
+        self.account_online_account._retrieve_transactions()
+        data = {
+            'start_date': False,
+            'account_id': False,
+            'last_transaction_identifier': False,
+            'currency_code': 'EUR',
+            'provider_data': False,
+            'account_data': False,
+            'include_pendings': False,
+            'include_foreign_currency': True,
+        }
+        patched_fetch.assert_called_with('/proxy/v1/transactions', data=data)
+
+        # No transaction exists in db but we have a value for last_sync on the online_account, we should use that date
+        self.account_online_account.last_sync = '2020-03-04'
+        data['start_date'] = '2020-03-04'
+        self.account_online_account._retrieve_transactions()
+        patched_fetch.assert_called_with('/proxy/v1/transactions', data=data)
+
+        # We have transactions, we should use the date of the latest one instead of the last_sync date
+        transactions = self._create_online_transactions(['2016-01-01', '2016-01-03'])
+        self.BankStatementLine._online_sync_bank_statement(transactions, self.account_online_account)
+        self.account_online_account.last_sync = '2020-03-04'
+        data['start_date'] = '2016-01-03'
+        data['last_transaction_identifier'] = '2'
+        self.account_online_account._retrieve_transactions()
+        patched_fetch.assert_called_with('/proxy/v1/transactions', data=data)
+
+    def test_multiple_transaction_identifier_fetched(self):
+        # Ensure that if we receive twice the same transaction within the same call, it won't be created twice
+        transactions = self._create_online_transactions(['2016-01-01', '2016-01-03'])
+        # Add first transactions to the list again
+        transactions.append(transactions[0])
+        self.BankStatementLine._online_sync_bank_statement(transactions, self.account_online_account)
+        bnk_stmt_lines = self.BankStatementLine.search([('online_transaction_identifier', '!=', False), ('journal_id', '=', self.euro_bank_journal.id)])
+        self.assertEqual(len(bnk_stmt_lines), 2, 'Should only have created two lines')
+
+    @patch('odoo.addons.odex30_account_online_sync.models.account_online.AccountOnlineLink._fetch_odoo_fin')
+    def test_fetch_transactions_reauth(self, patched_refresh):
+        patched_refresh.side_effect = [
+            {
+                'success': False,
+                'code': 300,
+                'data': {'mode': 'updateCredentials'},
+            },
+            {
+                'access_token': 'open_sesame',
+            },
+        ]
+        self.account_online_account.account_online_link_id.state = 'connected'
+        res = self.account_online_account.account_online_link_id._fetch_transactions()
+        self.assertTrue('account_online_identifier' in res.get('params', {}).get('includeParam', {}))
+
+    def test_duplicate_transaction_date_amount_account(self):
+        """ This test verifies that the duplicate transaction wizard is detects transactions with
+            same date, amount, account_number and currency
+        """
+        # Create 2 groups of respectively 2 and 3 duplicate transactions. We create one transaction the day before so the opening statement does not interfere with the test.
+        transactions = self._create_online_transactions([
+            '2024-01-01',
+            '2024-01-02', '2024-01-02',
+            '2024-01-03', '2024-01-03', '2024-01-03',
+        ])
+        bsls = self.BankStatementLine._online_sync_bank_statement(transactions, self.account_online_account)
+        self.env.flush_all()  # _get_duplicate_transactions make sql request, must write to db
+        duplicate_transactions = self.euro_bank_journal._get_duplicate_transactions(
+            fields.Date.to_date('2000-01-01')
+        )
+        group_1 = bsls.filtered(lambda bsl: bsl.date == fields.Date.from_string('2024-01-02')).ids
+        group_2 = bsls.filtered(lambda bsl: bsl.date == fields.Date.from_string('2024-01-03')).ids
+
+        self.assertEqual(duplicate_transactions, [group_1, group_2])
+
+        # check has_duplicate_transactions
+        has_duplicate_transactions = self.euro_bank_journal._has_duplicate_transactions(
+            fields.Date.to_date('2000-01-01')
+        )
+        self.assertTrue(has_duplicate_transactions is True)  # explicit check on bool type
+
+    def test_duplicate_transaction_online_transaction_identifier(self):
+        """ This test verifies that the duplicate transaction wizard is detects transactions with
+            same online_transaction_identifier
+        """
+        # Create transactions
+        transactions = self._create_online_transactions([
+            '2024-01-01', '2024-01-02', '2024-01-03', '2024-01-04', '2024-01-05'
+        ])
+        bsls = self.BankStatementLine._online_sync_bank_statement(transactions, self.account_online_account)
+
+        group_1, group_2 = [], []
+        for bsl in bsls:
+            # have to update the online_transaction_identifier after to force duplicates
+            if bsl.payment_ref in ('transaction_1', 'transaction_2'):
+                group_1.append(bsl.id)
+                bsl.online_transaction_identifier = 'same_oti_1'
+            if bsl.payment_ref in ('transaction_3, transaction_4, transaction_5'):
+                group_2.append(bsl.id)
+                bsl.online_transaction_identifier = 'same_oti_2'
+
+        self.env.flush_all()  # _get_duplicate_transactions make sql request, must write to db
+        duplicate_transactions = self.euro_bank_journal._get_duplicate_transactions(
+            fields.Date.to_date('2000-01-01')
+        )
+        self.assertEqual(duplicate_transactions, [group_1, group_2])
+
+    @patch('odoo.addons.odex30_account_online_sync.models.account_online.requests')
+    def test_fetch_receive_error_message(self, patched_request):
+        # We want to test that when we receive an error, a redirectWarning with the correct parameter is thrown
+        # However the method _log_information that we need to test for that is performing a rollback as it needs
+        # to save the message error on the record as well (so it rollback, save message, commit, raise error).
+        # So in order to test the method, we need to use a "test cursor".
+        mock_response = MagicMock()
+        mock_response.status_code = 200
+        mock_response.json.return_value = {
+            'error': {
+                'code': 400,
+                'message': 'Shit Happened',
+                'data': {
+                    'exception_type': 'random',
+                    'message': 'This kind of things can happen.',
+                    'error_reference': 'abc123',
+                    'provider_type': 'theonlyone',
+                    'redirect_warning_url': 'odoo_support',
+                },
+            },
+        }
+        patched_request.post.return_value = mock_response
+
+        generated_url = 'https://www.odoo.com/help?stage=bank_sync&summary=Bank+sync+error+ref%3A+abc123+-+Provider%3A+theonlyone+-+Client+ID%3A+client_id_1&description=ClientID%3A+client_id_1%0AInstitution%3A+Test+Bank%0AError+Reference%3A+abc123%0AError+Message%3A+This+kind+of+things+can+happen.%0A'
+        return_act_url = {
+            'type': 'ir.actions.act_url',
+            'url': generated_url
+        }
+        body_generated_url = generated_url.replace('&', '&amp;') #in post_message, & has been escaped to &amp;
+        message_body = f"""<p>This kind of things can happen.
+
+If you've already opened a ticket for this issue, don't report it again: a support agent will contact you shortly.<br>You can contact Odoo support <a href=\"{body_generated_url}\">Here</a></p>"""
+
+        # flush and clear everything for the new "transaction"
+        self.env.invalidate_all()
+        try:
+            self.env.registry.enter_test_mode(self.cr)
+            with self.env.registry.cursor() as test_cr:
+                test_env = self.env(cr=test_cr)
+                test_link_account = self.account_online_link.with_env(test_env)
+                test_link_account.state = 'connected'
+
+                # this hand-written self.assertRaises() does not roll back self.cr,
+                # which is necessary below to inspect the message being posted
+                try:
+                    test_link_account._fetch_odoo_fin('/testthisurl')
+                except RedirectWarning as exception:
+                    self.assertEqual(exception.args[0], "This kind of things can happen.\n\nIf you've already opened a ticket for this issue, don't report it again: a support agent will contact you shortly.")
+                    self.assertEqual(exception.args[1], return_act_url)
+                    self.assertEqual(exception.args[2], 'Report issue')
+                else:
+                    self.fail("Expected RedirectWarning not raised")
+                self.assertEqual(test_link_account.message_ids[0].body, message_body)
+        finally:
+            self.env.registry.leave_test_mode()
+
+    def test_account_online_link_having_journal_ids(self):
+        """ This test verifies that the account online link object
+            has all the journal in the field journal_ids.
+            It's important to handle these journals because we need
+            them to add the consent expiring date.
+        """
+        # Create a bank sync connection having 2 online accounts (with one journal connected for each account)
+        online_link = self.env['account.online.link'].create({
+            'name': 'My New Bank connection',
+        })
+        online_accounts = self.env['account.online.account'].create([
+            {
+                'name': 'Account 1',
+                'account_online_link_id': online_link.id,
+                'journal_ids': [Command.create({
+                    'name': 'Account 1',
+                    'code': 'BK1',
+                    'type': 'bank',
+                })],
+            },
+            {
+                'name': 'Account 2',
+                'account_online_link_id': online_link.id,
+                'journal_ids': [Command.create({
+                    'name': 'Account 2',
+                    'code': 'BK2',
+                    'type': 'bank',
+                })],
+            },
+        ])
+        self.assertEqual(online_link.account_online_account_ids, online_accounts)
+        self.assertEqual(len(online_link.journal_ids), 2)  # Our online link connections should have 2 journals.
+
+    def test_transaction_details_json_compatibility_from_html(self):
+        """ This test checks that, after being imported from the transient model
+            the records of account.bank.statement.line will have the
+            'transaction_details' field able to be decoded to a JSON,
+            i.e. it is not encapsulated in <p> </p> tags.
+        """
+        transaction = self._create_one_online_transaction()
+        transaction['transaction_details'] = '{\n    "account_id": "1",\n    "status": "posted"\n}'
+        transient_transaction = self.env['account.bank.statement.line.transient'].create(transaction)
+        transaction_details = transient_transaction.read(fields=['transaction_details'], load=None)[0]['transaction_details']
+        self.assertFalse(transaction_details.startswith('<p>'), 'Transient transaction details should not start with <p> when read.')
+        self.assertFalse(transaction_details.endswith('</p>'), 'Transient transaction details should not end with </p> when read.')
diff --git a/dev_odex30_accounting/odex30_account_online_sync/views/account_bank_statement_view.xml b/dev_odex30_accounting/odex30_account_online_sync/views/account_bank_statement_view.xml
new file mode 100644
index 0000000..678dc78
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_online_sync/views/account_bank_statement_view.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <data>
+        <record id="view_bank_statement_line_tree_inherit" model="ir.ui.view">
+            <field name="name">bank.statement.line.list.inherit</field>
+            <field name="model">account.bank.statement.line</field>
+            <field name="inherit_id" ref="odex30_account_accountant.view_bank_statement_line_tree_bank_rec_widget"/>
+            <field name="arch" type="xml">
+                <xpath expr="//field[@name='account_number']" position="after">
+                    <field name="online_transaction_identifier" optional="hide"/>
+                    <field name="online_account_id" optional="hide"/>
+                    <field name="online_link_id" optional="hide"/>
+                </xpath>
+            </field>
+        </record>
+
+        <record id="view_bank_statement_line_form_bank_rec_widget_inherit" model="ir.ui.view">
+            <field name="name">account.bank.statement.line.form.bank_rec_widget.inherit</field>
+            <field name="model">account.bank.statement.line</field>
+            <field name="mode">primary</field>
+            <field name="inherit_id" ref="odex30_account_accountant.view_bank_statement_line_form_bank_rec_widget"/>
+            <field name="arch" type="xml">
+                <xpath expr="//footer" position="replace"/>
+            </field>
+        </record>
+    </data>
+</odoo>
diff --git a/dev_odex30_accounting/odex30_account_online_sync/views/account_journal_dashboard_view.xml b/dev_odex30_accounting/odex30_account_online_sync/views/account_journal_dashboard_view.xml
new file mode 100644
index 0000000..ebe51e5
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_online_sync/views/account_journal_dashboard_view.xml
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <data>
+        <record id="account_journal_dashboard_inherit_online_sync" model="ir.ui.view">
+            <field name="name">account.journal.dashboard.inherit.online.sync</field>
+            <field name="model">account.journal</field>
+            <field name="inherit_id" ref="account.account_journal_dashboard_kanban_view"/>
+            <field name="arch" type="xml">
+                <field name="kanban_dashboard" position="after">
+                    <field name="expiring_synchronization_date"/>
+                    <field name="expiring_synchronization_due_day"/>
+                    <field name="next_link_synchronization"/>
+                    <field name="account_online_account_id"/>
+                    <field name="account_online_link_state"/>
+                    <field name="online_sync_fetching_status"/>
+                </field>
+
+                <xpath expr="//t[@t-set='bank_unconfigured']" position="attributes">
+                    <attribute name="t-value" add="!record.account_online_account_id.raw_value" separator=" and "/>
+                </xpath>
+
+                <xpath expr="//t[@name='empty_journal_helper']/span[@t-if=&quot;journal_type == &apos;bank&apos;&quot;]" position="attributes">
+                    <attribute name="t-if" add="!record.account_online_account_id.raw_value" separator=" and "/>
+                </xpath>
+
+                <xpath expr="//button[@name='action_configure_bank_journal']" position="attributes">
+                    <attribute name="t-if" add="dashboard.display_connect_bank_in_dashboard" separator=" and "/>
+                </xpath>
+
+                <xpath expr='//div[@id="dashboard_bank_cash_left"]' position='inside'>
+                    <div t-if="dashboard.bank_statements_source === 'online_sync' and dashboard.show_sync_actions">
+                        <t t-if="record.account_online_link_state.raw_value === 'connected' and record.account_online_account_id">
+                            <widget name="refresh_spin_widget" groups="account.group_account_manager"/>
+                            <span invisible="not expiring_synchronization_date" groups="account.group_account_manager">
+                                <widget name="connected_until_widget"/>
+                            </span>
+                        </t>
+                        <t t-elif="record.account_online_link_state.raw_value == 'error' || (record.expiring_synchronization_date.raw_value &amp;&amp; record.expiring_synchronization_due_day.value &lt;= 0)">
+                            <button groups="account.group_account_user" type="object" name="manual_sync" class="btn btn-danger">Reconnect Bank</button>
+                        </t>
+                        <t t-elif="record.account_online_link_state.raw_value == 'disconnected'">
+                            <button groups="account.group_account_user" type="object" name="action_reconnect_online_account" class="btn btn-danger">Reconnect Bank</button>
+                        </t>
+                    </div>
+                </xpath>
+
+                <xpath expr="//div[hasclass('o_kanban_card_manage_settings')][field[@name='show_on_dashboard']]" position="attributes">
+                    <attribute name="groups"/>
+                </xpath>
+
+                <xpath expr="//div[hasclass('o_kanban_card_manage_settings')]/field[@name='show_on_dashboard']" position="attributes">
+                    <attribute name="groups">account.group_account_manager</attribute>
+                    <attribute name="class" remove="col-4"/>
+                    <attribute name="t-att-class">dashboard.display_connect_bank_in_dashboard ? 'col-4' : 'col-6'</attribute>
+                </xpath>
+
+                <xpath expr="//div[hasclass('o_kanban_card_manage_settings')]/div[hasclass('col-6')]" position="attributes">
+                    <attribute name="groups">account.group_account_manager</attribute>
+                    <attribute name="class" remove="col-4"/>
+                    <attribute name="t-att-class">dashboard.display_connect_bank_in_dashboard ? 'col-4' : 'col-6'</attribute>
+                </xpath>
+
+                <xpath expr="//div[hasclass('o_kanban_card_manage_settings')]/field[@name='show_on_dashboard']" position="after">
+                    <t t-if="dashboard.display_connect_bank_in_dashboard and dashboard.bank_statements_source === 'online_sync'
+                        and record.account_online_link_state.raw_value != 'connected'">
+                        <div class="col-4 text-center" groups="account.group_account_basic">
+                            <a class="dropdown-item px-0" type="object" name="action_configure_bank_journal">Connect bank</a>
+                        </div>
+                    </t>
+                    <t t-elif="dashboard.display_connect_bank_in_dashboard">
+                        <div class="col-4 text-center" groups="account.group_account_manager">
+                            <a class="dropdown-item px-0" type="object" name="action_configure_bank_journal">Connect bank</a>
+                        </div>
+                    </t>
+                </xpath>
+
+                <xpath expr="//t[@t-name='bank_configuration_placeholder']" position="replace">
+                    <t t-if="bank_unconfigured and dashboard.display_connect_bank_in_dashboard">
+                        <widget name="bank_configure" groups="account.group_account_manager"/>
+                    </t>
+                    <t t-else="" t-call="JournalBodyBankCash"/>
+                </xpath>
+            </field>
+        </record>
+    </data>
+</odoo>
diff --git a/dev_odex30_accounting/odex30_account_online_sync/views/account_journal_view.xml b/dev_odex30_accounting/odex30_account_online_sync/views/account_journal_view.xml
new file mode 100644
index 0000000..4e356f0
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_online_sync/views/account_journal_view.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <data>
+        <record id="account_journal_form" model="ir.ui.view">
+            <field name="name">account.journal.form.online.sync</field>
+            <field name="model">account.journal</field>
+            <field name="inherit_id" ref="account.view_account_journal_form"/>
+            <field name="arch" type="xml">
+                <xpath expr="//group[@name='bank_account_number']" position="inside">
+                    <field name="account_online_account_id" invisible="1"/>
+                    <field name="renewal_contact_email" groups="account.group_account_readonly" invisible="not account_online_account_id"/>
+                    <!-- Take one cell in order to have the button aligned with the field and not its label -->
+                    <div class="o_cell flex-grow-1 flex-sm-grow-0" invisible="not account_online_account_id"/>
+                    <button name="action_send_reminder" class="oe_link oe_inline ps-0 py-0" type="object"
+                            invisible="not account_online_account_id">
+                            <i class="oi oi-arrow-right me-2"/> Send Now
+                    </button>
+                </xpath>
+            </field>
+        </record>
+    </data>
+</odoo>
diff --git a/dev_odex30_accounting/odex30_account_online_sync/views/account_online_sync_portal_templates.xml b/dev_odex30_accounting/odex30_account_online_sync/views/account_online_sync_portal_templates.xml
new file mode 100644
index 0000000..c0cd687
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_online_sync/views/account_online_sync_portal_templates.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <template id="portal_renew_consent" name="Renew Consent">
+        <t t-call="portal.portal_layout">
+            <t t-set="breadcrumbs_searchbar" t-value="False"/>
+            <div class="row">
+                <div class="col-auto">
+                    <h4>Connect your bank account to Odoo</h4>
+                </div>
+            </div>
+            <div class="row justify-content-center mb-4">
+                <div class="col-auto">
+                    <img alt="Odoo" src="/web/static/img/odoo_logo.svg" style="height: 5em;" class="align-baseline w-auto"/>
+                </div>
+            </div>
+            <div class="js_reconnect">
+                <div class="row justify-content-center mb-5">
+                    <div class="col-auto">
+                        <table class="table table-responsive">
+                            <tbody>
+                                <tr>
+                                    <td class="text-end h5">Bank</td>
+                                    <td class="text-start ps-4 h5"><t t-out="bank"/><t t-if="bank">,</t> <t t-out="bank_account"/></td>
+                                </tr>
+                                <tr>
+                                    <td class="text-end h5">Journal</td>
+                                    <td class="text-start ps-4 h5"><t t-out="journal"/></td>
+                                </tr>
+                                <tr>
+                                    <td class="text-end h5">Latest Balance</td>
+                                    <td class="text-start ps-4 h5"><span t-att-class="latest_balance > 0 and '' or 'text-danger'" t-out="latest_balance_formatted"/> on <t t-out="latest_sync"/></td>
+                                </tr>
+                            </tbody>
+                        </table>
+                    </div>
+                </div>
+                <div class="row justify-content-center mb-4 oe_online_sync">
+                    <div class="col-auto">
+                        <a id="renew_consent_button" role="button" class="btn btn-primary py-2" t-att-iframe-params="iframe_params">
+                            <h3 class="mb-0">Connect my Bank</h3>
+                        </a>
+                    </div>
+                </div>
+                <div class="row justify-content-center" style="color: #d4924a;">
+                    <div class="col-auto">
+                        Security Tip: always check the domain name of this page, before clicking on the button.
+                    </div>
+                </div>
+            </div>
+            <div class="js_reconnect d-none">
+                <div class="row justify-content-center mb-5">
+                    <div class="col-auto">
+                        <h2>Thank You!</h2>
+                    </div>
+                </div>
+            </div>
+        </t>
+    </template>
+</odoo>
diff --git a/dev_odex30_accounting/odex30_account_online_sync/views/account_online_sync_views.xml b/dev_odex30_accounting/odex30_account_online_sync/views/account_online_sync_views.xml
new file mode 100644
index 0000000..e43ecef
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_online_sync/views/account_online_sync_views.xml
@@ -0,0 +1,126 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <data>
+        <record id="account_online_link_view_form" model="ir.ui.view">
+            <field name="name">account.online.link.form</field>
+            <field name="model">account.online.link</field>
+            <field name="arch" type="xml">
+                <form create="false">
+                    <header>
+                        <button name="action_fetch_transactions" string="Fetch Transactions" class="oe_highlight"
+                                type="object" groups="account.group_account_user"
+                                invisible="state == 'disconnected' or not show_sync_actions"/>
+                        <button groups="account.group_account_manager" name="action_update_credentials" string="Update Credentials" class="btn-secondary" type="object" invisible="state == 'disconnected' or not show_sync_actions"/>
+                        <button groups="account.group_account_manager" name="action_reconnect_account" string="Reconnect" class="btn-primary" type="object" invisible="state != 'disconnected' or not show_sync_actions"/>
+                        <button groups="account.group_account_manager" name="action_new_synchronization" string="Connect" class="btn-primary" type="object" invisible="state != 'disconnected' or not show_sync_actions"/>
+                        <field name="state" widget="statusbar" readonly="1"/>
+                        <field name="show_sync_actions" invisible="1"/>
+                    </header>
+                    <sheet>
+                        <div class="oe_title">
+                            <h1><field name="name" readonly="False"/></h1>
+                        </div>
+                        <group>
+                            <group>
+                                <field name="client_id" readonly="1" string="Client id"/>
+                                <field name="auto_sync"/>
+                                <field name="provider_type" readonly="1"/>
+                            </group>
+                            <group>
+                                <field name="last_refresh" string="Last refresh" readonly="1"/>
+                                <field name="next_refresh" readonly="1" invisible="not auto_sync"/>
+                                <field name="expiring_synchronization_date" readonly="1"/>
+                                <field name="company_id" readonly="1" groups="base.group_multi_company"/>
+                            </group>
+                        </group>
+                        <group>
+                            <field name="account_online_account_ids" nolabel="1" widget="one2many" mode="list" string="Online Accounts" colspan="2">
+                                <list create="false" editable="bottom"> <!-- Clicks on records (for edit) are blocked -->
+                                    <field name="name" required="1"/>
+                                    <field name="account_number"/>
+                                    <field name="journal_ids"
+                                        widget="many2many_tags"
+                                        options="{'no_quick_create': True}"
+                                        domain="[('type', 'in', ['bank', 'credit']), ('account_online_account_id', '=', False), ('company_id', '=', company_id)]"
+                                        context="{'default_type': 'bank', 'default_bank_statements_source': 'online_sync', 'default_account_online_account_id': id}"/>
+                                    <field name="last_sync"/>
+                                    <field name="balance" readonly="1"/>
+                                    <field name="inverse_balance_sign" groups="base.group_no_one" optional="hide"/>
+                                    <field name="inverse_transaction_sign" groups="base.group_no_one" optional="hide"/>
+                                    <button name="action_reset_fetching_status" type="object" string="Reset" help="This button will reset the fetching status"/>
+                                    <field name="company_id" invisible="1"/>
+                                </list>
+                            </field>
+                        </group>
+                    </sheet>
+                    <!-- Chatter -->
+                    <chatter/>
+                </form>
+            </field>
+        </record>
+
+        <record id="account_online_account_view_form" model="ir.ui.view">
+            <field name="name">account.online.account.form</field>
+            <field name="model">account.online.account</field>
+            <field name="arch" type="xml">
+                <form create="false">
+                    <sheet>
+                        <div class="oe_title">
+                            <h1><field name="name" readonly="1"/></h1>
+                        </div>
+                        <group>
+                            <group>
+                                <field name="account_number" readonly="1"/>
+                                <field name="journal_ids" widget="many2many_tags" domain="[('type', 'in', ['bank', 'credit']), ('account_online_account_id', '=', False), ('company_id', '=', company_id)]"/>
+                                <field name="company_id" invisible="1"/>
+                            </group>
+                            <group>
+                                <field name="last_sync"/>
+                                <field name="balance" readonly="1"/>
+                            </group>
+                        </group>
+                    </sheet>
+                </form>
+            </field>
+        </record>
+
+        <record id="account_online_link_view_tree" model="ir.ui.view">
+            <field name="name">account.online.link.list</field>
+            <field name="model">account.online.link</field>
+            <field name="arch" type="xml">
+                <list decoration-danger="state != 'connected'" create="false">
+                    <field name="name" readonly="1"/>
+                    <field name="state"/>
+                    <field name="provider_type" readonly="1"/>
+                    <field name="last_refresh" readonly="1"/>
+                    <field name="next_refresh" readonly="1" optional="hide"/>
+                    <field name="company_id" groups="base.group_multi_company" readonly="1" optional="hide"/>
+                </list>
+            </field>
+        </record>
+
+        <record model="ir.actions.act_window" id="action_account_online_link_form">
+            <field name="name">Online Synchronization</field>
+            <field name="view_mode">list,form</field>
+            <field name="view_id" ref="account_online_link_view_tree"/>
+            <field name="res_model">account.online.link</field>
+            <field name="help" type="html">
+              <p class="o_view_nocontent_smiling_face">
+                Online Synchronization
+              </p>
+              <p>
+                To create a synchronization with your banking institution,<br/>
+                please click on <b>Add a Bank Account</b>.
+              </p>
+            </field>
+        </record>
+
+        <menuitem
+            name="Online Synchronization"
+            parent="account.account_banks_menu"
+            action="action_account_online_link_form"
+            id="menu_action_online_link_account"
+            groups="base.group_no_one"
+            sequence="4"/>
+    </data>
+</odoo>
diff --git a/dev_odex30_accounting/odex30_account_online_sync/wizard/__init__.py b/dev_odex30_accounting/odex30_account_online_sync/wizard/__init__.py
new file mode 100644
index 0000000..8ec63c8
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_online_sync/wizard/__init__.py
@@ -0,0 +1,6 @@
+# -*- coding: utf-8 -*-
+
+from . import account_bank_selection_wizard
+from . import account_journal_missing_transactions
+from . import account_journal_duplicate_transactions
+from . import account_bank_statement_line
diff --git a/dev_odex30_accounting/odex30_account_online_sync/wizard/__pycache__/__init__.cpython-311.pyc b/dev_odex30_accounting/odex30_account_online_sync/wizard/__pycache__/__init__.cpython-311.pyc
new file mode 100644
index 0000000..a92675a
Binary files /dev/null and b/dev_odex30_accounting/odex30_account_online_sync/wizard/__pycache__/__init__.cpython-311.pyc differ
diff --git a/dev_odex30_accounting/odex30_account_online_sync/wizard/__pycache__/account_bank_selection_wizard.cpython-311.pyc b/dev_odex30_accounting/odex30_account_online_sync/wizard/__pycache__/account_bank_selection_wizard.cpython-311.pyc
new file mode 100644
index 0000000..75cadbb
Binary files /dev/null and b/dev_odex30_accounting/odex30_account_online_sync/wizard/__pycache__/account_bank_selection_wizard.cpython-311.pyc differ
diff --git a/dev_odex30_accounting/odex30_account_online_sync/wizard/__pycache__/account_bank_statement_line.cpython-311.pyc b/dev_odex30_accounting/odex30_account_online_sync/wizard/__pycache__/account_bank_statement_line.cpython-311.pyc
new file mode 100644
index 0000000..051795c
Binary files /dev/null and b/dev_odex30_accounting/odex30_account_online_sync/wizard/__pycache__/account_bank_statement_line.cpython-311.pyc differ
diff --git a/dev_odex30_accounting/odex30_account_online_sync/wizard/__pycache__/account_journal_duplicate_transactions.cpython-311.pyc b/dev_odex30_accounting/odex30_account_online_sync/wizard/__pycache__/account_journal_duplicate_transactions.cpython-311.pyc
new file mode 100644
index 0000000..5b72c06
Binary files /dev/null and b/dev_odex30_accounting/odex30_account_online_sync/wizard/__pycache__/account_journal_duplicate_transactions.cpython-311.pyc differ
diff --git a/dev_odex30_accounting/odex30_account_online_sync/wizard/__pycache__/account_journal_missing_transactions.cpython-311.pyc b/dev_odex30_accounting/odex30_account_online_sync/wizard/__pycache__/account_journal_missing_transactions.cpython-311.pyc
new file mode 100644
index 0000000..b876f1d
Binary files /dev/null and b/dev_odex30_accounting/odex30_account_online_sync/wizard/__pycache__/account_journal_missing_transactions.cpython-311.pyc differ
diff --git a/dev_odex30_accounting/odex30_account_online_sync/wizard/account_bank_selection_wizard.py b/dev_odex30_accounting/odex30_account_online_sync/wizard/account_bank_selection_wizard.py
new file mode 100644
index 0000000..30b5453
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_online_sync/wizard/account_bank_selection_wizard.py
@@ -0,0 +1,29 @@
+# -*- coding: utf-8 -*-
+
+from odoo import api, fields, models
+
+
+class AccountBankSelection(models.TransientModel):
+    _name = "account.bank.selection"
+    _description = "Link a bank account to the selected journal"
+
+    account_online_link_id = fields.Many2one('account.online.link')
+    account_online_account_ids = fields.One2many(compute='_compute_online_account', comodel_name='account.online.account')
+    institution_name = fields.Char(related="account_online_link_id.name")
+    selected_account = fields.Many2one('account.online.account', domain="[('id', 'in', account_online_account_ids)]")
+
+    @api.depends('account_online_link_id')
+    def _compute_online_account(self):
+        for record in self:
+            record.account_online_account_ids = record.account_online_link_id.account_online_account_ids.filtered(lambda l: not l.journal_ids)
+
+    def sync_now(self):
+        if not self.selected_account:
+            self.selected_account = self.account_online_account_ids[0]
+        self.selected_account._assign_journal(self.env.context.get('swift_code'))
+        # Get transactions for that account
+        action = self.account_online_link_id._fetch_transactions(accounts=self.selected_account)
+        if not action:
+            action = self.env['ir.actions.act_window']._for_xml_id('account.open_account_journal_dashboard_kanban')
+            action['target'] = 'main'
+        return action
diff --git a/dev_odex30_accounting/odex30_account_online_sync/wizard/account_bank_selection_wizard.xml b/dev_odex30_accounting/odex30_account_online_sync/wizard/account_bank_selection_wizard.xml
new file mode 100644
index 0000000..e123253
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_online_sync/wizard/account_bank_selection_wizard.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <data>
+
+        <record id="view_account_bank_selection_form_wizard" model="ir.ui.view">
+            <field name="name">account.bank.selection.form.wizard</field>
+            <field name="model">account.bank.selection</field>
+            <field name="arch" type="xml">
+                <form string="Select a Bank Account">
+                    <div style="font-size: 1.3rem;">
+                        Select the <field name="institution_name" nolabel="1" class="oe_inline"/> account to connect:
+                    </div>
+                    <div>
+                        <field name="account_online_account_ids" invisible="1"/>
+                        <field name="selected_account" widget="online_account_radio" nolabel="1"/>
+                    </div>
+                    <footer>
+                        <button invisible="not selected_account" name="sync_now" class="btn-primary" string="Connect Bank" type="object" data-hotkey="q"/>
+                        <button string="Cancel" class="btn-secondary" special="cancel" data-hotkey="x"/>
+                    </footer>
+                </form>
+            </field>
+        </record>
+
+    </data>
+</odoo>
diff --git a/dev_odex30_accounting/odex30_account_online_sync/wizard/account_bank_statement_line.py b/dev_odex30_accounting/odex30_account_online_sync/wizard/account_bank_statement_line.py
new file mode 100644
index 0000000..a12988f
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_online_sync/wizard/account_bank_statement_line.py
@@ -0,0 +1,89 @@
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+from odoo import fields, models, _
+from odoo.exceptions import UserError
+from odoo.tools import html2plaintext
+
+
+class AccountBankStatementLineTransient(models.TransientModel):
+    _name = "account.bank.statement.line.transient"
+    _description = "Transient model for bank statement line"
+    _order = 'date asc'
+
+    sequence = fields.Integer(default=1)
+    date = fields.Date()
+    amount = fields.Monetary(readonly=True)
+    online_transaction_identifier = fields.Char(readonly=True)
+    payment_ref = fields.Char(readonly=True)
+    account_number = fields.Char(readonly=True)
+    partner_name = fields.Char(readonly=True)
+    transaction_details = fields.Html(readonly=True)
+    state = fields.Selection(
+        [
+            ('pending', 'Pending'),
+            ('posted', 'Posted'),
+        ],
+        default='posted',
+        readonly=True,
+    )
+
+    journal_id = fields.Many2one(
+        comodel_name='account.journal',
+        readonly=True,
+    )
+    online_account_id = fields.Many2one(
+        related='journal_id.account_online_account_id',
+        store=True,
+        readonly=True,
+    )
+    currency_id = fields.Many2one(
+        related='journal_id.company_id.currency_id',
+        readonly=True,
+    )
+    company_id = fields.Many2one(comodel_name='res.company')
+
+    foreign_currency_id = fields.Many2one(
+        comodel_name='res.currency',
+        string="Foreign Currency",
+    )
+
+    amount_currency = fields.Monetary(
+        string="Amount in Currency",
+        currency_field='foreign_currency_id',
+    )
+
+    def action_import_transactions(self):
+        # This action could be call on multiple lines.
+        if not self:
+            raise UserError(_("Please select first the transactions you wish to import."))
+
+        if self.filtered(lambda line: line.state == 'pending'):
+            raise UserError(_("You cannot import pending transactions."))
+
+        fields_to_read = [
+            'date',
+            'amount',
+            'online_transaction_identifier',
+            'payment_ref',
+            'account_number',
+            'partner_name',
+            'transaction_details',
+            'journal_id',
+            'online_account_id',
+            'company_id',
+            'foreign_currency_id',
+            'amount_currency',
+        ]
+        transactions_to_import = self.read(fields=fields_to_read, load=None)
+        self.env['account.bank.statement.line']._online_sync_bank_statement(transactions_to_import, self.online_account_id)
+        return self.env["ir.actions.act_window"]._for_xml_id('account.open_account_journal_dashboard_kanban')
+
+    def read(self, fields=None, load='_classic_read'):
+        transactions = super().read(fields=fields, load=load)
+
+        # Clean eventual <p>...</p> encapsulation for the 'transaction_details' field to be decoded as a JSON later.
+        for transaction in transactions:
+            if 'transaction_details' in transaction:
+                transaction['transaction_details'] = html2plaintext(transaction['transaction_details'])
+
+        return transactions
diff --git a/dev_odex30_accounting/odex30_account_online_sync/wizard/account_bank_statement_line.xml b/dev_odex30_accounting/odex30_account_online_sync/wizard/account_bank_statement_line.xml
new file mode 100644
index 0000000..7b8df19
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_online_sync/wizard/account_bank_statement_line.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <data>
+        <record id="view_missing_bank_statement_line_tree" model="ir.ui.view">
+            <field name="name">missing.bank.statement.line.list</field>
+            <field name="model">account.bank.statement.line.transient</field>
+            <field name="arch" type="xml">
+                <list create="false" js_class="transient_bank_statement_line_list_view">
+                    <field name="date"/>
+                    <field name="payment_ref"/>
+                    <field name="partner_name"/>
+                    <field name="account_number"/>
+                    <field name="amount"/>
+                    <field name="amount_currency" optional="hide"/>
+                    <field name="transaction_details" optional="hide" groups="base.group_no_one"/>
+                    <field name="online_transaction_identifier" optional="hide"/>
+                    <field name="state" widget="badge" decoration-muted="state == 'pending'" decoration-success="state == 'posted'"/>
+                </list>
+            </field>
+        </record>
+
+        <record id="missing_bank_statement_line_search" model="ir.ui.view">
+            <field name="name">missing.bank.statement.line.search</field>
+            <field name="model">account.bank.statement.line.transient</field>
+            <field name="arch" type="xml">
+                <search>
+                    <field name="state"/>
+                    <separator/>
+                    <filter name="filter_posted" string="Posted Transactions" domain="[('state', '=', 'posted')]"/>
+                </search>
+            </field>
+        </record>
+    </data>
+</odoo>
diff --git a/dev_odex30_accounting/odex30_account_online_sync/wizard/account_journal_duplicate_transactions.py b/dev_odex30_accounting/odex30_account_online_sync/wizard/account_journal_duplicate_transactions.py
new file mode 100644
index 0000000..55c583c
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_online_sync/wizard/account_journal_duplicate_transactions.py
@@ -0,0 +1,66 @@
+from datetime import timedelta
+
+from odoo import api, Command, fields, models, _
+
+
+class AccountDuplicateTransaction(models.TransientModel):
+    _name = 'account.duplicate.transaction.wizard'
+    _description = 'Wizard for duplicate transactions'
+
+    date = fields.Date(
+        string="Starting Date",
+        compute='_compute_date', readonly=False, store=True,
+    )
+    journal_id = fields.Many2one(
+        comodel_name='account.journal',
+        domain="[('type', '=', 'bank')]",
+    )
+    transaction_ids = fields.One2many(
+        comodel_name='account.bank.statement.line',
+        compute='_compute_transaction_ids',
+    )
+    first_ids_in_group = fields.Json(compute='_compute_transaction_ids')
+
+    @api.depends('journal_id')
+    def _compute_display_name(self):
+        for wizard in self:
+            wizard.display_name = _('%s duplicate transactions', wizard.journal_id.name or '')
+
+    @api.depends('journal_id', 'date')
+    def _compute_transaction_ids(self):
+        for wizard in self:
+            ids_groups = wizard.journal_id._get_duplicate_transactions(wizard.date or fields.Date.today()) if wizard.journal_id else []
+            first_ids_in_group = []
+            flat_ids = []
+            check_set = set()
+            for ids_group in ids_groups:
+                group_set = set(ids_group)
+                if not group_set & check_set:
+                    # list view not supposed to have the same line multiple times
+                    check_set.update(group_set)
+                    flat_ids.extend(ids_group)
+                    first_ids_in_group.append(ids_group[0])
+            wizard.write({'transaction_ids': [Command.set(flat_ids)]})
+            wizard.first_ids_in_group = first_ids_in_group
+
+    @api.depends('journal_id')
+    def _compute_date(self):
+        for wizard in self:
+            if wizard.date:
+                continue
+
+            last_bsl = self.env['account.bank.statement.line'].search_read(
+                [], order='id desc', limit=1, fields=['create_date']
+            )
+            if last_bsl:
+                # set date to the oldest transaction date of last sync batch
+                bsl = self.env['account.bank.statement.line'].search_read(
+                    [('create_date', '>=', last_bsl[0]['create_date'] - timedelta(minutes=10))],
+                    order='date', limit=1, fields=['date'],
+                )
+                wizard.date = bsl[0]['date']
+            else:
+                wizard.date = fields.Datetime.today()
+
+    def action_display_duplicate_transaction(self):
+        return self.journal_id.action_display_duplicate_transaction_from_date(self.date)
diff --git a/dev_odex30_accounting/odex30_account_online_sync/wizard/account_journal_duplicate_transactions.xml b/dev_odex30_accounting/odex30_account_online_sync/wizard/account_journal_duplicate_transactions.xml
new file mode 100644
index 0000000..555f9c0
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_online_sync/wizard/account_journal_duplicate_transactions.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <record id="account_duplicate_transaction_wizard_view_form" model="ir.ui.view">
+        <field name="name">account.duplicate.transaction.wizard.form</field>
+        <field name="model">account.duplicate.transaction.wizard</field>
+        <field name="arch" type="xml">
+            <form
+                string="Fetch Missing Bank Statements Wizard"
+                create="false"
+                js_class="account_duplicate_transactions_form"
+            >
+                <h3>Choose a date and a journal from which you want to check the transactions.</h3>
+                <group class="oe_form_field">
+                    <field name="date" required="1"/>
+                </group>
+                <field name="first_ids_in_group" invisible="1"/> <!-- Needed for account_duplicate_transactions_lines_list_x2many -->
+                <button
+                    confirm="This action will delete all selected transactions. Are you sure you want to proceed?"
+                    name="delete_selected_transactions"
+                    ref="delete_button" class="btn-primary"
+                >
+                    <i class="fa fa-trash me-1" /> Delete Selected
+                </button>
+                <notebook>
+                    <page string="Transactions">
+                        <field
+                            name="transaction_ids"
+                            widget="account_duplicate_transactions_lines_list_x2many"
+                            nolabel="1"
+                            context="{
+                                'form_view_ref': 'odex30_account_online_sync.view_bank_statement_line_form_bank_rec_widget_inherit',
+                            }"
+                        >
+                            <list>
+                                <field name="id" column_invisible="1"/>
+                                <field name="payment_ref"/>
+                                <field name="date"/>
+                                <field name="amount"/>
+                                <field name="online_transaction_identifier"/>
+                                <field name="account_number"/>
+                                <field name="partner_id"/>
+                                <field name="is_reconciled"/>
+                            </list>
+                        </field>
+                    </page>
+                </notebook>
+            </form>
+        </field>
+    </record>
+</odoo>
diff --git a/dev_odex30_accounting/odex30_account_online_sync/wizard/account_journal_missing_transactions.py b/dev_odex30_accounting/odex30_account_online_sync/wizard/account_journal_missing_transactions.py
new file mode 100644
index 0000000..f6e0c2c
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_online_sync/wizard/account_journal_missing_transactions.py
@@ -0,0 +1,78 @@
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+from dateutil.relativedelta import relativedelta
+
+from odoo import fields, models, _
+from odoo.exceptions import UserError
+from odoo.tools import format_date
+
+
+class AccountMissingTransaction(models.TransientModel):
+    _name = 'account.missing.transaction.wizard'
+    _description = 'Wizard for missing transactions'
+
+    date = fields.Date(
+        string="Starting Date",
+        default=lambda self: fields.Date.today() - relativedelta(months=1),
+    )
+    journal_id = fields.Many2one(
+        comodel_name='account.journal',
+        domain="[('type', '=', 'bank'), ('account_online_account_id', '!=', 'False'), ('account_online_link_state', '=', 'connected')]"
+    )
+
+    def _get_manual_bank_statement_lines(self):
+        return self.env['account.bank.statement.line'].search(
+            domain=[
+                ('date', '>=', self.date),
+                ('journal_id', '=', self.journal_id.id),
+                ('online_transaction_identifier', '=', False),
+            ],
+        )
+
+    def action_fetch_missing_transaction(self):
+        self.ensure_one()
+
+        if not self.journal_id:
+            raise UserError(_("You have to select one journal to continue."))
+
+        if not self.date:
+            raise UserError(_("Please enter a valid Starting Date to continue."))
+
+        if self.journal_id.account_online_link_state != 'connected':
+            raise UserError(_("You can't find missing transactions for a journal that isn't connected."))
+
+        fetched_transactions = self.journal_id.account_online_account_id._retrieve_transactions(date=self.date, include_pendings=True)
+        transactions = fetched_transactions.get('transactions') or []
+        pendings = fetched_transactions.get('pendings') or []
+
+        pendings = [{**pending, 'state': 'pending'} for pending in pendings]
+        filtered_transactions = self.journal_id.account_online_account_id._get_filtered_transactions(transactions + pendings)
+
+        transient_transactions_ids = self.env['account.bank.statement.line.transient'].create(filtered_transactions)
+
+        return {
+            'name': _("Missing and Pending Transactions"),
+            'type': 'ir.actions.act_window',
+            'res_model': 'account.bank.statement.line.transient',
+            'view_mode': 'list',
+            'views': [(False, 'list')],
+            'domain': [('id', 'in', transient_transactions_ids.ids)],
+            'context': {
+                'has_manual_entries': bool(self._get_manual_bank_statement_lines()),
+                'is_fetch_before_creation': self.date < self.journal_id.account_online_link_id.create_date.date(),
+                'account_online_link_create_date': format_date(self.env, self.journal_id.account_online_link_id.create_date),
+                'search_default_filter_posted': bool([transaction for transaction in filtered_transactions if transaction.get('state') != 'pending']),  # Activate this default filter only if we have posted transactions
+            },
+        }
+
+    def action_open_manual_bank_statement_lines(self):
+        self.ensure_one()
+        bank_statement_lines = self._get_manual_bank_statement_lines()
+
+        return {
+            'name': _("Manual Bank Statement Lines"),
+            'type': 'ir.actions.act_window',
+            'res_model': 'account.bank.statement.line',
+            'views': [(False, 'list'), (False, 'form')],
+            'domain': [('id', 'in', bank_statement_lines.ids)],
+        }
diff --git a/dev_odex30_accounting/odex30_account_online_sync/wizard/account_journal_missing_transactions.xml b/dev_odex30_accounting/odex30_account_online_sync/wizard/account_journal_missing_transactions.xml
new file mode 100644
index 0000000..5d85de2
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_online_sync/wizard/account_journal_missing_transactions.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <record id="account_missing_transaction_wizard_view_form" model="ir.ui.view">
+        <field name="name">account.missing.transaction.wizard.form</field>
+        <field name="model">account.missing.transaction.wizard</field>
+        <field name="arch" type="xml">
+            <form string="Fetch Missing Bank Statements Wizard" create="false">
+                <p>
+                    Choose a date and a journal from which you want to fetch transactions
+                </p>
+                <group class="oe_form_field">
+                    <field name="journal_id" required="1" options="{'no_quick_create':True,'no_create_edit':True}"/>
+                    <field name="date" required="1"/>
+                </group>
+                <footer>
+                    <button string="Fetch" data-hotkey="q" name="action_fetch_missing_transaction" type="object" class="btn-primary" />
+                    <button string="Cancel" class="btn-secondary" special="cancel" data-hotkey="z" />
+                </footer>
+            </form>
+        </field>
+    </record>
+</odoo>
diff --git a/dev_odex30_accounting/odex30_account_reports/__init__.py b/dev_odex30_accounting/odex30_account_reports/__init__.py
new file mode 100644
index 0000000..f0d2677
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_reports/__init__.py
@@ -0,0 +1,12 @@
+# -*- coding: utf-8 -*-
+
+from . import models
+from . import controllers
+from . import wizard
+
+
+def set_periodicity_journal_on_companies(env):
+    for company in env['res.company'].search([]):
+        company.account_tax_periodicity_journal_id = company._get_default_misc_journal()
+        company.account_tax_periodicity_journal_id.show_on_dashboard = True
+        company._initiate_account_onboardings()
diff --git a/dev_odex30_accounting/odex30_account_reports/__manifest__.py b/dev_odex30_accounting/odex30_account_reports/__manifest__.py
new file mode 100644
index 0000000..881f1d9
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_reports/__manifest__.py
@@ -0,0 +1,98 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+{
+    'name' : 'Accounting Reports',
+    'summary': 'View and create reports',
+    'category': 'Odex30-Accounting/Odex30-Accounting',
+    'author': "Expert Co. Ltd.",
+    'website': "http://www.exp-sa.com",
+    'description': """
+Accounting Reports
+==================
+    """,
+    'depends': ['account'],
+    'data': [
+        'security/ir.model.access.csv',
+        'data/pdf_export_templates.xml',
+        'data/customer_reports_pdf_export_templates.xml',
+        'data/balance_sheet.xml',
+        'data/cash_flow_report.xml',
+        'data/executive_summary.xml',
+        'data/profit_and_loss.xml',
+        'data/bank_reconciliation_report.xml',
+        'data/aged_partner_balance.xml',
+        'data/general_ledger.xml',
+        'data/trial_balance.xml',
+        'data/sales_report.xml',
+        'data/partner_ledger.xml',
+        'data/customer_statement.xml',
+        'data/followup_report.xml',
+        'data/multicurrency_revaluation_report.xml',
+        'data/deferred_reports.xml',
+        'data/journal_report.xml',
+        'data/generic_tax_report.xml',
+        'views/account_report_view.xml',
+        'data/account_report_actions.xml',
+        'data/report_send_cron.xml',
+        'data/menuitems.xml',
+        'data/mail_activity_type_data.xml',
+        'data/mail_templates.xml',
+        'views/account_move_views.xml',
+        'views/res_company_views.xml',
+        'views/account_journal_dashboard_view.xml',
+        'views/mail_activity_views.xml',
+        'views/res_config_settings_views.xml',
+        'views/res_partner_views.xml',
+        'views/report_template.xml',
+        'wizard/account_report_send.xml',
+        'wizard/multicurrency_revaluation.xml',
+        'wizard/report_export_wizard.xml',
+        'wizard/account_report_file_download_error_wizard.xml',
+        'wizard/fiscal_year.xml',
+        'wizard/mail_activity_schedule_views.xml',
+        'views/account_activity.xml',
+        'views/account_account_views.xml',
+        'views/account_tax_views.xml',
+    ],
+    'auto_install': True,
+    'installable': True,
+    'post_init_hook': 'set_periodicity_journal_on_companies',
+    'assets': {
+        'odex30_account_reports.assets_pdf_export': [
+            ('include', 'web._assets_helpers'),
+            'web/static/src/scss/pre_variables.scss',
+            'web/static/lib/bootstrap/scss/_variables.scss',
+            'web/static/lib/bootstrap/scss/_variables-dark.scss',
+            'web/static/lib/bootstrap/scss/_maps.scss',
+            ('include', 'web._assets_bootstrap_backend'),
+            'web/static/fonts/fonts.scss',
+            'odex30_account_reports/static/src/scss/**/*',
+        ],
+        'web.report_assets_common': [
+            'odex30_account_reports/static/src/scss/account_pdf_export_template.scss',
+        ],
+
+        'web.assets_backend': [
+            'odex30_account_reports/static/src/components/account_report/account_report.xml',  # أضف هذا أولاً
+            'odex30_account_reports/static/src/components/account_report/account_report.js',
+            'odex30_account_reports/static/src/components/**/*.xml',  # أضف هذا
+            'odex30_account_reports/static/src/components/**/*.js',
+            'odex30_account_reports/static/src/js/**/*',
+            'odex30_account_reports/static/src/widgets/**/*',
+        ],
+
+        'web.assets_web_dark': [
+            'odex30_account_reports/static/src/scss/*.dark.scss',
+        ],
+        'web.qunit_suite_tests': [
+            'odex30_account_reports/static/tests/legacy/*.js',
+        ],
+        'web.assets_unit_tests': [
+            'odex30_account_reports/static/tests/*.js',
+            'odex30_account_reports/static/tests/account_report/**/*.js',
+        ],
+        'web.assets_tests': [
+            'odex30_account_reports/static/tests/tours/**/*',
+        ],
+    }
+}
diff --git a/dev_odex30_accounting/odex30_account_reports/__pycache__/__init__.cpython-311.pyc b/dev_odex30_accounting/odex30_account_reports/__pycache__/__init__.cpython-311.pyc
new file mode 100644
index 0000000..97bbe6b
Binary files /dev/null and b/dev_odex30_accounting/odex30_account_reports/__pycache__/__init__.cpython-311.pyc differ
diff --git a/dev_odex30_accounting/odex30_account_reports/controllers/__init__.py b/dev_odex30_accounting/odex30_account_reports/controllers/__init__.py
new file mode 100644
index 0000000..5d4b25d
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_reports/controllers/__init__.py
@@ -0,0 +1,4 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+
+from . import main
diff --git a/dev_odex30_accounting/odex30_account_reports/controllers/__pycache__/__init__.cpython-311.pyc b/dev_odex30_accounting/odex30_account_reports/controllers/__pycache__/__init__.cpython-311.pyc
new file mode 100644
index 0000000..7c52b63
Binary files /dev/null and b/dev_odex30_accounting/odex30_account_reports/controllers/__pycache__/__init__.cpython-311.pyc differ
diff --git a/dev_odex30_accounting/odex30_account_reports/controllers/__pycache__/main.cpython-311.pyc b/dev_odex30_accounting/odex30_account_reports/controllers/__pycache__/main.cpython-311.pyc
new file mode 100644
index 0000000..d373e6a
Binary files /dev/null and b/dev_odex30_accounting/odex30_account_reports/controllers/__pycache__/main.cpython-311.pyc differ
diff --git a/dev_odex30_accounting/odex30_account_reports/controllers/main.py b/dev_odex30_accounting/odex30_account_reports/controllers/main.py
new file mode 100644
index 0000000..e02c708
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_reports/controllers/main.py
@@ -0,0 +1,85 @@
+import werkzeug
+from werkzeug.exceptions import InternalServerError
+
+from odoo.addons.odex30_account_reports.models.account_report import AccountReportFileDownloadException
+from odoo.addons.account.controllers.download_docs import _get_headers
+from odoo import http
+from odoo.http import content_disposition, request
+from odoo.tools.misc import html_escape
+
+import json
+
+
+class AccountReportController(http.Controller):
+
+    @http.route('/account_reports', type='http', auth='user', methods=['POST'], csrf=False)
+    def get_report(self, options, file_generator, **kwargs):
+        uid = request.uid
+        options = json.loads(options)
+
+        allowed_company_ids = request.env['account.report'].get_report_company_ids(options)
+        if not allowed_company_ids:
+            company_str = request.cookies.get('cids', str(request.env.user.company_id.id))
+            allowed_company_ids = [int(str_id) for str_id in company_str.split('-')]
+
+        report = request.env['account.report'].with_user(uid).with_context(allowed_company_ids=allowed_company_ids).browse(options['report_id'])
+
+        try:
+            generated_file_data = report.dispatch_report_action(options, file_generator)
+            file_content = generated_file_data['file_content']
+            file_type = generated_file_data['file_type']
+            response_headers = self._get_response_headers(file_type, generated_file_data['file_name'], file_content)
+
+            if file_type == 'xlsx':
+                response = request.make_response(None, headers=response_headers)
+                response.stream.write(file_content)
+            else:
+                response = request.make_response(file_content, headers=response_headers)
+
+            if file_type in ('zip', 'xaf'):
+
+                response.direct_passthrough = True
+
+            return response
+        except AccountReportFileDownloadException as e:
+            if e.content:
+                e.content['file_content'] = e.content['file_content'].decode()
+            data = {
+                'name': type(e).__name__,
+                'arguments': [e.errors, e.content],
+            }
+            raise InternalServerError(response=self._generate_response(data)) from e
+        except Exception as e:  # noqa: BLE001
+            data = http.serialize_exception(e)
+            raise InternalServerError(response=self._generate_response(data)) from e
+
+    def _generate_response(self, data):
+        error = {
+            'code': 200,
+            'message': 'Odoo Server Error',
+            'data': data,
+        }
+        return request.make_response(html_escape(json.dumps(error)))
+
+    def _get_response_headers(self, file_type, file_name, file_content):
+        headers = [
+            ('Content-Type', request.env['account.report'].get_export_mime_type(file_type)),
+            ('Content-Disposition', content_disposition(file_name)),
+        ]
+
+        if file_type in ('xml', 'txt', 'csv', 'kvr', 'csv'):
+            headers.append(('Content-Length', len(file_content)))
+
+        return headers
+
+    @http.route('/account_reports/download_attachments/<models("ir.attachment"):attachments>', type='http', auth='user')
+    def download_report_attachments(self, attachments):
+        attachments.check_access('read')
+        assert all(attachment.res_id and attachment.res_model == 'res.partner' for attachment in attachments)
+        if len(attachments) == 1:
+            headers = _get_headers(attachments.name, attachments.mimetype, attachments.raw)
+            return request.make_response(attachments.raw, headers)
+        else:
+            content = attachments._build_zip_from_attachments()
+            headers = _get_headers('attachments.zip', 'zip', content)
+            return request.make_response(content, headers)
diff --git a/dev_odex30_accounting/odex30_account_reports/data/account_report_actions.xml b/dev_odex30_accounting/odex30_account_reports/data/account_report_actions.xml
new file mode 100644
index 0000000..e6de725
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_reports/data/account_report_actions.xml
@@ -0,0 +1,165 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <data>
+
+        <record id="action_account_report_cs" model="ir.actions.client">
+            <field name="name">Cash Flow Statement</field>
+            <field name="tag">account_report</field>
+            <field name="context" eval="{'report_id': ref('odex30_account_reports.cash_flow_report')}"/>
+        </record>
+
+        <record id="action_account_report_bs" model="ir.actions.client">
+            <field name="name">Balance Sheet</field>
+            <field name="tag">account_report</field>
+            <field name="path">balance-sheet</field>
+            <field name="context" eval="{'report_id': ref('odex30_account_reports.balance_sheet')}"/>
+        </record>
+
+        <record id="action_account_report_exec_summary" model="ir.actions.client">
+            <field name="name">Executive Summary</field>
+            <field name="tag">account_report</field>
+            <field name="path">executive-summary</field>
+            <field name="context" eval="{'report_id': ref('odex30_account_reports.executive_summary')}"/>
+        </record>
+
+        <record id="action_account_report_pl" model="ir.actions.client">
+            <field name="name">Profit and Loss</field>
+            <field name="tag">account_report</field>
+            <field name="path">profit-and-loss</field>
+            <field name="context" eval="{'report_id': ref('odex30_account_reports.profit_and_loss')}"/>
+        </record>
+
+        <record id="action_account_report_gt" model="ir.actions.client">
+            <field name="name">Tax Return</field>
+            <field name="tag">account_report</field>
+            <field name="path">tax-report</field>
+            <field name="context" eval="{'report_id': ref('account.generic_tax_report')}"/>
+        </record>
+
+        <record id="action_account_report_ja" model="ir.actions.client">
+            <field name="name">Journal Audit</field>
+            <field name="tag">account_report</field>
+            <field name="path">journal-report</field>
+            <field name="context" eval="{'report_id': ref('odex30_account_reports.journal_report')}"/>
+        </record>
+
+        <record id="action_account_report_general_ledger" model="ir.actions.client">
+            <field name="name">General Ledger</field>
+            <field name="tag">account_report</field>
+            <field name="path">general-ledger</field>
+            <field name="context" eval="{'report_id': ref('odex30_account_reports.general_ledger_report')}"/>
+        </record>
+
+        <record id="action_account_report_multicurrency_revaluation" model="ir.actions.client">
+            <field name="name">Unrealized Currency Gains/Losses</field>
+            <field name="tag">account_report</field>
+            <field name="context" eval="{'report_id': ref('odex30_account_reports.multicurrency_revaluation_report')}"/>
+        </record>
+
+        <record id="action_account_report_ar" model="ir.actions.client">
+            <field name="name">Aged Receivable</field>
+            <field name="tag">account_report</field>
+            <field name="path">aged-receivable</field>
+            <field name="context" eval="{'report_id': ref('odex30_account_reports.aged_receivable_report')}" />
+        </record>
+
+        <record id="action_account_report_ap" model="ir.actions.client">
+            <field name="name">Aged Payable</field>
+            <field name="tag">account_report</field>
+            <field name="path">aged-payable</field>
+            <field name="context" eval="{'report_id': ref('odex30_account_reports.aged_payable_report')}" />
+        </record>
+
+        <record id="action_account_report_coa" model="ir.actions.client">
+            <field name="name">Trial Balance</field>
+            <field name="tag">account_report</field>
+            <field name="path">trial-balance</field>
+            <field name="context" eval="{'report_id': ref('odex30_account_reports.trial_balance_report')}"/>
+        </record>
+
+        <record id="action_account_report_partner_ledger" model="ir.actions.client">
+            <field name="name">Partner Ledger</field>
+            <field name="tag">account_report</field>
+            <field name="path">partner-ledger</field>
+            <field name="context" eval="{'report_id': ref('odex30_account_reports.partner_ledger_report')}"/>
+        </record>
+
+        <record id="action_account_report_customer_statement" model="ir.actions.client">
+            <field name="name">Customer Statement</field>
+            <field name="tag">account_report</field>
+            <field name="context" eval="{'report_id': ref('odex30_account_reports.customer_statement_report')}"/>
+        </record>
+
+        <record id="action_account_report_sales" model="ir.actions.client">
+            <field name="name">EC Sales List</field>
+            <field name="tag">account_report</field>
+            <field name="context" eval="{'report_id': ref('odex30_account_reports.generic_ec_sales_report')}"/>
+        </record>
+
+        <record id="action_account_report_deferred_expense" model="ir.actions.client">
+            <field name="name">Deferred Expense</field>
+            <field name="tag">account_report</field>
+            <field name="path">deferred-expense</field>
+            <field name="context" eval="{'report_id': ref('odex30_account_reports.deferred_expense_report')}"/>
+        </record>
+        <record id="action_account_report_deferred_revenue" model="ir.actions.client">
+            <field name="name">Deferred Revenue</field>
+            <field name="tag">account_report</field>
+            <field name="path">deferred-revenue</field>
+            <field name="context" eval="{'report_id': ref('odex30_account_reports.deferred_revenue_report')}"/>
+        </record>
+
+        <record id="account_financial_current_year_earnings0" model="account.report.line">
+            <field name="action_id" ref="action_account_report_pl"/>
+        </record>
+
+        <record id="account_financial_report_executivesummary_profitability0" model="account.report.line">
+            <field name="action_id" ref="action_account_report_pl"/>
+        </record>
+
+        <record id="account_financial_report_executivesummary_balancesheet0" model="account.report.line">
+            <field name="action_id" ref="action_account_report_bs"/>
+        </record>
+
+        <record id="action_create_report_menu" model="ir.actions.server">
+            <field name="name">Create Menu Item</field>
+            <field name="model_id" ref="account.model_account_report"/>
+            <field name="binding_model_id" ref="account.model_account_report" />
+            <field name="state">code</field>
+            <field name="binding_view_types">form</field>
+            <field name="code">
+if records:
+    action = records._create_menu_item_for_report()
+            </field>
+        </record>
+
+        <record id="action_account_report_tree" model="ir.actions.act_window">
+            <field name="name">Accounting Reports</field>
+            <field name="res_model">account.report</field>
+            <field name="view_mode">list,form</field>
+            <field name="view_id" ref="account_report_tree"/>
+            <field name="search_view_id" ref="view_account_report_search"/>
+        </record>
+
+        <record id="action_account_report_horizontal_groups" model="ir.actions.act_window">
+            <field name="name">Horizontal Groups</field>
+            <field name="res_model">account.report.horizontal.group</field>
+            <field name="view_mode">list,form</field>
+            <field name="view_id" ref="account_report_horizontal_group_tree"/>
+        </record>
+
+        <record id="action_account_report_bank_reconciliation" model="ir.actions.client">
+            <field name="name">Bank Reconciliation</field>
+            <field name="tag">account_report</field>
+            <field name="context" eval="{'report_id': ref('odex30_account_reports.bank_reconciliation_report')}"/>
+        </record>
+
+        <record id="action_account_report_budget_tree" model="ir.actions.act_window">
+            <field name="name">Financial Budgets</field>
+            <field name="res_model">account.report.budget</field>
+            <field name="view_mode">list,form</field>
+            <field name="view_id" ref="account_report_budget_tree"/>
+        </record>
+
+    </data>
+</odoo>
diff --git a/dev_odex30_accounting/odex30_account_reports/data/aged_partner_balance.xml b/dev_odex30_accounting/odex30_account_reports/data/aged_partner_balance.xml
new file mode 100644
index 0000000..9989e42
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_reports/data/aged_partner_balance.xml
@@ -0,0 +1,326 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo auto_sequence="1">
+    <record id="aged_receivable_report" model="account.report">
+        <field name="name">Aged Receivable</field>
+        <field name="filter_date_range" eval="False"/>
+        <field name="filter_unfold_all" eval="True"/>
+        <field name="filter_partner" eval="True"/>
+        <field name="filter_period_comparison" eval="False"/>
+        <field name="filter_account_type">receivable</field>
+        <field name="filter_hierarchy">never</field>
+        <field name="filter_show_draft" eval="False"/>
+        <field name="filter_multi_company">selector</field>
+        <field name="default_opening_date_filter">today</field>
+        <field name="custom_handler_model_id" ref="model_account_aged_receivable_report_handler"/>
+        <field name="column_ids">
+            <record id="aged_receivable_report_invoice_date" model="account.report.column">
+                <field name="name">Invoice Date</field>
+                <field name="expression_label">invoice_date</field>
+                <field name="figure_type">date</field>
+                <field name="sortable" eval="True"/>
+            </record>
+            <record id="aged_receivable_report_amount_currency" model="account.report.column">
+                <field name="name">Amount Currency</field>
+                <field name="expression_label">amount_currency</field>
+            </record>
+            <record id="aged_receivable_report_currency" model="account.report.column">
+                <field name="name">Currency</field>
+                <field name="expression_label">currency</field>
+                <field name="figure_type">string</field>
+            </record>
+            <record id="aged_receivable_report_account_name" model="account.report.column">
+                <field name="name">Account</field>
+                <field name="expression_label">account_name</field>
+                <field name="figure_type">string</field>
+            </record>
+            <record id="aged_receivable_report_period0" model="account.report.column">
+                <field name="name">At Date</field>
+                <field name="expression_label">period0</field>
+                <field name="sortable" eval="True"/>
+            </record>
+            <record id="aged_receivable_report_period1" model="account.report.column">
+                <field name="name">Period 1</field>
+                <field name="expression_label">period1</field>
+                <field name="sortable" eval="True"/>
+            </record>
+            <record id="aged_receivable_report_period2" model="account.report.column">
+                <field name="name">Period 2</field>
+                <field name="expression_label">period2</field>
+                <field name="sortable" eval="True"/>
+            </record>
+            <record id="aged_receivable_report_period3" model="account.report.column">
+                <field name="name">Period 3</field>
+                <field name="expression_label">period3</field>
+                <field name="sortable" eval="True"/>
+            </record>
+            <record id="aged_receivable_report_period4" model="account.report.column">
+                <field name="name">Period 4</field>
+                <field name="expression_label">period4</field>
+                <field name="sortable" eval="True"/>
+            </record>
+            <record id="aged_receivable_report_period5" model="account.report.column">
+                <field name="name">Older</field>
+                <field name="expression_label">period5</field>
+                <field name="sortable" eval="True"/>
+            </record>
+            <record id="aged_receivable_report_total" model="account.report.column">
+                <field name="name">Total</field>
+                <field name="expression_label">total</field>
+                <field name="sortable" eval="True"/>
+            </record>
+        </field>
+        <field name="line_ids">
+          <record id="aged_receivable_line" model="account.report.line">
+              <field name="name">Aged Receivable</field>
+              <field name="groupby">partner_id, id</field>
+              <field name="expression_ids">
+                  <record id="aged_receivable_line_invoice_date" model="account.report.expression">
+                      <field name="label">invoice_date</field>
+                      <field name="engine">custom</field>
+                      <field name="formula">_report_custom_engine_aged_receivable</field>
+                      <field name="subformula">invoice_date</field>
+                      <field name="auditable" eval="False"/>
+                  </record>
+                  <record id="aged_receivable_line_amount_currency" model="account.report.expression">
+                      <field name="label">amount_currency</field>
+                      <field name="engine">custom</field>
+                      <field name="formula">_report_custom_engine_aged_receivable</field>
+                      <field name="subformula">amount_currency</field>
+                      <field name="auditable" eval="False"/>
+                  </record>
+                  <record id="aged_receivable_line_amount_currency_forced_currency" model="account.report.expression">
+                      <field name="label">_currency_amount_currency</field>
+                      <field name="engine">custom</field>
+                      <field name="formula">_report_custom_engine_aged_receivable</field>
+                      <field name="subformula">currency_id</field>
+                  </record>
+                  <record id="aged_receivable_line_currency" model="account.report.expression">
+                      <field name="label">currency</field>
+                      <field name="engine">custom</field>
+                      <field name="formula">_report_custom_engine_aged_receivable</field>
+                      <field name="subformula">currency</field>
+                      <field name="auditable" eval="False"/>
+                  </record>
+                  <record id="aged_receivable_line_account_name" model="account.report.expression">
+                      <field name="label">account_name</field>
+                      <field name="engine">custom</field>
+                      <field name="formula">_report_custom_engine_aged_receivable</field>
+                      <field name="subformula">account_name</field>
+                      <field name="auditable" eval="False"/>
+                  </record>
+                  <record id="aged_receivable_line_period0" model="account.report.expression">
+                      <field name="label">period0</field>
+                      <field name="engine">custom</field>
+                      <field name="formula">_report_custom_engine_aged_receivable</field>
+                      <field name="subformula">period0</field>
+                      <field name="auditable" eval="True"/>
+                  </record>
+                  <record id="aged_receivable_line_period1" model="account.report.expression">
+                      <field name="label">period1</field>
+                      <field name="engine">custom</field>
+                      <field name="formula">_report_custom_engine_aged_receivable</field>
+                      <field name="subformula">period1</field>
+                      <field name="auditable" eval="True"/>
+                  </record>
+                  <record id="aged_receivable_line_period2" model="account.report.expression">
+                      <field name="label">period2</field>
+                      <field name="engine">custom</field>
+                      <field name="formula">_report_custom_engine_aged_receivable</field>
+                      <field name="subformula">period2</field>
+                      <field name="auditable" eval="True"/>
+                  </record>
+                  <record id="aged_receivable_line_period3" model="account.report.expression">
+                      <field name="label">period3</field>
+                      <field name="engine">custom</field>
+                      <field name="formula">_report_custom_engine_aged_receivable</field>
+                      <field name="subformula">period3</field>
+                      <field name="auditable" eval="True"/>
+                  </record>
+                  <record id="aged_receivable_line_period4" model="account.report.expression">
+                      <field name="label">period4</field>
+                      <field name="engine">custom</field>
+                      <field name="formula">_report_custom_engine_aged_receivable</field>
+                      <field name="subformula">period4</field>
+                      <field name="auditable" eval="True"/>
+                  </record>
+                  <record id="aged_receivable_line_period5" model="account.report.expression">
+                      <field name="label">period5</field>
+                      <field name="engine">custom</field>
+                      <field name="formula">_report_custom_engine_aged_receivable</field>
+                      <field name="subformula">period5</field>
+                      <field name="auditable" eval="True"/>
+                  </record>
+                  <record id="aged_receivable_line_total" model="account.report.expression">
+                      <field name="label">total</field>
+                      <field name="engine">custom</field>
+                      <field name="formula">_report_custom_engine_aged_receivable</field>
+                      <field name="subformula">total</field>
+                      <field name="auditable" eval="True"/>
+                  </record>
+              </field>
+          </record>
+        </field>
+    </record>
+
+    <record id="aged_payable_report" model="account.report">
+        <field name="name">Aged Payable</field>
+        <field name="filter_date_range" eval="False"/>
+        <field name="filter_unfold_all" eval="True"/>
+        <field name="filter_partner" eval="True"/>
+        <field name="filter_period_comparison" eval="False"/>
+        <field name="filter_account_type">payable</field>
+        <field name="filter_hierarchy">never</field>
+        <field name="filter_show_draft" eval="False"/>
+        <field name="filter_multi_company">selector</field>
+        <field name="default_opening_date_filter">today</field>
+        <field name="custom_handler_model_id" ref="model_account_aged_payable_report_handler"/>
+        <field name="column_ids">
+            <record id="aged_payable_report_invoice_date" model="account.report.column">
+                <field name="name">Invoice Date</field>
+                <field name="expression_label">invoice_date</field>
+                <field name="figure_type">date</field>
+                <field name="sortable" eval="True"/>
+            </record>
+            <record id="aged_payable_report_amount_currency" model="account.report.column">
+                <field name="name">Amount Currency</field>
+                <field name="expression_label">amount_currency</field>
+            </record>
+            <record id="aged_payable_report_currency" model="account.report.column">
+                <field name="name">Currency</field>
+                <field name="expression_label">currency</field>
+                <field name="figure_type">string</field>
+            </record>
+            <record id="aged_payable_report_account_name" model="account.report.column">
+                <field name="name">Account</field>
+                <field name="expression_label">account_name</field>
+                <field name="figure_type">string</field>
+            </record>
+            <record id="aged_payable_report_period0" model="account.report.column">
+                <field name="name">At Date</field>
+                <field name="expression_label">period0</field>
+                <field name="sortable" eval="True"/>
+            </record>
+            <record id="aged_payable_report_period1" model="account.report.column">
+                <field name="name">Period 1</field>
+                <field name="expression_label">period1</field>
+                <field name="sortable" eval="True"/>
+            </record>
+            <record id="aged_payable_report_period2" model="account.report.column">
+                <field name="name">Period 2</field>
+                <field name="expression_label">period2</field>
+                <field name="sortable" eval="True"/>
+            </record>
+            <record id="aged_payable_report_period3" model="account.report.column">
+                <field name="name">Period 3</field>
+                <field name="expression_label">period3</field>
+                <field name="sortable" eval="True"/>
+            </record>
+            <record id="aged_payable_report_period4" model="account.report.column">
+                <field name="name">Period 4</field>
+                <field name="expression_label">period4</field>
+                <field name="sortable" eval="True"/>
+            </record>
+            <record id="aged_payable_report_period5" model="account.report.column">
+                <field name="name">Older</field>
+                <field name="expression_label">period5</field>
+                <field name="sortable" eval="True"/>
+            </record>
+            <record id="aged_payable_report_total" model="account.report.column">
+                <field name="name">Total</field>
+                <field name="expression_label">total</field>
+                <field name="sortable" eval="True"/>
+            </record>
+        </field>
+        <field name="line_ids">
+            <record id="aged_payable_line" model="account.report.line">
+                <field name="name">Aged Payable</field>
+                <field name="groupby">partner_id, id</field>
+                <field name="expression_ids">
+                    <record id="aged_payable_line_invoice_date" model="account.report.expression">
+                        <field name="label">invoice_date</field>
+                        <field name="engine">custom</field>
+                        <field name="formula">_report_custom_engine_aged_payable</field>
+                        <field name="subformula">invoice_date</field>
+                        <field name="auditable" eval="False"/>
+                    </record>
+                    <record id="aged_payable_line_amount_currency" model="account.report.expression">
+                        <field name="label">amount_currency</field>
+                        <field name="engine">custom</field>
+                        <field name="formula">_report_custom_engine_aged_payable</field>
+                        <field name="subformula">amount_currency</field>
+                        <field name="auditable" eval="False"/>
+                    </record>
+                    <record id="aged_payable_line_amount_currency_forced_currency" model="account.report.expression">
+                        <field name="label">_currency_amount_currency</field>
+                        <field name="engine">custom</field>
+                        <field name="formula">_report_custom_engine_aged_payable</field>
+                        <field name="subformula">currency_id</field>
+                    </record>
+                    <record id="aged_payable_line_currency" model="account.report.expression">
+                        <field name="label">currency</field>
+                        <field name="engine">custom</field>
+                        <field name="formula">_report_custom_engine_aged_payable</field>
+                        <field name="subformula">currency</field>
+                        <field name="auditable" eval="False"/>
+                    </record>
+                    <record id="aged_payable_line_account_name" model="account.report.expression">
+                        <field name="label">account_name</field>
+                        <field name="engine">custom</field>
+                        <field name="formula">_report_custom_engine_aged_payable</field>
+                        <field name="subformula">account_name</field>
+                        <field name="auditable" eval="False"/>
+                    </record>
+                    <record id="aged_payable_line_period0" model="account.report.expression">
+                        <field name="label">period0</field>
+                        <field name="engine">custom</field>
+                        <field name="formula">_report_custom_engine_aged_payable</field>
+                        <field name="subformula">period0</field>
+                        <field name="auditable" eval="True"/>
+                    </record>
+                    <record id="aged_payable_line_period1" model="account.report.expression">
+                        <field name="label">period1</field>
+                        <field name="engine">custom</field>
+                        <field name="formula">_report_custom_engine_aged_payable</field>
+                        <field name="subformula">period1</field>
+                        <field name="auditable" eval="True"/>
+                    </record>
+                    <record id="aged_payable_line_period2" model="account.report.expression">
+                        <field name="label">period2</field>
+                        <field name="engine">custom</field>
+                        <field name="formula">_report_custom_engine_aged_payable</field>
+                        <field name="subformula">period2</field>
+                        <field name="auditable" eval="True"/>
+                    </record>
+                    <record id="aged_payable_line_period3" model="account.report.expression">
+                        <field name="label">period3</field>
+                        <field name="engine">custom</field>
+                        <field name="formula">_report_custom_engine_aged_payable</field>
+                        <field name="subformula">period3</field>
+                        <field name="auditable" eval="True"/>
+                    </record>
+                    <record id="aged_payable_line_period4" model="account.report.expression">
+                        <field name="label">period4</field>
+                        <field name="engine">custom</field>
+                        <field name="formula">_report_custom_engine_aged_payable</field>
+                        <field name="subformula">period4</field>
+                        <field name="auditable" eval="True"/>
+                    </record>
+                    <record id="aged_payable_line_period5" model="account.report.expression">
+                        <field name="label">period5</field>
+                        <field name="engine">custom</field>
+                        <field name="formula">_report_custom_engine_aged_payable</field>
+                        <field name="subformula">period5</field>
+                        <field name="auditable" eval="True"/>
+                    </record>
+                    <record id="aged_payable_line_total" model="account.report.expression">
+                        <field name="label">total</field>
+                        <field name="engine">custom</field>
+                        <field name="formula">_report_custom_engine_aged_payable</field>
+                        <field name="subformula">total</field>
+                        <field name="auditable" eval="True"/>
+                    </record>
+                </field>
+            </record>
+        </field>
+    </record>
+</odoo>
diff --git a/dev_odex30_accounting/odex30_account_reports/data/balance_sheet.xml b/dev_odex30_accounting/odex30_account_reports/data/balance_sheet.xml
new file mode 100644
index 0000000..fb5d771
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_reports/data/balance_sheet.xml
@@ -0,0 +1,285 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo auto_sequence="1">
+    <record id="balance_sheet" model="account.report">
+        <field name="name">Balance Sheet</field>
+        <field name="filter_date_range" eval="False"/>
+        <field name="filter_analytic_groupby" eval="True"/>
+        <field name="filter_unfold_all" eval="True"/>
+        <field name="filter_journals" eval="True"/>
+        <field name="filter_multi_company">selector</field>
+        <field name="default_opening_date_filter">today</field>
+        <field name="custom_handler_model_id" ref="model_account_balance_sheet_report_handler"/>
+        <field name="column_ids">
+            <record id="balance_sheet_balance" model="account.report.column">
+                <field name="name">Balance</field>
+                <field name="expression_label">balance</field>
+            </record>
+        </field>
+        <field name="line_ids">
+            <record id="account_financial_report_total_assets0" model="account.report.line">
+                <field name="name">ASSETS</field>
+                <field name="hierarchy_level">0</field>
+                <field name="code">TA</field>
+                <field name="horizontal_split_side">left</field>
+                <field name="aggregation_formula">CA.balance + FA.balance + PNCA.balance</field>
+                <field name="children_ids">
+                    <record id="account_financial_report_current_assets_view0" model="account.report.line">
+                        <field name="name">Current Assets</field>
+                        <field name="code">CA</field>
+                        <field name="aggregation_formula">BA.balance + REC.balance + CAS.balance + PRE.balance</field>
+                        <field name="children_ids">
+                            <record id="account_financial_report_bank_view0" model="account.report.line">
+                                <field name="name">Bank and Cash Accounts</field>
+                                <field name="code">BA</field>
+                                <field name="groupby">account_id</field>
+                                <field name="foldable" eval="True"/>
+                                <field name="domain_formula">sum([('account_id.account_type', '=', 'asset_cash')])</field>
+                            </record>
+                            <record id="account_financial_report_receivable0" model="account.report.line">
+                                <field name="name">Receivables</field>
+                                <field name="code">REC</field>
+                                <field name="groupby">account_id</field>
+                                <field name="foldable" eval="True"/>
+                                <field name="domain_formula">sum([('account_id.account_type', '=', 'asset_receivable'), ('account_id.non_trade', '=', False)])</field>
+                            </record>
+                            <record id="account_financial_report_current_assets0" model="account.report.line">
+                                <field name="name">Current Assets</field>
+                                <field name="code">CAS</field>
+                                <field name="groupby">account_id</field>
+                                <field name="foldable" eval="True"/>
+                                <field name="domain_formula">sum(['|', ('account_id.account_type', '=', 'asset_current'), '&amp;', ('account_id.account_type', '=', 'asset_receivable'), ('account_id.non_trade', '=', True)])</field>
+                            </record>
+                            <record id="account_financial_report_prepayements0" model="account.report.line">
+                                <field name="name">Prepayments</field>
+                                <field name="code">PRE</field>
+                                <field name="groupby">account_id</field>
+                                <field name="foldable" eval="True"/>
+                                <field name="domain_formula">sum([('account_id.account_type', '=', 'asset_prepayments')])</field>
+                            </record>
+                        </field>
+                    </record>
+                    <record id="account_financial_report_fixed_assets_view0" model="account.report.line">
+                        <field name="name">Plus Fixed Assets</field>
+                        <field name="code">FA</field>
+                        <field name="groupby">account_id</field>
+                        <field name="foldable" eval="True"/>
+                        <field name="domain_formula">sum([('account_id.account_type', '=', 'asset_fixed')])</field>
+                    </record>
+                    <record id="account_financial_report_non_current_assets_view0" model="account.report.line">
+                        <field name="name">Plus Non-current Assets</field>
+                        <field name="code">PNCA</field>
+                        <field name="groupby">account_id</field>
+                        <field name="foldable" eval="True"/>
+                        <field name="domain_formula">sum([('account_id.account_type', '=', 'asset_non_current')])</field>
+                    </record>
+                </field>
+            </record>
+            <record id="account_financial_report_liabilities_view0" model="account.report.line">
+                <field name="name">LIABILITIES</field>
+                <field name="hierarchy_level">0</field>
+                <field name="code">L</field>
+                <field name="horizontal_split_side">right</field>
+                <field name="expression_ids">
+                    <record id="account_financial_report_liabilities_view0_balance" model="account.report.expression">
+                        <field name="label">balance</field>
+                        <field name="engine">aggregation</field>
+                        <field name="formula">CL.balance + NL.balance</field>
+                        <field name="green_on_positive" eval="False"/>
+                    </record>
+                </field>
+                <field name="children_ids">
+                    <record id="account_financial_report_current_liabilities0" model="account.report.line">
+                        <field name="name">Current Liabilities</field>
+                        <field name="code">CL</field>
+                        <field name="expression_ids">
+                            <record id="account_financial_report_current_liabilities0_balance" model="account.report.expression">
+                                <field name="label">balance</field>
+                                <field name="engine">aggregation</field>
+                                <field name="formula">CL1.balance + CL2.balance</field>
+                                <field name="green_on_positive" eval="False"/>
+                            </record>
+                        </field>
+                        <field name="children_ids">
+                            <record id="account_financial_report_current_liabilities1" model="account.report.line">
+                                <field name="name">Current Liabilities</field>
+                                <field name="code">CL1</field>
+                                <field name="groupby">account_id</field>
+                                <field name="foldable" eval="True"/>
+                                <field name="expression_ids">
+                                    <record id="account_financial_report_current_liabilities1_balance" model="account.report.expression">
+                                        <field name="label">balance</field>
+                                        <field name="engine">domain</field>
+                                        <field name="formula" eval="['|', ('account_id.account_type', 'in', ('liability_current', 'liability_credit_card')), '&amp;', ('account_id.account_type', '=', 'liability_payable'), ('account_id.non_trade', '=', True)]"/>
+                                        <field name="subformula">-sum</field>
+                                        <field name="green_on_positive" eval="False"/>
+                                    </record>
+                                </field>
+                            </record>
+                            <record id="account_financial_report_current_liabilities_payable" model="account.report.line">
+                                <field name="name">Payables</field>
+                                <field name="code">CL2</field>
+                                <field name="groupby">account_id</field>
+                                <field name="foldable" eval="True"/>
+                                <field name="expression_ids">
+                                    <record id="account_financial_report_current_liabilities_payable_balance" model="account.report.expression">
+                                        <field name="label">balance</field>
+                                        <field name="engine">domain</field>
+                                        <field name="formula" eval="[('account_id.account_type', '=', 'liability_payable'), ('account_id.non_trade', '=', False)]"/>
+                                        <field name="subformula">-sum</field>
+                                        <field name="green_on_positive" eval="False"/>
+                                    </record>
+                                </field>
+                            </record>
+                        </field>
+                    </record>
+                    <record id="account_financial_report_non_current_liabilities0" model="account.report.line">
+                        <field name="name">Plus Non-current Liabilities</field>
+                        <field name="code">NL</field>
+                        <field name="groupby">account_id</field>
+                        <field name="foldable" eval="True"/>
+                        <field name="expression_ids">
+                            <record id="account_financial_report_non_current_liabilities0_balance" model="account.report.expression">
+                                <field name="label">balance</field>
+                                <field name="engine">domain</field>
+                                <field name="formula" eval="[('account_id.account_type', '=', 'liability_non_current')]"/>
+                                <field name="subformula">-sum</field>
+                                <field name="green_on_positive" eval="False"/>
+                            </record>
+                        </field>
+                    </record>
+                </field>
+            </record>
+            <record id="account_financial_report_equity0" model="account.report.line">
+                <field name="name">EQUITY</field>
+                <field name="hierarchy_level">0</field>
+                <field name="code">EQ</field>
+                <field name="horizontal_split_side">right</field>
+                <field name="aggregation_formula">UNAFFECTED_EARNINGS.balance + RETAINED_EARNINGS.balance</field>
+                <field name="children_ids">
+                    <record id="account_financial_unaffected_earnings0" model="account.report.line">
+                        <field name="name">Unallocated Earnings</field>
+                        <field name="code">UNAFFECTED_EARNINGS</field>
+                        <field name="aggregation_formula">CURR_YEAR_EARNINGS.balance + PREV_YEAR_EARNINGS.balance</field>
+                        <field name="children_ids">
+                            <record id="account_financial_current_year_earnings0" model="account.report.line">
+                                <field name="name">Current Year Unallocated Earnings</field>
+                                <field name="code">CURR_YEAR_EARNINGS</field>
+                                <field name="aggregation_formula"/>
+                                <field name="expression_ids">
+                                    <record id="account_financial_current_year_earnings_pnl" model="account.report.expression">
+                                        <field name="label">pnl</field>
+                                        <field name="engine">aggregation</field>
+                                        <field name="formula">NEP.balance</field>
+                                        <field name="date_scope">from_fiscalyear</field>
+                                        <field name="subformula">cross_report</field>
+                                    </record>
+                                    <record id="account_financial_current_year_earnings_alloc" model="account.report.expression">
+                                        <field name="label">alloc</field>
+                                        <field name="engine">domain</field>
+                                        <field name="formula" eval="[('account_id.account_type', '=', 'equity_unaffected')]"/>
+                                        <field name="date_scope">from_fiscalyear</field>
+                                        <field name="subformula">-sum</field>
+                                    </record>
+                                    <record id="account_financial_current_year_earnings_balance" model="account.report.expression">
+                                        <field name="label">balance</field>
+                                        <field name="engine">aggregation</field>
+                                        <field name="formula">CURR_YEAR_EARNINGS.pnl + CURR_YEAR_EARNINGS.alloc</field>
+                                    </record>
+                                </field>
+                            </record>
+                            <record id="account_financial_previous_year_earnings0" model="account.report.line">
+                                <field name="name">Previous Years Unallocated Earnings</field>
+                                <field name="code">PREV_YEAR_EARNINGS</field>
+                                <field name="expression_ids">
+                                    <record id="account_financial_previous_year_earnings0_allocated_earnings" model="account.report.expression">
+                                        <field name="label">allocated_earnings</field>
+                                        <field name="engine">domain</field>
+                                        <field name="formula" eval="[('account_id.account_type', '=', 'equity_unaffected')]"/>
+                                        <field name="subformula">-sum</field>
+                                        <field name="date_scope">from_beginning</field>
+                                    </record>
+                                    <record id="account_financial_previous_year_earnings0_balance_domain" model="account.report.expression">
+                                        <field name="label">balance_domain</field>
+                                        <field name="engine">domain</field>
+                                        <field name="formula" eval="[('account_id.account_type', 'in', ('income', 'income_other', 'expense_direct_cost', 'expense', 'expense_depreciation'))]"/>
+                                        <field name="subformula">-sum</field>
+                                        <field name="date_scope">from_beginning</field>
+                                    </record>
+                                    <record id="account_financial_previous_year_earnings0_balance" model="account.report.expression">
+                                        <field name="label">balance</field>
+                                        <field name="engine">aggregation</field>
+                                        <field name="formula">PREV_YEAR_EARNINGS.balance_domain + PREV_YEAR_EARNINGS.allocated_earnings - CURR_YEAR_EARNINGS.balance</field>
+                                    </record>
+                                </field>
+                            </record>
+                        </field>
+                    </record>
+                    <record id="account_financial_retained_earnings0" model="account.report.line">
+                        <field name="name">Retained Earnings</field>
+                        <field name="code">RETAINED_EARNINGS</field>
+                        <field name="aggregation_formula">CURR_RETAINED_EARNINGS.balance + PREV_RETAINED_EARNINGS.balance</field>
+                        <field name="groupby" eval="False"/>
+                        <field name="foldable" eval="False"/>
+                        <field name="children_ids">
+                            <record id="account_financial_retained_earnings_line_1" model="account.report.line">
+                                <field name="name">Current Year Retained Earnings</field>
+                                <field name="code">CURR_RETAINED_EARNINGS</field>
+                                <field name="groupby">account_id</field>
+                                <field name="foldable" eval="True"/>
+                                <field name="expression_ids">
+                                    <record id="account_financial_retained_earnings_current" model="account.report.expression">
+                                        <field name="label">balance</field>
+                                        <field name="engine">domain</field>
+                                        <field name="formula" eval="[('account_id.account_type', '=', 'equity')]"/>
+                                        <field name="subformula">-sum</field>
+                                        <field name="date_scope">from_fiscalyear</field>
+                                    </record>
+                                </field>
+                            </record>
+                            <record id="account_financial_retained_earnings_line_2" model="account.report.line">
+                                <field name="name">Previous Years Retained Earnings</field>
+                                <field name="code">PREV_RETAINED_EARNINGS</field>
+                                <field name="expression_ids">
+                                    <record id="account_financial_retained_earnings_total" model="account.report.expression">
+                                        <field name="label">total</field>
+                                        <field name="engine">domain</field>
+                                        <field name="formula" eval="[('account_id.account_type', '=', 'equity')]"/>
+                                        <field name="subformula">-sum</field>
+                                    </record>
+                                    <record id="account_financial_retained_earnings_balance" model="account.report.expression">
+                                        <field name="label">balance</field>
+                                        <field name="engine">aggregation</field>
+                                        <field name="formula">PREV_RETAINED_EARNINGS.total - CURR_RETAINED_EARNINGS.balance</field>
+                                    </record>
+                                </field>
+                            </record>
+                        </field>
+                    </record>
+                </field>
+            </record>
+            <record id="account_financial_report_liabilities_and_equity_view0" model="account.report.line">
+                <field name="name">LIABILITIES + EQUITY</field>
+                <field name="hierarchy_level">0</field>
+                <field name="code">LE</field>
+                <field name="horizontal_split_side">right</field>
+                <field name="expression_ids">
+                    <record id="account_financial_report_liabilities_and_equity_view0_balance" model="account.report.expression">
+                        <field name="label">balance</field>
+                        <field name="engine">aggregation</field>
+                        <field name="formula">L.balance + EQ.balance</field>
+                        <field name="green_on_positive" eval="False"/>
+                    </record>
+                </field>
+            </record>
+            <record id="account_financial_report_off_sheet" model="account.report.line">
+                <field name="name">OFF BALANCE SHEET ACCOUNTS</field>
+                <field name="hierarchy_level">0</field>
+                <field name="code">OS</field>
+                <field name="groupby">account_id</field>
+                <field name="foldable" eval="True"/>
+                <field name="hide_if_zero" eval="1"/>
+                <field name="domain_formula">-sum([('account_id.account_type', '=', 'off_balance')])</field>
+            </record>
+        </field>
+    </record>
+</odoo>
diff --git a/dev_odex30_accounting/odex30_account_reports/data/bank_reconciliation_report.xml b/dev_odex30_accounting/odex30_account_reports/data/bank_reconciliation_report.xml
new file mode 100644
index 0000000..bb25524
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_reports/data/bank_reconciliation_report.xml
@@ -0,0 +1,474 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo auto_sequence="1">
+    <record id="bank_reconciliation_report" model="account.report">
+        <field name="name">Bank Reconciliation Report</field>
+        <field name="filter_show_draft" eval="True"/>
+        <field name="filter_date_range" eval="False"/>
+        <field name="filter_period_comparison" eval="False"/>
+        <field name="filter_hide_0_lines">by_default</field>
+        <field name="search_bar" eval="True"/>
+        <field name="default_opening_date_filter">today</field>
+        <field name="custom_handler_model_id" ref="model_account_bank_reconciliation_report_handler"/>
+        <field name="column_ids">
+            <record id="bank_reconciliation_report_date" model="account.report.column">
+                <field name="name">Date</field>
+                <field name="expression_label">date</field>
+                <field name="figure_type">date</field>
+            </record>
+            <record id="bank_reconciliation_report_label" model="account.report.column">
+                <field name="name">Label</field>
+                <field name="expression_label">label</field>
+                <field name="figure_type">string</field>
+            </record>
+            <record id="bank_reconciliation_report_amount_currency" model="account.report.column">
+                <field name="name">Amount Currency</field>
+                <field name="expression_label">amount_currency</field>
+                <field name="figure_type">monetary</field>
+            </record>
+            <record id="bank_reconciliation_report_currency" model="account.report.column">
+                <field name="name">Currency</field>
+                <field name="expression_label">currency</field>
+                <field name="figure_type">string</field>
+            </record>
+            <record id="bank_reconciliation_report_amount" model="account.report.column">
+                <field name="name">Amount</field>
+                <field name="expression_label">amount</field>
+                <field name="figure_type">monetary</field>
+            </record>
+        </field>
+        <field name="line_ids">
+            <record id="balance_bank" model="account.report.line">
+                <field name="name">Balance of Bank</field>
+                <field name="code">balance_bank</field>
+                <field name="hierarchy_level">0</field>
+                <field name="expression_ids">
+                    <record id="balance_bank_expr" model="account.report.expression">
+                        <field name="label">amount</field>
+                        <field name="engine">aggregation</field>
+                        <field name="formula">last_statement_balance.amount + transaction_without_statement.amount + misc_operations.amount</field>
+                        <field name="auditable" eval="True"/>
+                    </record>
+                    <record id="balance_bank_expr_forced_currency_amount" model="account.report.expression">
+                        <field name="label">_currency_amount</field>
+                        <field name="engine">custom</field>
+                        <field name="formula">_report_custom_engine_forced_currency_amount</field>
+                        <field name="subformula">amount_currency_id</field>
+                    </record>
+                </field>
+                <field name="children_ids">
+                    <record id="last_statement_balance" model="account.report.line">
+                        <field name="name">Last statement balance</field>
+                        <field name="code">last_statement_balance</field>
+                        <field name="expression_ids">
+                            <record id="last_statement_balance_amount" model="account.report.expression">
+                                <field name="label">amount</field>
+                                <field name="engine">custom</field>
+                                <field name="formula">_report_custom_engine_last_statement_balance_amount</field>
+                                <field name="subformula">amount</field>
+                                <field name="auditable" eval="False"/>
+                            </record>
+                            <record id="last_statement_balance_forced_currency_amount" model="account.report.expression">
+                                <field name="label">_currency_amount</field>
+                                <field name="engine">custom</field>
+                                <field name="formula">_report_custom_engine_last_statement_balance_amount</field>
+                                <field name="subformula">amount_currency_id</field>
+                            </record>
+                        </field>
+                        <field name="children_ids">
+                            <record id="unreconciled_last_statement_receipts" model="account.report.line">
+                                <field name="name">Including Unreconciled Receipts</field>
+                                <field name="code">last_statement_receipts</field>
+                                <field name="groupby">id</field>
+                                <field name="foldable" eval="True"/>
+                                <field name="expression_ids">
+                                    <record id="unreconciled_last_statement_receipts_date" model="account.report.expression">
+                                        <field name="label">date</field>
+                                        <field name="engine">custom</field>
+                                        <field name="formula">_report_custom_engine_unreconciled_last_statement_receipts</field>
+                                        <field name="subformula">date</field>
+                                        <field name="auditable" eval="False"/>
+                                    </record>
+                                    <record id="unreconciled_last_statement_receipts_label" model="account.report.expression">
+                                        <field name="label">label</field>
+                                        <field name="engine">custom</field>
+                                        <field name="formula">_report_custom_engine_unreconciled_last_statement_receipts</field>
+                                        <field name="subformula">label</field>
+                                        <field name="auditable" eval="False"/>
+                                    </record>
+                                    <record id="unreconciled_last_statement_receipts_amount_currency" model="account.report.expression">
+                                        <field name="label">amount_currency</field>
+                                        <field name="engine">custom</field>
+                                        <field name="formula">_report_custom_engine_unreconciled_last_statement_receipts</field>
+                                        <field name="subformula">amount_currency</field>
+                                        <field name="auditable" eval="False"/>
+                                    </record>
+                                    <record id="unreconciled_last_statement_receipts_forced_currency_amount_currency" model="account.report.expression">
+                                        <field name="label">_currency_amount_currency</field>
+                                        <field name="engine">custom</field>
+                                        <field name="formula">_report_custom_engine_unreconciled_last_statement_receipts</field>
+                                        <field name="subformula">amount_currency_currency_id</field>
+                                    </record>
+                                    <record id="unreconciled_last_statement_receipts_currency" model="account.report.expression">
+                                      <field name="label">currency</field>
+                                      <field name="engine">custom</field>
+                                      <field name="formula">_report_custom_engine_unreconciled_last_statement_receipts</field>
+                                      <field name="subformula">currency</field>
+                                      <field name="auditable" eval="False"/>
+                                    </record>
+                                    <record id="unreconciled_last_statement_receipts_amount" model="account.report.expression">
+                                      <field name="label">amount</field>
+                                      <field name="engine">custom</field>
+                                      <field name="formula">_report_custom_engine_unreconciled_last_statement_receipts</field>
+                                      <field name="subformula">amount</field>
+                                      <field name="auditable" eval="False"/>
+                                    </record>
+                                    <record id="unreconciled_last_statement_receipts_forced_currency_amount" model="account.report.expression">
+                                        <field name="label">_currency_amount</field>
+                                        <field name="engine">custom</field>
+                                        <field name="formula">_report_custom_engine_unreconciled_last_statement_receipts</field>
+                                        <field name="subformula">amount_currency_id</field>
+                                    </record>
+                                </field>
+                            </record>
+                            <record id="unreconciled_last_statement_payments" model="account.report.line">
+                                <field name="name">Including Unreconciled Payments</field>
+                                <field name="code">last_statement_payments</field>
+                                <field name="groupby">id</field>
+                                <field name="foldable" eval="True"/>
+                                <field name="expression_ids">
+                                    <record id="unreconciled_last_statement_payments_date" model="account.report.expression">
+                                        <field name="label">date</field>
+                                        <field name="engine">custom</field>
+                                        <field name="formula">_report_custom_engine_unreconciled_last_statement_payments</field>
+                                        <field name="subformula">date</field>
+                                        <field name="auditable" eval="False"/>
+                                    </record>
+                                    <record id="unreconciled_last_statement_payments_label" model="account.report.expression">
+                                        <field name="label">label</field>
+                                        <field name="engine">custom</field>
+                                        <field name="formula">_report_custom_engine_unreconciled_last_statement_payments</field>
+                                        <field name="subformula">label</field>
+                                        <field name="auditable" eval="False"/>
+                                    </record>
+                                    <record id="unreconciled_last_statement_payments_amount_currency" model="account.report.expression">
+                                        <field name="label">amount_currency</field>
+                                        <field name="engine">custom</field>
+                                        <field name="formula">_report_custom_engine_unreconciled_last_statement_payments</field>
+                                        <field name="subformula">amount_currency</field>
+                                        <field name="auditable" eval="False"/>
+                                    </record>
+                                    <record id="unreconciled_last_statement_payments_forced_currency_amount_currency" model="account.report.expression">
+                                        <field name="label">_currency_amount_currency</field>
+                                        <field name="engine">custom</field>
+                                        <field name="formula">_report_custom_engine_unreconciled_last_statement_payments</field>
+                                        <field name="subformula">amount_currency_currency_id</field>
+                                    </record>
+                                    <record id="unreconciled_last_statement_payments_currency" model="account.report.expression">
+                                      <field name="label">currency</field>
+                                      <field name="engine">custom</field>
+                                      <field name="formula">_report_custom_engine_unreconciled_last_statement_payments</field>
+                                      <field name="subformula">currency</field>
+                                      <field name="auditable" eval="False"/>
+                                    </record>
+                                    <record id="unreconciled_last_statement_payments_amount" model="account.report.expression">
+                                      <field name="label">amount</field>
+                                      <field name="engine">custom</field>
+                                      <field name="formula">_report_custom_engine_unreconciled_last_statement_payments</field>
+                                      <field name="subformula">amount</field>
+                                      <field name="auditable" eval="False"/>
+                                    </record>
+                                    <record id="unreconciled_last_statement_payments_forced_currency_amount" model="account.report.expression">
+                                        <field name="label">_currency_amount</field>
+                                        <field name="engine">custom</field>
+                                        <field name="formula">_report_custom_engine_unreconciled_last_statement_payments</field>
+                                        <field name="subformula">amount_currency_id</field>
+                                    </record>
+                                </field>
+                            </record>
+                        </field>
+                    </record>
+                    <record id="transaction_without_statement" model="account.report.line">
+                        <field name="name">Transactions without statement</field>
+                        <field name="code">transaction_without_statement</field>
+                        <field name="expression_ids">
+                            <record id="transaction_without_statement_expr" model="account.report.expression">
+                                <field name="label">amount</field>
+                                <field name="engine">custom</field>
+                                <field name="formula">_report_custom_engine_transaction_without_statement_amount</field>
+                                <field name="subformula">amount</field>
+                                <field name="auditable" eval="False"/>
+                            </record>
+                            <record id="transaction_without_statement_expr_forced_currency_amount" model="account.report.expression">
+                                <field name="label">_currency_amount</field>
+                                <field name="engine">custom</field>
+                                <field name="formula">_report_custom_engine_transaction_without_statement_amount</field>
+                                <field name="subformula">amount_currency_id</field>
+                            </record>
+                        </field>
+                        <field name="children_ids">
+                            <record id="no_statement_unreconciled_receipt" model="account.report.line">
+                                <field name="name">Including Unreconciled Receipts</field>
+                                <field name="code">unreconciled_receipt</field>
+                                <field name="groupby">id</field>
+                                <field name="foldable" eval="True"/>
+                                <field name="expression_ids">
+                                    <record id="no_statement_unreconciled_receipt_date" model="account.report.expression">
+                                        <field name="label">date</field>
+                                        <field name="engine">custom</field>
+                                        <field name="formula">_report_custom_engine_unreconciled_receipts</field>
+                                        <field name="subformula">date</field>
+                                        <field name="auditable" eval="False"/>
+                                    </record>
+                                    <record id="no_statement_unreconciled_receipt_label" model="account.report.expression">
+                                        <field name="label">label</field>
+                                        <field name="engine">custom</field>
+                                        <field name="formula">_report_custom_engine_unreconciled_receipts</field>
+                                        <field name="subformula">label</field>
+                                        <field name="auditable" eval="False"/>
+                                    </record>
+                                    <record id="no_statement_unreconciled_receipt_amount_currency" model="account.report.expression">
+                                        <field name="label">amount_currency</field>
+                                        <field name="engine">custom</field>
+                                        <field name="formula">_report_custom_engine_unreconciled_receipts</field>
+                                        <field name="subformula">amount_currency</field>
+                                        <field name="auditable" eval="False"/>
+                                    </record>
+                                    <record id="no_statement_unreconciled_receipt_forced_currency_amount_currency" model="account.report.expression">
+                                        <field name="label">_currency_amount_currency</field>
+                                        <field name="engine">custom</field>
+                                        <field name="formula">_report_custom_engine_unreconciled_receipts</field>
+                                        <field name="subformula">amount_currency_currency_id</field>
+                                    </record>
+                                    <record id="no_statement_unreconciled_receipt_currency" model="account.report.expression">
+                                      <field name="label">currency</field>
+                                      <field name="engine">custom</field>
+                                      <field name="formula">_report_custom_engine_unreconciled_receipts</field>
+                                      <field name="subformula">currency</field>
+                                      <field name="auditable" eval="False"/>
+                                    </record>
+                                    <record id="no_statement_unreconciled_receipt_amount" model="account.report.expression">
+                                      <field name="label">amount</field>
+                                      <field name="engine">custom</field>
+                                      <field name="formula">_report_custom_engine_unreconciled_receipts</field>
+                                      <field name="subformula">amount</field>
+                                      <field name="auditable" eval="False"/>
+                                    </record>
+                                    <record id="no_statement_unreconciled_receipt_forced_currency_amount" model="account.report.expression">
+                                        <field name="label">_currency_amount</field>
+                                        <field name="engine">custom</field>
+                                        <field name="formula">_report_custom_engine_unreconciled_receipts</field>
+                                        <field name="subformula">amount_currency_id</field>
+                                    </record>
+                                </field>
+                            </record>
+                            <record id="no_statement_unreconciled_payments" model="account.report.line">
+                                <field name="name">Including Unreconciled Payments</field>
+                                <field name="code">unreconciled_payments</field>
+                                <field name="groupby">id</field>
+                                <field name="foldable" eval="True"/>
+                                <field name="expression_ids">
+                                    <record id="no_statement_unreconciled_payments_date" model="account.report.expression">
+                                        <field name="label">date</field>
+                                        <field name="engine">custom</field>
+                                        <field name="formula">_report_custom_engine_unreconciled_payments</field>
+                                        <field name="subformula">date</field>
+                                        <field name="auditable" eval="False"/>
+                                    </record>
+                                    <record id="no_statement_unreconciled_payments_label" model="account.report.expression">
+                                        <field name="label">label</field>
+                                        <field name="engine">custom</field>
+                                        <field name="formula">_report_custom_engine_unreconciled_payments</field>
+                                        <field name="subformula">label</field>
+                                        <field name="auditable" eval="False"/>
+                                    </record>
+                                    <record id="no_statement_unreconciled_payments_amount_currency" model="account.report.expression">
+                                        <field name="label">amount_currency</field>
+                                        <field name="engine">custom</field>
+                                        <field name="formula">_report_custom_engine_unreconciled_payments</field>
+                                        <field name="subformula">amount_currency</field>
+                                        <field name="auditable" eval="False"/>
+                                    </record>
+                                    <record id="no_statement_unreconciled_payments_forced_currency_amount_currency" model="account.report.expression">
+                                        <field name="label">_currency_amount_currency</field>
+                                        <field name="engine">custom</field>
+                                        <field name="formula">_report_custom_engine_unreconciled_payments</field>
+                                        <field name="subformula">amount_currency_currency_id</field>
+                                    </record>
+                                    <record id="no_statement_unreconciled_payments_currency" model="account.report.expression">
+                                      <field name="label">currency</field>
+                                      <field name="engine">custom</field>
+                                      <field name="formula">_report_custom_engine_unreconciled_payments</field>
+                                      <field name="subformula">currency</field>
+                                      <field name="auditable" eval="False"/>
+                                    </record>
+                                    <record id="no_statement_unreconciled_payments_amount" model="account.report.expression">
+                                      <field name="label">amount</field>
+                                      <field name="engine">custom</field>
+                                      <field name="formula">_report_custom_engine_unreconciled_payments</field>
+                                      <field name="subformula">amount</field>
+                                      <field name="auditable" eval="False"/>
+                                    </record>
+                                    <record id="no_statement_unreconciled_payments_forced_currency_amount" model="account.report.expression">
+                                        <field name="label">_currency_amount</field>
+                                        <field name="engine">custom</field>
+                                        <field name="formula">_report_custom_engine_unreconciled_payments</field>
+                                        <field name="subformula">amount_currency_id</field>
+                                    </record>
+                                </field>
+                            </record>
+                        </field>
+                    </record>
+                    <record id="misc_operations" model="account.report.line">
+                        <field name="name">Misc. operations</field>
+                        <field name="code">misc_operations</field>
+                        <field name="expression_ids">
+                            <record id="misc_operations_amount" model="account.report.expression">
+                                <field name="label">amount</field>
+                                <field name="engine">custom</field>
+                                <field name="formula">_report_custom_engine_misc_operations</field>
+                                <field name="subformula">amount</field>
+                                <field name="auditable" eval="True"/>
+                            </record>
+                            <record id="misc_operations_amount_forced_currency_amount" model="account.report.expression">
+                                <field name="label">_currency_amount</field>
+                                <field name="engine">custom</field>
+                                <field name="formula">_report_custom_engine_misc_operations</field>
+                                <field name="subformula">amount_currency_id</field>
+                            </record>
+                        </field>
+                    </record>
+                </field>
+            </record>
+            <record id="outstanding" model="account.report.line">
+                <field name="name">Outstanding Receipts/Payments</field>
+                <field name="hierarchy_level">0</field>
+                <field name="expression_ids">
+                    <record id="outstanding_expr" model="account.report.expression">
+                        <field name="label">amount</field>
+                        <field name="engine">aggregation</field>
+                        <field name="formula">outstanding_receipts.amount + outstanding_payments.amount</field>
+                        <field name="auditable" eval="False"/>
+                    </record>
+                    <record id="outstanding_expr_forced_currency_amount" model="account.report.expression">
+                        <field name="label">_currency_amount</field>
+                        <field name="engine">custom</field>
+                        <field name="formula">_report_custom_engine_forced_currency_amount</field>
+                        <field name="subformula">amount_currency_id</field>
+                    </record>
+                </field>
+                <field name="children_ids">
+                    <record id="outstanding_receipts" model="account.report.line">
+                        <field name="name">(+) Outstanding Receipts</field>
+                        <field name="code">outstanding_receipts</field>
+                        <field name="groupby">id</field>
+                        <field name="foldable" eval="True"/>
+                        <field name="expression_ids">
+                            <record id="outstanding_receipts_date" model="account.report.expression">
+                                <field name="label">date</field>
+                                <field name="engine">custom</field>
+                                <field name="formula">_report_custom_engine_outstanding_receipts</field>
+                                <field name="subformula">date</field>
+                                <field name="auditable" eval="False"/>
+                            </record>
+                            <record id="outstanding_receipts_label" model="account.report.expression">
+                                <field name="label">label</field>
+                                <field name="engine">custom</field>
+                                <field name="formula">_report_custom_engine_outstanding_receipts</field>
+                                <field name="subformula">label</field>
+                                <field name="auditable" eval="False"/>
+                            </record>
+                            <record id="outstanding_receipts_amount_currency" model="account.report.expression">
+                                <field name="label">amount_currency</field>
+                                <field name="engine">custom</field>
+                                <field name="formula">_report_custom_engine_outstanding_receipts</field>
+                                <field name="subformula">amount_currency</field>
+                                <field name="auditable" eval="False"/>
+                            </record>
+                            <record id="outstanding_receipts_forced_currency_amount_currency" model="account.report.expression">
+                                <field name="label">_currency_amount_currency</field>
+                                <field name="engine">custom</field>
+                                <field name="formula">_report_custom_engine_outstanding_receipts</field>
+                                <field name="subformula">amount_currency_currency_id</field>
+                            </record>
+                            <record id="outstanding_receipts_currency" model="account.report.expression">
+                              <field name="label">currency</field>
+                              <field name="engine">custom</field>
+                              <field name="formula">_report_custom_engine_outstanding_receipts</field>
+                              <field name="subformula">currency</field>
+                              <field name="auditable" eval="False"/>
+                            </record>
+                            <record id="outstanding_receipts_amount" model="account.report.expression">
+                              <field name="label">amount</field>
+                              <field name="engine">custom</field>
+                              <field name="formula">_report_custom_engine_outstanding_receipts</field>
+                              <field name="subformula">amount</field>
+                              <field name="auditable" eval="False"/>
+                            </record>
+                            <record id="outstanding_receipts_forced_currency_amount" model="account.report.expression">
+                                <field name="label">_currency_amount</field>
+                                <field name="engine">custom</field>
+                                <field name="formula">_report_custom_engine_outstanding_receipts</field>
+                                <field name="subformula">amount_currency_id</field>
+                            </record>
+                        </field>
+                    </record>
+                    <record id="outstanding_payments" model="account.report.line">
+                        <field name="name">(-) Outstanding Payments</field>
+                        <field name="code">outstanding_payments</field>
+                        <field name="groupby">id</field>
+                        <field name="foldable" eval="True"/>
+                        <field name="expression_ids">
+                            <record id="outstanding_payments_date" model="account.report.expression">
+                                <field name="label">date</field>
+                                <field name="engine">custom</field>
+                                <field name="formula">_report_custom_engine_outstanding_payments</field>
+                                <field name="subformula">date</field>
+                                <field name="auditable" eval="False"/>
+                            </record>
+                            <record id="outstanding_payments_label" model="account.report.expression">
+                                <field name="label">label</field>
+                                <field name="engine">custom</field>
+                                <field name="formula">_report_custom_engine_outstanding_payments</field>
+                                <field name="subformula">label</field>
+                                <field name="auditable" eval="False"/>
+                            </record>
+                            <record id="outstanding_payments_amount_currency" model="account.report.expression">
+                                <field name="label">amount_currency</field>
+                                <field name="engine">custom</field>
+                                <field name="formula">_report_custom_engine_outstanding_payments</field>
+                                <field name="subformula">amount_currency</field>
+                                <field name="auditable" eval="False"/>
+                            </record>
+                            <record id="outstanding_payments_forced_currency_amount_currency" model="account.report.expression">
+                                <field name="label">_currency_amount_currency</field>
+                                <field name="engine">custom</field>
+                                <field name="formula">_report_custom_engine_outstanding_payments</field>
+                                <field name="subformula">amount_currency_currency_id</field>
+                            </record>
+                            <record id="outstanding_payments_currency" model="account.report.expression">
+                              <field name="label">currency</field>
+                              <field name="engine">custom</field>
+                              <field name="formula">_report_custom_engine_outstanding_payments</field>
+                              <field name="subformula">currency</field>
+                              <field name="auditable" eval="False"/>
+                            </record>
+                            <record id="outstanding_payments_amount" model="account.report.expression">
+                              <field name="label">amount</field>
+                              <field name="engine">custom</field>
+                              <field name="formula">_report_custom_engine_outstanding_payments</field>
+                              <field name="subformula">amount</field>
+                              <field name="auditable" eval="False"/>
+                            </record>
+                            <record id="outstanding_payments_forced_currency_amount" model="account.report.expression">
+                                <field name="label">_currency_amount</field>
+                                <field name="engine">custom</field>
+                                <field name="formula">_report_custom_engine_outstanding_payments</field>
+                                <field name="subformula">amount_currency_id</field>
+                            </record>
+                        </field>
+                    </record>
+                </field>
+            </record>
+        </field>
+    </record>
+</odoo>
diff --git a/dev_odex30_accounting/odex30_account_reports/data/cash_flow_report.xml b/dev_odex30_accounting/odex30_account_reports/data/cash_flow_report.xml
new file mode 100644
index 0000000..6179612
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_reports/data/cash_flow_report.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo auto_sequence="1">
+    <record id="cash_flow_report" model="account.report">
+        <field name="name">Cash Flow Statement</field>
+        <field name="filter_unfold_all" eval="True"/>
+        <field name="filter_date_range" eval="True"/>
+        <field name="filter_journals" eval="True"/>
+        <field name="filter_period_comparison" eval="False"/>
+        <field name="filter_multi_company">selector</field>
+        <field name="currency_translation">current</field>
+        <field name="custom_handler_model_id" ref="model_account_cash_flow_report_handler"/>
+        <field name="column_ids">
+            <record id="cash_flow_report_balance" model="account.report.column">
+                <field name="name">Balance</field>
+                <field name="expression_label">balance</field>
+            </record>
+        </field>
+    </record>
+</odoo>
diff --git a/dev_odex30_accounting/odex30_account_reports/data/customer_reports_pdf_export_templates.xml b/dev_odex30_accounting/odex30_account_reports/data/customer_reports_pdf_export_templates.xml
new file mode 100644
index 0000000..31c2f27
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_reports/data/customer_reports_pdf_export_templates.xml
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+    <template id="pdf_export_main_customer_report" inherit_id="odex30_account_reports.pdf_export_main" primary="True">
+        <xpath expr="//body//header" position="replace">
+            <header>
+                <div class='o_title text-center'>
+                    <t t-if="report.filter_show_draft and options['all_entries']">[Draft]</t>
+                    <t t-out="report_title"/>
+                </div>
+                <div class="row">
+                    <div class="col-8">
+                        <!-- All company information (name, address, vat, ...) -->
+                        <t t-call="odex30_account_reports.company_information_customer_report"/>
+                    </div>
+                    <div class="col-4">
+                        <!-- All tax and bank information -->
+                        <t t-call="odex30_account_reports.tax_information_customer_report"/>
+                        <t t-call="odex30_account_reports.bank_information_customer_report"/>
+                    </div>
+                </div>
+            </header>
+        </xpath>
+    </template>
+
+    <template id="company_information_customer_report">
+        <t t-set="company_names" t-value="[company['name'] for company in options['companies']]"/>
+        <div class="row">
+            <div class="col-10" t-out="', '.join(company_names)"/>
+        </div>
+
+        <address class="mb-0 o_text_muted" t-field="env.company.partner_id" t-options='{"widget": "contact", "fields": ["address"], "no_marker": True}'/>
+    </template>
+
+    <template id="tax_information_customer_report">
+        <div class="row">
+            <t t-if="options.get('tax_unit', 'company_only') == 'company_only'">
+                <t t-if="env.company.account_fiscal_country_id.vat_label" t-out="env.company.account_fiscal_country_id.vat_label+':'"/>
+                <t t-else="">
+                    <t t-if="env.company.vat">Tax ID:</t>
+                </t>
+                <t t-out="env.company.vat"/>
+            </t>
+            <t t-else="">
+                <t t-set="tax_unit_vat" t-value="env['account.tax.unit'].browse(options.get('tax_unit')).vat"/>
+                <t t-if="tax_unit_vat">
+                    Tax ID: <t t-out="tax_unit_vat"/>
+                </t>
+            </t>
+        </div>
+    </template>
+
+    <template id="bank_information_customer_report">
+        <t t-set="bank_account" t-value="env.company.partner_id.bank_ids.filtered(lambda bank: bank.allow_out_payment)[:1]"/>
+        <div class="row">
+            <t t-if="bank_account">
+                Bank: <t t-out="bank_account.acc_number"/>
+            </t>
+        </div>
+    </template>
+
+</odoo>
diff --git a/dev_odex30_accounting/odex30_account_reports/data/customer_statement.xml b/dev_odex30_accounting/odex30_account_reports/data/customer_statement.xml
new file mode 100644
index 0000000..2ef481a
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_reports/data/customer_statement.xml
@@ -0,0 +1,32 @@
+<odoo auto_sequence="1">
+    <record id="customer_statement_report" model="account.report">
+        <field name="name">Customer Statement</field>
+        <field name="filter_journals" eval="True"/>
+        <field name="root_report_id" ref="odex30_account_reports.partner_ledger_report" />
+        <field name="custom_handler_model_id" ref="model_account_customer_statement_report_handler"/>
+        <field name="column_ids">
+            <record id="customer_statement_report_invoicing_date" model="account.report.column">
+                <field name="name">Invoice Date</field>
+                <field name="expression_label">invoice_date</field>
+                <field name="figure_type">date</field>
+            </record>
+            <record id="customer_statement_report_date_maturity" model="account.report.column">
+                <field name="name">Due Date</field>
+                <field name="expression_label">date_maturity</field>
+                <field name="figure_type">date</field>
+            </record>
+            <record id="customer_statement_amount" model="account.report.column">
+                <field name="name">Amount</field>
+                <field name="expression_label">amount</field>
+            </record>
+            <record id="customer_statement_report_amount_currency" model="account.report.column">
+                <field name="name">Amount Currency</field>
+                <field name="expression_label">amount_currency</field>
+            </record>
+            <record id="customer_statement_report_balance" model="account.report.column">
+                <field name="name">Balance</field>
+                <field name="expression_label">balance</field>
+            </record>
+        </field>
+    </record>
+</odoo>
diff --git a/dev_odex30_accounting/odex30_account_reports/data/deferred_reports.xml b/dev_odex30_accounting/odex30_account_reports/data/deferred_reports.xml
new file mode 100644
index 0000000..437c872
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_reports/data/deferred_reports.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo auto_sequence="1">
+
+    <record id="deferred_expense_report" model="account.report">
+        <field name="name">Deferred Expense Report</field>
+        <field name="filter_journals" eval="True"/>
+        <field name="filter_analytic" eval="True"/>
+        <field name="filter_period_comparison" eval="True"/>
+        <field name="filter_growth_comparison" eval="False"/>
+        <field name="filter_multi_company">selector</field>
+        <field name="filter_unfold_all" eval="True"/>
+        <field name="filter_hierarchy">by_default</field>
+        <field name="default_opening_date_filter">previous_month</field>
+        <field name="search_bar" eval="True"/>
+        <field name="custom_handler_model_id" ref="model_account_deferred_expense_report_handler"/>
+        <field name="column_ids">
+            <record id="deferred_expense_current" model="account.report.column">
+                <field name="name">Current</field>
+                <field name="expression_label">current</field>
+            </record>
+        </field>
+    </record>
+
+    <record id="deferred_revenue_report" model="account.report">
+        <field name="name">Deferred Revenue Report</field>
+        <field name="filter_journals" eval="True"/>
+        <field name="filter_analytic" eval="True"/>
+        <field name="filter_period_comparison" eval="True"/>
+        <field name="filter_growth_comparison" eval="False"/>
+        <field name="filter_multi_company">selector</field>
+        <field name="filter_unfold_all" eval="True"/>
+        <field name="filter_hierarchy">by_default</field>
+        <field name="default_opening_date_filter">previous_month</field>
+        <field name="search_bar" eval="True"/>
+        <field name="custom_handler_model_id" ref="model_account_deferred_revenue_report_handler"/>
+        <field name="column_ids">
+            <record id="deferred_revenue_current" model="account.report.column">
+                <field name="name">Current</field>
+                <field name="expression_label">current</field>
+            </record>
+        </field>
+    </record>
+</odoo>
diff --git a/dev_odex30_accounting/odex30_account_reports/data/executive_summary.xml b/dev_odex30_accounting/odex30_account_reports/data/executive_summary.xml
new file mode 100644
index 0000000..a771e25
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_reports/data/executive_summary.xml
@@ -0,0 +1,395 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo auto_sequence="1">
+    <record id="executive_summary" model="account.report">
+        <field name="name">Executive Summary</field>
+        <field name="filter_multi_company">selector</field>
+        <field name="default_opening_date_filter">this_year</field>
+        <field name="column_ids">
+            <record id="executive_summary_column" model="account.report.column">
+                <field name="name">Balance</field>
+                <field name="expression_label">balance</field>
+            </record>
+        </field>
+        <field name="line_ids">
+            <record id="account_financial_report_executivesummary_cash0" model="account.report.line">
+                <field name="name">Cash</field>
+                <field name="hierarchy_level">0</field>
+                <field name="children_ids">
+                    <record id="account_financial_report_executivesummary_cash_received0" model="account.report.line">
+                        <field name="name">Cash received</field>
+                        <field name="code">CR</field>
+                        <field name="expression_ids">
+                            <record id="account_financial_report_executivesummary_cash_received0_balance" model="account.report.expression">
+                                <field name="label">balance</field>
+                                <field name="engine">domain</field>
+                                <field name="formula" eval="[('account_id.account_type', 'in', ('asset_cash', 'liability_credit_card')), ('debit', '&gt;', 0.0)]"/>
+                                <field name="subformula">sum</field>
+                                <field name="auditable" eval="False"/>
+                            </record>
+                        </field>
+                    </record>
+                    <record id="account_financial_report_executivesummary_cash_spent0" model="account.report.line">
+                        <field name="name">Cash spent</field>
+                        <field name="code">CS</field>
+                        <field name="expression_ids">
+                            <record id="account_financial_report_executivesummary_cash_spent0_balance" model="account.report.expression">
+                                <field name="label">balance</field>
+                                <field name="engine">domain</field>
+                                <field name="formula" eval="[('account_id.account_type', 'in', ('asset_cash', 'liability_credit_card')), ('credit', '&gt;', 0.0)]"/>
+                                <field name="subformula">sum</field>
+                                <field name="green_on_positive" eval="False"/>
+                                <field name="auditable" eval="False"/>
+                            </record>
+                        </field>
+                    </record>
+                    <record id="account_financial_report_executivesummary_cash_surplus0" model="account.report.line">
+                        <field name="name">Cash surplus</field>
+                        <field name="expression_ids">
+                            <record id="account_financial_report_executivesummary_cash_surplus0_balance" model="account.report.expression">
+                                <field name="label">balance</field>
+                                <field name="engine">aggregation</field>
+                                <field name="formula">CR.balance + CS.balance</field>
+                                <field name="auditable" eval="False"/>
+                            </record>
+                        </field>
+                    </record>
+                    <record id="account_financial_report_executivesummary_closing_bank_balance0" model="account.report.line">
+                        <field name="name">Closing bank balance</field>
+                        <field name="expression_ids">
+                            <record id="account_financial_report_executivesummary_closing_bank_balance0_balance" model="account.report.expression">
+                                <field name="label">balance</field>
+                                <field name="engine">domain</field>
+                                <field name="formula" eval="[('account_id.account_type', 'in', ('asset_cash', 'liability_credit_card'))]"/>
+                                <field name="date_scope">from_beginning</field>
+                                <field name="subformula">sum</field>
+                                <field name="auditable" eval="False"/>
+                            </record>
+                        </field>
+                    </record>
+                </field>
+            </record>
+            <record id="account_financial_report_executivesummary_profitability0" model="account.report.line">
+                <field name="name">Profitability</field>
+                <field name="hierarchy_level">0</field>
+                <field name="children_ids">
+                    <record id="account_financial_report_executivesummary_income0" model="account.report.line">
+                        <field name="name">Revenue</field>
+                        <field name="expression_ids">
+                            <record id="account_financial_report_executivesummary_income0_balance" model="account.report.expression">
+                                <field name="label">balance</field>
+                                <field name="engine">aggregation</field>
+                                <field name="formula">REV.balance</field>
+                                <field name="date_scope">strict_range</field>
+                                <field name="subformula">cross_report</field>
+                                <field name="auditable" eval="False"/>
+                            </record>
+                        </field>
+                    </record>
+                    <record id="account_financial_report_executivesummary_direct_costs0" model="account.report.line">
+                        <field name="name">Cost of Revenue</field>
+                        <field name="code">EXEC_COS</field>
+                        <field name="expression_ids">
+                            <record id="account_financial_report_executivesummary_direct_costs0_balance" model="account.report.expression">
+                                <field name="label">balance</field>
+                                <field name="engine">aggregation</field>
+                                <field name="formula">COS.balance</field>
+                                <field name="date_scope">strict_range</field>
+                                <field name="subformula">cross_report</field>
+                                <field name="green_on_positive" eval="False"/>
+                                <field name="auditable" eval="False"/>
+                            </record>
+                        </field>
+                    </record>
+                    <record id="account_financial_report_executivesummary_gross_profit0" model="account.report.line">
+                        <field name="name">Gross profit</field>
+                        <field name="expression_ids">
+                            <record id="account_financial_report_executivesummary_gross_profit0_balance" model="account.report.expression">
+                                <field name="label">balance</field>
+                                <field name="engine">aggregation</field>
+                                <field name="formula">GRP.balance</field>
+                                <field name="date_scope">strict_range</field>
+                                <field name="subformula">cross_report</field>
+                                <field name="auditable" eval="False"/>
+                            </record>
+                        </field>
+                    </record>
+                    <record id="account_financial_report_executivesummary_expenses0" model="account.report.line">
+                        <field name="name">Expenses</field>
+                        <field name="expression_ids">
+                            <record id="account_financial_report_executivesummary_expenses0_balance" model="account.report.expression">
+                                <field name="label">balance</field>
+                                <field name="engine">aggregation</field>
+                                <field name="formula">EXP.balance</field>
+                                <field name="date_scope">strict_range</field>
+                                <field name="subformula">cross_report</field>
+                                <field name="green_on_positive" eval="False"/>
+                                <field name="auditable" eval="False"/>
+                            </record>
+                        </field>
+                    </record>
+                    <record id="account_financial_report_executivesummary_profit0" model="account.report.line">
+                        <field name="name">Net Profit</field>
+                        <field name="code">EXEC_NEP</field>
+                        <field name="expression_ids">
+                            <record id="account_financial_report_executivesummary_profit0_balance" model="account.report.expression">
+                                <field name="label">balance</field>
+                                <field name="engine">aggregation</field>
+                                <field name="formula">NEP.balance</field>
+                                <field name="date_scope">strict_range</field>
+                                <field name="subformula">cross_report</field>
+                                <field name="auditable" eval="False"/>
+                            </record>
+                        </field>
+                    </record>
+                </field>
+            </record>
+            <record id="account_financial_report_executivesummary_balancesheet0" model="account.report.line">
+                <field name="name">Balance Sheet</field>
+                <field name="hierarchy_level">0</field>
+                <field name="children_ids">
+                    <record id="account_financial_report_executivesummary_debtors0" model="account.report.line">
+                        <field name="name">Receivables</field>
+                        <field name="code">DEB</field>
+                        <field name="expression_ids">
+                            <record id="account_financial_report_executivesummary_debtors0_balance" model="account.report.expression">
+                                <field name="label">balance</field>
+                                <field name="engine">domain</field>
+                                <field name="formula" eval="[('account_id.account_type', '=', 'asset_receivable')]"/>
+                                <field name="date_scope">from_beginning</field>
+                                <field name="subformula">sum</field>
+                                <field name="auditable" eval="False"/>
+                            </record>
+                        </field>
+                    </record>
+                    <record id="account_financial_report_executivesummary_creditors0" model="account.report.line">
+                        <field name="name">Payables</field>
+                        <field name="code">CRE</field>
+                        <field name="expression_ids">
+                            <record id="account_financial_report_executivesummary_creditors0_balance" model="account.report.expression">
+                                <field name="label">balance</field>
+                                <field name="engine">domain</field>
+                                <field name="formula" eval="[('account_id.account_type', '=', 'liability_payable')]"/>
+                                <field name="date_scope">from_beginning</field>
+                                <field name="subformula">sum</field>
+                                <field name="green_on_positive" eval="False"/>
+                                <field name="auditable" eval="False"/>
+                            </record>
+                        </field>
+                    </record>
+                    <record id="account_financial_report_executivesummary_net_assets0" model="account.report.line">
+                        <field name="name">Net assets</field>
+                        <field name="code">EXEC_SUMMARY_NA</field>
+                        <field name="expression_ids">
+                            <record id="account_financial_report_executivesummary_net_assets0_balance" model="account.report.expression">
+                                <field name="label">balance</field>
+                                <field name="engine">aggregation</field>
+                                <field name="formula">TA.balance - L.balance</field>
+                                <field name="date_scope">from_beginning</field>
+                                <field name="subformula">cross_report</field>
+                                <field name="auditable" eval="False"/>
+                            </record>
+                        </field>
+                    </record>
+                </field>
+            </record>
+            <record id="account_financial_report_executivesummary_performance0" model="account.report.line">
+                <field name="name">Performance</field>
+                <field name="hierarchy_level">0</field>
+                <field name="children_ids">
+                    <record id="account_financial_report_executivesummary_gpmargin0" model="account.report.line">
+                        <field name="name">Gross profit margin (gross profit / operating income)</field>
+                        <field name="code">GPMARGIN0</field>
+                        <field name="expression_ids">
+                            <record id="account_financial_report_executivesummary_gpmargin0_balance" model="account.report.expression">
+                                <field name="label">balance</field>
+                                <field name="engine">aggregation</field>
+                                <field name="formula">GPMARGIN0.grp / GPMARGIN0.opinc * 100</field>
+                                <field name="subformula">ignore_zero_division</field>
+                                <field name="figure_type">percentage</field>
+                                <field name="auditable" eval="False"/>
+                            </record>
+                            <record id="account_financial_report_executivesummary_gpmargin0_grp" model="account.report.expression">
+                                <field name="label">grp</field>
+                                <field name="engine">aggregation</field>
+                                <field name="formula">GRP.balance</field>
+                                <field name="date_scope">strict_range</field>
+                                <field name="subformula">cross_report</field>
+                            </record>
+                            <record id="account_financial_report_executivesummary_gpmargin0_opinc" model="account.report.expression">
+                                <field name="label">opinc</field>
+                                <field name="engine">aggregation</field>
+                                <field name="formula">REV.balance</field>
+                                <field name="date_scope">strict_range</field>
+                                <field name="subformula">cross_report</field>
+                            </record>
+                        </field>
+                    </record>
+                    <record id="account_financial_report_executivesummary_npmargin0" model="account.report.line">
+                        <field name="name">Net profit margin (net profit / revenue)</field>
+                        <field name="code">NPMARGIN0</field>
+                        <field name="expression_ids">
+                            <record id="account_financial_report_executivesummary_npmargin0_balance" model="account.report.expression">
+                                <field name="label">balance</field>
+                                <field name="engine">aggregation</field>
+                                <field name="formula">NPMARGIN0.nep / NPMARGIN0.rev * 100</field>
+                                <field name="subformula">ignore_zero_division</field>
+                                <field name="figure_type">percentage</field>
+                                <field name="auditable" eval="False"/>
+                            </record>
+                            <record id="account_financial_report_executivesummary_npmargin0_nep" model="account.report.expression">
+                                <field name="label">nep</field>
+                                <field name="engine">aggregation</field>
+                                <field name="formula">NEP.balance</field>
+                                <field name="date_scope">strict_range</field>
+                                <field name="subformula">cross_report</field>
+                            </record>
+                            <record id="account_financial_report_executivesummary_npmargin0_inc" model="account.report.expression">
+                                <field name="label">rev</field>
+                                <field name="engine">aggregation</field>
+                                <field name="formula">REV.balance</field>
+                                <field name="date_scope">strict_range</field>
+                                <field name="subformula">cross_report</field>
+                            </record>
+                        </field>
+                    </record>
+                    <record id="account_financial_report_executivesummary_return_investment0" model="account.report.line">
+                        <field name="name">Return on investments (net profit / assets)</field>
+                        <field name="code">ROI</field>
+                        <field name="expression_ids">
+                            <record id="account_financial_report_executivesummary_return_investment0_balance" model="account.report.expression">
+                                <field name="label">balance</field>
+                                <field name="engine">aggregation</field>
+                                <field name="formula">ROI.nep / ROI.ta * 100</field>
+                                <field name="subformula">ignore_zero_division</field>
+                                <field name="figure_type">percentage</field>
+                                <field name="auditable" eval="False"/>
+                            </record>
+                            <record id="account_financial_report_executivesummary_return_investment0_nep" model="account.report.expression">
+                                <field name="label">nep</field>
+                                <field name="engine">aggregation</field>
+                                <field name="formula">NEP.balance</field>
+                                <field name="date_scope">strict_range</field>
+                                <field name="subformula">cross_report</field>
+                            </record>
+                            <record id="account_financial_report_executivesummary_return_investment0_ta" model="account.report.expression">
+                                <field name="label">ta</field>
+                                <field name="engine">aggregation</field>
+                                <field name="formula">TA.balance</field>
+                                <field name="date_scope">from_beginning</field>
+                                <field name="subformula">cross_report</field>
+                            </record>
+                        </field>
+                    </record>
+                </field>
+            </record>
+            <record id="account_financial_report_executivesummary_position0" model="account.report.line">
+                <field name="name">Position</field>
+                <field name="hierarchy_level">0</field>
+                <field name="children_ids">
+                    <record id="account_financial_report_executivesummary_avdebt0" model="account.report.line">
+                        <field name="name">Average debtors days</field>
+                        <field name="code">AVG_DEBT_DAYS</field>
+                        <field name="expression_ids">
+                            <record id="account_financial_report_executivesummary_avdebt0_balance" model="account.report.expression">
+                                <field name="label">balance</field>
+                                <field name="engine">aggregation</field>
+                                <field name="formula">DEB.balance / AVG_DEBT_DAYS.opinc * AVG_DEBT_DAYS.NDays</field>
+                                <field name="subformula">ignore_zero_division</field>
+                                <field name="green_on_positive" eval="False"/>
+                                <field name="figure_type">float</field>
+                                <field name="auditable" eval="False"/>
+                            </record>
+                            <record id="account_financial_report_executivesummary_avdebt0_opinc" model="account.report.expression">
+                                <field name="label">opinc</field>
+                                <field name="engine">aggregation</field>
+                                <field name="formula">REV.balance</field>
+                                <field name="date_scope">strict_range</field>
+                                <field name="subformula">cross_report</field>
+                            </record>
+                            <record id="account_financial_report_executivesummary_avdebt0_ndays" model="account.report.expression">
+                                <field name="label">NDays</field>
+                                <field name="engine">custom</field>
+                                <field name="formula">_report_custom_engine_executive_summary_ndays</field>
+                                <field name="auditable" eval="False"/>
+                            </record>
+                        </field>
+                    </record>
+                    <record id="account_financial_report_executivesummary_avgcre0" model="account.report.line">
+                        <field name="name">Average creditors days</field>
+                        <field name="code">AVG_CRED_DAYS</field>
+                        <field name="expression_ids">
+                            <record id="account_financial_report_executivesummary_avgcre0_balance" model="account.report.expression">
+                                <field name="label">balance</field>
+                                <field name="engine">aggregation</field>
+                                <field name="formula">-CRE.balance / (AVG_CRED_DAYS.cos + AVG_CRED_DAYS.exp) * AVG_CRED_DAYS.NDays</field>
+                                <field name="subformula">ignore_zero_division</field>
+                                <field name="green_on_positive" eval="False"/>
+                                <field name="figure_type">float</field>
+                                <field name="auditable" eval="False"/>
+                            </record>
+                            <record id="account_financial_report_executivesummary_avgcre0_cos" model="account.report.expression">
+                                <field name="label">cos</field>
+                                <field name="engine">aggregation</field>
+                                <field name="formula">COS.balance</field>
+                                <field name="date_scope">strict_range</field>
+                                <field name="subformula">cross_report</field>
+                            </record>
+                            <record id="account_financial_report_executivesummary_avgcre0_exp" model="account.report.expression">
+                                <field name="label">exp</field>
+                                <field name="engine">aggregation</field>
+                                <field name="formula">EXP.balance</field>
+                                <field name="date_scope">strict_range</field>
+                                <field name="subformula">cross_report</field>
+                            </record>
+                            <record id="account_financial_report_executivesummary_avgcre0_ndays" model="account.report.expression">
+                                <field name="label">NDays</field>
+                                <field name="engine">custom</field>
+                                <field name="formula">_report_custom_engine_executive_summary_ndays</field>
+                                <field name="auditable" eval="False"/>
+                            </record>
+                        </field>
+                    </record>
+                    <record id="account_financial_report_executivesummary_st_cash_forecast0" model="account.report.line">
+                        <field name="name">Short term cash forecast</field>
+                        <field name="expression_ids">
+                            <record id="account_financial_report_executivesummary_st_cash_forecast0_balance" model="account.report.expression">
+                                <field name="label">balance</field>
+                                <field name="engine">aggregation</field>
+                                <field name="formula">DEB.balance + CRE.balance</field>
+                                <field name="auditable" eval="False"/>
+                            </record>
+                        </field>
+                    </record>
+                    <record id="account_financial_report_executivesummary_ca_to_l0" model="account.report.line">
+                        <field name="name">Current assets to liabilities</field>
+                        <field name="code">CATL</field>
+                        <field name="expression_ids">
+                            <record id="account_financial_report_executivesummary_ca_to_l0_balance" model="account.report.expression">
+                                <field name="label">balance</field>
+                                <field name="engine">aggregation</field>
+                                <field name="formula">CATL.ca / CATL.cl</field>
+                                <field name="subformula">ignore_zero_division</field>
+                                <field name="figure_type">float</field>
+                                <field name="auditable" eval="False"/>
+                            </record>
+                            <record id="account_financial_report_executivesummary_ca_to_l0_ca" model="account.report.expression">
+                                <field name="label">ca</field>
+                                <field name="engine">aggregation</field>
+                                <field name="formula">CA.balance</field>
+                                <field name="date_scope">from_beginning</field>
+                                <field name="subformula">cross_report</field>
+                            </record>
+                            <record id="account_financial_report_executivesummary_ca_to_l0_cl" model="account.report.expression">
+                                <field name="label">cl</field>
+                                <field name="engine">aggregation</field>
+                                <field name="formula">CL.balance</field>
+                                <field name="date_scope">from_beginning</field>
+                                <field name="subformula">cross_report</field>
+                            </record>
+                        </field>
+                    </record>
+                </field>
+            </record>
+        </field>
+    </record>
+</odoo>
diff --git a/dev_odex30_accounting/odex30_account_reports/data/followup_report.xml b/dev_odex30_accounting/odex30_account_reports/data/followup_report.xml
new file mode 100644
index 0000000..928be76
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_reports/data/followup_report.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<odoo auto_sequence="1">
+    <record id="followup_report" model="account.report">
+        <field name="name">Follow-Up Report</field>
+        <field name="filter_journals" eval="True"/>
+        <field name="default_opening_date_filter">today</field>
+        <field name="filter_date_range" eval="False"/>
+        <field name="load_more_limit" eval="80"/>
+        <field name="root_report_id" ref="odex30_account_reports.partner_ledger_report"/>
+        <field name="custom_handler_model_id" ref="model_account_followup_report_handler"/>
+        <field name="filter_account_type">receivable</field>
+        <field name="column_ids">
+            <record id="followup_report_invoicing_date" model="account.report.column">
+                <field name="name">Invoice Date</field>
+                <field name="expression_label">invoice_date</field>
+                <field name="figure_type">date</field>
+            </record>
+            <record id="followup_report_date_maturity" model="account.report.column">
+                <field name="name">Due Date</field>
+                <field name="expression_label">date_maturity</field>
+                <field name="figure_type">date</field>
+            </record>
+            <record id="followup_report_amount" model="account.report.column">
+                <field name="name">Amount</field>
+                <field name="expression_label">amount</field>
+            </record>
+            <record id="followup_report_report_amount_currency" model="account.report.column">
+                <field name="name">Amount Currency</field>
+                <field name="expression_label">amount_currency</field>
+            </record>
+            <record id="followup_report_report_balance" model="account.report.column">
+                <field name="name">Balance</field>
+                <field name="expression_label">balance</field>
+            </record>
+        </field>
+    </record>
+</odoo>
diff --git a/dev_odex30_accounting/odex30_account_reports/data/general_ledger.xml b/dev_odex30_accounting/odex30_account_reports/data/general_ledger.xml
new file mode 100644
index 0000000..d48f428
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_reports/data/general_ledger.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo auto_sequence="1">
+    <record id="general_ledger_report" model="account.report">
+        <field name="name">General Ledger</field>
+        <field name="filter_journals" eval="True"/>
+        <field name="filter_analytic" eval="True"/>
+        <field name="filter_period_comparison" eval="False"/>
+        <field name="filter_multi_company">selector</field>
+        <field name="filter_unfold_all" eval="True"/>
+        <field name="filter_hide_0_lines">never</field>
+        <field name="default_opening_date_filter">this_month</field>
+        <field name="search_bar" eval="True"/>
+        <field name="load_more_limit" eval="80"/>
+        <field name="custom_handler_model_id" ref="model_account_general_ledger_report_handler"/>
+        <field name="column_ids">
+            <record id="general_ledger_report_date" model="account.report.column">
+                <field name="name">Date</field>
+                <field name="expression_label">date</field>
+                <field name="figure_type">date</field>
+            </record>
+            <record id="general_ledger_report_communication" model="account.report.column">
+                <field name="name">Communication</field>
+                <field name="expression_label">communication</field>
+                <field name="figure_type">string</field>
+            </record>
+            <record id="general_ledger_report_partner_name" model="account.report.column">
+                <field name="name">Partner</field>
+                <field name="expression_label">partner_name</field>
+                <field name="figure_type">string</field>
+            </record>
+            <record id="general_ledger_report_amount_currency" model="account.report.column">
+                <field name="name">Currency</field>
+                <field name="expression_label">amount_currency</field>
+            </record>
+            <record id="general_ledger_report_debit" model="account.report.column">
+                <field name="name">Debit</field>
+                <field name="expression_label">debit</field>
+            </record>
+            <record id="general_ledger_report_credit" model="account.report.column">
+                <field name="name">Credit</field>
+                <field name="expression_label">credit</field>
+            </record>
+            <record id="general_ledger_report_balance" model="account.report.column">
+                <field name="name">Balance</field>
+                <field name="expression_label">balance</field>
+            </record>
+        </field>
+    </record>
+</odoo>
diff --git a/dev_odex30_accounting/odex30_account_reports/data/generic_tax_report.xml b/dev_odex30_accounting/odex30_account_reports/data/generic_tax_report.xml
new file mode 100644
index 0000000..3da471f
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_reports/data/generic_tax_report.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<odoo>
+    <record id="account.generic_tax_report" model="account.report">
+        <field name="custom_handler_model_id" ref="model_account_generic_tax_report_handler"/>
+    </record>
+
+    <record id="account.generic_tax_report_account_tax" model="account.report">
+        <field name="custom_handler_model_id" ref="model_account_generic_tax_report_handler_account_tax"/>
+    </record>
+
+    <record id="account.generic_tax_report_tax_account" model="account.report">
+        <field name="custom_handler_model_id" ref="model_account_generic_tax_report_handler_tax_account"/>
+    </record>
+</odoo>
diff --git a/dev_odex30_accounting/odex30_account_reports/data/journal_report.xml b/dev_odex30_accounting/odex30_account_reports/data/journal_report.xml
new file mode 100644
index 0000000..09da773
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_reports/data/journal_report.xml
@@ -0,0 +1,239 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+  <data auto_sequence="1">
+    <record id="journal_report" model="account.report">
+        <field name="name">Journal Report</field>
+        <field name="filter_journals" eval="True"/>
+        <field name="filter_show_draft" eval="True"/>
+        <field name="filter_unfold_all" eval="True"/>
+        <field name="filter_hierarchy">never</field>
+        <field name="filter_period_comparison" eval="False"/>
+        <field name="filter_unreconciled" eval="False"/>
+        <field name="filter_hide_0_lines">never</field>
+        <field name="default_opening_date_filter">this_year</field>
+        <field name="custom_handler_model_id" ref="model_account_journal_report_handler"/>
+        <field name="column_ids">
+            <record id="journal_report_code" model="account.report.column">
+                <field name="name">Code</field>
+                <field name="expression_label">code</field>
+                <field name="figure_type">string</field>
+            </record>
+            <record id="journal_report_debit" model="account.report.column">
+                <field name="name">Debit</field>
+                <field name="expression_label">debit</field>
+            </record>
+            <record id="journal_report_credit" model="account.report.column">
+                <field name="name">Credit</field>
+                <field name="expression_label">credit</field>
+            </record>
+            <record id="journal_report_balance" model="account.report.column">
+                <field name="name">Balance</field>
+                <field name="expression_label">balance</field>
+            </record>
+        </field>
+        <field name="line_ids">
+            <record id="journal_report_line" model="account.report.line">
+                <field name="name">Name</field>
+                <field name="groupby">journal_id, account_id</field>
+                <field name="hierarchy_level">0</field>
+                <field name="expression_ids">
+                    <record id="journal_report_line_code" model="account.report.expression">
+                        <field name="label">code</field>
+                        <field name="engine">custom</field>
+                        <field name="formula">_report_custom_engine_journal_report</field>
+                        <field name="subformula">code</field>
+                    </record>
+                    <record id="journal_report_line_debit" model="account.report.expression">
+                        <field name="label">debit</field>
+                        <field name="engine">custom</field>
+                        <field name="formula">_report_custom_engine_journal_report</field>
+                        <field name="subformula">debit</field>
+                    </record>
+                    <record id="journal_report_line_credit" model="account.report.expression">
+                        <field name="label">credit</field>
+                        <field name="engine">custom</field>
+                        <field name="formula">_report_custom_engine_journal_report</field>
+                        <field name="subformula">credit</field>
+                    </record>
+                    <record id="journal_report_line_balance" model="account.report.expression">
+                        <field name="label">balance</field>
+                        <field name="engine">custom</field>
+                        <field name="formula">_report_custom_engine_journal_report</field>
+                        <field name="subformula">balance</field>
+                    </record>
+                </field>
+            </record>
+        </field>
+    </record>
+  </data>
+
+  <data>
+    <template id="journal_report_pdf_export_main">
+        <html>
+            <head>
+                 <base t-att-href="base_url"/>
+                 <meta http-equiv="content-type" content="text/html; charset=utf-8"/>
+                 <t t-call-assets="odex30_account_reports.assets_pdf_export" t-js="False"/>
+             </head>
+            <body t-att-dir="env['res.lang']._get_data(code=lang or env.user.lang).direction or 'ltr'">
+                <div t-att-class="options['css_custom_class']">
+                    <header>
+                        <div class="row align-items-center">
+                            <div class="col-4 o_header_font">
+                                 <t t-call="odex30_account_reports.company_information"/>
+                            </div>
+                            <div class="col-4">
+                                 <div class="o_title">
+                                    <t t-if="report.filter_show_draft and options['all_entries']">[Draft]</t>
+                                    <t t-out="report.name"/>
+                                </div>
+                                <div class="o_subtitle">
+                                    <t t-out="options['date']['date_from']"/> - <t t-out="options['date']['date_to']"/>
+                                </div>
+                            </div>
+                        </div>
+                    </header>
+
+                    <!-- Journal entries -->
+                    <t t-foreach="document_data['journals_vals']" t-as="journal_vals">
+                        <section style="page-break-after: always;">
+                            <div class="o_section_title">
+                                <t t-out="journal_vals.get('name')"/>
+                            </div>
+                            <div class="d-flex align-items-start">
+                                <t t-call="odex30_account_reports.journal_report_pdf_body_default"/>
+                            </div>
+
+                            <t t-if="journal_vals.get('tax_summary')">
+                                <t t-call="odex30_account_reports.pdf_journal_report_taxes_summary">
+                                    <t t-set="tax_summary" t-value="journal_vals['tax_summary']"/>
+                                </t>
+                            </t>
+                        </section>
+                    </t>
+
+                    <section t-if="document_data.get('global_tax_summary')">
+                        <div class="o_section_title">
+                            Global Tax Summary
+                        </div>
+                        <t t-call="odex30_account_reports.pdf_journal_report_taxes_summary">
+                            <t t-set="tax_summary" t-value="document_data['global_tax_summary']"/>
+                        </t>
+                    </section>
+                </div>
+            </body>
+        </html>
+    </template>
+
+    <template id="journal_report_pdf_body_default">
+        <table class="o_table">
+            <thead>
+                <tr>
+                    <t t-foreach="journal_vals['columns']" t-as="column">
+                        <th t-att-class="column.get('class', '')">
+                            <t t-out="column.get('name', '')"/>
+                        </th>
+                    </t>
+                </tr>
+            </thead>
+
+            <tbody>
+                <t t-foreach="journal_vals['lines']" t-as="line">
+                    <tr t-att-class="line.get('line_class', '')">
+                        <t t-foreach="journal_vals['columns']" t-as="column">
+                            <t t-if="line.get(column['label'])">
+                                <t t-set="cell_style" t-value="line[column['label']].get('class', '')"/>
+                                <t t-set="column_style" t-value="column.get('class', '')"/>
+                                <td t-att-class="cell_style + column_style">
+                                    <t t-out="line[column['label']]['data']"/>
+                                </td>
+                            </t>
+                            <t t-else="">
+                                <td/>
+                            </t>
+                        </t>
+                    </tr>
+                </t>
+            </tbody>
+        </table>
+    </template>
+
+    <template id="pdf_journal_report_taxes_summary">
+        <div class="container tax_summary" style="page-break-inside: avoid;">
+            <t t-set="taxes" t-value="tax_summary.get('tax_report_lines')"/>
+            <t t-if="taxes">
+                <div class="row o_section_subtitle">
+                    <p>Tax Applied</p>
+                </div>
+                <div class="row taxes">
+                    <t t-set="extra_columns" t-value="tax_summary.get('extra_columns')"/>
+                    <table class="o_table">
+                        <thead>
+                            <tr>
+                                <th t-if="len(taxes) > 1">Country</th>
+                                <th>Name</th>
+                                <th class="o_right_alignment">Base Amount</th>
+                                <th class="o_right_alignment">Tax Amount</th>
+                                <th t-if="tax_summary.get('tax_non_deductible_column')" class="o_right_alignment">Non-Deductible</th>
+                                <th t-if="tax_summary.get('tax_deductible_column')" class="o_right_alignment">Deductible</th>
+                                <th t-if="tax_summary.get('tax_due_column')" class="o_right_alignment">Due</th>
+                            </tr>
+                        </thead>
+                        <tbody>
+                            <t t-foreach="taxes" t-as="country_name">
+                                <tr t-foreach="taxes[country_name]" t-as="tax">
+                                    <t t-if="country_name_size > 1">
+                                        <td>
+                                            <t t-if="tax_index == 0" t-out="country_name"/>
+                                        </td>
+                                    </t>
+                                    <td t-out="tax['name']"/>
+                                    <td class="o_right_alignment" t-out="tax['base_amount']"/>
+                                    <td class="o_right_alignment" t-out="tax['tax_amount']"/>
+                                    <td t-if="tax_summary.get('tax_non_deductible_column')" class="o_right_alignment" t-out="tax['tax_non_deductible']"/>
+                                    <td t-if="tax_summary.get('tax_deductible_column')" class="o_right_alignment" t-out="tax['tax_deductible']"/>
+                                    <td t-if="tax_summary.get('tax_due_column')" class="o_right_alignment" t-out="tax['tax_due']"/>
+                                </tr>
+                            </t>
+                        </tbody>
+                    </table>
+                </div>
+            </t>
+            <t t-set="grids" t-value="tax_summary.get('tax_grid_summary_lines')"/>
+            <t t-if="grids">
+                <div class="row o_section_subtitle">
+                    <p>Impacted Tax Grids</p>
+                </div>
+                <div class="row tax_grid">
+                    <table class="o_table">
+                        <thead>
+                            <tr>
+                                <th t-if="len(grids) > 1">Country</th>
+                                <th>Grid</th>
+                                <th class="o_right_alignment">+</th>
+                                <th class="o_right_alignment">-</th>
+                                <th class="o_right_alignment">Impact On Grid</th>
+                            </tr>
+                        </thead>
+                        <tbody>
+                            <t t-foreach="grids" t-as="country_name">
+                                <tr t-foreach="grids[country_name]" t-as="grid_name">
+                                    <t t-if="country_name_size > 1">
+                                        <td>
+                                            <t t-if="grid_name_index == 0" t-out="country_name"/>
+                                        </td>
+                                    </t>
+                                    <td t-out="grid_name"/>
+                                    <td class="o_right_alignment" t-out="grids[country_name][grid_name].get('+', 0)"/>
+                                    <td class="o_right_alignment" t-out="grids[country_name][grid_name].get('-', 0)"/>
+                                    <td class="o_right_alignment" t-out="grids[country_name][grid_name]['impact']"/>
+                                </tr>
+                            </t>
+                        </tbody>
+                    </table>
+                </div>
+            </t>
+        </div>
+    </template>
+  </data>
+</odoo>
diff --git a/dev_odex30_accounting/odex30_account_reports/data/mail_activity_type_data.xml b/dev_odex30_accounting/odex30_account_reports/data/mail_activity_type_data.xml
new file mode 100644
index 0000000..4638127
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_reports/data/mail_activity_type_data.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <data>
+        <record id="tax_closing_activity_type" model="mail.activity.type">
+            <field name="name">Tax Report</field>
+            <field name="summary">Tax Report</field>
+            <field name="category">tax_report</field>
+            <field name="res_model">account.journal</field>
+            <field name="chaining_type">suggest</field>
+        </record>
+
+        <record id="mail_activity_type_tax_report_to_pay" model="mail.activity.type">
+            <field name="name">Pay Tax</field>
+            <field name="summary">Tax is ready to be paid</field>
+            <field name="category">tax_report</field>
+            <field name="delay_count">0</field>
+            <field name="delay_unit">days</field>
+            <field name="delay_from">previous_activity</field>
+            <field name="res_model">account.move</field>
+            <field name="chaining_type">suggest</field>
+        </record>
+
+        <record id="mail_activity_type_tax_report_to_be_sent" model="mail.activity.type">
+            <field name="name">Tax Report Ready</field>
+            <field name="summary">Tax report is ready to be sent to the administration</field>
+            <field name="category">tax_report</field>
+            <field name="delay_count">0</field>
+            <field name="delay_unit">days</field>
+            <field name="delay_from">current_date</field>
+            <field name="res_model">account.move</field>
+            <field name="chaining_type">suggest</field>
+        </record>
+
+        <record id="mail_activity_type_tax_report_error" model="mail.activity.type">
+            <field name="name">Tax Report - Error</field>
+            <field name="summary">Error sending Tax Report</field>
+            <field name="category">tax_report</field>
+            <field name="res_model">account.move</field>
+            <field name="decoration_type">warning</field>
+        </record>
+    </data>
+</odoo>
diff --git a/dev_odex30_accounting/odex30_account_reports/data/mail_templates.xml b/dev_odex30_accounting/odex30_account_reports/data/mail_templates.xml
new file mode 100644
index 0000000..b4af9e0
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_reports/data/mail_templates.xml
@@ -0,0 +1,26 @@
+<odoo>
+    <record id="email_template_customer_statement" model="mail.template">
+        <field name="name">Customer Statement</field>
+        <field name="model_id" ref="base.model_res_partner"/>
+        <field name="email_from">{{ object._get_followup_responsible().email_formatted }}</field>
+        <field name="subject">{{ (object.company_id or object._get_followup_responsible().company_id).name }} Statement - {{ object.commercial_company_name }}</field>
+        <field name="body_html" type="html">
+            <div style="margin: 0px; padding: 0px;">
+                <p style="margin: 0px; padding: 0px;">
+                    <t t-if="object.id != object.commercial_partner_id.id">Dear <t t-out="object.name or ''"/> (<t t-out="object.commercial_partner_id.name or ''"/>),</t>
+                    <t t-else="">Dear <t t-out="object.name or ''"/>,</t>
+                    <br/>
+                    Please find enclosed the statement of your account.
+                    <br/>
+                    Do not hesitate to contact us if you have any questions.
+                    <br/>
+                    Sincerely,
+                    <br/>
+	                <t t-out="object._get_followup_responsible().name if is_html_empty(object._get_followup_responsible().signature) else object._get_followup_responsible().signature"/>
+                </p>
+            </div>
+        </field>
+        <field name="lang">{{ object.lang }}</field>
+        <field name="auto_delete" eval="False"/>
+    </record>
+</odoo>
diff --git a/dev_odex30_accounting/odex30_account_reports/data/menuitems.xml b/dev_odex30_accounting/odex30_account_reports/data/menuitems.xml
new file mode 100644
index 0000000..fadfd37
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_reports/data/menuitems.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <menuitem id="menu_action_account_report_partner_ledger" name="Partner Ledger" action="action_account_report_partner_ledger" groups="account.group_account_readonly" parent="account.account_reports_partners_reports_menu"/>
+    <menuitem id="menu_action_account_report_aged_receivable" name="Aged Receivable" action="action_account_report_ar" groups="account.group_account_readonly" parent="account.account_reports_partners_reports_menu"/>
+    <menuitem id="menu_action_account_report_aged_payable" name="Aged Payable" action="action_account_report_ap" groups="account.group_account_readonly" parent="account.account_reports_partners_reports_menu"/>
+    <menuitem id="account_reports_audit_reports_menu" name="Audit Reports" parent="account.menu_finance_reports" sequence="2">
+        <menuitem id="menu_action_account_report_general_ledger" name="General Ledger" action="action_account_report_general_ledger" groups="account.group_account_readonly"/>
+        <menuitem id="menu_action_account_report_coa" name="Trial Balance" action="action_account_report_coa" groups="account.group_account_readonly"/>
+        <menuitem id="menu_action_account_report_ja" name="Journal Audit" action="action_account_report_ja" groups="account.group_account_readonly"/>
+    </menuitem>
+
+    <menuitem id="menu_action_account_report_gt" name="Tax Return" action="action_account_report_gt" parent="account.account_reports_legal_statements_menu" sequence="50" groups="account.group_account_readonly,account.group_account_basic"/>
+    <menuitem id="menu_action_account_report_sales" action="action_account_report_sales" parent="account.account_reports_legal_statements_menu" sequence="60" groups="account.group_account_readonly" active="False"/>
+
+    <menuitem id="menu_action_account_report_multicurrency_revaluation" name="Unrealized Currency Gains/Losses" action="action_account_report_multicurrency_revaluation" parent="account.account_reports_management_menu" groups="base.group_multi_currency"/>
+    <menuitem id="menu_action_account_report_balance_sheet" name="Balance Sheet" action="action_account_report_bs" parent="account.account_reports_legal_statements_menu" groups="account.group_account_readonly"/>
+    <menuitem id="menu_action_account_report_profit_and_loss" name="Profit and Loss" action="action_account_report_pl" parent="account.account_reports_legal_statements_menu" groups="account.group_account_readonly"/>
+    <menuitem id="menu_action_account_report_cash_flow" name="Cash Flow Statement" action="action_account_report_cs" parent="account.account_reports_legal_statements_menu" groups="account.group_account_readonly"/>
+    <menuitem id="menu_action_account_report_exec_summary" name="Executive Summary" action="action_account_report_exec_summary" parent="account.account_reports_legal_statements_menu" groups="account.group_account_readonly"/>
+    <menuitem id="menu_action_account_report_deferred_revenue" name="Deferred Revenue" action="action_account_report_deferred_revenue" parent="account.account_reports_management_menu" groups="account.group_account_readonly"/>
+    <menuitem id="menu_action_account_report_deferred_expense" name="Deferred Expense" action="action_account_report_deferred_expense" parent="account.account_reports_management_menu" groups="account.group_account_readonly"/>
+    <menuitem id="menu_action_account_report_tree" name="Accounting Reports" sequence="6" parent="account.account_management_menu" action="action_account_report_tree" groups="base.group_no_one"/>
+    <menuitem id="menu_action_account_report_horizontal_groups" name="Horizontal Groups" action="action_account_report_horizontal_groups" parent="account.account_account_menu" sequence="10" groups="base.group_no_one"/>
+    <menuitem id="menu_action_account_report_budget_tree" name="Financial Budgets" action="action_account_report_budget_tree" parent="account.account_account_menu" sequence="11"/>
+</odoo>
diff --git a/dev_odex30_accounting/odex30_account_reports/data/multicurrency_revaluation_report.xml b/dev_odex30_accounting/odex30_account_reports/data/multicurrency_revaluation_report.xml
new file mode 100644
index 0000000..c18e4d6
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_reports/data/multicurrency_revaluation_report.xml
@@ -0,0 +1,107 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo auto_sequence="1">
+    <record id="multicurrency_revaluation_report" model="account.report">
+        <field name="name">Unrealized Currency Gains/Losses</field>
+        <field name="filter_date_range" eval="False"/>
+        <field name="filter_show_draft" eval="True"/>
+        <field name="default_opening_date_filter">previous_month</field>
+        <field name="custom_handler_model_id" ref="model_account_multicurrency_revaluation_report_handler"/>
+        <field name="column_ids">
+            <record id="multicurrency_revaluation_report_balance_currency" model="account.report.column">
+                <field name="name">Balance in Foreign Currency</field>
+                <field name="expression_label">balance_currency</field>
+            </record>
+            <record id="multicurrency_revaluation_report_balance_operation" model="account.report.column">
+                <field name="name">Balance at Operation Rate</field>
+                <field name="expression_label">balance_operation</field>
+            </record>
+            <record id="multicurrency_revaluation_report_balance_current" model="account.report.column">
+                <field name="name">Balance at Current Rate</field>
+                <field name="expression_label">balance_current</field>
+            </record>
+            <record id="multicurrency_revaluation_report_adjustment" model="account.report.column">
+                <field name="name">Adjustment</field>
+                <field name="expression_label">adjustment</field>
+            </record>
+        </field>
+        <field name="line_ids">
+            <record id="multicurrency_revaluation_to_adjust" model="account.report.line">
+                <field name="name">Accounts To Adjust</field>
+                <field name="code">multicurrency_included</field>
+                <field name="groupby">currency_id, account_id, id</field>
+                <field name="expression_ids">
+                    <record id="multicurrency_revaluation_to_adjust_balance_currency" model="account.report.expression">
+                        <field name="label">balance_currency</field>
+                        <field name="engine">custom</field>
+                        <field name="formula">_report_custom_engine_multi_currency_revaluation_to_adjust</field>
+                        <field name="subformula">balance_currency</field>
+                    </record>
+                    <record id="multicurrency_revaluation_to_adjust_balance_currency_forced_currency" model="account.report.expression">
+                        <field name="label">_currency_balance_currency</field>
+                        <field name="engine">custom</field>
+                        <field name="formula">_report_custom_engine_multi_currency_revaluation_to_adjust</field>
+                        <field name="subformula">currency_id</field>
+                    </record>
+                    <record id="multicurrency_revaluation_to_adjust_balance_operation" model="account.report.expression">
+                        <field name="label">balance_operation</field>
+                        <field name="engine">custom</field>
+                        <field name="formula">_report_custom_engine_multi_currency_revaluation_to_adjust</field>
+                        <field name="subformula">balance_operation</field>
+                        <field name="auditable" eval="False"/>
+                    </record>
+                    <record id="multicurrency_revaluation_to_adjust_balance_current" model="account.report.expression">
+                        <field name="label">balance_current</field>
+                        <field name="engine">custom</field>
+                        <field name="formula">_report_custom_engine_multi_currency_revaluation_to_adjust</field>
+                        <field name="subformula">balance_current</field>
+                        <field name="auditable" eval="False"/>
+                    </record>
+                    <record id="multicurrency_revaluation_to_adjust_adjustment" model="account.report.expression">
+                        <field name="label">adjustment</field>
+                        <field name="engine">custom</field>
+                        <field name="formula">_report_custom_engine_multi_currency_revaluation_to_adjust</field>
+                        <field name="subformula">adjustment</field>
+                        <field name="auditable" eval="False"/>
+                    </record>
+                </field>
+            </record>
+
+            <record id="multicurrency_revaluation_excluded" model="account.report.line">
+                <field name="name">Excluded Accounts</field>
+                <field name="groupby">currency_id, account_id, id</field>
+                <field name="expression_ids">
+                    <record id="multicurrency_revaluation_excluded_balance_currency" model="account.report.expression">
+                        <field name="label">balance_currency</field>
+                        <field name="engine">custom</field>
+                        <field name="formula">_report_custom_engine_multi_currency_revaluation_excluded</field>
+                        <field name="subformula">balance_currency</field>
+                    </record>
+                    <record id="multicurrency_revaluation_excluded_balance_currency_forced_currency" model="account.report.expression">
+                        <field name="label">_currency_balance_currency</field>
+                        <field name="engine">custom</field>
+                        <field name="formula">_report_custom_engine_multi_currency_revaluation_excluded</field>
+                        <field name="subformula">currency_id</field>
+                    </record>
+                    <record id="multicurrency_revaluation_excluded_balance_operation" model="account.report.expression">
+                        <field name="label">balance_operation</field>
+                        <field name="engine">custom</field>
+                        <field name="formula">_report_custom_engine_multi_currency_revaluation_excluded</field>
+                        <field name="subformula">balance_operation</field>
+                    </record>
+                    <record id="multicurrency_revaluation_excluded_balance_current" model="account.report.expression">
+                        <field name="label">balance_current</field>
+                        <field name="engine">custom</field>
+                        <field name="formula">_report_custom_engine_multi_currency_revaluation_excluded</field>
+                        <field name="subformula">balance_current</field>
+                    </record>
+                    <record id="multicurrency_revaluation_excluded_adjustment" model="account.report.expression">
+                        <field name="label">adjustment</field>
+                        <field name="engine">custom</field>
+                        <field name="formula">_report_custom_engine_multi_currency_revaluation_excluded</field>
+                        <field name="subformula">adjustment</field>
+                    </record>
+                </field>
+            </record>
+        </field>
+    </record>
+</odoo>
diff --git a/dev_odex30_accounting/odex30_account_reports/data/partner_ledger.xml b/dev_odex30_accounting/odex30_account_reports/data/partner_ledger.xml
new file mode 100644
index 0000000..cd4ff52
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_reports/data/partner_ledger.xml
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo auto_sequence="1">
+    <record id="partner_ledger_report" model="account.report">
+        <field name="name">Partner Ledger</field>
+        <field name="filter_show_draft" eval="True"/>
+        <field name="filter_account_type">both</field>
+        <field name="filter_partner" eval="True"/>
+        <field name="filter_unfold_all" eval="True"/>
+        <field name="filter_unreconciled" eval="True"/>
+        <field name="filter_period_comparison" eval="False"/>
+        <field name="filter_multi_company">selector</field>
+        <field name="filter_hide_0_lines">never</field>
+        <field name="default_opening_date_filter">this_year</field>
+        <field name="search_bar" eval="True"/>
+        <field name="load_more_limit" eval="80"/>
+        <field name="custom_handler_model_id" ref="model_account_partner_ledger_report_handler"/>
+        <field name="column_ids">
+            <record id="partner_ledger_report_journal_code" model="account.report.column">
+                <field name="name">Journal</field>
+                <field name="expression_label">journal_code</field>
+                <field name="figure_type">string</field>
+            </record>
+            <record id="partner_ledger_report_account_code" model="account.report.column">
+                <field name="name">Account</field>
+                <field name="expression_label">account_code</field>
+                <field name="figure_type">string</field>
+            </record>
+            <record id="partner_ledger_report_invoicing_date" model="account.report.column">
+                <field name="name">Invoice Date</field>
+                <field name="expression_label">invoice_date</field>
+                <field name="figure_type">date</field>
+            </record>
+            <record id="partner_ledger_report_date_maturity" model="account.report.column">
+                <field name="name">Due Date</field>
+                <field name="expression_label">date_maturity</field>
+                <field name="figure_type">date</field>
+            </record>
+            <record id="partner_ledger_report_matching_number" model="account.report.column">
+                <field name="name">Matching</field>
+                <field name="expression_label">matching_number</field>
+                <field name="figure_type">string</field>
+            </record>
+            <record id="partner_ledger_report_debit" model="account.report.column">
+                <field name="name">Debit</field>
+                <field name="expression_label">debit</field>
+            </record>
+            <record id="partner_ledger_report_credit" model="account.report.column">
+                <field name="name">Credit</field>
+                <field name="expression_label">credit</field>
+            </record>
+            <record id="partner_ledger_report_amount_currency" model="account.report.column">
+                <field name="name">Amount Currency</field>
+                <field name="expression_label">amount_currency</field>
+            </record>
+            <record id="partner_ledger_report_balance" model="account.report.column">
+                <field name="name">Balance</field>
+                <field name="expression_label">balance</field>
+            </record>
+        </field>
+    </record>
+</odoo>
diff --git a/dev_odex30_accounting/odex30_account_reports/data/pdf_export_templates.xml b/dev_odex30_accounting/odex30_account_reports/data/pdf_export_templates.xml
new file mode 100644
index 0000000..7adaefe
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_reports/data/pdf_export_templates.xml
@@ -0,0 +1,335 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <template id="pdf_export_main">
+         <html>
+             <head>
+                 <base t-att-href="base_url"/>
+                 <meta http-equiv="content-type" content="text/html; charset=utf-8"/>
+                 <t t-call-assets="odex30_account_reports.assets_pdf_export" t-js="False"/>
+             </head>
+             <body>
+                 <div t-att-class="'o_content ' + options['css_custom_class']">
+                     <header>
+                         <div class="o_title">
+                             <t t-if="report.filter_show_draft and options['all_entries']">[Draft]</t>
+                             <t t-out="report_title"/>
+                         </div>
+                         <div class="row o_header_font">
+                             <div class="col-8">
+                                 <!-- All company information (name, address, vat, ...) -->
+                                 <t t-call="{{custom_templates.get('company_information', 'odex30_account_reports.company_information')}}"/>
+                             </div>
+                             <div class="col-4">
+                                 <!-- All filters and options -->
+                                 <t t-call="{{custom_templates.get('pdf_export_filters', 'odex30_account_reports.pdf_export_filters')}}"/>
+                             </div>
+                         </div>
+                     </header>
+
+                     <div class="d-flex align-items-start">
+                         <t t-foreach="options.get('horizontal_split') and ['left', 'right'] or [None]" t-as="split_side">
+                             <table t-attf-class="o_table  #{options.get('horizontal_split') and 'horizontal_split_page'}">
+                                 <!-- Header -->
+                                 <t t-call="{{custom_templates.get('pdf_export_main_table_header', 'odex30_account_reports.pdf_export_main_table_header')}}"/>
+
+                                 <!-- Body -->
+                                 <tbody>
+                                     <t t-if="lines">
+                                         <t t-call="{{custom_templates.get('pdf_export_main_table_body', 'odex30_account_reports.pdf_export_main_table_body')}}">
+                                             <t t-set="lines" t-value="filter(lambda x: not split_side or split_side == x.get('horizontal_split_side', 'left'), lines)"/>
+                                         </t>
+                                     </t>
+                                 </tbody>
+                             </table>
+                         </t>
+                     </div>
+
+                     <!-- Annotations -->
+                     <ol class="o_annotation">
+                        <t t-foreach="annotations" t-as="annotation">
+                            <li>
+                                <t t-out="annotation.get('number')"/>.
+                                <t t-if="annotation.get('date')"><t t-out="annotation['date']"/> -</t>
+                                <t t-out="annotation.get('text')"/>
+                            </li>
+                        </t>
+                     </ol>
+                 </div>
+             </body>
+         </html>
+    </template>
+
+    <template id="company_information">
+        <t t-set="company_names" t-value="[company['name'] for company in options['companies']]"/>
+        <div class="row">
+            <div class="col-10" t-out="', '.join(company_names)"/>
+        </div>
+
+        <address class="mb-0 o_text_muted" t-field="env.company.partner_id" t-options='{"widget": "contact", "fields": ["address"], "no_marker": True}'/>
+
+        <t t-if="options.get('tax_unit', 'company_only') == 'company_only'">
+            <t t-if="env.company.account_fiscal_country_id.vat_label" t-out="env.company.account_fiscal_country_id.vat_label+':'"/>
+            <t t-else="">Tax ID:</t>
+            <t t-out="env.company.vat"/>
+        </t>
+        <t t-else="">
+            Tax ID: <t t-out="env['account.tax.unit'].browse(options.get('tax_unit')).vat"/>
+        </t>
+    </template>
+
+    <template id="pdf_export_filters">
+        <!-- Journals -->
+        <t t-if="options.get('journals')">
+            <div class="row" name="filter_info_template_journals">
+                <t t-set="journal_group_selected" t-value="options.get('selected_journal_groups')"/>
+                <t t-if="journal_group_selected">
+                    <div class="col-3">Multi-Ledger: </div>
+                    <div class="col-9 o_text_muted" t-out="journal_group_selected['title']"/>
+                </t>
+                <t t-else="">
+                    <t t-set="journal_value" t-value="[journal.get('title') for journal in options['journals'] if journal.get('selected')]"/>
+                    <t t-if="journal_value">
+                        <div class="col-3">Journals: </div>
+                        <div class="col-9 o_text_muted" t-out="', '.join(journal_value)"/>
+                    </t>
+                </t>
+            </div>
+        </t>
+
+        <!-- Partners -->
+        <t t-if="options.get('partner_ids') != None">
+            <div class="row">
+                <t t-set="partner_value" t-value="[partner for partner in options['selected_partner_ids']]"/>
+                <t t-if="partner_value">
+                    <div class="col-3">Partners:</div>
+                    <div class="col-9 o_text_muted" t-out="', '.join(partner_value)"/>
+                </t>
+            </div>
+        </t>
+
+        <!-- Partners categories -->
+        <t t-if="options.get('partner_categories') != None">
+            <div class="row">
+                <t t-set="partner_category_value" t-value="[partner for partner in options['selected_partner_categories']]"/>
+                <t t-if="partner_category_value">
+                    <div class="col-3">Partners Categories:</div>
+                    <div class="col-9 o_text_muted" t-out="', '.join(partner_category_value)"/>
+                </t>
+            </div>
+        </t>
+
+        <!-- Horizontal -->
+        <t t-if="options.get('selected_horizontal_group_id')">
+            <div class="row">
+                <t t-set="horizontal_group" t-value="[hg['name'] for hg in options['available_horizontal_groups'] if hg['id'] == options.get('selected_horizontal_group_id')]"/>
+                <t t-if="horizontal_group">
+                    <div class="col-3">Horizontal:</div>
+                    <div class="col-9 o_text_muted" t-out="horizontal_group[0]"/>
+                </t>
+            </div>
+        </t>
+
+        <!-- Currency -->
+        <t t-if="options.get('company_currency')">
+            <div class="row">
+                <div class="col-3">Currency:</div>
+                <div class="col-9 o_text_muted" t-out="options['company_currency']['currency_name']"/>
+            </div>
+        </t>
+
+        <!-- Filters -->
+        <t t-if="options.get('aml_ir_filters') and any(opt['selected'] for opt in options['aml_ir_filters'])" name="aml_ir_filters">
+            <div class="row">
+                <t t-set="aml_ir_filters" t-value="opt['name'] for opt in options['aml_ir_filters'] if opt['selected']"/>
+                <t t-if="aml_ir_filters">
+                    <div class="col-3">Filters:</div>
+                    <div class="col-9 o_text_muted" t-out="', '.join(aml_ir_filters)"/>
+                </t>
+            </div>
+        </t>
+
+        <!-- Extra options -->
+        <div class="row" name="pdf_options_header">
+            <t t-call="{{custom_templates.get('pdf_export_filter_extra_options_template', 'odex30_account_reports.pdf_export_filter_extra_options_template')}}"/>
+        </div>
+    </template>
+
+    <template id="pdf_export_filter_extra_options_template">
+        <t t-set="rounding_unit_display_names" t-value="{k: v[1] for k, v in options['rounding_unit_names'].items() if v[1]}"/>
+        <div class="col-3" t-if="(report.filter_show_draft and options['all_entries']) or
+                                 (report.filter_unreconciled and options['unreconciled']) or
+                                 options.get('include_analytic_without_aml') or
+                                 options['rounding_unit'] in rounding_unit_display_names">
+            Options:
+        </div>
+        <div class="col-9 o_text_muted">
+            <t t-set="extra_options" t-value="[]"/>
+
+            <!-- All entries -->
+            <t t-if="report.filter_show_draft and options['all_entries']" groups="account.group_account_readonly">
+                <t t-set="label_draft_entries">With Draft Entries</t>
+                <t t-set="extra_options" t-value="extra_options + [label_draft_entries]"/>
+            </t>
+
+            <!-- Unreconciled -->
+            <t t-if="report.filter_unreconciled and options['unreconciled']">
+                <t t-set="label_unreconciled_entries">Unreconciled Entries</t>
+                <t t-set="extra_options" t-value="extra_options + [label_unreconciled_entries]"/>
+            </t>
+
+            <!-- Analytic -->
+            <t t-if="options.get('include_analytic_without_aml')" name="include_analytic">
+                <t t-set="label_analytic_simulations">Including Analytic Simulations</t>
+                <t t-set="extra_options" t-value="extra_options + [label_analytic_simulations]"/>
+            </t>
+
+            <!-- Currency Unit Amount Text -->
+            <t t-if="options['rounding_unit'] in rounding_unit_display_names">
+                <t t-set="rounding_unit" t-value="options.get('rounding_unit')"/>
+                <t t-set="extra_options" t-value="extra_options + [rounding_unit_display_names[rounding_unit]]"/>
+            </t>
+
+            <t t-out="', '.join(extra_options)"/>
+        </div>
+    </template>
+
+    <template id="pdf_export_main_table_header">
+        <thead id="table_header">
+            <t t-foreach="options['column_headers']" t-as="column_header">
+                <tr>
+                    <!-- First empty column -->
+                    <th/>
+
+                    <!-- Other columns -->
+                    <t t-foreach="column_header * column_headers_render_data['level_repetitions'][column_header_index]" t-as="header">
+                        <th t-att-colspan="header.get('colspan', column_headers_render_data['level_colspan'][column_header_index]) + (1 if options.get('show_horizontal_group_total') and column_header_first else 0)" class="o_overflow_name">
+                            <t t-out="header.get('name')"/>
+                        </th>
+                    </t>
+
+                    <th t-if="options.get('show_horizontal_group_total') and not column_header_first">
+                        <t t-out="[group['name'] for group in options['available_horizontal_groups'] if group['id'] == options['selected_horizontal_group_id']][0]"/>
+                    </th>
+
+                    <th t-if="options.get('column_percent_comparison') == 'growth'">%</th>
+                </tr>
+            </t>
+            <!-- Custom subheaders -->
+            <t t-if="column_headers_render_data['custom_subheaders']">
+                <tr>
+                    <!-- First empty column -->
+                    <th/>
+
+                    <!-- Other columns -->
+                    <t t-foreach="column_headers_render_data['custom_subheaders']" t-as="subheader">
+                        <th t-att-colspan="subheader.get('colspan', 1)">
+                            <t t-out="subheader.get('name')"/>
+                        </th>
+                    </t>
+                </tr>
+            </t>
+            <tr>
+                <!-- First empty column -->
+                <th/>
+
+                <t t-foreach="options['columns']" t-as="subheader">
+                    <th>
+                        <t t-out="subheader.get('name')"/>
+                    </th>
+                </t>
+                <th t-if="options.get('show_horizontal_group_total')">
+                    <t t-out="options['columns'][0].get('name')"/>
+                </th>
+                <th t-if="options.get('column_percent_comparison') == 'growth'"/>
+            </tr>
+        </thead>
+    </template>
+
+    <template id="pdf_export_main_table_body">
+        <t t-foreach="lines" t-as="line">
+            <t t-set="o_line_level" t-value="'o_line_level_' + str(line['level'])"/>
+
+            <t t-if="line.get('page_break') and not options.get('horizontal_split')">
+                <!-- End current table -->
+                <t t-out="table_end"/>
+
+                <!-- Append table header -->
+                <t t-call="{{custom_templates.get('pdf_export_main_table_header', 'odex30_account_reports.pdf_export_main_table_header')}}"/>
+
+                <!-- Start new table -->
+                <t t-out="table_start"/>
+            </t>
+
+            <!-- Adds an empty row above line with level 0 to add some spacing (it is the easiest and cleanest way) -->
+            <t t-if="line_index != 0 and line['level'] == 0">
+                <tr>
+                    <td/>
+
+                    <t t-foreach="line.get('columns')" t-as="cell">
+                        <td/>
+                    </t>
+
+                    <t t-if="options.get('column_percent_comparison')">
+                        <td/>
+                    </t>
+
+                    <t t-if="options.get('show_horizontal_group_total')">
+                        <td/>
+                    </t>
+                </tr>
+            </t>
+
+            <t t-set="o_bold" t-value="(' o_fw_bold' if line.get('unfolded') or 'total' in line.get('id') else '')"/>
+            <t t-set="o_overflow" t-value="(' o_overflow_name' if len(line.get('name') or '') > 42 else '')"/>
+
+            <tr t-att-class="o_line_level + o_bold + o_overflow" name="pdf_export_main_table_body_lines_tr">
+                <td t-att-colspan="line.get('colspan', '1')" class="o_line_name_level">
+                    <t t-out="line.get('name')"/>
+                    <t t-if="line.get('annotations')">
+                        <t t-foreach="annotations" t-as="annotation">
+                            <t t-if="annotation.get('number') and annotation['number'] in (line.get('annotations') or [])">
+                                <sup t-out="annotation['number']"/>
+                            </t>
+                        </t>
+                    </t>
+                </td>
+
+                <t t-foreach="line.get('columns')" t-as="cell">
+                    <td class="o_cell_td">
+                        <t t-if="not env.company.totals_below_sections or options.get('ignore_totals_below_sections') or not line.get('unfolded')">
+                            <t t-call="{{custom_templates.get('pdf_export_cell', 'odex30_account_reports.pdf_export_cell')}}"/>
+                        </t>
+                    </td>
+                </t>
+
+                <t t-if="options.get('column_percent_comparison')">
+                    <td class="o_column_percent_comparison">
+                        <t t-if="line.get('column_percent_comparison_data')">
+                            <t t-out="line['column_percent_comparison_data'].get('name')"/>
+                        </t>
+                    </td>
+                </t>
+
+                <t t-if="options.get('show_horizontal_group_total')">
+                    <td class="o_cell_td">
+                        <t t-if="line.get('horizontal_group_total_data')">
+                            <t t-set="o_classes" t-value="'o_line_cell_value_number' + (' o_muted' if line['horizontal_group_total_data'].get('no_format') == 0 else '')"/>
+                            <span t-att-class="o_classes" t-out="line['horizontal_group_total_data'].get('name')"/>
+                        </t>
+                    </td>
+                </t>
+            </tr>
+        </t>
+    </template>
+
+    <template id="pdf_export_cell">
+        <t t-if="cell.get('figure_type', '') in ['float', 'integer', 'monetary', 'percentage']">
+            <t t-set="o_classes" t-value="'o_line_cell_value_number' + (' o_muted' if cell.get('is_zero') else '')"/>
+        </t>
+        <t t-else="">
+            <t t-set="o_classes" t-value="'o_overflow_value'"/>
+        </t>
+
+        <span t-att-class="o_classes" t-out="cell.get('name')"/>
+    </template>
+</odoo>
diff --git a/dev_odex30_accounting/odex30_account_reports/data/profit_and_loss.xml b/dev_odex30_accounting/odex30_account_reports/data/profit_and_loss.xml
new file mode 100644
index 0000000..cc40bf8
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_reports/data/profit_and_loss.xml
@@ -0,0 +1,139 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo auto_sequence="1">
+    <record id="profit_and_loss" model="account.report">
+        <field name="name">Profit and Loss</field>
+        <field name="filter_analytic_groupby" eval="True"/>
+        <field name="filter_unfold_all" eval="True"/>
+        <field name="filter_journals" eval="True"/>
+        <field name="filter_multi_company">selector</field>
+        <field name="filter_budgets" eval="True"/>
+        <field name="default_opening_date_filter">this_year</field>
+        <field name="column_ids">
+            <record id="profit_and_loss_column" model="account.report.column">
+                <field name="name">Balance</field>
+                <field name="expression_label">balance</field>
+            </record>
+        </field>
+        <field name="line_ids">
+            <record id="account_financial_report_revenue0" model="account.report.line">
+                <field name="name">Revenue</field>
+                <field name="code">REV</field>
+                <field name="hierarchy_level">1</field>
+                <field name="groupby">account_id</field>
+                <field name="foldable" eval="True"/>
+                <field name="expression_ids">
+                    <record id="account_financial_report_revenue0_balance" model="account.report.expression">
+                        <field name="label">balance</field>
+                        <field name="engine">domain</field>
+                        <field name="formula" eval="[('account_id.account_type', '=', 'income')]"/>
+                        <field name="subformula">-sum</field>
+                    </record>
+                </field>
+            </record>
+            <record id="account_financial_report_cost_sales0" model="account.report.line">
+                <field name="name">Less Costs of Revenue</field>
+                <field name="code">COS</field>
+                <field name="parent_id" eval="False"/>
+                <field name="hierarchy_level">1</field>
+                <field name="groupby">account_id</field>
+                <field name="foldable" eval="True"/>
+                <field name="expression_ids">
+                    <record id="account_financial_report_cost_sales0_balance" model="account.report.expression">
+                        <field name="label">balance</field>
+                        <field name="engine">domain</field>
+                        <field name="formula" eval="[('account_id.account_type', '=', 'expense_direct_cost')]"/>
+                        <field name="subformula">sum</field>
+                        <field name="green_on_positive" eval="False"/>
+                    </record>
+                </field>
+            </record>
+            <record id="account_financial_report_gross_profit0" model="account.report.line">
+                <field name="name">Gross Profit</field>
+                <field name="code">GRP</field>
+                <field name="parent_id" eval="False"/>
+                <field name="hierarchy_level">0</field>
+                <field name="expression_ids">
+                    <record id="account_financial_report_gross_profit0_balance" model="account.report.expression">
+                        <field name="label">balance</field>
+                        <field name="engine">aggregation</field>
+                        <field name="formula">REV.balance - COS.balance</field>
+                    </record>
+                </field>
+            </record>
+            <record id="account_financial_report_expense0" model="account.report.line">
+                <field name="name">Less Operating Expenses</field>
+                <field name="code">EXP</field>
+                <field name="parent_id" eval="False"/>
+                <field name="hierarchy_level">1</field>
+                <field name="groupby">account_id</field>
+                <field name="foldable" eval="True"/>
+                <field name="expression_ids">
+                    <record id="account_financial_report_expense0_balance" model="account.report.expression">
+                        <field name="label">balance</field>
+                        <field name="engine">domain</field>
+                        <field name="formula" eval="[('account_id.account_type', '=', 'expense')]"/>
+                        <field name="subformula">sum</field>
+                        <field name="green_on_positive" eval="False"/>
+                    </record>
+                </field>
+            </record>
+            <record id="account_financial_report_operating_income0" model="account.report.line">
+                <field name="name">Operating Income (or Loss)</field>
+                <field name="hierarchy_level">0</field>
+                <field name="code">INC</field>
+                <field name="expression_ids">
+                    <record id="account_financial_report_operating_income0_balance" model="account.report.expression">
+                        <field name="label">balance</field>
+                        <field name="engine">aggregation</field>
+                        <field name="formula">REV.balance - COS.balance - EXP.balance</field>
+                    </record>
+                </field>
+            </record>
+            <record id="account_financial_report_other_income0" model="account.report.line">
+                <field name="name">Plus Other Income</field>
+                <field name="code">OIN</field>
+                <field name="parent_id" eval="False"/>
+                <field name="hierarchy_level">1</field>
+                <field name="groupby">account_id</field>
+                <field name="foldable" eval="True"/>
+                <field name="expression_ids">
+                    <record id="account_financial_report_other_income0_balance" model="account.report.expression">
+                        <field name="label">balance</field>
+                        <field name="engine">domain</field>
+                        <field name="formula" eval="[('account_id.account_type', '=', 'income_other')]"/>
+                        <field name="subformula">-sum</field>
+                    </record>
+                </field>
+            </record>
+            <record id="account_financial_report_depreciation0" model="account.report.line">
+                <field name="name">Less Other Expenses</field>
+                <field name="code">OEXP</field>
+                <field name="parent_id" eval="False"/>
+                <field name="hierarchy_level">1</field>
+                <field name="groupby">account_id</field>
+                <field name="foldable" eval="True"/>
+                <field name="expression_ids">
+                    <record id="account_financial_report_depreciation0_balance" model="account.report.expression">
+                        <field name="label">balance</field>
+                        <field name="engine">domain</field>
+                        <field name="formula" eval="[('account_id.account_type', '=', 'expense_depreciation')]"/>
+                        <field name="subformula">sum</field>
+                        <field name="green_on_positive" eval="False"/>
+                    </record>
+                </field>
+            </record>
+            <record id="account_financial_report_net_profit0" model="account.report.line">
+                <field name="name">Net Profit</field>
+                <field name="hierarchy_level">0</field>
+                <field name="code">NEP</field>
+                <field name="expression_ids">
+                    <record id="account_financial_report_net_profit0_balance" model="account.report.expression">
+                        <field name="label">balance</field>
+                        <field name="engine">aggregation</field>
+                        <field name="formula">REV.balance + OIN.balance - COS.balance - EXP.balance - OEXP.balance</field>
+                    </record>
+                </field>
+            </record>
+        </field>
+    </record>
+</odoo>
diff --git a/dev_odex30_accounting/odex30_account_reports/data/report_send_cron.xml b/dev_odex30_accounting/odex30_account_reports/data/report_send_cron.xml
new file mode 100644
index 0000000..3582846
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_reports/data/report_send_cron.xml
@@ -0,0 +1,11 @@
+<odoo>
+    <record id="ir_cron_account_report_send" model="ir.cron">
+        <field name="name">Send account reports automatically</field>
+        <field name="model_id" ref="model_account_report"/>
+        <field name="state">code</field>
+        <field name="code">model._cron_account_report_send(job_count=20)</field>
+        <field name="user_id" ref="base.user_root"/>
+        <field name="interval_number">1</field>
+        <field name="interval_type">days</field>
+    </record>
+</odoo>
diff --git a/dev_odex30_accounting/odex30_account_reports/data/sales_report.xml b/dev_odex30_accounting/odex30_account_reports/data/sales_report.xml
new file mode 100644
index 0000000..60e4aab
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_reports/data/sales_report.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<odoo auto_sequence="1">
+    <record id="generic_ec_sales_report" model="account.report">
+        <field name="name">Generic EC Sales List</field>
+        <field name="filter_show_draft" eval="True"/>
+        <field name="filter_period_comparison" eval="False"/>
+        <field name="filter_date_range" eval="True"/>
+        <field name="filter_journals" eval="True"/>
+        <field name="filter_show_draft" eval="False"/>
+        <field name="filter_unreconciled" eval="False"/>
+        <field name="filter_multi_company">selector</field>
+        <field name="default_opening_date_filter">previous_month</field>
+        <field name="load_more_limit" eval="80"/>
+        <field name="search_bar" eval="True"/>
+        <field name="custom_handler_model_id" ref="model_account_ec_sales_report_handler"/>
+        <field name="column_ids">
+            <record id="account_financial_report_ec_sales_country" model="account.report.column">
+                <field name="name">Country Code</field>
+                <field name="expression_label">country_code</field>
+                <field name="figure_type">string</field>
+                <field name="sortable" eval="True"/>
+            </record>
+            <record id="account_financial_report_ec_sales_vat" model="account.report.column">
+                <field name="name">VAT Number</field>
+                <field name="expression_label">vat_number</field>
+                <field name="figure_type">string</field>
+                <field name="sortable" eval="True"/>
+            </record>
+            <record id="account_financial_report_ec_sales_amount" model="account.report.column">
+                <field name="name">Amount</field>
+                <field name="expression_label">balance</field>
+                <field name="sortable" eval="True"/>
+            </record>
+        </field>
+    </record>
+</odoo>
diff --git a/dev_odex30_accounting/odex30_account_reports/data/trial_balance.xml b/dev_odex30_accounting/odex30_account_reports/data/trial_balance.xml
new file mode 100644
index 0000000..da0c5f2
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_reports/data/trial_balance.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo auto_sequence="1">
+    <record id="trial_balance_report" model="account.report">
+        <field name="name">Trial Balance</field>
+        <field name="filter_journals" eval="True"/>
+        <field name="filter_analytic" eval="True"/>
+        <field name="filter_growth_comparison" eval="False"/>
+        <field name="filter_multi_company">selector</field>
+        <field name="filter_unfold_all" eval="True"/>
+        <field name="filter_hierarchy">by_default</field>
+        <field name="filter_hide_0_lines">never</field>
+        <field name="default_opening_date_filter">this_month</field>
+        <field name="search_bar" eval="True"/>
+        <field name="custom_handler_model_id" ref="model_account_trial_balance_report_handler"/>
+        <field name="column_ids">
+            <record id="trial_balance_report_debit" model="account.report.column">
+                <field name="name">Debit</field>
+                <field name="expression_label">debit</field>
+            </record>
+            <record id="trial_balance_report_credit" model="account.report.column">
+                <field name="name">Credit</field>
+                <field name="expression_label">credit</field>
+            </record>
+        </field>
+    </record>
+</odoo>
diff --git a/dev_odex30_accounting/odex30_account_reports/i18n/account_reports.pot b/dev_odex30_accounting/odex30_account_reports/i18n/account_reports.pot
new file mode 100644
index 0000000..437d20a
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_reports/i18n/account_reports.pot
@@ -0,0 +1,4482 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# 	* odex30_account_reports
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 18.0+e\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2025-10-24 18:48+0000\n"
+"PO-Revision-Date: 2025-10-24 18:48+0000\n"
+"Last-Translator: \n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/bank_reconciliation_report/warnings.xml:0
+msgid "\" account balance is affected by"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_journal_report.py:0
+msgid "%(journal)s - %(account)s"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_report.py:0
+msgid "%(names)s and %(remaining)s others"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_report.py:0
+msgid "%(names)s and one other"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/res_company.py:0
+msgid "%(report_label)s: %(period)s"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/budget.py:0
+msgid "%s (copy)"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_report.py:0
+msgid "%s is not a numeric value"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/account_report/filters/filters.js:0
+msgid "%s selected"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_report.py:0
+msgid ""
+"'Open General Ledger' caret option is only available form report lines "
+"targetting accounts."
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_report.py:0
+msgid ""
+"'View Bank Statement' caret option is only available for report lines "
+"targeting bank statements."
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_report.py:0
+msgid "'external' engine does not support groupby, limit nor offset."
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_report.py:0
+msgid "(%s lines)"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model:account.report.line,name:account_reports.outstanding_receipts
+msgid "(+) Outstanding Receipts"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model:account.report.line,name:account_reports.outstanding_payments
+msgid "(-) Outstanding Payments"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_report.py:0
+msgid "(1 line)"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_deferred_reports.py:0
+msgid "(No %s)"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_report.py:0
+msgid "(No Group)"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/bank_reconciliation_report/warnings.xml:0
+msgid ", leading to an unexplained difference of"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model_terms:ir.ui.view,arch_db:account_reports.view_move_form_vat_return
+msgid "-> Refresh"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model:mail.template,body_html:account_reports.email_template_customer_statement
+msgid ""
+"<div style=\"margin: 0px; padding: 0px;\">\n"
+"                <p style=\"margin: 0px; padding: 0px;\">\n"
+"                    <t t-if=\"object.id != object.commercial_partner_id.id\">Dear <t t-out=\"object.name or ''\"/> (<t t-out=\"object.commercial_partner_id.name or ''\"/>),</t>\n"
+"                    <t t-else=\"\">Dear <t t-out=\"object.name or ''\"/>,</t>\n"
+"                    <br/>\n"
+"                    Please find enclosed the statement of your account.\n"
+"                    <br/>\n"
+"                    Do not hesitate to contact us if you have any questions.\n"
+"                    <br/>\n"
+"                    Sincerely,\n"
+"                    <br/>\n"
+"\t                <t t-out=\"object._get_followup_responsible().name if is_html_empty(object._get_followup_responsible().signature) else object._get_followup_responsible().signature\"/>\n"
+"                </p>\n"
+"            </div>\n"
+"        "
+msgstr ""
+
+#. module: odex30_account_reports
+#: model_terms:ir.ui.view,arch_db:account_reports.account_report_send_form
+msgid ""
+"<i class=\"fa fa-question-circle ml4\" role=\"img\" aria-label=\"Warning\" "
+"title=\"The email address is unknown on the partner\" invisible=\"not "
+"send_mail_readonly\"/>"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model_terms:ir.ui.view,arch_db:account_reports.view_account_report_file_download_error_wizard_form
+msgid ""
+"<i>Errors marked with <i class=\"fa fa-warning\"/> are critical and prevent "
+"the file generation.</i>"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model_terms:ir.ui.view,arch_db:account_reports.account_reports_journal_dashboard_kanban_view
+msgid "<span role=\"separator\">Reconciliation</span>"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model_terms:ir.ui.view,arch_db:account_reports.view_account_report_file_download_error_wizard_form
+msgid "<span>One or more error(s) occurred during file generation:</span>"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model:ir.model.constraint,message:account_reports.constraint_account_report_horizontal_group_name_uniq
+msgid "A horizontal group with the same name already exists."
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/widgets/account_report_x2many/account_report_x2many.js:0
+msgid "A line with a 'Group By' value cannot have children."
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_tax.py:0
+msgid ""
+"A tax unit can only be created between companies sharing the same main "
+"currency."
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_tax.py:0
+msgid ""
+"A tax unit must contain a minimum of two companies. You might want to delete"
+" the unit."
+msgstr ""
+
+#. module: odex30_account_reports
+#: model:account.report.line,name:account_reports.account_financial_report_total_assets0
+msgid "ASSETS"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_journal_report.py:0
+#: code:addons/odex30_account_reports/static/src/components/deferred_reports/groupby.xml:0
+#: code:addons/odex30_account_reports/wizard/multicurrency_revaluation.py:0
+#: model:account.report.column,name:account_reports.aged_payable_report_account_name
+#: model:account.report.column,name:account_reports.aged_receivable_report_account_name
+#: model:account.report.column,name:account_reports.partner_ledger_report_account_code
+#: model:ir.model,name:account_reports.model_account_account
+#: model:ir.model.fields,field_description:account_reports.field_account_report_budget_item__account_id
+msgid "Account"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model:ir.model,name:account_reports.model_account_chart_template
+msgid "Account Chart Template"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_journal_report.py:0
+msgid "Account Code"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_report.py:0
+msgid "Account Code / Tag"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model:ir.model.fields,field_description:account_reports.field_res_company__account_display_representative_field
+msgid "Account Display Representative Field"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_journal_report.py:0
+msgid "Account Label"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_report.py:0
+msgid "Account Name"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model:ir.model,name:account_reports.model_account_report_annotation
+msgid "Account Report Annotation"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model:ir.model,name:account_reports.model_account_report_custom_handler
+msgid "Account Report Custom Handler"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model:ir.model,name:account_reports.model_account_tax_report_handler
+msgid "Account Report Handler for Tax Reports"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model:ir.model,name:account_reports.model_account_report_send
+msgid "Account Report Send"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model:ir.model.fields,field_description:account_reports.field_res_config_settings__account_reports_show_per_company_setting
+msgid "Account Reports Show Per Company Setting"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model:ir.model.fields,field_description:account_reports.field_res_partner__account_represented_company_ids
+#: model:ir.model.fields,field_description:account_reports.field_res_users__account_represented_company_ids
+msgid "Account Represented Company"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model:ir.model.fields,field_description:account_reports.field_res_company__account_revaluation_journal_id
+msgid "Account Revaluation Journal"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/account_report/filters/filter_account_type.xml:0
+msgid "Account:"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model:ir.model.fields,field_description:account_reports.field_res_company__account_representative_id
+msgid "Accounting Firm"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model:ir.model,name:account_reports.model_account_report
+msgid "Accounting Report"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model:ir.model,name:account_reports.model_account_report_budget
+msgid "Accounting Report Budget"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model:ir.model,name:account_reports.model_account_report_budget_item
+msgid "Accounting Report Budget Item"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model:ir.model,name:account_reports.model_account_report_expression
+msgid "Accounting Report Expression"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model:ir.model,name:account_reports.model_account_report_external_value
+msgid "Accounting Report External Value"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model:ir.model,name:account_reports.model_account_report_line
+msgid "Accounting Report Line"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model:ir.actions.act_window,name:account_reports.action_account_report_tree
+#: model:ir.ui.menu,name:account_reports.menu_action_account_report_tree
+#: model_terms:ir.ui.view,arch_db:account_reports.view_account_report_search
+msgid "Accounting Reports"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/account_report/filters/filter_analytic.xml:0
+#: code:addons/odex30_account_reports/static/src/components/account_report/filters/filter_analytic_groupby.xml:0
+msgid "Accounts"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_report.py:0
+#: model_terms:ir.ui.view,arch_db:account_reports.account_report_form
+msgid "Accounts Coverage Report"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model:account.report.line,name:account_reports.multicurrency_revaluation_to_adjust
+msgid "Accounts To Adjust"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_report.py:0
+msgid "Accounts coverage"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model:ir.model.fields,field_description:account_reports.field_mail_activity_type__category
+msgid "Action"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model:ir.model.fields,field_description:account_reports.field_account_report_file_download_error_wizard__actionable_errors
+msgid "Actionable Errors"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model:ir.model.fields,help:account_reports.field_mail_activity_type__category
+msgid ""
+"Actions may trigger specific behavior like opening calendar view or "
+"automatically mark as done when a document is uploaded"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model:ir.model,name:account_reports.model_mail_activity
+msgid "Activity"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model:ir.model,name:account_reports.model_mail_activity_type
+msgid "Activity Type"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/account_report/line_name/popover/annotations_popover.xml:0
+#: code:addons/odex30_account_reports/static/src/widgets/account_report_x2many/account_report_x2many.xml:0
+msgid "Add a line"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model_terms:ir.ui.view,arch_db:account_reports.account_report_send_form
+msgid "Add contacts to notify..."
+msgstr ""
+
+#. module: odex30_account_reports
+#: model:ir.model.fields,field_description:account_reports.field_res_company__totals_below_sections
+#: model:ir.model.fields,field_description:account_reports.field_res_config_settings__totals_below_sections
+msgid "Add totals below sections"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model:account.report.column,name:account_reports.multicurrency_revaluation_report_adjustment
+msgid "Adjustment"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_multicurrency_revaluation_report.py:0
+msgid "Adjustment Entry"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_cash_flow_report.py:0
+msgid "Advance Payments received from customers"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_cash_flow_report.py:0
+msgid "Advance payments made to suppliers"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model_terms:ir.ui.view,arch_db:account_reports.account_report_form
+msgid "Advanced"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model:ir.model,name:account_reports.model_account_aged_partner_balance_report_handler
+msgid "Aged Partner Balance Custom Handler"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model:account.report,name:account_reports.aged_payable_report
+#: model:account.report.line,name:account_reports.aged_payable_line
+#: model:ir.actions.client,name:account_reports.action_account_report_ap
+#: model:ir.ui.menu,name:account_reports.menu_action_account_report_aged_payable
+msgid "Aged Payable"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model:ir.model,name:account_reports.model_account_aged_payable_report_handler
+msgid "Aged Payable Custom Handler"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model_terms:ir.ui.view,arch_db:account_reports.account_reports_journal_dashboard_kanban_view
+msgid "Aged Payables"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model:account.report,name:account_reports.aged_receivable_report
+#: model:account.report.line,name:account_reports.aged_receivable_line
+#: model:ir.actions.client,name:account_reports.action_account_report_ar
+#: model:ir.ui.menu,name:account_reports.menu_action_account_report_aged_receivable
+msgid "Aged Receivable"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model:ir.model,name:account_reports.model_account_aged_receivable_report_handler
+msgid "Aged Receivable Custom Handler"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model_terms:ir.ui.view,arch_db:account_reports.account_reports_journal_dashboard_kanban_view
+msgid "Aged Receivables"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_report.py:0
+#: code:addons/odex30_account_reports/static/src/components/account_report/filters/filter_fiscal_position.xml:0
+#: code:addons/odex30_account_reports/static/src/components/account_report/filters/filters.js:0
+#: code:addons/odex30_account_reports/static/src/components/sales_report/filters/filters.js:0
+msgid "All"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_report.py:0
+msgid "All Journals"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/account_report/filters/filters.js:0
+msgid "All Payable"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/account_report/filters/filters.js:0
+msgid "All Receivable"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_report.py:0
+msgid "All Report Variants"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/tax_report/warnings.xml:0
+msgid ""
+"All selected companies or branches do not share the same Tax ID. Please "
+"check the Tax ID of the selected companies."
+msgstr ""
+
+#. module: odex30_account_reports
+#: model:account.report.column,name:account_reports.account_financial_report_ec_sales_amount
+#: model:account.report.column,name:account_reports.bank_reconciliation_report_amount
+#: model:account.report.column,name:account_reports.customer_statement_amount
+#: model:account.report.column,name:account_reports.followup_report_amount
+#: model:ir.model.fields,field_description:account_reports.field_account_report_budget_item__amount
+msgid "Amount"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_journal_report.py:0
+#: model:account.report.column,name:account_reports.aged_payable_report_amount_currency
+#: model:account.report.column,name:account_reports.aged_receivable_report_amount_currency
+#: model:account.report.column,name:account_reports.bank_reconciliation_report_amount_currency
+#: model:account.report.column,name:account_reports.customer_statement_report_amount_currency
+#: model:account.report.column,name:account_reports.followup_report_report_amount_currency
+#: model:account.report.column,name:account_reports.partner_ledger_report_amount_currency
+msgid "Amount Currency"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_journal_report.py:0
+msgid "Amount in currency: %s"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_report.py:0
+msgid "Amounts in Lakhs"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_report.py:0
+msgid "Amounts in Millions"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_report.py:0
+msgid "Amounts in Thousands"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/account_report/filters/filter_analytic.xml:0
+#: code:addons/odex30_account_reports/static/src/components/account_report/filters/filter_analytic_groupby.xml:0
+msgid "Analytic"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model:ir.model.fields,field_description:account_reports.field_account_report__filter_analytic_groupby
+msgid "Analytic Group By"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/account_report/filters/filter_extra_options.xml:0
+msgid "Analytic Simulations"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/account_report/line_name/line_name.xml:0
+msgid "Annotate"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/account_report/line_name/popover/annotations_popover.xml:0
+msgid "Annotation"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model:ir.model.fields,field_description:account_reports.field_account_report__annotations_ids
+msgid "Annotations"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_report.py:0
+msgid "As of %s"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/account_report/filters/filters.js:0
+msgid "Ascending"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model:account.report.column,name:account_reports.aged_payable_report_period0
+#: model:account.report.column,name:account_reports.aged_receivable_report_period0
+msgid "At Date"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model_terms:ir.ui.view,arch_db:account_reports.account_report_send_form
+msgid "Attach a file"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_generic_tax_report.py:0
+#: code:addons/odex30_account_reports/static/src/components/journal_report/line/line.xml:0
+#: code:addons/odex30_account_reports/static/src/components/journal_report/line_name.xml:0
+msgid "Audit"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model:ir.ui.menu,name:account_reports.account_reports_audit_reports_menu
+msgid "Audit Reports"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model:account.report.line,name:account_reports.account_financial_report_executivesummary_avgcre0
+msgid "Average creditors days"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model:account.report.line,name:account_reports.account_financial_report_executivesummary_avdebt0
+msgid "Average debtors days"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_journal_report.py:0
+msgid "B: %s"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_journal_report.py:0
+#: model:account.report.column,name:account_reports.balance_sheet_balance
+#: model:account.report.column,name:account_reports.cash_flow_report_balance
+#: model:account.report.column,name:account_reports.customer_statement_report_balance
+#: model:account.report.column,name:account_reports.executive_summary_column
+#: model:account.report.column,name:account_reports.followup_report_report_balance
+#: model:account.report.column,name:account_reports.general_ledger_report_balance
+#: model:account.report.column,name:account_reports.journal_report_balance
+#: model:account.report.column,name:account_reports.partner_ledger_report_balance
+#: model:account.report.column,name:account_reports.profit_and_loss_column
+#: model_terms:ir.ui.view,arch_db:account_reports.account_reports_journal_dashboard_kanban_view
+msgid "Balance"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model:account.report,name:account_reports.balance_sheet
+#: model:account.report.line,name:account_reports.account_financial_report_executivesummary_balancesheet0
+#: model:ir.actions.client,name:account_reports.action_account_report_bs
+#: model:ir.ui.menu,name:account_reports.menu_action_account_report_balance_sheet
+msgid "Balance Sheet"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model:ir.model,name:account_reports.model_account_balance_sheet_report_handler
+msgid "Balance Sheet Custom Handler"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model:account.report.column,name:account_reports.multicurrency_revaluation_report_balance_current
+msgid "Balance at Current Rate"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model:account.report.column,name:account_reports.multicurrency_revaluation_report_balance_operation
+msgid "Balance at Operation Rate"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model:account.report.column,name:account_reports.multicurrency_revaluation_report_balance_currency
+msgid "Balance in Foreign Currency"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/bank_reconciliation_report.py:0
+msgid "Balance of '%s'"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model:account.report.line,name:account_reports.balance_bank
+msgid "Balance of Bank"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_generic_tax_report.py:0
+msgid "Balance tax advance payment account"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_generic_tax_report.py:0
+msgid "Balance tax current account (payable)"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_generic_tax_report.py:0
+msgid "Balance tax current account (receivable)"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model:ir.actions.client,name:account_reports.action_account_report_bank_reconciliation
+msgid "Bank Reconciliation"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model:account.report,name:account_reports.bank_reconciliation_report
+msgid "Bank Reconciliation Report"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model:ir.model,name:account_reports.model_account_bank_reconciliation_report_handler
+msgid "Bank Reconciliation Report Custom Handler"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model:account.report.line,name:account_reports.account_financial_report_bank_view0
+msgid "Bank and Cash Accounts"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model_terms:ir.ui.view,arch_db:account_reports.bank_information_customer_report
+msgid "Bank:"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_general_ledger.py:0
+#: code:addons/odex30_account_reports/models/account_journal_report.py:0
+#: code:addons/odex30_account_reports/static/src/components/journal_report/line/line.xml:0
+#: model_terms:ir.ui.view,arch_db:account_reports.pdf_journal_report_taxes_summary
+msgid "Base Amount"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/aged_partner_balance/filter_aging.xml:0
+msgid "Based on"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_deferred_reports.py:0
+msgid "Before"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/account_report/filters/filter_budgets.xml:0
+#: model:ir.model.fields,field_description:account_reports.field_account_report_budget_item__budget_id
+msgid "Budget"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model:ir.model.fields,field_description:account_reports.field_account_account__budget_item_ids
+msgid "Budget Item"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model_terms:ir.ui.view,arch_db:account_reports.account_report_budget_form
+msgid "Budget Items"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/account_report/filters/filter_budgets.xml:0
+#: model_terms:ir.ui.view,arch_db:account_reports.account_report_budget_form
+msgid "Budget Name"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_report.py:0
+msgid "Budget items can only be edited from account lines."
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/redirectAction/redirectAction.xml:0
+#: model_terms:ir.ui.view,arch_db:account_reports.account_report_send_form
+#: model_terms:ir.ui.view,arch_db:account_reports.view_account_multicurrency_revaluation_wizard
+#: model_terms:ir.ui.view,arch_db:account_reports.view_report_export_wizard
+msgid "Cancel"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_generic_tax_report.py:0
+msgid "Cannot audit tax from another model than account.tax."
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_report.py:0
+msgid "Cannot generate carryover values for all fiscal positions at once!"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/account_report/line_cell/popover/carryover_popover.xml:0
+msgid "Carryover"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_report.py:0
+msgid "Carryover adjustment for tax unit"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_report.py:0
+msgid "Carryover can only be generated for a single column group."
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_report.py:0
+msgid "Carryover from %(date_from)s to %(date_to)s"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_report.py:0
+msgid "Carryover lines for: %s"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model:account.report.line,name:account_reports.account_financial_report_executivesummary_cash0
+msgid "Cash"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model:ir.model,name:account_reports.model_account_cash_flow_report_handler
+msgid "Cash Flow Report Custom Handler"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model:account.report,name:account_reports.cash_flow_report
+#: model:ir.actions.client,name:account_reports.action_account_report_cs
+#: model:ir.ui.menu,name:account_reports.menu_action_account_report_cash_flow
+msgid "Cash Flow Statement"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_cash_flow_report.py:0
+msgid "Cash and cash equivalents, beginning of period"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_cash_flow_report.py:0
+msgid "Cash and cash equivalents, closing balance"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_cash_flow_report.py:0
+msgid "Cash flows from financing activities"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_cash_flow_report.py:0
+msgid "Cash flows from investing & extraordinary activities"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_cash_flow_report.py:0
+msgid "Cash flows from operating activities"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_cash_flow_report.py:0
+msgid "Cash flows from unclassified activities"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_cash_flow_report.py:0
+msgid "Cash in"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_cash_flow_report.py:0
+msgid "Cash out"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_cash_flow_report.py:0
+msgid "Cash paid for operating activities"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model:account.report.line,name:account_reports.account_financial_report_executivesummary_cash_received0
+msgid "Cash received"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_cash_flow_report.py:0
+msgid "Cash received from operating activities"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model:account.report.line,name:account_reports.account_financial_report_executivesummary_cash_spent0
+msgid "Cash spent"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model:account.report.line,name:account_reports.account_financial_report_executivesummary_cash_surplus0
+msgid "Cash surplus"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model:ir.model,name:account_reports.model_account_change_lock_date
+msgid "Change Lock Date"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/wizard/account_report_send.py:0
+msgid "Check Partner(s) Email(s)"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/tax_report/warnings.xml:0
+msgid "Check them"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model_terms:ir.ui.view,arch_db:account_reports.view_account_report_file_download_error_wizard_form
+msgid "Close"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_generic_tax_report.py:0
+msgid "Closing Entry"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model:account.report.line,name:account_reports.account_financial_report_executivesummary_closing_bank_balance0
+msgid "Closing bank balance"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_report.py:0
+#: model:account.report.column,name:account_reports.journal_report_code
+msgid "Code"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/sales_report/filters/filter_code.xml:0
+msgid "Codes:"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model_terms:ir.ui.view,arch_db:account_reports.account_report_form
+msgid "Columns"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model:account.report.column,name:account_reports.general_ledger_report_communication
+msgid "Communication"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_report.py:0
+#: model:ir.model,name:account_reports.model_res_company
+#: model:ir.model.fields,field_description:account_reports.field_account_tax_unit__company_ids
+msgid "Companies"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_report.py:0
+#: model:ir.model.fields,field_description:account_reports.field_account_multicurrency_revaluation_wizard__company_id
+#: model:ir.model.fields,field_description:account_reports.field_account_report_budget__company_id
+msgid "Company"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_tax.py:0
+msgid ""
+"Company %(company)s already belongs to a tax unit in %(country)s. A company "
+"can at most be part of one tax unit per country."
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_report.py:0
+msgid "Company Currency"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/account_report/filters/filter_tax_unit.xml:0
+#: code:addons/odex30_account_reports/static/src/components/account_report/filters/filters.js:0
+msgid "Company Only"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_report.py:0
+msgid "Company Settings"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/account_report/filters/filter_comparison.xml:0
+msgid "Comparison"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model:ir.model,name:account_reports.model_res_config_settings
+msgid "Config Settings"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model_terms:ir.ui.view,arch_db:account_reports.res_config_settings_view_form
+msgid "Configure start dates"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_generic_tax_report.py:0
+msgid "Configure your TAX accounts - %s"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/res_config_settings.py:0
+msgid "Configure your start dates"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model_terms:ir.ui.view,arch_db:account_reports.res_config_settings_view_form
+msgid "Configure your tax accounts"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model:ir.model,name:account_reports.model_res_partner
+msgid "Contact"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model_terms:ir.ui.view,arch_db:account_reports.duplicated_vat_partner_tree_view
+msgid "Contacts"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model:ir.model.fields,field_description:account_reports.field_account_report_send__mail_body
+msgid "Contents"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model:account.report.line,name:account_reports.account_financial_report_executivesummary_direct_costs0
+msgid "Cost of Revenue"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_report.py:0
+msgid ""
+"Could not expand term %(term)s while evaluating formula "
+"%(unexpanded_formula)s"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_report.py:0
+msgid "Could not parse account_code formula from token '%s'"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_journal_report.py:0
+#: code:addons/odex30_account_reports/static/src/components/journal_report/line/line.xml:0
+#: model:ir.model.fields,field_description:account_reports.field_account_tax_unit__country_id
+#: model_terms:ir.ui.view,arch_db:account_reports.pdf_journal_report_taxes_summary
+#: model_terms:ir.ui.view,arch_db:account_reports.view_account_report_search
+msgid "Country"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model:account.report.column,name:account_reports.account_financial_report_ec_sales_country
+msgid "Country Code"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/account_report/filters/filter_budgets.xml:0
+msgid "Create"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model:ir.actions.server,name:account_reports.action_create_composite_report_list
+msgid "Create Composite Report"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model_terms:ir.ui.view,arch_db:account_reports.view_account_multicurrency_revaluation_wizard
+msgid "Create Entry"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model:ir.actions.server,name:account_reports.action_create_report_menu
+msgid "Create Menu Item"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model:ir.model.fields,field_description:account_reports.field_account_multicurrency_revaluation_wizard__create_uid
+#: model:ir.model.fields,field_description:account_reports.field_account_report_annotation__create_uid
+#: model:ir.model.fields,field_description:account_reports.field_account_report_budget__create_uid
+#: model:ir.model.fields,field_description:account_reports.field_account_report_budget_item__create_uid
+#: model:ir.model.fields,field_description:account_reports.field_account_report_file_download_error_wizard__create_uid
+#: model:ir.model.fields,field_description:account_reports.field_account_report_horizontal_group__create_uid
+#: model:ir.model.fields,field_description:account_reports.field_account_report_horizontal_group_rule__create_uid
+#: model:ir.model.fields,field_description:account_reports.field_account_report_send__create_uid
+#: model:ir.model.fields,field_description:account_reports.field_account_reports_export_wizard__create_uid
+#: model:ir.model.fields,field_description:account_reports.field_account_reports_export_wizard_format__create_uid
+#: model:ir.model.fields,field_description:account_reports.field_account_tax_unit__create_uid
+msgid "Created by"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model:ir.model.fields,field_description:account_reports.field_account_multicurrency_revaluation_wizard__create_date
+#: model:ir.model.fields,field_description:account_reports.field_account_report_annotation__create_date
+#: model:ir.model.fields,field_description:account_reports.field_account_report_budget__create_date
+#: model:ir.model.fields,field_description:account_reports.field_account_report_budget_item__create_date
+#: model:ir.model.fields,field_description:account_reports.field_account_report_file_download_error_wizard__create_date
+#: model:ir.model.fields,field_description:account_reports.field_account_report_horizontal_group__create_date
+#: model:ir.model.fields,field_description:account_reports.field_account_report_horizontal_group_rule__create_date
+#: model:ir.model.fields,field_description:account_reports.field_account_report_send__create_date
+#: model:ir.model.fields,field_description:account_reports.field_account_reports_export_wizard__create_date
+#: model:ir.model.fields,field_description:account_reports.field_account_reports_export_wizard_format__create_date
+#: model:ir.model.fields,field_description:account_reports.field_account_tax_unit__create_date
+msgid "Created on"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_journal_report.py:0
+#: code:addons/odex30_account_reports/wizard/multicurrency_revaluation.py:0
+#: model:account.report.column,name:account_reports.general_ledger_report_credit
+#: model:account.report.column,name:account_reports.journal_report_credit
+#: model:account.report.column,name:account_reports.partner_ledger_report_credit
+#: model:account.report.column,name:account_reports.trial_balance_report_credit
+msgid "Credit"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model:account.report.column,name:account_reports.aged_payable_report_currency
+#: model:account.report.column,name:account_reports.aged_receivable_report_currency
+#: model:account.report.column,name:account_reports.bank_reconciliation_report_currency
+#: model:account.report.column,name:account_reports.general_ledger_report_amount_currency
+msgid "Currency"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_report.py:0
+msgid "Currency Code"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_multicurrency_revaluation_report.py:0
+msgid "Currency Rates (%s)"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model_terms:ir.ui.view,arch_db:account_reports.pdf_export_filters
+msgid "Currency:"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model:account.report.column,name:account_reports.deferred_expense_current
+#: model:account.report.column,name:account_reports.deferred_revenue_current
+msgid "Current"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model:account.report.line,name:account_reports.account_financial_report_current_assets0
+#: model:account.report.line,name:account_reports.account_financial_report_current_assets_view0
+msgid "Current Assets"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model:account.report.line,name:account_reports.account_financial_report_current_liabilities0
+#: model:account.report.line,name:account_reports.account_financial_report_current_liabilities1
+msgid "Current Liabilities"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model:account.report.line,name:account_reports.account_financial_retained_earnings_line_1
+msgid "Current Year Retained Earnings"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model:account.report.line,name:account_reports.account_financial_current_year_earnings0
+msgid "Current Year Unallocated Earnings"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model:account.report.line,name:account_reports.account_financial_report_executivesummary_ca_to_l0
+msgid "Current assets to liabilities"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/account_report/filters/filter_comparison.xml:0
+#: code:addons/odex30_account_reports/static/src/components/account_report/filters/filter_date.xml:0
+msgid "Custom Dates"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model:ir.model.fields,field_description:account_reports.field_account_report__custom_handler_model_id
+msgid "Custom Handler Model"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model:ir.model.fields,field_description:account_reports.field_account_report__custom_handler_model_name
+msgid "Custom Handler Model Name"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/bank_reconciliation_report.py:0
+msgid ""
+"Custom engine _report_custom_engine_last_statement_balance_amount does not "
+"support groupby"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model:account.report,name:account_reports.customer_statement_report
+#: model:ir.actions.client,name:account_reports.action_account_report_customer_statement
+#: model:mail.template,name:account_reports.email_template_customer_statement
+msgid "Customer Statement"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model:ir.model,name:account_reports.model_account_customer_statement_report_handler
+msgid "Customer Statement Custom Handler"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/account_report/line_name/popover/annotations_popover.xml:0
+#: model:account.report.column,name:account_reports.bank_reconciliation_report_date
+#: model:account.report.column,name:account_reports.general_ledger_report_date
+#: model:ir.model.fields,field_description:account_reports.field_account_multicurrency_revaluation_wizard__date
+#: model:ir.model.fields,field_description:account_reports.field_account_report_annotation__date
+#: model:ir.model.fields,field_description:account_reports.field_account_report_budget_item__date
+msgid "Date"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/account_report/filters/filters.js:0
+msgid "Date cannot be empty"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model:ir.model.fields,help:account_reports.field_account_report_annotation__date
+msgid "Date considered as annotated by the annotation."
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/aged_partner_balance/filter_aging.xml:0
+msgid "Days"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_journal_report.py:0
+#: code:addons/odex30_account_reports/wizard/multicurrency_revaluation.py:0
+#: model:account.report.column,name:account_reports.general_ledger_report_debit
+#: model:account.report.column,name:account_reports.journal_report_debit
+#: model:account.report.column,name:account_reports.partner_ledger_report_debit
+#: model:account.report.column,name:account_reports.trial_balance_report_debit
+msgid "Debit"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_journal_report.py:0
+#: code:addons/odex30_account_reports/static/src/components/journal_report/line/line.xml:0
+#: model_terms:ir.ui.view,arch_db:account_reports.pdf_journal_report_taxes_summary
+msgid "Deductible"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/deferred_reports/warnings.xml:0
+msgid "Deferrals have not yet been completely generated for this period."
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/deferred_reports/warnings.xml:0
+msgid "Deferrals have not yet been generated for this period."
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_deferred_reports.py:0
+#: code:addons/odex30_account_reports/models/account_report.py:0
+msgid "Deferred Entries"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model:ir.actions.client,name:account_reports.action_account_report_deferred_expense
+#: model:ir.ui.menu,name:account_reports.menu_action_account_report_deferred_expense
+msgid "Deferred Expense"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model:ir.model,name:account_reports.model_account_deferred_expense_report_handler
+msgid "Deferred Expense Custom Handler"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model:account.report,name:account_reports.deferred_expense_report
+msgid "Deferred Expense Report"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model:ir.model,name:account_reports.model_account_deferred_report_handler
+msgid "Deferred Expense Report Custom Handler"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model:ir.actions.client,name:account_reports.action_account_report_deferred_revenue
+#: model:ir.ui.menu,name:account_reports.menu_action_account_report_deferred_revenue
+msgid "Deferred Revenue"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model:ir.model,name:account_reports.model_account_deferred_revenue_report_handler
+msgid "Deferred Revenue Custom Handler"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model:account.report,name:account_reports.deferred_revenue_report
+msgid "Deferred Revenue Report"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model_terms:ir.ui.view,arch_db:account_reports.account_report_expression_form
+msgid "Definition"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model:ir.model.fields,field_description:account_reports.field_res_company__account_tax_periodicity
+msgid "Delay units"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_move.py:0
+msgid "Depending moves"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/account_report/filters/filters.js:0
+msgid "Descending"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_generic_tax_report.py:0
+msgid "Difference from rounding taxes"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model:ir.model.fields,field_description:account_reports.field_account_report_line__display_custom_groupby_warning
+msgid "Display Custom Groupby Warning"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model:ir.model.fields,field_description:account_reports.field_account_report_send__display_mail_composer
+msgid "Display Mail Composer"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model:ir.model.fields,field_description:account_reports.field_account_multicurrency_revaluation_wizard__display_name
+#: model:ir.model.fields,field_description:account_reports.field_account_report_annotation__display_name
+#: model:ir.model.fields,field_description:account_reports.field_account_report_budget__display_name
+#: model:ir.model.fields,field_description:account_reports.field_account_report_budget_item__display_name
+#: model:ir.model.fields,field_description:account_reports.field_account_report_file_download_error_wizard__display_name
+#: model:ir.model.fields,field_description:account_reports.field_account_report_horizontal_group__display_name
+#: model:ir.model.fields,field_description:account_reports.field_account_report_horizontal_group_rule__display_name
+#: model:ir.model.fields,field_description:account_reports.field_account_report_send__display_name
+#: model:ir.model.fields,field_description:account_reports.field_account_reports_export_wizard__display_name
+#: model:ir.model.fields,field_description:account_reports.field_account_reports_export_wizard_format__display_name
+#: model:ir.model.fields,field_description:account_reports.field_account_tax_unit__display_name
+msgid "Display Name"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_journal_report.py:0
+msgid "Document"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model:ir.model.fields,field_description:account_reports.field_account_reports_export_wizard__doc_name
+msgid "Documents Name"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model:ir.model.fields,field_description:account_reports.field_account_report_horizontal_group_rule__domain
+msgid "Domain"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/account_report/filters/filter_fiscal_position.xml:0
+#: code:addons/odex30_account_reports/static/src/components/account_report/filters/filters.js:0
+msgid "Domestic"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model:ir.model.fields,field_description:account_reports.field_account_report_send__checkbox_download
+msgid "Download"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model_terms:ir.ui.view,arch_db:account_reports.view_account_report_file_download_error_wizard_form
+msgid "Download Anyway"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model_terms:ir.ui.view,arch_db:account_reports.res_config_settings_view_form
+msgid "Download the Data Inalterability Check Report"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/account_report/filters/filter_extra_options.xml:0
+msgid "Draft Entries"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_general_ledger.py:0
+msgid "Draft Entry"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_followup_report.py:0
+#: code:addons/odex30_account_reports/models/account_journal_report.py:0
+#: code:addons/odex30_account_reports/static/src/components/journal_report/line/line.xml:0
+#: model_terms:ir.ui.view,arch_db:account_reports.pdf_journal_report_taxes_summary
+msgid "Due"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/aged_partner_balance/filter_aging.xml:0
+#: model:account.report.column,name:account_reports.customer_statement_report_date_maturity
+#: model:account.report.column,name:account_reports.followup_report_date_maturity
+#: model:account.report.column,name:account_reports.partner_ledger_report_date_maturity
+msgid "Due Date"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model:ir.actions.client,name:account_reports.action_account_report_sales
+#: model:ir.ui.menu,name:account_reports.menu_action_account_report_sales
+msgid "EC Sales List"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model:ir.model,name:account_reports.model_account_ec_sales_report_handler
+msgid "EC Sales Report Custom Handler"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_sales_report.py:0
+msgid "EC tax on non EC countries"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_sales_report.py:0
+msgid "EC tax on same country"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model:account.report.line,name:account_reports.account_financial_report_equity0
+msgid "EQUITY"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_report.py:0
+msgid ""
+"Editing a manual report line is not allowed in multivat setup when "
+"displaying data from all fiscal positions."
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_report.py:0
+msgid ""
+"Editing a manual report line is not allowed when multiple companies are "
+"selected."
+msgstr ""
+
+#. module: odex30_account_reports
+#: model:ir.model.fields,field_description:account_reports.field_account_report_send__checkbox_send_mail
+msgid "Email"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model:ir.model.fields,field_description:account_reports.field_account_report_send__mail_template_id
+msgid "Email template"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model:ir.model.fields,field_description:account_reports.field_account_report_send__enable_download
+msgid "Enable Download"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_report.py:0
+msgid "Enable Sections"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model:ir.model.fields,field_description:account_reports.field_account_report_send__enable_send_mail
+msgid "Enable Send Mail"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/account_report/filters/filter_variant.xml:0
+msgid "Enable more ..."
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_trial_balance_report.py:0
+msgid "End Balance"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/account_report/filters/filters.js:0
+msgid "End of Month"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/account_report/filters/filters.js:0
+msgid "End of Quarter"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/account_report/filters/filters.js:0
+msgid "End of Year"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/account_report/line/popover/debug_popover.xml:0
+msgid "Engine"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_sales_report.py:0
+msgid "Entries with partners with no VAT"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_report.py:0
+msgid "Error message"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model:mail.activity.type,summary:account_reports.mail_activity_type_tax_report_error
+msgid "Error sending Tax Report"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/multicurrency_revaluation_report/filters/filter_exchange_rate.xml:0
+msgid "Exchange Rates"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model:ir.model.fields,field_description:account_reports.field_account_move_line__exclude_bank_lines
+msgid "Exclude Bank Lines"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model_terms:ir.ui.view,arch_db:account_reports.view_journal_report_audit_move_line_search
+msgid "Exclude Bank lines"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model:ir.model.fields,field_description:account_reports.field_account_account__exclude_provision_currency_ids
+msgid "Exclude Provision Currency"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model:account.report.line,name:account_reports.multicurrency_revaluation_excluded
+msgid "Excluded Accounts"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model:account.report,name:account_reports.executive_summary
+#: model:ir.actions.client,name:account_reports.action_account_report_exec_summary
+#: model:ir.ui.menu,name:account_reports.menu_action_account_report_exec_summary
+msgid "Executive Summary"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model:ir.model.fields,field_description:account_reports.field_account_multicurrency_revaluation_wizard__expense_provision_account_id
+msgid "Expense Account"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model:ir.model.fields,field_description:account_reports.field_res_company__account_revaluation_expense_provision_account_id
+msgid "Expense Provision Account"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/wizard/multicurrency_revaluation.py:0
+msgid "Expense Provision for %s"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model:account.report.line,name:account_reports.account_financial_report_executivesummary_expenses0
+msgid "Expenses"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model_terms:ir.ui.view,arch_db:account_reports.view_report_export_wizard
+msgid "Export"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model:ir.model,name:account_reports.model_account_reports_export_wizard_format
+msgid "Export format for accounting's reports"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model:ir.model.fields,field_description:account_reports.field_account_reports_export_wizard__export_format_ids
+msgid "Export to"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model:ir.model,name:account_reports.model_account_reports_export_wizard
+msgid "Export wizard for accounting's reports"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model_terms:ir.ui.view,arch_db:account_reports.account_report_expression_form
+msgid "Expression"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_report.py:0
+msgid ""
+"Expression labelled '%(label)s' of line '%(line)s' is being overwritten when"
+" computing the current report. Make sure the cross-report aggregations of "
+"this report only reference terms belonging to other reports."
+msgstr ""
+
+#. module: odex30_account_reports
+#: model:ir.model.fields,field_description:account_reports.field_account_report_horizontal_group_rule__field_name
+msgid "Field"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_report.py:0
+msgid ""
+"Field %s does not exist on account.move.line, and is not supported by this "
+"report's custom handler."
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_report.py:0
+msgid "Field %s does not exist on account.move.line."
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_report.py:0
+msgid "Field %s of account.move.line cannot be used in a groupby expression."
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_report.py:0
+msgid ""
+"Field %s of account.move.line is not searchable and can therefore not be "
+"used in a groupby expression."
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_report.py:0
+msgid ""
+"Field 'Custom Handler Model' can only reference records inheriting from "
+"[%s]."
+msgstr ""
+
+#. module: odex30_account_reports
+#: model:ir.model.fields,field_description:account_reports.field_account_report_file_download_error_wizard__file_content
+msgid "File Content"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model_terms:ir.ui.view,arch_db:account_reports.view_account_report_file_download_error_wizard_form
+msgid "File Download Errors"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model:ir.model.fields,field_description:account_reports.field_account_report_file_download_error_wizard__file_name
+msgid "File Name"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_report.py:0
+#: model_terms:ir.ui.view,arch_db:account_reports.account_report_form
+msgid "Filters"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/account_report/filters/filter_aml_ir_filters.xml:0
+#: model_terms:ir.ui.view,arch_db:account_reports.pdf_export_filters
+msgid "Filters:"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model:ir.actions.act_window,name:account_reports.action_account_report_budget_tree
+#: model:ir.ui.menu,name:account_reports.menu_action_account_report_budget_tree
+msgid "Financial Budgets"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model:ir.model,name:account_reports.model_account_fiscal_position
+#: model:ir.model.fields,field_description:account_reports.field_account_report_annotation__fiscal_position_id
+msgid "Fiscal Position"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/account_report/filters/filter_fiscal_position.xml:0
+msgid "Fiscal Position:"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model:ir.model.fields,field_description:account_reports.field_account_tax_unit__fpos_synced
+msgid "Fiscal Positions Synchronised"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model_terms:ir.ui.view,arch_db:account_reports.view_tax_unit_form
+msgid ""
+"Fiscal Positions should apply to all companies of the tax unit. You may want"
+" to"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model:account.report,name:account_reports.followup_report
+msgid "Follow-Up Report"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model:ir.model,name:account_reports.model_account_followup_report_handler
+msgid "Follow-Up Report Custom Handler"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/wizard/multicurrency_revaluation.py:0
+msgid "Foreign currencies adjustment entry as of %s"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/account_report/line/popover/debug_popover.xml:0
+msgid "Formula"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_report.py:0
+msgid ""
+"From %(date_from)s\n"
+"to  %(date_to)s"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model:ir.model.fields,field_description:account_reports.field_account_reports_export_wizard_format__fun_param
+msgid "Function Parameter"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model:ir.model.fields,field_description:account_reports.field_account_reports_export_wizard_format__fun_to_call
+msgid "Function to Call"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_report.py:0
+#: code:addons/odex30_account_reports/models/account_trial_balance_report.py:0
+#: code:addons/odex30_account_reports/static/src/components/bank_reconciliation_report/warnings.xml:0
+#: code:addons/odex30_account_reports/static/src/components/multicurrency_revaluation_report/line_name.xml:0
+#: model:account.report,name:account_reports.general_ledger_report
+#: model:ir.actions.client,name:account_reports.action_account_report_general_ledger
+#: model:ir.ui.menu,name:account_reports.menu_action_account_report_general_ledger
+msgid "General Ledger"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model:ir.model,name:account_reports.model_account_general_ledger_report_handler
+msgid "General Ledger Custom Handler"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_deferred_reports.py:0
+msgid "Generate entry"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/wizard/report_export_wizard.py:0
+msgid "Generated Documents"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model:account.report,name:account_reports.generic_ec_sales_report
+msgid "Generic EC Sales List"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model:ir.model,name:account_reports.model_account_generic_tax_report_handler
+msgid "Generic Tax Report Custom Handler"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model:ir.model,name:account_reports.model_account_generic_tax_report_handler_account_tax
+msgid "Generic Tax Report Custom Handler (Account -> Tax)"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model:ir.model,name:account_reports.model_account_generic_tax_report_handler_tax_account
+msgid "Generic Tax Report Custom Handler (Tax -> Account)"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_journal_report.py:0
+#: model_terms:ir.ui.view,arch_db:account_reports.journal_report_pdf_export_main
+msgid "Global Tax Summary"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_sales_report.py:0
+msgid "Goods"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_journal_report.py:0
+#: code:addons/odex30_account_reports/static/src/components/journal_report/line/line.xml:0
+#: model_terms:ir.ui.view,arch_db:account_reports.pdf_journal_report_taxes_summary
+msgid "Grid"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model:account.report.line,name:account_reports.account_financial_report_gross_profit0
+msgid "Gross Profit"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model:account.report.line,name:account_reports.account_financial_report_executivesummary_gross_profit0
+msgid "Gross profit"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model:account.report.line,name:account_reports.account_financial_report_executivesummary_gpmargin0
+msgid "Gross profit margin (gross profit / operating income)"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model_terms:ir.ui.view,arch_db:account_reports.account_report_line_form
+#: model_terms:ir.ui.view,arch_db:account_reports.view_account_report_search
+msgid "Group By"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model_terms:ir.ui.view,arch_db:account_reports.account_report_horizontal_group_form
+msgid "Group Name"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/deferred_reports/groupby.xml:0
+msgid "Group by"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_deferred_reports.py:0
+msgid "Grouped Deferral Entry of %s"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/partner_ledger/filter_extra_options.xml:0
+msgid "Hide Account"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/partner_ledger/filter_extra_options.xml:0
+msgid "Hide Debit/Credit"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/account_report/filters/filter_extra_options.xml:0
+msgid "Hide lines at 0"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/account_report/filters/filter_extra_options.xml:0
+msgid "Hierarchy and Subtotals"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_report.py:0
+#: model:ir.model.fields,field_description:account_reports.field_account_report_horizontal_group_rule__horizontal_group_id
+msgid "Horizontal Group"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/account_report/filters/filter_horizontal_groups.xml:0
+msgid "Horizontal Group:"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model:ir.actions.act_window,name:account_reports.action_account_report_horizontal_groups
+#: model:ir.model.fields,field_description:account_reports.field_account_report__horizontal_group_ids
+#: model:ir.ui.menu,name:account_reports.menu_action_account_report_horizontal_groups
+msgid "Horizontal Groups"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model:ir.model,name:account_reports.model_account_report_horizontal_group
+msgid "Horizontal group for reports"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model:ir.model,name:account_reports.model_account_report_horizontal_group_rule
+msgid "Horizontal group rule for reports"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model_terms:ir.ui.view,arch_db:account_reports.pdf_export_filters
+msgid "Horizontal:"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model_terms:ir.ui.view,arch_db:account_reports.res_config_settings_view_form
+msgid "How often tax returns have to be made"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model:ir.model.fields,field_description:account_reports.field_account_multicurrency_revaluation_wizard__id
+#: model:ir.model.fields,field_description:account_reports.field_account_report_annotation__id
+#: model:ir.model.fields,field_description:account_reports.field_account_report_budget__id
+#: model:ir.model.fields,field_description:account_reports.field_account_report_budget_item__id
+#: model:ir.model.fields,field_description:account_reports.field_account_report_file_download_error_wizard__id
+#: model:ir.model.fields,field_description:account_reports.field_account_report_horizontal_group__id
+#: model:ir.model.fields,field_description:account_reports.field_account_report_horizontal_group_rule__id
+#: model:ir.model.fields,field_description:account_reports.field_account_report_send__id
+#: model:ir.model.fields,field_description:account_reports.field_account_reports_export_wizard__id
+#: model:ir.model.fields,field_description:account_reports.field_account_reports_export_wizard_format__id
+#: model:ir.model.fields,field_description:account_reports.field_account_tax_unit__id
+msgid "ID"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_journal_report.py:0
+#: code:addons/odex30_account_reports/static/src/components/journal_report/line/line.xml:0
+#: model_terms:ir.ui.view,arch_db:account_reports.pdf_journal_report_taxes_summary
+msgid "Impact On Grid"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/journal_report/line/line.xml:0
+#: model_terms:ir.ui.view,arch_db:account_reports.pdf_journal_report_taxes_summary
+msgid "Impacted Tax Grids"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/account_report/filters/filters.js:0
+msgid "In %s"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model_terms:ir.ui.view,arch_db:account_reports.view_account_report_search
+msgid "Inactive"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/journal_report/filter_extra_options.xml:0
+msgid "Include Payments"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_report.py:0
+#: code:addons/odex30_account_reports/static/src/components/account_report/filters/filters.js:0
+#: model_terms:ir.ui.view,arch_db:account_reports.pdf_export_filter_extra_options_template
+msgid "Including Analytic Simulations"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model:account.report.line,name:account_reports.no_statement_unreconciled_payments
+#: model:account.report.line,name:account_reports.unreconciled_last_statement_payments
+msgid "Including Unreconciled Payments"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model:account.report.line,name:account_reports.no_statement_unreconciled_receipt
+#: model:account.report.line,name:account_reports.unreconciled_last_statement_receipts
+msgid "Including Unreconciled Receipts"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model:ir.model.fields,field_description:account_reports.field_account_multicurrency_revaluation_wizard__income_provision_account_id
+msgid "Income Account"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model:ir.model.fields,field_description:account_reports.field_res_company__account_revaluation_income_provision_account_id
+msgid "Income Provision Account"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/wizard/multicurrency_revaluation.py:0
+msgid "Income Provision for %s"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/bank_reconciliation_report.py:0
+msgid "Inconsistent Statements"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_report.py:0
+msgid ""
+"Inconsistent data: more than one external value at the same date for a "
+"'most_recent' external line."
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_report.py:0
+msgid ""
+"Inconsistent report_id in options dictionary. Options says "
+"%(options_report)s; report is %(report)s."
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_report.py:0
+#: code:addons/odex30_account_reports/models/account_trial_balance_report.py:0
+msgid "Initial Balance"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/account_report/filters/filter_extra_options.xml:0
+msgid "Integer Rounding"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/aged_partner_balance/filters.js:0
+msgid "Intervals cannot be smaller than 1"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/sales_report/warnings.xml:0
+msgid "Intra-community taxes are applied on"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_report.py:0
+msgid ""
+"Invalid domain formula in expression \"%(expression)s\" of line "
+"\"%(line)s\": %(formula)s"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_report.py:0
+msgid "Invalid method “%s”"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_report.py:0
+msgid ""
+"Invalid subformula in expression \"%(expression)s\" of line \"%(line)s\": "
+"%(subformula)s"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_report.py:0
+msgid "Invalid token '%(token)s' in account_codes formula '%(formula)s'"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/aged_partner_balance/filter_aging.xml:0
+#: model:account.report.column,name:account_reports.aged_payable_report_invoice_date
+#: model:account.report.column,name:account_reports.aged_receivable_report_invoice_date
+#: model:account.report.column,name:account_reports.customer_statement_report_invoicing_date
+#: model:account.report.column,name:account_reports.followup_report_invoicing_date
+#: model:account.report.column,name:account_reports.partner_ledger_report_invoicing_date
+msgid "Invoice Date"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model_terms:ir.ui.view,arch_db:account_reports.view_journal_report_audit_move_line_search
+msgid "Invoice lines"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model:ir.model.fields,field_description:account_reports.field_account_report__is_account_coverage_report_available
+msgid "Is Account Coverage Report Available"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_move.py:0
+msgid "It seems there is some depending closing move to be posted"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/account_report/filters/filters.js:0
+msgid ""
+"It's not possible to select a budget with the horizontal group feature."
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/account_report/filters/filters.js:0
+msgid ""
+"It's not possible to select a horizontal group with the budget feature."
+msgstr ""
+
+#. module: odex30_account_reports
+#: model:ir.model.fields,field_description:account_reports.field_account_report_budget__item_ids
+msgid "Items"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model:account.report.column,name:account_reports.partner_ledger_report_journal_code
+#: model:ir.model,name:account_reports.model_account_journal
+#: model:ir.model.fields,field_description:account_reports.field_account_financial_year_op__account_tax_periodicity_journal_id
+#: model:ir.model.fields,field_description:account_reports.field_account_multicurrency_revaluation_wizard__journal_id
+#: model:ir.model.fields,field_description:account_reports.field_res_company__account_tax_periodicity_journal_id
+#: model:ir.model.fields,field_description:account_reports.field_res_config_settings__account_tax_periodicity_journal_id
+#: model_terms:ir.ui.view,arch_db:account_reports.res_config_settings_view_form
+#: model_terms:ir.ui.view,arch_db:account_reports.setup_financial_year_opening_form
+msgid "Journal"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model:ir.actions.client,name:account_reports.action_account_report_ja
+#: model:ir.ui.menu,name:account_reports.menu_action_account_report_ja
+msgid "Journal Audit"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model:ir.model,name:account_reports.model_account_move
+msgid "Journal Entry"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model:ir.model,name:account_reports.model_account_move_line
+msgid "Journal Item"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_deferred_reports.py:0
+#: code:addons/odex30_account_reports/models/account_report.py:0
+#: code:addons/odex30_account_reports/models/account_trial_balance_report.py:0
+#: code:addons/odex30_account_reports/models/bank_reconciliation_report.py:0
+#: code:addons/odex30_account_reports/static/src/components/general_ledger/line_name.xml:0
+#: code:addons/odex30_account_reports/static/src/components/partner_ledger/line_name.xml:0
+msgid "Journal Items"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_generic_tax_report.py:0
+#: code:addons/odex30_account_reports/models/account_journal_report.py:0
+msgid "Journal Items for Tax Audit"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model:account.report,name:account_reports.journal_report
+msgid "Journal Report"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model:ir.model,name:account_reports.model_account_journal_report_handler
+msgid "Journal Report Custom Handler"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_generic_tax_report.py:0
+msgid "Journal items with archived tax tags"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_report.py:0
+msgid "Journals"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model_terms:ir.ui.view,arch_db:account_reports.pdf_export_filters
+msgid "Journals:"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model:account.report.line,name:account_reports.account_financial_report_liabilities_view0
+msgid "LIABILITIES"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model:account.report.line,name:account_reports.account_financial_report_liabilities_and_equity_view0
+msgid "LIABILITIES + EQUITY"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#. odoo-python
+#: code:addons/odex30_account_reports/static/src/components/account_report/line/popover/debug_popover.xml:0
+#: code:addons/odex30_account_reports/wizard/multicurrency_revaluation.py:0
+#: model:account.report.column,name:account_reports.bank_reconciliation_report_label
+msgid "Label"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model:ir.model.fields,field_description:account_reports.field_account_report_send__mail_lang
+msgid "Lang"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model_terms:ir.ui.view,arch_db:account_reports.account_reports_journal_dashboard_kanban_view
+msgid "Last Statement balance + Transactions since statement"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model:ir.model.fields,field_description:account_reports.field_account_multicurrency_revaluation_wizard__write_uid
+#: model:ir.model.fields,field_description:account_reports.field_account_report_annotation__write_uid
+#: model:ir.model.fields,field_description:account_reports.field_account_report_budget__write_uid
+#: model:ir.model.fields,field_description:account_reports.field_account_report_budget_item__write_uid
+#: model:ir.model.fields,field_description:account_reports.field_account_report_file_download_error_wizard__write_uid
+#: model:ir.model.fields,field_description:account_reports.field_account_report_horizontal_group__write_uid
+#: model:ir.model.fields,field_description:account_reports.field_account_report_horizontal_group_rule__write_uid
+#: model:ir.model.fields,field_description:account_reports.field_account_report_send__write_uid
+#: model:ir.model.fields,field_description:account_reports.field_account_reports_export_wizard__write_uid
+#: model:ir.model.fields,field_description:account_reports.field_account_reports_export_wizard_format__write_uid
+#: model:ir.model.fields,field_description:account_reports.field_account_tax_unit__write_uid
+msgid "Last Updated by"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model:ir.model.fields,field_description:account_reports.field_account_multicurrency_revaluation_wizard__write_date
+#: model:ir.model.fields,field_description:account_reports.field_account_report_annotation__write_date
+#: model:ir.model.fields,field_description:account_reports.field_account_report_budget__write_date
+#: model:ir.model.fields,field_description:account_reports.field_account_report_budget_item__write_date
+#: model:ir.model.fields,field_description:account_reports.field_account_report_file_download_error_wizard__write_date
+#: model:ir.model.fields,field_description:account_reports.field_account_report_horizontal_group__write_date
+#: model:ir.model.fields,field_description:account_reports.field_account_report_horizontal_group_rule__write_date
+#: model:ir.model.fields,field_description:account_reports.field_account_report_send__write_date
+#: model:ir.model.fields,field_description:account_reports.field_account_reports_export_wizard__write_date
+#: model:ir.model.fields,field_description:account_reports.field_account_reports_export_wizard_format__write_date
+#: model:ir.model.fields,field_description:account_reports.field_account_tax_unit__write_date
+msgid "Last Updated on"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model:account.report.line,name:account_reports.last_statement_balance
+msgid "Last statement balance"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_deferred_reports.py:0
+msgid "Later"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model:account.report.line,name:account_reports.account_financial_report_cost_sales0
+msgid "Less Costs of Revenue"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model:account.report.line,name:account_reports.account_financial_report_expense0
+msgid "Less Operating Expenses"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model:account.report.line,name:account_reports.account_financial_report_depreciation0
+msgid "Less Other Expenses"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model:ir.model.fields,field_description:account_reports.field_account_report_annotation__line_id
+msgid "Line"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_report.py:0
+msgid ""
+"Line '%(child)s' is configured to appear before its parent '%(parent)s'. "
+"This is not allowed."
+msgstr ""
+
+#. module: odex30_account_reports
+#: model_terms:ir.ui.view,arch_db:account_reports.account_report_form
+msgid "Lines"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_report.py:0
+msgid "Load more..."
+msgstr ""
+
+#. module: odex30_account_reports
+#: model:ir.model.fields,field_description:account_reports.field_account_report_send__mail_attachments_widget
+msgid "Mail Attachments Widget"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model:ir.model.fields,field_description:account_reports.field_account_tax_unit__main_company_id
+msgid "Main Company"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model:ir.model.fields,help:account_reports.field_account_tax_unit__main_company_id
+msgid ""
+"Main company of this unit; the one actually reporting and paying the taxes."
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_multicurrency_revaluation_report.py:0
+#: model_terms:ir.ui.view,arch_db:account_reports.view_account_multicurrency_revaluation_wizard
+msgid "Make Adjustment Entry"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model:ir.model,name:account_reports.model_account_report_file_download_error_wizard
+msgid "Manage the file generation errors from report exports."
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_report.py:0
+msgid "Manual value"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_report.py:0
+msgid "Manual values"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model:account.report.column,name:account_reports.partner_ledger_report_matching_number
+msgid "Matching"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model:ir.model.fields,help:account_reports.field_account_tax_unit__company_ids
+msgid "Members of this unit"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_report.py:0
+msgid "Method '%(method_name)s' must start with the '%(prefix)s' prefix."
+msgstr ""
+
+#. module: odex30_account_reports
+#: model:account.report.line,name:account_reports.misc_operations
+msgid "Misc. operations"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model:ir.model.fields,field_description:account_reports.field_account_report_send__mode
+msgid "Mode"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model:ir.model.fields,field_description:account_reports.field_account_report_horizontal_group_rule__res_model_name
+msgid "Model"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/account_report/filters/filters.js:0
+msgid "Month"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model_terms:ir.ui.view,arch_db:account_reports.account_report_budget_form
+msgid "Months"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model_terms:ir.ui.view,arch_db:account_reports.pdf_export_filters
+msgid "Multi-Ledger:"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_report.py:0
+msgid "Multi-ledger"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model:ir.model,name:account_reports.model_account_multicurrency_revaluation_report_handler
+msgid "Multicurrency Revaluation Report Custom Handler"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model:ir.model,name:account_reports.model_account_multicurrency_revaluation_wizard
+msgid "Multicurrency Revaluation Wizard"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model:ir.model.fields.selection,name:account_reports.selection__account_report_send__mode__multi
+msgid "Multiple Recipients"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/res_company.py:0
+msgid ""
+"Multiple draft tax closing entries exist for fiscal position %(position)s after %(period_start)s. There should be at most one. \n"
+" %(closing_entries)s"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/res_company.py:0
+msgid ""
+"Multiple draft tax closing entries exist for your domestic region after %(period_start)s. There should be at most one. \n"
+" %(closing_entries)s"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_general_ledger.py:0
+#: code:addons/odex30_account_reports/models/account_journal_report.py:0
+#: code:addons/odex30_account_reports/static/src/components/journal_report/line/line.xml:0
+#: model:account.report.line,name:account_reports.journal_report_line
+#: model:ir.model.fields,field_description:account_reports.field_account_report_budget__name
+#: model:ir.model.fields,field_description:account_reports.field_account_report_horizontal_group__name
+#: model:ir.model.fields,field_description:account_reports.field_account_reports_export_wizard_format__name
+#: model:ir.model.fields,field_description:account_reports.field_account_tax_unit__name
+#: model_terms:ir.ui.view,arch_db:account_reports.duplicated_vat_partner_tree_view
+#: model_terms:ir.ui.view,arch_db:account_reports.pdf_journal_report_taxes_summary
+#: model_terms:ir.ui.view,arch_db:account_reports.view_tax_unit_form
+msgid "Name"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model:ir.model.fields,help:account_reports.field_account_reports_export_wizard__doc_name
+msgid "Name to give to the generated documents."
+msgstr ""
+
+#. module: odex30_account_reports
+#: model:account.report.line,name:account_reports.account_financial_report_executivesummary_profit0
+#: model:account.report.line,name:account_reports.account_financial_report_net_profit0
+msgid "Net Profit"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model:account.report.line,name:account_reports.account_financial_report_executivesummary_net_assets0
+msgid "Net assets"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_cash_flow_report.py:0
+msgid "Net increase in cash and cash equivalents"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model:account.report.line,name:account_reports.account_financial_report_executivesummary_npmargin0
+msgid "Net profit margin (net profit / revenue)"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model_terms:ir.ui.view,arch_db:account_reports.account_reports_journal_dashboard_kanban_view
+msgid "Never miss a tax deadline."
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_report.py:0
+#: code:addons/odex30_account_reports/static/src/components/account_report/line_cell/popover/edit_popover.xml:0
+msgid "No"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/account_report/filters/filter_comparison.xml:0
+msgid "No Comparison"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_report.py:0
+msgid "No Journal"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_report.py:0
+msgid "No VAT number associated with your company. Please define one."
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/wizard/multicurrency_revaluation.py:0
+msgid "No adjustment needed"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/account_report/account_report.xml:0
+msgid "No data to display !"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/chart_template.py:0
+msgid "No default miscellaneous journal could be found for the active company"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_deferred_reports.py:0
+msgid "No entry to generate."
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/wizard/multicurrency_revaluation.py:0
+msgid "No provision needed was found."
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/account_report/filters/filters.js:0
+msgid "Non Trade Partners"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_report.py:0
+msgid "Non Trade Payable"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_report.py:0
+msgid "Non Trade Receivable"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_journal_report.py:0
+#: code:addons/odex30_account_reports/static/src/components/journal_report/line/line.xml:0
+#: model_terms:ir.ui.view,arch_db:account_reports.pdf_journal_report_taxes_summary
+msgid "Non-Deductible"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/account_report/filters/filter_horizontal_groups.xml:0
+#: code:addons/odex30_account_reports/static/src/components/account_report/filters/filters.js:0
+#: code:addons/odex30_account_reports/static/src/components/sales_report/filters/filters.js:0
+#: model_terms:ir.ui.view,arch_db:account_reports.account_report_form
+msgid "None"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_deferred_reports.py:0
+msgid "Not Started"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/account_report/filters/filters.js:0
+msgid "Number of periods cannot be smaller than 1"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model:account.report.line,name:account_reports.account_financial_report_off_sheet
+msgid "OFF BALANCE SHEET ACCOUNTS"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/account_report/filters/filters.js:0
+#: code:addons/odex30_account_reports/static/src/components/aged_partner_balance/filters.js:0
+msgid "Odoo Warning"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model:account.report.column,name:account_reports.aged_payable_report_period5
+#: model:account.report.column,name:account_reports.aged_receivable_report_period5
+msgid "Older"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/wizard/report_export_wizard.py:0
+msgid "One of the formats chosen can not be exported in the DMS"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_move.py:0
+msgid "Only Billing Administrators are allowed to change lock dates!"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model:ir.actions.server,name:account_reports.action_account_reports_customer_statements
+msgid "Open Customer Statements"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model:ir.model,name:account_reports.model_account_financial_year_op
+msgid "Opening Balance of Financial Year"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model:account.report.line,name:account_reports.account_financial_report_operating_income0
+msgid "Operating Income (or Loss)"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_report.py:0
+#: code:addons/odex30_account_reports/static/src/components/account_report/filters/filter_extra_options.xml:0
+#: model_terms:ir.ui.view,arch_db:account_reports.account_report_expression_form
+#: model_terms:ir.ui.view,arch_db:account_reports.account_report_form
+msgid "Options"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model_terms:ir.ui.view,arch_db:account_reports.pdf_export_filter_extra_options_template
+msgid "Options:"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model:account.report.line,name:account_reports.outstanding
+msgid "Outstanding Receipts/Payments"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_followup_report.py:0
+msgid "Overdue"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_report.py:0
+msgid "PDF"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model:ir.model.fields,field_description:account_reports.field_account_reports_export_wizard__report_id
+msgid "Parent Report Id"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model:ir.model.fields,field_description:account_reports.field_account_reports_export_wizard_format__export_wizard_id
+msgid "Parent Wizard"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/aged_partner_balance/line_name/line_name.xml:0
+#: code:addons/odex30_account_reports/static/src/components/partner_ledger/line_name.xml:0
+#: model:account.report.column,name:account_reports.general_ledger_report_partner_name
+#: model:ir.model.fields,field_description:account_reports.field_account_report_send__partner_ids
+msgid "Partner"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_report.py:0
+msgid "Partner Categories"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model:account.report,name:account_reports.partner_ledger_report
+#: model:ir.actions.client,name:account_reports.action_account_report_partner_ledger
+#: model:ir.ui.menu,name:account_reports.menu_action_account_report_partner_ledger
+msgid "Partner Ledger"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model:ir.model,name:account_reports.model_account_partner_ledger_report_handler
+msgid "Partner Ledger Custom Handler"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/aged_partner_balance/line_name/line_name.xml:0
+#: code:addons/odex30_account_reports/static/src/components/partner_ledger/line_name.xml:0
+msgid "Partner is bad"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/aged_partner_balance/line_name/line_name.xml:0
+#: code:addons/odex30_account_reports/static/src/components/partner_ledger/line_name.xml:0
+msgid "Partner is good"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/wizard/account_report_send.py:0
+msgid "Partner(s) should have an email address."
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_report.py:0
+#: code:addons/odex30_account_reports/static/src/components/account_report/filters/filter_partner.xml:0
+msgid "Partners"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model_terms:ir.ui.view,arch_db:account_reports.pdf_export_filters
+msgid "Partners Categories:"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_sales_report.py:0
+msgid "Partners with duplicated VAT numbers"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model_terms:ir.ui.view,arch_db:account_reports.pdf_export_filters
+msgid "Partners:"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model:mail.activity.type,name:account_reports.mail_activity_type_tax_report_to_pay
+msgid "Pay Tax"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_move.py:0
+msgid "Pay tax: %s"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_aged_partner_balance.py:0
+#: code:addons/odex30_account_reports/models/account_report.py:0
+msgid "Payable"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_generic_tax_report.py:0
+msgid "Payable tax amount"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model:account.report.line,name:account_reports.account_financial_report_current_liabilities_payable
+#: model:account.report.line,name:account_reports.account_financial_report_executivesummary_creditors0
+msgid "Payables"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model:account.report.line,name:account_reports.account_financial_report_executivesummary_performance0
+msgid "Performance"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/account_report/filters/filters.js:0
+msgid "Period"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model:account.report.column,name:account_reports.aged_payable_report_period1
+#: model:account.report.column,name:account_reports.aged_receivable_report_period1
+msgid "Period 1"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model:account.report.column,name:account_reports.aged_payable_report_period2
+#: model:account.report.column,name:account_reports.aged_receivable_report_period2
+msgid "Period 2"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model:account.report.column,name:account_reports.aged_payable_report_period3
+#: model:account.report.column,name:account_reports.aged_receivable_report_period3
+msgid "Period 3"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model:account.report.column,name:account_reports.aged_payable_report_period4
+#: model:account.report.column,name:account_reports.aged_receivable_report_period4
+msgid "Period 4"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/account_report/filters/filter_comparison.xml:0
+msgid "Period order"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model:ir.model.fields,field_description:account_reports.field_res_config_settings__account_tax_periodicity
+#: model:ir.model.fields,help:account_reports.field_account_financial_year_op__account_tax_periodicity
+#: model:ir.model.fields,help:account_reports.field_res_company__account_tax_periodicity
+#: model:ir.model.fields,help:account_reports.field_res_config_settings__account_tax_periodicity
+#: model_terms:ir.ui.view,arch_db:account_reports.res_config_settings_view_form
+msgid "Periodicity"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model:ir.model.fields,field_description:account_reports.field_account_financial_year_op__account_tax_periodicity
+msgid "Periodicity in month"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/account_report/filters/filters.js:0
+msgid "Periods"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/account_report/filters/filter_analytic_groupby.xml:0
+msgid "Plans"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#. odoo-python
+#: code:addons/odex30_account_reports/models/budget.py:0
+#: code:addons/odex30_account_reports/static/src/components/account_report/filters/filters.js:0
+msgid "Please enter a valid budget name."
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/multicurrency_revaluation_report/filters/filters.js:0
+msgid "Please enter a valid number."
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/wizard/account_report_send.py:0
+msgid "Please select a mail template to send multiple statements."
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_report.py:0
+msgid ""
+"Please select the main company and its branches in the company selector to "
+"proceed."
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_deferred_reports.py:0
+msgid "Please set the deferred accounts in the accounting settings."
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_deferred_reports.py:0
+msgid "Please set the deferred journal in the accounting settings."
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_generic_tax_report.py:0
+msgid "Please specify the accounts necessary for the Tax Closing Entry."
+msgstr ""
+
+#. module: odex30_account_reports
+#: model:account.report.line,name:account_reports.account_financial_report_fixed_assets_view0
+msgid "Plus Fixed Assets"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model:account.report.line,name:account_reports.account_financial_report_non_current_assets_view0
+msgid "Plus Non-current Assets"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model:account.report.line,name:account_reports.account_financial_report_non_current_liabilities0
+msgid "Plus Non-current Liabilities"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model:account.report.line,name:account_reports.account_financial_report_other_income0
+msgid "Plus Other Income"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model:account.report.line,name:account_reports.account_financial_report_executivesummary_position0
+msgid "Position"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/account_report/line_cell/popover/edit_popover.xml:0
+msgid "Post"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/account_report/filters/filters.js:0
+msgid "Posted Entries"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model:account.report.line,name:account_reports.account_financial_report_prepayements0
+msgid "Prepayments"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model:ir.model.fields,field_description:account_reports.field_account_multicurrency_revaluation_wizard__preview_data
+msgid "Preview Data"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/account_report/filters/filter_comparison.xml:0
+msgid "Previous Period"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/account_report/filters/filter_comparison.xml:0
+msgid "Previous Periods"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/account_report/filters/filter_comparison.xml:0
+msgid "Previous Year"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/account_report/filters/filter_comparison.xml:0
+msgid "Previous Years"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model:account.report.line,name:account_reports.account_financial_retained_earnings_line_2
+msgid "Previous Years Retained Earnings"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model:account.report.line,name:account_reports.account_financial_previous_year_earnings0
+msgid "Previous Years Unallocated Earnings"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model_terms:ir.ui.view,arch_db:account_reports.account_report_send_form
+msgid "Print & Send"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_generic_tax_report.py:0
+msgid "Proceed"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model_terms:ir.ui.view,arch_db:account_reports.view_account_multicurrency_revaluation_wizard
+msgid ""
+"Proceed with caution as there might be an existing adjustment for this "
+"period ("
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_deferred_reports.py:0
+#: code:addons/odex30_account_reports/static/src/components/deferred_reports/groupby.xml:0
+msgid "Product"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/deferred_reports/groupby.xml:0
+msgid "Product Category"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model:account.report,name:account_reports.profit_and_loss
+#: model:ir.actions.client,name:account_reports.action_account_report_pl
+#: model:ir.ui.menu,name:account_reports.menu_action_account_report_profit_and_loss
+msgid "Profit and Loss"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model:account.report.line,name:account_reports.account_financial_report_executivesummary_profitability0
+msgid "Profitability"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model_terms:ir.ui.view,arch_db:account_reports.view_move_form_vat_return
+msgid "Proposition of tax closing journal entry."
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/wizard/multicurrency_revaluation.py:0
+msgid "Provision for %(for_cur)s (1 %(comp_cur)s = %(rate)s %(for_cur)s)"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/account_report/filters/filters.js:0
+msgid "Quarter"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/multicurrency_revaluation_report/line_name.xml:0
+msgid "Rates"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_aged_partner_balance.py:0
+#: code:addons/odex30_account_reports/models/account_report.py:0
+msgid "Receivable"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_generic_tax_report.py:0
+msgid "Receivable tax amount"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model:account.report.line,name:account_reports.account_financial_report_executivesummary_debtors0
+#: model:account.report.line,name:account_reports.account_financial_report_receivable0
+msgid "Receivables"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model:ir.model.fields,field_description:account_reports.field_account_report_send__mail_partner_ids
+#: model_terms:ir.ui.view,arch_db:account_reports.account_report_send_form
+msgid "Recipients"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model_terms:ir.ui.view,arch_db:account_reports.account_reports_journal_dashboard_kanban_view
+msgid "Reconciliation Report"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model:ir.model.fields,field_description:account_reports.field_account_financial_year_op__account_tax_periodicity_reminder_day
+#: model:ir.model.fields,field_description:account_reports.field_res_config_settings__account_tax_periodicity_reminder_day
+#: model_terms:ir.ui.view,arch_db:account_reports.res_config_settings_view_form
+#: model_terms:ir.ui.view,arch_db:account_reports.setup_financial_year_opening_form
+msgid "Reminder"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model:ir.model.fields,field_description:account_reports.field_account_report_annotation__report_id
+#: model:ir.model.fields,field_description:account_reports.field_account_report_send__account_report_id
+msgid "Report"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model_terms:ir.ui.view,arch_db:account_reports.account_report_line_form
+msgid "Report Line"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model_terms:ir.ui.view,arch_db:account_reports.account_report_form
+msgid "Report Name"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model:ir.model.fields,field_description:account_reports.field_account_report_send__report_options
+msgid "Report Options"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_report.py:0
+msgid "Report lines mentioning the account code"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/account_report/filters/filter_variant.xml:0
+msgid "Report:"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model_terms:ir.ui.view,arch_db:account_reports.res_config_settings_view_form
+msgid "Reporting"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model:ir.model.fields,field_description:account_reports.field_account_report_horizontal_group__report_ids
+msgid "Reports"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model_terms:ir.ui.view,arch_db:account_reports.account_report_line_form
+msgid "Reset to Standard"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model:account.report.line,name:account_reports.account_financial_retained_earnings0
+msgid "Retained Earnings"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model:account.report.line,name:account_reports.account_financial_report_executivesummary_return_investment0
+msgid "Return on investments (net profit / assets)"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model:account.report.line,name:account_reports.account_financial_report_executivesummary_income0
+#: model:account.report.line,name:account_reports.account_financial_report_revenue0
+msgid "Revenue"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model:ir.model.fields,field_description:account_reports.field_account_multicurrency_revaluation_wizard__reversal_date
+msgid "Reversal Date"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_deferred_reports.py:0
+msgid "Reversal of Grouped Deferral Entry of %s"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/wizard/multicurrency_revaluation.py:0
+msgid "Reversal of: %s"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model_terms:ir.ui.view,arch_db:account_reports.view_account_report_search
+msgid "Root Report"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model:ir.model.fields,field_description:account_reports.field_account_report_horizontal_group__rule_ids
+msgid "Rules"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/account_report/filters/filter_comparison.xml:0
+msgid "Same Period Last Year"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/account_report/search_bar/search_bar.xml:0
+msgid "Search..."
+msgstr ""
+
+#. module: odex30_account_reports
+#: model_terms:ir.ui.view,arch_db:account_reports.account_report_form
+msgid "Sections"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_customer_statement.py:0
+#: code:addons/odex30_account_reports/models/account_partner_ledger.py:0
+msgid "Send"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_partner_ledger.py:0
+msgid "Send %s Statement"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model:ir.model.fields,field_description:account_reports.field_account_report__send_and_print_values
+msgid "Send And Print Values"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model:ir.model.fields,field_description:account_reports.field_account_report_send__send_mail_readonly
+msgid "Send Mail Readonly"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_partner_ledger.py:0
+msgid "Send Partner Ledgers"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model:ir.actions.server,name:account_reports.ir_cron_account_report_send_ir_actions_server
+msgid "Send account reports automatically"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_move.py:0
+msgid "Send tax report: %s"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/wizard/account_report_send.py:0
+msgid "Sending statements"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model:ir.model.fields,field_description:account_reports.field_account_report_budget__sequence
+msgid "Sequence"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_sales_report.py:0
+msgid "Services"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model_terms:ir.ui.view,arch_db:account_reports.view_journal_report_audit_move_line_tree
+msgid "Set as Checked"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model_terms:ir.ui.view,arch_db:account_reports.duplicated_vat_partner_tree_view
+msgid "Set as main"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model:account.report.line,name:account_reports.account_financial_report_executivesummary_st_cash_forecast0
+msgid "Short term cash forecast"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/aged_partner_balance/filter_extra_options.xml:0
+msgid "Show Account"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/account_report/filters/filter_budgets.xml:0
+msgid "Show All Accounts"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/aged_partner_balance/filter_extra_options.xml:0
+msgid "Show Currency"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model:ir.model.fields,field_description:account_reports.field_account_multicurrency_revaluation_wizard__show_warning_move_id
+msgid "Show Warning Move"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/deferred_reports/warnings.xml:0
+msgid "Show already generated deferrals."
+msgstr ""
+
+#. module: odex30_account_reports
+#: model:ir.model.fields.selection,name:account_reports.selection__account_report_send__mode__single
+msgid "Single Recipient"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/bank_reconciliation_report/warnings.xml:0
+msgid "Some"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/tax_report/warnings.xml:0
+msgid "Some journal items appear to point to obsolete report lines."
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/sales_report/warnings.xml:0
+msgid ""
+"Some lines in the report involve partners that share the same VAT number.\n"
+"\n"
+"        Please review the"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/account_report/filters/filter_comparison.xml:0
+#: code:addons/odex30_account_reports/static/src/components/account_report/filters/filter_date.xml:0
+msgid "Specific Date"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model:ir.model.fields,help:account_reports.field_res_company__account_representative_id
+msgid ""
+"Specify an Accounting Firm that will act as a representative when exporting "
+"reports."
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/account_report/filters/filter_extra_options.xml:0
+msgid "Split Horizontally"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model:ir.model.fields,field_description:account_reports.field_account_report__tax_closing_start_date
+msgid "Start Date"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model:ir.model.fields,field_description:account_reports.field_res_company__account_tax_periodicity_reminder_day
+msgid "Start from"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_journal_report.py:0
+msgid "Starting Balance"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/aged_partner_balance/line_name/line_name.xml:0
+msgid "Statement"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/wizard/account_report_send.py:0
+msgid "Statements are being sent in the background."
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/account_report/line/popover/debug_popover.xml:0
+msgid "Subformula"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model:ir.model.fields,field_description:account_reports.field_account_report_send__mail_subject
+msgid "Subject"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model_terms:ir.ui.view,arch_db:account_reports.account_report_send_form
+msgid "Subject..."
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_journal_report.py:0
+msgid "T: %s"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/account_report/filters/filter_partner.xml:0
+msgid "Tags"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_general_ledger.py:0
+#: code:addons/odex30_account_reports/models/account_journal_report.py:0
+#: code:addons/odex30_account_reports/static/src/components/journal_report/line/line.xml:0
+#: model_terms:ir.ui.view,arch_db:account_reports.pdf_journal_report_taxes_summary
+msgid "Tax Amount"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model_terms:ir.ui.view,arch_db:account_reports.pdf_journal_report_taxes_summary
+msgid "Tax Applied"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model:ir.model.fields,field_description:account_reports.field_account_bank_statement_line__tax_closing_alert
+#: model:ir.model.fields,field_description:account_reports.field_account_move__tax_closing_alert
+msgid "Tax Closing Alert"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model:ir.model.fields,field_description:account_reports.field_account_bank_statement_line__tax_closing_report_id
+#: model:ir.model.fields,field_description:account_reports.field_account_move__tax_closing_report_id
+msgid "Tax Closing Report"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_general_ledger.py:0
+msgid "Tax Declaration"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_journal_report.py:0
+msgid "Tax Grids"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model:ir.model.fields,field_description:account_reports.field_account_tax_unit__vat
+msgid "Tax ID"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model_terms:ir.ui.view,arch_db:account_reports.company_information
+#: model_terms:ir.ui.view,arch_db:account_reports.tax_information_customer_report
+msgid "Tax ID:"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_generic_tax_report.py:0
+msgid "Tax Paid Adjustment"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/tax_report/filters/filter_date.xml:0
+msgid "Tax Period"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_generic_tax_report.py:0
+msgid "Tax Received Adjustment"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model:mail.activity.type,name:account_reports.tax_closing_activity_type
+#: model:mail.activity.type,summary:account_reports.tax_closing_activity_type
+#: model_terms:ir.ui.view,arch_db:account_reports.view_move_form_vat_return
+msgid "Tax Report"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model:mail.activity.type,name:account_reports.mail_activity_type_tax_report_error
+msgid "Tax Report - Error"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model:mail.activity.type,name:account_reports.mail_activity_type_tax_report_to_be_sent
+msgid "Tax Report Ready"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model:ir.actions.client,name:account_reports.action_account_report_gt
+#: model:ir.ui.menu,name:account_reports.menu_action_account_report_gt
+msgid "Tax Return"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model_terms:ir.ui.view,arch_db:account_reports.res_config_settings_view_form
+msgid "Tax Return Periodicity"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model:ir.model,name:account_reports.model_account_tax_unit
+#: model_terms:ir.ui.view,arch_db:account_reports.view_tax_unit_form
+msgid "Tax Unit"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/account_report/filters/filter_tax_unit.xml:0
+msgid "Tax Unit:"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model:ir.actions.act_window,name:account_reports.action_view_tax_units
+#: model:ir.model.fields,field_description:account_reports.field_res_company__account_tax_unit_ids
+#: model:ir.ui.menu,name:account_reports.menu_view_tax_units
+msgid "Tax Units"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model:ir.model.fields,field_description:account_reports.field_mail_activity__account_tax_closing_params
+msgid "Tax closing additional params"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model:mail.activity.type,summary:account_reports.mail_activity_type_tax_report_to_pay
+msgid "Tax is ready to be paid"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model:ir.model.fields.selection,name:account_reports.selection__mail_activity_type__category__tax_report
+msgid "Tax report"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model:mail.activity.type,summary:account_reports.mail_activity_type_tax_report_to_be_sent
+msgid "Tax report is ready to be sent to the administration"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/res_company.py:0
+msgid "Tax return"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_journal_report.py:0
+msgid "Taxes"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_journal_report.py:0
+#: code:addons/odex30_account_reports/static/src/components/journal_report/line/line.xml:0
+msgid "Taxes Applied"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model:ir.model.fields,help:account_reports.field_account_tax_unit__fpos_synced
+msgid ""
+"Technical field indicating whether Fiscal Positions exist for all companies "
+"in the unit"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model:ir.model,name:account_reports.model_ir_actions_account_report_download
+msgid "Technical model for accounting report downloads"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/account_report/ellipsis/ellipsis.js:0
+msgid "Text copied"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_report.py:0
+msgid "The Accounts Coverage Report is not available for this report."
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/account_report/line_name/popover_line/annotation_popover_line.js:0
+msgid "The annotation shouldn't have an empty value."
+msgstr ""
+
+#. module: odex30_account_reports
+#: model:ir.model.fields,field_description:account_reports.field_account_report_annotation__text
+msgid "The annotation's content."
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_move.py:0
+msgid ""
+"The attachments of the tax report can be found on the %(link_start)sclosing "
+"entry%(link_end)s of the representative company."
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_partner_ledger.py:0
+msgid "The column '%s' is not available for this report."
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_tax.py:0
+msgid ""
+"The country detected for this VAT number does not match the one set on this "
+"Tax Unit."
+msgstr ""
+
+#. module: odex30_account_reports
+#: model:ir.model.fields,help:account_reports.field_account_tax_unit__country_id
+msgid ""
+"The country in which this tax unit is used to group your companies' tax "
+"reports declaration."
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_multicurrency_revaluation_report.py:0
+msgid "The currency rate cannot be equal to zero"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/bank_reconciliation_report/warnings.xml:0
+msgid "The current balance in the"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_generic_tax_report.py:0
+msgid ""
+"The currently selected dates don't match a tax period. The closing entry "
+"will be created for the closest-matching period according to your "
+"periodicity setup."
+msgstr ""
+
+#. module: odex30_account_reports
+#: model:ir.model.fields,help:account_reports.field_account_report_annotation__fiscal_position_id
+msgid "The fiscal position used while annotating."
+msgstr ""
+
+#. module: odex30_account_reports
+#: model:ir.model.fields,help:account_reports.field_account_report_annotation__line_id
+msgid "The id of the annotated line."
+msgstr ""
+
+#. module: odex30_account_reports
+#: model:ir.model.fields,help:account_reports.field_account_report_annotation__report_id
+msgid "The id of the annotated report."
+msgstr ""
+
+#. module: odex30_account_reports
+#: model:ir.model.fields,help:account_reports.field_account_tax_unit__vat
+msgid "The identifier to be used when submitting a report for this unit."
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_tax.py:0
+msgid "The main company of a tax unit has to be part of it."
+msgstr ""
+
+#. module: odex30_account_reports
+#: model:ir.model.fields,help:account_reports.field_res_company__account_tax_unit_ids
+msgid "The tax units this company belongs to."
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_report.py:0
+msgid "The used operator is not supported for this expression."
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/account_report/warnings.xml:0
+msgid "There are"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/wizard/account_report_send.py:0
+msgid ""
+"There are currently reports waiting to be sent, please try again later."
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/account_report/account_report.xml:0
+msgid "There is no data to display for the given filters."
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_report.py:0
+msgid ""
+"This account exists in the Chart of Accounts but is not mentioned in any "
+"line of the report"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_report.py:0
+msgid ""
+"This account is reported in a line of the report but does not exist in the "
+"Chart of Accounts"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_report.py:0
+msgid "This account is reported in multiple lines of the report"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_report.py:0
+msgid "This account is reported multiple times on the same line of the report"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model_terms:ir.ui.view,arch_db:account_reports.res_config_settings_view_form
+msgid ""
+"This allows you to choose the position of totals in your financial reports."
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/account_report/warnings.xml:0
+msgid ""
+"This company is part of a tax unit. You're currently not viewing the whole "
+"unit."
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/widgets/account_report_x2many/account_report_x2many.js:0
+msgid ""
+"This line and all its children will be deleted. Are you sure you want to "
+"proceed?"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/widgets/account_report_x2many/account_report_x2many.xml:0
+msgid "This line is out of sequence."
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/widgets/account_report_x2many/account_report_x2many.xml:0
+msgid ""
+"This line is placed before its parent, which is not allowed. You can fix it "
+"by dragging it to the proper position."
+msgstr ""
+
+#. module: odex30_account_reports
+#: model_terms:ir.ui.view,arch_db:account_reports.account_report_line_form
+msgid "This line uses a custom user-defined 'Group By' value."
+msgstr ""
+
+#. module: odex30_account_reports
+#: model_terms:ir.ui.view,arch_db:account_reports.account_report_form
+msgid "This option hides lines with a value of 0"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_report.py:0
+msgid "This report already has a menuitem."
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/tax_report/warnings.xml:0
+msgid ""
+"This report contains inconsistencies. The affected lines are marked with a "
+"warning."
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/multicurrency_revaluation_report/warnings.xml:0
+msgid "This report only displays the data of the active company."
+msgstr ""
+
+#. module: odex30_account_reports
+#: model_terms:ir.ui.view,arch_db:account_reports.account_report_form
+msgid ""
+"This report uses report-specific code.\n"
+"                        You can customize it manually, but any change in the parameters used for its computation could lead to errors."
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/account_report/warnings.xml:0
+msgid ""
+"This report uses the CTA conversion method to consolidate multiple companies using different currencies,\n"
+"        which can lead the report to be unbalanced."
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_report.py:0
+msgid "This subformula references an unknown expression: %s"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_report.py:0
+msgid ""
+"This tag is reported in a line of the report but is not linked to any "
+"account of the Chart of Accounts"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model_terms:ir.ui.view,arch_db:account_reports.view_move_form_vat_return
+msgid ""
+"This tax closing entry is posted, but the tax lock date is earlier than the "
+"covered period's last day. You might need to reset it to draft and refresh "
+"its content, in case other entries using taxes have been posted in the "
+"meantime."
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/account_report/filters/filter_date.xml:0
+msgid "Today"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_deferred_reports.py:0
+#: code:addons/odex30_account_reports/models/account_general_ledger.py:0
+#: code:addons/odex30_account_reports/models/account_journal_report.py:0
+#: code:addons/odex30_account_reports/models/account_partner_ledger.py:0
+#: code:addons/odex30_account_reports/models/account_sales_report.py:0
+#: model:account.report.column,name:account_reports.aged_payable_report_total
+#: model:account.report.column,name:account_reports.aged_receivable_report_total
+msgid "Total"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_report.py:0
+msgid "Total %s"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/account_report/filters/filters.js:0
+msgid "Trade Partners"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model:account.report.line,name:account_reports.transaction_without_statement
+msgid "Transactions without statement"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model:account.report,name:account_reports.trial_balance_report
+#: model:ir.actions.client,name:account_reports.action_account_report_coa
+#: model:ir.ui.menu,name:account_reports.menu_action_account_report_coa
+msgid "Trial Balance"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model:ir.model,name:account_reports.model_account_trial_balance_report_handler
+msgid "Trial Balance Custom Handler"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_sales_report.py:0
+msgid "Triangular"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_report.py:0
+msgid ""
+"Trying to dispatch an action on a report not compatible with the provided "
+"options."
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_report.py:0
+msgid ""
+"Trying to expand a group for a line which was not generated by a report "
+"line: %s"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_report.py:0
+msgid "Trying to expand a line without an expansion function."
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_report.py:0
+msgid "Trying to expand groupby results on lines without a groupby value."
+msgstr ""
+
+#. module: odex30_account_reports
+#: model:account.report.line,name:account_reports.account_financial_unaffected_earnings0
+msgid "Unallocated Earnings"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_report.py:0
+msgid "Undefined"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/account_report/filters/filter_extra_options.xml:0
+msgid "Unfold All"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_report.py:0
+msgid "Unknown"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_partner_ledger.py:0
+#: code:addons/odex30_account_reports/models/account_sales_report.py:0
+msgid "Unknown Partner"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_report.py:0
+msgid "Unknown bound criterium: %s"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_report.py:0
+msgid "Unknown date scope: %s"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model:account.report,name:account_reports.multicurrency_revaluation_report
+#: model:ir.actions.client,name:account_reports.action_account_report_multicurrency_revaluation
+#: model:ir.ui.menu,name:account_reports.menu_action_account_report_multicurrency_revaluation
+msgid "Unrealized Currency Gains/Losses"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_report.py:0
+#: code:addons/odex30_account_reports/static/src/components/account_report/filters/filter_extra_options.xml:0
+#: code:addons/odex30_account_reports/static/src/components/account_report/filters/filters.js:0
+#: model_terms:ir.ui.view,arch_db:account_reports.pdf_export_filter_extra_options_template
+msgid "Unreconciled Entries"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model:account.report.column,name:account_reports.account_financial_report_ec_sales_vat
+msgid "VAT Number"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model_terms:ir.ui.view,arch_db:account_reports.setup_financial_year_opening_form
+msgid "VAT Periodicity"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/account_report/line/popover/debug_popover.xml:0
+msgid "Value"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_move.py:0
+msgid "Vat closing from %(date_from)s to %(date_to)s"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model_terms:ir.ui.view,arch_db:account_reports.view_journal_report_audit_move_line_tree
+msgid "View"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_report.py:0
+msgid "View Bank Statement"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/account_report/line_cell/popover/carryover_popover.xml:0
+msgid "View Carryover Lines"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_report.py:0
+msgid "View Journal Entry"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_report.py:0
+#: code:addons/odex30_account_reports/models/account_sales_report.py:0
+#: model_terms:ir.ui.view,arch_db:account_reports.view_journal_report_audit_move_line_tree
+msgid "View Partner"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/wizard/account_report_send.py:0
+msgid "View Partner(s)"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_report.py:0
+msgid "View Payment"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model:ir.model.fields,field_description:account_reports.field_account_report_send__warnings
+msgid "Warnings"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model_terms:ir.ui.view,arch_db:account_reports.res_config_settings_view_form
+msgid ""
+"When ticked, totals and subtotals appear below the sections of the report"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model:ir.model.fields,help:account_reports.field_res_company__totals_below_sections
+#: model:ir.model.fields,help:account_reports.field_res_config_settings__totals_below_sections
+msgid ""
+"When ticked, totals and subtotals appear below the sections of the report."
+msgstr ""
+
+#. module: odex30_account_reports
+#: model:ir.model.fields,help:account_reports.field_account_account__exclude_provision_currency_ids
+msgid ""
+"Whether or not we have to make provisions for the selected foreign "
+"currencies."
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_report.py:0
+#: code:addons/odex30_account_reports/static/src/components/account_report/filters/filters.js:0
+#: model_terms:ir.ui.view,arch_db:account_reports.pdf_export_filter_extra_options_template
+msgid "With Draft Entries"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_general_ledger.py:0
+msgid "Wrong ID for general ledger line to expand: %s"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_partner_ledger.py:0
+msgid "Wrong ID for partner ledger line to expand: %s"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_report.py:0
+msgid "Wrong format for if_other_expr_above/if_other_expr_below formula: %s"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_report.py:0
+msgid "XLSX"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/account_report/filters/filters.js:0
+msgid "Year"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_report.py:0
+#: code:addons/odex30_account_reports/static/src/components/account_report/line_cell/popover/edit_popover.xml:0
+msgid "Yes"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/multicurrency_revaluation_report/warnings.xml:0
+msgid "You are using custom exchange rates."
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_move.py:0
+msgid "You can't open a tax report from a move without a VAT closing date."
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_move_line.py:0
+msgid "You cannot add taxes on a tax closing move line."
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_deferred_reports.py:0
+msgid ""
+"You cannot generate entries for a period that does not end at the end of the"
+" month."
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_deferred_reports.py:0
+msgid "You cannot generate entries for a period that is locked."
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_move.py:0
+msgid ""
+"You cannot reset this closing entry to draft, as another closing entry has "
+"been posted at a later date."
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_move.py:0
+msgid ""
+"You cannot reset this closing entry to draft, as it would delete carryover "
+"values impacting the tax report of a locked period. Please change the "
+"following lock dates to proceed: %(lock_date_info)s."
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_report.py:0
+msgid "You cannot update this value as it's locked by: %s"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_multicurrency_revaluation_report.py:0
+msgid "You need to activate more than one currency to access this report."
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_generic_tax_report.py:0
+msgid ""
+"You're about the generate the closing entries of multiple companies at once."
+" Each of them will be created in accordance with its company tax "
+"periodicity."
+msgstr ""
+
+#. module: odex30_account_reports
+#: model_terms:ir.ui.view,arch_db:account_reports.journal_report_pdf_export_main
+#: model_terms:ir.ui.view,arch_db:account_reports.pdf_export_main
+#: model_terms:ir.ui.view,arch_db:account_reports.pdf_export_main_customer_report
+msgid "[Draft]"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/sales_report/warnings.xml:0
+msgid "addressed to"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/sales_report/warnings.xml:0
+msgid "affected partners"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/tax_report/warnings.xml:0
+msgid "and correct their tax tags if necessary."
+msgstr ""
+
+#. module: odex30_account_reports
+#: model:ir.model.fields.selection,name:account_reports.selection__res_company__account_tax_periodicity__year
+msgid "annually"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model_terms:ir.ui.view,arch_db:account_reports.res_config_settings_view_form
+#: model_terms:ir.ui.view,arch_db:account_reports.setup_financial_year_opening_form
+msgid "days after period"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/bank_reconciliation_report/warnings.xml:0
+msgid "doesn't match the balance of your"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model:ir.model.fields.selection,name:account_reports.selection__res_company__account_tax_periodicity__2_months
+msgid "every 2 months"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model:ir.model.fields.selection,name:account_reports.selection__res_company__account_tax_periodicity__4_months
+msgid "every 4 months"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/bank_reconciliation_report/warnings.xml:0
+msgid "have a starting balance different from the previous ending balance."
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/account_report/line_cell/popover/carryover_popover.xml:0
+msgid "in the next period."
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/sales_report/warnings.xml:0
+msgid "invoices"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/bank_reconciliation_report/warnings.xml:0
+msgid "journal items"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/bank_reconciliation_report/warnings.xml:0
+msgid "last bank statement"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model:ir.model.fields.selection,name:account_reports.selection__res_company__account_tax_periodicity__monthly
+msgid "monthly"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_report.py:0
+msgid "n/a"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/sales_report/warnings.xml:0
+msgid "partners"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/account_report/warnings.xml:0
+msgid "prior or included in this period."
+msgstr ""
+
+#. module: odex30_account_reports
+#: model:ir.model.fields.selection,name:account_reports.selection__res_company__account_tax_periodicity__trimester
+msgid "quarterly"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model:ir.model.fields.selection,name:account_reports.selection__res_company__account_tax_periodicity__semester
+msgid "semi-annually"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/bank_reconciliation_report/warnings.xml:0
+msgid "statements"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model_terms:ir.ui.view,arch_db:account_reports.view_tax_unit_form
+msgid "synchronize fiscal positions"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_tax.py:0
+msgid "tax unit [%s]"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/sales_report/warnings.xml:0
+msgid "that are not established abroad."
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/account_report/filters/filter_comparison.xml:0
+#: code:addons/odex30_account_reports/static/src/components/account_report/filters/filter_date.xml:0
+msgid "to"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/sales_report/warnings.xml:0
+msgid "to resolve the duplication."
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/account_report/warnings.xml:0
+msgid "unposted Journal Entries"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/account_report/line_cell/popover/carryover_popover.xml:0
+msgid "were carried over to this line from previous period."
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/bank_reconciliation_report/warnings.xml:0
+msgid "which don't originate from a bank statement nor payment."
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/sales_report/warnings.xml:0
+msgid "who are not established in any of the EC countries."
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/account_report/line_cell/popover/carryover_popover.xml:0
+msgid "will be carried over to"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/account_report/line_cell/popover/carryover_popover.xml:0
+msgid "will be carried over to this line in the next period."
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/sales_report/warnings.xml:0
+msgid "without a valid intra-community VAT number."
+msgstr ""
+
+#. module: odex30_account_reports
+#: model:mail.template,subject:account_reports.email_template_customer_statement
+msgid ""
+"{{ (object.company_id or object._get_followup_responsible().company_id).name"
+" }} Statement - {{ object.commercial_company_name }}"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/multicurrency_revaluation_report/warnings.xml:0
+msgid "⇒ Reset to Odoo’s Rate"
+msgstr ""
diff --git a/dev_odex30_accounting/odex30_account_reports/i18n/ar_001.po b/dev_odex30_accounting/odex30_account_reports/i18n/ar_001.po
new file mode 100644
index 0000000..2cddacb
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_reports/i18n/ar_001.po
@@ -0,0 +1,4608 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# * odex30_account_reports
+#
+# Translators:
+# Martin Trigaux, 2024
+# Wil Odoo, 2025
+# Malaz Abuidris <msea@odoo.com>, 2025
+# Weblate <noreply-mt-weblate@weblate.org>, 2025.
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 18.0+e\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2025-10-24 18:48+0000\n"
+"PO-Revision-Date: 2025-11-12 14:22+0000\n"
+"Last-Translator: Weblate <noreply-mt-weblate@weblate.org>\n"
+"Language-Team: Arabic <https://translate.odoo.com/projects/odoo-18/"
+"odex30_account_reports/ar/>\n"
+"Language: ar\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 "
+"&& n%100<=10 ? 3 : n%100>=11 ? 4 : 5;\n"
+"X-Generator: Weblate 5.12.2\n"
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/bank_reconciliation_report/warnings.xml:0
+msgid "\" account balance is affected by"
+msgstr "\" يتأثر رصيد الحساب بـ"
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_journal_report.py:0
+msgid "%(journal)s - %(account)s"
+msgstr "%(journal)s - %(account)s"
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_report.py:0
+msgid "%(names)s and %(remaining)s others"
+msgstr "%(names)s و%(remaining)s آخرين "
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_report.py:0
+msgid "%(names)s and one other"
+msgstr "%(names)s وشخص آخر "
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/res_company.py:0
+msgid "%(report_label)s: %(period)s"
+msgstr "%(report_label)s: %(period)s"
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/budget.py:0
+msgid "%s (copy)"
+msgstr "%s (نسخة)"
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_report.py:0
+msgid "%s is not a numeric value"
+msgstr "%s ليست قيمة عددية "
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/account_report/filters/filters.js:0
+msgid "%s selected"
+msgstr "تم تحديد %s "
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_report.py:0
+msgid ""
+"'Open General Ledger' caret option is only available form report lines "
+"targetting accounts."
+msgstr ""
+"خيار علامة إقحام 'فتح دفتر الأستاذ العام' متاح فقط من بنود التقرير التي "
+"تستهدف الحسابات. "
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_report.py:0
+msgid ""
+"'View Bank Statement' caret option is only available for report lines "
+"targeting bank statements."
+msgstr ""
+"خيار علامة إقحام 'عرض كشف الحساب البنكي' متاح فقط من بنود التقرير التي "
+"تستهدف كشوف الحسابت البنكية. "
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_report.py:0
+msgid "'external' engine does not support groupby, limit nor offset."
+msgstr "لا يدعم المحرك 'الخارجي' عمليات التجميع حسب، أو التقييد، أو الإزاحة. "
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_report.py:0
+msgid "(%s lines)"
+msgstr "(%s بنود) "
+
+#. module: odex30_account_reports
+#: model:account.report.line,name:odex30_account_reports.outstanding_receipts
+msgid "(+) Outstanding Receipts"
+msgstr "(+) الإيصالات المستحقة "
+
+#. module: odex30_account_reports
+#: model:account.report.line,name:odex30_account_reports.outstanding_payments
+msgid "(-) Outstanding Payments"
+msgstr "(-) المدفوعات المستحقة "
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_report.py:0
+msgid "(1 line)"
+msgstr "(بند 1) "
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_deferred_reports.py:0
+msgid "(No %s)"
+msgstr "(لا %s) "
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_report.py:0
+msgid "(No Group)"
+msgstr "(بلا تجميع)"
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/bank_reconciliation_report/warnings.xml:0
+msgid ", leading to an unexplained difference of"
+msgstr "، والذي يؤدي إلى فريق لا يمكن تفسيره في "
+
+#. module: odex30_account_reports
+#: model_terms:ir.ui.view,arch_db:odex30_account_reports.view_move_form_vat_return
+msgid "-> Refresh"
+msgstr "-> تحديث"
+
+#. module: odex30_account_reports
+#: model:mail.template,body_html:odex30_account_reports.email_template_customer_statement
+msgid ""
+"<div style=\"margin: 0px; padding: 0px;\">\n"
+"                <p style=\"margin: 0px; padding: 0px;\">\n"
+"                    <t t-if=\"object.id != "
+"object.commercial_partner_id.id\">Dear <t t-out=\"object.name or ''\"/> (<t "
+"t-out=\"object.commercial_partner_id.name or ''\"/>),</t>\n"
+"                    <t t-else=\"\">Dear <t t-out=\"object.name or ''\"/>,</"
+"t>\n"
+"                    <br/>\n"
+"                    Please find enclosed the statement of your account.\n"
+"                    <br/>\n"
+"                    Do not hesitate to contact us if you have any "
+"questions.\n"
+"                    <br/>\n"
+"                    Sincerely,\n"
+"                    <br/>\n"
+"\t                <t t-out=\"object._get_followup_responsible().name if "
+"is_html_empty(object._get_followup_responsible().signature) else "
+"object._get_followup_responsible().signature\"/>\n"
+"                </p>\n"
+"            </div>\n"
+"        "
+msgstr ""
+"<div style=\"margin: 0px; padding: 0px;\">\n"
+"                <p style=\"margin: 0px; padding: 0px;\">\n"
+"                    <t t-if=\"object.id != "
+"object.commercial_partner_id.id\">عزيزنا <t t-out=\"object.name or ''\"/> "
+"(<t t-out=\"object.commercial_partner_id.name or ''\"/>)،</t>\n"
+"                    <t t-else=\"\">عزيزنا <t t-out=\"object.name or ''\"/>،</"
+"t>\n"
+"                    <br/>\n"
+"                    يُرجى الاطلاع على كشف حسابك في المرفقات.\n"
+"                    <br/>\n"
+"                    لا تتردد في التواصل معنا إذا كانت لديك أي أسئلة أو "
+"استفسارات.\n"
+"                    <br/>\n"
+"                    مع وافر الشكر والتقدير،\n"
+"                    <br/>\n"
+"\t                <t t-out=\"object._get_followup_responsible().name if "
+"is_html_empty(object._get_followup_responsible().signature) else "
+"object._get_followup_responsible().signature\"/>\n"
+"                </p>\n"
+"            </div>\n"
+"        "
+
+#. module: odex30_account_reports
+#: model_terms:ir.ui.view,arch_db:odex30_account_reports.account_report_send_form
+msgid ""
+"<i class=\"fa fa-question-circle ml4\" role=\"img\" aria-label=\"Warning\" "
+"title=\"The email address is unknown on the partner\" invisible=\"not "
+"send_mail_readonly\"/>"
+msgstr ""
+"<i class=\"fa fa-question-circle ml4\" role=\"img\" aria-label=\"Warning\" "
+"title=\"عنوان البريد الإلكتروني غير معرف لدى الشريك \" invisible=\"not "
+"send_mail_readonly\"/>"
+
+#. module: odex30_account_reports
+#: model_terms:ir.ui.view,arch_db:odex30_account_reports.view_account_report_file_download_error_wizard_form
+msgid ""
+"<i>Errors marked with <i class=\"fa fa-warning\"/> are critical and prevent "
+"the file generation.</i>"
+msgstr ""
+"<i>تعتبر الأخطاء التي تم وضع علامة <i class=\"fa fa-warning\"/> عليها خطيرة "
+"وتمنع إنشاء الملف.</i>   "
+
+#. module: odex30_account_reports
+#: model_terms:ir.ui.view,arch_db:odex30_account_reports.account_reports_journal_dashboard_kanban_view
+msgid "<span role=\"separator\">Reconciliation</span>"
+msgstr "<span role=\"separator\">التسوية</span>"
+
+#. module: odex30_account_reports
+#: model_terms:ir.ui.view,arch_db:odex30_account_reports.view_account_report_file_download_error_wizard_form
+msgid "<span>One or more error(s) occurred during file generation:</span>"
+msgstr "<span>وقع خطأ واحد أو أكثر أثناء عملية إنشاء الملف:</span> "
+
+#. module: odex30_account_reports
+#: model:ir.model.constraint,message:odex30_account_reports.constraint_account_report_horizontal_group_name_uniq
+msgid "A horizontal group with the same name already exists."
+msgstr "توجد مجموعة أفقية بنفس الاسم بالفعل. "
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/widgets/account_report_x2many/account_report_x2many.js:0
+msgid "A line with a 'Group By' value cannot have children."
+msgstr "البند الذي به قيمة 'التجميع حسب' لا يمكن أن يكون له توابع. "
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_tax.py:0
+msgid ""
+"A tax unit can only be created between companies sharing the same main "
+"currency."
+msgstr "يمكن إنشاء الوحدة الضريبية فقط بين الشركات التي تتشارك نفس العملة. "
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_tax.py:0
+msgid ""
+"A tax unit must contain a minimum of two companies. You might want to delete "
+"the unit."
+msgstr "يجب أن تحتوي وحدة الضريبة على شركتين كحد أدنى. قد ترغب في حذف الوحدة. "
+
+#. module: odex30_account_reports
+#: model:account.report.line,name:odex30_account_reports.account_financial_report_total_assets0
+msgid "ASSETS"
+msgstr "الأصول"
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_journal_report.py:0
+#: code:addons/odex30_account_reports/static/src/components/deferred_reports/groupby.xml:0
+#: code:addons/odex30_account_reports/wizard/multicurrency_revaluation.py:0
+#: model:account.report.column,name:odex30_account_reports.aged_payable_report_account_name
+#: model:account.report.column,name:odex30_account_reports.aged_receivable_report_account_name
+#: model:account.report.column,name:odex30_account_reports.partner_ledger_report_account_code
+#: model:ir.model,name:odex30_account_reports.model_account_account
+#: model:ir.model.fields,field_description:odex30_account_reports.field_account_report_budget_item__account_id
+msgid "Account"
+msgstr "الحساب "
+
+#. module: odex30_account_reports
+#: model:ir.model,name:odex30_account_reports.model_account_chart_template
+msgid "Account Chart Template"
+msgstr "نموذج مخطط الحساب "
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_journal_report.py:0
+msgid "Account Code"
+msgstr "كود الحساب "
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_report.py:0
+msgid "Account Code / Tag"
+msgstr "علامة تصنيف / كود الحساب "
+
+#. module: odex30_account_reports
+#: model:ir.model.fields,field_description:odex30_account_reports.field_res_company__account_display_representative_field
+msgid "Account Display Representative Field"
+msgstr "حقل ممثل لعرض الحساب "
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_journal_report.py:0
+msgid "Account Label"
+msgstr "عنوان الحساب "
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_report.py:0
+msgid "Account Name"
+msgstr "اسم الحساب"
+
+#. module: odex30_account_reports
+#: model:ir.model,name:odex30_account_reports.model_account_report_annotation
+msgid "Account Report Annotation"
+msgstr "شرح تقرير الحساب "
+
+#. module: odex30_account_reports
+#: model:ir.model,name:odex30_account_reports.model_account_report_custom_handler
+msgid "Account Report Custom Handler"
+msgstr "المعالج المخصص لتقارير الحساب "
+
+#. module: odex30_account_reports
+#: model:ir.model,name:odex30_account_reports.model_account_tax_report_handler
+msgid "Account Report Handler for Tax Reports"
+msgstr "معالج تقرير الحساب للتقارير الضريبية "
+
+#. module: odex30_account_reports
+#: model:ir.model,name:odex30_account_reports.model_account_report_send
+msgid "Account Report Send"
+msgstr "إرسال التقرير المحاسبي "
+
+#. module: odex30_account_reports
+#: model:ir.model.fields,field_description:odex30_account_reports.field_res_config_settings__account_reports_show_per_company_setting
+msgid "Account Reports Show Per Company Setting"
+msgstr "عرض تقارير الحساب حسب إعدادات الشركة "
+
+#. module: odex30_account_reports
+#: model:ir.model.fields,field_description:odex30_account_reports.field_res_partner__account_represented_company_ids
+#: model:ir.model.fields,field_description:odex30_account_reports.field_res_users__account_represented_company_ids
+msgid "Account Represented Company"
+msgstr "شركة ممثَّلة في الحساب "
+
+#. module: odex30_account_reports
+#: model:ir.model.fields,field_description:odex30_account_reports.field_res_company__account_revaluation_journal_id
+msgid "Account Revaluation Journal"
+msgstr "يومية إعادة تقييم الحساب "
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/account_report/filters/filter_account_type.xml:0
+msgid "Account:"
+msgstr "الحساب: "
+
+#. module: odex30_account_reports
+#: model:ir.model.fields,field_description:odex30_account_reports.field_res_company__account_representative_id
+msgid "Accounting Firm"
+msgstr "مؤسسة محاسبية "
+
+#. module: odex30_account_reports
+#: model:ir.model,name:odex30_account_reports.model_account_report
+msgid "Accounting Report"
+msgstr "تقرير المحاسبة "
+
+#. module: odex30_account_reports
+#: model:ir.model,name:odex30_account_reports.model_account_report_budget
+msgid "Accounting Report Budget"
+msgstr "ميزانية التقرير المحاسبي "
+
+#. module: odex30_account_reports
+#: model:ir.model,name:odex30_account_reports.model_account_report_budget_item
+msgid "Accounting Report Budget Item"
+msgstr "عنصر ميزانية التقرير المحاسبي "
+
+#. module: odex30_account_reports
+#: model:ir.model,name:odex30_account_reports.model_account_report_expression
+msgid "Accounting Report Expression"
+msgstr "تعبير التقرير المحاسبي "
+
+#. module: odex30_account_reports
+#: model:ir.model,name:odex30_account_reports.model_account_report_external_value
+msgid "Accounting Report External Value"
+msgstr "القيمة الخارجية للتقرير المحاسبي"
+
+#. module: odex30_account_reports
+#: model:ir.model,name:odex30_account_reports.model_account_report_line
+msgid "Accounting Report Line"
+msgstr "بند التقرير المحاسبي "
+
+#. module: odex30_account_reports
+#: model:ir.actions.act_window,name:odex30_account_reports.action_account_report_tree
+#: model:ir.ui.menu,name:odex30_account_reports.menu_action_account_report_tree
+#: model_terms:ir.ui.view,arch_db:odex30_account_reports.view_account_report_search
+msgid "Accounting Reports"
+msgstr "التقارير المحاسبية"
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/account_report/filters/filter_analytic.xml:0
+#: code:addons/odex30_account_reports/static/src/components/account_report/filters/filter_analytic_groupby.xml:0
+msgid "Accounts"
+msgstr "الحسابات"
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_report.py:0
+#: model_terms:ir.ui.view,arch_db:odex30_account_reports.account_report_form
+msgid "Accounts Coverage Report"
+msgstr "تقرير تغطية الحسابات "
+
+#. module: odex30_account_reports
+#: model:account.report.line,name:odex30_account_reports.multicurrency_revaluation_to_adjust
+msgid "Accounts To Adjust"
+msgstr "الحسابات بانتظار التعديل "
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_report.py:0
+msgid "Accounts coverage"
+msgstr "تغطية الحسابات "
+
+#. module: odex30_account_reports
+#: model:ir.model.fields,field_description:odex30_account_reports.field_mail_activity_type__category
+msgid "Action"
+msgstr "إجراء"
+
+#. module: odex30_account_reports
+#: model:ir.model.fields,field_description:odex30_account_reports.field_account_report_file_download_error_wizard__actionable_errors
+msgid "Actionable Errors"
+msgstr "أخطاء قابلة للتنفيذ "
+
+#. module: odex30_account_reports
+#: model:ir.model.fields,help:odex30_account_reports.field_mail_activity_type__category
+msgid ""
+"Actions may trigger specific behavior like opening calendar view or "
+"automatically mark as done when a document is uploaded"
+msgstr ""
+"قد تؤدي الإجراءات إلى سلوك معين مثل فتح طريقة عرض التقويم أو وضع علامة "
+"\"تم\" تلقائياً عند تحميل مستند "
+
+#. module: odex30_account_reports
+#: model:ir.model,name:odex30_account_reports.model_mail_activity
+msgid "Activity"
+msgstr "النشاط"
+
+#. module: odex30_account_reports
+#: model:ir.model,name:odex30_account_reports.model_mail_activity_type
+msgid "Activity Type"
+msgstr "نوع النشاط"
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/account_report/line_name/popover/annotations_popover.xml:0
+#: code:addons/odex30_account_reports/static/src/widgets/account_report_x2many/account_report_x2many.xml:0
+msgid "Add a line"
+msgstr "إضافة بند"
+
+#. module: odex30_account_reports
+#: model_terms:ir.ui.view,arch_db:odex30_account_reports.account_report_send_form
+msgid "Add contacts to notify..."
+msgstr "إضافة جهات اتصال لإشعارهم..."
+
+#. module: odex30_account_reports
+#: model:ir.model.fields,field_description:odex30_account_reports.field_res_company__totals_below_sections
+#: model:ir.model.fields,field_description:odex30_account_reports.field_res_config_settings__totals_below_sections
+msgid "Add totals below sections"
+msgstr "إضافة إجمالي تحت الأقسام"
+
+#. module: odex30_account_reports
+#: model:account.report.column,name:odex30_account_reports.multicurrency_revaluation_report_adjustment
+msgid "Adjustment"
+msgstr "التعديلات"
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_multicurrency_revaluation_report.py:0
+msgid "Adjustment Entry"
+msgstr "تعديل القيد"
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_cash_flow_report.py:0
+msgid "Advance Payments received from customers"
+msgstr "المدفوعات المدفوعة مقدماً من قِبَل العملاء "
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_cash_flow_report.py:0
+msgid "Advance payments made to suppliers"
+msgstr "المدفوعات المدفوعة مقدمًا للموردين"
+
+#. module: odex30_account_reports
+#: model_terms:ir.ui.view,arch_db:odex30_account_reports.account_report_form
+msgid "Advanced"
+msgstr "متقدم"
+
+#. module: odex30_account_reports
+#: model:ir.model,name:odex30_account_reports.model_account_aged_partner_balance_report_handler
+msgid "Aged Partner Balance Custom Handler"
+msgstr "المعالج المخصص لأعمار ديون الشريك "
+
+#. module: odex30_account_reports
+#: model:account.report,name:odex30_account_reports.aged_payable_report
+#: model:account.report.line,name:odex30_account_reports.aged_payable_line
+#: model:ir.actions.client,name:odex30_account_reports.action_account_report_ap
+#: model:ir.ui.menu,name:odex30_account_reports.menu_action_account_report_aged_payable
+msgid "Aged Payable"
+msgstr "حسابات دائنة مستحقة متأخرة "
+
+#. module: odex30_account_reports
+#: model:ir.model,name:odex30_account_reports.model_account_aged_payable_report_handler
+msgid "Aged Payable Custom Handler"
+msgstr "المعالج المخصص للحسابات الدائنة المستحقة "
+
+#. module: odex30_account_reports
+#: model_terms:ir.ui.view,arch_db:odex30_account_reports.account_reports_journal_dashboard_kanban_view
+msgid "Aged Payables"
+msgstr "حساب دائن مستحق متأخر "
+
+#. module: odex30_account_reports
+#: model:account.report,name:odex30_account_reports.aged_receivable_report
+#: model:account.report.line,name:odex30_account_reports.aged_receivable_line
+#: model:ir.actions.client,name:odex30_account_reports.action_account_report_ar
+#: model:ir.ui.menu,name:odex30_account_reports.menu_action_account_report_aged_receivable
+msgid "Aged Receivable"
+msgstr "المتأخر المدين"
+
+#. module: odex30_account_reports
+#: model:ir.model,name:odex30_account_reports.model_account_aged_receivable_report_handler
+msgid "Aged Receivable Custom Handler"
+msgstr "المعالج المخصص للحسابات المدينة المستحقة "
+
+#. module: odex30_account_reports
+#: model_terms:ir.ui.view,arch_db:odex30_account_reports.account_reports_journal_dashboard_kanban_view
+msgid "Aged Receivables"
+msgstr "المتأخرات المدينة"
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_report.py:0
+#: code:addons/odex30_account_reports/static/src/components/account_report/filters/filter_fiscal_position.xml:0
+#: code:addons/odex30_account_reports/static/src/components/account_report/filters/filters.js:0
+#: code:addons/odex30_account_reports/static/src/components/sales_report/filters/filters.js:0
+msgid "All"
+msgstr "الكل"
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_report.py:0
+msgid "All Journals"
+msgstr "كافة اليوميات "
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/account_report/filters/filters.js:0
+msgid "All Payable"
+msgstr "جميع الذمم مستحقة الدفع "
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/account_report/filters/filters.js:0
+msgid "All Receivable"
+msgstr "جميع الذمم المدينة"
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_report.py:0
+msgid "All Report Variants"
+msgstr "كافة متغيرات التقرير "
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/tax_report/warnings.xml:0
+msgid ""
+"All selected companies or branches do not share the same Tax ID. Please "
+"check the Tax ID of the selected companies."
+msgstr ""
+"لا تتشارك كل الشركات أو الفروع المحددة في نفس المُعرِّف الضريبي. يُرجى التحقق من "
+"المُعرِّف الضريبي للشركات المحددة. "
+
+#. module: odex30_account_reports
+#: model:account.report.column,name:odex30_account_reports.account_financial_report_ec_sales_amount
+#: model:account.report.column,name:odex30_account_reports.bank_reconciliation_report_amount
+#: model:account.report.column,name:odex30_account_reports.customer_statement_amount
+#: model:account.report.column,name:odex30_account_reports.followup_report_amount
+#: model:ir.model.fields,field_description:odex30_account_reports.field_account_report_budget_item__amount
+msgid "Amount"
+msgstr "مبلغ"
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_journal_report.py:0
+#: model:account.report.column,name:odex30_account_reports.aged_payable_report_amount_currency
+#: model:account.report.column,name:odex30_account_reports.aged_receivable_report_amount_currency
+#: model:account.report.column,name:odex30_account_reports.bank_reconciliation_report_amount_currency
+#: model:account.report.column,name:odex30_account_reports.customer_statement_report_amount_currency
+#: model:account.report.column,name:odex30_account_reports.followup_report_report_amount_currency
+#: model:account.report.column,name:odex30_account_reports.partner_ledger_report_amount_currency
+msgid "Amount Currency"
+msgstr "عملة المبلغ"
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_journal_report.py:0
+msgid "Amount in currency: %s"
+msgstr "المبلغ بالعملة: %s "
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_report.py:0
+msgid "Amounts in Lakhs"
+msgstr "المبلغ باللاكس "
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_report.py:0
+msgid "Amounts in Millions"
+msgstr "المبالغ بالملايين "
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_report.py:0
+msgid "Amounts in Thousands"
+msgstr "المبالغ بالآلاف "
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/account_report/filters/filter_analytic.xml:0
+#: code:addons/odex30_account_reports/static/src/components/account_report/filters/filter_analytic_groupby.xml:0
+msgid "Analytic"
+msgstr "تحليلي "
+
+#. module: odex30_account_reports
+#: model:ir.model.fields,field_description:odex30_account_reports.field_account_report__filter_analytic_groupby
+msgid "Analytic Group By"
+msgstr "التجميع التحليلي حسب "
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/account_report/filters/filter_extra_options.xml:0
+msgid "Analytic Simulations"
+msgstr "عمليات المحاكاة التحليلية "
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/account_report/line_name/line_name.xml:0
+msgid "Annotate"
+msgstr "تعليق"
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/account_report/line_name/popover/annotations_popover.xml:0
+msgid "Annotation"
+msgstr "الشرح "
+
+#. module: odex30_account_reports
+#: model:ir.model.fields,field_description:odex30_account_reports.field_account_report__annotations_ids
+msgid "Annotations"
+msgstr "الشرح "
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_report.py:0
+msgid "As of %s"
+msgstr "اعتبارًا من %s"
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/account_report/filters/filters.js:0
+msgid "Ascending"
+msgstr "تصاعدي "
+
+#. module: odex30_account_reports
+#: model:account.report.column,name:odex30_account_reports.aged_payable_report_period0
+#: model:account.report.column,name:odex30_account_reports.aged_receivable_report_period0
+msgid "At Date"
+msgstr "بتاريخ"
+
+#. module: odex30_account_reports
+#: model_terms:ir.ui.view,arch_db:odex30_account_reports.account_report_send_form
+msgid "Attach a file"
+msgstr "إرفاق ملف"
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_generic_tax_report.py:0
+#: code:addons/odex30_account_reports/static/src/components/journal_report/line/line.xml:0
+#: code:addons/odex30_account_reports/static/src/components/journal_report/line_name.xml:0
+msgid "Audit"
+msgstr "تدقيق"
+
+#. module: odex30_account_reports
+#: model:ir.ui.menu,name:odex30_account_reports.account_reports_audit_reports_menu
+msgid "Audit Reports"
+msgstr "تقارير التدقيق"
+
+#. module: odex30_account_reports
+#: model:account.report.line,name:odex30_account_reports.account_financial_report_executivesummary_avgcre0
+msgid "Average creditors days"
+msgstr "متوسط أيام الدائنين"
+
+#. module: odex30_account_reports
+#: model:account.report.line,name:odex30_account_reports.account_financial_report_executivesummary_avdebt0
+msgid "Average debtors days"
+msgstr "متوسط أيام المدينين"
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_journal_report.py:0
+msgid "B: %s"
+msgstr "B: %s"
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_journal_report.py:0
+#: model:account.report.column,name:odex30_account_reports.balance_sheet_balance
+#: model:account.report.column,name:odex30_account_reports.cash_flow_report_balance
+#: model:account.report.column,name:odex30_account_reports.customer_statement_report_balance
+#: model:account.report.column,name:odex30_account_reports.executive_summary_column
+#: model:account.report.column,name:odex30_account_reports.followup_report_report_balance
+#: model:account.report.column,name:odex30_account_reports.general_ledger_report_balance
+#: model:account.report.column,name:odex30_account_reports.journal_report_balance
+#: model:account.report.column,name:odex30_account_reports.partner_ledger_report_balance
+#: model:account.report.column,name:odex30_account_reports.profit_and_loss_column
+#: model_terms:ir.ui.view,arch_db:odex30_account_reports.account_reports_journal_dashboard_kanban_view
+msgid "Balance"
+msgstr "الرصيد"
+
+#. module: odex30_account_reports
+#: model:account.report,name:odex30_account_reports.balance_sheet
+#: model:account.report.line,name:odex30_account_reports.account_financial_report_executivesummary_balancesheet0
+#: model:ir.actions.client,name:odex30_account_reports.action_account_report_bs
+#: model:ir.ui.menu,name:odex30_account_reports.menu_action_account_report_balance_sheet
+msgid "Balance Sheet"
+msgstr "الميزانية العمومية"
+
+#. module: odex30_account_reports
+#: model:ir.model,name:odex30_account_reports.model_account_balance_sheet_report_handler
+msgid "Balance Sheet Custom Handler"
+msgstr "المعالج المخصص للميزانية العمومية "
+
+#. module: odex30_account_reports
+#: model:account.report.column,name:odex30_account_reports.multicurrency_revaluation_report_balance_current
+msgid "Balance at Current Rate"
+msgstr "الرصيد بسعر الصرف الحالي "
+
+#. module: odex30_account_reports
+#: model:account.report.column,name:odex30_account_reports.multicurrency_revaluation_report_balance_operation
+msgid "Balance at Operation Rate"
+msgstr "الرصيد بسعر العملية "
+
+#. module: odex30_account_reports
+#: model:account.report.column,name:odex30_account_reports.multicurrency_revaluation_report_balance_currency
+msgid "Balance in Foreign Currency"
+msgstr "الرصيد بالعملة الأجنبية "
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/bank_reconciliation_report.py:0
+msgid "Balance of '%s'"
+msgstr "رصيد '%s' "
+
+#. module: odex30_account_reports
+#: model:account.report.line,name:odex30_account_reports.balance_bank
+msgid "Balance of Bank"
+msgstr "رصيد البنك "
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_generic_tax_report.py:0
+msgid "Balance tax advance payment account"
+msgstr "حساب رصيد الضريبة مسبقة الدفع "
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_generic_tax_report.py:0
+msgid "Balance tax current account (payable)"
+msgstr "حساب رصيد الضريبة مسبقة الدفع (الدائن)"
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_generic_tax_report.py:0
+msgid "Balance tax current account (receivable)"
+msgstr "حساب رصيد الضريبة مسبقة الدفع (المدين)"
+
+#. module: odex30_account_reports
+#: model:ir.actions.client,name:odex30_account_reports.action_account_report_bank_reconciliation
+msgid "Bank Reconciliation"
+msgstr "التسوية البنكية"
+
+#. module: odex30_account_reports
+#: model:account.report,name:odex30_account_reports.bank_reconciliation_report
+msgid "Bank Reconciliation Report"
+msgstr "تقرير التسوية البنكية"
+
+#. module: odex30_account_reports
+#: model:ir.model,name:odex30_account_reports.model_account_bank_reconciliation_report_handler
+msgid "Bank Reconciliation Report Custom Handler"
+msgstr "المعالج المخصص لتقارير تسوية البنك "
+
+#. module: odex30_account_reports
+#: model:account.report.line,name:odex30_account_reports.account_financial_report_bank_view0
+msgid "Bank and Cash Accounts"
+msgstr "الحسابات البنكية والنقدية "
+
+#. module: odex30_account_reports
+#: model_terms:ir.ui.view,arch_db:odex30_account_reports.bank_information_customer_report
+msgid "Bank:"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_general_ledger.py:0
+#: code:addons/odex30_account_reports/models/account_journal_report.py:0
+#: code:addons/odex30_account_reports/static/src/components/journal_report/line/line.xml:0
+#: model_terms:ir.ui.view,arch_db:odex30_account_reports.pdf_journal_report_taxes_summary
+msgid "Base Amount"
+msgstr "المبلغ الأساسي"
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/aged_partner_balance/filter_aging.xml:0
+msgid "Based on"
+msgstr "بناءً على"
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_deferred_reports.py:0
+msgid "Before"
+msgstr "قبل"
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/account_report/filters/filter_budgets.xml:0
+#: model:ir.model.fields,field_description:odex30_account_reports.field_account_report_budget_item__budget_id
+msgid "Budget"
+msgstr "الميزانية "
+
+#. module: odex30_account_reports
+#: model:ir.model.fields,field_description:odex30_account_reports.field_account_account__budget_item_ids
+msgid "Budget Item"
+msgstr "عنصر الميزانية "
+
+#. module: odex30_account_reports
+#: model_terms:ir.ui.view,arch_db:odex30_account_reports.account_report_budget_form
+msgid "Budget Items"
+msgstr "عناصر الميزانية "
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/account_report/filters/filter_budgets.xml:0
+#: model_terms:ir.ui.view,arch_db:odex30_account_reports.account_report_budget_form
+msgid "Budget Name"
+msgstr "اسم الميزانية "
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_report.py:0
+msgid "Budget items can only be edited from account lines."
+msgstr "يمكن تحرير عناصر الميزانية فقط من بنود الحساب. "
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/redirectAction/redirectAction.xml:0
+#: model_terms:ir.ui.view,arch_db:odex30_account_reports.account_report_send_form
+#: model_terms:ir.ui.view,arch_db:odex30_account_reports.view_account_multicurrency_revaluation_wizard
+#: model_terms:ir.ui.view,arch_db:odex30_account_reports.view_report_export_wizard
+msgid "Cancel"
+msgstr "إلغاء"
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_generic_tax_report.py:0
+msgid "Cannot audit tax from another model than account.tax."
+msgstr "لا يمكن تدقيق الضريبة من نموذج آخر غير account.tax. "
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_report.py:0
+msgid "Cannot generate carryover values for all fiscal positions at once!"
+msgstr "لا يمكن إنشاء قيم الترحيل لكافة الأوضاع المالية في آن واحد! "
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/account_report/line_cell/popover/carryover_popover.xml:0
+msgid "Carryover"
+msgstr "الترحيل"
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_report.py:0
+msgid "Carryover adjustment for tax unit"
+msgstr "تعديل الترحيل لوحدة الضريبة "
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_report.py:0
+msgid "Carryover can only be generated for a single column group."
+msgstr "يمكن إنشاء الترحيل فقط لمجموعة عمود واحدة. "
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_report.py:0
+msgid "Carryover from %(date_from)s to %(date_to)s"
+msgstr "ترحيل من %(date_from)s إلى %(date_to)s "
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_report.py:0
+msgid "Carryover lines for: %s"
+msgstr "ترحيل القيود لـ: %s "
+
+#. module: odex30_account_reports
+#: model:account.report.line,name:odex30_account_reports.account_financial_report_executivesummary_cash0
+msgid "Cash"
+msgstr "نقدي"
+
+#. module: odex30_account_reports
+#: model:ir.model,name:odex30_account_reports.model_account_cash_flow_report_handler
+msgid "Cash Flow Report Custom Handler"
+msgstr "المعالج المخصص لتقارير التدفق النقدي "
+
+#. module: odex30_account_reports
+#: model:account.report,name:odex30_account_reports.cash_flow_report
+#: model:ir.actions.client,name:odex30_account_reports.action_account_report_cs
+#: model:ir.ui.menu,name:odex30_account_reports.menu_action_account_report_cash_flow
+msgid "Cash Flow Statement"
+msgstr "كشف التدفقات النقدية"
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_cash_flow_report.py:0
+msgid "Cash and cash equivalents, beginning of period"
+msgstr "النقد ومعادِلات النقد، بداية الفترة "
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_cash_flow_report.py:0
+msgid "Cash and cash equivalents, closing balance"
+msgstr "النقد وومعادِلات النقد، رصيد الإقفال "
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_cash_flow_report.py:0
+msgid "Cash flows from financing activities"
+msgstr "التدفقات النقدية من الأنشطة المالية "
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_cash_flow_report.py:0
+msgid "Cash flows from investing & extraordinary activities"
+msgstr "التدفقات النقدية من الأنشطة الاستثمارية وغير العادية"
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_cash_flow_report.py:0
+msgid "Cash flows from operating activities"
+msgstr "التدفقات النقدية من الأنشطة التشغيلية"
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_cash_flow_report.py:0
+msgid "Cash flows from unclassified activities"
+msgstr "التدفقات النقدية من الأنشطة غير المصنفة"
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_cash_flow_report.py:0
+msgid "Cash in"
+msgstr "إيرادات"
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_cash_flow_report.py:0
+msgid "Cash out"
+msgstr "نفقات "
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_cash_flow_report.py:0
+msgid "Cash paid for operating activities"
+msgstr "نفقات الأنشطة التشغيلية "
+
+#. module: odex30_account_reports
+#: model:account.report.line,name:odex30_account_reports.account_financial_report_executivesummary_cash_received0
+msgid "Cash received"
+msgstr "الأرباح النقدية "
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_cash_flow_report.py:0
+msgid "Cash received from operating activities"
+msgstr "أرباح الأنشطة التشغيلية"
+
+#. module: odex30_account_reports
+#: model:account.report.line,name:odex30_account_reports.account_financial_report_executivesummary_cash_spent0
+msgid "Cash spent"
+msgstr "المبلغ المُنفَق "
+
+#. module: odex30_account_reports
+#: model:account.report.line,name:odex30_account_reports.account_financial_report_executivesummary_cash_surplus0
+msgid "Cash surplus"
+msgstr "الفائض النقدي"
+
+#. module: odex30_account_reports
+#: model:ir.model,name:odex30_account_reports.model_account_change_lock_date
+msgid "Change Lock Date"
+msgstr "تغيير تاريخ الإقفال"
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/wizard/account_report_send.py:0
+msgid "Check Partner(s) Email(s)"
+msgstr "تحقق من عناوين البريد الإلكتروني للشركاء "
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/tax_report/warnings.xml:0
+msgid "Check them"
+msgstr "تفقدهم "
+
+#. module: odex30_account_reports
+#: model_terms:ir.ui.view,arch_db:odex30_account_reports.view_account_report_file_download_error_wizard_form
+msgid "Close"
+msgstr "إغلاق"
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_generic_tax_report.py:0
+msgid "Closing Entry"
+msgstr "قيد الإقفال "
+
+#. module: odex30_account_reports
+#: model:account.report.line,name:odex30_account_reports.account_financial_report_executivesummary_closing_bank_balance0
+msgid "Closing bank balance"
+msgstr "رصيد الإقفال البنكي "
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_report.py:0
+#: model:account.report.column,name:odex30_account_reports.journal_report_code
+msgid "Code"
+msgstr "رمز "
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/sales_report/filters/filter_code.xml:0
+msgid "Codes:"
+msgstr "الأكواد: "
+
+#. module: odex30_account_reports
+#: model_terms:ir.ui.view,arch_db:odex30_account_reports.account_report_form
+msgid "Columns"
+msgstr "الأعمدة"
+
+#. module: odex30_account_reports
+#: model:account.report.column,name:odex30_account_reports.general_ledger_report_communication
+msgid "Communication"
+msgstr "التواصل "
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_report.py:0
+#: model:ir.model,name:odex30_account_reports.model_res_company
+#: model:ir.model.fields,field_description:odex30_account_reports.field_account_tax_unit__company_ids
+msgid "Companies"
+msgstr "الشركات"
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_report.py:0
+#: model:ir.model.fields,field_description:odex30_account_reports.field_account_multicurrency_revaluation_wizard__company_id
+#: model:ir.model.fields,field_description:odex30_account_reports.field_account_report_budget__company_id
+msgid "Company"
+msgstr "الشركة "
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_tax.py:0
+msgid ""
+"Company %(company)s already belongs to a tax unit in %(country)s. A company "
+"can at most be part of one tax unit per country."
+msgstr ""
+"الشركة %(company)s تنتمي بالفعل إلى وحدة ضريبية في %(country)s. يمكن أن تكون "
+"الشركة الواحدة جزءاً من وحدة ضريبية واحدة كحد أقصى لكل دولة. "
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_report.py:0
+msgid "Company Currency"
+msgstr "عملة الشركة "
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/account_report/filters/filter_tax_unit.xml:0
+#: code:addons/odex30_account_reports/static/src/components/account_report/filters/filters.js:0
+msgid "Company Only"
+msgstr "الشركة فقط "
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_report.py:0
+msgid "Company Settings"
+msgstr "إعدادات الشركة "
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/account_report/filters/filter_comparison.xml:0
+msgid "Comparison"
+msgstr "مقارنة"
+
+#. module: odex30_account_reports
+#: model:ir.model,name:odex30_account_reports.model_res_config_settings
+msgid "Config Settings"
+msgstr "تهيئة الإعدادات "
+
+#. module: odex30_account_reports
+#: model_terms:ir.ui.view,arch_db:odex30_account_reports.res_config_settings_view_form
+msgid "Configure start dates"
+msgstr "تهيئة تواريخ البدء "
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_generic_tax_report.py:0
+msgid "Configure your TAX accounts - %s"
+msgstr "قم بتهيئة حساباتك الضريبية - %s "
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/res_config_settings.py:0
+msgid "Configure your start dates"
+msgstr "قم بتهيئة تواريخ البدء "
+
+#. module: odex30_account_reports
+#: model_terms:ir.ui.view,arch_db:odex30_account_reports.res_config_settings_view_form
+msgid "Configure your tax accounts"
+msgstr "قم بتهيئة حساباتك الضريبية "
+
+#. module: odex30_account_reports
+#: model:ir.model,name:odex30_account_reports.model_res_partner
+msgid "Contact"
+msgstr "جهة الاتصال"
+
+#. module: odex30_account_reports
+#: model_terms:ir.ui.view,arch_db:odex30_account_reports.duplicated_vat_partner_tree_view
+msgid "Contacts"
+msgstr "جهات الاتصال"
+
+#. module: odex30_account_reports
+#: model:ir.model.fields,field_description:odex30_account_reports.field_account_report_send__mail_body
+msgid "Contents"
+msgstr "المحتويات"
+
+#. module: odex30_account_reports
+#: model:account.report.line,name:odex30_account_reports.account_financial_report_executivesummary_direct_costs0
+msgid "Cost of Revenue"
+msgstr "تكاليف الإيرادات "
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_report.py:0
+msgid ""
+"Could not expand term %(term)s while evaluating formula %"
+"(unexpanded_formula)s"
+msgstr "hello "
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_report.py:0
+msgid "Could not parse account_code formula from token '%s'"
+msgstr "تعذر تحليل صيغة account_code من الرمز '%s' "
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_journal_report.py:0
+#: code:addons/odex30_account_reports/static/src/components/journal_report/line/line.xml:0
+#: model:ir.model.fields,field_description:odex30_account_reports.field_account_tax_unit__country_id
+#: model_terms:ir.ui.view,arch_db:odex30_account_reports.pdf_journal_report_taxes_summary
+#: model_terms:ir.ui.view,arch_db:odex30_account_reports.view_account_report_search
+msgid "Country"
+msgstr "الدولة"
+
+#. module: odex30_account_reports
+#: model:account.report.column,name:odex30_account_reports.account_financial_report_ec_sales_country
+msgid "Country Code"
+msgstr "رمز الدولة"
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/account_report/filters/filter_budgets.xml:0
+msgid "Create"
+msgstr "إنشاء "
+
+#. module: odex30_account_reports
+#: model:ir.actions.server,name:odex30_account_reports.action_create_composite_report_list
+msgid "Create Composite Report"
+msgstr "إنشاء تقرير مُركّب "
+
+#. module: odex30_account_reports
+#: model_terms:ir.ui.view,arch_db:odex30_account_reports.view_account_multicurrency_revaluation_wizard
+msgid "Create Entry"
+msgstr "إنشاء قيد "
+
+#. module: odex30_account_reports
+#: model:ir.actions.server,name:odex30_account_reports.action_create_report_menu
+msgid "Create Menu Item"
+msgstr "إنشاء عنصر قائمة "
+
+#. module: odex30_account_reports
+#: model:ir.model.fields,field_description:odex30_account_reports.field_account_multicurrency_revaluation_wizard__create_uid
+#: model:ir.model.fields,field_description:odex30_account_reports.field_account_report_annotation__create_uid
+#: model:ir.model.fields,field_description:odex30_account_reports.field_account_report_budget__create_uid
+#: model:ir.model.fields,field_description:odex30_account_reports.field_account_report_budget_item__create_uid
+#: model:ir.model.fields,field_description:odex30_account_reports.field_account_report_file_download_error_wizard__create_uid
+#: model:ir.model.fields,field_description:odex30_account_reports.field_account_report_horizontal_group__create_uid
+#: model:ir.model.fields,field_description:odex30_account_reports.field_account_report_horizontal_group_rule__create_uid
+#: model:ir.model.fields,field_description:odex30_account_reports.field_account_report_send__create_uid
+#: model:ir.model.fields,field_description:odex30_account_reports.field_account_reports_export_wizard__create_uid
+#: model:ir.model.fields,field_description:odex30_account_reports.field_account_reports_export_wizard_format__create_uid
+#: model:ir.model.fields,field_description:odex30_account_reports.field_account_tax_unit__create_uid
+msgid "Created by"
+msgstr "أنشئ بواسطة"
+
+#. module: odex30_account_reports
+#: model:ir.model.fields,field_description:odex30_account_reports.field_account_multicurrency_revaluation_wizard__create_date
+#: model:ir.model.fields,field_description:odex30_account_reports.field_account_report_annotation__create_date
+#: model:ir.model.fields,field_description:odex30_account_reports.field_account_report_budget__create_date
+#: model:ir.model.fields,field_description:odex30_account_reports.field_account_report_budget_item__create_date
+#: model:ir.model.fields,field_description:odex30_account_reports.field_account_report_file_download_error_wizard__create_date
+#: model:ir.model.fields,field_description:odex30_account_reports.field_account_report_horizontal_group__create_date
+#: model:ir.model.fields,field_description:odex30_account_reports.field_account_report_horizontal_group_rule__create_date
+#: model:ir.model.fields,field_description:odex30_account_reports.field_account_report_send__create_date
+#: model:ir.model.fields,field_description:odex30_account_reports.field_account_reports_export_wizard__create_date
+#: model:ir.model.fields,field_description:odex30_account_reports.field_account_reports_export_wizard_format__create_date
+#: model:ir.model.fields,field_description:odex30_account_reports.field_account_tax_unit__create_date
+msgid "Created on"
+msgstr "أنشئ في"
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_journal_report.py:0
+#: code:addons/odex30_account_reports/wizard/multicurrency_revaluation.py:0
+#: model:account.report.column,name:odex30_account_reports.general_ledger_report_credit
+#: model:account.report.column,name:odex30_account_reports.journal_report_credit
+#: model:account.report.column,name:odex30_account_reports.partner_ledger_report_credit
+#: model:account.report.column,name:odex30_account_reports.trial_balance_report_credit
+msgid "Credit"
+msgstr "الدائن"
+
+#. module: odex30_account_reports
+#: model:account.report.column,name:odex30_account_reports.aged_payable_report_currency
+#: model:account.report.column,name:odex30_account_reports.aged_receivable_report_currency
+#: model:account.report.column,name:odex30_account_reports.bank_reconciliation_report_currency
+#: model:account.report.column,name:odex30_account_reports.general_ledger_report_amount_currency
+msgid "Currency"
+msgstr "العملة"
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_report.py:0
+msgid "Currency Code"
+msgstr "كود العملة "
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_multicurrency_revaluation_report.py:0
+msgid "Currency Rates (%s)"
+msgstr "أسعار صرف العملة (%s)"
+
+#. module: odex30_account_reports
+#: model_terms:ir.ui.view,arch_db:odex30_account_reports.pdf_export_filters
+msgid "Currency:"
+msgstr "العملة: "
+
+#. module: odex30_account_reports
+#: model:account.report.column,name:odex30_account_reports.deferred_expense_current
+#: model:account.report.column,name:odex30_account_reports.deferred_revenue_current
+msgid "Current"
+msgstr "الحالي "
+
+#. module: odex30_account_reports
+#: model:account.report.line,name:odex30_account_reports.account_financial_report_current_assets0
+#: model:account.report.line,name:odex30_account_reports.account_financial_report_current_assets_view0
+msgid "Current Assets"
+msgstr "الأصول المتداولة"
+
+#. module: odex30_account_reports
+#: model:account.report.line,name:odex30_account_reports.account_financial_report_current_liabilities0
+#: model:account.report.line,name:odex30_account_reports.account_financial_report_current_liabilities1
+msgid "Current Liabilities"
+msgstr "الالتزامات الجارية "
+
+#. module: odex30_account_reports
+#: model:account.report.line,name:odex30_account_reports.account_financial_retained_earnings_line_1
+msgid "Current Year Retained Earnings"
+msgstr "الأرباح المحتجزة للسنة الجارية "
+
+#. module: odex30_account_reports
+#: model:account.report.line,name:odex30_account_reports.account_financial_current_year_earnings0
+msgid "Current Year Unallocated Earnings"
+msgstr "الأرباح غير المخصصة للسنة الجارية "
+
+#. module: odex30_account_reports
+#: model:account.report.line,name:odex30_account_reports.account_financial_report_executivesummary_ca_to_l0
+msgid "Current assets to liabilities"
+msgstr "نسبة الأصول المتداولة إلى الالتزامات"
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/account_report/filters/filter_comparison.xml:0
+#: code:addons/odex30_account_reports/static/src/components/account_report/filters/filter_date.xml:0
+msgid "Custom Dates"
+msgstr "التواريخ المخصصة "
+
+#. module: odex30_account_reports
+#: model:ir.model.fields,field_description:odex30_account_reports.field_account_report__custom_handler_model_id
+msgid "Custom Handler Model"
+msgstr "نموذج للمعالج المخصص "
+
+#. module: odex30_account_reports
+#: model:ir.model.fields,field_description:odex30_account_reports.field_account_report__custom_handler_model_name
+msgid "Custom Handler Model Name"
+msgstr "اسم نموذج المعالج المخصص "
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/bank_reconciliation_report.py:0
+msgid ""
+"Custom engine _report_custom_engine_last_statement_balance_amount does not "
+"support groupby"
+msgstr ""
+"المحرك المخصص _report_custom_engine_last_statement_balance_amount لا يدعم "
+"خاصية groupby "
+
+#. module: odex30_account_reports
+#: model:account.report,name:odex30_account_reports.customer_statement_report
+#: model:ir.actions.client,name:odex30_account_reports.action_account_report_customer_statement
+#: model:mail.template,name:odex30_account_reports.email_template_customer_statement
+msgid "Customer Statement"
+msgstr "كشف حساب العميل "
+
+#. module: odex30_account_reports
+#: model:ir.model,name:odex30_account_reports.model_account_customer_statement_report_handler
+msgid "Customer Statement Custom Handler"
+msgstr "المعالج المخصص لكشف حساب العميل "
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/account_report/line_name/popover/annotations_popover.xml:0
+#: model:account.report.column,name:odex30_account_reports.bank_reconciliation_report_date
+#: model:account.report.column,name:odex30_account_reports.general_ledger_report_date
+#: model:ir.model.fields,field_description:odex30_account_reports.field_account_multicurrency_revaluation_wizard__date
+#: model:ir.model.fields,field_description:odex30_account_reports.field_account_report_annotation__date
+#: model:ir.model.fields,field_description:odex30_account_reports.field_account_report_budget_item__date
+msgid "Date"
+msgstr "التاريخ"
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/account_report/filters/filters.js:0
+msgid "Date cannot be empty"
+msgstr "لا يمكن ترك خانة التاريخ فارغة"
+
+#. module: odex30_account_reports
+#: model:ir.model.fields,help:odex30_account_reports.field_account_report_annotation__date
+msgid "Date considered as annotated by the annotation."
+msgstr "يُعتَبَر التاريخ مشروحاً بواسطة الشرح. "
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/aged_partner_balance/filter_aging.xml:0
+msgid "Days"
+msgstr "أيام "
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_journal_report.py:0
+#: code:addons/odex30_account_reports/wizard/multicurrency_revaluation.py:0
+#: model:account.report.column,name:odex30_account_reports.general_ledger_report_debit
+#: model:account.report.column,name:odex30_account_reports.journal_report_debit
+#: model:account.report.column,name:odex30_account_reports.partner_ledger_report_debit
+#: model:account.report.column,name:odex30_account_reports.trial_balance_report_debit
+msgid "Debit"
+msgstr "المدين"
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_journal_report.py:0
+#: code:addons/odex30_account_reports/static/src/components/journal_report/line/line.xml:0
+#: model_terms:ir.ui.view,arch_db:odex30_account_reports.pdf_journal_report_taxes_summary
+msgid "Deductible"
+msgstr "قابل للاستقطاع "
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/deferred_reports/warnings.xml:0
+msgid "Deferrals have not yet been completely generated for this period."
+msgstr "لم يتم بعد إنشاء التأجيلات بالكامل لهذه الفترة. "
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/deferred_reports/warnings.xml:0
+msgid "Deferrals have not yet been generated for this period."
+msgstr "لم يتم بعد إنشاء التأجيلات لهذه الفترة. "
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_deferred_reports.py:0
+#: code:addons/odex30_account_reports/models/account_report.py:0
+msgid "Deferred Entries"
+msgstr "القيم المؤجلة "
+
+#. module: odex30_account_reports
+#: model:ir.actions.client,name:odex30_account_reports.action_account_report_deferred_expense
+#: model:ir.ui.menu,name:odex30_account_reports.menu_action_account_report_deferred_expense
+msgid "Deferred Expense"
+msgstr "النفقات المؤجلة "
+
+#. module: odex30_account_reports
+#: model:ir.model,name:odex30_account_reports.model_account_deferred_expense_report_handler
+msgid "Deferred Expense Custom Handler"
+msgstr "أداة مخصصة لمعالجة النفقات المؤجلة "
+
+#. module: odex30_account_reports
+#: model:account.report,name:odex30_account_reports.deferred_expense_report
+msgid "Deferred Expense Report"
+msgstr "تقرير النفقات المؤجلة "
+
+#. module: odex30_account_reports
+#: model:ir.model,name:odex30_account_reports.model_account_deferred_report_handler
+msgid "Deferred Expense Report Custom Handler"
+msgstr "أداة مخصصة لمعالجة تقرير النفقات المؤجلة "
+
+#. module: odex30_account_reports
+#: model:ir.actions.client,name:odex30_account_reports.action_account_report_deferred_revenue
+#: model:ir.ui.menu,name:odex30_account_reports.menu_action_account_report_deferred_revenue
+msgid "Deferred Revenue"
+msgstr "الإيرادات المؤجلة "
+
+#. module: odex30_account_reports
+#: model:ir.model,name:odex30_account_reports.model_account_deferred_revenue_report_handler
+msgid "Deferred Revenue Custom Handler"
+msgstr "أداة مخصصة لمعالجة الإيرادات المؤجلة "
+
+#. module: odex30_account_reports
+#: model:account.report,name:odex30_account_reports.deferred_revenue_report
+msgid "Deferred Revenue Report"
+msgstr "تقرير الإيرادات المؤجلة "
+
+#. module: odex30_account_reports
+#: model_terms:ir.ui.view,arch_db:odex30_account_reports.account_report_expression_form
+msgid "Definition"
+msgstr "تعريف"
+
+#. module: odex30_account_reports
+#: model:ir.model.fields,field_description:odex30_account_reports.field_res_company__account_tax_periodicity
+msgid "Delay units"
+msgstr "وحدات التأخير"
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_move.py:0
+msgid "Depending moves"
+msgstr "الحركات المعتمدة على غيرها "
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/account_report/filters/filters.js:0
+msgid "Descending"
+msgstr "تنازلي "
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_generic_tax_report.py:0
+msgid "Difference from rounding taxes"
+msgstr "الفرق من تقريب الضرائب "
+
+#. module: odex30_account_reports
+#: model:ir.model.fields,field_description:odex30_account_reports.field_account_report_line__display_custom_groupby_warning
+msgid "Display Custom Groupby Warning"
+msgstr "عرض تحذير \"التجميع حسب\" المخصص "
+
+#. module: odex30_account_reports
+#: model:ir.model.fields,field_description:odex30_account_reports.field_account_report_send__display_mail_composer
+msgid "Display Mail Composer"
+msgstr "عرض أداة إنشاء البريد الإلكتروني "
+
+#. module: odex30_account_reports
+#: model:ir.model.fields,field_description:odex30_account_reports.field_account_multicurrency_revaluation_wizard__display_name
+#: model:ir.model.fields,field_description:odex30_account_reports.field_account_report_annotation__display_name
+#: model:ir.model.fields,field_description:odex30_account_reports.field_account_report_budget__display_name
+#: model:ir.model.fields,field_description:odex30_account_reports.field_account_report_budget_item__display_name
+#: model:ir.model.fields,field_description:odex30_account_reports.field_account_report_file_download_error_wizard__display_name
+#: model:ir.model.fields,field_description:odex30_account_reports.field_account_report_horizontal_group__display_name
+#: model:ir.model.fields,field_description:odex30_account_reports.field_account_report_horizontal_group_rule__display_name
+#: model:ir.model.fields,field_description:odex30_account_reports.field_account_report_send__display_name
+#: model:ir.model.fields,field_description:odex30_account_reports.field_account_reports_export_wizard__display_name
+#: model:ir.model.fields,field_description:odex30_account_reports.field_account_reports_export_wizard_format__display_name
+#: model:ir.model.fields,field_description:odex30_account_reports.field_account_tax_unit__display_name
+msgid "Display Name"
+msgstr "اسم العرض "
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_journal_report.py:0
+msgid "Document"
+msgstr "المستند "
+
+#. module: odex30_account_reports
+#: model:ir.model.fields,field_description:odex30_account_reports.field_account_reports_export_wizard__doc_name
+msgid "Documents Name"
+msgstr "اسم المستندات "
+
+#. module: odex30_account_reports
+#: model:ir.model.fields,field_description:odex30_account_reports.field_account_report_horizontal_group_rule__domain
+msgid "Domain"
+msgstr "النطاق"
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/account_report/filters/filter_fiscal_position.xml:0
+#: code:addons/odex30_account_reports/static/src/components/account_report/filters/filters.js:0
+msgid "Domestic"
+msgstr "محلي"
+
+#. module: odex30_account_reports
+#: model:ir.model.fields,field_description:odex30_account_reports.field_account_report_send__checkbox_download
+msgid "Download"
+msgstr "تنزيل "
+
+#. module: odex30_account_reports
+#: model_terms:ir.ui.view,arch_db:odex30_account_reports.view_account_report_file_download_error_wizard_form
+msgid "Download Anyway"
+msgstr "التنزيل بأي حال "
+
+#. module: odex30_account_reports
+#: model_terms:ir.ui.view,arch_db:odex30_account_reports.res_config_settings_view_form
+msgid "Download the Data Inalterability Check Report"
+msgstr "تحميل تقرير التحقق من بيانات عدم قابلية التغيير "
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/account_report/filters/filter_extra_options.xml:0
+msgid "Draft Entries"
+msgstr "القيود في حالة المسودة "
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_general_ledger.py:0
+msgid "Draft Entry"
+msgstr "مسودة قيد "
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_followup_report.py:0
+#: code:addons/odex30_account_reports/models/account_journal_report.py:0
+#: code:addons/odex30_account_reports/static/src/components/journal_report/line/line.xml:0
+#: model_terms:ir.ui.view,arch_db:odex30_account_reports.pdf_journal_report_taxes_summary
+msgid "Due"
+msgstr "مستحق"
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/aged_partner_balance/filter_aging.xml:0
+#: model:account.report.column,name:odex30_account_reports.customer_statement_report_date_maturity
+#: model:account.report.column,name:odex30_account_reports.followup_report_date_maturity
+#: model:account.report.column,name:odex30_account_reports.partner_ledger_report_date_maturity
+msgid "Due Date"
+msgstr "موعد إجراء المكالمة "
+
+#. module: odex30_account_reports
+#: model:ir.actions.client,name:odex30_account_reports.action_account_report_sales
+#: model:ir.ui.menu,name:odex30_account_reports.menu_action_account_report_sales
+msgid "EC Sales List"
+msgstr "قائمة مبيعات EC"
+
+#. module: odex30_account_reports
+#: model:ir.model,name:odex30_account_reports.model_account_ec_sales_report_handler
+msgid "EC Sales Report Custom Handler"
+msgstr "المعالج المخصص لتقارير مبيعات العمولة الأوروبية "
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_sales_report.py:0
+msgid "EC tax on non EC countries"
+msgstr "ضريبة الاتحاد الأوروبي للدول خارج الاتحاد الأوروبي "
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_sales_report.py:0
+msgid "EC tax on same country"
+msgstr "ضريبة الاتحاد الأوروبي في نفس الدولة "
+
+#. module: odex30_account_reports
+#: model:account.report.line,name:odex30_account_reports.account_financial_report_equity0
+msgid "EQUITY"
+msgstr "رأس المال "
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_report.py:0
+msgid ""
+"Editing a manual report line is not allowed in multivat setup when "
+"displaying data from all fiscal positions."
+msgstr ""
+"لا يُسمح بتحرير تقرير يدوي في بيئة متعددة الضرائب عند عرض البيانات من كافة "
+"الأوضاع المالية. "
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_report.py:0
+msgid ""
+"Editing a manual report line is not allowed when multiple companies are "
+"selected."
+msgstr "لا يُسمح بتحرير تقرير يدوي عندما يتم تحديد عدة شركات. "
+
+#. module: odex30_account_reports
+#: model:ir.model.fields,field_description:odex30_account_reports.field_account_report_send__checkbox_send_mail
+msgid "Email"
+msgstr "البريد الإلكتروني"
+
+#. module: odex30_account_reports
+#: model:ir.model.fields,field_description:odex30_account_reports.field_account_report_send__mail_template_id
+msgid "Email template"
+msgstr "قالب البريد الإلكتروني "
+
+#. module: odex30_account_reports
+#: model:ir.model.fields,field_description:odex30_account_reports.field_account_report_send__enable_download
+msgid "Enable Download"
+msgstr "تمكين التنزيل "
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_report.py:0
+msgid "Enable Sections"
+msgstr "تمكين الأجزاء "
+
+#. module: odex30_account_reports
+#: model:ir.model.fields,field_description:odex30_account_reports.field_account_report_send__enable_send_mail
+msgid "Enable Send Mail"
+msgstr "تمكين إرسال البريد الإلكتروني "
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/account_report/filters/filter_variant.xml:0
+msgid "Enable more ..."
+msgstr "تمكين المزيد... "
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_trial_balance_report.py:0
+msgid "End Balance"
+msgstr "الرصيد النهائي "
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/account_report/filters/filters.js:0
+msgid "End of Month"
+msgstr "نهاية الشهر "
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/account_report/filters/filters.js:0
+msgid "End of Quarter"
+msgstr "نهاية ربع السنة "
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/account_report/filters/filters.js:0
+msgid "End of Year"
+msgstr "نهاية العام "
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/account_report/line/popover/debug_popover.xml:0
+msgid "Engine"
+msgstr "المحرك "
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_sales_report.py:0
+msgid "Entries with partners with no VAT"
+msgstr "القيود التي بها شركاء بلا ضريبة القيمة المضافة "
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_report.py:0
+msgid "Error message"
+msgstr "رسالة خطأ"
+
+#. module: odex30_account_reports
+#: model:mail.activity.type,summary:odex30_account_reports.mail_activity_type_tax_report_error
+msgid "Error sending Tax Report"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/multicurrency_revaluation_report/filters/filter_exchange_rate.xml:0
+msgid "Exchange Rates"
+msgstr "أسعار الصرف "
+
+#. module: odex30_account_reports
+#: model:ir.model.fields,field_description:odex30_account_reports.field_account_move_line__exclude_bank_lines
+msgid "Exclude Bank Lines"
+msgstr "استثناء بنود البنك "
+
+#. module: odex30_account_reports
+#: model_terms:ir.ui.view,arch_db:odex30_account_reports.view_journal_report_audit_move_line_search
+msgid "Exclude Bank lines"
+msgstr "استثناء بنود البنك "
+
+#. module: odex30_account_reports
+#: model:ir.model.fields,field_description:odex30_account_reports.field_account_account__exclude_provision_currency_ids
+msgid "Exclude Provision Currency"
+msgstr "استثناء عملة الحكم "
+
+#. module: odex30_account_reports
+#: model:account.report.line,name:odex30_account_reports.multicurrency_revaluation_excluded
+msgid "Excluded Accounts"
+msgstr "الحسابات المستثناة "
+
+#. module: odex30_account_reports
+#: model:account.report,name:odex30_account_reports.executive_summary
+#: model:ir.actions.client,name:odex30_account_reports.action_account_report_exec_summary
+#: model:ir.ui.menu,name:odex30_account_reports.menu_action_account_report_exec_summary
+msgid "Executive Summary"
+msgstr "الملخص التنفيذي"
+
+#. module: odex30_account_reports
+#: model:ir.model.fields,field_description:odex30_account_reports.field_account_multicurrency_revaluation_wizard__expense_provision_account_id
+msgid "Expense Account"
+msgstr "حساب النفقات "
+
+#. module: odex30_account_reports
+#: model:ir.model.fields,field_description:odex30_account_reports.field_res_company__account_revaluation_expense_provision_account_id
+msgid "Expense Provision Account"
+msgstr "حساب أحكام النفقات "
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/wizard/multicurrency_revaluation.py:0
+msgid "Expense Provision for %s"
+msgstr "حكم النفقات لـ %s"
+
+#. module: odex30_account_reports
+#: model:account.report.line,name:odex30_account_reports.account_financial_report_executivesummary_expenses0
+msgid "Expenses"
+msgstr "النفقات "
+
+#. module: odex30_account_reports
+#: model_terms:ir.ui.view,arch_db:odex30_account_reports.view_report_export_wizard
+msgid "Export"
+msgstr "تصدير"
+
+#. module: odex30_account_reports
+#: model:ir.model,name:odex30_account_reports.model_account_reports_export_wizard_format
+msgid "Export format for accounting's reports"
+msgstr "صيغة التصدير للتقارير المحاسبية "
+
+#. module: odex30_account_reports
+#: model:ir.model.fields,field_description:odex30_account_reports.field_account_reports_export_wizard__export_format_ids
+msgid "Export to"
+msgstr "التصدير إلى "
+
+#. module: odex30_account_reports
+#: model:ir.model,name:odex30_account_reports.model_account_reports_export_wizard
+msgid "Export wizard for accounting's reports"
+msgstr "مُعالِج التصدير للتقارير المحاسبية "
+
+#. module: odex30_account_reports
+#: model_terms:ir.ui.view,arch_db:odex30_account_reports.account_report_expression_form
+msgid "Expression"
+msgstr "تعبير "
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_report.py:0
+msgid ""
+"Expression labelled '%(label)s' of line '%(line)s' is being overwritten when "
+"computing the current report. Make sure the cross-report aggregations of "
+"this report only reference terms belonging to other reports."
+msgstr ""
+"تتم الكتابة فوق التعبير الذي عنوانه \"%(label)s\" من البند \"%(line)s\" عند "
+"احتساب التقرير الحالي. تأكد من أن مجموعات التقارير التبادلية لهذا التقرير "
+"تشير فقط إلى الشروط التي تنتمي إلى تقارير أخرى. "
+
+#. module: odex30_account_reports
+#: model:ir.model.fields,field_description:odex30_account_reports.field_account_report_horizontal_group_rule__field_name
+msgid "Field"
+msgstr "حقل"
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_report.py:0
+msgid ""
+"Field %s does not exist on account.move.line, and is not supported by this "
+"report's custom handler."
+msgstr ""
+"الحقل %s غير موجود في account.move.line، وهو غير مدعوم في أداة معالجة "
+"التقارير هذه. "
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_report.py:0
+msgid "Field %s does not exist on account.move.line."
+msgstr "الحقل %s غير موجود في account.move.line. "
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_report.py:0
+msgid "Field %s of account.move.line cannot be used in a groupby expression."
+msgstr "لا يمكن استخدام حقل%s  account.move.line في تعبير groupby. "
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_report.py:0
+msgid ""
+"Field %s of account.move.line is not searchable and can therefore not be "
+"used in a groupby expression."
+msgstr ""
+"لا يمكن البحث في حقل %s لـ account.move.line، وبالتالي لا يمكن استخدامه في "
+"تعبير groupby. "
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_report.py:0
+msgid ""
+"Field 'Custom Handler Model' can only reference records inheriting from [%s]."
+msgstr ""
+"الحقل 'نموذج المعالج المخصص' يمكنه فقط الإشارة إلى السجلات التي ترث من [%s]. "
+
+#. module: odex30_account_reports
+#: model:ir.model.fields,field_description:odex30_account_reports.field_account_report_file_download_error_wizard__file_content
+msgid "File Content"
+msgstr "محتوى الملف "
+
+#. module: odex30_account_reports
+#: model_terms:ir.ui.view,arch_db:odex30_account_reports.view_account_report_file_download_error_wizard_form
+msgid "File Download Errors"
+msgstr "أخطاء تنزيل الملف "
+
+#. module: odex30_account_reports
+#: model:ir.model.fields,field_description:odex30_account_reports.field_account_report_file_download_error_wizard__file_name
+msgid "File Name"
+msgstr "اسم الملف"
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_report.py:0
+#: model_terms:ir.ui.view,arch_db:odex30_account_reports.account_report_form
+msgid "Filters"
+msgstr "عوامل التصفية "
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/account_report/filters/filter_aml_ir_filters.xml:0
+#: model_terms:ir.ui.view,arch_db:odex30_account_reports.pdf_export_filters
+msgid "Filters:"
+msgstr "عوامل التصفية: "
+
+#. module: odex30_account_reports
+#: model:ir.actions.act_window,name:odex30_account_reports.action_account_report_budget_tree
+#: model:ir.ui.menu,name:odex30_account_reports.menu_action_account_report_budget_tree
+msgid "Financial Budgets"
+msgstr "الميزانيات المالية "
+
+#. module: odex30_account_reports
+#: model:ir.model,name:odex30_account_reports.model_account_fiscal_position
+#: model:ir.model.fields,field_description:odex30_account_reports.field_account_report_annotation__fiscal_position_id
+msgid "Fiscal Position"
+msgstr "الوضع المالي "
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/account_report/filters/filter_fiscal_position.xml:0
+msgid "Fiscal Position:"
+msgstr "الوضع المالي: "
+
+#. module: odex30_account_reports
+#: model:ir.model.fields,field_description:odex30_account_reports.field_account_tax_unit__fpos_synced
+msgid "Fiscal Positions Synchronised"
+msgstr "الأوضاع المالية المتزامنة "
+
+#. module: odex30_account_reports
+#: model_terms:ir.ui.view,arch_db:odex30_account_reports.view_tax_unit_form
+msgid ""
+"Fiscal Positions should apply to all companies of the tax unit. You may want "
+"to"
+msgstr ""
+"يجب أن تنطبق الأوضاع المالية على كافة الشركات لوحدة الضريبة. ربما عليك "
+
+#. module: odex30_account_reports
+#: model:account.report,name:odex30_account_reports.followup_report
+msgid "Follow-Up Report"
+msgstr "تقرير المتابعة "
+
+#. module: odex30_account_reports
+#: model:ir.model,name:odex30_account_reports.model_account_followup_report_handler
+msgid "Follow-Up Report Custom Handler"
+msgstr "المعالج المخصص لتقرير المتابعة "
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/wizard/multicurrency_revaluation.py:0
+msgid "Foreign currencies adjustment entry as of %s"
+msgstr "قيد تعديل العملات الأجنبية اعتباراً من %s"
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/account_report/line/popover/debug_popover.xml:0
+msgid "Formula"
+msgstr "الصيغة"
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_report.py:0
+msgid ""
+"From %(date_from)s\n"
+"to  %(date_to)s"
+msgstr ""
+"من %(date_from)s\n"
+"إلى  %(date_to)s "
+
+#. module: odex30_account_reports
+#: model:ir.model.fields,field_description:odex30_account_reports.field_account_reports_export_wizard_format__fun_param
+msgid "Function Parameter"
+msgstr "معايير الوظيفة "
+
+#. module: odex30_account_reports
+#: model:ir.model.fields,field_description:odex30_account_reports.field_account_reports_export_wizard_format__fun_to_call
+msgid "Function to Call"
+msgstr "الوظيفة لاستدعائها "
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_report.py:0
+#: code:addons/odex30_account_reports/models/account_trial_balance_report.py:0
+#: code:addons/odex30_account_reports/static/src/components/bank_reconciliation_report/warnings.xml:0
+#: code:addons/odex30_account_reports/static/src/components/multicurrency_revaluation_report/line_name.xml:0
+#: model:account.report,name:odex30_account_reports.general_ledger_report
+#: model:ir.actions.client,name:odex30_account_reports.action_account_report_general_ledger
+#: model:ir.ui.menu,name:odex30_account_reports.menu_action_account_report_general_ledger
+msgid "General Ledger"
+msgstr "دفتر الأستاذ العام"
+
+#. module: odex30_account_reports
+#: model:ir.model,name:odex30_account_reports.model_account_general_ledger_report_handler
+msgid "General Ledger Custom Handler"
+msgstr "المعالج المخصص لدفتر الأستاذ العام "
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_deferred_reports.py:0
+msgid "Generate entry"
+msgstr "إنشاء قيد "
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/wizard/report_export_wizard.py:0
+msgid "Generated Documents"
+msgstr "إنشاء المستندات "
+
+#. module: odex30_account_reports
+#: model:account.report,name:odex30_account_reports.generic_ec_sales_report
+msgid "Generic EC Sales List"
+msgstr "قائمة مبيعات EC عامة "
+
+#. module: odex30_account_reports
+#: model:ir.model,name:odex30_account_reports.model_account_generic_tax_report_handler
+msgid "Generic Tax Report Custom Handler"
+msgstr "معالج مخصص للتقرير الضريبي العام "
+
+#. module: odex30_account_reports
+#: model:ir.model,name:odex30_account_reports.model_account_generic_tax_report_handler_account_tax
+msgid "Generic Tax Report Custom Handler (Account -> Tax)"
+msgstr "معالج مخصص للتقرير الضريبي العام (الحساب -> الضريبة) "
+
+#. module: odex30_account_reports
+#: model:ir.model,name:odex30_account_reports.model_account_generic_tax_report_handler_tax_account
+msgid "Generic Tax Report Custom Handler (Tax -> Account)"
+msgstr "معالج مخصص للتقرير الضريبي العام (الضريبة -> الحساب) "
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_journal_report.py:0
+#: model_terms:ir.ui.view,arch_db:odex30_account_reports.journal_report_pdf_export_main
+msgid "Global Tax Summary"
+msgstr "الملخص الشامل للضريبة "
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_sales_report.py:0
+msgid "Goods"
+msgstr "البضائع "
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_journal_report.py:0
+#: code:addons/odex30_account_reports/static/src/components/journal_report/line/line.xml:0
+#: model_terms:ir.ui.view,arch_db:odex30_account_reports.pdf_journal_report_taxes_summary
+msgid "Grid"
+msgstr "الشبكة"
+
+#. module: odex30_account_reports
+#: model:account.report.line,name:odex30_account_reports.account_financial_report_gross_profit0
+msgid "Gross Profit"
+msgstr "إجمالي الربح"
+
+#. module: odex30_account_reports
+#: model:account.report.line,name:odex30_account_reports.account_financial_report_executivesummary_gross_profit0
+msgid "Gross profit"
+msgstr "إجمالي الربح"
+
+#. module: odex30_account_reports
+#: model:account.report.line,name:odex30_account_reports.account_financial_report_executivesummary_gpmargin0
+msgid "Gross profit margin (gross profit / operating income)"
+msgstr "إجمالي هامش الربح (إجمالي الربح / الدخل التشغيلي)"
+
+#. module: odex30_account_reports
+#: model_terms:ir.ui.view,arch_db:odex30_account_reports.account_report_line_form
+#: model_terms:ir.ui.view,arch_db:odex30_account_reports.view_account_report_search
+msgid "Group By"
+msgstr "تجميع حسب"
+
+#. module: odex30_account_reports
+#: model_terms:ir.ui.view,arch_db:odex30_account_reports.account_report_horizontal_group_form
+msgid "Group Name"
+msgstr "اسم المجموعة"
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/deferred_reports/groupby.xml:0
+msgid "Group by"
+msgstr "التجميع حسب "
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_deferred_reports.py:0
+msgid "Grouped Deferral Entry of %s"
+msgstr "القيد المؤجل المجمع لـ %s"
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/partner_ledger/filter_extra_options.xml:0
+msgid "Hide Account"
+msgstr "إخفاء الحساب "
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/partner_ledger/filter_extra_options.xml:0
+msgid "Hide Debit/Credit"
+msgstr "إخفاء الخصم / الائتمان "
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/account_report/filters/filter_extra_options.xml:0
+msgid "Hide lines at 0"
+msgstr "إخفاء البنود في 0 "
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/account_report/filters/filter_extra_options.xml:0
+msgid "Hierarchy and Subtotals"
+msgstr "التسلسل الهرمي والمجاميع الفرعية"
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_report.py:0
+#: model:ir.model.fields,field_description:odex30_account_reports.field_account_report_horizontal_group_rule__horizontal_group_id
+msgid "Horizontal Group"
+msgstr "المجموعة الأفقية "
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/account_report/filters/filter_horizontal_groups.xml:0
+msgid "Horizontal Group:"
+msgstr "المجموعة الأفقية: "
+
+#. module: odex30_account_reports
+#: model:ir.actions.act_window,name:odex30_account_reports.action_account_report_horizontal_groups
+#: model:ir.model.fields,field_description:odex30_account_reports.field_account_report__horizontal_group_ids
+#: model:ir.ui.menu,name:odex30_account_reports.menu_action_account_report_horizontal_groups
+msgid "Horizontal Groups"
+msgstr "المجموعات الأفقية "
+
+#. module: odex30_account_reports
+#: model:ir.model,name:odex30_account_reports.model_account_report_horizontal_group
+msgid "Horizontal group for reports"
+msgstr "المجموعة الأفقية للتقارير "
+
+#. module: odex30_account_reports
+#: model:ir.model,name:odex30_account_reports.model_account_report_horizontal_group_rule
+msgid "Horizontal group rule for reports"
+msgstr "قاعدة المجموعة الأفقية للتقارير "
+
+#. module: odex30_account_reports
+#: model_terms:ir.ui.view,arch_db:odex30_account_reports.pdf_export_filters
+msgid "Horizontal:"
+msgstr "أفقي: "
+
+#. module: odex30_account_reports
+#: model_terms:ir.ui.view,arch_db:odex30_account_reports.res_config_settings_view_form
+msgid "How often tax returns have to be made"
+msgstr "مدى تواتر الإقرارات الضريبية "
+
+#. module: odex30_account_reports
+#: model:ir.model.fields,field_description:odex30_account_reports.field_account_multicurrency_revaluation_wizard__id
+#: model:ir.model.fields,field_description:odex30_account_reports.field_account_report_annotation__id
+#: model:ir.model.fields,field_description:odex30_account_reports.field_account_report_budget__id
+#: model:ir.model.fields,field_description:odex30_account_reports.field_account_report_budget_item__id
+#: model:ir.model.fields,field_description:odex30_account_reports.field_account_report_file_download_error_wizard__id
+#: model:ir.model.fields,field_description:odex30_account_reports.field_account_report_horizontal_group__id
+#: model:ir.model.fields,field_description:odex30_account_reports.field_account_report_horizontal_group_rule__id
+#: model:ir.model.fields,field_description:odex30_account_reports.field_account_report_send__id
+#: model:ir.model.fields,field_description:odex30_account_reports.field_account_reports_export_wizard__id
+#: model:ir.model.fields,field_description:odex30_account_reports.field_account_reports_export_wizard_format__id
+#: model:ir.model.fields,field_description:odex30_account_reports.field_account_tax_unit__id
+msgid "ID"
+msgstr "المُعرف"
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_journal_report.py:0
+#: code:addons/odex30_account_reports/static/src/components/journal_report/line/line.xml:0
+#: model_terms:ir.ui.view,arch_db:odex30_account_reports.pdf_journal_report_taxes_summary
+msgid "Impact On Grid"
+msgstr "التأثير على الشبكة "
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/journal_report/line/line.xml:0
+#: model_terms:ir.ui.view,arch_db:odex30_account_reports.pdf_journal_report_taxes_summary
+msgid "Impacted Tax Grids"
+msgstr "شبكات الضرائب المتأثرة "
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/account_report/filters/filters.js:0
+msgid "In %s"
+msgstr "في %s "
+
+#. module: odex30_account_reports
+#: model_terms:ir.ui.view,arch_db:odex30_account_reports.view_account_report_search
+msgid "Inactive"
+msgstr "غير نشط "
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/journal_report/filter_extra_options.xml:0
+msgid "Include Payments"
+msgstr "تضمين المدفوعات "
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_report.py:0
+#: code:addons/odex30_account_reports/static/src/components/account_report/filters/filters.js:0
+#: model_terms:ir.ui.view,arch_db:odex30_account_reports.pdf_export_filter_extra_options_template
+msgid "Including Analytic Simulations"
+msgstr "شاملة عمليات المحاكات التحليلية "
+
+#. module: odex30_account_reports
+#: model:account.report.line,name:odex30_account_reports.no_statement_unreconciled_payments
+#: model:account.report.line,name:odex30_account_reports.unreconciled_last_statement_payments
+msgid "Including Unreconciled Payments"
+msgstr "شاملة المدفوعات غير المسواة "
+
+#. module: odex30_account_reports
+#: model:account.report.line,name:odex30_account_reports.no_statement_unreconciled_receipt
+#: model:account.report.line,name:odex30_account_reports.unreconciled_last_statement_receipts
+msgid "Including Unreconciled Receipts"
+msgstr "شاملة الإيصالات غير المسواة "
+
+#. module: odex30_account_reports
+#: model:ir.model.fields,field_description:odex30_account_reports.field_account_multicurrency_revaluation_wizard__income_provision_account_id
+msgid "Income Account"
+msgstr "حساب الدخل"
+
+#. module: odex30_account_reports
+#: model:ir.model.fields,field_description:odex30_account_reports.field_res_company__account_revaluation_income_provision_account_id
+msgid "Income Provision Account"
+msgstr "حساب أحكام الدخل "
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/wizard/multicurrency_revaluation.py:0
+msgid "Income Provision for %s"
+msgstr "حكم الدخل لـ %s "
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/bank_reconciliation_report.py:0
+msgid "Inconsistent Statements"
+msgstr "كشوفات الحساب غير المتسقة "
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_report.py:0
+msgid ""
+"Inconsistent data: more than one external value at the same date for a "
+"'most_recent' external line."
+msgstr ""
+"Inconsistent data: more than one external value at the same date for a "
+"'most_recent' external line."
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_report.py:0
+msgid ""
+"Inconsistent report_id in options dictionary. Options says %"
+"(options_report)s; report is %(report)s."
+msgstr ""
+"report_id غير متسق في دليل الخيارات. يقول الخيار %(options_report)s؛ التقرير "
+"%(report)s.  "
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_report.py:0
+#: code:addons/odex30_account_reports/models/account_trial_balance_report.py:0
+msgid "Initial Balance"
+msgstr "الرصيد الافتتاحي"
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/account_report/filters/filter_extra_options.xml:0
+msgid "Integer Rounding"
+msgstr "تقريب العدد الصحيح "
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/aged_partner_balance/filters.js:0
+msgid "Intervals cannot be smaller than 1"
+msgstr "لا يمكن أن تكون الفترات الزمنية أقل من 1 "
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/sales_report/warnings.xml:0
+msgid "Intra-community taxes are applied on"
+msgstr "الضرائب بين المجتمعات مطبقة على "
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_report.py:0
+msgid ""
+"Invalid domain formula in expression \"%(expression)s\" of line \"%"
+"(line)s\": %(formula)s"
+msgstr ""
+"صيغة النطاق غير صالحة في التعبير \"%(expression)s\" في البند \"%(line)s\": %"
+"(formula)s "
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_report.py:0
+msgid "Invalid method “%s”"
+msgstr "الطريقة غير صحيحة \"%s\" "
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_report.py:0
+msgid ""
+"Invalid subformula in expression \"%(expression)s\" of line \"%(line)s\": %"
+"(subformula)s"
+msgstr ""
+"الصيغة الفرعية غير صالحة في التعبير \"%(expression)s\" في البند \"%"
+"(line)s\": %(subformula)s "
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_report.py:0
+msgid "Invalid token '%(token)s' in account_codes formula '%(formula)s'"
+msgstr "الرمز غير صالح '%(token)s' في صيغة account_codes '%(formula)s' "
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/aged_partner_balance/filter_aging.xml:0
+#: model:account.report.column,name:odex30_account_reports.aged_payable_report_invoice_date
+#: model:account.report.column,name:odex30_account_reports.aged_receivable_report_invoice_date
+#: model:account.report.column,name:odex30_account_reports.customer_statement_report_invoicing_date
+#: model:account.report.column,name:odex30_account_reports.followup_report_invoicing_date
+#: model:account.report.column,name:odex30_account_reports.partner_ledger_report_invoicing_date
+msgid "Invoice Date"
+msgstr "تاريخ الفاتورة"
+
+#. module: odex30_account_reports
+#: model_terms:ir.ui.view,arch_db:odex30_account_reports.view_journal_report_audit_move_line_search
+msgid "Invoice lines"
+msgstr "بنود الفاتورة"
+
+#. module: odex30_account_reports
+#: model:ir.model.fields,field_description:odex30_account_reports.field_account_report__is_account_coverage_report_available
+msgid "Is Account Coverage Report Available"
+msgstr "تقرير تغطية الحسابات متاح "
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_move.py:0
+msgid "It seems there is some depending closing move to be posted"
+msgstr "يبدو أنه توجد حركة إغلاق معتمدة على غيرها يجب أن يتم ترحيلها. "
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/account_report/filters/filters.js:0
+msgid "It's not possible to select a budget with the horizontal group feature."
+msgstr "لا يمكن تحديد ميزانية باستخدام خاصية المجموعة الأفقية. "
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/account_report/filters/filters.js:0
+msgid "It's not possible to select a horizontal group with the budget feature."
+msgstr "لا يمكن تحديد مجموعة أفقية باستخدام خاصية الميزانية. "
+
+#. module: odex30_account_reports
+#: model:ir.model.fields,field_description:odex30_account_reports.field_account_report_budget__item_ids
+msgid "Items"
+msgstr "العناصر "
+
+#. module: odex30_account_reports
+#: model:account.report.column,name:odex30_account_reports.partner_ledger_report_journal_code
+#: model:ir.model,name:odex30_account_reports.model_account_journal
+#: model:ir.model.fields,field_description:odex30_account_reports.field_account_financial_year_op__account_tax_periodicity_journal_id
+#: model:ir.model.fields,field_description:odex30_account_reports.field_account_multicurrency_revaluation_wizard__journal_id
+#: model:ir.model.fields,field_description:odex30_account_reports.field_res_company__account_tax_periodicity_journal_id
+#: model:ir.model.fields,field_description:odex30_account_reports.field_res_config_settings__account_tax_periodicity_journal_id
+#: model_terms:ir.ui.view,arch_db:odex30_account_reports.res_config_settings_view_form
+#: model_terms:ir.ui.view,arch_db:odex30_account_reports.setup_financial_year_opening_form
+msgid "Journal"
+msgstr "دفتر اليومية"
+
+#. module: odex30_account_reports
+#: model:ir.actions.client,name:odex30_account_reports.action_account_report_ja
+#: model:ir.ui.menu,name:odex30_account_reports.menu_action_account_report_ja
+msgid "Journal Audit"
+msgstr "تدقيق دفتر اليومية "
+
+#. module: odex30_account_reports
+#: model:ir.model,name:odex30_account_reports.model_account_move
+msgid "Journal Entry"
+msgstr "قيد اليومية"
+
+#. module: odex30_account_reports
+#: model:ir.model,name:odex30_account_reports.model_account_move_line
+msgid "Journal Item"
+msgstr "عنصر اليومية"
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_deferred_reports.py:0
+#: code:addons/odex30_account_reports/models/account_report.py:0
+#: code:addons/odex30_account_reports/models/account_trial_balance_report.py:0
+#: code:addons/odex30_account_reports/models/bank_reconciliation_report.py:0
+#: code:addons/odex30_account_reports/static/src/components/general_ledger/line_name.xml:0
+#: code:addons/odex30_account_reports/static/src/components/partner_ledger/line_name.xml:0
+msgid "Journal Items"
+msgstr "عناصر اليومية"
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_generic_tax_report.py:0
+#: code:addons/odex30_account_reports/models/account_journal_report.py:0
+msgid "Journal Items for Tax Audit"
+msgstr "عناصر اليومية للتدقيق الضريبي"
+
+#. module: odex30_account_reports
+#: model:account.report,name:odex30_account_reports.journal_report
+msgid "Journal Report"
+msgstr "تقرير اليومية "
+
+#. module: odex30_account_reports
+#: model:ir.model,name:odex30_account_reports.model_account_journal_report_handler
+msgid "Journal Report Custom Handler"
+msgstr "المعالج المخصص لتقرير اليومية "
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_generic_tax_report.py:0
+msgid "Journal items with archived tax tags"
+msgstr "عناصر دفتر اليومية مع علامات تصنيف مؤرشفة للضريبة "
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_report.py:0
+msgid "Journals"
+msgstr "دفاتر اليومية"
+
+#. module: odex30_account_reports
+#: model_terms:ir.ui.view,arch_db:odex30_account_reports.pdf_export_filters
+msgid "Journals:"
+msgstr "دفاتر اليومية:"
+
+#. module: odex30_account_reports
+#: model:account.report.line,name:odex30_account_reports.account_financial_report_liabilities_view0
+msgid "LIABILITIES"
+msgstr "التزامات"
+
+#. module: odex30_account_reports
+#: model:account.report.line,name:odex30_account_reports.account_financial_report_liabilities_and_equity_view0
+msgid "LIABILITIES + EQUITY"
+msgstr "الالتزامات + رأس المال "
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#. odoo-python
+#: code:addons/odex30_account_reports/static/src/components/account_report/line/popover/debug_popover.xml:0
+#: code:addons/odex30_account_reports/wizard/multicurrency_revaluation.py:0
+#: model:account.report.column,name:odex30_account_reports.bank_reconciliation_report_label
+msgid "Label"
+msgstr "بطاقة عنوان"
+
+#. module: odex30_account_reports
+#: model:ir.model.fields,field_description:odex30_account_reports.field_account_report_send__mail_lang
+msgid "Lang"
+msgstr "اللغة "
+
+#. module: odex30_account_reports
+#: model_terms:ir.ui.view,arch_db:odex30_account_reports.account_reports_journal_dashboard_kanban_view
+msgid "Last Statement balance + Transactions since statement"
+msgstr "رصيد آخر كشف حساب + المعاملات منذ إصدار كشف الحساب "
+
+#. module: odex30_account_reports
+#: model:ir.model.fields,field_description:odex30_account_reports.field_account_multicurrency_revaluation_wizard__write_uid
+#: model:ir.model.fields,field_description:odex30_account_reports.field_account_report_annotation__write_uid
+#: model:ir.model.fields,field_description:odex30_account_reports.field_account_report_budget__write_uid
+#: model:ir.model.fields,field_description:odex30_account_reports.field_account_report_budget_item__write_uid
+#: model:ir.model.fields,field_description:odex30_account_reports.field_account_report_file_download_error_wizard__write_uid
+#: model:ir.model.fields,field_description:odex30_account_reports.field_account_report_horizontal_group__write_uid
+#: model:ir.model.fields,field_description:odex30_account_reports.field_account_report_horizontal_group_rule__write_uid
+#: model:ir.model.fields,field_description:odex30_account_reports.field_account_report_send__write_uid
+#: model:ir.model.fields,field_description:odex30_account_reports.field_account_reports_export_wizard__write_uid
+#: model:ir.model.fields,field_description:odex30_account_reports.field_account_reports_export_wizard_format__write_uid
+#: model:ir.model.fields,field_description:odex30_account_reports.field_account_tax_unit__write_uid
+msgid "Last Updated by"
+msgstr "آخر تحديث بواسطة"
+
+#. module: odex30_account_reports
+#: model:ir.model.fields,field_description:odex30_account_reports.field_account_multicurrency_revaluation_wizard__write_date
+#: model:ir.model.fields,field_description:odex30_account_reports.field_account_report_annotation__write_date
+#: model:ir.model.fields,field_description:odex30_account_reports.field_account_report_budget__write_date
+#: model:ir.model.fields,field_description:odex30_account_reports.field_account_report_budget_item__write_date
+#: model:ir.model.fields,field_description:odex30_account_reports.field_account_report_file_download_error_wizard__write_date
+#: model:ir.model.fields,field_description:odex30_account_reports.field_account_report_horizontal_group__write_date
+#: model:ir.model.fields,field_description:odex30_account_reports.field_account_report_horizontal_group_rule__write_date
+#: model:ir.model.fields,field_description:odex30_account_reports.field_account_report_send__write_date
+#: model:ir.model.fields,field_description:odex30_account_reports.field_account_reports_export_wizard__write_date
+#: model:ir.model.fields,field_description:odex30_account_reports.field_account_reports_export_wizard_format__write_date
+#: model:ir.model.fields,field_description:odex30_account_reports.field_account_tax_unit__write_date
+msgid "Last Updated on"
+msgstr "آخر تحديث في"
+
+#. module: odex30_account_reports
+#: model:account.report.line,name:odex30_account_reports.last_statement_balance
+msgid "Last statement balance"
+msgstr "رصيد آخر كشف حساب "
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_deferred_reports.py:0
+msgid "Later"
+msgstr "لاحقاً"
+
+#. module: odex30_account_reports
+#: model:account.report.line,name:odex30_account_reports.account_financial_report_cost_sales0
+msgid "Less Costs of Revenue"
+msgstr "تكاليف إيرادات أقل "
+
+#. module: odex30_account_reports
+#: model:account.report.line,name:odex30_account_reports.account_financial_report_expense0
+msgid "Less Operating Expenses"
+msgstr "نفقات تشغيلية أقل "
+
+#. module: odex30_account_reports
+#: model:account.report.line,name:odex30_account_reports.account_financial_report_depreciation0
+msgid "Less Other Expenses"
+msgstr "نفقات أخرى أقل "
+
+#. module: odex30_account_reports
+#: model:ir.model.fields,field_description:odex30_account_reports.field_account_report_annotation__line_id
+msgid "Line"
+msgstr "البند "
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_report.py:0
+msgid ""
+"Line '%(child)s' is configured to appear before its parent '%(parent)s'. "
+"This is not allowed."
+msgstr ""
+"تم تهيئة البند '%(child)s' ليظهر قبل البند الأصلي '%(parent)s'. لا يُسمح "
+"بذلك.  "
+
+#. module: odex30_account_reports
+#: model_terms:ir.ui.view,arch_db:odex30_account_reports.account_report_form
+msgid "Lines"
+msgstr "البنود"
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_report.py:0
+msgid "Load more..."
+msgstr "تحميل المزيد... "
+
+#. module: odex30_account_reports
+#: model:ir.model.fields,field_description:odex30_account_reports.field_account_report_send__mail_attachments_widget
+msgid "Mail Attachments Widget"
+msgstr "أداة مرفقات البريد الإلكتروني "
+
+#. module: odex30_account_reports
+#: model:ir.model.fields,field_description:odex30_account_reports.field_account_tax_unit__main_company_id
+msgid "Main Company"
+msgstr "الشركة الرئيسية "
+
+#. module: odex30_account_reports
+#: model:ir.model.fields,help:odex30_account_reports.field_account_tax_unit__main_company_id
+msgid ""
+"Main company of this unit; the one actually reporting and paying the taxes."
+msgstr ""
+"الشركة الرئيسية لهذه الوحدة؛ الشركة التي تقوم بإصدار التقارير ودفع الضرائب. "
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_multicurrency_revaluation_report.py:0
+#: model_terms:ir.ui.view,arch_db:odex30_account_reports.view_account_multicurrency_revaluation_wizard
+msgid "Make Adjustment Entry"
+msgstr "إنشاء قيد تعديل "
+
+#. module: odex30_account_reports
+#: model:ir.model,name:odex30_account_reports.model_account_report_file_download_error_wizard
+msgid "Manage the file generation errors from report exports."
+msgstr "قم بإدارة أخطاء إنشاء الملفات من عمليات تصدير التقارير. "
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_report.py:0
+msgid "Manual value"
+msgstr "القيمة اليدوية "
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_report.py:0
+msgid "Manual values"
+msgstr "القيم اليدوية "
+
+#. module: odex30_account_reports
+#: model:account.report.column,name:odex30_account_reports.partner_ledger_report_matching_number
+msgid "Matching"
+msgstr "مطابقة"
+
+#. module: odex30_account_reports
+#: model:ir.model.fields,help:odex30_account_reports.field_account_tax_unit__company_ids
+msgid "Members of this unit"
+msgstr "أعضاء هذه الوحدة "
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_report.py:0
+msgid "Method '%(method_name)s' must start with the '%(prefix)s' prefix."
+msgstr "يجب أن تبدأ الطريقة '%(method_name)s' بالبادئة '%(prefix)s'. "
+
+#. module: odex30_account_reports
+#: model:account.report.line,name:odex30_account_reports.misc_operations
+msgid "Misc. operations"
+msgstr "العمليات المتنوعة "
+
+#. module: odex30_account_reports
+#: model:ir.model.fields,field_description:odex30_account_reports.field_account_report_send__mode
+msgid "Mode"
+msgstr "الوضع"
+
+#. module: odex30_account_reports
+#: model:ir.model.fields,field_description:odex30_account_reports.field_account_report_horizontal_group_rule__res_model_name
+msgid "Model"
+msgstr "النموذج "
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/account_report/filters/filters.js:0
+msgid "Month"
+msgstr "الشهر"
+
+#. module: odex30_account_reports
+#: model_terms:ir.ui.view,arch_db:odex30_account_reports.account_report_budget_form
+msgid "Months"
+msgstr "شهور"
+
+#. module: odex30_account_reports
+#: model_terms:ir.ui.view,arch_db:odex30_account_reports.pdf_export_filters
+msgid "Multi-Ledger:"
+msgstr "دفتر الأستاذ المتعدد "
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_report.py:0
+msgid "Multi-ledger"
+msgstr "دفتر الأستاذ المتعدد "
+
+#. module: odex30_account_reports
+#: model:ir.model,name:odex30_account_reports.model_account_multicurrency_revaluation_report_handler
+msgid "Multicurrency Revaluation Report Custom Handler"
+msgstr "المعالج المخصص لتقرير إعادة التقييم متعدد العملات "
+
+#. module: odex30_account_reports
+#: model:ir.model,name:odex30_account_reports.model_account_multicurrency_revaluation_wizard
+msgid "Multicurrency Revaluation Wizard"
+msgstr "مُعالج إعادة التقييم متعدد العملات "
+
+#. module: odex30_account_reports
+#: model:ir.model.fields.selection,name:odex30_account_reports.selection__account_report_send__mode__multi
+msgid "Multiple Recipients"
+msgstr "عدة مستلمين "
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/res_company.py:0
+msgid ""
+"Multiple draft tax closing entries exist for fiscal position %(position)s "
+"after %(period_start)s. There should be at most one. \n"
+" %(closing_entries)s"
+msgstr ""
+"توجد عدة قيود إقفال الضريبة بحالة المسودة في الوضع المالي %(position)s بعد %"
+"(period_start)s. يجب أن يكون هناك واحد فقط كحد أقصى. \n"
+" %(closing_entries)s "
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/res_company.py:0
+msgid ""
+"Multiple draft tax closing entries exist for your domestic region after %"
+"(period_start)s. There should be at most one. \n"
+" %(closing_entries)s"
+msgstr ""
+"توجد عدة قيود إقفال للضريبة بحالة المسودة في منطقتك بعد%(period_start)s. يجب "
+"أن يكون هناك واحد فقط كحد أقصى. \n"
+" %(closing_entries)s "
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_general_ledger.py:0
+#: code:addons/odex30_account_reports/models/account_journal_report.py:0
+#: code:addons/odex30_account_reports/static/src/components/journal_report/line/line.xml:0
+#: model:account.report.line,name:odex30_account_reports.journal_report_line
+#: model:ir.model.fields,field_description:odex30_account_reports.field_account_report_budget__name
+#: model:ir.model.fields,field_description:odex30_account_reports.field_account_report_horizontal_group__name
+#: model:ir.model.fields,field_description:odex30_account_reports.field_account_reports_export_wizard_format__name
+#: model:ir.model.fields,field_description:odex30_account_reports.field_account_tax_unit__name
+#: model_terms:ir.ui.view,arch_db:odex30_account_reports.duplicated_vat_partner_tree_view
+#: model_terms:ir.ui.view,arch_db:odex30_account_reports.pdf_journal_report_taxes_summary
+#: model_terms:ir.ui.view,arch_db:odex30_account_reports.view_tax_unit_form
+msgid "Name"
+msgstr "الاسم"
+
+#. module: odex30_account_reports
+#: model:ir.model.fields,help:odex30_account_reports.field_account_reports_export_wizard__doc_name
+msgid "Name to give to the generated documents."
+msgstr "الاسم لمنحه للمستندات المنشأة. "
+
+#. module: odex30_account_reports
+#: model:account.report.line,name:odex30_account_reports.account_financial_report_executivesummary_profit0
+#: model:account.report.line,name:odex30_account_reports.account_financial_report_net_profit0
+msgid "Net Profit"
+msgstr "صافي الربح"
+
+#. module: odex30_account_reports
+#: model:account.report.line,name:odex30_account_reports.account_financial_report_executivesummary_net_assets0
+msgid "Net assets"
+msgstr "صافي الأصول"
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_cash_flow_report.py:0
+msgid "Net increase in cash and cash equivalents"
+msgstr "صافي الزيادة في النقد وما يعادل النقد "
+
+#. module: odex30_account_reports
+#: model:account.report.line,name:odex30_account_reports.account_financial_report_executivesummary_npmargin0
+msgid "Net profit margin (net profit / revenue)"
+msgstr "صافي هامش الربح (صافي الربح / الإيرادات) "
+
+#. module: odex30_account_reports
+#: model_terms:ir.ui.view,arch_db:odex30_account_reports.account_reports_journal_dashboard_kanban_view
+msgid "Never miss a tax deadline."
+msgstr "لا تفوت أي موعد نهائي بعد الآن. "
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_report.py:0
+#: code:addons/odex30_account_reports/static/src/components/account_report/line_cell/popover/edit_popover.xml:0
+msgid "No"
+msgstr "لا"
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/account_report/filters/filter_comparison.xml:0
+msgid "No Comparison"
+msgstr "بلا مقارنة"
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_report.py:0
+msgid "No Journal"
+msgstr "لا يوجد دفتر يومية "
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_report.py:0
+msgid "No VAT number associated with your company. Please define one."
+msgstr "لا يوجد رقم ضريبة مرتبط بشركتك. الرجاء تحديد واحد. "
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/wizard/multicurrency_revaluation.py:0
+msgid "No adjustment needed"
+msgstr "لا حاجة لإجراء أي تعديل "
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/account_report/account_report.xml:0
+msgid "No data to display !"
+msgstr "لا توجد بيانات لعرضها! "
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/chart_template.py:0
+msgid "No default miscellaneous journal could be found for the active company"
+msgstr "لم يتم العثور على دفتر يومية افتراضي للمتفرقات للشركة الفعالة "
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_deferred_reports.py:0
+msgid "No entry to generate."
+msgstr "لا يوجد قيد لإنشائه. "
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/wizard/multicurrency_revaluation.py:0
+msgid "No provision needed was found."
+msgstr "لم يتم العثور على أي أحكام مطلوبة. "
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/account_report/filters/filters.js:0
+msgid "Non Trade Partners"
+msgstr "الشركاء غير التجاريين. "
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_report.py:0
+msgid "Non Trade Payable"
+msgstr "حساب الدائنين غير التجاري "
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_report.py:0
+msgid "Non Trade Receivable"
+msgstr "حساب المدينين غير التجاري "
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_journal_report.py:0
+#: code:addons/odex30_account_reports/static/src/components/journal_report/line/line.xml:0
+#: model_terms:ir.ui.view,arch_db:odex30_account_reports.pdf_journal_report_taxes_summary
+msgid "Non-Deductible"
+msgstr "غير قابلة للاقتطاع "
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/account_report/filters/filter_horizontal_groups.xml:0
+#: code:addons/odex30_account_reports/static/src/components/account_report/filters/filters.js:0
+#: code:addons/odex30_account_reports/static/src/components/sales_report/filters/filters.js:0
+#: model_terms:ir.ui.view,arch_db:odex30_account_reports.account_report_form
+msgid "None"
+msgstr "لا شيء"
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_deferred_reports.py:0
+msgid "Not Started"
+msgstr "لم يبدأ بعد "
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/account_report/filters/filters.js:0
+msgid "Number of periods cannot be smaller than 1"
+msgstr "لا يمكن أن يكون عدد الفترات أقل من 1 "
+
+#. module: odex30_account_reports
+#: model:account.report.line,name:odex30_account_reports.account_financial_report_off_sheet
+msgid "OFF BALANCE SHEET ACCOUNTS"
+msgstr "الحسابات خارج الميزانية العمومية "
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/account_report/filters/filters.js:0
+#: code:addons/odex30_account_reports/static/src/components/aged_partner_balance/filters.js:0
+msgid "Odoo Warning"
+msgstr "تحذير من أودو"
+
+#. module: odex30_account_reports
+#: model:account.report.column,name:odex30_account_reports.aged_payable_report_period5
+#: model:account.report.column,name:odex30_account_reports.aged_receivable_report_period5
+msgid "Older"
+msgstr "أقدم"
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/wizard/report_export_wizard.py:0
+msgid "One of the formats chosen can not be exported in the DMS"
+msgstr "إحدى الصيغ التي اخترتها لا يمكن تصديرها في برنامج إدارة المستندات "
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_move.py:0
+msgid "Only Billing Administrators are allowed to change lock dates!"
+msgstr "مديرو الفوترة وحدهم المصرح لهم بتغيير تواريخ الإقفال! "
+
+#. module: odex30_account_reports
+#: model:ir.actions.server,name:odex30_account_reports.action_account_reports_customer_statements
+msgid "Open Customer Statements"
+msgstr "فتح كشوفات العملاء "
+
+#. module: odex30_account_reports
+#: model:ir.model,name:odex30_account_reports.model_account_financial_year_op
+msgid "Opening Balance of Financial Year"
+msgstr "الرصيد الافتتاحي للسنة المالية "
+
+#. module: odex30_account_reports
+#: model:account.report.line,name:odex30_account_reports.account_financial_report_operating_income0
+msgid "Operating Income (or Loss)"
+msgstr "الدخل التشغيلي (أو الخسائر التشغيلية) "
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_report.py:0
+#: code:addons/odex30_account_reports/static/src/components/account_report/filters/filter_extra_options.xml:0
+#: model_terms:ir.ui.view,arch_db:odex30_account_reports.account_report_expression_form
+#: model_terms:ir.ui.view,arch_db:odex30_account_reports.account_report_form
+msgid "Options"
+msgstr "الخيارات"
+
+#. module: odex30_account_reports
+#: model_terms:ir.ui.view,arch_db:odex30_account_reports.pdf_export_filter_extra_options_template
+msgid "Options:"
+msgstr "الخيارات: "
+
+#. module: odex30_account_reports
+#: model:account.report.line,name:odex30_account_reports.outstanding
+msgid "Outstanding Receipts/Payments"
+msgstr "المدفوعات/الإيصالات المستحقة "
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_followup_report.py:0
+msgid "Overdue"
+msgstr "متأخر"
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_report.py:0
+msgid "PDF"
+msgstr "PDF"
+
+#. module: odex30_account_reports
+#: model:ir.model.fields,field_description:odex30_account_reports.field_account_reports_export_wizard__report_id
+msgid "Parent Report Id"
+msgstr "معرف التقرير الأساسي "
+
+#. module: odex30_account_reports
+#: model:ir.model.fields,field_description:odex30_account_reports.field_account_reports_export_wizard_format__export_wizard_id
+msgid "Parent Wizard"
+msgstr "المعالج الأساسي "
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/aged_partner_balance/line_name/line_name.xml:0
+#: code:addons/odex30_account_reports/static/src/components/partner_ledger/line_name.xml:0
+#: model:account.report.column,name:odex30_account_reports.general_ledger_report_partner_name
+#: model:ir.model.fields,field_description:odex30_account_reports.field_account_report_send__partner_ids
+msgid "Partner"
+msgstr "الشريك"
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_report.py:0
+msgid "Partner Categories"
+msgstr "فئات الشركاء "
+
+#. module: odex30_account_reports
+#: model:account.report,name:odex30_account_reports.partner_ledger_report
+#: model:ir.actions.client,name:odex30_account_reports.action_account_report_partner_ledger
+#: model:ir.ui.menu,name:odex30_account_reports.menu_action_account_report_partner_ledger
+msgid "Partner Ledger"
+msgstr "دفتر الأستاذ العام للشركاء"
+
+#. module: odex30_account_reports
+#: model:ir.model,name:odex30_account_reports.model_account_partner_ledger_report_handler
+msgid "Partner Ledger Custom Handler"
+msgstr "المعالج المخصص لدفتر الأستاذ العام الخاص بالشريك "
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/aged_partner_balance/line_name/line_name.xml:0
+#: code:addons/odex30_account_reports/static/src/components/partner_ledger/line_name.xml:0
+msgid "Partner is bad"
+msgstr "الشريك سيء "
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/aged_partner_balance/line_name/line_name.xml:0
+#: code:addons/odex30_account_reports/static/src/components/partner_ledger/line_name.xml:0
+msgid "Partner is good"
+msgstr "الشريك جيد "
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/wizard/account_report_send.py:0
+msgid "Partner(s) should have an email address."
+msgstr "يجب أن يكون للوكلاء عنوان بريد إلكتروني. "
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_report.py:0
+#: code:addons/odex30_account_reports/static/src/components/account_report/filters/filter_partner.xml:0
+msgid "Partners"
+msgstr "الشركاء"
+
+#. module: odex30_account_reports
+#: model_terms:ir.ui.view,arch_db:odex30_account_reports.pdf_export_filters
+msgid "Partners Categories:"
+msgstr "فئات الشركاء: "
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_sales_report.py:0
+msgid "Partners with duplicated VAT numbers"
+msgstr "الشركاء الذين يملكون أرقام ضريبية مكررة "
+
+#. module: odex30_account_reports
+#: model_terms:ir.ui.view,arch_db:odex30_account_reports.pdf_export_filters
+msgid "Partners:"
+msgstr "الشركاء:"
+
+#. module: odex30_account_reports
+#: model:mail.activity.type,name:odex30_account_reports.mail_activity_type_tax_report_to_pay
+msgid "Pay Tax"
+msgstr "دفع الضريبة "
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_move.py:0
+msgid "Pay tax: %s"
+msgstr "دفع الضريبة: %s "
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_aged_partner_balance.py:0
+#: code:addons/odex30_account_reports/models/account_report.py:0
+msgid "Payable"
+msgstr "الدائن"
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_generic_tax_report.py:0
+msgid "Payable tax amount"
+msgstr "مبلغ الضريبة الدائن "
+
+#. module: odex30_account_reports
+#: model:account.report.line,name:odex30_account_reports.account_financial_report_current_liabilities_payable
+#: model:account.report.line,name:odex30_account_reports.account_financial_report_executivesummary_creditors0
+msgid "Payables"
+msgstr "الدائنون"
+
+#. module: odex30_account_reports
+#: model:account.report.line,name:odex30_account_reports.account_financial_report_executivesummary_performance0
+msgid "Performance"
+msgstr "الأداء"
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/account_report/filters/filters.js:0
+msgid "Period"
+msgstr "الفترة"
+
+#. module: odex30_account_reports
+#: model:account.report.column,name:odex30_account_reports.aged_payable_report_period1
+#: model:account.report.column,name:odex30_account_reports.aged_receivable_report_period1
+msgid "Period 1"
+msgstr "الفترة 1 "
+
+#. module: odex30_account_reports
+#: model:account.report.column,name:odex30_account_reports.aged_payable_report_period2
+#: model:account.report.column,name:odex30_account_reports.aged_receivable_report_period2
+msgid "Period 2"
+msgstr "الفترة 2 "
+
+#. module: odex30_account_reports
+#: model:account.report.column,name:odex30_account_reports.aged_payable_report_period3
+#: model:account.report.column,name:odex30_account_reports.aged_receivable_report_period3
+msgid "Period 3"
+msgstr "الفترة 3 "
+
+#. module: odex30_account_reports
+#: model:account.report.column,name:odex30_account_reports.aged_payable_report_period4
+#: model:account.report.column,name:odex30_account_reports.aged_receivable_report_period4
+msgid "Period 4"
+msgstr "الفترة 4 "
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/account_report/filters/filter_comparison.xml:0
+msgid "Period order"
+msgstr "طلب المدة "
+
+#. module: odex30_account_reports
+#: model:ir.model.fields,field_description:odex30_account_reports.field_res_config_settings__account_tax_periodicity
+#: model:ir.model.fields,help:odex30_account_reports.field_account_financial_year_op__account_tax_periodicity
+#: model:ir.model.fields,help:odex30_account_reports.field_res_company__account_tax_periodicity
+#: model:ir.model.fields,help:odex30_account_reports.field_res_config_settings__account_tax_periodicity
+#: model_terms:ir.ui.view,arch_db:odex30_account_reports.res_config_settings_view_form
+msgid "Periodicity"
+msgstr "الوتيرة "
+
+#. module: odex30_account_reports
+#: model:ir.model.fields,field_description:odex30_account_reports.field_account_financial_year_op__account_tax_periodicity
+msgid "Periodicity in month"
+msgstr "الوتيرة في الشهر "
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/account_report/filters/filters.js:0
+msgid "Periods"
+msgstr "الفترات "
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/account_report/filters/filter_analytic_groupby.xml:0
+msgid "Plans"
+msgstr "الخطط "
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#. odoo-python
+#: code:addons/odex30_account_reports/models/budget.py:0
+#: code:addons/odex30_account_reports/static/src/components/account_report/filters/filters.js:0
+msgid "Please enter a valid budget name."
+msgstr "يُرجى إدخال اسم ميزانية صالح. "
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/multicurrency_revaluation_report/filters/filters.js:0
+msgid "Please enter a valid number."
+msgstr "يُرجى إدخال رقم صالح. "
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/wizard/account_report_send.py:0
+msgid "Please select a mail template to send multiple statements."
+msgstr "يرجى تحديد قالب بريد لإرسال عدة كشوفات. "
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_report.py:0
+msgid ""
+"Please select the main company and its branches in the company selector to "
+"proceed."
+msgstr "يرجى تحديد الشركة الرئيسية وفروعها في أداة اختيار الشركة للمتابعة. "
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_deferred_reports.py:0
+msgid "Please set the deferred accounts in the accounting settings."
+msgstr "يرجى تعيين الحسابات المؤجلة في إعدادات المحاسبة. "
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_deferred_reports.py:0
+msgid "Please set the deferred journal in the accounting settings."
+msgstr "يرجى إعداد دفتر اليومية المؤجل في إعدادات المحاسبة. "
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_generic_tax_report.py:0
+msgid "Please specify the accounts necessary for the Tax Closing Entry."
+msgstr "يرجى تحديد الحسابات الضرورية للقيد الختامي للضريبة. "
+
+#. module: odex30_account_reports
+#: model:account.report.line,name:odex30_account_reports.account_financial_report_fixed_assets_view0
+msgid "Plus Fixed Assets"
+msgstr "بالإضافة الى الأصول الثابتة"
+
+#. module: odex30_account_reports
+#: model:account.report.line,name:odex30_account_reports.account_financial_report_non_current_assets_view0
+msgid "Plus Non-current Assets"
+msgstr "بالإضافة للأصول غير المتداولة"
+
+#. module: odex30_account_reports
+#: model:account.report.line,name:odex30_account_reports.account_financial_report_non_current_liabilities0
+msgid "Plus Non-current Liabilities"
+msgstr "بالإضافة للالتزامات غير الجارية "
+
+#. module: odex30_account_reports
+#: model:account.report.line,name:odex30_account_reports.account_financial_report_other_income0
+msgid "Plus Other Income"
+msgstr "بالإضافة إلى دخل آخر "
+
+#. module: odex30_account_reports
+#: model:account.report.line,name:odex30_account_reports.account_financial_report_executivesummary_position0
+msgid "Position"
+msgstr "المنصب الوظيفي "
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/account_report/line_cell/popover/edit_popover.xml:0
+msgid "Post"
+msgstr "منشور "
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/account_report/filters/filters.js:0
+msgid "Posted Entries"
+msgstr "القيود المُرحّلة "
+
+#. module: odex30_account_reports
+#: model:account.report.line,name:odex30_account_reports.account_financial_report_prepayements0
+msgid "Prepayments"
+msgstr "المدفوعات المسددة مقدمًا "
+
+#. module: odex30_account_reports
+#: model:ir.model.fields,field_description:odex30_account_reports.field_account_multicurrency_revaluation_wizard__preview_data
+msgid "Preview Data"
+msgstr "معاينة البيانات "
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/account_report/filters/filter_comparison.xml:0
+msgid "Previous Period"
+msgstr "الفترة السابقة"
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/account_report/filters/filter_comparison.xml:0
+msgid "Previous Periods"
+msgstr "الفترات السابقة "
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/account_report/filters/filter_comparison.xml:0
+msgid "Previous Year"
+msgstr "العام الماضي"
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/account_report/filters/filter_comparison.xml:0
+msgid "Previous Years"
+msgstr "السنوات الماضية "
+
+#. module: odex30_account_reports
+#: model:account.report.line,name:odex30_account_reports.account_financial_retained_earnings_line_2
+msgid "Previous Years Retained Earnings"
+msgstr "الأرباح المحتجزة للسنة الماضية "
+
+#. module: odex30_account_reports
+#: model:account.report.line,name:odex30_account_reports.account_financial_previous_year_earnings0
+msgid "Previous Years Unallocated Earnings"
+msgstr "أرباح السنين الماضية غير المخصصة"
+
+#. module: odex30_account_reports
+#: model_terms:ir.ui.view,arch_db:odex30_account_reports.account_report_send_form
+msgid "Print & Send"
+msgstr "طباعة وإرسال "
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_generic_tax_report.py:0
+msgid "Proceed"
+msgstr "استمرار "
+
+#. module: odex30_account_reports
+#: model_terms:ir.ui.view,arch_db:odex30_account_reports.view_account_multicurrency_revaluation_wizard
+msgid ""
+"Proceed with caution as there might be an existing adjustment for this "
+"period ("
+msgstr "الاستمرار بحذر لأنه قد تكون هناك تعديلات لهذه الفترة ("
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_deferred_reports.py:0
+#: code:addons/odex30_account_reports/static/src/components/deferred_reports/groupby.xml:0
+msgid "Product"
+msgstr "المنتج "
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/deferred_reports/groupby.xml:0
+msgid "Product Category"
+msgstr "فئة المنتج "
+
+#. module: odex30_account_reports
+#: model:account.report,name:odex30_account_reports.profit_and_loss
+#: model:ir.actions.client,name:odex30_account_reports.action_account_report_pl
+#: model:ir.ui.menu,name:odex30_account_reports.menu_action_account_report_profit_and_loss
+msgid "Profit and Loss"
+msgstr "الربح والخسارة "
+
+#. module: odex30_account_reports
+#: model:account.report.line,name:odex30_account_reports.account_financial_report_executivesummary_profitability0
+msgid "Profitability"
+msgstr "الربحية "
+
+#. module: odex30_account_reports
+#: model_terms:ir.ui.view,arch_db:odex30_account_reports.view_move_form_vat_return
+msgid "Proposition of tax closing journal entry."
+msgstr "مقترح قيد يومية إقفال الضريبة. "
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/wizard/multicurrency_revaluation.py:0
+msgid "Provision for %(for_cur)s (1 %(comp_cur)s = %(rate)s %(for_cur)s)"
+msgstr "الحكل لـ %(for_cur)s (1 %(comp_cur)s = %(rate)s %(for_cur)s) "
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/account_report/filters/filters.js:0
+msgid "Quarter"
+msgstr "ربع السنة"
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/multicurrency_revaluation_report/line_name.xml:0
+msgid "Rates"
+msgstr "الأسعار"
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_aged_partner_balance.py:0
+#: code:addons/odex30_account_reports/models/account_report.py:0
+msgid "Receivable"
+msgstr "المدين"
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_generic_tax_report.py:0
+msgid "Receivable tax amount"
+msgstr "مبلغ الضريبة المدين "
+
+#. module: odex30_account_reports
+#: model:account.report.line,name:odex30_account_reports.account_financial_report_executivesummary_debtors0
+#: model:account.report.line,name:odex30_account_reports.account_financial_report_receivable0
+msgid "Receivables"
+msgstr "المدينين"
+
+#. module: odex30_account_reports
+#: model:ir.model.fields,field_description:odex30_account_reports.field_account_report_send__mail_partner_ids
+#: model_terms:ir.ui.view,arch_db:odex30_account_reports.account_report_send_form
+msgid "Recipients"
+msgstr "المستلمين"
+
+#. module: odex30_account_reports
+#: model_terms:ir.ui.view,arch_db:odex30_account_reports.account_reports_journal_dashboard_kanban_view
+msgid "Reconciliation Report"
+msgstr "تقرير التسوية "
+
+#. module: odex30_account_reports
+#: model:ir.model.fields,field_description:odex30_account_reports.field_account_financial_year_op__account_tax_periodicity_reminder_day
+#: model:ir.model.fields,field_description:odex30_account_reports.field_res_config_settings__account_tax_periodicity_reminder_day
+#: model_terms:ir.ui.view,arch_db:odex30_account_reports.res_config_settings_view_form
+#: model_terms:ir.ui.view,arch_db:odex30_account_reports.setup_financial_year_opening_form
+msgid "Reminder"
+msgstr "تذكير"
+
+#. module: odex30_account_reports
+#: model:ir.model.fields,field_description:odex30_account_reports.field_account_report_annotation__report_id
+#: model:ir.model.fields,field_description:odex30_account_reports.field_account_report_send__account_report_id
+msgid "Report"
+msgstr "التقرير"
+
+#. module: odex30_account_reports
+#: model_terms:ir.ui.view,arch_db:odex30_account_reports.account_report_line_form
+msgid "Report Line"
+msgstr "بند التقرير"
+
+#. module: odex30_account_reports
+#: model_terms:ir.ui.view,arch_db:odex30_account_reports.account_report_form
+msgid "Report Name"
+msgstr "اسم التقرير"
+
+#. module: odex30_account_reports
+#: model:ir.model.fields,field_description:odex30_account_reports.field_account_report_send__report_options
+msgid "Report Options"
+msgstr "خيارات التقرير"
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_report.py:0
+msgid "Report lines mentioning the account code"
+msgstr "بنود التقرير التي تحتوي على كود الحساب "
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/account_report/filters/filter_variant.xml:0
+msgid "Report:"
+msgstr "التقرير:"
+
+#. module: odex30_account_reports
+#: model_terms:ir.ui.view,arch_db:odex30_account_reports.res_config_settings_view_form
+msgid "Reporting"
+msgstr "إعداد التقارير "
+
+#. module: odex30_account_reports
+#: model:ir.model.fields,field_description:odex30_account_reports.field_account_report_horizontal_group__report_ids
+msgid "Reports"
+msgstr "التقارير"
+
+#. module: odex30_account_reports
+#: model_terms:ir.ui.view,arch_db:odex30_account_reports.account_report_line_form
+msgid "Reset to Standard"
+msgstr "إعادة التعيين إلى الوضع القياسي "
+
+#. module: odex30_account_reports
+#: model:account.report.line,name:odex30_account_reports.account_financial_retained_earnings0
+msgid "Retained Earnings"
+msgstr "الأرباح المحتجزة"
+
+#. module: odex30_account_reports
+#: model:account.report.line,name:odex30_account_reports.account_financial_report_executivesummary_return_investment0
+msgid "Return on investments (net profit / assets)"
+msgstr "العائد على الاستثمار (صافي الربح / الأصول)"
+
+#. module: odex30_account_reports
+#: model:account.report.line,name:odex30_account_reports.account_financial_report_executivesummary_income0
+#: model:account.report.line,name:odex30_account_reports.account_financial_report_revenue0
+msgid "Revenue"
+msgstr "الإيرادات "
+
+#. module: odex30_account_reports
+#: model:ir.model.fields,field_description:odex30_account_reports.field_account_multicurrency_revaluation_wizard__reversal_date
+msgid "Reversal Date"
+msgstr "تاريخ الانعكاس"
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_deferred_reports.py:0
+msgid "Reversal of Grouped Deferral Entry of %s"
+msgstr "عكس القيد المؤجل المجمع لـ %s "
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/wizard/multicurrency_revaluation.py:0
+msgid "Reversal of: %s"
+msgstr "عكس: %s"
+
+#. module: odex30_account_reports
+#: model_terms:ir.ui.view,arch_db:odex30_account_reports.view_account_report_search
+msgid "Root Report"
+msgstr "تقرير الجذر "
+
+#. module: odex30_account_reports
+#: model:ir.model.fields,field_description:odex30_account_reports.field_account_report_horizontal_group__rule_ids
+msgid "Rules"
+msgstr "القواعد"
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/account_report/filters/filter_comparison.xml:0
+msgid "Same Period Last Year"
+msgstr "نفس الفترة العام الماضي"
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/account_report/search_bar/search_bar.xml:0
+msgid "Search..."
+msgstr "بحث..."
+
+#. module: odex30_account_reports
+#: model_terms:ir.ui.view,arch_db:odex30_account_reports.account_report_form
+msgid "Sections"
+msgstr "الأقسام "
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_customer_statement.py:0
+#: code:addons/odex30_account_reports/models/account_partner_ledger.py:0
+msgid "Send"
+msgstr "إرسال"
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_partner_ledger.py:0
+msgid "Send %s Statement"
+msgstr "إرسال كشف حساب %s "
+
+#. module: odex30_account_reports
+#: model:ir.model.fields,field_description:odex30_account_reports.field_account_report__send_and_print_values
+msgid "Send And Print Values"
+msgstr "إرسال وطباعة القيم "
+
+#. module: odex30_account_reports
+#: model:ir.model.fields,field_description:odex30_account_reports.field_account_report_send__send_mail_readonly
+msgid "Send Mail Readonly"
+msgstr "إرسال بريد إلكتروني للقراءة فقط "
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_partner_ledger.py:0
+msgid "Send Partner Ledgers"
+msgstr "إرسال دفاتر الأستاذ العام للشركاء "
+
+#. module: odex30_account_reports
+#: model:ir.actions.server,name:odex30_account_reports.ir_cron_account_report_send_ir_actions_server
+msgid "Send account reports automatically"
+msgstr "إرسال تقارير الحسابات تلقائياً "
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_move.py:0
+msgid "Send tax report: %s"
+msgstr "إرسال التقرير الضريبي: %s "
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/wizard/account_report_send.py:0
+msgid "Sending statements"
+msgstr "جاري إرسال كشوفات الحساب "
+
+#. module: odex30_account_reports
+#: model:ir.model.fields,field_description:odex30_account_reports.field_account_report_budget__sequence
+msgid "Sequence"
+msgstr "تسلسل "
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_sales_report.py:0
+msgid "Services"
+msgstr "الخدمات"
+
+#. module: odex30_account_reports
+#: model_terms:ir.ui.view,arch_db:odex30_account_reports.view_journal_report_audit_move_line_tree
+msgid "Set as Checked"
+msgstr "التعيين كتمّ التحقق منه "
+
+#. module: odex30_account_reports
+#: model_terms:ir.ui.view,arch_db:odex30_account_reports.duplicated_vat_partner_tree_view
+msgid "Set as main"
+msgstr "تعيين كالرئيسي "
+
+#. module: odex30_account_reports
+#: model:account.report.line,name:odex30_account_reports.account_financial_report_executivesummary_st_cash_forecast0
+msgid "Short term cash forecast"
+msgstr "توقعات النقد قصيرة الأجل"
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/aged_partner_balance/filter_extra_options.xml:0
+msgid "Show Account"
+msgstr "إظهار الحساب "
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/account_report/filters/filter_budgets.xml:0
+msgid "Show All Accounts"
+msgstr "إظهار كافة الحسابات "
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/aged_partner_balance/filter_extra_options.xml:0
+msgid "Show Currency"
+msgstr "إظهار العملة "
+
+#. module: odex30_account_reports
+#: model:ir.model.fields,field_description:odex30_account_reports.field_account_multicurrency_revaluation_wizard__show_warning_move_id
+msgid "Show Warning Move"
+msgstr "إظهار حركة تحذير "
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/deferred_reports/warnings.xml:0
+msgid "Show already generated deferrals."
+msgstr "إظهار التأجيلات التي تم إنشاؤها بالفعل. "
+
+#. module: odex30_account_reports
+#: model:ir.model.fields.selection,name:odex30_account_reports.selection__account_report_send__mode__single
+msgid "Single Recipient"
+msgstr "مستلم واحد "
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/bank_reconciliation_report/warnings.xml:0
+msgid "Some"
+msgstr "بعض "
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/tax_report/warnings.xml:0
+msgid "Some journal items appear to point to obsolete report lines."
+msgstr "يبدو أن بعض عناصر دفتر اليومية تشير إلى بنود تقرير قديمة. "
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/sales_report/warnings.xml:0
+msgid ""
+"Some lines in the report involve partners that share the same VAT number.\n"
+"\n"
+"        Please review the"
+msgstr ""
+"تتضمن بعض بنود التقرير شركاء لهم نفس رقم ضريبة القيمة المضافة.\n"
+"\n"
+"        يُرجى مراجعة "
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/account_report/filters/filter_comparison.xml:0
+#: code:addons/odex30_account_reports/static/src/components/account_report/filters/filter_date.xml:0
+msgid "Specific Date"
+msgstr "تاريخ محدد"
+
+#. module: odex30_account_reports
+#: model:ir.model.fields,help:odex30_account_reports.field_res_company__account_representative_id
+msgid ""
+"Specify an Accounting Firm that will act as a representative when exporting "
+"reports."
+msgstr ""
+"قم بتحديد منشأة محاسبية التي سوف تؤدي دور الوكيل أو الممثل عند تصدير "
+"التقارير.  "
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/account_report/filters/filter_extra_options.xml:0
+msgid "Split Horizontally"
+msgstr "التقسيم أفقياَ "
+
+#. module: odex30_account_reports
+#: model:ir.model.fields,field_description:odex30_account_reports.field_account_report__tax_closing_start_date
+msgid "Start Date"
+msgstr "تاريخ البدء "
+
+#. module: odex30_account_reports
+#: model:ir.model.fields,field_description:odex30_account_reports.field_res_company__account_tax_periodicity_reminder_day
+msgid "Start from"
+msgstr "البدء من "
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_journal_report.py:0
+msgid "Starting Balance"
+msgstr "الرصيد الافتتاحي"
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/aged_partner_balance/line_name/line_name.xml:0
+msgid "Statement"
+msgstr "كشف الحساب"
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/wizard/account_report_send.py:0
+msgid "Statements are being sent in the background."
+msgstr "يتم إرسال كشوف الحسابات في الخلفية. "
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/account_report/line/popover/debug_popover.xml:0
+msgid "Subformula"
+msgstr "صيغة فرعية "
+
+#. module: odex30_account_reports
+#: model:ir.model.fields,field_description:odex30_account_reports.field_account_report_send__mail_subject
+msgid "Subject"
+msgstr "الموضوع "
+
+#. module: odex30_account_reports
+#: model_terms:ir.ui.view,arch_db:odex30_account_reports.account_report_send_form
+msgid "Subject..."
+msgstr "الموضوع..."
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_journal_report.py:0
+msgid "T: %s"
+msgstr "T: %s"
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/account_report/filters/filter_partner.xml:0
+msgid "Tags"
+msgstr "علامات التصنيف "
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_general_ledger.py:0
+#: code:addons/odex30_account_reports/models/account_journal_report.py:0
+#: code:addons/odex30_account_reports/static/src/components/journal_report/line/line.xml:0
+#: model_terms:ir.ui.view,arch_db:odex30_account_reports.pdf_journal_report_taxes_summary
+msgid "Tax Amount"
+msgstr "مبلغ الضريبة "
+
+#. module: odex30_account_reports
+#: model_terms:ir.ui.view,arch_db:odex30_account_reports.pdf_journal_report_taxes_summary
+msgid "Tax Applied"
+msgstr "تم تطبيق الضريبة "
+
+#. module: odex30_account_reports
+#: model:ir.model.fields,field_description:odex30_account_reports.field_account_bank_statement_line__tax_closing_alert
+#: model:ir.model.fields,field_description:odex30_account_reports.field_account_move__tax_closing_alert
+msgid "Tax Closing Alert"
+msgstr "تنبيه الإقفال الضريبي "
+
+#. module: odex30_account_reports
+#: model:ir.model.fields,field_description:odex30_account_reports.field_account_bank_statement_line__tax_closing_report_id
+#: model:ir.model.fields,field_description:odex30_account_reports.field_account_move__tax_closing_report_id
+msgid "Tax Closing Report"
+msgstr "تقرير الإقفال الضريبي "
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_general_ledger.py:0
+msgid "Tax Declaration"
+msgstr "الإقرار الضريبي "
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_journal_report.py:0
+msgid "Tax Grids"
+msgstr "شبكات الضرائب"
+
+#. module: odex30_account_reports
+#: model:ir.model.fields,field_description:odex30_account_reports.field_account_tax_unit__vat
+msgid "Tax ID"
+msgstr "معرف الضريبة"
+
+#. module: odex30_account_reports
+#: model_terms:ir.ui.view,arch_db:odex30_account_reports.company_information
+#: model_terms:ir.ui.view,arch_db:odex30_account_reports.tax_information_customer_report
+msgid "Tax ID:"
+msgstr "معرف الضريبة: "
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_generic_tax_report.py:0
+msgid "Tax Paid Adjustment"
+msgstr "تعديل الضريبة المدفوعة "
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/tax_report/filters/filter_date.xml:0
+msgid "Tax Period"
+msgstr "الفترة الضريبية "
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_generic_tax_report.py:0
+msgid "Tax Received Adjustment"
+msgstr "تعديل الضريبة المتلقاة "
+
+#. module: odex30_account_reports
+#: model:mail.activity.type,name:odex30_account_reports.tax_closing_activity_type
+#: model:mail.activity.type,summary:odex30_account_reports.tax_closing_activity_type
+#: model_terms:ir.ui.view,arch_db:odex30_account_reports.view_move_form_vat_return
+msgid "Tax Report"
+msgstr "التقرير الضريبي "
+
+#. module: odex30_account_reports
+#: model:mail.activity.type,name:odex30_account_reports.mail_activity_type_tax_report_error
+msgid "Tax Report - Error"
+msgstr ""
+
+#. module: odex30_account_reports
+#: model:mail.activity.type,name:odex30_account_reports.mail_activity_type_tax_report_to_be_sent
+msgid "Tax Report Ready"
+msgstr "التقرير الضريبي جاهز "
+
+#. module: odex30_account_reports
+#: model:ir.actions.client,name:odex30_account_reports.action_account_report_gt
+#: model:ir.ui.menu,name:odex30_account_reports.menu_action_account_report_gt
+msgid "Tax Return"
+msgstr "الإقرار الضريبي "
+
+#. module: odex30_account_reports
+#: model_terms:ir.ui.view,arch_db:odex30_account_reports.res_config_settings_view_form
+msgid "Tax Return Periodicity"
+msgstr "مدى دورية الإقرار الضريبي "
+
+#. module: odex30_account_reports
+#: model:ir.model,name:odex30_account_reports.model_account_tax_unit
+#: model_terms:ir.ui.view,arch_db:odex30_account_reports.view_tax_unit_form
+msgid "Tax Unit"
+msgstr "الوحدة الضريبية "
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/account_report/filters/filter_tax_unit.xml:0
+msgid "Tax Unit:"
+msgstr "وحدة الضريبة: "
+
+#. module: odex30_account_reports
+#: model:ir.actions.act_window,name:odex30_account_reports.action_view_tax_units
+#: model:ir.model.fields,field_description:odex30_account_reports.field_res_company__account_tax_unit_ids
+#: model:ir.ui.menu,name:odex30_account_reports.menu_view_tax_units
+msgid "Tax Units"
+msgstr "الوحدات الضريبية "
+
+#. module: odex30_account_reports
+#: model:ir.model.fields,field_description:odex30_account_reports.field_mail_activity__account_tax_closing_params
+msgid "Tax closing additional params"
+msgstr "المعايير الإضافية للإقفال الضريبي "
+
+#. module: odex30_account_reports
+#: model:mail.activity.type,summary:odex30_account_reports.mail_activity_type_tax_report_to_pay
+msgid "Tax is ready to be paid"
+msgstr "الضريبة جاهزة ليتم دفعها "
+
+#. module: odex30_account_reports
+#: model:ir.model.fields.selection,name:odex30_account_reports.selection__mail_activity_type__category__tax_report
+msgid "Tax report"
+msgstr "التقرير الضريبي "
+
+#. module: odex30_account_reports
+#: model:mail.activity.type,summary:odex30_account_reports.mail_activity_type_tax_report_to_be_sent
+msgid "Tax report is ready to be sent to the administration"
+msgstr "التقرير الضريبي جاهز لإرساله إلى الإدارة "
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/res_company.py:0
+msgid "Tax return"
+msgstr "الإقرار الضريبي "
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_journal_report.py:0
+msgid "Taxes"
+msgstr "الضرائب"
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_journal_report.py:0
+#: code:addons/odex30_account_reports/static/src/components/journal_report/line/line.xml:0
+msgid "Taxes Applied"
+msgstr "تم تطبيق الضرائب"
+
+#. module: odex30_account_reports
+#: model:ir.model.fields,help:odex30_account_reports.field_account_tax_unit__fpos_synced
+msgid ""
+"Technical field indicating whether Fiscal Positions exist for all companies "
+"in the unit"
+msgstr ""
+"حقل تقني يشير إلى ما إذا كانت الأوضاع المالية موجودة لكافة الشركات في الوحدة "
+"أم لا "
+
+#. module: odex30_account_reports
+#: model:ir.model,name:odex30_account_reports.model_ir_actions_account_report_download
+msgid "Technical model for accounting report downloads"
+msgstr "نموذج تقني لتنزيلات التقارير المحاسبية "
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/account_report/ellipsis/ellipsis.js:0
+msgid "Text copied"
+msgstr "تم نسخ النص "
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_report.py:0
+msgid "The Accounts Coverage Report is not available for this report."
+msgstr "تقرير تغطية الحسابات غير متاح لهذا التقرير. "
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/account_report/line_name/popover_line/annotation_popover_line.js:0
+msgid "The annotation shouldn't have an empty value."
+msgstr "يجب ألا يحتوي الشرح على قيمة فارغة. "
+
+#. module: odex30_account_reports
+#: model:ir.model.fields,field_description:odex30_account_reports.field_account_report_annotation__text
+msgid "The annotation's content."
+msgstr "محتوى الشرح. "
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_move.py:0
+msgid ""
+"The attachments of the tax report can be found on the %(link_start)sclosing "
+"entry%(link_end)s of the representative company."
+msgstr ""
+"يمكن العثور على مرفقات التقرير الضريبي في %(link_start)sقيد الإقفال%"
+"(link_end)s للشركة الممثلة. "
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_partner_ledger.py:0
+msgid "The column '%s' is not available for this report."
+msgstr "العمود '%s' غير متاح لهذا التقرير. "
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_tax.py:0
+msgid ""
+"The country detected for this VAT number does not match the one set on this "
+"Tax Unit."
+msgstr ""
+"لا تطابق الدولة التي تم رصدها لرقم الضريبة الدولة التي تم تعيينها لهذا الوضع "
+"الضريبي. "
+
+#. module: odex30_account_reports
+#: model:ir.model.fields,help:odex30_account_reports.field_account_tax_unit__country_id
+msgid ""
+"The country in which this tax unit is used to group your companies' tax "
+"reports declaration."
+msgstr ""
+"الدولة التي تُستخدَم فيها هذه الوحدة الضريبية لتجميع إقرارات التقارير الضريبية "
+"لشركتك. "
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_multicurrency_revaluation_report.py:0
+msgid "The currency rate cannot be equal to zero"
+msgstr "لا يمكن أن يكون سعر صرف العملة مساوياً لصفر "
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/bank_reconciliation_report/warnings.xml:0
+msgid "The current balance in the"
+msgstr "الرصيد الحالي في "
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_generic_tax_report.py:0
+msgid ""
+"The currently selected dates don't match a tax period. The closing entry "
+"will be created for the closest-matching period according to your "
+"periodicity setup."
+msgstr ""
+"لا تتطابق التواريخ المحددة حالياً مع إحدى الفترات الضريبية. سيتم إنشاء القيد "
+"الختامي لأقرب فترة مطابقة وفقاً لإعدادات معدل التكرار والدورية الخاصة بك. "
+
+#. module: odex30_account_reports
+#: model:ir.model.fields,help:odex30_account_reports.field_account_report_annotation__fiscal_position_id
+msgid "The fiscal position used while annotating."
+msgstr "الوضع المالي المُستَخدَم عند الشرح. "
+
+#. module: odex30_account_reports
+#: model:ir.model.fields,help:odex30_account_reports.field_account_report_annotation__line_id
+msgid "The id of the annotated line."
+msgstr "معرِّف البند الذي تم شرحه. "
+
+#. module: odex30_account_reports
+#: model:ir.model.fields,help:odex30_account_reports.field_account_report_annotation__report_id
+msgid "The id of the annotated report."
+msgstr "معرِّف التقرير الذي تم شرحه. "
+
+#. module: odex30_account_reports
+#: model:ir.model.fields,help:odex30_account_reports.field_account_tax_unit__vat
+msgid "The identifier to be used when submitting a report for this unit."
+msgstr "المعرف لاستخدامه عند تسليم تقرير لهذه الوحدة. "
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_tax.py:0
+msgid "The main company of a tax unit has to be part of it."
+msgstr "يجب أن تكون الشركة الرئيسية لوحدة ضريبية جزءاً منها. "
+
+#. module: odex30_account_reports
+#: model:ir.model.fields,help:odex30_account_reports.field_res_company__account_tax_unit_ids
+msgid "The tax units this company belongs to."
+msgstr "الوحدة الضريبية التي تنتمي إليها هذه الشركة. "
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_report.py:0
+msgid "The used operator is not supported for this expression."
+msgstr "المشغل المستخدَم غير مدعوم لهذا التعبير. "
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/account_report/warnings.xml:0
+msgid "There are"
+msgstr "هناك "
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/wizard/account_report_send.py:0
+msgid "There are currently reports waiting to be sent, please try again later."
+msgstr "هناك تقارير بانتظار إرسالها حالياً. يُرجى إعادة المحاولة لاحقاً. "
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/account_report/account_report.xml:0
+msgid "There is no data to display for the given filters."
+msgstr "لا توجد بيانات لعرضها لعناصر التصفية المحددة. "
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_report.py:0
+msgid ""
+"This account exists in the Chart of Accounts but is not mentioned in any "
+"line of the report"
+msgstr ""
+"الحساب موجود في شجرة الحسابات ولكنه غير مذكور في أي بند من بنود التقرير "
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_report.py:0
+msgid ""
+"This account is reported in a line of the report but does not exist in the "
+"Chart of Accounts"
+msgstr ""
+"تم إعداد تقرير حول هذا الحساب في بند من التقرير ولكنه غير موجود في شجرة "
+"الحسابات "
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_report.py:0
+msgid "This account is reported in multiple lines of the report"
+msgstr "توجد عدة تقارير حول هذا الحساب في عدة بنود من التقرير "
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_report.py:0
+msgid "This account is reported multiple times on the same line of the report"
+msgstr "توجد عدة تقارير حول هذا الحساب في نفس البند من التقرير "
+
+#. module: odex30_account_reports
+#: model_terms:ir.ui.view,arch_db:odex30_account_reports.res_config_settings_view_form
+msgid ""
+"This allows you to choose the position of totals in your financial reports."
+msgstr "يسمح لك هذا باختيار مكان الإجمالي في تقاريرك المالية."
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/account_report/warnings.xml:0
+msgid ""
+"This company is part of a tax unit. You're currently not viewing the whole "
+"unit."
+msgstr "هذه الشركة هي جزء من وحدة ضريبية. لا تعرض حالياً الوحدة بأكملها. "
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/widgets/account_report_x2many/account_report_x2many.js:0
+msgid ""
+"This line and all its children will be deleted. Are you sure you want to "
+"proceed?"
+msgstr "سيتم حذف هذا البند وكافة توابعه. هل أنت متأكد من أنك ترغب بالاستمرار؟ "
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/widgets/account_report_x2many/account_report_x2many.xml:0
+msgid "This line is out of sequence."
+msgstr "هذا البند خارج التسلسل. "
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/widgets/account_report_x2many/account_report_x2many.xml:0
+msgid ""
+"This line is placed before its parent, which is not allowed. You can fix it "
+"by dragging it to the proper position."
+msgstr ""
+"تم وضع هذا البند قبل البند الأصلي، وهو أمر غير مسموح به. يمكنك إصلاحه عن "
+"طريق سحبه إلى المكان المناسب. "
+
+#. module: odex30_account_reports
+#: model_terms:ir.ui.view,arch_db:odex30_account_reports.account_report_line_form
+msgid "This line uses a custom user-defined 'Group By' value."
+msgstr ""
+"يستخدم هذا البند قيمة \"التجميع حسب\" المخصصة المعرفة من قِبَل المستخدم. "
+
+#. module: odex30_account_reports
+#: model_terms:ir.ui.view,arch_db:odex30_account_reports.account_report_form
+msgid "This option hides lines with a value of 0"
+msgstr "يقوم هذا الخيار بإخفاء البنود التي قيمتها 0 "
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_report.py:0
+msgid "This report already has a menuitem."
+msgstr "هذا التقرير يحتوي على عنصر قائمة بالفعل. "
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/tax_report/warnings.xml:0
+msgid ""
+"This report contains inconsistencies. The affected lines are marked with a "
+"warning."
+msgstr ""
+"يحتوي التقرير على بيانات غير متسقة. تم وضع علامة تحذير على البنود المتأثرة. "
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/multicurrency_revaluation_report/warnings.xml:0
+msgid "This report only displays the data of the active company."
+msgstr "هذا التقرير يعرض فقط بيانات الشركة النشطة. "
+
+#. module: odex30_account_reports
+#: model_terms:ir.ui.view,arch_db:odex30_account_reports.account_report_form
+msgid ""
+"This report uses report-specific code.\n"
+"                        You can customize it manually, but any change in the "
+"parameters used for its computation could lead to errors."
+msgstr ""
+"يستخدم هذا التقرير كود خاص بالتقرير.\n"
+"                        يمكنك تخصيصه يدوياً، ولكن قد يؤدي أي تغيير في العوامل "
+"المستخدمة في حسابه إلى حدوث أخطاء. "
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/account_report/warnings.xml:0
+msgid ""
+"This report uses the CTA conversion method to consolidate multiple companies "
+"using different currencies,\n"
+"        which can lead the report to be unbalanced."
+msgstr ""
+"يستخدم هذا التقرير طريقة التحويل CTA لدمج عدة شركات تستخدم عملات مختلفة،\n"
+"        مما قد يؤدي إلى اختلال توازن التقرير.  "
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_report.py:0
+msgid "This subformula references an unknown expression: %s"
+msgstr "تشير الصيغة الفرعية إلى تعبير غير معروف: %s "
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_report.py:0
+msgid ""
+"This tag is reported in a line of the report but is not linked to any "
+"account of the Chart of Accounts"
+msgstr ""
+"تم إعداد تقرير حول علامة التصنيف هذه في بند من التقرير ولكنه غير مرتبط بأي "
+"حساب في شجرة الحسابات "
+
+#. module: odex30_account_reports
+#: model_terms:ir.ui.view,arch_db:odex30_account_reports.view_move_form_vat_return
+msgid ""
+"This tax closing entry is posted, but the tax lock date is earlier than the "
+"covered period's last day. You might need to reset it to draft and refresh "
+"its content, in case other entries using taxes have been posted in the "
+"meantime."
+msgstr ""
+"تم ترحيل قيد الإقفال الضريبي هذا، ولكن تاريخ قفل الضريبة يسبق اليوم الأخير "
+"للفترة المشمولة. قد تحتاج إلى إعادة تعيينه إلى حالة المسودة لتحديث محتواه، "
+"في حال تم ترحيل قيود أخرى تستخدم الضرائب في هذه الأثناء. "
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/account_report/filters/filter_date.xml:0
+msgid "Today"
+msgstr "اليوم "
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_deferred_reports.py:0
+#: code:addons/odex30_account_reports/models/account_general_ledger.py:0
+#: code:addons/odex30_account_reports/models/account_journal_report.py:0
+#: code:addons/odex30_account_reports/models/account_partner_ledger.py:0
+#: code:addons/odex30_account_reports/models/account_sales_report.py:0
+#: model:account.report.column,name:odex30_account_reports.aged_payable_report_total
+#: model:account.report.column,name:odex30_account_reports.aged_receivable_report_total
+msgid "Total"
+msgstr "الإجمالي"
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_report.py:0
+msgid "Total %s"
+msgstr "الإجمالي %s"
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/account_report/filters/filters.js:0
+msgid "Trade Partners"
+msgstr "شركاء تجاريون "
+
+#. module: odex30_account_reports
+#: model:account.report.line,name:odex30_account_reports.transaction_without_statement
+msgid "Transactions without statement"
+msgstr "المعاملات التي ليس لها كشف حساب "
+
+#. module: odex30_account_reports
+#: model:account.report,name:odex30_account_reports.trial_balance_report
+#: model:ir.actions.client,name:odex30_account_reports.action_account_report_coa
+#: model:ir.ui.menu,name:odex30_account_reports.menu_action_account_report_coa
+msgid "Trial Balance"
+msgstr "ميزان المراجعة"
+
+#. module: odex30_account_reports
+#: model:ir.model,name:odex30_account_reports.model_account_trial_balance_report_handler
+msgid "Trial Balance Custom Handler"
+msgstr "معالج مخصص لميزان المراجعة "
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_sales_report.py:0
+msgid "Triangular"
+msgstr "مثلث الشكل "
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_report.py:0
+msgid ""
+"Trying to dispatch an action on a report not compatible with the provided "
+"options."
+msgstr "جاري محاولة إرسال إجراء في تقرير غير متوافق مع الخيارات المتوفرة. "
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_report.py:0
+msgid ""
+"Trying to expand a group for a line which was not generated by a report "
+"line: %s"
+msgstr "نحاول تفصيل مجموعة لبند لم يتم إنشاؤه بواسطة بند تقرير: %s "
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_report.py:0
+msgid "Trying to expand a line without an expansion function."
+msgstr "نحاول تفصيل بند دون استخدام خاصية التفصيل. "
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_report.py:0
+msgid "Trying to expand groupby results on lines without a groupby value."
+msgstr "نحاول تفصيل نتائج خاصية groupby دون قيمة groupby. "
+
+#. module: odex30_account_reports
+#: model:account.report.line,name:odex30_account_reports.account_financial_unaffected_earnings0
+msgid "Unallocated Earnings"
+msgstr "أرباح غير مخصصة"
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_report.py:0
+msgid "Undefined"
+msgstr "غير محدد"
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/account_report/filters/filter_extra_options.xml:0
+msgid "Unfold All"
+msgstr "كشف الكل"
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_report.py:0
+msgid "Unknown"
+msgstr "غير معروف"
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_partner_ledger.py:0
+#: code:addons/odex30_account_reports/models/account_sales_report.py:0
+msgid "Unknown Partner"
+msgstr "شريك مجهول "
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_report.py:0
+msgid "Unknown bound criterium: %s"
+msgstr "فئة ربط غير معروفة: %s "
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_report.py:0
+msgid "Unknown date scope: %s"
+msgstr "نطاق البيانات غير معروف: %s "
+
+#. module: odex30_account_reports
+#: model:account.report,name:odex30_account_reports.multicurrency_revaluation_report
+#: model:ir.actions.client,name:odex30_account_reports.action_account_report_multicurrency_revaluation
+#: model:ir.ui.menu,name:odex30_account_reports.menu_action_account_report_multicurrency_revaluation
+msgid "Unrealized Currency Gains/Losses"
+msgstr "الأرباح/الخسائر غير المُدرَكة للعملة "
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_report.py:0
+#: code:addons/odex30_account_reports/static/src/components/account_report/filters/filter_extra_options.xml:0
+#: code:addons/odex30_account_reports/static/src/components/account_report/filters/filters.js:0
+#: model_terms:ir.ui.view,arch_db:odex30_account_reports.pdf_export_filter_extra_options_template
+msgid "Unreconciled Entries"
+msgstr "القيود غير المسواة "
+
+#. module: odex30_account_reports
+#: model:account.report.column,name:odex30_account_reports.account_financial_report_ec_sales_vat
+msgid "VAT Number"
+msgstr "رقم ضريبة القيمة المضافة"
+
+#. module: odex30_account_reports
+#: model_terms:ir.ui.view,arch_db:odex30_account_reports.setup_financial_year_opening_form
+msgid "VAT Periodicity"
+msgstr "وتيرة ضريبة القيمة المضافة "
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/account_report/line/popover/debug_popover.xml:0
+msgid "Value"
+msgstr "القيمة"
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_move.py:0
+msgid "Vat closing from %(date_from)s to %(date_to)s"
+msgstr "إغلاق ضريبة القيمة المضافة من %(date_from)s إلى %(date_to)s "
+
+#. module: odex30_account_reports
+#: model_terms:ir.ui.view,arch_db:odex30_account_reports.view_journal_report_audit_move_line_tree
+msgid "View"
+msgstr "أداة العرض"
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_report.py:0
+msgid "View Bank Statement"
+msgstr "عرض كشف الحساب البنكي "
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/account_report/line_cell/popover/carryover_popover.xml:0
+msgid "View Carryover Lines"
+msgstr "عرض بنود الترحيل "
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_report.py:0
+msgid "View Journal Entry"
+msgstr "عرض قيد اليومية"
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_report.py:0
+#: code:addons/odex30_account_reports/models/account_sales_report.py:0
+#: model_terms:ir.ui.view,arch_db:odex30_account_reports.view_journal_report_audit_move_line_tree
+msgid "View Partner"
+msgstr "عرض الشريك"
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/wizard/account_report_send.py:0
+msgid "View Partner(s)"
+msgstr "View Partner(s)"
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_report.py:0
+msgid "View Payment"
+msgstr "عرض الدفع "
+
+#. module: odex30_account_reports
+#: model:ir.model.fields,field_description:odex30_account_reports.field_account_report_send__warnings
+msgid "Warnings"
+msgstr "تحذيرات"
+
+#. module: odex30_account_reports
+#: model_terms:ir.ui.view,arch_db:odex30_account_reports.res_config_settings_view_form
+msgid ""
+"When ticked, totals and subtotals appear below the sections of the report"
+msgstr "عند التحديد، سوف تظهر المجاميع الكلية والفرعية تحت أقسام التقرير "
+
+#. module: odex30_account_reports
+#: model:ir.model.fields,help:odex30_account_reports.field_res_company__totals_below_sections
+#: model:ir.model.fields,help:odex30_account_reports.field_res_config_settings__totals_below_sections
+msgid ""
+"When ticked, totals and subtotals appear below the sections of the report."
+msgstr "عند التحديد، سوف تظهر المجاميع الكلية والفرعية تحت أقسام التقرير "
+
+#. module: odex30_account_reports
+#: model:ir.model.fields,help:odex30_account_reports.field_account_account__exclude_provision_currency_ids
+msgid ""
+"Whether or not we have to make provisions for the selected foreign "
+"currencies."
+msgstr "ما إذا كان علينا إنشاء أحكام للعملات الأجنبية المختارة أم لا. "
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_report.py:0
+#: code:addons/odex30_account_reports/static/src/components/account_report/filters/filters.js:0
+#: model_terms:ir.ui.view,arch_db:odex30_account_reports.pdf_export_filter_extra_options_template
+msgid "With Draft Entries"
+msgstr "مع القيود بحالة المسودة "
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_general_ledger.py:0
+msgid "Wrong ID for general ledger line to expand: %s"
+msgstr "المعرّف غير صحيح لبند دفتر الأستاذ العام لتفصيله: %s "
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_partner_ledger.py:0
+msgid "Wrong ID for partner ledger line to expand: %s"
+msgstr "المعرّف غير صحيح لبند دفتر الأستاذ الخاص بالشريك لتفصيله: %s "
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_report.py:0
+msgid "Wrong format for if_other_expr_above/if_other_expr_below formula: %s"
+msgstr "الصيغة غير صحيحة لمعادلة if_other_expr_above/if_other_expr_below: %s "
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_report.py:0
+msgid "XLSX"
+msgstr "XLSX"
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/account_report/filters/filters.js:0
+msgid "Year"
+msgstr "السنة "
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_report.py:0
+#: code:addons/odex30_account_reports/static/src/components/account_report/line_cell/popover/edit_popover.xml:0
+msgid "Yes"
+msgstr "نعم"
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/multicurrency_revaluation_report/warnings.xml:0
+msgid "You are using custom exchange rates."
+msgstr "أنت تستخدم أسعار صرف مخصصة "
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_move.py:0
+msgid "You can't open a tax report from a move without a VAT closing date."
+msgstr ""
+"لا يمكنك فتح تقرير ضريبي من حركة دون تاريخ إقفال ضريبة القيمة المضافة. "
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_move_line.py:0
+msgid "You cannot add taxes on a tax closing move line."
+msgstr "لا يمكنك إضافة ضرائب في بند حركة إقفال ضريبي. "
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_deferred_reports.py:0
+msgid ""
+"You cannot generate entries for a period that does not end at the end of the "
+"month."
+msgstr "لا يمكنك إنشاء قيود لفترة لا تنتهي بنهاية الشهر. "
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_deferred_reports.py:0
+msgid "You cannot generate entries for a period that is locked."
+msgstr "لا يمكنك إنشاء قيود لفترة مقفلة. "
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_move.py:0
+msgid ""
+"You cannot reset this closing entry to draft, as another closing entry has "
+"been posted at a later date."
+msgstr ""
+"لا يمكنك إعادة تعيين قيد الإقفال هذا إلى حالة المسودة، لأنه قد تم ترحيل قيد "
+"إقفال آخر بتاريخ لاحق. "
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_move.py:0
+msgid ""
+"You cannot reset this closing entry to draft, as it would delete carryover "
+"values impacting the tax report of a locked period. Please change the "
+"following lock dates to proceed: %(lock_date_info)s."
+msgstr ""
+"لا يمكنك إعادة تعيين قيد الإقفال هذا إلى حالة المسودة، لأن ذلك سيؤدي إلى حذف "
+"القيم المرحّلة التي تؤثر على تقرير الضرائب لفترة مقفلة. يرجى تغيير تواريخ "
+"القفل التالية للمتابعة: %(lock_date_info)s."
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_report.py:0
+msgid "You cannot update this value as it's locked by: %s"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_multicurrency_revaluation_report.py:0
+msgid "You need to activate more than one currency to access this report."
+msgstr "عليك تفعيل أكثر من عملة واحدة للوصول إلى هذا التقرير. "
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_generic_tax_report.py:0
+msgid ""
+"You're about the generate the closing entries of multiple companies at once. "
+"Each of them will be created in accordance with its company tax periodicity."
+msgstr ""
+"أنت على وشك إنشاء القيود الختامية لعدة شركات في آنٍ واحد. سيتم إنشاء كل منها "
+"وفقاً لمعدل تكرار ضريبة الشركة الخاصة بها. "
+
+#. module: odex30_account_reports
+#: model_terms:ir.ui.view,arch_db:odex30_account_reports.journal_report_pdf_export_main
+#: model_terms:ir.ui.view,arch_db:odex30_account_reports.pdf_export_main
+#: model_terms:ir.ui.view,arch_db:odex30_account_reports.pdf_export_main_customer_report
+msgid "[Draft]"
+msgstr "[Draft]"
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/sales_report/warnings.xml:0
+msgid "addressed to"
+msgstr "موجهة إلى "
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/sales_report/warnings.xml:0
+msgid "affected partners"
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/tax_report/warnings.xml:0
+msgid "and correct their tax tags if necessary."
+msgstr "وتصحيح علامات تصنيف الضريبة إذا لزم الأمر. "
+
+#. module: odex30_account_reports
+#: model:ir.model.fields.selection,name:odex30_account_reports.selection__res_company__account_tax_periodicity__year
+msgid "annually"
+msgstr "سنوياً "
+
+#. module: odex30_account_reports
+#: model_terms:ir.ui.view,arch_db:odex30_account_reports.res_config_settings_view_form
+#: model_terms:ir.ui.view,arch_db:odex30_account_reports.setup_financial_year_opening_form
+msgid "days after period"
+msgstr "أيام بعد الفترة "
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/bank_reconciliation_report/warnings.xml:0
+msgid "doesn't match the balance of your"
+msgstr "لا يطابق رصيد "
+
+#. module: odex30_account_reports
+#: model:ir.model.fields.selection,name:odex30_account_reports.selection__res_company__account_tax_periodicity__2_months
+msgid "every 2 months"
+msgstr "كل شهرين "
+
+#. module: odex30_account_reports
+#: model:ir.model.fields.selection,name:odex30_account_reports.selection__res_company__account_tax_periodicity__4_months
+msgid "every 4 months"
+msgstr "كل 4 شهور "
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/bank_reconciliation_report/warnings.xml:0
+msgid "have a starting balance different from the previous ending balance."
+msgstr "أن يكون الرصيد الافتتاحي مختلفاً عن الرصيد الختامي السابق "
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/account_report/line_cell/popover/carryover_popover.xml:0
+msgid "in the next period."
+msgstr "في الفترة القادمة. "
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/sales_report/warnings.xml:0
+msgid "invoices"
+msgstr "فواتير العملاء "
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/bank_reconciliation_report/warnings.xml:0
+msgid "journal items"
+msgstr "عناصر اليومية "
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/bank_reconciliation_report/warnings.xml:0
+msgid "last bank statement"
+msgstr "آخر كشف حساب بنكي "
+
+#. module: odex30_account_reports
+#: model:ir.model.fields.selection,name:odex30_account_reports.selection__res_company__account_tax_periodicity__monthly
+msgid "monthly"
+msgstr "شهرياً "
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_report.py:0
+msgid "n/a"
+msgstr "غير منطبق "
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/sales_report/warnings.xml:0
+msgid "partners"
+msgstr "الشركاء "
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/account_report/warnings.xml:0
+msgid "prior or included in this period."
+msgstr "قبل هذه الفترة أو مشمول فيها. "
+
+#. module: odex30_account_reports
+#: model:ir.model.fields.selection,name:odex30_account_reports.selection__res_company__account_tax_periodicity__trimester
+msgid "quarterly"
+msgstr "ربع سنوي "
+
+#. module: odex30_account_reports
+#: model:ir.model.fields.selection,name:odex30_account_reports.selection__res_company__account_tax_periodicity__semester
+msgid "semi-annually"
+msgstr "شبه سنوي "
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/bank_reconciliation_report/warnings.xml:0
+msgid "statements"
+msgstr "كشوفات الحسابات "
+
+#. module: odex30_account_reports
+#: model_terms:ir.ui.view,arch_db:odex30_account_reports.view_tax_unit_form
+msgid "synchronize fiscal positions"
+msgstr "مزامنة الأوضاع المالية "
+
+#. module: odex30_account_reports
+#. odoo-python
+#: code:addons/odex30_account_reports/models/account_tax.py:0
+msgid "tax unit [%s]"
+msgstr "وحدة الضريبة [%s] "
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/sales_report/warnings.xml:0
+msgid "that are not established abroad."
+msgstr "التي لم يتم إنشاؤها في الخارج. "
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/account_report/filters/filter_comparison.xml:0
+#: code:addons/odex30_account_reports/static/src/components/account_report/filters/filter_date.xml:0
+msgid "to"
+msgstr "إلى"
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/sales_report/warnings.xml:0
+msgid "to resolve the duplication."
+msgstr ""
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/account_report/warnings.xml:0
+msgid "unposted Journal Entries"
+msgstr "قيود يومية غير مُرحلة"
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/account_report/line_cell/popover/carryover_popover.xml:0
+msgid "were carried over to this line from previous period."
+msgstr "تم ترحيلها إلى هذا البند من الفترة السابقة. "
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/bank_reconciliation_report/warnings.xml:0
+msgid "which don't originate from a bank statement nor payment."
+msgstr "والذي لا ينتج عن كشف حساب بنكي أو عملية دفع. "
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/sales_report/warnings.xml:0
+msgid "who are not established in any of the EC countries."
+msgstr "غير المنشئين في أي من دول الاتحاد الأوروبي. "
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/account_report/line_cell/popover/carryover_popover.xml:0
+msgid "will be carried over to"
+msgstr "سيتم ترحيلها إلى "
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/account_report/line_cell/popover/carryover_popover.xml:0
+msgid "will be carried over to this line in the next period."
+msgstr "سيتم ترحيلها إلى هذا البند في الفترة التالية. "
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/sales_report/warnings.xml:0
+msgid "without a valid intra-community VAT number."
+msgstr "دون رقم ضريبي صالح لبين المجتمعات. "
+
+#. module: odex30_account_reports
+#: model:mail.template,subject:odex30_account_reports.email_template_customer_statement
+msgid ""
+"{{ (object.company_id or "
+"object._get_followup_responsible().company_id).name }} Statement - "
+"{{ object.commercial_company_name }}"
+msgstr ""
+"{{ (object.company_id or "
+"object._get_followup_responsible().company_id).name }} Statement - "
+"{{ object.commercial_company_name }}"
+
+#. module: odex30_account_reports
+#. odoo-javascript
+#: code:addons/odex30_account_reports/static/src/components/multicurrency_revaluation_report/warnings.xml:0
+msgid "⇒ Reset to Odoo’s Rate"
+msgstr "-> إعادة التعيين لأسعار أودو "
diff --git a/dev_odex30_accounting/odex30_account_reports/models/__init__.py b/dev_odex30_accounting/odex30_account_reports/models/__init__.py
new file mode 100644
index 0000000..2d52b6b
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_reports/models/__init__.py
@@ -0,0 +1,32 @@
+
+from . import res_partner
+from . import res_company
+from . import account
+from . import account_report
+from . import account_analytic_report
+from . import bank_reconciliation_report
+from . import account_general_ledger
+from . import account_generic_tax_report
+from . import account_journal_report
+from . import account_cash_flow_report
+from . import account_deferred_reports
+from . import account_multicurrency_revaluation_report
+from . import account_move_line
+from . import account_trial_balance_report
+from . import account_aged_partner_balance
+from . import account_partner_ledger
+from . import mail_activity
+from . import mail_activity_type
+from . import res_config_settings
+from . import chart_template
+from . import account_journal_dashboard
+from . import ir_actions
+from . import account_sales_report
+from . import account_move
+from . import account_tax
+from . import executive_summary_report
+from . import budget
+from . import balance_sheet
+from . import account_fiscal_position
+from . import account_customer_statement
+from . import account_followup_report
diff --git a/dev_odex30_accounting/odex30_account_reports/models/__pycache__/__init__.cpython-311.pyc b/dev_odex30_accounting/odex30_account_reports/models/__pycache__/__init__.cpython-311.pyc
new file mode 100644
index 0000000..e71859a
Binary files /dev/null and b/dev_odex30_accounting/odex30_account_reports/models/__pycache__/__init__.cpython-311.pyc differ
diff --git a/dev_odex30_accounting/odex30_account_reports/models/__pycache__/account.cpython-311.pyc b/dev_odex30_accounting/odex30_account_reports/models/__pycache__/account.cpython-311.pyc
new file mode 100644
index 0000000..b70bdaf
Binary files /dev/null and b/dev_odex30_accounting/odex30_account_reports/models/__pycache__/account.cpython-311.pyc differ
diff --git a/dev_odex30_accounting/odex30_account_reports/models/__pycache__/account_aged_partner_balance.cpython-311.pyc b/dev_odex30_accounting/odex30_account_reports/models/__pycache__/account_aged_partner_balance.cpython-311.pyc
new file mode 100644
index 0000000..c9b60c4
Binary files /dev/null and b/dev_odex30_accounting/odex30_account_reports/models/__pycache__/account_aged_partner_balance.cpython-311.pyc differ
diff --git a/dev_odex30_accounting/odex30_account_reports/models/__pycache__/account_analytic_report.cpython-311.pyc b/dev_odex30_accounting/odex30_account_reports/models/__pycache__/account_analytic_report.cpython-311.pyc
new file mode 100644
index 0000000..c8ae24c
Binary files /dev/null and b/dev_odex30_accounting/odex30_account_reports/models/__pycache__/account_analytic_report.cpython-311.pyc differ
diff --git a/dev_odex30_accounting/odex30_account_reports/models/__pycache__/account_cash_flow_report.cpython-311.pyc b/dev_odex30_accounting/odex30_account_reports/models/__pycache__/account_cash_flow_report.cpython-311.pyc
new file mode 100644
index 0000000..f2495e2
Binary files /dev/null and b/dev_odex30_accounting/odex30_account_reports/models/__pycache__/account_cash_flow_report.cpython-311.pyc differ
diff --git a/dev_odex30_accounting/odex30_account_reports/models/__pycache__/account_customer_statement.cpython-311.pyc b/dev_odex30_accounting/odex30_account_reports/models/__pycache__/account_customer_statement.cpython-311.pyc
new file mode 100644
index 0000000..cfc9213
Binary files /dev/null and b/dev_odex30_accounting/odex30_account_reports/models/__pycache__/account_customer_statement.cpython-311.pyc differ
diff --git a/dev_odex30_accounting/odex30_account_reports/models/__pycache__/account_deferred_reports.cpython-311.pyc b/dev_odex30_accounting/odex30_account_reports/models/__pycache__/account_deferred_reports.cpython-311.pyc
new file mode 100644
index 0000000..cd4db1b
Binary files /dev/null and b/dev_odex30_accounting/odex30_account_reports/models/__pycache__/account_deferred_reports.cpython-311.pyc differ
diff --git a/dev_odex30_accounting/odex30_account_reports/models/__pycache__/account_fiscal_position.cpython-311.pyc b/dev_odex30_accounting/odex30_account_reports/models/__pycache__/account_fiscal_position.cpython-311.pyc
new file mode 100644
index 0000000..50f95f4
Binary files /dev/null and b/dev_odex30_accounting/odex30_account_reports/models/__pycache__/account_fiscal_position.cpython-311.pyc differ
diff --git a/dev_odex30_accounting/odex30_account_reports/models/__pycache__/account_followup_report.cpython-311.pyc b/dev_odex30_accounting/odex30_account_reports/models/__pycache__/account_followup_report.cpython-311.pyc
new file mode 100644
index 0000000..5726de4
Binary files /dev/null and b/dev_odex30_accounting/odex30_account_reports/models/__pycache__/account_followup_report.cpython-311.pyc differ
diff --git a/dev_odex30_accounting/odex30_account_reports/models/__pycache__/account_general_ledger.cpython-311.pyc b/dev_odex30_accounting/odex30_account_reports/models/__pycache__/account_general_ledger.cpython-311.pyc
new file mode 100644
index 0000000..41cd339
Binary files /dev/null and b/dev_odex30_accounting/odex30_account_reports/models/__pycache__/account_general_ledger.cpython-311.pyc differ
diff --git a/dev_odex30_accounting/odex30_account_reports/models/__pycache__/account_generic_tax_report.cpython-311.pyc b/dev_odex30_accounting/odex30_account_reports/models/__pycache__/account_generic_tax_report.cpython-311.pyc
new file mode 100644
index 0000000..b4119e6
Binary files /dev/null and b/dev_odex30_accounting/odex30_account_reports/models/__pycache__/account_generic_tax_report.cpython-311.pyc differ
diff --git a/dev_odex30_accounting/odex30_account_reports/models/__pycache__/account_journal_dashboard.cpython-311.pyc b/dev_odex30_accounting/odex30_account_reports/models/__pycache__/account_journal_dashboard.cpython-311.pyc
new file mode 100644
index 0000000..712531f
Binary files /dev/null and b/dev_odex30_accounting/odex30_account_reports/models/__pycache__/account_journal_dashboard.cpython-311.pyc differ
diff --git a/dev_odex30_accounting/odex30_account_reports/models/__pycache__/account_journal_report.cpython-311.pyc b/dev_odex30_accounting/odex30_account_reports/models/__pycache__/account_journal_report.cpython-311.pyc
new file mode 100644
index 0000000..cee7be1
Binary files /dev/null and b/dev_odex30_accounting/odex30_account_reports/models/__pycache__/account_journal_report.cpython-311.pyc differ
diff --git a/dev_odex30_accounting/odex30_account_reports/models/__pycache__/account_move.cpython-311.pyc b/dev_odex30_accounting/odex30_account_reports/models/__pycache__/account_move.cpython-311.pyc
new file mode 100644
index 0000000..ab37b9a
Binary files /dev/null and b/dev_odex30_accounting/odex30_account_reports/models/__pycache__/account_move.cpython-311.pyc differ
diff --git a/dev_odex30_accounting/odex30_account_reports/models/__pycache__/account_move_line.cpython-311.pyc b/dev_odex30_accounting/odex30_account_reports/models/__pycache__/account_move_line.cpython-311.pyc
new file mode 100644
index 0000000..715c077
Binary files /dev/null and b/dev_odex30_accounting/odex30_account_reports/models/__pycache__/account_move_line.cpython-311.pyc differ
diff --git a/dev_odex30_accounting/odex30_account_reports/models/__pycache__/account_multicurrency_revaluation_report.cpython-311.pyc b/dev_odex30_accounting/odex30_account_reports/models/__pycache__/account_multicurrency_revaluation_report.cpython-311.pyc
new file mode 100644
index 0000000..4b6504e
Binary files /dev/null and b/dev_odex30_accounting/odex30_account_reports/models/__pycache__/account_multicurrency_revaluation_report.cpython-311.pyc differ
diff --git a/dev_odex30_accounting/odex30_account_reports/models/__pycache__/account_partner_ledger.cpython-311.pyc b/dev_odex30_accounting/odex30_account_reports/models/__pycache__/account_partner_ledger.cpython-311.pyc
new file mode 100644
index 0000000..617f41c
Binary files /dev/null and b/dev_odex30_accounting/odex30_account_reports/models/__pycache__/account_partner_ledger.cpython-311.pyc differ
diff --git a/dev_odex30_accounting/odex30_account_reports/models/__pycache__/account_report.cpython-311.pyc b/dev_odex30_accounting/odex30_account_reports/models/__pycache__/account_report.cpython-311.pyc
new file mode 100644
index 0000000..9089e42
Binary files /dev/null and b/dev_odex30_accounting/odex30_account_reports/models/__pycache__/account_report.cpython-311.pyc differ
diff --git a/dev_odex30_accounting/odex30_account_reports/models/__pycache__/account_sales_report.cpython-311.pyc b/dev_odex30_accounting/odex30_account_reports/models/__pycache__/account_sales_report.cpython-311.pyc
new file mode 100644
index 0000000..8553fcc
Binary files /dev/null and b/dev_odex30_accounting/odex30_account_reports/models/__pycache__/account_sales_report.cpython-311.pyc differ
diff --git a/dev_odex30_accounting/odex30_account_reports/models/__pycache__/account_tax.cpython-311.pyc b/dev_odex30_accounting/odex30_account_reports/models/__pycache__/account_tax.cpython-311.pyc
new file mode 100644
index 0000000..307603f
Binary files /dev/null and b/dev_odex30_accounting/odex30_account_reports/models/__pycache__/account_tax.cpython-311.pyc differ
diff --git a/dev_odex30_accounting/odex30_account_reports/models/__pycache__/account_trial_balance_report.cpython-311.pyc b/dev_odex30_accounting/odex30_account_reports/models/__pycache__/account_trial_balance_report.cpython-311.pyc
new file mode 100644
index 0000000..906b37c
Binary files /dev/null and b/dev_odex30_accounting/odex30_account_reports/models/__pycache__/account_trial_balance_report.cpython-311.pyc differ
diff --git a/dev_odex30_accounting/odex30_account_reports/models/__pycache__/balance_sheet.cpython-311.pyc b/dev_odex30_accounting/odex30_account_reports/models/__pycache__/balance_sheet.cpython-311.pyc
new file mode 100644
index 0000000..35feb17
Binary files /dev/null and b/dev_odex30_accounting/odex30_account_reports/models/__pycache__/balance_sheet.cpython-311.pyc differ
diff --git a/dev_odex30_accounting/odex30_account_reports/models/__pycache__/bank_reconciliation_report.cpython-311.pyc b/dev_odex30_accounting/odex30_account_reports/models/__pycache__/bank_reconciliation_report.cpython-311.pyc
new file mode 100644
index 0000000..606e2fd
Binary files /dev/null and b/dev_odex30_accounting/odex30_account_reports/models/__pycache__/bank_reconciliation_report.cpython-311.pyc differ
diff --git a/dev_odex30_accounting/odex30_account_reports/models/__pycache__/budget.cpython-311.pyc b/dev_odex30_accounting/odex30_account_reports/models/__pycache__/budget.cpython-311.pyc
new file mode 100644
index 0000000..98683bb
Binary files /dev/null and b/dev_odex30_accounting/odex30_account_reports/models/__pycache__/budget.cpython-311.pyc differ
diff --git a/dev_odex30_accounting/odex30_account_reports/models/__pycache__/chart_template.cpython-311.pyc b/dev_odex30_accounting/odex30_account_reports/models/__pycache__/chart_template.cpython-311.pyc
new file mode 100644
index 0000000..770eec7
Binary files /dev/null and b/dev_odex30_accounting/odex30_account_reports/models/__pycache__/chart_template.cpython-311.pyc differ
diff --git a/dev_odex30_accounting/odex30_account_reports/models/__pycache__/executive_summary_report.cpython-311.pyc b/dev_odex30_accounting/odex30_account_reports/models/__pycache__/executive_summary_report.cpython-311.pyc
new file mode 100644
index 0000000..2ab0b5d
Binary files /dev/null and b/dev_odex30_accounting/odex30_account_reports/models/__pycache__/executive_summary_report.cpython-311.pyc differ
diff --git a/dev_odex30_accounting/odex30_account_reports/models/__pycache__/ir_actions.cpython-311.pyc b/dev_odex30_accounting/odex30_account_reports/models/__pycache__/ir_actions.cpython-311.pyc
new file mode 100644
index 0000000..8f4b74f
Binary files /dev/null and b/dev_odex30_accounting/odex30_account_reports/models/__pycache__/ir_actions.cpython-311.pyc differ
diff --git a/dev_odex30_accounting/odex30_account_reports/models/__pycache__/mail_activity.cpython-311.pyc b/dev_odex30_accounting/odex30_account_reports/models/__pycache__/mail_activity.cpython-311.pyc
new file mode 100644
index 0000000..012be9e
Binary files /dev/null and b/dev_odex30_accounting/odex30_account_reports/models/__pycache__/mail_activity.cpython-311.pyc differ
diff --git a/dev_odex30_accounting/odex30_account_reports/models/__pycache__/mail_activity_type.cpython-311.pyc b/dev_odex30_accounting/odex30_account_reports/models/__pycache__/mail_activity_type.cpython-311.pyc
new file mode 100644
index 0000000..592f6a9
Binary files /dev/null and b/dev_odex30_accounting/odex30_account_reports/models/__pycache__/mail_activity_type.cpython-311.pyc differ
diff --git a/dev_odex30_accounting/odex30_account_reports/models/__pycache__/res_company.cpython-311.pyc b/dev_odex30_accounting/odex30_account_reports/models/__pycache__/res_company.cpython-311.pyc
new file mode 100644
index 0000000..f77f8e8
Binary files /dev/null and b/dev_odex30_accounting/odex30_account_reports/models/__pycache__/res_company.cpython-311.pyc differ
diff --git a/dev_odex30_accounting/odex30_account_reports/models/__pycache__/res_config_settings.cpython-311.pyc b/dev_odex30_accounting/odex30_account_reports/models/__pycache__/res_config_settings.cpython-311.pyc
new file mode 100644
index 0000000..09fbda3
Binary files /dev/null and b/dev_odex30_accounting/odex30_account_reports/models/__pycache__/res_config_settings.cpython-311.pyc differ
diff --git a/dev_odex30_accounting/odex30_account_reports/models/__pycache__/res_partner.cpython-311.pyc b/dev_odex30_accounting/odex30_account_reports/models/__pycache__/res_partner.cpython-311.pyc
new file mode 100644
index 0000000..2c75e49
Binary files /dev/null and b/dev_odex30_accounting/odex30_account_reports/models/__pycache__/res_partner.cpython-311.pyc differ
diff --git a/dev_odex30_accounting/odex30_account_reports/models/account.py b/dev_odex30_accounting/odex30_account_reports/models/account.py
new file mode 100644
index 0000000..63c5a14
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_reports/models/account.py
@@ -0,0 +1,9 @@
+
+from odoo import api, fields, models
+
+
+class AccountAccount(models.Model):
+    _inherit = "account.account"
+
+    exclude_provision_currency_ids = fields.Many2many('res.currency', relation='account_account_exclude_res_currency_provision', help="Whether or not we have to make provisions for the selected foreign currencies.")
+    budget_item_ids = fields.One2many(comodel_name='account.report.budget.item', inverse_name='account_id')  # To use it in the domain when adding accounts from the report
diff --git a/dev_odex30_accounting/odex30_account_reports/models/account_aged_partner_balance.py b/dev_odex30_accounting/odex30_account_reports/models/account_aged_partner_balance.py
new file mode 100644
index 0000000..35b0547
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_reports/models/account_aged_partner_balance.py
@@ -0,0 +1,447 @@
+
+import datetime
+
+from odoo import models, fields, _
+from odoo.tools import SQL
+from odoo.tools.misc import format_date
+
+from dateutil.relativedelta import relativedelta
+from itertools import chain
+
+
+class AgedPartnerBalanceCustomHandler(models.AbstractModel):
+    _name = 'account.aged.partner.balance.report.handler'
+    _inherit = 'account.report.custom.handler'
+    _description = 'Aged Partner Balance Custom Handler'
+
+    def _get_custom_display_config(self):
+        return {
+            'css_custom_class': 'aged_partner_balance',
+            'templates': {
+                'AccountReportLineName': 'odex30_account_reports.AgedPartnerBalanceLineName',
+            },
+            'components': {
+                'AccountReportFilters': 'odex30_account_reports.AgedPartnerBalanceFilters',
+            },
+        }
+
+    def _custom_options_initializer(self, report, options, previous_options):
+        super()._custom_options_initializer(report, options, previous_options=previous_options)
+        hidden_columns = set()
+
+        options['multi_currency'] = report.env.user.has_group('base.group_multi_currency')
+        options['show_currency'] = options['multi_currency'] and (previous_options or {}).get('show_currency', False)
+        options['no_xlsx_currency_code_columns'] = True
+        if not options['show_currency']:
+            hidden_columns.update(['amount_currency', 'currency'])
+
+        options['show_account'] = (previous_options or {}).get('show_account', False)
+        if not options['show_account']:
+            hidden_columns.add('account_name')
+
+        options['columns'] = [
+            column for column in options['columns']
+            if column['expression_label'] not in hidden_columns
+        ]
+
+        default_order_column = {
+            'expression_label': 'invoice_date',
+            'direction': 'ASC',
+        }
+
+        options['order_column'] = previous_options.get('order_column') or default_order_column
+        options['aging_based_on'] = previous_options.get('aging_based_on') or 'base_on_maturity_date'
+        options['aging_interval'] = previous_options.get('aging_interval') or 30
+
+        # Set aging column names
+        interval = options['aging_interval']
+        for column in options['columns']:
+            if column['expression_label'].startswith('period'):
+                period_number = int(column['expression_label'].replace('period', '')) - 1
+                if 0 <= period_number < 4:
+                    column['name'] = f'{interval * period_number + 1}-{interval * (period_number + 1)}'
+
+    def _custom_line_postprocessor(self, report, options, lines):
+        partner_lines_map = {}
+
+        # Sort line dicts by partner
+        for line in lines:
+            model, model_id = report._get_model_info_from_id(line['id'])
+            if model == 'res.partner':
+                partner_lines_map[model_id] = line
+
+        if partner_lines_map:
+            for partner, line_dict in zip(
+                    self.env['res.partner'].browse(partner_lines_map),
+                    partner_lines_map.values()
+            ):
+                line_dict['trust'] = partner.with_company(partner.company_id or self.env.company).trust
+
+        return lines
+
+    def _report_custom_engine_aged_receivable(self, expressions, options, date_scope, current_groupby, next_groupby, offset=0, limit=None, warnings=None):
+        return self._aged_partner_report_custom_engine_common(options, 'asset_receivable', current_groupby, next_groupby, offset=offset, limit=limit)
+
+    def _report_custom_engine_aged_payable(self, expressions, options, date_scope, current_groupby, next_groupby, offset=0, limit=None, warnings=None):
+        return self._aged_partner_report_custom_engine_common(options, 'liability_payable', current_groupby, next_groupby, offset=offset, limit=limit)
+
+    def _aged_partner_report_custom_engine_common(self, options, internal_type, current_groupby, next_groupby, offset=0, limit=None):
+        report = self.env['account.report'].browse(options['report_id'])
+        report._check_groupby_fields((next_groupby.split(',') if next_groupby else []) + ([current_groupby] if current_groupby else []))
+
+        def minus_days(date_obj, days):
+            return fields.Date.to_string(date_obj - relativedelta(days=days))
+
+        aging_date_field = SQL.identifier('invoice_date') if options['aging_based_on'] == 'base_on_invoice_date' else SQL.identifier('date_maturity')
+        date_to = fields.Date.from_string(options['date']['date_to'])
+        interval = options['aging_interval']
+        periods = [(False, fields.Date.to_string(date_to))]
+        # Since we added the first period in the list we have to do one less iteration
+        nb_periods = len([column for column in options['columns'] if column['expression_label'].startswith('period')]) - 1
+        for i in range(nb_periods):
+            start_date = minus_days(date_to, (interval * i) + 1)
+            # The last element of the list will have False for the end date
+            end_date = minus_days(date_to, interval * (i + 1)) if i < nb_periods - 1 else False
+            periods.append((start_date, end_date))
+
+        def build_result_dict(report, query_res_lines):
+            rslt = {f'period{i}': 0 for i in range(len(periods))}
+
+            for query_res in query_res_lines:
+                for i in range(len(periods)):
+                    period_key = f'period{i}'
+                    rslt[period_key] += query_res[period_key]
+
+            if current_groupby == 'id':
+                query_res = query_res_lines[0] # We're grouping by id, so there is only 1 element in query_res_lines anyway
+                currency = self.env['res.currency'].browse(query_res['currency_id'][0]) if len(query_res['currency_id']) == 1 else None
+                rslt.update({
+                    'invoice_date': query_res['invoice_date'][0] if len(query_res['invoice_date']) == 1 else None,
+                    'due_date': query_res['due_date'][0] if len(query_res['due_date']) == 1 else None,
+                    'amount_currency': query_res['amount_currency'],
+                    'currency_id': query_res['currency_id'][0] if len(query_res['currency_id']) == 1 else None,
+                    'currency': currency.display_name if currency else None,
+                    'account_name': query_res['account_name'][0] if len(query_res['account_name']) == 1 else None,
+                    'total': None,
+                    'has_sublines': query_res['aml_count'] > 0,
+
+                    # Needed by the custom_unfold_all_batch_data_generator, to speed-up unfold_all
+                    'partner_id': query_res['partner_id'][0] if query_res['partner_id'] else None,
+                })
+            else:
+                rslt.update({
+                    'invoice_date': None,
+                    'due_date': None,
+                    'amount_currency': None,
+                    'currency_id': None,
+                    'currency': None,
+                    'account_name': None,
+                    'total': sum(rslt[f'period{i}'] for i in range(len(periods))),
+                    'has_sublines': False,
+                })
+
+            return rslt
+
+        # Build period table
+        period_table_format = ('(VALUES %s)' % ','.join("(%s, %s, %s)" for period in periods))
+        params = list(chain.from_iterable(
+            (period[0] or None, period[1] or None, i)
+            for i, period in enumerate(periods)
+        ))
+        period_table = SQL(period_table_format, *params)
+
+        # Build query
+        query = report._get_report_query(options, 'strict_range', domain=[('account_id.account_type', '=', internal_type)])
+        account_alias = query.left_join(lhs_alias='account_move_line', lhs_column='account_id', rhs_table='account_account', rhs_column='id', link='account_id')
+        account_code = self.env['account.account']._field_to_sql(account_alias, 'code', query)
+
+        always_present_groupby = SQL("period_table.period_index")
+        if current_groupby:
+            groupby_field_sql = self.env['account.move.line']._field_to_sql("account_move_line", current_groupby, query)
+            select_from_groupby = SQL("%s AS grouping_key,", groupby_field_sql)
+            groupby_clause = SQL("%s, %s", groupby_field_sql, always_present_groupby)
+        else:
+            select_from_groupby = SQL()
+            groupby_clause = always_present_groupby
+        multiplicator = -1 if internal_type == 'liability_payable' else 1
+        select_period_query = SQL(',').join(
+            SQL("""
+                CASE WHEN period_table.period_index = %(period_index)s
+                THEN %(multiplicator)s * SUM(%(balance_select)s)
+                ELSE 0 END AS %(column_name)s
+                """,
+                period_index=i,
+                multiplicator=multiplicator,
+                column_name=SQL.identifier(f"period{i}"),
+                balance_select=report._currency_table_apply_rate(SQL(
+                    "account_move_line.balance - COALESCE(part_debit.amount, 0) + COALESCE(part_credit.amount, 0)"
+                )),
+            )
+            for i in range(len(periods))
+        )
+
+        tail_query = report._get_engine_query_tail(offset, limit)
+        query = SQL(
+            """
+            WITH period_table(date_start, date_stop, period_index) AS (%(period_table)s)
+
+            SELECT
+                %(select_from_groupby)s
+                %(multiplicator)s * (
+                    SUM(account_move_line.amount_currency)
+                    - COALESCE(SUM(part_debit.debit_amount_currency), 0)
+                    + COALESCE(SUM(part_credit.credit_amount_currency), 0)
+                ) AS amount_currency,
+                ARRAY_AGG(DISTINCT account_move_line.partner_id) AS partner_id,
+                ARRAY_AGG(account_move_line.payment_id) AS payment_id,
+                ARRAY_AGG(DISTINCT account_move_line.invoice_date) AS invoice_date,
+                ARRAY_AGG(DISTINCT COALESCE(account_move_line.%(aging_date_field)s, account_move_line.date)) AS report_date,
+                ARRAY_AGG(DISTINCT %(account_code)s) AS account_name,
+                ARRAY_AGG(DISTINCT COALESCE(account_move_line.%(aging_date_field)s, account_move_line.date)) AS due_date,
+                ARRAY_AGG(DISTINCT account_move_line.currency_id) AS currency_id,
+                COUNT(account_move_line.id) AS aml_count,
+                ARRAY_AGG(%(account_code)s) AS account_code,
+                %(select_period_query)s
+
+            FROM %(table_references)s
+
+            JOIN account_journal journal ON journal.id = account_move_line.journal_id
+            %(currency_table_join)s
+
+            LEFT JOIN LATERAL (
+                SELECT
+                    SUM(part.amount) AS amount,
+                    SUM(part.debit_amount_currency) AS debit_amount_currency,
+                    part.debit_move_id
+                FROM account_partial_reconcile part
+                WHERE part.max_date <= %(date_to)s AND part.debit_move_id = account_move_line.id
+                GROUP BY part.debit_move_id
+            ) part_debit ON TRUE
+
+            LEFT JOIN LATERAL (
+                SELECT
+                    SUM(part.amount) AS amount,
+                    SUM(part.credit_amount_currency) AS credit_amount_currency,
+                    part.credit_move_id
+                FROM account_partial_reconcile part
+                WHERE part.max_date <= %(date_to)s AND part.credit_move_id = account_move_line.id
+                GROUP BY part.credit_move_id
+            ) part_credit ON TRUE
+
+            JOIN period_table ON
+                (
+                    period_table.date_start IS NULL
+                    OR COALESCE(account_move_line.%(aging_date_field)s, account_move_line.date) <= DATE(period_table.date_start)
+                )
+                AND
+                (
+                    period_table.date_stop IS NULL
+                    OR COALESCE(account_move_line.%(aging_date_field)s, account_move_line.date) >= DATE(period_table.date_stop)
+                )
+
+            WHERE %(search_condition)s
+
+            GROUP BY %(groupby_clause)s
+
+            HAVING
+                ROUND(SUM(%(having_debit)s), %(currency_precision)s) != 0
+                OR ROUND(SUM(%(having_credit)s), %(currency_precision)s) != 0
+
+            ORDER BY %(groupby_clause)s
+
+            %(tail_query)s
+            """,
+            account_code=account_code,
+            period_table=period_table,
+            select_from_groupby=select_from_groupby,
+            select_period_query=select_period_query,
+            multiplicator=multiplicator,
+            aging_date_field=aging_date_field,
+            table_references=query.from_clause,
+            currency_table_join=report._currency_table_aml_join(options),
+            date_to=date_to,
+            search_condition=query.where_clause,
+            groupby_clause=groupby_clause,
+            having_debit=report._currency_table_apply_rate(SQL("CASE WHEN account_move_line.balance > 0  THEN account_move_line.balance else 0 END - COALESCE(part_debit.amount, 0)")),
+            having_credit=report._currency_table_apply_rate(SQL("CASE WHEN account_move_line.balance < 0  THEN -account_move_line.balance else 0 END - COALESCE(part_credit.amount, 0)")),
+            currency_precision=self.env.company.currency_id.decimal_places,
+            tail_query=tail_query,
+        )
+
+        self._cr.execute(query)
+        query_res_lines = self._cr.dictfetchall()
+
+        if not current_groupby:
+            return build_result_dict(report, query_res_lines)
+        else:
+            rslt = []
+
+            all_res_per_grouping_key = {}
+            for query_res in query_res_lines:
+                grouping_key = query_res['grouping_key']
+                all_res_per_grouping_key.setdefault(grouping_key, []).append(query_res)
+
+            for grouping_key, query_res_lines in all_res_per_grouping_key.items():
+                rslt.append((grouping_key, build_result_dict(report, query_res_lines)))
+
+            return rslt
+
+    def open_journal_items(self, options, params):
+        params['view_ref'] = 'account.view_move_line_tree_grouped_partner'
+        options_for_audit = {**options, 'date': {**options['date'], 'date_from': None}}
+        report = self.env['account.report'].browse(options['report_id'])
+        action = report.open_journal_items(options=options_for_audit, params=params)
+        action.get('context', {}).update({'search_default_group_by_account': 0, 'search_default_group_by_partner': 1})
+        return action
+
+    def open_customer_statement(self, options, params):
+        report = self.env['account.report'].browse(options['report_id'])
+        record_model, record_id = report._get_model_info_from_id(params.get('line_id'))
+        if self.env.ref('odex30_account_reports.customer_statement_report', raise_if_not_found=False):
+            return self.env[record_model].browse(record_id).open_customer_statement()
+        return self.env[record_model].browse(record_id).open_partner_ledger()
+
+    def _common_custom_unfold_all_batch_data_generator(self, internal_type, report, options, lines_to_expand_by_function):
+        rslt = {} # In the form {full_sub_groupby_key: all_column_group_expression_totals for this groupby computation}
+        report_periods = 6 # The report has 6 periods
+
+        for expand_function_name, lines_to_expand in lines_to_expand_by_function.items():
+            for line_to_expand in lines_to_expand: # In standard, this loop will execute only once
+                if expand_function_name == '_report_expand_unfoldable_line_with_groupby':
+                    report_line_id = report._get_res_id_from_line_id(line_to_expand['id'], 'account.report.line')
+                    expressions_to_evaluate = report.line_ids.expression_ids.filtered(lambda x: x.report_line_id.id == report_line_id and x.engine == 'custom')
+
+                    if not expressions_to_evaluate:
+                        continue
+
+                    for column_group_key, column_group_options in report._split_options_per_column_group(options).items():
+                        # Get all aml results by partner
+                        aml_data_by_partner = {}
+                        for aml_id, aml_result in self._aged_partner_report_custom_engine_common(column_group_options, internal_type, 'id', None):
+                            aml_result['aml_id'] = aml_id
+                            aml_data_by_partner.setdefault(aml_result['partner_id'], []).append(aml_result)
+
+                        # Iterate on results by partner to generate the content of the column group
+                        partner_expression_totals = rslt.setdefault(f"[{report_line_id}]=>partner_id", {})\
+                                                        .setdefault(column_group_key, {expression: {'value': []} for expression in expressions_to_evaluate})
+                        for partner_id, aml_data_list in aml_data_by_partner.items():
+                            partner_values = self._prepare_partner_values()
+                            for i in range(report_periods):
+                                partner_values[f'period{i}'] = 0
+
+                            # Build expression totals under the right key
+                            partner_aml_expression_totals = rslt.setdefault(f"[{report_line_id}]partner_id:{partner_id}=>id", {})\
+                                                                .setdefault(column_group_key, {expression: {'value': []} for expression in expressions_to_evaluate})
+                            for aml_data in aml_data_list:
+                                for i in range(report_periods):
+                                    period_value = aml_data[f'period{i}']
+                                    partner_values[f'period{i}'] += period_value
+                                    partner_values['total'] += period_value
+
+                                for expression in expressions_to_evaluate:
+                                    partner_aml_expression_totals[expression]['value'].append(
+                                        (aml_data['aml_id'], aml_data[expression.subformula])
+                                    )
+
+                            for expression in expressions_to_evaluate:
+                                partner_expression_totals[expression]['value'].append(
+                                    (partner_id, partner_values[expression.subformula])
+                                )
+
+        return rslt
+
+    def _prepare_partner_values(self):
+        return {
+            'invoice_date': None,
+            'due_date': None,
+            'amount_currency': None,
+            'currency_id': None,
+            'currency': None,
+            'account_name': None,
+            'total': 0,
+        }
+
+    def aged_partner_balance_audit(self, options, params, journal_type):
+        """ Open a list of invoices/bills and/or deferral entries for the clicked cell
+        :param dict options: the report's `options`
+        :param dict params:  a dict containing:
+                                 `calling_line_dict_id`: line id containing the optional account of the cell
+                                 `expression_label`: the expression label of the cell
+        """
+        report = self.env['account.report'].browse(options['report_id'])
+        action = self.env['ir.actions.actions']._for_xml_id('account.action_amounts_to_settle')
+        journal_type_to_exclude = {'purchase': 'sale', 'sale': 'purchase'}
+        if options:
+            domain = [
+                ('account_id.reconcile', '=', True),
+                ('journal_id.type', '!=', journal_type_to_exclude.get(journal_type)),
+                *self._build_domain_from_period(options, params['expression_label']),
+                *report._get_options_domain(options, 'from_beginning'),
+                *report._get_audit_line_groupby_domain(params['calling_line_dict_id']),
+            ]
+            action['domain'] = domain
+        return action
+
+    def _build_domain_from_period(self, options, period):
+        if period != "total" and period[-1].isdigit():
+            period_number = int(period[-1])
+            if period_number == 0:
+                domain = [('date_maturity', '>=', options['date']['date_to'])]
+            else:
+                options_date_to = datetime.datetime.strptime(options['date']['date_to'], '%Y-%m-%d')
+                period_end = options_date_to - datetime.timedelta(30*(period_number-1)+1)
+                period_start = options_date_to - datetime.timedelta(30*(period_number))
+                domain = [('date_maturity', '>=', period_start), ('date_maturity', '<=', period_end)]
+                if period_number == 5:
+                    domain = [('date_maturity', '<=', period_end)]
+        else:
+            domain = []
+        return domain
+
+class AgedPayableCustomHandler(models.AbstractModel):
+    _name = 'account.aged.payable.report.handler'
+    _inherit = 'account.aged.partner.balance.report.handler'
+    _description = 'Aged Payable Custom Handler'
+
+    def open_journal_items(self, options, params):
+        payable_account_type = {'id': 'trade_payable', 'name': _("Payable"), 'selected': True}
+
+        if 'account_type' in options:
+            options['account_type'].append(payable_account_type)
+        else:
+            options['account_type'] = [payable_account_type]
+
+        return super().open_journal_items(options, params)
+
+    def _custom_unfold_all_batch_data_generator(self, report, options, lines_to_expand_by_function):
+        # We only optimize the unfold all if the groupby value of the report has not been customized. Else, we'll just run the full computation
+        if self.env.ref('odex30_account_reports.aged_payable_line').groupby.replace(' ', '') == 'partner_id,id':
+            return self._common_custom_unfold_all_batch_data_generator('liability_payable', report, options, lines_to_expand_by_function)
+        return {}
+
+    def action_audit_cell(self, options, params):
+        return super().aged_partner_balance_audit(options, params, 'purchase')
+
+class AgedReceivableCustomHandler(models.AbstractModel):
+    _name = 'account.aged.receivable.report.handler'
+    _inherit = 'account.aged.partner.balance.report.handler'
+    _description = 'Aged Receivable Custom Handler'
+
+    def open_journal_items(self, options, params):
+        receivable_account_type = {'id': 'trade_receivable', 'name': _("Receivable"), 'selected': True}
+
+        if 'account_type' in options:
+            options['account_type'].append(receivable_account_type)
+        else:
+            options['account_type'] = [receivable_account_type]
+
+        return super().open_journal_items(options, params)
+
+    def _custom_unfold_all_batch_data_generator(self, report, options, lines_to_expand_by_function):
+        # We only optimize the unfold all if the groupby value of the report has not been customized. Else, we'll just run the full computation
+        if self.env.ref('odex30_account_reports.aged_receivable_line').groupby.replace(' ', '') == 'partner_id,id':
+            return self._common_custom_unfold_all_batch_data_generator('asset_receivable', report, options, lines_to_expand_by_function)
+        return {}
+
+    def action_audit_cell(self, options, params):
+        return super().aged_partner_balance_audit(options, params, 'sale')
diff --git a/dev_odex30_accounting/odex30_account_reports/models/account_analytic_report.py b/dev_odex30_accounting/odex30_account_reports/models/account_analytic_report.py
new file mode 100644
index 0000000..f972be1
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_reports/models/account_analytic_report.py
@@ -0,0 +1,257 @@
+
+from odoo import models, fields, api, osv
+from odoo.addons.web.controllers.utils import clean_action
+from odoo.tools import SQL, Query
+
+
+class AccountReport(models.AbstractModel):
+    _inherit = 'account.report'
+
+    filter_analytic_groupby = fields.Boolean(
+        string="Analytic Group By",
+        compute=lambda x: x._compute_report_option_filter('filter_analytic_groupby'), readonly=False, store=True, depends=['root_report_id', 'section_main_report_ids'],
+    )
+
+    def _get_options_initializers_forced_sequence_map(self):
+        """ Force the sequence for the init_options so columns headers are already generated but not the columns
+            So, between _init_options_column_headers and _init_options_columns"""
+        sequence_map = super(AccountReport, self)._get_options_initializers_forced_sequence_map()
+        sequence_map[self._init_options_analytic_groupby] = 995
+        return sequence_map
+
+    def _init_options_analytic_groupby(self, options, previous_options):
+        if not self.filter_analytic_groupby:
+            return
+        enable_analytic_accounts = self.env.user.has_group('analytic.group_analytic_accounting')
+        if not enable_analytic_accounts:
+            return
+
+        options['display_analytic_groupby'] = True
+        options['display_analytic_plan_groupby'] = True
+
+        options['include_analytic_without_aml'] = previous_options.get('include_analytic_without_aml', False)
+        previous_analytic_accounts = previous_options.get('analytic_accounts_groupby', [])
+        analytic_account_ids = [int(x) for x in previous_analytic_accounts]
+        selected_analytic_accounts = self.env['account.analytic.account'].with_context(active_test=False).search(
+            [('id', 'in', analytic_account_ids)])
+        options['analytic_accounts_groupby'] = selected_analytic_accounts.ids
+        options['selected_analytic_account_groupby_names'] = selected_analytic_accounts.mapped('name')
+
+        previous_analytic_plans = previous_options.get('analytic_plans_groupby', [])
+        analytic_plan_ids = [int(x) for x in previous_analytic_plans]
+        selected_analytic_plans = self.env['account.analytic.plan'].search([('id', 'in', analytic_plan_ids)])
+        options['analytic_plans_groupby'] = selected_analytic_plans.ids
+        options['selected_analytic_plan_groupby_names'] = selected_analytic_plans.mapped('name')
+
+        self._create_column_analytic(options)
+
+    def _init_options_readonly_query(self, options, previous_options):
+        super()._init_options_readonly_query(options, previous_options)
+        options['readonly_query'] = options['readonly_query'] and not options.get('analytic_groupby_option')
+
+    def _create_column_analytic(self, options):
+        """ Creates the analytic columns for each plan or account in the filters.
+        This will duplicate all previous columns and adding the analytic accounts in the domain of the added columns.
+
+        The analytic_groupby_option is used so the table used is the shadowed table.
+        The domain on analytic_distribution can just use simple comparison as the column of the shadowed
+        table will simply be filled with analytic_account_ids.
+        """
+        analytic_headers = []
+        plans = self.env['account.analytic.plan'].browse(options.get('analytic_plans_groupby'))
+        for plan in plans:
+            account_list = []
+            accounts = self.env['account.analytic.account'].search([('plan_id', 'child_of', plan.id)])
+            for account in accounts:
+                account_list.append(account.id)
+            analytic_headers.append({
+                'name': plan.name,
+                'forced_options': {
+                    'analytic_groupby_option': True,
+                    'analytic_accounts_list': tuple(account_list),  # Analytic accounts used in the domain to filter the lines.
+                    'analytic_plan_id': plan.id,
+                }
+            })
+
+        accounts = self.env['account.analytic.account'].browse(options.get('analytic_accounts_groupby'))
+        for account in accounts:
+            analytic_headers.append({
+                'name': account.name,
+                'forced_options': {
+                    'analytic_groupby_option': True,
+                    'analytic_accounts_list': (account.id,),
+                }
+            })
+        if analytic_headers:
+            has_selected_budgets = any([budget for budget in options.get('budgets', []) if budget['selected']])
+            if has_selected_budgets:
+                # if budget is selected, then analytic headers are placed on the same header level
+                options['column_headers'][-1] = analytic_headers + options['column_headers'][-1]
+            else:
+                # We add the analytic layer to the column_headers before creating the columns
+                analytic_headers.append({'name': ''})
+
+                options['column_headers'] = [
+                    *options['column_headers'],
+                    analytic_headers,
+                ]
+
+    @api.model
+    def _prepare_lines_for_analytic_groupby(self):
+        """Prepare the analytic_temp_account_move_line
+
+        This method should be used once before all the SQL queries using the
+        table account_move_line for the analytic columns for the financial reports.
+        It will create a new table with the schema of account_move_line table, but with
+        the data from account_analytic_line.
+
+        We inherit the schema of account_move_line, make the correspondence between
+        account_move_line fields and account_analytic_line fields and put NULL for those
+        who don't exist in account_analytic_line.
+        We also drop the NOT NULL constraints for fields who are not required in account_analytic_line.
+        """
+        self.env.cr.execute("SELECT 1 FROM information_schema.tables WHERE table_name='analytic_temp_account_move_line'")
+        if self.env.cr.fetchone():
+            return
+
+        project_plan, other_plans = self.env['account.analytic.plan']._get_all_plans()
+        analytic_cols = SQL(", ").join(SQL('"account_analytic_line".%s', SQL.identifier(n._column_name())) for n in (project_plan + other_plans))
+        analytic_distribution_equivalent = SQL('to_jsonb(UNNEST(ARRAY_REMOVE(ARRAY[%s], NULL)))', analytic_cols)
+
+        change_equivalence_dict = {
+            'id': SQL("account_analytic_line.id"),
+            'balance': SQL("-amount"),
+            'display_type': 'product',
+            'parent_state': 'posted',
+            'account_id': SQL.identifier("general_account_id"),
+            'debit': SQL("CASE WHEN (amount < 0) THEN -amount else 0 END"),
+            'credit': SQL("CASE WHEN (amount > 0) THEN amount else 0 END"),
+            'analytic_distribution': analytic_distribution_equivalent,
+            'date': SQL("account_analytic_line.date"),
+            'company_id': SQL("account_analytic_line.company_id"),
+        }
+
+        all_stored_aml_fields = {
+            field
+            for field, attrs in self.env['account.move.line'].fields_get().items()
+            if attrs['type'] not in ['many2many', 'one2many'] and attrs.get('store')
+        }
+
+        for aml_field in all_stored_aml_fields:
+            if aml_field not in change_equivalence_dict:
+                change_equivalence_dict[aml_field] = SQL('"account_move_line".%s', SQL.identifier(aml_field))
+
+        stored_aml_fields, fields_to_insert = self.env['account.move.line']._prepare_aml_shadowing_for_report(change_equivalence_dict)
+
+        query = SQL("""
+            CREATE OR REPLACE TEMPORARY VIEW analytic_temp_account_move_line (%(stored_aml_fields)s) AS
+            SELECT %(fields_to_insert)s
+            FROM account_analytic_line
+            LEFT JOIN account_move_line
+                ON account_analytic_line.move_line_id = account_move_line.id
+            WHERE
+                account_analytic_line.general_account_id IS NOT NULL;
+        """, stored_aml_fields=stored_aml_fields, fields_to_insert=fields_to_insert)
+
+        self.env.cr.execute(query)
+
+    def _get_report_query(self, options, date_scope, domain=None) -> Query:
+        # Override to add the context key which will eventually trigger the shadowing of the table
+        context_self = self.with_context(account_report_analytic_groupby=options.get('analytic_groupby_option'))
+
+        # We add the domain filter for analytic_distribution here, as the search is not available
+        query = super(AccountReport, context_self)._get_report_query(options, date_scope, domain)
+        if options.get('analytic_accounts'):
+            if 'analytic_accounts_list' in options:
+                # the table will be `analytic_temp_account_move_line` and thus analytic_distribution will be a single ID
+                analytic_account_ids = tuple(str(account_id) for account_id in options['analytic_accounts'])
+                query.add_where(SQL("""account_move_line.analytic_distribution IN %s""", analytic_account_ids))
+            else:
+                # Real `account_move_line` table so real JSON with percentage
+                analytic_account_ids = [[str(account_id) for account_id in options['analytic_accounts']]]
+                query.add_where(SQL('%s && %s', analytic_account_ids, self.env['account.move.line']._query_analytic_accounts()))
+
+        return query
+
+    def action_audit_cell(self, options, params):
+        column_group_options = self._get_column_group_options(options, params['column_group_key'])
+
+        if not column_group_options.get('analytic_groupby_option'):
+            return super(AccountReport, self).action_audit_cell(options, params)
+        else:
+            # Start by getting the domain from the options. Note that this domain is targeting account.move.line
+            report_line = self.env['account.report.line'].browse(params['report_line_id'])
+            expression = report_line.expression_ids.filtered(lambda x: x.label == params['expression_label'])
+            line_domain = self._get_audit_line_domain(column_group_options, expression, params)
+            # The line domain is made for move lines, so we need some postprocessing to have it work with analytic lines.
+            domain = []
+            AccountAnalyticLine = self.env['account.analytic.line']
+            for expression in line_domain:
+                if len(expression) == 1:  # For operators such as '&' or '|' we can juste add them again.
+                    domain.append(expression)
+                    continue
+
+                field, operator, right_term = expression
+                # On analytic lines, the account.account field is named general_account_id and not account_id.
+                if field.split('.')[0] == 'account_id':
+                    field = field.replace('account_id', 'general_account_id')
+                    expression = [(field, operator, right_term)]
+                # Replace the 'analytic_distribution' by the account_id domain as we expect for analytic lines.
+                elif field == 'analytic_distribution':
+                    expression = [('auto_account_id', 'in', right_term)]
+                # For other fields not present in on the analytic line model, map them to get the info from the move_line.
+                # Or ignore these conditions if there is no move lines.
+                elif field.split('.')[0] not in AccountAnalyticLine._fields:
+                    expression = [(f'move_line_id.{field}', operator, right_term)]
+                    if options.get('include_analytic_without_aml'):
+                        expression = osv.expression.OR([
+                            [('move_line_id', '=', False)],
+                            expression,
+                        ])
+                else:
+                    expression = [expression]  # just for the extend
+                domain.extend(expression)
+
+            action = clean_action(self.env.ref('analytic.account_analytic_line_action_entries')._get_action_dict(), env=self.env)
+            action['domain'] = domain
+            return action
+
+    @api.model
+    def _get_options_journals_domain(self, options):
+        domain = super(AccountReport, self)._get_options_journals_domain(options)
+        # Add False to the domain in order to select lines without journals for analytics columns.
+        if options.get('include_analytic_without_aml'):
+            domain = osv.expression.OR([
+                domain,
+                [('journal_id', '=', False)],
+            ])
+        return domain
+
+    def _get_options_domain(self, options, date_scope):
+        self.ensure_one()
+        domain = super()._get_options_domain(options, date_scope)
+
+        # Get the analytic accounts that we need to filter on from the options and add a domain for them.
+        if 'analytic_accounts_list' in options:
+            domain = osv.expression.AND([
+                domain,
+                [('analytic_distribution', 'in', options.get('analytic_accounts_list', []))],
+            ])
+
+        return domain
+
+
+class AccountMoveLine(models.Model):
+    _inherit = "account.move.line"
+
+    def _where_calc(self, domain, active_test=True):
+        """ In case we need an analytic column in an account_report, we shadow the account_move_line table
+        with a temp table filled with analytic data, that will be used for the analytic columns.
+        We do it in this function to only create and fill it once for all computations of a report.
+        The following analytic columns and computations will just query the shadowed table instead of the real one.
+        """
+        query = super()._where_calc(domain, active_test)
+        if self.env.context.get('account_report_analytic_groupby') and not self.env.context.get('account_report_cash_basis'):
+            self.env['account.report']._prepare_lines_for_analytic_groupby()
+            query._tables['account_move_line'] = SQL.identifier('analytic_temp_account_move_line')
+        return query
diff --git a/dev_odex30_accounting/odex30_account_reports/models/account_cash_flow_report.py b/dev_odex30_accounting/odex30_account_reports/models/account_cash_flow_report.py
new file mode 100644
index 0000000..555a497
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_reports/models/account_cash_flow_report.py
@@ -0,0 +1,711 @@
+from odoo import models, _
+from odoo.tools import SQL, Query
+
+
+class CashFlowReportCustomHandler(models.AbstractModel):
+    _name = 'account.cash.flow.report.handler'
+    _inherit = 'account.report.custom.handler'
+    _description = 'Cash Flow Report Custom Handler'
+
+    def _dynamic_lines_generator(self, report, options, all_column_groups_expression_totals, warnings=None):
+        lines = []
+
+        layout_data = self._get_layout_data()
+        report_data = self._get_report_data(report, options, layout_data)
+
+        for layout_line_id, layout_line_data in layout_data.items():
+            lines.append((0, self._get_layout_line(report, options, layout_line_id, layout_line_data, report_data)))
+
+            if layout_line_id in report_data and 'aml_groupby_account' in report_data[layout_line_id]:
+                aml_data_values = report_data[layout_line_id]['aml_groupby_account'].values()
+
+                aml_data_values_with_account_code = []
+                aml_data_values_without_account_code = []
+
+                for aml_data in aml_data_values:
+                    if aml_data['account_code'] is not None:
+                        aml_data_values_with_account_code.append(aml_data)
+                    else:
+                        aml_data_values_without_account_code.append(aml_data)
+
+                for aml_data in (sorted(aml_data_values_with_account_code, key=lambda x: x['account_code'])
+                                 + aml_data_values_without_account_code):
+                    lines.append((0, self._get_aml_line(report, options, aml_data)))
+
+        unexplained_difference_line = self._get_unexplained_difference_line(report, options, report_data)
+
+        if unexplained_difference_line:
+            lines.append((0, unexplained_difference_line))
+
+        return lines
+
+    def _custom_options_initializer(self, report, options, previous_options):
+        super()._custom_options_initializer(report, options, previous_options=previous_options)
+        report._init_options_journals(options, previous_options=previous_options, additional_journals_domain=[('type', 'in', ('bank', 'cash', 'general'))])
+
+    def _get_report_data(self, report, options, layout_data):
+        report_data = {}
+
+        payment_account_ids = self._get_account_ids(report, options)
+        if not payment_account_ids:
+            return report_data
+
+        # Compute 'Cash and cash equivalents, beginning of period'
+        for aml_data in self._compute_liquidity_balance(report, options, payment_account_ids, 'to_beginning_of_period'):
+            self._add_report_data('opening_balance', aml_data, layout_data, report_data)
+            self._add_report_data('closing_balance', aml_data, layout_data, report_data)
+
+        # Compute 'Cash and cash equivalents, closing balance'
+        for aml_data in self._compute_liquidity_balance(report, options, payment_account_ids, 'strict_range'):
+            self._add_report_data('closing_balance', aml_data, layout_data, report_data)
+
+        tags_ids = self._get_tags_ids()
+        cashflow_tag_ids = self._get_cashflow_tag_ids()
+
+        # Process liquidity moves
+        for aml_groupby_account in self._get_liquidity_moves(report, options, payment_account_ids, cashflow_tag_ids):
+            for aml_data in aml_groupby_account.values():
+                self._dispatch_aml_data(tags_ids, aml_data, layout_data, report_data)
+
+        # Process reconciled moves
+        for aml_groupby_account in self._get_reconciled_moves(report, options, payment_account_ids, cashflow_tag_ids):
+            for aml_data in aml_groupby_account.values():
+                self._dispatch_aml_data(tags_ids, aml_data, layout_data, report_data)
+
+        return report_data
+
+    def _add_report_data(self, layout_line_id, aml_data, layout_data, report_data):
+        """
+        Add or update the report_data dictionnary with aml_data.
+
+        report_data is a dictionnary where the keys are keys from _cash_flow_report_get_layout_data() (used for mapping)
+        and the values can contain 2 dictionnaries:
+            * (required) 'balance' where the key is the column_group_key and the value is the balance of the line
+            * (optional) 'aml_groupby_account' where the key is an account_id and the values are the aml data
+        """
+        def _report_update_parent(layout_line_id, aml_column_group_key, aml_balance, layout_data, report_data):
+            # Update the balance in report_data of the parent of the layout_line_id recursively (Stops when the line has no parent)
+            if 'parent_line_id' in layout_data[layout_line_id]:
+                parent_line_id = layout_data[layout_line_id]['parent_line_id']
+
+                report_data.setdefault(parent_line_id, {'balance': {}})
+                report_data[parent_line_id]['balance'].setdefault(aml_column_group_key, 0.0)
+                report_data[parent_line_id]['balance'][aml_column_group_key] += aml_balance
+
+                _report_update_parent(parent_line_id, aml_column_group_key, aml_balance, layout_data, report_data)
+
+        aml_column_group_key = aml_data['column_group_key']
+        aml_account_id = aml_data['account_id']
+        aml_account_code = aml_data['account_code']
+        aml_account_name = aml_data['account_name']
+        aml_balance = aml_data['balance']
+        aml_account_tag = aml_data.get('account_tag_id', None)
+
+        if self.env.company.currency_id.is_zero(aml_balance):
+            return
+
+        report_data.setdefault(layout_line_id, {
+            'balance': {},
+            'aml_groupby_account': {},
+        })
+
+        report_data[layout_line_id]['aml_groupby_account'].setdefault(aml_account_id, {
+            'parent_line_id': layout_line_id,
+            'account_id': aml_account_id,
+            'account_code': aml_account_code,
+            'account_name': aml_account_name,
+            'account_tag_id': aml_account_tag,
+            'level': layout_data[layout_line_id]['level'] + 1,
+            'balance': {},
+        })
+
+        report_data[layout_line_id]['balance'].setdefault(aml_column_group_key, 0.0)
+        report_data[layout_line_id]['balance'][aml_column_group_key] += aml_balance
+
+        report_data[layout_line_id]['aml_groupby_account'][aml_account_id]['balance'].setdefault(aml_column_group_key, 0.0)
+        report_data[layout_line_id]['aml_groupby_account'][aml_account_id]['balance'][aml_column_group_key] += aml_balance
+
+        _report_update_parent(layout_line_id, aml_column_group_key, aml_balance, layout_data, report_data)
+
+    def _get_tags_ids(self):
+        ''' Get a dict to pass on to _dispatch_aml_data containing information mapping account tags to report lines. '''
+        return {
+            'operating': self.env.ref('account.account_tag_operating').id,
+            'investing': self.env.ref('account.account_tag_investing').id,
+            'financing': self.env.ref('account.account_tag_financing').id,
+        }
+
+    def _get_cashflow_tag_ids(self):
+        ''' Get the list of account tags that are relevant for the cash flow report. '''
+        return self._get_tags_ids().values()
+
+    def _dispatch_aml_data(self, tags_ids, aml_data, layout_data, report_data):
+        # Dispatch the aml_data in the correct layout_line
+        if aml_data['account_account_type'] == 'asset_receivable':
+            self._add_report_data('advance_payments_customer', aml_data, layout_data, report_data)
+        elif aml_data['account_account_type'] == 'liability_payable':
+            self._add_report_data('advance_payments_suppliers', aml_data, layout_data, report_data)
+        elif aml_data['balance'] < 0:
+            if aml_data['account_tag_id'] == tags_ids['operating']:
+                self._add_report_data('paid_operating_activities', aml_data, layout_data, report_data)
+            elif aml_data['account_tag_id'] == tags_ids['investing']:
+                self._add_report_data('investing_activities_cash_out', aml_data, layout_data, report_data)
+            elif aml_data['account_tag_id'] == tags_ids['financing']:
+                self._add_report_data('financing_activities_cash_out', aml_data, layout_data, report_data)
+            else:
+                self._add_report_data('unclassified_activities_cash_out', aml_data, layout_data, report_data)
+        elif aml_data['balance'] > 0:
+            if aml_data['account_tag_id'] == tags_ids['operating']:
+                self._add_report_data('received_operating_activities', aml_data, layout_data, report_data)
+            elif aml_data['account_tag_id'] == tags_ids['investing']:
+                self._add_report_data('investing_activities_cash_in', aml_data, layout_data, report_data)
+            elif aml_data['account_tag_id'] == tags_ids['financing']:
+                self._add_report_data('financing_activities_cash_in', aml_data, layout_data, report_data)
+            else:
+                self._add_report_data('unclassified_activities_cash_in', aml_data, layout_data, report_data)
+
+    # -------------------------------------------------------------------------
+    # QUERIES
+    # -------------------------------------------------------------------------
+    def _get_account_ids(self, report, options):
+        ''' Retrieve all accounts to be part of the cash flow statement and also the accounts making them.
+
+        :param options: The report options.
+        :return:        payment_account_ids: A tuple containing all account.account's ids being used in a liquidity journal.
+        '''
+        # Fetch liquidity accounts:
+        # Accounts being used by at least one bank/cash journal.
+        selected_journal_ids = [j['id'] for j in report._get_options_journals(options)]
+
+        where_clause = "account_journal.id IN %s" if selected_journal_ids else "account_journal.type IN ('bank', 'cash', 'general')"
+        where_params = [tuple(selected_journal_ids)] if selected_journal_ids else []
+
+        self._cr.execute(f'''
+            SELECT
+                array_remove(ARRAY_AGG(DISTINCT account_account.id), NULL),
+                array_remove(ARRAY_AGG(DISTINCT account_payment_method_line.payment_account_id), NULL)
+            FROM account_journal
+            JOIN res_company
+                ON account_journal.company_id = res_company.id
+            LEFT JOIN account_payment_method_line
+                ON account_journal.id = account_payment_method_line.journal_id
+            LEFT JOIN account_account
+                ON account_journal.default_account_id = account_account.id
+                   AND account_account.account_type IN ('asset_cash', 'liability_credit_card')
+            WHERE {where_clause}
+        ''', where_params)
+
+        res = self._cr.fetchall()[0]
+        payment_account_ids = set((res[0] or []) + (res[1] or []))
+
+        if not payment_account_ids:
+            return ()
+
+        return tuple(payment_account_ids)
+
+    def _get_move_ids_query(self, report, payment_account_ids, column_group_options) -> SQL:
+        ''' Get all liquidity moves to be part of the cash flow statement.
+        :param payment_account_ids: A tuple containing all account.account's ids being used in a liquidity journal.
+        :return: query: The SQL query to retrieve the move IDs.
+        '''
+
+        query = report._get_report_query(column_group_options, 'strict_range', [('account_id', 'in', list(payment_account_ids))])
+        return SQL(
+            '''
+            SELECT
+                array_agg(DISTINCT account_move_line.move_id) AS move_id
+            FROM %(table_references)s
+            WHERE %(search_condition)s
+            ''',
+            table_references=query.from_clause,
+            search_condition=query.where_clause,
+        )
+
+    def _compute_liquidity_balance(self, report, options, payment_account_ids, date_scope):
+        ''' Compute the balance of all liquidity accounts to populate the following sections:
+            'Cash and cash equivalents, beginning of period' and 'Cash and cash equivalents, closing balance'.
+
+        :param options:                 The report options.
+        :param payment_account_ids:     A tuple containing all account.account's ids being used in a liquidity journal.
+        :return:                        A list of tuple (account_id, account_code, account_name, balance).
+        '''
+        queries = []
+
+        for column_group_key, column_group_options in report._split_options_per_column_group(options).items():
+            query = report._get_report_query(column_group_options, date_scope, domain=[('account_id', 'in', payment_account_ids)])
+            account_alias = query.join(lhs_alias='account_move_line', lhs_column='account_id', rhs_table='account_account', rhs_column='id', link='account_id')
+            account_name = self.env['account.account']._field_to_sql(account_alias, 'name')
+            account_code = self.env['account.account']._field_to_sql(account_alias, 'code', query)
+
+            queries.append(SQL(
+                '''
+                SELECT
+                    %(column_group_key)s AS column_group_key,
+                    account_move_line.account_id,
+                    %(account_code)s AS account_code,
+                    %(account_name)s AS account_name,
+                    SUM(%(balance_select)s) AS balance
+                FROM %(table_references)s
+                %(currency_table_join)s
+                WHERE %(search_condition)s
+                GROUP BY account_move_line.account_id, %(account_code)s, %(account_name)s
+                ''',
+                column_group_key=column_group_key,
+                account_code=account_code,
+                account_name=account_name,
+                table_references=query.from_clause,
+                balance_select=report._currency_table_apply_rate(SQL("account_move_line.balance")),
+                currency_table_join=report._currency_table_aml_join(column_group_options),
+                search_condition=query.where_clause,
+            ))
+
+        self._cr.execute(SQL(' UNION ALL ').join(queries))
+
+        return self._cr.dictfetchall()
+
+    def _get_liquidity_moves(self, report, options, payment_account_ids, cash_flow_tag_ids):
+        ''' Fetch all information needed to compute lines from liquidity moves.
+        The difficulty is to represent only the not-reconciled part of balance.
+
+        :param options:                 The report options.
+        :param payment_account_ids:     A tuple containing all account.account's ids being used in a liquidity journal.
+        :return:                        A list of tuple (account_id, account_code, account_name, account_type, amount).
+        '''
+
+        reconciled_aml_groupby_account = {}
+
+        queries = []
+
+        for column_group_key, column_group_options in report._split_options_per_column_group(options).items():
+            move_ids_query = self._get_move_ids_query(report, payment_account_ids, column_group_options)
+            query = Query(self.env, 'account_move_line')
+            account_alias = query.join(lhs_alias='account_move_line', lhs_column='account_id', rhs_table='account_account', rhs_column='id', link='account_id')
+            account_code = self.env['account.account']._field_to_sql(account_alias, 'code', query)
+            account_name = self.env['account.account']._field_to_sql(account_alias, 'name')
+            account_type = SQL.identifier(account_alias, 'account_type')
+
+            queries.append(SQL(
+                '''
+                (WITH payment_move_ids AS (%(move_ids_query)s)
+                -- Credit amount of each account
+                SELECT
+                    %(column_group_key)s AS column_group_key,
+                    account_move_line.account_id,
+                    %(account_code)s AS account_code,
+                    %(account_name)s AS account_name,
+                    %(account_type)s AS account_account_type,
+                    account_account_account_tag.account_account_tag_id AS account_tag_id,
+                    SUM(%(partial_amount_select)s) AS balance
+                FROM %(from_clause)s
+                %(currency_table_join)s
+                LEFT JOIN account_partial_reconcile
+                    ON account_partial_reconcile.credit_move_id = account_move_line.id
+                LEFT JOIN account_account_account_tag
+                    ON account_account_account_tag.account_account_id = account_move_line.account_id
+                    AND account_account_account_tag.account_account_tag_id IN %(cash_flow_tag_ids)s
+                WHERE account_move_line.move_id IN (SELECT unnest(payment_move_ids.move_id) FROM payment_move_ids)
+                    AND account_move_line.account_id NOT IN %(payment_account_ids)s
+                    AND account_partial_reconcile.max_date BETWEEN %(date_from)s AND %(date_to)s
+                GROUP BY account_move_line.company_id, account_move_line.account_id, %(account_code)s, %(account_name)s, account_account_type, account_account_account_tag.account_account_tag_id
+
+                UNION ALL
+
+                -- Debit amount of each account
+                SELECT
+                    %(column_group_key)s AS column_group_key,
+                    account_move_line.account_id,
+                    %(account_code)s AS account_code,
+                    %(account_name)s AS account_name,
+                    %(account_type)s AS account_account_type,
+                    account_account_account_tag.account_account_tag_id AS account_tag_id,
+                    -SUM(%(partial_amount_select)s) AS balance
+                FROM %(from_clause)s
+                %(currency_table_join)s
+                LEFT JOIN account_partial_reconcile
+                    ON account_partial_reconcile.debit_move_id = account_move_line.id
+                LEFT JOIN account_account_account_tag
+                    ON account_account_account_tag.account_account_id = account_move_line.account_id
+                    AND account_account_account_tag.account_account_tag_id IN %(cash_flow_tag_ids)s
+                WHERE account_move_line.move_id IN (SELECT unnest(payment_move_ids.move_id) FROM payment_move_ids)
+                    AND account_move_line.account_id NOT IN %(payment_account_ids)s
+                    AND account_partial_reconcile.max_date BETWEEN %(date_from)s AND %(date_to)s
+                GROUP BY account_move_line.company_id, account_move_line.account_id, %(account_code)s, %(account_name)s, account_account_type, account_account_account_tag.account_account_tag_id
+
+                UNION ALL
+
+                -- Total amount of each account
+                SELECT
+                    %(column_group_key)s AS column_group_key,
+                    account_move_line.account_id AS account_id,
+                    %(account_code)s AS account_code,
+                    %(account_name)s AS account_name,
+                    %(account_type)s AS account_account_type,
+                    account_account_account_tag.account_account_tag_id AS account_tag_id,
+                    SUM(%(aml_balance_select)s) AS balance
+                FROM %(from_clause)s
+                %(currency_table_join)s
+                LEFT JOIN account_account_account_tag
+                    ON account_account_account_tag.account_account_id = account_move_line.account_id
+                    AND account_account_account_tag.account_account_tag_id IN %(cash_flow_tag_ids)s
+                WHERE account_move_line.move_id IN (SELECT unnest(payment_move_ids.move_id) FROM payment_move_ids)
+                    AND account_move_line.account_id NOT IN %(payment_account_ids)s
+                GROUP BY account_move_line.account_id, %(account_code)s, %(account_name)s, account_account_type, account_account_account_tag.account_account_tag_id)
+                ''',
+                column_group_key=column_group_key,
+                move_ids_query=move_ids_query,
+                account_code=account_code,
+                account_name=account_name,
+                account_type=account_type,
+                from_clause=query.from_clause,
+                currency_table_join=report._currency_table_aml_join(column_group_options),
+                partial_amount_select=report._currency_table_apply_rate(SQL("account_partial_reconcile.amount")),
+                aml_balance_select=report._currency_table_apply_rate(SQL("account_move_line.balance")),
+                cash_flow_tag_ids=tuple(cash_flow_tag_ids),
+                payment_account_ids=payment_account_ids,
+                date_from=column_group_options['date']['date_from'],
+                date_to=column_group_options['date']['date_to'],
+            ))
+
+        self._cr.execute(SQL(' UNION ALL ').join(queries))
+
+        for aml_data in self._cr.dictfetchall():
+            reconciled_aml_groupby_account.setdefault(aml_data['account_id'], {})
+            reconciled_aml_groupby_account[aml_data['account_id']].setdefault(aml_data['column_group_key'], {
+                'column_group_key': aml_data['column_group_key'],
+                'account_id': aml_data['account_id'],
+                'account_code': aml_data['account_code'],
+                'account_name': aml_data['account_name'],
+                'account_account_type': aml_data['account_account_type'],
+                'account_tag_id': aml_data['account_tag_id'],
+                'balance': 0.0,
+            })
+
+            reconciled_aml_groupby_account[aml_data['account_id']][aml_data['column_group_key']]['balance'] -= aml_data['balance']
+
+        return list(reconciled_aml_groupby_account.values())
+
+    def _get_reconciled_moves(self, report, options, payment_account_ids, cash_flow_tag_ids):
+        ''' Retrieve all moves being not a liquidity move to be shown in the cash flow statement.
+        Each amount must be valued at the percentage of what is actually paid.
+        E.g. An invoice of 1000 being paid at 50% must be valued at 500.
+
+        :param options:                 The report options.
+        :param payment_account_ids:     A tuple containing all account.account's ids being used in a liquidity journal.
+        :return:                        A list of tuple (account_id, account_code, account_name, account_type, amount).
+        '''
+
+        reconciled_account_ids = {column_group_key: set() for column_group_key in options['column_groups']}
+        reconciled_percentage_per_move = {column_group_key: {} for column_group_key in options['column_groups']}
+        currency_table = report._get_currency_table(options)
+
+        queries = []
+
+        for column_group_key, column_group_options in report._split_options_per_column_group(options).items():
+            move_ids_query = self._get_move_ids_query(report, payment_account_ids, column_group_options)
+
+            queries.append(SQL(
+                '''
+                (WITH payment_move_ids AS (%(move_ids_query)s)
+                SELECT
+                    %(column_group_key)s AS column_group_key,
+                    debit_line.move_id,
+                    debit_line.account_id,
+                    SUM(%(partial_amount)s) AS balance
+                FROM account_move_line AS credit_line
+                LEFT JOIN account_partial_reconcile
+                    ON account_partial_reconcile.credit_move_id = credit_line.id
+                JOIN %(currency_table)s
+                    ON account_currency_table.company_id = account_partial_reconcile.company_id
+                    AND account_currency_table.rate_type = 'current' -- For payable/receivable accounts it'll always be 'current' anyway
+                INNER JOIN account_move_line AS debit_line
+                    ON debit_line.id = account_partial_reconcile.debit_move_id
+                WHERE credit_line.move_id IN (SELECT unnest(payment_move_ids.move_id) FROM payment_move_ids)
+                    AND credit_line.account_id NOT IN %(payment_account_ids)s
+                    AND credit_line.credit > 0.0
+                    AND debit_line.move_id NOT IN (SELECT unnest(payment_move_ids.move_id) FROM payment_move_ids)
+                    AND account_partial_reconcile.max_date BETWEEN %(date_from)s AND %(date_to)s
+                GROUP BY debit_line.move_id, debit_line.account_id
+
+                UNION ALL
+
+                SELECT
+                    %(column_group_key)s AS column_group_key,
+                    credit_line.move_id,
+                    credit_line.account_id,
+                    -SUM(%(partial_amount)s) AS balance
+                FROM account_move_line AS debit_line
+                LEFT JOIN account_partial_reconcile
+                    ON account_partial_reconcile.debit_move_id = debit_line.id
+                JOIN %(currency_table)s
+                    ON account_currency_table.company_id = account_partial_reconcile.company_id
+                    AND account_currency_table.rate_type = 'current' -- For payable/receivable accounts it'll always be 'current' anyway
+                INNER JOIN account_move_line AS credit_line
+                    ON credit_line.id = account_partial_reconcile.credit_move_id
+                WHERE debit_line.move_id IN (SELECT unnest(payment_move_ids.move_id) FROM payment_move_ids)
+                    AND debit_line.account_id NOT IN %(payment_account_ids)s
+                    AND debit_line.debit > 0.0
+                    AND credit_line.move_id NOT IN (SELECT unnest(payment_move_ids.move_id) FROM payment_move_ids)
+                    AND account_partial_reconcile.max_date BETWEEN %(date_from)s AND %(date_to)s
+                GROUP BY credit_line.move_id, credit_line.account_id)
+                ''',
+                move_ids_query=move_ids_query,
+                column_group_key=column_group_key,
+                payment_account_ids=payment_account_ids,
+                date_from=column_group_options['date']['date_from'],
+                date_to=column_group_options['date']['date_to'],
+                currency_table=currency_table,
+                partial_amount=report._currency_table_apply_rate(SQL("account_partial_reconcile.amount")),
+            ))
+
+        self._cr.execute(SQL(' UNION ALL ').join(queries))
+
+        for aml_data in self._cr.dictfetchall():
+            reconciled_percentage_per_move[aml_data['column_group_key']].setdefault(aml_data['move_id'], {})
+            reconciled_percentage_per_move[aml_data['column_group_key']][aml_data['move_id']].setdefault(aml_data['account_id'], [0.0, 0.0])
+            reconciled_percentage_per_move[aml_data['column_group_key']][aml_data['move_id']][aml_data['account_id']][0] += aml_data['balance']
+
+            reconciled_account_ids[aml_data['column_group_key']].add(aml_data['account_id'])
+
+        if not reconciled_percentage_per_move:
+            return []
+
+        queries = []
+
+        for column in options['columns']:
+            queries.append(SQL(
+                '''
+                SELECT
+                    %(column_group_key)s AS column_group_key,
+                    account_move_line.move_id,
+                    account_move_line.account_id,
+                    SUM(%(balance_select)s) AS balance
+                FROM account_move_line
+                JOIN %(currency_table)s
+                    ON account_currency_table.company_id = account_move_line.company_id
+                    AND account_currency_table.rate_type = 'current' -- For payable/receivable accounts it'll always be 'current' anyway
+                WHERE account_move_line.move_id IN %(move_ids)s
+                    AND account_move_line.account_id IN %(account_ids)s
+                GROUP BY account_move_line.move_id, account_move_line.account_id
+                ''',
+                column_group_key=column['column_group_key'],
+                currency_table=currency_table,
+                balance_select=report._currency_table_apply_rate(SQL("account_move_line.balance")),
+                move_ids=tuple(reconciled_percentage_per_move[column['column_group_key']].keys()) or (None,),
+                account_ids=tuple(reconciled_account_ids[column['column_group_key']]) or (None,)
+            ))
+
+        self._cr.execute(SQL(' UNION ALL ').join(queries))
+
+        for aml_data in self._cr.dictfetchall():
+            if aml_data['account_id'] in reconciled_percentage_per_move[aml_data['column_group_key']][aml_data['move_id']]:
+                reconciled_percentage_per_move[aml_data['column_group_key']][aml_data['move_id']][aml_data['account_id']][1] += aml_data['balance']
+
+        reconciled_aml_per_account = {}
+
+        queries = []
+
+        query = Query(self.env, 'account_move_line')
+        account_alias = query.join(lhs_alias='account_move_line', lhs_column='account_id', rhs_table='account_account', rhs_column='id', link='account_id')
+        account_code = self.env['account.account']._field_to_sql(account_alias, 'code', query)
+        account_name = self.env['account.account']._field_to_sql(account_alias, 'name')
+        account_type = SQL.identifier(account_alias, 'account_type')
+
+        for column in options['columns']:
+            queries.append(SQL(
+                '''
+                SELECT
+                    %(column_group_key)s AS column_group_key,
+                    account_move_line.move_id,
+                    account_move_line.account_id,
+                    %(account_code)s AS account_code,
+                    %(account_name)s AS account_name,
+                    %(account_type)s AS account_account_type,
+                    account_account_account_tag.account_account_tag_id AS account_tag_id,
+                    SUM(%(balance_select)s) AS balance
+                FROM %(from_clause)s
+                %(currency_table_join)s
+                LEFT JOIN account_account_account_tag
+                    ON account_account_account_tag.account_account_id = account_move_line.account_id
+                    AND account_account_account_tag.account_account_tag_id IN %(cash_flow_tag_ids)s
+                WHERE account_move_line.move_id IN %(move_ids)s
+                GROUP BY account_move_line.move_id, account_move_line.account_id, %(account_code)s, %(account_name)s, account_account_type, account_account_account_tag.account_account_tag_id
+                ''',
+                column_group_key=column['column_group_key'],
+                account_code=account_code,
+                account_name=account_name,
+                account_type=account_type,
+                from_clause=query.from_clause,
+                currency_table_join=report._currency_table_aml_join(options),
+                balance_select=report._currency_table_apply_rate(SQL("account_move_line.balance")),
+                cash_flow_tag_ids=tuple(cash_flow_tag_ids),
+                move_ids=tuple(reconciled_percentage_per_move[column['column_group_key']].keys()) or (None,)
+            ))
+
+        self._cr.execute(SQL(' UNION ALL ').join(queries))
+
+        for aml_data in self._cr.dictfetchall():
+            aml_column_group_key = aml_data['column_group_key']
+            aml_move_id = aml_data['move_id']
+            aml_account_id = aml_data['account_id']
+            aml_account_code = aml_data['account_code']
+            aml_account_name = aml_data['account_name']
+            aml_account_account_type = aml_data['account_account_type']
+            aml_account_tag_id = aml_data['account_tag_id']
+            aml_balance = aml_data['balance']
+
+            # Compute the total reconciled for the whole move.
+            total_reconciled_amount = 0.0
+            total_amount = 0.0
+
+            for reconciled_amount, amount in reconciled_percentage_per_move[aml_column_group_key][aml_move_id].values():
+                total_reconciled_amount += reconciled_amount
+                total_amount += amount
+
+            # Compute matched percentage for each account.
+            if total_amount and aml_account_id not in reconciled_percentage_per_move[aml_column_group_key][aml_move_id]:
+                # Lines being on reconciled moves but not reconciled with any liquidity move must be valued at the
+                # percentage of what is actually paid.
+                reconciled_percentage = total_reconciled_amount / total_amount
+                aml_balance *= reconciled_percentage
+            elif not total_amount and aml_account_id in reconciled_percentage_per_move[aml_column_group_key][aml_move_id]:
+                # The total amount to reconcile is 0. In that case, only add entries being on these accounts. Otherwise,
+                # this special case will lead to an unexplained difference equivalent to the reconciled amount on this
+                # account.
+                # E.g:
+                #
+                # Liquidity move:
+                # Account         | Debit     | Credit
+                # --------------------------------------
+                # Bank            |           | 100
+                # Receivable      | 100       |
+                #
+                # Reconciled move:                          <- reconciled_amount=100, total_amount=0.0
+                # Account         | Debit     | Credit
+                # --------------------------------------
+                # Receivable      |           | 200
+                # Receivable      | 200       |             <- Only the reconciled part of this entry must be added.
+                aml_balance = -reconciled_percentage_per_move[aml_column_group_key][aml_move_id][aml_account_id][0]
+            else:
+                # Others lines are not considered.
+                continue
+
+            reconciled_aml_per_account.setdefault(aml_account_id, {})
+            reconciled_aml_per_account[aml_account_id].setdefault(aml_column_group_key, {
+                'column_group_key': aml_column_group_key,
+                'account_id': aml_account_id,
+                'account_code': aml_account_code,
+                'account_name': aml_account_name,
+                'account_account_type': aml_account_account_type,
+                'account_tag_id': aml_account_tag_id,
+                'balance': 0.0,
+            })
+
+            reconciled_aml_per_account[aml_account_id][aml_column_group_key]['balance'] -= aml_balance
+
+        return list(reconciled_aml_per_account.values())
+
+    # -------------------------------------------------------------------------
+    # COLUMNS / LINES
+    # -------------------------------------------------------------------------
+    def _get_layout_data(self):
+        # Indentation of the following dict reflects the structure of the report.
+        return {
+            'opening_balance': {'name': _('Cash and cash equivalents, beginning of period'), 'level': 0},
+            'net_increase': {'name': _('Net increase in cash and cash equivalents'), 'level': 0, 'unfolded': True},
+                'operating_activities': {'name': _('Cash flows from operating activities'), 'level': 2, 'parent_line_id': 'net_increase', 'class': 'fw-bold', 'unfolded': True},
+                    'advance_payments_customer': {'name': _('Advance Payments received from customers'), 'level': 4, 'parent_line_id': 'operating_activities'},
+                    'received_operating_activities': {'name': _('Cash received from operating activities'), 'level': 4, 'parent_line_id': 'operating_activities'},
+                    'advance_payments_suppliers': {'name': _('Advance payments made to suppliers'), 'level': 4, 'parent_line_id': 'operating_activities'},
+                    'paid_operating_activities': {'name': _('Cash paid for operating activities'), 'level': 4, 'parent_line_id': 'operating_activities'},
+                'investing_activities': {'name': _('Cash flows from investing & extraordinary activities'), 'level': 2, 'parent_line_id': 'net_increase', 'class': 'fw-bold', 'unfolded': True},
+                    'investing_activities_cash_in': {'name': _('Cash in'), 'level': 4, 'parent_line_id': 'investing_activities'},
+                    'investing_activities_cash_out': {'name': _('Cash out'), 'level': 4, 'parent_line_id': 'investing_activities'},
+                'financing_activities': {'name': _('Cash flows from financing activities'), 'level': 2, 'parent_line_id': 'net_increase', 'class': 'fw-bold', 'unfolded': True},
+                    'financing_activities_cash_in': {'name': _('Cash in'), 'level': 4, 'parent_line_id': 'financing_activities'},
+                    'financing_activities_cash_out': {'name': _('Cash out'), 'level': 4, 'parent_line_id': 'financing_activities'},
+                'unclassified_activities': {'name': _('Cash flows from unclassified activities'), 'level': 2, 'parent_line_id': 'net_increase', 'class': 'fw-bold', 'unfolded': True},
+                    'unclassified_activities_cash_in': {'name': _('Cash in'), 'level': 4, 'parent_line_id': 'unclassified_activities'},
+                    'unclassified_activities_cash_out': {'name': _('Cash out'), 'level': 4, 'parent_line_id': 'unclassified_activities'},
+            'closing_balance': {'name': _('Cash and cash equivalents, closing balance'), 'level': 0},
+        }
+
+    def _get_layout_line(self, report, options, layout_line_id, layout_line_data, report_data):
+        line_id = report._get_generic_line_id(None, None, markup=layout_line_id)
+        unfoldable = 'aml_groupby_account' in report_data[layout_line_id] if layout_line_id in report_data else False
+
+        column_values = []
+
+        for column in options['columns']:
+            expression_label = column['expression_label']
+            column_group_key = column['column_group_key']
+
+            value = report_data[layout_line_id][expression_label].get(column_group_key, 0.0) if layout_line_id in report_data else 0.0
+
+            column_values.append(report._build_column_dict(value, column, options=options))
+
+        return {
+            'id': line_id,
+            'name': layout_line_data['name'],
+            'level': layout_line_data['level'],
+            'class': layout_line_data.get('class', ''),
+            'columns': column_values,
+            'unfoldable': unfoldable,
+            'unfolded': line_id in options['unfolded_lines'] or layout_line_data.get('unfolded') or (options.get('unfold_all') and unfoldable),
+        }
+
+    def _get_aml_line(self, report, options, aml_data):
+        parent_line_id = report._get_generic_line_id(None, None, aml_data['parent_line_id'])
+        line_id = report._get_generic_line_id('account.account', aml_data['account_id'], parent_line_id=parent_line_id)
+
+        column_values = []
+
+        for column in options['columns']:
+            expression_label = column['expression_label']
+            column_group_key = column['column_group_key']
+
+            value = aml_data[expression_label].get(column_group_key, 0.0)
+
+            column_values.append(report._build_column_dict(value, column, options=options))
+
+        return {
+            'id': line_id,
+            'name': f"{aml_data['account_code']} {aml_data['account_name']}" if aml_data['account_code'] else aml_data['account_name'],
+            'caret_options': 'account.account',
+            'level': aml_data['level'],
+            'parent_id': parent_line_id,
+            'columns': column_values,
+        }
+
+    def _get_unexplained_difference_line(self, report, options, report_data):
+        unexplained_difference = False
+        column_values = []
+
+        for column in options['columns']:
+            expression_label = column['expression_label']
+            column_group_key = column['column_group_key']
+
+            opening_balance = report_data['opening_balance'][expression_label].get(column_group_key, 0.0) if 'opening_balance' in report_data else 0.0
+            closing_balance = report_data['closing_balance'][expression_label].get(column_group_key, 0.0) if 'closing_balance' in report_data else 0.0
+            net_increase = report_data['net_increase'][expression_label].get(column_group_key, 0.0) if 'net_increase' in report_data else 0.0
+
+            balance = closing_balance - opening_balance - net_increase
+
+            if not self.env.company.currency_id.is_zero(balance):
+                unexplained_difference = True
+
+            column_values.append(report._build_column_dict(
+                balance,
+                {
+                    'figure_type': 'monetary',
+                    'expression_label': 'balance',
+                },
+                options=options,
+            ))
+
+        if unexplained_difference:
+            return {
+                'id': report._get_generic_line_id(None, None, markup='unexplained_difference'),
+                'name': 'Unexplained Difference',
+                'level': 1,
+                'columns': column_values,
+            }
diff --git a/dev_odex30_accounting/odex30_account_reports/models/account_customer_statement.py b/dev_odex30_accounting/odex30_account_reports/models/account_customer_statement.py
new file mode 100644
index 0000000..c53756b
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_reports/models/account_customer_statement.py
@@ -0,0 +1,24 @@
+from odoo import models, _
+
+
+class CustomerStatementCustomHandler(models.AbstractModel):
+    _name = 'account.customer.statement.report.handler'
+    _inherit = 'account.partner.ledger.report.handler'
+    _description = 'Customer Statement Custom Handler'
+
+    def _get_custom_display_config(self):
+        display_config = super()._get_custom_display_config()
+        display_config['css_custom_class'] += ' customer_statement'
+        if self.env.ref('odex30_account_reports.pdf_export_main_customer_report', raise_if_not_found=False):
+            display_config.setdefault('pdf_export', {})['pdf_export_main'] = 'odex30_account_reports.pdf_export_main_customer_report'
+        return display_config
+
+    def _custom_options_initializer(self, report, options, previous_options):
+        super()._custom_options_initializer(report, options, previous_options)
+
+        options['buttons'].append({
+            'name': _('Send'),
+            'action': 'action_send_statements',
+            'sequence': 90,
+            'always_show': True,
+        })
diff --git a/dev_odex30_accounting/odex30_account_reports/models/account_deferred_reports.py b/dev_odex30_accounting/odex30_account_reports/models/account_deferred_reports.py
new file mode 100644
index 0000000..9732ba6
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_reports/models/account_deferred_reports.py
@@ -0,0 +1,659 @@
+import calendar
+from collections import defaultdict
+from dateutil.relativedelta import relativedelta
+
+from odoo import models, fields, _, api, Command
+from odoo.exceptions import UserError
+from odoo.tools import groupby, SQL
+from odoo.addons.odex30_account_accountant.models.account_move import DEFERRED_DATE_MIN, DEFERRED_DATE_MAX
+
+
+class DeferredReportCustomHandler(models.AbstractModel):
+    _name = 'account.deferred.report.handler'
+    _inherit = 'account.report.custom.handler'
+    _description = 'Deferred Expense Report Custom Handler'
+
+    def _get_deferred_report_type(self):
+        raise NotImplementedError("This method is not implemented in the deferred report handler.")
+
+
+    def _get_domain_fully_inside_period(self, options):
+        return [  # Exclude if entirely inside the period
+            '!', '&', '&', '&', '&', '&', '&', '&',
+                ('deferred_start_date', '!=', False),
+                ('deferred_end_date', '!=', False),
+                ('deferred_start_date', '>=', options['date']['date_from']),
+                ('deferred_start_date', '<=', options['date']['date_to']),
+                ('deferred_end_date', '>=', options['date']['date_from']),
+                ('deferred_end_date', '<=', options['date']['date_to']),
+                ('move_id.date', '>=', options['date']['date_from']),
+                ('move_id.date', '<=', options['date']['date_to']),
+        ]
+
+    def _get_domain(self, report, options, filter_already_generated=False, filter_not_started=False):
+        domain = report._get_options_domain(options, "from_beginning")
+        account_types = ('expense', 'expense_depreciation', 'expense_direct_cost') if self._get_deferred_report_type() == 'expense' else ('income', 'income_other')
+        domain += [
+            ('account_id.account_type', 'in', account_types),
+            ('deferred_start_date', '!=', False),
+            ('deferred_end_date', '!=', False),
+            ('deferred_end_date', '>=', options['date']['date_from']),
+            ('move_id.date', '<=', options['date']['date_to']),
+        ]
+        domain += self._get_domain_fully_inside_period(options)
+        if filter_already_generated:
+            # Avoid regenerating already generated deferrals
+            domain += [
+            ('deferred_end_date', '>=', options['date']['date_from']),
+            '!',
+                ('move_id.deferred_move_ids', 'any', [
+                    ('date', '=', options['date']['date_to']),
+                    '|',
+                        ('state', '=', 'posted'),  # Either posted
+                        '&',  # Or autoposted in the future
+                            ('auto_post', '=', 'at_date'),
+                            ('date', '>=', fields.Date.context_today(self)),
+                ])
+        ]
+        if filter_not_started:
+            domain += [('deferred_start_date', '>', options['date']['date_to'])]
+        return domain
+
+    @api.model
+    def _get_select(self, options):
+        account_name = self.env['account.account']._field_to_sql('account_move_line__account_id', 'name')
+        return [
+            SQL("account_move_line.id AS line_id"),
+            SQL("account_move_line.account_id AS account_id"),
+            SQL("account_move_line.partner_id AS partner_id"),
+            SQL("account_move_line.product_id AS product_id"),
+            SQL("account_move_line__product_template_id.categ_id AS product_category_id"),
+            SQL("account_move_line.name AS line_name"),
+            SQL("account_move_line.deferred_start_date AS deferred_start_date"),
+            SQL("account_move_line.deferred_end_date AS deferred_end_date"),
+            SQL("account_move_line.deferred_end_date - account_move_line.deferred_start_date AS diff_days"),
+            SQL("account_move_line.balance AS balance"),
+            SQL("account_move_line.analytic_distribution AS analytic_distribution"),
+            SQL("account_move_line__move_id.id as move_id"),
+            SQL("account_move_line__move_id.name AS move_name"),
+            SQL("""
+                NOT (
+                    account_move_line.deferred_end_date >= %(report_date_from)s
+                    AND
+                    NOT EXISTS (
+                         SELECT 1 
+                           FROM account_move_deferred_rel AS amdr
+                      LEFT JOIN account_move AS am ON amdr.deferred_move_id = am.id
+                          WHERE amdr.original_move_id = account_move_line.move_id
+                            AND am.date = %(report_date_to)s
+                            AND (
+                                 am.state = 'posted' 
+                                 OR (am.auto_post = 'at_date' AND am.date >= %(today)s)
+                                )
+                    )
+                ) AS is_already_generated
+            """,
+                report_date_from=options['date']['date_from'],
+                report_date_to=options['date']['date_to'],
+                today=fields.Date.context_today(self),
+            ),
+            SQL("%s AS account_name", account_name),
+        ]
+
+    def _get_lines(self, report, options, filter_already_generated=False):
+        if 'report_deferred_lines' not in self.env.cr.cache:
+            self._fetch_lines(report, options, filter_already_generated)
+
+        if not filter_already_generated:
+            # No more filtering needed, we can reuse the cached result
+            return self.env.cr.cache['report_deferred_lines'].values()
+        else:
+            # Filter the cached result to only keep the lines that are not already generated
+            cached_lines = self.env.cr.cache['report_deferred_lines'].values()
+            return [cached_line for cached_line in cached_lines if not cached_line['is_already_generated']]
+
+    def _fetch_lines(self, report, options, filter_already_generated):
+        """Fetch the lines that need to be deferred from the DB and store them in the cache for later reuse"""
+        domain = self._get_domain(report, options, filter_already_generated)
+        query = report._get_report_query(options, domain=domain, date_scope='from_beginning')
+        select_clause = SQL(', ').join(self._get_select(options))
+
+        query = SQL(
+            """
+            SELECT %(select_clause)s
+            FROM %(table_references)s
+            LEFT JOIN product_product AS account_move_line__product_id ON account_move_line.product_id = account_move_line__product_id.id
+        LEFT JOIN product_template AS account_move_line__product_template_id ON account_move_line__product_id.product_tmpl_id = account_move_line__product_template_id.id
+        WHERE %(search_condition)s
+            ORDER BY account_move_line.deferred_start_date, account_move_line.id
+            """,
+            select_clause=select_clause,
+            table_references=query.from_clause,
+            search_condition=query.where_clause,
+        )
+
+        self.env.cr.execute(query)
+        # Cache the result so that it can be reused to check whether a warning banner should be shown
+        # only if it's the generic query (so without filtering already generated deferrals)
+        self.env.cr.cache['report_deferred_lines'] = {
+            r['line_id']: r for r in self.env.cr.dictfetchall()
+        }
+
+    @api.model
+    def _get_grouping_fields_deferred_lines(self, filter_already_generated=False, grouping_field='account_id'):
+        return (grouping_field,)
+
+    @api.model
+    def _group_by_deferred_fields(self, line, filter_already_generated=False, grouping_field='account_id'):
+        return tuple(line[k] for k in self._get_grouping_fields_deferred_lines(filter_already_generated, grouping_field))
+
+    @api.model
+    def _get_grouping_fields_deferral_lines(self):
+        return ()
+
+    @api.model
+    def _group_by_deferral_fields(self, line):
+        return tuple(line[k] for k in self._get_grouping_fields_deferral_lines())
+
+    @api.model
+    def _group_deferred_amounts_by_grouping_field(self, deferred_amounts_by_line, periods, is_reverse, filter_already_generated=False, grouping_field='account_id'):
+        """
+        Groups the deferred amounts by account and computes the totals for each account for each period.
+        And the total for all accounts for each period.
+        E.g. (where period1 = (date1, date2, label1), period2 = (date2, date3, label2), ...)
+        {
+            self._get_grouping_keys_deferred_lines(): {
+                'account_id': account1, 'amount_total': 600, period_1: 200, period_2: 400
+            },
+            self._get_grouping_keys_deferred_lines(): {
+                'account_id': account2, 'amount_total': 700, period_1: 300, period_2: 400
+            },
+        }, {'totals_aggregated': 1300, period_1: 500, period_2: 800}
+        """
+        deferred_amounts_by_line = groupby(deferred_amounts_by_line, key=lambda x: self._group_by_deferred_fields(x, filter_already_generated, grouping_field))
+        totals_per_key = {}  # {key: {**self._get_grouping_fields_deferral_lines(), total, before, current, later}}
+        totals_aggregated_by_period = {period: 0 for period in periods + ['totals_aggregated']}
+        sign = 1 if is_reverse else -1
+        for key, lines_per_key in deferred_amounts_by_line:
+            lines_per_key = list(lines_per_key)
+            current_key_totals = self._get_current_key_totals_dict(lines_per_key, sign)
+            totals_aggregated_by_period['totals_aggregated'] += current_key_totals['amount_total']
+            for period in periods:
+                current_key_totals[period] = sign * sum(line[period] for line in lines_per_key)
+                totals_aggregated_by_period[period] += self.env.company.currency_id.round(current_key_totals[period])
+            totals_per_key[key] = current_key_totals
+        return totals_per_key, totals_aggregated_by_period
+
+    ###########################
+    # DEFERRED REPORT DISPLAY #
+    ###########################
+
+    def _get_custom_display_config(self):
+        return {
+            'templates': {
+                'AccountReportFilters': 'odex30_account_reports.DeferredFilters',
+            },
+        }
+
+    def _custom_options_initializer(self, report, options, previous_options):
+        super()._custom_options_initializer(report, options, previous_options=previous_options)
+
+        options_per_col_group = report._split_options_per_column_group(options)
+        for column_dict in options['columns']:
+            column_options = options_per_col_group[column_dict['column_group_key']]
+            column_dict['name'] = column_options['date']['string']
+            column_dict['date_from'] = column_options['date']['date_from']
+            column_dict['date_to'] = column_options['date']['date_to']
+
+        options['columns'] = list(reversed(options['columns']))
+        total_column = [{
+            **options['columns'][0],
+            'name': _('Total'),
+            'expression_label': 'total',
+            'date_from': DEFERRED_DATE_MIN,
+            'date_to': DEFERRED_DATE_MAX,
+        }]
+        not_started_column = [{
+            **options['columns'][0],
+            'name': _('Not Started'),
+            'expression_label': 'not_started',
+            'date_from': options['columns'][-1]['date_to'],
+            'date_to': DEFERRED_DATE_MAX,
+        }]
+        before_column = [{
+            **options['columns'][0],
+            'name': _('Before'),
+            'expression_label': 'before',
+            'date_from': DEFERRED_DATE_MIN,
+            'date_to': fields.Date.to_string(fields.Date.to_date(options['columns'][0]['date_from']) - relativedelta(days=1)),
+        }]
+        later_column = [{
+            **options['columns'][0],
+            'name': _('Later'),
+            'expression_label': 'later',
+            'date_from': fields.Date.to_string(fields.Date.to_date(options['columns'][-1]['date_to']) + relativedelta(days=1)),
+            'date_to': DEFERRED_DATE_MAX,
+        }]
+        options['columns'] = total_column + not_started_column + before_column + options['columns'] + later_column
+        options['column_headers'] = []
+        options['deferred_report_type'] = self._get_deferred_report_type()
+        options['deferred_grouping_field'] = previous_options.get('deferred_grouping_field') or 'account_id'
+        if (
+            self._get_deferred_report_type() == 'expense' and self.env.company.generate_deferred_expense_entries_method == 'manual'
+            or self._get_deferred_report_type() == 'revenue' and self.env.company.generate_deferred_revenue_entries_method == 'manual'
+        ):
+            options['buttons'].append({'name': _('Generate entry'), 'action': 'action_generate_entry', 'sequence': 80, 'always_show': True})
+
+    def action_audit_cell(self, options, params):
+        """ Open a list of invoices/bills and/or deferral entries for the clicked cell in a deferred report.
+
+        Specifically, we show the following lines, grouped by their journal entry, filtered by the column date bounds:
+        - Total: Lines of all invoices/bills being deferred in the current period
+        - Not Started: Lines of all deferral entries for which the original invoice/bill date is before or in the
+                       current period, but the deferral only starts after the current period, as well as the lines of
+                       their original invoices/bills
+        - Before: Lines of all deferral entries with a date before the current period, created by invoices/bills also
+                  being deferred in the current period, as well as the lines of their original invoices/bills
+        - Current: Lines of all deferral entries in the current period, as well as these of their original
+                   invoices/bills
+        - Later: Lines of all deferral entries with a date after the current period, created by invoices/bills also
+                 being deferred in the current period, as well as the lines of their original invoices/bills
+
+        :param dict options: the report's `options`
+        :param dict params:  a dict containing:
+                                 `calling_line_dict_id`: line id containing the optional account of the cell
+                                 `column_group_id`: the column group id of the cell
+                                 `expression_label`: the expression label of the cell
+        """
+        report = self.env['account.report'].browse(options['report_id'])
+        column_values = next(
+            (column for column in options['columns'] if (
+                column['column_group_key'] == params.get('column_group_key')
+                and column['expression_label'] == params.get('expression_label')
+            )),
+            None
+        )
+        if not column_values:
+            return
+
+        column_date_from = fields.Date.to_date(column_values['date_from'])
+        column_date_to = fields.Date.to_date(column_values['date_to'])
+        report_date_from = fields.Date.to_date(options['date']['date_from'])
+        report_date_to = fields.Date.to_date(options['date']['date_to'])
+
+        # Corrections for comparisons
+        if column_values['expression_label'] in ('not_started', 'later'):
+            # Not Started and Later period start one day after `report_date_to`
+            column_date_from = report_date_to + relativedelta(days=1)
+        if column_values['expression_label'] == 'before':
+            # Before period ends one day before `report_date_from`
+            column_date_to = report_date_from - relativedelta(days=1)
+
+        # calling_line_dict_id is of the format `~account.report~15|~account.account~25`
+        _grouping_model, grouping_record_id = report._get_model_info_from_id(params.get('calling_line_dict_id'))
+
+        # Find the original lines to be deferred in the report period
+        original_move_lines_domain = self._get_domain(
+            report, options, filter_not_started=column_values['expression_label'] == 'not_started'
+        )
+        if grouping_record_id:
+            # We're auditing a specific account, so we only want moves containing this account
+            original_move_lines_domain.append((options['deferred_grouping_field'], '=', grouping_record_id))
+        # We're getting all lines from the concerned moves. They are filtered later for flexibility.
+        original_moves = self.env['account.move.line'].search(original_move_lines_domain).move_id
+
+        domain = [
+            # For the Total period only show the original move lines
+            '&',
+                ('move_id', 'in', original_moves.ids),
+                ('deferred_end_date', '>=', report_date_from),
+        ]
+
+        # Show both the original move lines and deferral move lines for all other periods
+        if column_values['expression_label'] != 'total' and original_moves.deferred_move_ids:
+            domain = ['|'] + [('move_id', 'in', original_moves.deferred_move_ids.ids)] + domain
+
+        if column_values['expression_label'] == 'not_started':
+            domain += [('deferred_start_date', '>=', column_date_from)]
+        else:
+            # If in manually & grouped mode, and deferrals have not yet been generated
+            # so no move with `date` set => instead show the candidates original deferred moves that
+            # will be deferred upon clicking the button. If totally/partially generated, we'll just
+            # use the `date` filter which will include both the originals and deferrals.
+            if not original_moves.deferred_move_ids:
+                domain += [
+                    ('deferred_start_date', '<=', column_date_to),
+                    ('deferred_end_date', '>=', column_date_from),
+                ]
+            else:
+                domain += [
+                    ('date', '>=', column_date_from),
+                    ('date', '<=', column_date_to),
+                ]
+        domain += self._get_domain_fully_inside_period(options)
+
+        return {
+            'type': 'ir.actions.act_window',
+            'name': _('Deferred Entries'),
+            'res_model': 'account.move.line',
+            'domain': domain,
+            'views': [(self.env.ref('odex30_account_accountant.view_deferred_entries_tree').id, 'list'), (False, 'pivot'), (False, 'graph'), (False, 'kanban')],
+            # Most filters are set here to allow auditing flexibility to the user
+            'context': {
+                'search_default_pl_accounts': True,
+                f'search_default_{options["deferred_grouping_field"]}': grouping_record_id,
+                'expand': True,
+            },
+        }
+
+    def _caret_options_initializer(self):
+        return {
+            'deferred_caret': [
+                {'name': _("Journal Items"), 'action': 'open_journal_items'},
+            ],
+        }
+
+    def _customize_warnings(self, report, options, all_column_groups_expression_totals, warnings):
+        if (
+            self._get_deferred_report_type() == 'expense' and self.env.company.generate_deferred_expense_entries_method == 'manual'
+            or self._get_deferred_report_type() == 'revenue' and self.env.company.generate_deferred_revenue_entries_method == 'manual'
+        ):
+            already_generated = self.env['account.move'].search_count(
+                report._get_generated_deferral_entries_domain(options)
+            )
+            # This will trigger a second _get_lines call, however the first one was cached, so we just need to filter again on the cache (see _get_lines)
+            moves_lines_to_generate, __, __, __, __ = self._get_moves_to_defer(options)
+            if moves_lines_to_generate and already_generated:
+                warnings['odex30_account_reports.deferred_report_warning_partially_generated'] = {'alert_type': 'warning'}
+            elif moves_lines_to_generate:
+                warnings['odex30_account_reports.deferred_report_warning_never_generated'] = {'alert_type': 'warning'}
+            elif already_generated:
+                warnings['odex30_account_reports.deferred_report_info_fully_generated'] = {'alert_type': 'info'}
+
+
+    def open_journal_items(self, options, params):
+        report = self.env['account.report'].browse(options['report_id'])
+        record_model, record_id = report._get_model_info_from_id(params.get('line_id'))
+        domain = self._get_domain(report, options)
+        if record_model == 'account.account' and record_id:
+            domain += [('account_id', '=', record_id)]
+        elif record_model == 'product.product' and record_id:
+            domain += [('product_id', '=', record_id)]
+        elif record_model == 'product.category' and record_id:
+            domain += [('product_category_id', '=', record_id)]
+        return {
+            'type': 'ir.actions.act_window',
+            'name': _("Deferred Entries"),
+            'res_model': 'account.move.line',
+            'domain': domain,
+            'views': [(self.env.ref('odex30_account_accountant.view_deferred_entries_tree').id, 'list')],
+            'context': {
+                'search_default_group_by_move': True,
+                'expand': True,
+            }
+        }
+
+    def _dynamic_lines_generator(self, report, options, all_column_groups_expression_totals, warnings=None):
+        def get_columns(totals):
+            return [
+                {
+                    **report._build_column_dict(
+                        totals[(
+                            fields.Date.to_date(column['date_from']),
+                            fields.Date.to_date(column['date_to']),
+                            column['expression_label']
+                        )],
+                        column,
+                        options=options,
+                        currency=self.env.company.currency_id,
+                    ),
+                    'auditable': True,
+                }
+                for column in options['columns']
+            ]
+
+        lines = self._get_lines(report, options)
+        periods = [
+            (
+                fields.Date.from_string(column['date_from']),
+                fields.Date.from_string(column['date_to']),
+                column['expression_label'],
+            )
+            for column in options['columns']
+        ]
+        deferred_amounts_by_line = self.env['account.move']._get_deferred_amounts_by_line(lines, periods, self._get_deferred_report_type())
+        totals_per_grouping_field, totals_all_grouping_field = self._group_deferred_amounts_by_grouping_field(
+            deferred_amounts_by_line=deferred_amounts_by_line,
+            periods=periods,
+            is_reverse=self._get_deferred_report_type() == 'expense',
+            filter_already_generated=False,
+            grouping_field=options['deferred_grouping_field'],
+        )
+
+        report_lines = []
+        grouping_model = self.env['account.move.line'][options['deferred_grouping_field']]._name
+        for totals_grouping_field in totals_per_grouping_field.values():
+            grouping_record = self.env[grouping_model].browse(totals_grouping_field[options['deferred_grouping_field']])
+            grouping_field_description = self.env['account.move.line'][options['deferred_grouping_field']]._description
+            if options['deferred_grouping_field'] == 'product_id':
+                grouping_field_description = _("Product")
+            grouping_name = grouping_record.display_name or _("(No %s)", grouping_field_description)
+            report_lines.append((0, {
+                'id': report._get_generic_line_id(grouping_model, grouping_record.id),
+                'name': grouping_name,
+                'caret_options': 'deferred_caret',
+                'level': 1,
+                'columns': get_columns(totals_grouping_field),
+            }))
+        if totals_per_grouping_field:
+            report_lines.append((0, {
+                'id': report._get_generic_line_id(None, None, markup='total'),
+                'name': 'Total',
+                'level': 1,
+                'columns': get_columns(totals_all_grouping_field),
+            }))
+
+        return report_lines
+
+    #######################
+    # DEFERRED GENERATION #
+    #######################
+
+    def action_generate_entry(self, options):
+        new_deferred_moves = self._generate_deferral_entry(options)
+        return {
+            'name': _('Deferred Entries'),
+            'type': 'ir.actions.act_window',
+            'views': [(False, "list"), (False, "form")],
+            'domain': [('id', 'in', new_deferred_moves.ids)],
+            'res_model': 'account.move',
+            'context': {
+                'search_default_group_by_move': True,
+                'expand': True,
+            },
+            'target': 'current',
+        }
+
+    def _get_moves_to_defer(self, options):
+        date_from = fields.Date.to_date(DEFERRED_DATE_MIN)
+        date_to = fields.Date.from_string(options['date']['date_to'])
+        if date_to.day != calendar.monthrange(date_to.year, date_to.month)[1]:
+            raise UserError(_("You cannot generate entries for a period that does not end at the end of the month."))
+        options['all_entries'] = False  # We only want to create deferrals for posted moves
+        report = self.env["account.report"].browse(options["report_id"])
+        self.env['account.move.line'].flush_model()
+        lines = self._get_lines(report, options, filter_already_generated=True)
+        deferral_entry_period = self.env['account.report']._get_dates_period(date_from, date_to, 'range', period_type='month')
+        ref = _("Grouped Deferral Entry of %s", deferral_entry_period['string'])
+        ref_rev = _("Reversal of Grouped Deferral Entry of %s", deferral_entry_period['string'])
+        deferred_account = self.env.company.deferred_expense_account_id if self._get_deferred_report_type() == 'expense' else self.env.company.deferred_revenue_account_id
+        move_lines, original_move_ids = self._get_deferred_lines(lines, deferred_account, (date_from, date_to, 'current'), self._get_deferred_report_type() == 'expense', ref)
+        return move_lines, original_move_ids, ref, ref_rev, date_to
+
+    def _generate_deferral_entry(self, options):
+        journal = self.env.company.deferred_expense_journal_id if self._get_deferred_report_type() == "expense" else self.env.company.deferred_revenue_journal_id
+        if not journal:
+            raise UserError(_("Please set the deferred journal in the accounting settings."))
+        move_lines, original_move_ids, ref, ref_rev, date_to = self._get_moves_to_defer(options)
+        if self.env.company._get_violated_lock_dates(date_to, False, journal):
+            raise UserError(_("You cannot generate entries for a period that is locked."))
+        if not move_lines:
+            raise UserError(_("No entry to generate."))
+
+        deferred_move = self.env['account.move'].with_context(skip_account_deprecation_check=True).create({
+            'move_type': 'entry',
+            'deferred_original_move_ids': [Command.set(original_move_ids)],
+            'journal_id': journal.id,
+            'date': date_to,
+            'auto_post': 'at_date',
+            'ref': ref,
+        })
+        # We write the lines after creation, to make sure the `deferred_original_move_ids` is set.
+        # This way we can avoid adding taxes for deferred moves.
+        deferred_move.write({'line_ids': move_lines})
+        reverse_move = deferred_move._reverse_moves()
+        reverse_move.write({
+            'date': deferred_move.date + relativedelta(days=1),
+            'ref': ref_rev,
+        })
+        reverse_move.line_ids.name = ref_rev
+        new_deferred_moves = deferred_move + reverse_move
+        # We create the relation (original deferred move, deferral entry)
+        # using SQL. This avoids a MemoryError using the ORM which will
+        # load huge amounts of moves in memory for nothing
+        self.env.cr.execute_values("""
+            INSERT INTO account_move_deferred_rel(original_move_id, deferred_move_id)
+                 VALUES %s
+            ON CONFLICT DO NOTHING
+        """, [
+            (original_move_id, deferral_move.id)
+            for original_move_id in original_move_ids
+            for deferral_move in new_deferred_moves
+        ])
+        new_deferred_moves.invalidate_recordset()
+        new_deferred_moves._post(soft=True)
+        return new_deferred_moves
+
+    @api.model
+    def _get_current_key_totals_dict(self, lines_per_key, sign):
+        return {
+            'account_id': lines_per_key[0]['account_id'],
+            'product_id': lines_per_key[0]['product_id'],
+            'product_category_id': lines_per_key[0]['product_category_id'],
+            'amount_total': sign * sum(line['balance'] for line in lines_per_key),
+            'move_ids': {line['move_id'] for line in lines_per_key},
+        }
+
+    @api.model
+    def _get_deferred_lines(self, lines, deferred_account, period, is_reverse, ref):
+        """
+        Returns a list of Command objects to create the deferred lines of a single given period.
+        And the move_ids of the original lines that created these deferred
+        (to keep track of the original invoice in the deferred entries).
+        """
+        if not deferred_account:
+            raise UserError(_("Please set the deferred accounts in the accounting settings."))
+
+        deferred_amounts_by_line = self.env['account.move']._get_deferred_amounts_by_line(lines, [period], is_reverse)
+        deferred_amounts_by_key, deferred_amounts_totals = self._group_deferred_amounts_by_grouping_field(deferred_amounts_by_line, [period], is_reverse, filter_already_generated=True)
+        totals_aggregated = deferred_amounts_totals['totals_aggregated']
+        if totals_aggregated == deferred_amounts_totals[period]:
+            return [], set()
+
+        # compute analytic distribution to populate on deferred lines
+        # structure: {self._get_grouping_keys_deferred_lines(): [analytic distribution]}
+        # dict of keys: self._get_grouping_keys_deferred_lines()
+        #         values: dict of keys: "account.analytic.account.id" (string)
+        #                         values: float
+        anal_dist_by_key = defaultdict(lambda: defaultdict(float))
+        # using another var for the analytic distribution of the deferral account
+        deferred_anal_dist = defaultdict(lambda: defaultdict(float))
+        for line in lines:
+            if not line['analytic_distribution']:
+                continue
+            # Analytic distribution should be computed from the lines with the same _get_grouping_keys_deferred_lines(), except for
+            # the deferred line with the deferral account which will use _get_grouping_fields_deferral_lines()
+            sign = 1 if is_reverse else -1
+            key_amount = deferred_amounts_by_key.get(self._group_by_deferred_fields(line, True))
+            total_amount = key_amount.get('amount_total')
+            key_ratio = sign * line['balance'] / total_amount if total_amount else 0
+            full_ratio = sign * line['balance'] / totals_aggregated if totals_aggregated else 0
+
+            for account_id, distribution in line['analytic_distribution'].items():
+                anal_dist_by_key[self._group_by_deferred_fields(line, True)][account_id] += distribution * key_ratio
+                deferred_anal_dist[self._group_by_deferral_fields(line)][account_id] += distribution * full_ratio
+
+        remaining_balance = 0
+        deferred_lines = []
+        original_move_ids = set()
+        for key, line in deferred_amounts_by_key.items():
+            for balance in (-line['amount_total'], line[period]):
+                if balance != 0 and line[period] != line['amount_total']:
+                    original_move_ids |= line['move_ids']
+                    deferred_balance = self.env.company.currency_id.round((1 if is_reverse else -1) * balance)
+                    deferred_lines.append(
+                        Command.create(
+                            self.env['account.move.line']._get_deferred_lines_values(
+                                account_id=line['account_id'],
+                                balance=deferred_balance,
+                                ref=ref,
+                                analytic_distribution=anal_dist_by_key[key] or False,
+                                line=line,
+                            )
+                        )
+                    )
+                    remaining_balance += deferred_balance
+
+        grouped_by_key = {
+            key: list(value)
+            for key, value in groupby(
+                deferred_amounts_by_key.values(),
+                key=self._group_by_deferral_fields,
+            )
+        }
+        deferral_lines = []
+        for key, lines_per_key in grouped_by_key.items():
+            balance = 0
+            for line in lines_per_key:
+                if line[period] != line['amount_total']:
+                    balance += self.env.company.currency_id.round((1 if is_reverse else -1) * (line['amount_total'] - line[period]))
+            deferral_lines.append(
+                Command.create(
+                    self.env['account.move.line']._get_deferred_lines_values(
+                        account_id=deferred_account.id,
+                        balance=balance,
+                        ref=ref,
+                        analytic_distribution=deferred_anal_dist[key] or False,
+                        line=lines_per_key[0],
+                    )
+                )
+            )
+            remaining_balance += balance
+
+        if not self.env.company.currency_id.is_zero(remaining_balance):
+            deferral_lines.append(
+                Command.create({
+                    'account_id': deferred_account.id,
+                    'balance': -remaining_balance,
+                    'name': ref,
+                })
+            )
+        return deferred_lines + deferral_lines, original_move_ids
+
+
+class DeferredExpenseCustomHandler(models.AbstractModel):
+    _name = 'account.deferred.expense.report.handler'
+    _inherit = 'account.deferred.report.handler'
+    _description = 'Deferred Expense Custom Handler'
+
+    def _get_deferred_report_type(self):
+        return 'expense'
+
+
+class DeferredRevenueCustomHandler(models.AbstractModel):
+    _name = 'account.deferred.revenue.report.handler'
+    _inherit = 'account.deferred.report.handler'
+    _description = 'Deferred Revenue Custom Handler'
+
+    def _get_deferred_report_type(self):
+        return 'revenue'
diff --git a/dev_odex30_accounting/odex30_account_reports/models/account_fiscal_position.py b/dev_odex30_accounting/odex30_account_reports/models/account_fiscal_position.py
new file mode 100644
index 0000000..bcba747
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_reports/models/account_fiscal_position.py
@@ -0,0 +1,19 @@
+from odoo import models
+
+
+class AccountFiscalPosition(models.Model):
+    _inherit = 'account.fiscal.position'
+
+    def _inverse_foreign_vat(self):
+        # EXTENDS account
+        super()._inverse_foreign_vat()
+        for fpos in self:
+            if fpos.foreign_vat:
+                fpos._create_draft_closing_move_for_foreign_vat()
+
+    def _create_draft_closing_move_for_foreign_vat(self):
+        self.ensure_one()
+        existing_draft_closings = self.env['account.move'].search([('tax_closing_report_id', '!=', False), ('state', '=', 'draft')])
+        for closing_date, entries in existing_draft_closings.grouped('date').items():
+            for entry in entries:
+                self.company_id._get_and_update_tax_closing_moves(closing_date, entry.tax_closing_report_id, fiscal_positions=self)
diff --git a/dev_odex30_accounting/odex30_account_reports/models/account_followup_report.py b/dev_odex30_accounting/odex30_account_reports/models/account_followup_report.py
new file mode 100644
index 0000000..2b3d59e
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_reports/models/account_followup_report.py
@@ -0,0 +1,109 @@
+from odoo import fields, models, _
+from odoo.tools import SQL
+
+
+class AccountFollowupCustomHandler(models.AbstractModel):
+    _name = 'account.followup.report.handler'
+    _inherit = 'account.partner.ledger.report.handler'
+    _description = 'Follow-Up Report Custom Handler'
+
+    def _custom_options_initializer(self, report, options, previous_options):
+        super()._custom_options_initializer(report, options, previous_options)
+
+        options['hide_initial_balance'] = True
+        if len(options['partner_ids']) == 1:
+            options['ignore_totals_below_sections'] = True
+            options['hide_partner_totals'] = True
+
+        if options['report_id'] != previous_options.get('report_id'):
+            options['unreconciled'] = True
+            # by default, select only the 'sales' journals
+            for journal in options.get('journals', []):
+                journal['selected'] = journal.get('type') != 'general'  # dividers don't get a type
+            # Since we forced the selection of some journal, we need to recompute the filter label
+            report._init_options_journals_names(options, previous_options=previous_options)
+
+    def _get_custom_display_config(self):
+        display_config = super()._get_custom_display_config()
+        if self.env.ref('odex30_account_reports.pdf_export_main_customer_report', raise_if_not_found=False):
+            display_config.setdefault('pdf_export', {})['pdf_export_main'] = 'odex30_account_reports.pdf_export_main_customer_report'
+        return display_config
+
+    def _filter_overdue_amls_from_results(self, aml_results):
+        return list(filter(lambda aml: aml['date_maturity'] and aml['date_maturity'] < fields.Date.today(), aml_results))
+
+    def _filter_due_amls_from_results(self, aml_results):
+        return list(filter(lambda aml: not aml['date_maturity'] or aml['date_maturity'] >= fields.Date.today(), aml_results))
+
+    def _get_partner_aml_report_lines(self, report, options, partner_line_id, aml_results, progress, offset=0, level_shift=0):
+
+        def create_status_line(status_name):
+            return {
+                'id': report._get_generic_line_id(None, None, markup=status_name, parent_line_id=partner_line_id),
+                'name': status_name,
+                'level': 3 + level_shift,
+                'parent_id': partner_line_id,
+                'columns': [{} for _col in options['columns']],
+                'unfolded': True,
+            }
+
+        def get_aml_lines_with_status_line(status_name, status_line_id, aml_values, treated_results_count, progress):
+            lines = []
+            next_progress = progress
+            has_more = False
+
+            if not status_line_id or offset == 0:
+                status_line = create_status_line(status_name)
+                lines.append(status_line)
+                status_line_id = status_line['id']
+
+            for aml_value in aml_values:
+                if self._is_report_limit_reached(report, options, treated_results_count):
+                    # We loaded one more than the limit on purpose: this way we know we need a "load more" line
+                    has_more = True
+                    break
+
+                aml_report_line = self._get_report_line_move_line(options, aml_value, status_line_id, next_progress, level_shift=level_shift + 1)
+                lines.append(aml_report_line)
+                next_progress = self._init_load_more_progress(options, aml_report_line)
+                treated_results_count += 1
+
+            return lines, next_progress, treated_results_count, has_more
+
+        lines = []
+        next_progress = progress
+        has_more = False
+        treated_results_count = 0
+        due_line_id, overdue_line_id = self._get_unfolded_partner_status_lines(report, options, partner_line_id)
+
+        overdue_aml_values = self._filter_overdue_amls_from_results(aml_results)
+        due_aml_values = self._filter_due_amls_from_results(aml_results)
+
+        if overdue_aml_values:
+            overdue_lines, next_progress, treated_results_count, has_more = get_aml_lines_with_status_line(_('Overdue'), overdue_line_id, overdue_aml_values, treated_results_count, next_progress)
+            lines.extend(overdue_lines)
+            # If we reached the limit just before the due line and have already loaded one extra line, we should skip the due line for now and add a "load more" line
+            if self._is_report_limit_reached(report, options, treated_results_count) and due_aml_values:
+                has_more = True
+
+        if due_aml_values and not has_more:
+            due_lines, next_progress, treated_results_count, has_more = get_aml_lines_with_status_line(_('Due'), due_line_id, due_aml_values, treated_results_count, next_progress)
+            lines.extend(due_lines)
+
+        return lines, next_progress, treated_results_count, has_more
+
+    def _get_unfolded_partner_status_lines(self, report, options, partner_line_id):
+        _dummy1, _dummy2, partner_id = report._parse_line_id(partner_line_id)[-1]
+        due_line_id, overdue_line_id = None, None
+        for line_id in options['unfolded_lines']:
+            res_ids_map = report._get_res_ids_from_line_id(line_id, ['account.report', 'res.partner'])
+            if res_ids_map['account.report'] == report.id and res_ids_map['res.partner'] == partner_id:
+                markup, _dummy1, _dummy2 = report._parse_line_id(line_id)[-1]
+                if markup == 'Due':
+                    due_line_id = line_id
+                if markup == 'Overdue':
+                    overdue_line_id = line_id
+        return due_line_id, overdue_line_id
+
+    def _get_order_by_aml_values(self):
+        return SQL('account_move_line.date_maturity, %(order_by)s', order_by=super()._get_order_by_aml_values())
diff --git a/dev_odex30_accounting/odex30_account_reports/models/account_general_ledger.py b/dev_odex30_accounting/odex30_account_reports/models/account_general_ledger.py
new file mode 100644
index 0000000..6c065f7
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_reports/models/account_general_ledger.py
@@ -0,0 +1,761 @@
+import json
+
+from odoo import models, fields, api, _
+from odoo.tools.misc import format_date
+from odoo.tools import get_lang, SQL
+from odoo.exceptions import UserError
+
+from datetime import timedelta
+from collections import defaultdict
+
+
+class GeneralLedgerCustomHandler(models.AbstractModel):
+    _name = 'account.general.ledger.report.handler'
+    _inherit = 'account.report.custom.handler'
+    _description = 'General Ledger Custom Handler'
+
+    def _get_custom_display_config(self):
+        return {
+            'templates': {
+                'AccountReportLineName': 'odex30_account_reports.GeneralLedgerLineName',
+            },
+        }
+
+    def _custom_options_initializer(self, report, options, previous_options):
+        # Remove multi-currency columns if needed
+        super()._custom_options_initializer(report, options, previous_options=previous_options)
+        if self.env.user.has_group('base.group_multi_currency'):
+            options['multi_currency'] = True
+        else:
+            options['columns'] = [
+                column for column in options['columns']
+                if column['expression_label'] != 'amount_currency'
+            ]
+
+        # Automatically unfold the report when printing it, unless some specific lines have been unfolded
+        options['unfold_all'] = (options['export_mode'] == 'print' and not options.get('unfolded_lines')) or options['unfold_all']
+
+    def _dynamic_lines_generator(self, report, options, all_column_groups_expression_totals, warnings=None):
+        lines = []
+        date_from = fields.Date.from_string(options['date']['date_from'])
+        company_currency = self.env.company.currency_id
+
+        totals_by_column_group = defaultdict(lambda: {'debit': 0, 'credit': 0, 'balance': 0})
+        for account, column_group_results in self._query_values(report, options):
+            eval_dict = {}
+            has_lines = False
+            for column_group_key, results in column_group_results.items():
+                account_sum = results.get('sum', {})
+                account_un_earn = results.get('unaffected_earnings', {})
+
+                account_debit = account_sum.get('debit', 0.0) + account_un_earn.get('debit', 0.0)
+                account_credit = account_sum.get('credit', 0.0) + account_un_earn.get('credit', 0.0)
+                account_balance = account_sum.get('balance', 0.0) + account_un_earn.get('balance', 0.0)
+
+                eval_dict[column_group_key] = {
+                    'amount_currency': account_sum.get('amount_currency', 0.0) + account_un_earn.get('amount_currency', 0.0),
+                    'debit': account_debit,
+                    'credit': account_credit,
+                    'balance': account_balance,
+                }
+
+                max_date = account_sum.get('max_date')
+                has_lines = has_lines or (max_date and max_date >= date_from)
+
+                totals_by_column_group[column_group_key]['debit'] += account_debit
+                totals_by_column_group[column_group_key]['credit'] += account_credit
+                totals_by_column_group[column_group_key]['balance'] += account_balance
+
+            lines.append(self._get_account_title_line(report, options, account, has_lines, eval_dict))
+
+        # Report total line.
+        for totals in totals_by_column_group.values():
+            totals['balance'] = company_currency.round(totals['balance'])
+
+        # Tax Declaration lines.
+        journal_options = report._get_options_journals(options)
+        if len(options['column_groups']) == 1 and len(journal_options) == 1 and journal_options[0]['type'] in ('sale', 'purchase'):
+            lines += self._tax_declaration_lines(report, options, journal_options[0]['type'])
+
+        # Total line
+        lines.append(self._get_total_line(report, options, totals_by_column_group))
+
+        return [(0, line) for line in lines]
+
+    def _custom_unfold_all_batch_data_generator(self, report, options, lines_to_expand_by_function):
+        account_ids_to_expand = []
+        for line_dict in lines_to_expand_by_function.get('_report_expand_unfoldable_line_general_ledger', []):
+            model, model_id = report._get_model_info_from_id(line_dict['id'])
+            if model == 'account.account':
+                account_ids_to_expand.append(model_id)
+
+        limit_to_load = report.load_more_limit if report.load_more_limit and not options.get('export_mode') else None
+        has_more_per_account_id = {}
+
+        unlimited_aml_results_per_account_id = self._get_aml_values(report, options, account_ids_to_expand)[0]
+        if limit_to_load:
+            # Apply the load_more_limit.
+            # load_more_limit cannot be passed to the call to _get_aml_values, otherwise it won't be applied per account but on the whole result.
+            # We gain perf from batching, but load every result ; then we need to filter them.
+
+            aml_results_per_account_id = {}
+            for account_id, account_aml_results in unlimited_aml_results_per_account_id.items():
+                account_values = {}
+                for key, value in account_aml_results.items():
+                    if len(account_values) == limit_to_load:
+                        has_more_per_account_id[account_id] = True
+                        break
+                    account_values[key] = value
+                aml_results_per_account_id[account_id] = account_values
+        else:
+            aml_results_per_account_id = unlimited_aml_results_per_account_id
+
+        return {
+            'initial_balances': self._get_initial_balance_values(report, account_ids_to_expand, options),
+            'aml_results': aml_results_per_account_id,
+            'has_more': has_more_per_account_id,
+        }
+
+    def _tax_declaration_lines(self, report, options, tax_type):
+        labels_replacement = {
+            'debit': _("Base Amount"),
+            'credit': _("Tax Amount"),
+        }
+
+        rslt = [{
+            'id': report._get_generic_line_id(None, None, markup='tax_decl_header_1'),
+            'name': _('Tax Declaration'),
+            'columns': [{} for column in options['columns']],
+            'level': 1,
+            'unfoldable': False,
+            'unfolded': False,
+        }, {
+            'id': report._get_generic_line_id(None, None, markup='tax_decl_header_2'),
+            'name': _('Name'),
+            'columns': [{'name': labels_replacement.get(col['expression_label'], '')} for col in options['columns']],
+            'level': 3,
+            'unfoldable': False,
+            'unfolded': False,
+        }]
+
+        # Call the generic tax report
+        generic_tax_report = self.env.ref('account.generic_tax_report')
+        tax_report_options = generic_tax_report.get_options({**options, 'selected_variant_id': generic_tax_report.id, 'forced_domain': [('tax_line_id.type_tax_use', '=', tax_type)]})
+        tax_report_lines = generic_tax_report._get_lines(tax_report_options)
+        tax_type_parent_line_id = generic_tax_report._get_generic_line_id(None, None, markup=tax_type)
+
+        for tax_report_line in tax_report_lines:
+            if tax_report_line.get('parent_id') == tax_type_parent_line_id:
+                original_columns = tax_report_line['columns']
+                row_column_map = {
+                    'debit': original_columns[0],
+                    'credit': original_columns[1],
+                }
+
+                tax_report_line['columns'] = [row_column_map.get(col['expression_label'], {}) for col in options['columns']]
+                rslt.append(tax_report_line)
+
+        return rslt
+
+    def _query_values(self, report, options):
+        """ Executes the queries, and performs all the computations.
+
+        :return:    [(record, values_by_column_group), ...],  where
+                    - record is an account.account record.
+                    - values_by_column_group is a dict in the form {column_group_key: values, ...}
+                        - column_group_key is a string identifying a column group, as in options['column_groups']
+                        - values is a list of dictionaries, one per period containing:
+                            - sum:                              {'debit': float, 'credit': float, 'balance': float}
+                            - (optional) initial_balance:       {'debit': float, 'credit': float, 'balance': float}
+                            - (optional) unaffected_earnings:   {'debit': float, 'credit': float, 'balance': float}
+        """
+        # Execute the queries and dispatch the results.
+        query = self._get_query_sums(report, options)
+
+        if not query:
+            return []
+
+        groupby_accounts = {}
+        groupby_companies = {}
+
+        for res in self.env.execute_query_dict(query):
+            # No result to aggregate.
+            if res['groupby'] is None:
+                continue
+
+            column_group_key = res['column_group_key']
+            key = res['key']
+            if key == 'sum':
+                groupby_accounts.setdefault(res['groupby'], {col_group_key: {} for col_group_key in options['column_groups']})
+                groupby_accounts[res['groupby']][column_group_key][key] = res
+
+            elif key == 'initial_balance':
+                groupby_accounts.setdefault(res['groupby'], {col_group_key: {} for col_group_key in options['column_groups']})
+                groupby_accounts[res['groupby']][column_group_key][key] = res
+
+            elif key == 'unaffected_earnings':
+                groupby_companies.setdefault(res['groupby'], {col_group_key: {} for col_group_key in options['column_groups']})
+                groupby_companies[res['groupby']][column_group_key] = res
+
+        # Affect the unaffected earnings to the first fetched account of type 'account.data_unaffected_earnings'.
+        # It's less costly to fetch all candidate accounts in a single search and then iterate it.
+        if groupby_companies:
+            unaffected_earnings_accounts = self.env['account.account'].search([
+                ('display_name', 'ilike', options.get('filter_search_bar')),
+                *self.env['account.account']._check_company_domain(list(groupby_companies.keys())),
+                ('account_type', '=', 'equity_unaffected'),
+            ])
+            for company_id, groupby_company in groupby_companies.items():
+                if equity_unaffected_account := unaffected_earnings_accounts.filtered(lambda a: self.env['res.company'].browse(company_id).root_id in a.company_ids):
+                    for column_group_key in options['column_groups']:
+                        groupby_accounts.setdefault(
+                            equity_unaffected_account.id,
+                            {col_group_key: {'unaffected_earnings': {}} for col_group_key in options['column_groups']},
+                        )
+                        if unaffected_earnings := groupby_company.get(column_group_key):
+                            if groupby_accounts[equity_unaffected_account.id][column_group_key].get('unaffected_earnings'):
+                                for key in ['amount_currency', 'debit', 'credit', 'balance']:
+                                    groupby_accounts[equity_unaffected_account.id][column_group_key]['unaffected_earnings'][key] += unaffected_earnings[key]
+                            else:
+                                groupby_accounts[equity_unaffected_account.id][column_group_key]['unaffected_earnings'] = unaffected_earnings
+
+        # Retrieve the accounts to browse.
+        # groupby_accounts.keys() contains all account ids affected by:
+        # - the amls in the current period.
+        # - the amls affecting the initial balance.
+        # - the unaffected earnings allocation.
+        # Note a search is done instead of a browse to preserve the table ordering.
+        if groupby_accounts:
+            accounts = self.env['account.account'].search([('id', 'in', list(groupby_accounts.keys()))])
+        else:
+            accounts = []
+
+        return [(account, groupby_accounts[account.id]) for account in accounts]
+
+    def _get_query_sums(self, report, options) -> SQL:
+        """ Construct a query retrieving all the aggregated sums to build the report. It includes:
+        - sums for all accounts.
+        - sums for the initial balances.
+        - sums for the unaffected earnings.
+        - sums for the tax declaration.
+        :return:                    query as SQL object
+        """
+        options_by_column_group = report._split_options_per_column_group(options)
+
+        queries = []
+
+        # ============================================
+        # 1) Get sums for all accounts.
+        # ============================================
+        for column_group_key, options_group in options_by_column_group.items():
+
+            # Sum is computed including the initial balance of the accounts configured to do so, unless a special option key is used
+            # (this is required for trial balance, which is based on general ledger)
+            sum_date_scope = 'strict_range' if options_group.get('general_ledger_strict_range') else 'from_beginning'
+
+            query_domain = []
+
+            if not options_group.get('general_ledger_strict_range'):
+                date_from = fields.Date.from_string(options_group['date']['date_from'])
+                current_fiscalyear_dates = self.env.company.compute_fiscalyear_dates(date_from)
+                query_domain += [
+                    '|',
+                    ('date', '>=', current_fiscalyear_dates['date_from']),
+                    ('account_id.include_initial_balance', '=', True),
+                ]
+
+            if options_group.get('export_mode') == 'print' and options_group.get('filter_search_bar'):
+                if options_group.get('hierarchy'):
+                    query_domain += [
+                        '|',
+                        ('account_id', 'ilike', options_group['filter_search_bar']),
+                        ('account_id.id', 'in', SQL(
+                            """
+                            /*
+                            JOIN clause: Check if the account_group include the account_account
+                            A group from 10 to 10 include every account with code that begin with 10.
+                            If there is an account with a length of 6, it should be included if it's in the range from 100 000 to 109 999 included
+
+                            Where clause: Check if the account_group matches the filter
+                            */
+                            (SELECT distinct account_account.id
+                            FROM account_account
+                            LEFT JOIN account_group ON
+                                (
+                                    LEFT(account_account.code_store->> '%(company_id)s', LENGTH(code_prefix_start)) BETWEEN
+                                        code_prefix_start
+                                    AND code_prefix_end
+                                )
+                            WHERE ( account_group.name->> %(lang)s  ILIKE %(filter_search_bar)s
+                                OR  account_group.code_prefix_start ILIKE %(filter_search_bar)s)
+                            )""",
+                            lang=self.env.lang,
+                            company_id=self.env.company.id,
+                            filter_search_bar="%" + options_group['filter_search_bar'] + "%")),
+                    ]
+                else:
+                    query_domain.append(('account_id', 'ilike', options_group['filter_search_bar']))
+
+            if options_group.get('include_current_year_in_unaff_earnings'):
+                query_domain += [('account_id.include_initial_balance', '=', True)]
+
+            query = report._get_report_query(options_group, sum_date_scope, domain=query_domain)
+            queries.append(SQL(
+                """
+                SELECT
+                    account_move_line.account_id                            AS groupby,
+                    'sum'                                                   AS key,
+                    MAX(account_move_line.date)                             AS max_date,
+                    %(column_group_key)s                                    AS column_group_key,
+                    COALESCE(SUM(account_move_line.amount_currency), 0.0)   AS amount_currency,
+                    SUM(%(debit_select)s)   AS debit,
+                    SUM(%(credit_select)s)  AS credit,
+                    SUM(%(balance_select)s) AS balance
+                FROM %(table_references)s
+                %(currency_table_join)s
+                WHERE %(search_condition)s
+                GROUP BY account_move_line.account_id
+                """,
+                column_group_key=column_group_key,
+                table_references=query.from_clause,
+                debit_select=report._currency_table_apply_rate(SQL("account_move_line.debit")),
+                credit_select=report._currency_table_apply_rate(SQL("account_move_line.credit")),
+                balance_select=report._currency_table_apply_rate(SQL("account_move_line.balance")),
+                currency_table_join=report._currency_table_aml_join(options_group),
+                search_condition=query.where_clause,
+            ))
+
+            # ============================================
+            # 2) Get sums for the unaffected earnings.
+            # ============================================
+            if not options_group.get('general_ledger_strict_range'):
+                unaff_earnings_domain = [('account_id.include_initial_balance', '=', False)]
+
+                # The period domain is expressed as:
+                # [
+                #   ('date' <= fiscalyear['date_from'] - 1),
+                #   ('account_id.include_initial_balance', '=', False),
+                # ]
+
+                new_options = self._get_options_unaffected_earnings(options_group)
+                query = report._get_report_query(new_options, 'strict_range', domain=unaff_earnings_domain)
+                queries.append(SQL(
+                    """
+                    SELECT
+                        account_move_line.company_id                            AS groupby,
+                        'unaffected_earnings'                                   AS key,
+                        NULL                                                    AS max_date,
+                        %(column_group_key)s                                    AS column_group_key,
+                        COALESCE(SUM(account_move_line.amount_currency), 0.0)   AS amount_currency,
+                        SUM(%(debit_select)s)                                   AS debit,
+                        SUM(%(credit_select)s)                                  AS credit,
+                        SUM(%(balance_select)s) AS balance
+                    FROM %(table_references)s
+                    %(currency_table_join)s
+                    WHERE %(search_condition)s
+                    GROUP BY account_move_line.company_id
+                    """,
+                    column_group_key=column_group_key,
+                    table_references=query.from_clause,
+                    debit_select=report._currency_table_apply_rate(SQL("account_move_line.debit")),
+                    credit_select=report._currency_table_apply_rate(SQL("account_move_line.credit")),
+                    balance_select=report._currency_table_apply_rate(SQL("account_move_line.balance")),
+                    currency_table_join=report._currency_table_aml_join(options_group),
+                    search_condition=query.where_clause,
+                ))
+
+        return SQL(" UNION ALL ").join(queries)
+
+    def _get_options_unaffected_earnings(self, options):
+        ''' Create options used to compute the unaffected earnings.
+        The unaffected earnings are the amount of benefits/loss that have not been allocated to
+        another account in the previous fiscal years.
+        The resulting dates domain will be:
+        [
+          ('date' <= fiscalyear['date_from'] - 1),
+          ('account_id.include_initial_balance', '=', False),
+        ]
+        :param options: The report options.
+        :return:        A copy of the options.
+        '''
+        new_options = options.copy()
+        new_options.pop('filter_search_bar', None)
+        fiscalyear_dates = self.env.company.compute_fiscalyear_dates(fields.Date.from_string(options['date']['date_from']))
+
+        # Trial balance uses the options key, general ledger does not
+        new_date_to = fields.Date.from_string(new_options['date']['date_to']) if options.get('include_current_year_in_unaff_earnings') else fiscalyear_dates['date_from'] - timedelta(days=1)
+
+        new_options['date'] = self.env['account.report']._get_dates_period(None, new_date_to, 'single')
+
+        return new_options
+
+    def _get_aml_values(self, report, options, expanded_account_ids, offset=0, limit=None):
+        rslt = {account_id: {} for account_id in expanded_account_ids}
+        aml_query = self._get_query_amls(report, options, expanded_account_ids, offset=offset, limit=limit)
+        self._cr.execute(aml_query)
+        aml_results_number = 0
+        has_more = False
+        for aml_result in self._cr.dictfetchall():
+            aml_results_number += 1
+            if aml_results_number == limit:
+                has_more = True
+                break
+
+            # For asset_receivable the name will already contains the ref with the _compute_name
+            if aml_result['ref'] and aml_result['account_type'] != 'asset_receivable':
+                aml_result['communication'] = f"{aml_result['ref']} - {aml_result['name']}"
+            else:
+                aml_result['communication'] = aml_result['name']
+
+            # The same aml can return multiple results when using account_report_cash_basis module, if the receivable/payable
+            # is reconciled with multiple payments. In this case, the date shown for the move lines actually corresponds to the
+            # reconciliation date. In order to keep distinct lines in this case, we include date in the grouping key.
+            aml_key = (aml_result['id'], aml_result['date'])
+
+            account_result = rslt[aml_result['account_id']]
+            if not aml_key in account_result:
+                account_result[aml_key] = {col_group_key: {} for col_group_key in options['column_groups']}
+
+            account_result[aml_key][aml_result['column_group_key']] = aml_result
+
+        return rslt, has_more
+
+    def _get_query_amls(self, report, options, expanded_account_ids, offset=0, limit=None) -> SQL:
+        """ Construct a query retrieving the account.move.lines when expanding a report line with or without the load
+        more.
+        :param options:               The report options.
+        :param expanded_account_ids:  The account.account ids corresponding to consider. If None, match every account.
+        :param offset:                The offset of the query (used by the load more).
+        :param limit:                 The limit of the query (used by the load more).
+        :return:                      (query, params)
+        """
+        additional_domain = [('account_id', 'in', expanded_account_ids)] if expanded_account_ids is not None else None
+        queries = []
+        journal_name = self.env['account.journal']._field_to_sql('journal', 'name')
+        for column_group_key, group_options in report._split_options_per_column_group(options).items():
+            # Get sums for the account move lines.
+            # period: [('date' <= options['date_to']), ('date', '>=', options['date_from'])]
+            query = report._get_report_query(group_options, domain=additional_domain, date_scope='strict_range')
+            account_alias = query.left_join(lhs_alias='account_move_line', lhs_column='account_id', rhs_table='account_account', rhs_column='id', link='account_id')
+            account_code = self.env['account.account']._field_to_sql(account_alias, 'code', query)
+            account_name = self.env['account.account']._field_to_sql(account_alias, 'name')
+            account_type = self.env['account.account']._field_to_sql(account_alias, 'account_type')
+
+            query = SQL(
+                '''
+                SELECT
+                    account_move_line.id,
+                    account_move_line.date,
+                    MIN(account_move_line.date_maturity)    AS date_maturity,
+                    MIN(account_move_line.name)             AS name,
+                    MIN(account_move_line.ref)              AS ref,
+                    MIN(account_move_line.company_id)       AS company_id,
+                    MIN(account_move_line.account_id)       AS account_id,
+                    MIN(account_move_line.payment_id)       AS payment_id,
+                    MIN(account_move_line.partner_id)       AS partner_id,
+                    MIN(account_move_line.currency_id)      AS currency_id,
+                    SUM(account_move_line.amount_currency)  AS amount_currency,
+                    MIN(COALESCE(account_move_line.invoice_date, account_move_line.date))                 AS invoice_date,
+                    account_move_line.date                                                                AS date,
+                    SUM(%(debit_select)s)                   AS debit,
+                    SUM(%(credit_select)s)                  AS credit,
+                    SUM(%(balance_select)s)                 AS balance,
+                    MIN(move.name)                          AS move_name,
+                    MIN(company.currency_id)                AS company_currency_id,
+                    MIN(partner.name)                       AS partner_name,
+                    MIN(move.move_type)                     AS move_type,
+                    MIN(%(account_code)s)                   AS account_code,
+                    MIN(%(account_name)s)                   AS account_name,
+                    MIN(%(account_type)s)                   AS account_type,
+                    MIN(journal.code)                       AS journal_code,
+                    MIN(%(journal_name)s)                   AS journal_name,
+                    MIN(full_rec.id)                        AS full_rec_name,
+                    %(column_group_key)s                    AS column_group_key
+                FROM %(table_references)s
+                JOIN account_move move                      ON move.id = account_move_line.move_id
+                %(currency_table_join)s
+                LEFT JOIN res_company company               ON company.id = account_move_line.company_id
+                LEFT JOIN res_partner partner               ON partner.id = account_move_line.partner_id
+                LEFT JOIN account_journal journal           ON journal.id = account_move_line.journal_id
+                LEFT JOIN account_full_reconcile full_rec   ON full_rec.id = account_move_line.full_reconcile_id
+                WHERE %(search_condition)s
+                GROUP BY account_move_line.id, account_move_line.date
+                ORDER BY account_move_line.date, move_name, account_move_line.id
+                ''',
+                account_code=account_code,
+                account_name=account_name,
+                account_type=account_type,
+                journal_name=journal_name,
+                column_group_key=column_group_key,
+                table_references=query.from_clause,
+                currency_table_join=report._currency_table_aml_join(group_options),
+                debit_select=report._currency_table_apply_rate(SQL("account_move_line.debit")),
+                credit_select=report._currency_table_apply_rate(SQL("account_move_line.credit")),
+                balance_select=report._currency_table_apply_rate(SQL("account_move_line.balance")),
+                search_condition=query.where_clause,
+            )
+            queries.append(query)
+
+        full_query = SQL(" UNION ALL ").join(SQL("(%s)", query) for query in queries)
+
+        if offset:
+            full_query = SQL('%s OFFSET %s ', full_query, offset)
+        if limit:
+            full_query = SQL('%s LIMIT %s ', full_query, limit)
+
+        return full_query
+
+    def _get_initial_balance_values(self, report, account_ids, options):
+        """
+        Get sums for the initial balance.
+        """
+        queries = []
+        for column_group_key, options_group in report._split_options_per_column_group(options).items():
+            new_options = self._get_options_initial_balance(options_group)
+            domain = [
+                ('account_id', 'in', account_ids),
+            ]
+            if not new_options.get('general_ledger_strict_range'):
+                domain += [
+                    '|',
+                    ('date', '>=', new_options['date']['date_from']),
+                    ('account_id.include_initial_balance', '=', True),
+                ]
+            if new_options.get('include_current_year_in_unaff_earnings'):
+                domain += [('account_id.include_initial_balance', '=', True)]
+            query = report._get_report_query(new_options, 'from_beginning', domain=domain)
+            queries.append(SQL(
+                """
+                SELECT
+                    account_move_line.account_id                          AS groupby,
+                    'initial_balance'                                     AS key,
+                    NULL                                                  AS max_date,
+                    %(column_group_key)s                                  AS column_group_key,
+                    COALESCE(SUM(account_move_line.amount_currency), 0.0) AS amount_currency,
+                    SUM(%(debit_select)s)                                 AS debit,
+                    SUM(%(credit_select)s)                                AS credit,
+                    SUM(%(balance_select)s)                               AS balance
+                FROM %(table_references)s
+                %(currency_table_join)s
+                WHERE %(search_condition)s
+                GROUP BY account_move_line.account_id
+                """,
+                column_group_key=column_group_key,
+                table_references=query.from_clause,
+                debit_select=report._currency_table_apply_rate(SQL("account_move_line.debit")),
+                credit_select=report._currency_table_apply_rate(SQL("account_move_line.credit")),
+                balance_select=report._currency_table_apply_rate(SQL("account_move_line.balance")),
+                currency_table_join=report._currency_table_aml_join(options_group),
+                search_condition=query.where_clause,
+            ))
+
+        self._cr.execute(SQL(" UNION ALL ").join(queries))
+
+        init_balance_by_col_group = {
+            account_id: {column_group_key: {} for column_group_key in options['column_groups']}
+            for account_id in account_ids
+        }
+        for result in self._cr.dictfetchall():
+            init_balance_by_col_group[result['groupby']][result['column_group_key']] = result
+
+        accounts = self.env['account.account'].browse(account_ids)
+        return {
+            account.id: (account, init_balance_by_col_group[account.id])
+            for account in accounts
+        }
+
+    def _get_options_initial_balance(self, options):
+        """ Create options used to compute the initial balances.
+        The initial balances depict the current balance of the accounts at the beginning of
+        the selected period in the report.
+        The resulting dates domain will be:
+        [
+            ('date' <= options['date_from'] - 1),
+            '|',
+            ('date' >= fiscalyear['date_from']),
+            ('account_id.include_initial_balance', '=', True)
+        ]
+        :param options: The report options.
+        :return:        A copy of the options.
+        """
+        #pylint: disable=sql-injection
+        new_options = options.copy()
+        date_to = new_options['comparison']['periods'][-1]['date_from'] if new_options.get('comparison', {}).get('periods') else new_options['date']['date_from']
+        new_date_to = fields.Date.from_string(date_to) - timedelta(days=1)
+
+        # Date from computation
+        # We have two case:
+        # 1) We are choosing a date that starts at the beginning of a fiscal year and we want the initial period to be
+        # the previous fiscal year
+        # 2) We are choosing a date that starts in the middle of a fiscal year and in that case we want the initial period
+        # to be the beginning of the fiscal year
+        date_from = fields.Date.from_string(new_options['date']['date_from'])
+        current_fiscalyear_dates = self.env.company.compute_fiscalyear_dates(date_from)
+
+        if date_from == current_fiscalyear_dates['date_from']:
+            # We want the previous fiscal year
+            previous_fiscalyear_dates = self.env.company.compute_fiscalyear_dates(date_from - timedelta(days=1))
+            new_date_from = previous_fiscalyear_dates['date_from']
+            include_current_year_in_unaff_earnings = True
+        else:
+            # We want the current fiscal year
+            new_date_from = current_fiscalyear_dates['date_from']
+            include_current_year_in_unaff_earnings = False
+
+        new_options['date'] = self.env['account.report']._get_dates_period(
+            new_date_from,
+            new_date_to,
+            'range',
+        )
+        new_options['include_current_year_in_unaff_earnings'] = include_current_year_in_unaff_earnings
+
+        return new_options
+
+    ####################################################
+    # COLUMN/LINE HELPERS
+    ####################################################
+    def _get_account_title_line(self, report, options, account, has_lines, eval_dict):
+        line_columns = []
+        for column in options['columns']:
+            col_value = eval_dict.get(column['column_group_key'], {}).get(column['expression_label'])
+            col_expr_label = column['expression_label']
+
+            value = None if col_value is None or (col_expr_label == 'amount_currency' and not account.currency_id) else col_value
+
+            line_columns.append(report._build_column_dict(
+                value,
+                column,
+                options=options,
+                currency=account.currency_id if col_expr_label == 'amount_currency' else None,
+            ))
+
+        line_id = report._get_generic_line_id('account.account', account.id)
+        is_in_unfolded_lines = any(
+            report._get_res_id_from_line_id(line_id, 'account.account') == account.id
+            for line_id in options.get('unfolded_lines')
+        )
+        return {
+            'id': line_id,
+            'name': account.display_name,
+            'columns': line_columns,
+            'level': 1,
+            'unfoldable': has_lines,
+            'unfolded': has_lines and (is_in_unfolded_lines or options.get('unfold_all')),
+            'expand_function': '_report_expand_unfoldable_line_general_ledger',
+        }
+
+    def _get_aml_line(self, report, parent_line_id, options, eval_dict, init_bal_by_col_group):
+        line_columns = []
+        for column in options['columns']:
+            col_expr_label = column['expression_label']
+            col_value = eval_dict[column['column_group_key']].get(col_expr_label)
+            col_currency = None
+
+            if col_value is not None:
+                if col_expr_label == 'amount_currency':
+                    col_currency = self.env['res.currency'].browse(eval_dict[column['column_group_key']]['currency_id'])
+                    col_value = None if col_currency == self.env.company.currency_id else col_value
+                elif col_expr_label == 'balance':
+                    col_value += (init_bal_by_col_group[column['column_group_key']] or 0)
+
+            line_columns.append(report._build_column_dict(
+                col_value,
+                column,
+                options=options,
+                currency=col_currency,
+            ))
+
+        aml_id = None
+        move_name = None
+        caret_type = None
+        for column_group_dict in eval_dict.values():
+            aml_id = column_group_dict.get('id', '')
+            if aml_id:
+                if column_group_dict.get('payment_id'):
+                    caret_type = 'account.payment'
+                else:
+                    caret_type = 'account.move.line'
+                move_name = column_group_dict['move_name']
+                date = str(column_group_dict.get('date', ''))
+                break
+
+        return {
+            'id': report._get_generic_line_id('account.move.line', aml_id, parent_line_id=parent_line_id, markup=date),
+            'caret_options': caret_type,
+            'parent_id': parent_line_id,
+            'name': move_name or _('Draft Entry'),
+            'columns': line_columns,
+            'level': 3,
+        }
+
+    @api.model
+    def _get_total_line(self, report, options, eval_dict):
+        line_columns = []
+        for column in options['columns']:
+            col_value = eval_dict[column['column_group_key']].get(column['expression_label'])
+            col_value = None if col_value is None else col_value
+
+            line_columns.append(report._build_column_dict(col_value, column, options=options))
+
+        return {
+            'id': report._get_generic_line_id(None, None, markup='total'),
+            'name': _('Total'),
+            'level': 1,
+            'columns': line_columns,
+        }
+
+    def caret_option_audit_tax(self, options, params):
+        return self.env['account.generic.tax.report.handler'].caret_option_audit_tax(options, params)
+
+    def _report_expand_unfoldable_line_general_ledger(self, line_dict_id, groupby, options, progress, offset, unfold_all_batch_data=None):
+        def init_load_more_progress(line_dict):
+            return {
+                column['column_group_key']: line_col.get('no_format', 0)
+                for column, line_col in  zip(options['columns'], line_dict['columns'])
+                if column['expression_label'] == 'balance'
+            }
+
+        report = self.env.ref('odex30_account_reports.general_ledger_report')
+        model, model_id = report._get_model_info_from_id(line_dict_id)
+
+        if model != 'account.account':
+            raise UserError(_("Wrong ID for general ledger line to expand: %s", line_dict_id))
+
+        lines = []
+
+        # Get initial balance
+        if offset == 0:
+            if unfold_all_batch_data:
+                account, init_balance_by_col_group = unfold_all_batch_data['initial_balances'][model_id]
+            else:
+                account, init_balance_by_col_group = self._get_initial_balance_values(report, [model_id], options)[model_id]
+
+            initial_balance_line = report._get_partner_and_general_ledger_initial_balance_line(options, line_dict_id, init_balance_by_col_group, account.currency_id)
+
+            if initial_balance_line:
+                lines.append(initial_balance_line)
+
+                # For the first expansion of the line, the initial balance line gives the progress
+                progress = init_load_more_progress(initial_balance_line)
+
+        # Get move lines
+        limit_to_load = report.load_more_limit + 1 if report.load_more_limit and options['export_mode'] != 'print' else None
+        if unfold_all_batch_data:
+            aml_results = unfold_all_batch_data['aml_results'][model_id]
+            has_more = unfold_all_batch_data['has_more'].get(model_id, False)
+        else:
+            aml_results, has_more = self._get_aml_values(report, options, [model_id], offset=offset, limit=limit_to_load)
+            aml_results = aml_results[model_id]
+
+        next_progress = progress
+        for aml_result in aml_results.values():
+            new_line = self._get_aml_line(report, line_dict_id, options, aml_result, next_progress)
+            lines.append(new_line)
+            next_progress = init_load_more_progress(new_line)
+
+        return {
+            'lines': lines,
+            'offset_increment': report.load_more_limit,
+            'has_more': has_more,
+            'progress': next_progress,
+        }
diff --git a/dev_odex30_accounting/odex30_account_reports/models/account_generic_tax_report.py b/dev_odex30_accounting/odex30_account_reports/models/account_generic_tax_report.py
new file mode 100644
index 0000000..b9adb8e
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_reports/models/account_generic_tax_report.py
@@ -0,0 +1,1222 @@
+import ast
+from collections import defaultdict
+
+from odoo import models, api, fields, Command, _
+from odoo.addons.web.controllers.utils import clean_action
+from odoo.exceptions import UserError, RedirectWarning
+from odoo.osv import expression
+from odoo.tools import SQL
+
+
+class AccountTaxReportHandler(models.AbstractModel):
+    _name = 'account.tax.report.handler'
+    _inherit = 'account.report.custom.handler'
+    _description = 'Account Report Handler for Tax Reports'
+
+
+    def _custom_options_initializer(self, report, options, previous_options):
+        optional_periods = {
+            'monthly': 'month',
+            'trimester': 'quarter',
+            'year': 'year',
+        }
+
+        options['buttons'].append({'name': _('Closing Entry'), 'action': 'action_periodic_vat_entries', 'sequence': 110, 'always_show': True})
+        options['enable_export_buttons_for_common_vat_in_branches'] = True
+
+        day, month = self.env.company._get_tax_closing_start_date_attributes(report)
+        periodicity = self.env.company._get_tax_periodicity(report)
+        options['tax_periodicity'] = {
+            'periodicity': periodicity,
+            'months_per_period': self.env.company._get_tax_periodicity_months_delay(report),
+            'start_day': day,
+            'start_month': month,
+        }
+
+        options['show_tax_period_filter'] = periodicity not in optional_periods or day != 1 or month != 1
+        if not options['show_tax_period_filter'] and 'custom' not in options['date']['filter']:
+            period_type = optional_periods[periodicity]
+            options['date']['filter'] = options['date']['filter'].replace('tax_period', period_type)
+            options['date']['period_type'] = options['date']['period_type'].replace('tax_period', period_type)
+
+    def _get_custom_display_config(self):
+        display_config = defaultdict(dict)
+        display_config['templates']['AccountReportFilters'] = 'odex30_account_reports.GenericTaxReportFiltersCustomizable'
+        return display_config
+
+    def _customize_warnings(self, report, options, all_column_groups_expression_totals, warnings):
+        if 'odex30_account_reports.common_warning_draft_in_period' in warnings:
+            # Recompute the warning 'common_warning_draft_in_period' to not include tax closing entries in the banner of unposted moves
+            if not self.env['account.move'].search_count(
+                [('state', '=', 'draft'), ('date', '<=', options['date']['date_to']),
+                 ('tax_closing_report_id', '=', False)],
+                limit=1,
+            ):
+                warnings.pop('odex30_account_reports.common_warning_draft_in_period')
+
+        # Chek the use of inactive tags in the period
+        query = report._get_report_query(options, 'strict_range')
+        rows = self.env.execute_query(SQL("""
+            SELECT 1
+            FROM %s
+            JOIN account_account_tag_account_move_line_rel aml_tag
+                ON account_move_line.id = aml_tag.account_move_line_id
+            JOIN account_account_tag tag
+                ON aml_tag.account_account_tag_id = tag.id
+            WHERE %s
+            AND NOT tag.active
+            LIMIT 1
+        """, query.from_clause, query.where_clause))
+        if rows:
+            warnings['odex30_account_reports.tax_report_warning_inactive_tags'] = {}
+
+
+    # -------------------------------------------------------------------------
+    # TAX CLOSING
+    # -------------------------------------------------------------------------
+
+    def _is_period_equal_to_options(self, report, options):
+        options_date_to = fields.Date.from_string(options['date']['date_to'])
+        options_date_from = fields.Date.from_string(options['date']['date_from'])
+        date_from, date_to = self.env.company._get_tax_closing_period_boundaries(options_date_to, report)
+        return date_from == options_date_from and date_to == options_date_to
+
+    def action_periodic_vat_entries(self, options, from_post=False):
+        report = self.env['account.report'].browse(options['report_id'])
+        if (
+            options['date']['period_type'] != 'tax_period'
+            and not self._is_period_equal_to_options(report, options)
+            and not self.env.context.get('override_tax_closing_warning')
+        ):
+            if len(options['companies']) > 1 and (report.filter_multi_company != 'tax_units' or not (report.country_id and options['available_tax_units'])):
+                message = _(
+                    "You're about the generate the closing entries of multiple companies at once. Each of them will be created in accordance with its company tax periodicity.")
+            else:
+                message = _(
+                    "The currently selected dates don't match a tax period. The closing entry will be created for the closest-matching period according to your periodicity setup.")
+
+            return {
+                'type': 'ir.actions.client',
+                'tag': 'odex30_account_reports.redirect_action',
+                'target': 'new',
+                'params': {
+                    'depending_action': self.with_context(
+                        {'override_tax_closing_warning': True}).action_periodic_vat_entries(options),
+                    'message': message,
+                    'button_text': _("Proceed"),
+                },
+                'context': {
+                    'dialog_size': 'medium',
+                    'override_tax_closing_warning': True,
+                },
+            }
+
+        moves = self._get_periodic_vat_entries(options, from_post=from_post)
+        # Make the action for the retrieved move and return it.
+        action = self.env["ir.actions.actions"]._for_xml_id("account.action_move_journal_line")
+        action = clean_action(action, env=self.env)
+        action.pop('domain', None)
+
+        if len(moves) == 1:
+            action['views'] = [(self.env.ref('account.view_move_form').id, 'form')]
+            action['res_id'] = moves.id
+        else:
+            action['domain'] = [('id', 'in', moves.ids)]
+            action['context'] = dict(ast.literal_eval(action['context']))
+            action['context'].pop('search_default_posted', None)
+        return action
+
+    def _get_periodic_vat_entries(self, options, from_post=False):
+        report = self.env['account.report'].browse(options['report_id'])
+
+        # When integer_rounding is available, we always want it for tax closing (as it means it's a legal requirement)
+        if options.get('integer_rounding'):
+            options['integer_rounding_enabled'] = True
+
+        # Return action to open form view of newly created entry
+        moves = self.env['account.move']
+
+        # Get all companies impacting the report.
+        companies = self.env['res.company'].browse(report.get_report_company_ids(options))
+
+        companies_moves = self._get_tax_closing_entries_for_closed_period(report, options, companies, posted_only=False)
+        moves += companies_moves
+        moves += self._generate_tax_closing_entries(report, options, companies=companies - companies_moves.company_id, from_post=from_post)
+
+        return moves
+
+    def _generate_tax_closing_entries(self, report, options, closing_moves=None, companies=None, from_post=False):
+        """Generates and/or updates VAT closing entries.
+
+        This method computes the content of the tax closing in the following way:
+        - Search on all tax lines in the given period, group them by tax_group (each tax group might have its own
+        tax receivable/payable account).
+        - Create a move line that balances each tax account and add the difference in the correct receivable/payable
+        account. Also take into account amounts already paid via advance tax payment account.
+
+        The tax closing is done so that an individual move is created per available VAT number: so, one for each
+        foreign vat fiscal position (each with fiscal_position_id set to this fiscal position), and one for the domestic
+        position (with fiscal_position_id = None). The moves created by this function hence depends on the content of the
+        options dictionary, and what fiscal positions are accepted by it.
+
+        :param options: the tax report options dict to use to make the closing.
+        :param closing_moves: If provided, closing moves to update the content from.
+                              They need to be compatible with the provided options (if they have a fiscal_position_id, for example).
+        :param companies: optional params, the companies given will be used instead of taking all the companies impacting
+                          the report.
+        :return: The closing moves.
+        """
+        if companies is None:
+            companies = self.env['res.company'].browse(report.get_report_company_ids(options))
+
+        if closing_moves is None:
+            closing_moves = self.env['account.move']
+
+        end_date = fields.Date.from_string(options['date']['date_to'])
+
+        closing_moves_by_company = defaultdict(lambda: self.env['account.move'])
+
+        companies_without_closing = companies.filtered(lambda company: company not in closing_moves.company_id)
+        if closing_moves:
+            for move in closing_moves.filtered(lambda x: x.state == 'draft'):
+                closing_moves_by_company[move.company_id] |= move
+
+        for company in companies_without_closing:
+            include_domestic, fiscal_positions = self._get_fpos_info_for_tax_closing(company, report, options)
+            company_closing_moves = company._get_and_update_tax_closing_moves(end_date, report, fiscal_positions=fiscal_positions, include_domestic=include_domestic)
+            closing_moves_by_company[company] = company_closing_moves
+            closing_moves += company_closing_moves
+
+        for company, company_closing_moves in closing_moves_by_company.items():
+
+            # First gather the countries for which the closing is being done
+            countries = self.env['res.country']
+            for move in company_closing_moves:
+                if move.fiscal_position_id.foreign_vat:
+                    countries |= move.fiscal_position_id.country_id
+                else:
+                    countries |= company.account_fiscal_country_id
+
+            # Check the tax groups from the company for any misconfiguration in these countries
+            if self.env['account.tax.group']._check_misconfigured_tax_groups(company, countries):
+                self._redirect_to_misconfigured_tax_groups(company, countries)
+
+            for move in company_closing_moves:
+                # When coming from post and that the current move is the closing of the current company we don't want to
+                # write on it again
+                if from_post and move == closing_moves_by_company.get(self.env.company):
+                    continue
+
+                # get tax entries by tax_group for the period defined in options
+                move_options = {**options, 'fiscal_position': move.fiscal_position_id.id if move.fiscal_position_id else 'domestic'}
+                line_ids_vals, tax_group_subtotal = self._compute_vat_closing_entry(company, move_options)
+
+                line_ids_vals += self._add_tax_group_closing_items(tax_group_subtotal, move)
+
+                if move.line_ids:
+                    line_ids_vals += [Command.delete(aml.id) for aml in move.line_ids]
+
+                move_vals = {}
+                if line_ids_vals:
+                    move_vals['line_ids'] = line_ids_vals
+                move.write(move_vals)
+
+        return closing_moves
+
+    def _get_tax_closing_entries_for_closed_period(self, report, options, companies, posted_only=True):
+        """ Fetch the closing entries related to the given companies for the currently selected tax report period.
+        Only used when the selected period already has a tax lock date impacting it, and assuming that these periods
+        all have a tax closing entry.
+        :param report: The tax report for which we are getting the closing entries.
+        :param options: the tax report options dict needed to get the period end date and fiscal position info.
+        :param companies: a recordset of companies for which the period has already been closed.
+        :return: The closing moves.
+        """
+        closing_moves = self.env['account.move']
+        for company in companies:
+            _dummy, period_end = company._get_tax_closing_period_boundaries(fields.Date.from_string(options['date']['date_to']), report)
+            include_domestic, fiscal_positions = self._get_fpos_info_for_tax_closing(company, report, options)
+            fiscal_position_ids = fiscal_positions.ids + ([False] if include_domestic else [])
+            state_domain = ('state', '=', 'posted') if posted_only else ('state', '!=', 'cancel')
+            closing_moves += self.env['account.move'].search([
+                ('company_id', '=', company.id),
+                ('fiscal_position_id', 'in', fiscal_position_ids),
+                ('date', '=', period_end),
+                ('tax_closing_report_id', '!=', False),
+                state_domain,
+            ])
+
+        return closing_moves
+
+    @api.model
+    def _compute_vat_closing_entry(self, company, options):
+        """Compute the VAT closing entry.
+
+        This method returns the one2many commands to balance the tax accounts for the selected period, and
+        a dictionnary that will help balance the different accounts set per tax group.
+        """
+        self = self.with_company(company) # Needed to handle access to property fields correctly
+
+        # first, for each tax group, gather the tax entries per tax and account
+        self.env['account.tax'].flush_model(['name', 'tax_group_id'])
+        self.env['account.tax.repartition.line'].flush_model(['use_in_tax_closing'])
+        self.env['account.move.line'].flush_model(['account_id', 'debit', 'credit', 'move_id', 'tax_line_id', 'date', 'company_id', 'display_type', 'parent_state'])
+        self.env['account.move'].flush_model(['state'])
+
+        new_options = {
+            **options,
+            'all_entries': False,
+            'date': dict(options['date']),
+        }
+
+        report = self.env['account.report'].browse(options['report_id'])
+        period_start, period_end = company._get_tax_closing_period_boundaries(fields.Date.from_string(options['date']['date_to']), report)
+        new_options['date']['date_from'] = fields.Date.to_string(period_start)
+        new_options['date']['date_to'] = fields.Date.to_string(period_end)
+        new_options['date']['period_type'] = 'custom'
+        new_options['date']['filter'] = 'custom'
+        new_options = report.with_context(allowed_company_ids=company.ids).get_options(previous_options=new_options)
+        # Force the use of the fiscal position from the original options (_get_options sets the fiscal
+        # position to 'all' when the report is the generic tax report)
+        new_options['fiscal_position'] = options['fiscal_position']
+
+        query = self.env.ref('account.generic_tax_report')._get_report_query(
+            new_options,
+            'strict_range',
+            domain=self._get_vat_closing_entry_additional_domain()
+        )
+
+        # Check whether it is multilingual, in order to get the translation from the JSON value if present
+        tax_name = self.env['account.tax']._field_to_sql('tax', 'name')
+
+        query = SQL(
+            """
+            SELECT "account_move_line".tax_line_id as tax_id,
+                    tax.tax_group_id as tax_group_id,
+                    %(tax_name)s as tax_name,
+                    "account_move_line".account_id,
+                    COALESCE(SUM("account_move_line".balance), 0) as amount
+            FROM account_tax tax, account_tax_repartition_line repartition, %(table_references)s
+            WHERE %(search_condition)s
+              AND tax.id = "account_move_line".tax_line_id
+              AND repartition.id = "account_move_line".tax_repartition_line_id
+              AND repartition.use_in_tax_closing
+            GROUP BY tax.tax_group_id, "account_move_line".tax_line_id, tax.name, "account_move_line".account_id
+            """,
+            tax_name=tax_name,
+            table_references=query.from_clause,
+            search_condition=query.where_clause,
+        )
+        self.env.cr.execute(query)
+        results = self.env.cr.dictfetchall()
+        results = self._postprocess_vat_closing_entry_results(company, new_options, results)
+
+        tax_group_ids = [r['tax_group_id'] for r in results]
+        tax_groups = {}
+        for tg, result in zip(self.env['account.tax.group'].browse(tax_group_ids), results):
+            if tg not in tax_groups:
+                tax_groups[tg] = {}
+            if result.get('tax_id') not in tax_groups[tg]:
+                tax_groups[tg][result.get('tax_id')] = []
+            tax_groups[tg][result.get('tax_id')].append((result.get('tax_name'), result.get('account_id'), result.get('amount')))
+
+        # then loop on previous results to
+        #    * add the lines that will balance their sum per account
+        #    * make the total per tax group's account triplet
+        # (if 2 tax groups share the same 3 accounts, they should consolidate in the vat closing entry)
+        move_vals_lines = []
+        tax_group_subtotal = {}
+        currency = self.env.company.currency_id
+        for tg, values in tax_groups.items():
+            total = 0
+            # ignore line that have no property defined on tax group
+            if not tg.tax_receivable_account_id or not tg.tax_payable_account_id:
+                continue
+            for dummy, value in values.items():
+                for v in value:
+                    tax_name, account_id, amt = v
+                    # Line to balance
+                    move_vals_lines.append((0, 0, {'name': tax_name, 'debit': abs(amt) if amt < 0 else 0, 'credit': amt if amt > 0 else 0, 'account_id': account_id}))
+                    total += amt
+
+            if not currency.is_zero(total):
+                # Add total to correct group
+                key = (tg.advance_tax_payment_account_id.id or False, tg.tax_receivable_account_id.id, tg.tax_payable_account_id.id)
+
+                if tax_group_subtotal.get(key):
+                    tax_group_subtotal[key] += total
+                else:
+                    tax_group_subtotal[key] = total
+
+        # If the tax report is completely empty, we add two 0-valued lines, using the first in in and out
+        # account id we find on the taxes.
+        if len(move_vals_lines) == 0:
+            rep_ln_in = self.env['account.tax.repartition.line'].search([
+                *self.env['account.tax.repartition.line']._check_company_domain(company),
+                ('account_id.deprecated', '=', False),
+                ('repartition_type', '=', 'tax'),
+                ('document_type', '=', 'invoice'),
+                ('tax_id.type_tax_use', '=', 'purchase')
+            ], limit=1)
+            rep_ln_out = self.env['account.tax.repartition.line'].search([
+                *self.env['account.tax.repartition.line']._check_company_domain(company),
+                ('account_id.deprecated', '=', False),
+                ('repartition_type', '=', 'tax'),
+                ('document_type', '=', 'invoice'),
+                ('tax_id.type_tax_use', '=', 'sale')
+            ], limit=1)
+
+            if rep_ln_out.account_id and rep_ln_in.account_id:
+                move_vals_lines = [
+                    Command.create({
+                        'name': _('Tax Received Adjustment'),
+                        'debit': 0,
+                        'credit': 0.0,
+                        'account_id': rep_ln_out.account_id.id
+                    }),
+
+                    Command.create({
+                        'name': _('Tax Paid Adjustment'),
+                        'debit': 0.0,
+                        'credit': 0,
+                        'account_id': rep_ln_in.account_id.id
+                    })
+                ]
+
+        return move_vals_lines, tax_group_subtotal
+
+    def _get_vat_closing_entry_additional_domain(self):
+        return []
+
+    def _postprocess_vat_closing_entry_results(self, company, options, results):
+        # Override this to, for example, apply a rounding to the lines of the closing entry
+        return results
+
+    def _vat_closing_entry_results_rounding(self, company, options, results, rounding_accounts, vat_results_summary):
+        """
+        Apply the rounding from the tax report by adding a line to the end of the query results
+        representing the sum of the roundings on each line of the tax report.
+        """
+        # Ignore if the rounding accounts cannot be found
+        if not rounding_accounts.get('profit') or not rounding_accounts.get('loss'):
+            return results
+
+        total_amount = 0.0
+        tax_group_id = None
+
+        for line in results:
+            total_amount += line['amount']
+            # The accounts on the tax group ids from the results should be uniform,
+            # but we choose the greatest id so that the line appears last on the entry.
+            tax_group_id = line['tax_group_id']
+
+        report = self.env['account.report'].browse(options['report_id'])
+
+        for line in report._get_lines(options):
+            model, record_id = report._get_model_info_from_id(line['id'])
+
+            if model != 'account.report.line':
+                continue
+
+            for (operation_type, report_line_id, column_expression_label) in vat_results_summary:
+                for column in line['columns']:
+                    if record_id != report_line_id or column['expression_label'] != column_expression_label:
+                        continue
+
+                    # We accept 3 types of operations:
+                    # 1) due and 2) deductible - This is used for reports that have lines for the payable vat and
+                    # lines for the reclaimable vat.
+                    # 3) total - This is used for reports that have a single line with the payable/reclaimable vat.
+                    if operation_type in {'due', 'total'}:
+                        total_amount += column['no_format']
+                    elif operation_type == 'deductible':
+                        total_amount -= column['no_format']
+
+        currency = company.currency_id
+        total_difference = currency.round(total_amount)
+
+        if not currency.is_zero(total_difference):
+            results.append({
+                'tax_name': _('Difference from rounding taxes'),
+                'amount': total_difference * -1,
+                'tax_group_id': tax_group_id,
+                'account_id': rounding_accounts['profit'].id if total_difference < 0 else rounding_accounts['loss'].id
+            })
+
+        return results
+
+    @api.model
+    def _add_tax_group_closing_items(self, tax_group_subtotal, closing_move):
+        """Transform the parameter tax_group_subtotal dictionnary into one2many commands.
+
+        Used to balance the tax group accounts for the creation of the vat closing entry.
+        """
+        def _add_line(account, name, company_currency):
+            self.env.cr.execute(sql_account, (
+                account,
+                closing_move.date,
+                closing_move.company_id.id,
+            ))
+            result = self.env.cr.dictfetchone()
+            advance_balance = result.get('balance') or 0
+            # Deduct/Add advance payment
+            if not company_currency.is_zero(advance_balance):
+                line_ids_vals.append((0, 0, {
+                    'name': name,
+                    'debit': abs(advance_balance) if advance_balance < 0 else 0,
+                    'credit': abs(advance_balance) if advance_balance > 0 else 0,
+                    'account_id': account
+                }))
+            return advance_balance
+
+        currency = closing_move.company_id.currency_id
+        sql_account = '''
+            SELECT SUM(aml.balance) AS balance
+            FROM account_move_line aml
+            LEFT JOIN account_move move ON move.id = aml.move_id
+            WHERE aml.account_id = %s
+              AND aml.date <= %s
+              AND move.state = 'posted'
+              AND aml.company_id = %s
+        '''
+        line_ids_vals = []
+        # keep track of already balanced account, as one can be used in several tax group
+        account_already_balanced = []
+        for key, value in tax_group_subtotal.items():
+            total = value
+            # Search if any advance payment done for that configuration
+            if key[0] and key[0] not in account_already_balanced:
+                total += _add_line(key[0], _('Balance tax advance payment account'), currency)
+                account_already_balanced.append(key[0])
+            if key[1] and key[1] not in account_already_balanced:
+                total += _add_line(key[1], _('Balance tax current account (receivable)'), currency)
+                account_already_balanced.append(key[1])
+            if key[2] and key[2] not in account_already_balanced:
+                total += _add_line(key[2], _('Balance tax current account (payable)'), currency)
+                account_already_balanced.append(key[2])
+            # Balance on the receivable/payable tax account
+            if not currency.is_zero(total):
+                line_ids_vals.append(Command.create({
+                    'name': _('Payable tax amount') if total < 0 else _('Receivable tax amount'),
+                    'debit': total if total > 0 else 0,
+                    'credit': abs(total) if total < 0 else 0,
+                    'account_id': key[2] if total < 0 else key[1]
+                }))
+        return line_ids_vals
+
+    @api.model
+    def _redirect_to_misconfigured_tax_groups(self, company, countries):
+        """ Raises a RedirectWarning informing the user his tax groups are missing configuration
+        for a given company, redirecting him to the list view of account.tax.group, filtered
+        accordingly to the provided countries.
+        """
+        need_config_action = {
+            'type': 'ir.actions.act_window',
+            'name': 'Tax groups',
+            'res_model': 'account.tax.group',
+            'view_mode': 'list',
+            'views': [[False, 'list']],
+            'domain': ['|', ('country_id', 'in', countries.ids), ('country_id', '=', False)]
+        }
+
+        raise RedirectWarning(
+            _('Please specify the accounts necessary for the Tax Closing Entry.'),
+            need_config_action,
+            _('Configure your TAX accounts - %s', company.display_name),
+        )
+
+    def _get_fpos_info_for_tax_closing(self, company, report, options):
+        """ Returns the fiscal positions information to use to generate the tax closing
+        for this company, with the provided options.
+
+        :return: (include_domestic, fiscal_positions), where fiscal positions is a recordset
+                 and include_domestic is a boolean telling whether or not the domestic closing
+                 (i.e. the one without any fiscal position) must also be performed
+        """
+        if options['fiscal_position'] == 'domestic':
+            fiscal_positions = self.env['account.fiscal.position']
+        elif options['fiscal_position'] == 'all':
+            fiscal_positions = self.env['account.fiscal.position'].search([
+                *self.env['account.fiscal.position']._check_company_domain(company),
+                ('foreign_vat', '!=', False),
+            ])
+        else:
+            fpos_ids = [options['fiscal_position']]
+            fiscal_positions = self.env['account.fiscal.position'].browse(fpos_ids)
+
+        if options['fiscal_position'] == 'all':
+            fiscal_country = company.account_fiscal_country_id
+            include_domestic = not fiscal_positions \
+                               or not report.country_id \
+                               or fiscal_country == fiscal_positions[0].country_id
+        else:
+            include_domestic = options['fiscal_position'] == 'domestic'
+
+        return include_domestic, fiscal_positions
+
+    def _get_amls_with_archived_tags_domain(self, options):
+        domain = [
+            ('tax_tag_ids.active', '=', False),
+            ('parent_state', '=', 'posted'),
+            ('date', '>=', options['date']['date_from']),
+        ]
+        if options['date']['mode'] == 'single':
+            domain.append(('date', '<=', options['date']['date_to']))
+        return domain
+
+    def action_open_amls_with_archived_tags(self, options, params=None):
+        return {
+            'name': _("Journal items with archived tax tags"),
+            'type': 'ir.actions.act_window',
+            'res_model': 'account.move.line',
+            'domain': self._get_amls_with_archived_tags_domain(options),
+            'context': {'active_test': False},
+            'views': [(self.env.ref('odex30_account_reports.view_archived_tag_move_tree').id, 'list')],
+        }
+
+
+class GenericTaxReportCustomHandler(models.AbstractModel):
+    _name = 'account.generic.tax.report.handler'
+    _inherit = 'account.tax.report.handler'
+    _description = 'Generic Tax Report Custom Handler'
+
+    def _get_custom_display_config(self):
+        parent_config = super()._get_custom_display_config()
+        parent_config['css_custom_class'] = 'generic_tax_report'
+        parent_config['templates']['AccountReportLineName'] = 'odex30_account_reports.TaxReportLineName'
+
+        return parent_config
+
+    def _custom_options_initializer(self, report, options, previous_options=None):
+        super()._custom_options_initializer(report, options, previous_options=previous_options)
+
+        # We are on the generic tax report (no country) and the user can not change the fiscal position so we show them all.
+        if not report.country_id and len(options['available_vat_fiscal_positions']) <= (0 if options['allow_domestic'] else 1) and len(options['companies']) <= 1:
+            options['allow_domestic'] = False
+            options['fiscal_position'] = 'all'
+
+    def _dynamic_lines_generator(self, report, options, all_column_groups_expression_totals, warnings=None):
+        return self._get_dynamic_lines(report, options, 'default', warnings)
+
+    def _caret_options_initializer(self):
+        return {
+            'generic_tax_report': [
+                {'name': _("Audit"), 'action': 'caret_option_audit_tax'},
+            ]
+        }
+
+    def _get_dynamic_lines(self, report, options, grouping, warnings=None):
+        """ Compute the report lines for the generic tax report.
+
+        :param options: The report options.
+        :return:        A list of lines, each one being a python dictionary.
+        """
+        options_by_column_group = report._split_options_per_column_group(options)
+
+        # Compute tax_base_amount / tax_amount for each selected groupby.
+        if grouping == 'tax_account':
+            groupby_fields = [('src_tax', 'type_tax_use'), ('src_tax', 'id'), ('account', 'id')]
+            comodels = [None, 'account.tax', 'account.account']
+        elif grouping == 'account_tax':
+            groupby_fields = [('src_tax', 'type_tax_use'), ('account', 'id'), ('src_tax', 'id')]
+            comodels = [None, 'account.account', 'account.tax']
+        else:
+            groupby_fields = [('src_tax', 'type_tax_use'), ('src_tax', 'id')]
+            comodels = [None, 'account.tax']
+
+        if grouping in ('tax_account', 'account_tax'):
+            tax_amount_hierarchy = self._read_generic_tax_report_amounts(report, options_by_column_group, groupby_fields)
+        else:
+            tax_amount_hierarchy = self._read_generic_tax_report_amounts_no_tax_details(report, options, options_by_column_group)
+
+
+        # Fetch involved records in order to ensure all lines are sorted according the comodel order.
+        # To do so, we compute 'sorting_map_list' allowing to retrieve each record by id and the order
+        # to be used.
+        record_ids_gb = [set() for dummy in groupby_fields]
+
+        def populate_record_ids_gb_recursively(node, level=0):
+            for k, v in node.items():
+                if k:
+                    record_ids_gb[level].add(k)
+                    if v.get('children'):
+                        populate_record_ids_gb_recursively(v['children'], level=level + 1)
+
+        populate_record_ids_gb_recursively(tax_amount_hierarchy)
+
+        sorting_map_list = []
+        for i, comodel in enumerate(comodels):
+            if comodel:
+                # Relational records.
+                records = self.env[comodel].with_context(active_test=False).search([('id', 'in', tuple(record_ids_gb[i]))])
+                sorting_map = {r.id: (r, j) for j, r in enumerate(records)}
+                sorting_map_list.append(sorting_map)
+            else:
+                # src_tax_type_tax_use.
+                selection = self.env['account.tax']._fields['type_tax_use']._description_selection(self.env)
+                sorting_map_list.append({v[0]: (v, j) for j, v in enumerate(selection) if v[0] in record_ids_gb[i]})
+
+        # Compute report lines.
+        lines = []
+        self._populate_lines_recursively(
+            report,
+            options,
+            lines,
+            sorting_map_list,
+            groupby_fields,
+            tax_amount_hierarchy,
+            warnings=warnings,
+        )
+        return lines
+
+
+    # -------------------------------------------------------------------------
+    # GENERIC TAX REPORT COMPUTATION (DYNAMIC LINES)
+    # -------------------------------------------------------------------------
+
+    @api.model
+    def _read_generic_tax_report_amounts_no_tax_details(self, report, options, options_by_column_group):
+        # Fetch the group of taxes.
+        # If all child taxes have a 'none' type_tax_use, all amounts are aggregated and only the group appears on the report.
+        company_ids = report.get_report_company_ids(options)
+        company_domain = self.env['account.tax']._check_company_domain(company_ids)
+        company_where_query = self.env['account.tax'].with_context(active_test=False)._where_calc(company_domain)
+        self._cr.execute(SQL(
+            '''
+                SELECT
+                    account_tax.id,
+                    account_tax.type_tax_use,
+                    ARRAY_AGG(child_tax.id) AS child_tax_ids,
+                    ARRAY_AGG(DISTINCT child_tax.type_tax_use) AS child_types
+                FROM account_tax_filiation_rel account_tax_rel
+                JOIN account_tax ON account_tax.id = account_tax_rel.parent_tax
+                JOIN account_tax child_tax ON child_tax.id = account_tax_rel.child_tax
+                WHERE account_tax.amount_type = 'group'
+                AND %s
+                GROUP BY account_tax.id
+            ''', company_where_query.where_clause or SQL("TRUE")
+        ))
+        group_of_taxes_info = {}
+        child_to_group_of_taxes = {}
+        for row in self._cr.dictfetchall():
+            row['to_expand'] = row['child_types'] != ['none']
+            group_of_taxes_info[row['id']] = row
+            for child_id in row['child_tax_ids']:
+                child_to_group_of_taxes[child_id] = row['id']
+
+        results = defaultdict(lambda: {  # key: type_tax_use
+            'base_amount': {column_group_key: 0.0 for column_group_key in options['column_groups']},
+            'tax_amount': {column_group_key: 0.0 for column_group_key in options['column_groups']},
+            'tax_non_deductible': {column_group_key: 0.0 for column_group_key in options['column_groups']},
+            'tax_deductible': {column_group_key: 0.0 for column_group_key in options['column_groups']},
+            'tax_due': {column_group_key: 0.0 for column_group_key in options['column_groups']},
+            'children': defaultdict(lambda: {  # key: tax_id
+                'base_amount': {column_group_key: 0.0 for column_group_key in options['column_groups']},
+                'tax_amount': {column_group_key: 0.0 for column_group_key in options['column_groups']},
+                'tax_non_deductible': {column_group_key: 0.0 for column_group_key in options['column_groups']},
+                'tax_deductible': {column_group_key: 0.0 for column_group_key in options['column_groups']},
+                'tax_due': {column_group_key: 0.0 for column_group_key in options['column_groups']},
+            }),
+        })
+
+        for column_group_key, options in options_by_column_group.items():
+            query = report._get_report_query(options, 'strict_range')
+            # make sure account_move is always joined
+            if 'account_move_line__move_id' not in query._joins:
+                query.join('account_move_line', 'move_id', 'account_move', 'id', 'move_id')
+
+            # Fetch the base amounts.
+            self._cr.execute(SQL(
+                '''
+                SELECT
+                    tax.id AS tax_id,
+                    tax.type_tax_use AS tax_type_tax_use,
+                    src_group_tax.id AS src_group_tax_id,
+                    src_group_tax.type_tax_use AS src_group_tax_type_tax_use,
+                    src_tax.id AS src_tax_id,
+                    src_tax.type_tax_use AS src_tax_type_tax_use,
+                    SUM(account_move_line.balance) AS base_amount
+                FROM %(table_references)s
+                JOIN account_move_line_account_tax_rel tax_rel ON account_move_line.id = tax_rel.account_move_line_id
+                JOIN account_tax tax ON tax.id = tax_rel.account_tax_id
+                LEFT JOIN account_tax src_tax ON src_tax.id = account_move_line.tax_line_id
+                LEFT JOIN account_tax src_group_tax ON src_group_tax.id = account_move_line.group_tax_id
+                WHERE %(search_condition)s
+                    AND (
+                        /* CABA */
+                        account_move_line__move_id.always_tax_exigible
+                        OR account_move_line__move_id.tax_cash_basis_rec_id IS NOT NULL
+                        OR tax.tax_exigibility != 'on_payment'
+                    )
+                    AND (
+                        (
+                            /* Tax lines affecting the base of others. */
+                            account_move_line.tax_line_id IS NOT NULL
+                            AND (
+                                src_tax.type_tax_use IN ('sale', 'purchase')
+                                OR src_group_tax.type_tax_use IN ('sale', 'purchase')
+                            )
+                        )
+                        OR
+                        (
+                            /* For regular base lines. */
+                            account_move_line.tax_line_id IS NULL
+                            AND tax.type_tax_use IN ('sale', 'purchase')
+                        )
+                    )
+                GROUP BY tax.id, src_group_tax.id, src_tax.id
+                ORDER BY src_group_tax.sequence, src_group_tax.id, src_tax.sequence, src_tax.id, tax.sequence, tax.id
+                ''',
+                table_references=query.from_clause,
+                search_condition=query.where_clause,
+            ))
+
+            group_of_taxes_with_extra_base_amount = set()
+            for row in self._cr.dictfetchall():
+                is_tax_line = bool(row['src_tax_id'])
+                if is_tax_line:
+                    if row['src_group_tax_id'] \
+                            and not group_of_taxes_info[row['src_group_tax_id']]['to_expand'] \
+                            and row['tax_id'] in group_of_taxes_info[row['src_group_tax_id']]['child_tax_ids']:
+                        # Suppose a base of 1000 with a group of taxes 20% affect + 10%.
+                        # The base of the group of taxes must be 1000, not 1200 because the group of taxes is not
+                        # expanded. So the tax lines affecting the base of its own group of taxes are ignored.
+                        pass
+                    elif row['tax_type_tax_use'] == 'none' and child_to_group_of_taxes.get(row['tax_id']):
+                        # The tax line is affecting the base of a 'none' tax belonging to a group of taxes.
+                        # In that case, the amount is accounted as an extra base for that group. However, we need to
+                        # account it only once.
+                        # For example, suppose a tax 10% affect base of subsequent followed by a group of taxes
+                        # 20% + 30%. On a base of 1000.0, the tax line for 10% will affect the base of 20% + 30%.
+                        # However, this extra base must be accounted only once since the base of the group of taxes
+                        # must be 1100.0 and not 1200.0.
+                        group_tax_id = child_to_group_of_taxes[row['tax_id']]
+                        if group_tax_id not in group_of_taxes_with_extra_base_amount:
+                            group_tax_info = group_of_taxes_info[group_tax_id]
+                            results[group_tax_info['type_tax_use']]['children'][group_tax_id]['base_amount'][column_group_key] += row['base_amount']
+                            group_of_taxes_with_extra_base_amount.add(group_tax_id)
+                    else:
+                        tax_type_tax_use = row['src_group_tax_type_tax_use'] or row['src_tax_type_tax_use']
+                        results[tax_type_tax_use]['children'][row['tax_id']]['base_amount'][column_group_key] += row['base_amount']
+                else:
+                    if row['tax_id'] in group_of_taxes_info and group_of_taxes_info[row['tax_id']]['to_expand']:
+                        # Expand the group of taxes since it contains at least one tax with a type != 'none'.
+                        group_info = group_of_taxes_info[row['tax_id']]
+                        for child_tax_id in group_info['child_tax_ids']:
+                            results[group_info['type_tax_use']]['children'][child_tax_id]['base_amount'][column_group_key] += row['base_amount']
+                    else:
+                        results[row['tax_type_tax_use']]['children'][row['tax_id']]['base_amount'][column_group_key] += row['base_amount']
+
+            # Fetch the tax amounts.
+
+            select_deductible = join_deductible = group_by_deductible = SQL()
+            if options.get('account_journal_report_tax_deductibility_columns'):
+                select_deductible = SQL(""", repartition.use_in_tax_closing AS trl_tax_closing
+                                           , SIGN(repartition.factor_percent) AS trl_factor""")
+                join_deductible = SQL("""JOIN account_tax_repartition_line repartition
+                                           ON account_move_line.tax_repartition_line_id = repartition.id""")
+                group_by_deductible = SQL(', repartition.use_in_tax_closing, SIGN(repartition.factor_percent)')
+
+            self._cr.execute(SQL(
+                '''
+                SELECT
+                    tax.id AS tax_id,
+                    tax.type_tax_use AS tax_type_tax_use,
+                    group_tax.id AS group_tax_id,
+                    group_tax.type_tax_use AS group_tax_type_tax_use,
+                    SUM(account_move_line.balance) AS tax_amount
+                    %(select_deductible)s
+                FROM %(table_references)s
+                JOIN account_tax tax ON tax.id = account_move_line.tax_line_id
+                %(join_deductible)s
+                LEFT JOIN account_tax group_tax ON group_tax.id = account_move_line.group_tax_id
+                WHERE %(search_condition)s
+                    AND (
+                        /* CABA */
+                        account_move_line__move_id.always_tax_exigible
+                        OR account_move_line__move_id.tax_cash_basis_rec_id IS NOT NULL
+                        OR tax.tax_exigibility != 'on_payment'
+                    )
+                    AND (
+                        (group_tax.id IS NULL AND tax.type_tax_use IN ('sale', 'purchase'))
+                        OR
+                        (group_tax.id IS NOT NULL AND group_tax.type_tax_use IN ('sale', 'purchase'))
+                    )
+                GROUP BY tax.id, group_tax.id %(group_by_deductible)s
+                ''',
+                select_deductible=select_deductible,
+                table_references=query.from_clause,
+                join_deductible=join_deductible,
+                search_condition=query.where_clause,
+                group_by_deductible=group_by_deductible,
+            ))
+
+            for row in self._cr.dictfetchall():
+                # Manage group of taxes.
+                # In case the group of taxes is mixing multiple taxes having a type_tax_use != 'none', consider
+                # them instead of the group.
+                tax_id = row['tax_id']
+                if row['group_tax_id']:
+                    tax_type_tax_use = row['group_tax_type_tax_use']
+                    if not group_of_taxes_info[row['group_tax_id']]['to_expand']:
+                        tax_id = row['group_tax_id']
+                else:
+                    tax_type_tax_use = row['group_tax_type_tax_use'] or row['tax_type_tax_use']
+
+                results[tax_type_tax_use]['tax_amount'][column_group_key] += row['tax_amount']
+                results[tax_type_tax_use]['children'][tax_id]['tax_amount'][column_group_key] += row['tax_amount']
+
+                if options.get('account_journal_report_tax_deductibility_columns'):
+                    tax_detail_label = False
+                    if row['trl_factor'] > 0 and tax_type_tax_use == 'purchase':
+                        tax_detail_label = 'tax_deductible' if row['trl_tax_closing'] else 'tax_non_deductible'
+                    elif row['trl_tax_closing'] and (row['trl_factor'] > 0, tax_type_tax_use) in ((False, 'purchase'), (True, 'sale')):
+                        tax_detail_label = 'tax_due'
+
+                    if tax_detail_label:
+                        results[tax_type_tax_use][tax_detail_label][column_group_key] += row['tax_amount'] * row['trl_factor']
+                        results[tax_type_tax_use]['children'][tax_id][tax_detail_label][column_group_key] += row['tax_amount'] * row['trl_factor']
+
+        return results
+
+    def _read_generic_tax_report_amounts(self, report, options_by_column_group, groupby_fields):
+        """ Read the tax details to compute the tax amounts.
+
+        :param options_list:    The list of report options, one for each period.
+        :param groupby_fields:  A list of tuple (alias, field) representing the way the amounts must be grouped.
+        :return:                A dictionary mapping each groupby key (e.g. a tax_id) to a sub dictionary containing:
+
+            base_amount:    The tax base amount expressed in company's currency.
+            tax_amount      The tax amount expressed in company's currency.
+            children:       The children nodes following the same pattern as the current dictionary.
+        """
+        fetch_group_of_taxes = False
+
+        select_clause_list = []
+        groupby_query_list = []
+        for alias, field in groupby_fields:
+            select_clause_list.append(SQL("%s AS %s", SQL.identifier(alias, field), SQL.identifier(f'{alias}_{field}')))
+            groupby_query_list.append(SQL.identifier(alias, field))
+
+            # Fetch both info from the originator tax and the child tax to manage the group of taxes.
+            if alias == 'src_tax':
+                select_clause_list.append(SQL("%s AS %s", SQL.identifier('tax', field), SQL.identifier(f'tax_{field}')))
+                groupby_query_list.append(SQL.identifier('tax', field))
+                fetch_group_of_taxes = True
+
+        # Fetch the group of taxes.
+        # If all children taxes are 'none', all amounts are aggregated and only the group will appear on the report.
+        # If some children taxes are not 'none', the children are displayed.
+        group_of_taxes_to_expand = set()
+        if fetch_group_of_taxes:
+            group_of_taxes = self.env['account.tax'].with_context(active_test=False).search([('amount_type', '=', 'group')])
+            for group in group_of_taxes:
+                if set(group.children_tax_ids.mapped('type_tax_use')) != {'none'}:
+                    group_of_taxes_to_expand.add(group.id)
+
+        res = {}
+        for column_group_key, options in options_by_column_group.items():
+            query = report._get_report_query(options, 'strict_range')
+            tax_details_query = self.env['account.move.line']._get_query_tax_details(query.from_clause, query.where_clause)
+
+            # Avoid adding multiple times the same base amount sharing the same grouping_key.
+            # It could happen when dealing with group of taxes for example.
+            row_keys = set()
+
+            self._cr.execute(SQL(
+                '''
+                SELECT
+                    %(select_clause)s,
+                    trl.document_type = 'refund' AS is_refund,
+                    SUM(CASE WHEN tdr.display_type = 'rounding' THEN 0 ELSE tdr.base_amount END) AS base_amount,
+                    SUM(tdr.tax_amount) AS tax_amount
+                FROM (%(tax_details_query)s) AS tdr
+                JOIN account_tax_repartition_line trl ON trl.id = tdr.tax_repartition_line_id
+                JOIN account_tax tax ON tax.id = tdr.tax_id
+                JOIN account_tax src_tax ON
+                    src_tax.id = COALESCE(tdr.group_tax_id, tdr.tax_id)
+                    AND src_tax.type_tax_use IN ('sale', 'purchase')
+                JOIN account_account account ON account.id = tdr.base_account_id
+                WHERE tdr.tax_exigible
+                GROUP BY tdr.tax_repartition_line_id, trl.document_type, %(groupby_query)s
+                ORDER BY src_tax.sequence, src_tax.id, tax.sequence, tax.id
+                ''',
+                select_clause=SQL(',').join(select_clause_list),
+                tax_details_query=tax_details_query,
+                groupby_query=SQL(',').join(groupby_query_list),
+            ))
+
+            for row in self._cr.dictfetchall():
+                node = res
+
+                # tuple of values used to prevent adding multiple times the same base amount.
+                cumulated_row_key = [row['is_refund']]
+
+                for alias, field in groupby_fields:
+                    grouping_key = f'{alias}_{field}'
+
+                    # Manage group of taxes.
+                    # In case the group of taxes is mixing multiple taxes having a type_tax_use != 'none', consider
+                    # them instead of the group.
+                    if grouping_key == 'src_tax_id' and row['src_tax_id'] in group_of_taxes_to_expand:
+                        # Add the originator group to the grouping key, to make sure that its base amount is not
+                        # treated twice, for hybrid cases where a tax is both used in a group and independently.
+                        cumulated_row_key.append(row[grouping_key])
+
+                        # Ensure the child tax is used instead of the group.
+                        grouping_key = 'tax_id'
+
+                    row_key = row[grouping_key]
+                    cumulated_row_key.append(row_key)
+                    cumulated_row_key_tuple = tuple(cumulated_row_key)
+
+                    node.setdefault(row_key, {
+                        'base_amount': {column_group_key: 0.0 for column_group_key in options['column_groups']},
+                        'tax_amount': {column_group_key: 0.0 for column_group_key in options['column_groups']},
+                        'children': {},
+                    })
+                    sub_node = node[row_key]
+
+                    # Add amounts.
+                    if cumulated_row_key_tuple not in row_keys:
+                        sub_node['base_amount'][column_group_key] += row['base_amount']
+                    sub_node['tax_amount'][column_group_key] += row['tax_amount']
+
+                    node = sub_node['children']
+                    row_keys.add(cumulated_row_key_tuple)
+
+        return res
+
+    def _populate_lines_recursively(self, report, options, lines, sorting_map_list, groupby_fields, values_node, index=0, type_tax_use=None, parent_line_id=None, warnings=None):
+        ''' Populate the list of report lines passed as parameter recursively. At this point, every amounts is already
+        fetched for every periods and every groupby.
+
+        :param options:             The report options.
+        :param lines:               The list of report lines to populate.
+        :param sorting_map_list:    A list of dictionary mapping each encountered key with a weight to sort the results.
+        :param index:               The index of the current element to process (also equals to the level into the hierarchy).
+        :param groupby_fields:      A list of tuple <alias, field> defining in which way tax amounts should be grouped.
+        :param values_node:         The node containing the amounts and children into the hierarchy.
+        :param type_tax_use:        The type_tax_use of the tax.
+        :param parent_line_id:      The line id of the parent line (if any)
+        :param warnings             The warnings dictionnary.
+        '''
+        if index == len(groupby_fields):
+            return
+
+        alias, field = groupby_fields[index]
+        groupby_key = f'{alias}_{field}'
+
+        # Sort the keys in order to add the lines in the same order as the records.
+        sorting_map = sorting_map_list[index]
+        sorted_keys = sorted(list(values_node.keys()), key=lambda x: sorting_map[x][1])
+
+        for key in sorted_keys:
+
+            # Compute 'type_tax_use' with the first grouping since 'src_tax_type_tax_use' is always
+            # the first one.
+            if groupby_key == 'src_tax_type_tax_use':
+                type_tax_use = key
+            sign = -1 if type_tax_use == 'sale' else 1
+
+            # Prepare columns.
+            tax_amount_dict = values_node[key]
+            columns = []
+            tax_base_amounts = tax_amount_dict['base_amount']
+            tax_amounts = tax_amount_dict['tax_amount']
+
+            for column in options['columns']:
+                tax_base_amount = tax_base_amounts[column['column_group_key']]
+                tax_amount = tax_amounts[column['column_group_key']]
+
+                expr_label = column.get('expression_label')
+                col_value = ''
+
+                if expr_label == 'net' and index == len(groupby_fields) - 1:
+                    col_value = sign * tax_base_amount
+
+                if expr_label == 'tax':
+                    col_value = sign * tax_amount
+
+                columns.append(report._build_column_dict(col_value, column, options=options))
+
+                # Add the non-deductible, deductible and due tax amounts.
+                if expr_label == 'tax' and options.get('account_journal_report_tax_deductibility_columns'):
+                    for deduct_type in ('tax_non_deductible', 'tax_deductible', 'tax_due'):
+                        columns.append(report._build_column_dict(
+                            col_value=sign * tax_amount_dict[deduct_type][column['column_group_key']],
+                            col_data={
+                                'figure_type': 'monetary',
+                                'column_group_key': column['column_group_key'],
+                                'expression_label': deduct_type,
+                            },
+                            options=options,
+                        ))
+
+            # Prepare line.
+            default_vals = {
+                'columns': columns,
+                'level': index if index == 0 else index + 1,
+                'unfoldable': False,
+            }
+            report_line = self._build_report_line(report, options, default_vals, groupby_key, sorting_map[key][0], parent_line_id, warnings)
+
+            if groupby_key == 'src_tax_id':
+                report_line['caret_options'] = 'generic_tax_report'
+
+            lines.append((0, report_line))
+
+            # Process children recursively.
+            self._populate_lines_recursively(
+                report,
+                options,
+                lines,
+                sorting_map_list,
+                groupby_fields,
+                tax_amount_dict.get('children'),
+                index=index + 1,
+                type_tax_use=type_tax_use,
+                parent_line_id=report_line['id'],
+                warnings=warnings,
+            )
+
+    def _build_report_line(self, report, options, default_vals, groupby_key, value, parent_line_id, warnings=None):
+        """ Build the report line accordingly to its type.
+        :param options:         The report options.
+        :param default_vals:    The pre-computed report line values.
+        :param groupby_key:     The grouping_key record.
+        :param value:           The value that could be a record.
+        :param parent_line_id   The line id of the parent line (if any, can be None otherwise)
+        :param warnings:        The warnings dictionary.
+        :return:                A python dictionary.
+        """
+        report_line = dict(default_vals)
+        if parent_line_id is not None:
+            report_line['parent_id'] = parent_line_id
+
+        if groupby_key == 'src_tax_type_tax_use':
+            type_tax_use_option = value
+            report_line['id'] = report._get_generic_line_id(None, None, markup=type_tax_use_option[0], parent_line_id=parent_line_id)
+            report_line['name'] = type_tax_use_option[1]
+
+        elif groupby_key == 'src_tax_id':
+            tax = value
+            report_line['id'] = report._get_generic_line_id(tax._name, tax.id, parent_line_id=parent_line_id)
+
+            if tax.amount_type == 'percent':
+                report_line['name'] = f"{tax.name} ({tax.amount}%)"
+
+                if warnings is not None:
+                    self._check_line_consistency(report, options, report_line, tax, warnings)
+            elif tax.amount_type == 'fixed':
+                report_line['name'] = f"{tax.name} ({tax.amount})"
+            else:
+                report_line['name'] = tax.name
+
+            if options.get('multi-company'):
+                report_line['name'] = f"{report_line['name']} - {tax.company_id.display_name}"
+
+        elif groupby_key == 'account_id':
+            account = value
+            report_line['id'] = report._get_generic_line_id(account._name, account.id, parent_line_id=parent_line_id)
+
+            if options.get('multi-company'):
+                report_line['name'] = f"{account.display_name} - {account.company_id.display_name}"
+            else:
+                report_line['name'] = account.display_name
+
+        return report_line
+
+    def _check_line_consistency(self, report, options, report_line, tax, warnings=None):
+        tax_applied = tax.amount * sum(tax.invoice_repartition_line_ids.filtered(lambda tax_rep: tax_rep.repartition_type == 'tax').mapped('factor')) / 100
+
+        for column_group_key, column_group_options in report._split_options_per_column_group(options).items():
+            net_value = next((col['no_format'] for col in report_line['columns'] if col['column_group_key'] == column_group_key and col['expression_label'] == 'net'), 0)
+            tax_value = next((col['no_format'] for col in report_line['columns'] if col['column_group_key'] == column_group_key and col['expression_label'] == 'tax'), 0)
+
+            if net_value == '':  # noqa: PLC1901
+                continue
+
+            currency = self.env.company.currency_id
+            computed_tax_amount = float(net_value or 0) * tax_applied
+            is_inconsistent = currency.compare_amounts(computed_tax_amount, tax_value)
+
+            if is_inconsistent:
+                error = abs(abs(tax_value) - abs(computed_tax_amount)) / float(net_value or 1)
+
+                # Error is bigger than 0.1%. We can not ignore it.
+                if error > 0.001:
+                    report_line['alert'] = True
+                    warnings['odex30_account_reports.tax_report_warning_lines_consistency'] = {'alert_type': 'danger'}
+
+                    return
+
+     # -------------------------------------------------------------------------
+     # BUTTONS & CARET OPTIONS
+     # -------------------------------------------------------------------------
+
+    def caret_option_audit_tax(self, options, params):
+        report = self.env['account.report'].browse(options['report_id'])
+        model, tax_id = report._get_model_info_from_id(params['line_id'])
+
+        if model != 'account.tax':
+            raise UserError(_("Cannot audit tax from another model than account.tax."))
+
+        tax = self.env['account.tax'].browse(tax_id)
+
+        if tax.amount_type == 'group':
+            tax_affecting_base_domain = [
+                ('tax_ids', 'in', tax.children_tax_ids.ids),
+                ('tax_repartition_line_id', '!=', False),
+            ]
+        else:
+            tax_affecting_base_domain = [
+                ('tax_ids', '=', tax.id),
+                ('tax_ids.type_tax_use', '=', tax.type_tax_use),
+                ('tax_repartition_line_id', '!=', False),
+            ]
+
+        domain = report._get_options_domain(options, 'strict_range') + expression.OR((
+            # Base lines
+            [
+                ('tax_ids', 'in', tax.ids),
+                ('tax_ids.type_tax_use', '=', tax.type_tax_use),
+                ('tax_repartition_line_id', '=', False),
+            ],
+            # Tax lines
+            [
+                ('group_tax_id', '=', tax.id) if tax.amount_type == 'group' else ('tax_line_id', '=', tax.id),
+            ],
+            # Tax lines acting as base lines
+            tax_affecting_base_domain,
+        ))
+
+        ctx = self._context.copy()
+        ctx.update({'search_default_group_by_account': 2, 'expand': 1})
+
+        return {
+            'type': 'ir.actions.act_window',
+            'name': _('Journal Items for Tax Audit'),
+            'res_model': 'account.move.line',
+            'views': [[self.env.ref('account.view_move_line_tax_audit_tree').id, 'list']],
+            'domain': domain,
+            'context': ctx,
+        }
+
+
+class GenericTaxReportCustomHandlerAT(models.AbstractModel):
+    _name = 'account.generic.tax.report.handler.account.tax'
+    _inherit = 'account.generic.tax.report.handler'
+    _description = 'Generic Tax Report Custom Handler (Account -> Tax)'
+
+    def _dynamic_lines_generator(self, report, options, all_column_groups_expression_totals, warnings=None):
+        return super()._get_dynamic_lines(report, options, 'account_tax', warnings)
+
+
+class GenericTaxReportCustomHandlerTA(models.AbstractModel):
+    _name = 'account.generic.tax.report.handler.tax.account'
+    _inherit = 'account.generic.tax.report.handler'
+    _description = 'Generic Tax Report Custom Handler (Tax -> Account)'
+
+    def _dynamic_lines_generator(self, report, options, all_column_groups_expression_totals, warnings=None):
+        return super()._get_dynamic_lines(report, options, 'tax_account', warnings)
diff --git a/dev_odex30_accounting/odex30_account_reports/models/account_journal_dashboard.py b/dev_odex30_accounting/odex30_account_reports/models/account_journal_dashboard.py
new file mode 100644
index 0000000..0b93785
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_reports/models/account_journal_dashboard.py
@@ -0,0 +1,28 @@
+from odoo import models
+
+import ast
+
+
+class AccountJournal(models.Model):
+    _inherit = 'account.journal'
+
+    def _fill_general_dashboard_data(self, dashboard_data):
+        super()._fill_general_dashboard_data(dashboard_data)
+        for journal in self.filtered(lambda journal: journal.type == 'general'):
+            dashboard_data[journal.id]['is_account_tax_periodicity_journal'] = journal == journal.company_id._get_tax_closing_journal()
+
+    def action_open_bank_balance_in_gl(self):
+
+        self.ensure_one()
+        action = self.env["ir.actions.actions"]._for_xml_id("odex30_account_reports.action_account_report_general_ledger")
+
+        action['context'] = dict(ast.literal_eval(action['context']), default_filter_accounts=self.default_account_id.code)
+
+        return action
+
+    def _transform_activity_dict(self, activity_data):
+        error_type_id = self.env['ir.model.data']._xmlid_to_res_id('odex30_account_reports.mail_activity_type_tax_report_error', raise_if_not_found=False)
+        return {
+            **super()._transform_activity_dict(activity_data),
+            'is_tax_report_error': error_type_id and activity_data['act_type_id'] == error_type_id,
+        }
diff --git a/dev_odex30_accounting/odex30_account_reports/models/account_journal_report.py b/dev_odex30_accounting/odex30_account_reports/models/account_journal_report.py
new file mode 100644
index 0000000..14e6594
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_reports/models/account_journal_report.py
@@ -0,0 +1,1385 @@
+import io
+import datetime
+
+from PIL import ImageFont
+from markupsafe import Markup
+
+from odoo import models, _
+from odoo.tools import SQL
+from odoo.tools.misc import xlsxwriter, file_path
+from collections import defaultdict
+from itertools import chain
+
+XLSX_GRAY_200 = '#EEEEEE'
+XLSX_BORDER_COLOR = '#B4B4B4'
+XLSX_FONT_SIZE_DEFAULT = 8
+XLSX_FONT_SIZE_HEADING = 11
+
+
+class JournalReportCustomHandler(models.AbstractModel):
+    _name = "account.journal.report.handler"
+    _inherit = "account.report.custom.handler"
+    _description = "Journal Report Custom Handler"
+
+    def _custom_options_initializer(self, report, options, previous_options):
+
+        # Initialise the custom option for this report.
+        options['ignore_totals_below_sections'] = True
+        options['show_payment_lines'] = previous_options.get('show_payment_lines', True)
+
+    def _get_custom_display_config(self):
+        return {
+            'css_custom_class': 'journal_report',
+            'pdf_css_custom_class': 'journal_report_pdf',
+            'components': {
+                'AccountReportLine': 'odex30_account_reports.JournalReportLine',
+            },
+            'templates': {
+                'AccountReportFilters': 'odex30_account_reports.JournalReportFilters',
+                'AccountReportLineName': 'odex30_account_reports.JournalReportLineName',
+            },
+            'pdf_export': {
+                'pdf_export_main': 'odex30_account_reports.journal_report_pdf_export_main',
+            },
+        }
+
+
+    def _report_custom_engine_journal_report(self, expressions, options, date_scope, current_groupby, next_groupby, offset=0, limit=None, warnings=None):
+
+        def build_result_dict(current_groupby, query_line):
+            """
+            Creates a line entry used by the custom engine
+            """
+            if current_groupby == 'account_id':
+                code = query_line['account_code'][0]
+            elif current_groupby == 'journal_id':
+                code = query_line['journal_code'][0]
+            else:
+                code = None
+
+            result_line_dict = {
+                'code': code,
+                'credit': query_line['credit'],
+                'debit': query_line['debit'],
+                'balance': query_line['balance'] if current_groupby == 'account_id' else None
+            }
+            return query_line['grouping_key'], result_line_dict
+
+        report = self.env['account.report'].browse(options['report_id'])
+        report._check_groupby_fields((next_groupby.split(',') if next_groupby else []) + ([current_groupby] if current_groupby else []))
+
+        # If it is the first line, we want to render our column label
+        # Since we don't use the one from the base report
+        if not current_groupby:
+            return {
+                'code': None,
+                'debit': None,
+                'credit': None,
+                'balance': None
+            }
+
+        query = report._get_report_query(options, 'strict_range')
+        account_alias = query.join(
+            lhs_alias='account_move_line',
+            lhs_column='account_id',
+            rhs_table='account_account',
+            rhs_column='id',
+            link='account_id_for_code', # Custom link name to avoid potential alias clash with what is generated by _field_to_sql for the groupby below
+        )
+        account_code = self.env['account.account']._field_to_sql(account_alias, 'code', query)
+
+        groupby_clause = self.env['account.move.line']._field_to_sql('account_move_line', current_groupby, query)
+        select_from_groupby = SQL('%s AS grouping_key', groupby_clause)
+
+        query = SQL(
+            """
+                SELECT
+                    %(select_from_groupby)s,
+                    ARRAY_AGG(DISTINCT %(account_code)s) AS account_code,
+                    ARRAY_AGG(DISTINCT j.code) AS journal_code,
+                    SUM("account_move_line".debit) AS debit,
+                    SUM("account_move_line".credit) AS credit,
+                    SUM("account_move_line".balance) AS balance
+                FROM %(table)s
+                JOIN account_move am ON am.id = account_move_line.move_id
+                JOIN account_journal j ON j.id = am.journal_id
+                JOIN res_company cp ON cp.id = am.company_id
+                WHERE %(case_statement)s AND %(search_conditions)s
+                GROUP BY %(groupby_clause)s
+                ORDER BY %(groupby_clause)s
+            """,
+            select_from_groupby=select_from_groupby,
+            account_code=account_code,
+            table=query.from_clause,
+            search_conditions=query.where_clause,
+            case_statement=self._get_payment_lines_filter_case_statement(options),
+            groupby_clause=groupby_clause
+        )
+        self._cr.execute(query)
+        query_lines = self._cr.dictfetchall()
+        result_lines = []
+
+        for query_line in query_lines:
+            result_lines.append(build_result_dict(current_groupby, query_line))
+
+        return result_lines
+
+    def _custom_line_postprocessor(self, report, options, lines):
+
+        new_lines = []
+
+        if not lines:
+            return new_lines
+
+        for i, line in enumerate(lines):
+            new_lines.append(line)
+            line_id = line['id']
+
+            line_model, res_id = report._get_model_info_from_id(line_id)
+            if line_model == 'account.journal':
+                line['journal_id'] = res_id
+            elif line_model == 'account.account':
+                res_ids_map = report._get_res_ids_from_line_id(line_id, ['account.journal', 'account.account'])
+                line['journal_id'] = res_ids_map['account.journal']
+                line['account_id'] = res_ids_map['account.account']
+                line['date'] = options['date']
+
+                journal = self.env['account.journal'].browse(line['journal_id'])
+
+                # If it is the last line of the journal section
+                # Check if the journal has taxes and if so, add the tax summaries
+                if (i + 1 == len(lines) or (i + 1 < len(lines) and report._get_model_info_from_id(lines[i + 1]['id'])[0] != 'account.account')) and self._section_has_tax(options, journal.id):
+                    tax_summary_line = {
+                        'id': report._get_generic_line_id(False, False, parent_line_id=line['parent_id'], markup='tax_report_section'),
+                        'name': '',
+                        'parent_id': line['parent_id'],
+                        'journal_id': journal.id,
+                        'is_tax_section_line': True,
+                        'columns': [],
+                        'colspan': len(options['columns']) + 1,
+                        'level': 4,
+                        **self._get_tax_summary_section(options, {'id': journal.id, 'type': journal.type})
+                    }
+                    new_lines.append(tax_summary_line)
+
+        # If we render the first level it means that we need to render
+        # the global tax summary lines
+        if report._get_model_info_from_id(lines[0]['id'])[0] == 'account.report.line':
+            if self._section_has_tax(options, False):
+                # We only add the global summary line if it has taxes
+                new_lines.append({
+                        'id': report._get_generic_line_id(False, False, markup='tax_report_section_heading'),
+                        'name': _('Global Tax Summary'),
+                        'level': 0,
+                        'columns': [],
+                        'unfoldable': False,
+                        'colspan': len(options['columns']) + 1
+                        # We want it to take the whole line. It makes it easier to unfold it.
+                    })
+                summary_line = {
+                    'id': report._get_generic_line_id(False, False, markup='tax_report_section'),
+                    'name': '',
+                    'is_tax_section_line': True,
+                    'columns': [],
+                    'colspan': len(options['columns']) + 1,
+                    'level': 4,
+                    'class': 'o_odex30_account_reports_ja_subtable',
+                    **self._get_tax_summary_section(options)
+                }
+                new_lines.append(summary_line)
+
+        return new_lines
+
+    def format_column_values_from_client(self, options, lines):
+        """
+        Format column values for journal reports, including tax summary sections.
+        Called via dispatch_report_action when rounding unit changes on client side.
+        """
+        report = self.env['account.report'].browse(options['report_id'])
+        for line_dict in lines:
+            if line_dict.get('is_tax_section_line'):
+                self._format_tax_summary_line(report, options, line_dict)
+
+        return report.format_column_values_from_client(options, lines)
+
+    def _format_tax_summary_line(self, report, options, line_dict):
+        """ Apply formatting to tax summary monetary values based on current options. """
+        # Format tax_report_lines (individual tax details)
+        tax_report_lines = line_dict.get('tax_report_lines')
+        if tax_report_lines:
+            monetary_fields = ['base_amount', 'tax_amount', 'tax_non_deductible', 'tax_deductible', 'tax_due']
+            for tax_line in chain.from_iterable(tax_report_lines.values()):
+                for field in monetary_fields:
+                    no_format_field = f'{field}_no_format'
+                    no_format_value = tax_line.get(no_format_field)
+                    if no_format_value is not None:
+                        tax_line[field] = report.format_value(options, no_format_value, figure_type='monetary')
+
+        # Format tax_grid_summary_lines (tax grid summaries)
+        tax_grid_lines = line_dict.get('tax_grid_summary_lines')
+        if tax_grid_lines:
+            for country_grids in tax_grid_lines.values():
+                for grid_line in country_grids.values():
+                    plus = grid_line.get('+_no_format', 0)
+                    minus = grid_line.get('-_no_format', 0)
+                    grid_line['+'] = report.format_value(options, plus, figure_type='monetary')
+                    grid_line['-'] = report.format_value(options, minus, figure_type='monetary')
+                    grid_line['impact'] = report.format_value(options, plus - minus, figure_type='monetary')
+
+    ##########################################################################
+    # PDF Export
+    ##########################################################################
+
+    def export_to_pdf(self, options):
+        """
+        Overrides the default export_to_pdf function from account.report to
+        not use the default lines system since we make a different report
+        from the UI
+        """
+        report = self.env['account.report'].browse(options['report_id'])
+        base_url = report.get_base_url()
+        print_options = {
+            **report.get_options(previous_options={**options, 'export_mode': 'print'}),
+            'css_custom_class': self._get_custom_display_config().get('pdf_css_custom_class', 'journal_report_pdf')
+        }
+        rcontext = {
+            'mode': 'print',
+            'base_url': base_url,
+            'company': self.env.company,
+        }
+
+        footer = self.env['ir.actions.report']._render_template('odex30_account_reports.internal_layout', values=rcontext)
+        footer = self.env['ir.actions.report']._render_template('web.minimal_layout', values=dict(rcontext, subst=True, body=Markup(footer.decode())))
+
+        document_data = self._generate_document_data_for_export(report, print_options, 'pdf')
+        render_values = {
+            'report': report,
+            'options': print_options,
+            'base_url': base_url,
+            'document_data': document_data
+        }
+        body = self.env['ir.qweb']._render(self._get_custom_display_config()['pdf_export']['pdf_export_main'], render_values)
+
+        action_report = self.env['ir.actions.report']
+        pdf_file_stream = io.BytesIO(action_report._run_wkhtmltopdf(
+            [body],
+            footer=footer.decode(),
+            landscape=False,
+            specific_paperformat_args={
+                'data-report-margin-top': 10,
+                'data-report-header-spacing': 10,
+                'data-report-margin-bottom': 15,
+            }
+        ))
+
+        pdf_result = pdf_file_stream.getvalue()
+        pdf_file_stream.close()
+
+        return {
+            'file_name': report.get_default_report_filename(print_options, 'pdf'),
+            'file_content': pdf_result,
+            'file_type': 'pdf',
+        }
+
+    ##########################################################################
+    # XLSX Export
+    ##########################################################################
+
+    def export_to_xlsx(self, options, response=None):
+        """
+        Overrides the default XLSX Generation from account.repor to use a custom one.
+        """
+        output = io.BytesIO()
+        workbook = xlsxwriter.Workbook(output, {
+            'in_memory': True,
+            'strings_to_formulas': False,
+        })
+        report = self.env['account.report'].search([('id', '=', options['report_id'])], limit=1)
+        print_options = report.get_options(previous_options={**options, 'export_mode': 'print'})
+        document_data = self._generate_document_data_for_export(report, print_options, 'xlsx')
+
+        # We need to use fonts to calculate column width otherwise column width would be ugly
+        # Using Lato as reference font is a hack and is not recommended. Customer computers don't have this font by default and so
+        # the generated xlsx wouldn't have this font. Since it is not by default, we preferred using Arial font as default and keep
+        # Lato as reference for columns width calculations.
+        fonts = {}
+        for font_size in (XLSX_FONT_SIZE_HEADING, XLSX_FONT_SIZE_DEFAULT):
+            fonts[font_size] = defaultdict()
+            for font_type in ('Reg', 'Bol', 'RegIta', 'BolIta'):
+                try:
+                    lato_path = f'web/static/fonts/lato/Lato-{font_type}-webfont.ttf'
+                    fonts[font_size][font_type] = ImageFont.truetype(file_path(lato_path), font_size)
+                except (OSError, FileNotFoundError):
+                    # This won't give great result, but it will work.
+                    fonts[font_size][font_type] = ImageFont.load_default()
+
+        for journal_vals in document_data['journals_vals']:
+            cursor_x = 0
+            cursor_y = 0
+
+            # Default sheet properties
+            sheet = workbook.add_worksheet(journal_vals['name'][:31])
+            columns = journal_vals['columns']
+
+            for column in columns:
+                align = 'left'
+                if 'o_right_alignment' in column.get('class', ''):
+                    align = 'right'
+                self._write_cell(cursor_x, cursor_y, column['name'], 1, False, report, fonts, workbook, sheet, XLSX_FONT_SIZE_HEADING,
+                                 True, XLSX_GRAY_200, align, 2, 2)
+                cursor_x = cursor_x + 1
+
+            # Set cursor coordinates for the table generation
+            cursor_y += 1
+            cursor_x = 0
+            for line in journal_vals['lines'][:-1]:
+                is_first_aml_line = False
+                for column in columns:
+                    border_top = 0 if not is_first_aml_line else 1
+                    align = 'left'
+
+                    if line.get(column['label'], {}).get('data'):
+                        data = line[column['label']]['data']
+                        is_date = isinstance(data, datetime.date)
+                        bold = False
+
+                        if 'o_right_alignment' in column.get('class', ''):
+                            align = 'right'
+
+                        if line[column['label']].get('class') and 'o_bold' in line[column['label']]['class']:
+                            # if the cell has bold styling, should only be on the first line of each aml
+                            is_first_aml_line = True
+                            border_top = 1
+                            bold = True
+
+                        self._write_cell(cursor_x, cursor_y, data, 1, is_date, report, fonts, workbook, sheet, XLSX_FONT_SIZE_DEFAULT,
+                                         bold, 'white', align, 0, border_top, XLSX_BORDER_COLOR)
+
+                    else:
+                        # Empty value
+                        self._write_cell(cursor_x, cursor_y, '', 1, False, report, fonts, workbook, sheet, XLSX_FONT_SIZE_DEFAULT, False,
+                                         'white', align, 0, border_top, XLSX_BORDER_COLOR)
+
+                    cursor_x += 1
+                cursor_x = 0
+                cursor_y += 1
+
+            # Draw total line
+            total_line = journal_vals['lines'][-1]
+            for column in columns:
+                data = ''
+                align = 'left'
+
+                if total_line.get(column['label'], {}).get('data'):
+                    data = total_line[column['label']]['data']
+
+                if 'o_right_alignment' in column.get('class', ''):
+                    align = 'right'
+
+                self._write_cell(cursor_x, cursor_y, data, 1, False, report, fonts, workbook, sheet, XLSX_FONT_SIZE_DEFAULT, True,
+                                 XLSX_GRAY_200, align, 2, 2)
+                cursor_x += 1
+
+            cursor_x = 0
+
+            sheet.set_default_row(20)
+            sheet.set_row(0, 30)
+
+            # Tax tables drawing
+            if journal_vals.get('tax_summary'):
+                self._write_tax_summaries_to_sheet(report, workbook, sheet, fonts, len(columns) + 1, 1, journal_vals['tax_summary'])
+
+        if document_data.get('global_tax_summary'):
+            self._write_tax_summaries_to_sheet(
+                report,
+                workbook,
+                workbook.add_worksheet(_('Global Tax Summary')[:31]),
+                fonts,
+                0,
+                0,
+                document_data['global_tax_summary']
+            )
+
+        report._add_options_xlsx_sheet(workbook, [print_options])
+        workbook.close()
+        output.seek(0)
+        generated_file = output.read()
+        output.close()
+
+        return {
+            'file_name': report.get_default_report_filename(options, 'xlsx'),
+            'file_content': generated_file,
+            'file_type': 'xlsx',
+        }
+
+    def _write_cell(self, x, y, value, colspan, datetime, report, fonts, workbook, sheet, font_size, bold=False,
+                    bg_color='white', align='left', border_bottom=0, border_top=0, border_color='0x000000'):
+        """
+        Write a value to a specific cell in the sheet with specific styling
+
+        This helps to not create style format for every use case
+
+        :param x:               The x coordinate of the cell to write in
+        :param y:               The y coordinate of the cell to write in
+        :param value:           The value to write
+        :param colspan:         The number of columns to extend
+        :param datetime:        True if the value is a date else False
+        :param report:          The current report
+        :param fonts:           The fonts used to calculate the size of each cells. We use Lato because we cannot get Arial but, we write in Arial since we cannot embed Lato on the worksheet
+        :param workbook:        The workbook currently using
+        :param sheet:           The sheet from the workbook to write on
+        :param font_size:       The font size to write with
+        :param bold:            True if the written value should be bold default: False
+        :param bg_color:        The background color of the cell in hex or string ex: '#fff' default: 'white'
+        :param align:           The alignement of the text ex: 'left', 'right', 'center' default: 'left'
+        :param border_bottom:   The width of the bottom border default: 0
+        :param border_top:      The width of the top border default: 0
+        :param border_color:    The color of the borders in hex or string default: '0x000'
+        """
+        style = workbook.add_format({
+            'font_name': 'Arial',
+            'font_size': font_size,
+            'bold': bold,
+            'bg_color': bg_color,
+            'align': align,
+            'bottom': border_bottom,
+            'top': border_top,
+            'border_color': border_color,
+        })
+
+        if colspan == 1:
+            if datetime:
+                style.set_num_format('yyyy-mm-dd')
+                sheet.write_datetime(y, x, value, style)
+            else:
+                # Some account_move_lines cells can have multiple lines: one for the title then some additional lines for text.
+                # On Xlsx it's better to keep everything on one line so when you click on cell, all the value is shown and not juste the title
+                if isinstance(value, str):
+                    value = value.replace('\n', ' ')
+                report._set_xlsx_cell_sizes(sheet, fonts[font_size], x, y, value, style, colspan > 1)
+                sheet.write(y, x, value, style)
+        else:
+            sheet.merge_range(y, x, y, x + colspan - 1, value, style)
+
+    def _write_tax_summaries_to_sheet(self, report, workbook, sheet, fonts, start_x, start_y, tax_summary):
+        cursor_x = start_x
+        cursor_y = start_y
+
+        # Tax applied
+        columns = []
+        taxes = tax_summary.get('tax_report_lines')
+        if taxes:
+            start_align_right = start_x + 1
+
+            if len(taxes) > 1:
+                start_align_right += 1
+                columns.append(_('Country'))
+
+            columns += [_('Name'), _('Base Amount'), _('Tax Amount')]
+            if tax_summary.get('tax_non_deductible_column'):
+                columns.append(_('Non-Deductible'))
+            if tax_summary.get('tax_deductible_column'):
+                columns.append(_('Deductible'))
+            if tax_summary.get('tax_due_column'):
+                columns.append(_('Due'))
+
+            # Draw Tax Applied Table
+            # Write tax applied header amd columns
+            self._write_cell(cursor_x, cursor_y, _('Taxes Applied'), len(columns), False, report, fonts, workbook, sheet,
+                             XLSX_FONT_SIZE_HEADING, True, 'white', 'left', 2)
+            cursor_y += 1
+            for column in columns:
+                align = 'left'
+                if cursor_x >= start_align_right:
+                    align = 'right'
+                self._write_cell(cursor_x, cursor_y, column, 1, False, report, fonts, workbook, sheet, XLSX_FONT_SIZE_DEFAULT, True,
+                                 XLSX_GRAY_200, align, 2)
+                cursor_x += 1
+
+            cursor_x = start_x
+            cursor_y += 1
+
+            for country in taxes:
+                is_country_first_line = True
+                for tax in taxes[country]:
+                    if len(taxes) > 1:
+                        if is_country_first_line:
+                            is_country_first_line = not is_country_first_line
+                            self._write_cell(cursor_x, cursor_y, country, 1, False, report, fonts, workbook, sheet,
+                                             XLSX_FONT_SIZE_DEFAULT, True, 'white', 'left', 1, 0, XLSX_BORDER_COLOR)
+
+                        cursor_x += 1
+
+                    self._write_cell(cursor_x, cursor_y, tax['name'], 1, False, report, fonts, workbook, sheet, XLSX_FONT_SIZE_DEFAULT,
+                                     True, 'white', 'left', 1, 0, XLSX_BORDER_COLOR)
+                    self._write_cell(cursor_x + 1, cursor_y, tax['base_amount'], 1, False, report, fonts, workbook, sheet,
+                                     XLSX_FONT_SIZE_DEFAULT, False, 'white', 'right', 1, 0, XLSX_BORDER_COLOR)
+                    self._write_cell(cursor_x + 2, cursor_y, tax['tax_amount'], 1, False, report, fonts, workbook, sheet,
+                                     XLSX_FONT_SIZE_DEFAULT, False, 'white', 'right', 1, 0, XLSX_BORDER_COLOR)
+                    cursor_x += 3
+
+                    if tax_summary.get('tax_non_deductible_column'):
+                        self._write_cell(cursor_x, cursor_y, tax['tax_non_deductible'], 1, False, report, fonts, workbook, sheet,
+                                         XLSX_FONT_SIZE_DEFAULT, False, 'white', 'right', 1, 0, XLSX_BORDER_COLOR)
+                        cursor_x += 1
+
+                    if tax_summary.get('tax_deductible_column'):
+                        self._write_cell(cursor_x, cursor_y, tax['tax_deductible'], 1, False, report, fonts, workbook, sheet,
+                                         XLSX_FONT_SIZE_DEFAULT, False, 'white', 'right', 1, 0, XLSX_BORDER_COLOR)
+                        cursor_x += 1
+
+                    if tax_summary.get('tax_due_column'):
+                        self._write_cell(cursor_x, cursor_y, tax['tax_due'], 1, False, report, fonts, workbook, sheet,
+                                         XLSX_FONT_SIZE_DEFAULT, False, 'white', 'right', 1, 0, XLSX_BORDER_COLOR)
+
+                    cursor_x = start_x
+                    cursor_y += 1
+
+        cursor_x = start_x
+        cursor_y += 2
+
+        # Tax grids
+        columns = []
+        grids = tax_summary.get('tax_grid_summary_lines')
+        if grids:
+            start_align_right = start_x + 1
+            if len(grids) > 1:
+                start_align_right += 1
+                columns.append(_('Country'))
+
+            columns += [_('Grid'), _('+'), _('-'), _('Impact On Grid')]
+
+            # Draw Tax Applied Table
+            # Write tax applied columns and header
+            self._write_cell(cursor_x, cursor_y, _('Impact On Grid'), len(columns), False, report, fonts, workbook, sheet,
+                             XLSX_FONT_SIZE_HEADING, True, 'white', 'left', 2)
+
+            cursor_y += 1
+            for column in columns:
+                align = 'left'
+                if cursor_x >= start_align_right:
+                    align = 'right'
+                self._write_cell(cursor_x, cursor_y, column, 1, False, report, fonts, workbook, sheet, XLSX_FONT_SIZE_DEFAULT, True,
+                                 XLSX_GRAY_200, align, 2)
+                cursor_x += 1
+
+            cursor_x = start_x
+            cursor_y += 1
+
+            for country in grids:
+                is_country_first_line = True
+                for grid_name in grids[country]:
+                    if len(grids) > 1:
+                        if is_country_first_line:
+                            is_country_first_line = not is_country_first_line
+                            self._write_cell(cursor_x, cursor_y, country, 1, False, report, fonts, workbook, sheet, XLSX_FONT_SIZE_DEFAULT,
+                                            True, 'white', 'left', 1, 0, XLSX_BORDER_COLOR)
+
+                        cursor_x += 1
+
+                    self._write_cell(cursor_x, cursor_y, grid_name, 1, False, report, fonts, workbook, sheet, XLSX_FONT_SIZE_DEFAULT, True,
+                                     'white', 'left', 1, 0, XLSX_BORDER_COLOR)
+                    self._write_cell(cursor_x + 1, cursor_y, grids[country][grid_name].get('+', 0), 1, False, report, fonts, workbook,
+                                     sheet, XLSX_FONT_SIZE_DEFAULT, False, 'white', 'right', 1, 0, XLSX_BORDER_COLOR)
+                    self._write_cell(cursor_x + 2, cursor_y, grids[country][grid_name].get('-', 0), 1, False, report, fonts, workbook,
+                                     sheet, XLSX_FONT_SIZE_DEFAULT, False, 'white', 'right', 1, 0, XLSX_BORDER_COLOR)
+                    self._write_cell(cursor_x + 3, cursor_y, grids[country][grid_name]['impact'], 1, False, report, fonts, workbook,
+                                     sheet, XLSX_FONT_SIZE_DEFAULT, False, 'white', 'right', 1, 0, XLSX_BORDER_COLOR)
+
+                    cursor_x = start_x
+                    cursor_y += 1
+
+    ##########################################################################
+    # Document Data Generation
+    ##########################################################################
+
+    def _generate_document_data_for_export(self, report, options, export_type='pdf'):
+        """
+        Used to generate all the data needed for the rendering of the export
+
+        :param export_type:     The export type the generation need to use can be ('pdf' or 'xslx')
+
+        :return: a dictionnary containing a list of all lines grouped by journals and a dictionnay with the global tax summary lines
+        - journals_vals (mandatory):                    List of dictionary containing all the lines, columns, and tax summaries
+            - lines (mandatory):                        A list of dict containing all tha data for each lines in format returned by _get_lines_for_journal
+            - columns (mandatory):                      A list of columns for this journal returned in the format returned by _get_columns_for_journal
+            - tax_summary (optional):                   A dict of data for the tax summaries inside journals in the format returned by _get_tax_summary_section
+        - global_tax_summary:                           A dict with the global tax summaries data in the format returned by _get_tax_summary_section
+        """
+        # Ensure that all the data is synchronized with the database before we read it
+        self.env.flush_all()
+        query = report._get_report_query(options, 'strict_range')
+        account_alias = query.left_join(lhs_alias='account_move_line', lhs_column='account_id', rhs_table='account_account', rhs_column='id', link='account_id')
+        account_code = self.env['account.account']._field_to_sql(account_alias, 'code', query)
+        account_name = self.env['account.account']._field_to_sql(account_alias, 'name')
+
+        query = SQL(
+            """
+            SELECT
+                account_move_line.id AS move_line_id,
+                account_move_line.name,
+                account_move_line.date,
+                account_move_line.invoice_date,
+                account_move_line.amount_currency,
+                account_move_line.tax_base_amount,
+                account_move_line.currency_id AS move_line_currency,
+                account_move_line.display_type AS display_type,
+                am.id AS move_id,
+                am.name AS move_name,
+                am.journal_id,
+                am.currency_id AS move_currency,
+                am.amount_total_in_currency_signed AS amount_currency_total,
+                am.currency_id != cp.currency_id AS is_multicurrency,
+                p.name AS partner_name,
+                %(account_code)s AS account_code,
+                %(account_name)s AS account_name,
+                %(account_alias)s.account_type AS account_type,
+                COALESCE(account_move_line.debit, 0) AS debit,
+                COALESCE(account_move_line.credit, 0) AS credit,
+                COALESCE(account_move_line.balance, 0) AS balance,
+                %(j_name)s AS journal_name,
+                j.code AS journal_code,
+                j.type AS journal_type,
+                cp.currency_id AS company_currency,
+                CASE WHEN j.type = 'sale' THEN am.payment_reference WHEN j.type = 'purchase' THEN am.ref END AS reference,
+                array_remove(array_agg(DISTINCT %(tax_name)s), NULL) AS taxes,
+                array_remove(array_agg(DISTINCT %(tag_name)s), NULL) AS tax_grids
+            FROM %(table)s
+            JOIN account_move am ON am.id = account_move_line.move_id
+            LEFT JOIN res_partner p ON p.id = account_move_line.partner_id
+            JOIN account_journal j ON j.id = am.journal_id
+            JOIN res_company cp ON cp.id = am.company_id
+            LEFT JOIN account_move_line_account_tax_rel aml_at_rel ON aml_at_rel.account_move_line_id = account_move_line.id
+            LEFT JOIN account_tax parent_tax ON parent_tax.id = aml_at_rel.account_tax_id and parent_tax.amount_type = 'group'
+            LEFT JOIN account_tax_filiation_rel tax_filiation_rel ON tax_filiation_rel.parent_tax = parent_tax.id
+            LEFT JOIN account_tax tax ON (tax.id = aml_at_rel.account_tax_id and tax.amount_type != 'group') or tax.id = tax_filiation_rel.child_tax
+            LEFT JOIN account_account_tag_account_move_line_rel tag_rel ON tag_rel.account_move_line_id = account_move_line.id
+            LEFT JOIN account_account_tag tag ON tag_rel.account_account_tag_id = tag.id
+            LEFT JOIN res_currency journal_curr ON journal_curr.id = j.currency_id
+            WHERE %(case_statement)s AND %(search_conditions)s
+            GROUP BY "account_move_line".id, am.id, p.id, %(account_alias)s.id, j.id, cp.id, journal_curr.id, account_code, account_name
+            ORDER BY
+                CASE j.type
+                    WHEN 'sale' THEN 1
+                    WHEN 'purchase' THEN 2
+                    WHEN 'general' THEN 3
+                    WHEN 'bank' THEN 4
+                    ELSE 5
+                END,
+                j.sequence,
+                CASE WHEN am.name = '/' THEN 1 ELSE 0 END, am.date, am.name, am.id,
+                CASE %(account_alias)s.account_type
+                    WHEN 'liability_payable' THEN 1
+                    WHEN 'asset_receivable' THEN 1
+                    WHEN 'liability_credit_card' THEN 5
+                    WHEN 'asset_cash' THEN 5
+                    ELSE 2
+                END,
+                account_move_line.tax_line_id NULLS FIRST
+            """,
+            table=query.from_clause,
+            case_statement=self._get_payment_lines_filter_case_statement(options),
+            search_conditions=query.where_clause,
+            account_code=account_code,
+            account_name=account_name,
+            account_alias=SQL.identifier(account_alias),
+            j_name=self.env['account.journal']._field_to_sql('j', 'name'),
+            tax_name=self.env['account.tax']._field_to_sql('tax', 'name'),
+            tag_name=self.env['account.account.tag']._field_to_sql('tag', 'name')
+        )
+
+        self._cr.execute(query)
+        result = {}
+
+        # Grouping by journal_id then move_id
+        for entry in self._cr.dictfetchall():
+            result.setdefault(entry['journal_id'], {})
+            result[entry['journal_id']].setdefault(entry['move_id'], [])
+            result[entry['journal_id']][entry['move_id']].append(entry)
+
+        journals_vals = []
+        any_journal_group_has_taxes = False
+
+        for journal_entry_dict in result.values():
+            account_move_vals_list = list(journal_entry_dict.values())
+            journal_vals = {
+                'id': account_move_vals_list[0][0]['journal_id'],
+                'name': account_move_vals_list[0][0]['journal_name'],
+                'code': account_move_vals_list[0][0]['journal_code'],
+                'type': account_move_vals_list[0][0]['journal_type']
+            }
+
+            if self._section_has_tax(options, journal_vals['id']):
+                journal_vals['tax_summary'] = self._get_tax_summary_section(options, journal_vals)
+                any_journal_group_has_taxes = True
+
+            journal_vals['lines'] = self._get_export_lines_for_journal(report, options, export_type, journal_vals, account_move_vals_list)
+            journal_vals['columns'] = self._get_columns_for_journal(journal_vals, export_type)
+            journals_vals.append(journal_vals)
+
+        return {
+            'journals_vals': journals_vals,
+            'global_tax_summary': self._get_tax_summary_section(options) if any_journal_group_has_taxes else False
+        }
+
+    def _get_columns_for_journal(self, journal, export_type='pdf'):
+        """
+        Creates a columns list that will be used in this journal for the pdf report
+
+        :return: A list of the columns as dict each having:
+            - name (mandatory):     A string that will be displayed
+            - label (mandatory):    A string used to link lines with the column
+            - class (optional):     A string with css classes that need to be applied to all that column
+        """
+        columns = [
+            {'name': _('Document'), 'label': 'document'},
+        ]
+
+        # We have different columns regarding we are exporting to a PDF file or an XLSX document
+        if export_type == 'pdf':
+            columns.append({'name': _('Account'), 'label': 'account_label'})
+        else:
+            columns.extend([
+                {'name': _('Account Code'), 'label': 'account_code'},
+                {'name': _('Account Label'), 'label': 'account_label'}
+            ])
+
+        columns.extend([
+            {'name': _('Name'), 'label': 'name'},
+            {'name': _('Debit'), 'label': 'debit', 'class': 'o_right_alignment '},
+            {'name': _('Credit'), 'label': 'credit', 'class': 'o_right_alignment '},
+        ])
+
+        if journal.get('tax_summary'):
+            columns.append(
+                {'name': _('Taxes'), 'label': 'taxes'},
+            )
+            if journal['tax_summary'].get('tax_grid_summary_lines'):
+                columns.append({'name': _('Tax Grids'), 'label': 'tax_grids'})
+
+        if self._should_use_bank_journal_export(journal):
+            columns.append({
+                'name': _('Balance'),
+                'label': 'balance',
+                'class': 'o_right_alignment '
+            })
+
+            if journal.get('multicurrency_column'):
+                columns.append({
+                    'name': _('Amount Currency'),
+                    'label': 'amount_currency',
+                    'class': 'o_right_alignment '
+                })
+
+        return columns
+
+    def _should_use_bank_journal_export(self, journal_vals):
+        """Returns True if the journal requires bank-specific export logic."""
+        return journal_vals.get('type') == 'bank'
+
+    def _get_export_lines_for_journal(self, report, options, export_type, journal_vals, account_move_vals_list):
+        """
+        Default document lines generation it will generate a list of lines in a format valid for the pdf and xlsx
+
+        If it is a bank journal it will be redirected to _get_lines_for_bank_journal since this type of journals
+        require more complexity
+        We want to be as lightweight as possible and not at unnecessary calculations
+
+        :return: A list of lines. Each line is a dict having:
+            - 'column_label':           A dict containing the values for a cell with a key that links to the label of a column
+                - data (mandatory):     The formatted cell value
+                - class (optional):     Additional css classes to apply to the current cell
+            - line_class (optional):    Additional css classes that applies to the entire line
+        """
+        lines = []
+
+        if self._should_use_bank_journal_export(journal_vals):
+            return self._get_export_lines_for_bank_journal(report, options, export_type, journal_vals, account_move_vals_list)
+
+        total_credit = 0
+        total_debit = 0
+
+        for i, account_move_line_vals_list in enumerate(account_move_vals_list):
+            for j, move_line_entry_vals in enumerate(account_move_line_vals_list):
+                document = False
+                if j == 0:
+                    document = move_line_entry_vals['move_name']
+                elif j == 1:
+                    document = move_line_entry_vals['date']
+
+                line = self._get_base_line(report, options, export_type, document, move_line_entry_vals, j, i % 2 != 0, journal_vals.get('tax_summary'))
+
+                total_credit += move_line_entry_vals['credit']
+                total_debit += move_line_entry_vals['debit']
+
+                lines.append(line)
+
+            # Add other currency amout if this move is using multiple currencies
+            move_vals_entry = account_move_line_vals_list[0]
+            if move_vals_entry['is_multicurrency']:
+                amount_currency_name = _(
+                    'Amount in currency: %s',
+                    report._format_value(
+                        options,
+                        move_vals_entry['amount_currency_total'],
+                        'monetary',
+                        format_params={'currency_id': move_vals_entry['move_currency']},
+                    ),
+                )
+                if len(account_move_line_vals_list) <= 2:
+                    lines.append({
+                        'document': {'data': amount_currency_name},
+                        'line_class': 'o_even ' if i % 2 == 0 else 'o_odd ',
+                        'amount': {'data': move_vals_entry['amount_currency_total']},
+                        'currency_id': {'data': move_vals_entry['move_currency']}
+                    })
+                else:
+                    lines[-1]['document'] = {'data': amount_currency_name}
+                    lines[-1]['amount'] = {'data': move_vals_entry['amount_currency_total']}
+                    lines[-1]['currency_id'] = {'data': move_vals_entry['move_currency']}
+
+        # Add an empty line to add a separation between the total section and the data section
+        lines.append({})
+
+        total_line = {
+            'name': {'data': _('Total')},
+            'debit': {'data': report._format_value(options, total_debit, 'monetary')},
+            'credit': {'data': report._format_value(options, total_credit, 'monetary')},
+        }
+
+        lines.append(total_line)
+
+        return lines
+
+    def _get_export_lines_for_bank_journal(self, report, options, export_type, journal_vals, account_moves_vals_list):
+        """
+        Bank journals are more complex and should be calculated separately from other journal types
+
+        :return: A list of lines. Each line is a dict having:
+            - 'column_label':           A dict containing the values for a cell with a key that links to the label of a column
+                - data (mandatory):     The formatted cell value
+                - class (optional):     Additional css classes to apply to the current cell
+            - line_class (optional):    Additional css classes that applies to the entire line
+        """
+        lines = []
+
+        # Initial balance
+        current_balance = self._query_bank_journal_initial_balance(options, journal_vals['id'])
+        lines.append({
+            'name': {'data': _('Starting Balance')},
+            'balance': {'data': report._format_value(options, current_balance, 'monetary')},
+        })
+
+        # Debit and credit accumulators
+        total_credit = 0
+        total_debit = 0
+
+        for i, account_move_line_vals_list in enumerate(account_moves_vals_list):
+            is_unreconciled_payment = not any(
+                line for line in account_move_line_vals_list if line['account_type'] in ('liability_credit_card', 'asset_cash')
+            )
+
+            for j, move_line_entry_vals in enumerate(account_move_line_vals_list):
+                # Do not display bank account lines for bank journals
+                if move_line_entry_vals['account_type'] not in ('liability_credit_card', 'asset_cash'):
+                    document = ''
+                    if j == 0:
+                        document = f'{move_line_entry_vals["move_name"]} ({move_line_entry_vals["date"]})'
+                    line = self._get_base_line(report, options, export_type, document, move_line_entry_vals, j, i % 2 != 0, journal_vals.get('tax_summary'))
+
+                    total_credit += move_line_entry_vals['credit']
+                    total_debit += move_line_entry_vals['debit']
+
+                    if not is_unreconciled_payment:
+                        # We need to invert the balance since it is a bank journal
+                        line_balance = -move_line_entry_vals['balance']
+                        current_balance += line_balance
+                        line.update({
+                            'balance': {
+                                'data': report._format_value(options, current_balance, 'monetary'),
+                                'class': 'o_muted ' if self.env.company.currency_id.is_zero(line_balance) else ''
+                            },
+                        })
+
+                    if self.env.user.has_group('base.group_multi_currency') and move_line_entry_vals['move_line_currency'] != move_line_entry_vals['company_currency']:
+                        journal_vals['multicurrency_column'] = True
+                        amount_currency = -move_line_entry_vals['amount_currency'] if not is_unreconciled_payment else move_line_entry_vals['amount_currency']
+                        move_line_currency = self.env['res.currency'].browse(move_line_entry_vals['move_line_currency'])
+                        line.update({
+                            'amount_currency': {
+                                'data': report._format_value(
+                                    options,
+                                    amount_currency,
+                                    'monetary',
+                                    format_params={'currency_id': move_line_currency.id},
+                                ),
+                                'class': 'o_muted ' if move_line_currency.is_zero(amount_currency) else '',
+                            }
+                        })
+                    lines.append(line)
+
+        # Add an empty line to add a separation between the total section and the data section
+        lines.append({})
+
+        total_line = {
+            'name': {'data': _('Total')},
+            'balance': {'data': report._format_value(options, current_balance, 'monetary')},
+        }
+        lines.append(total_line)
+
+        return lines
+
+    def _get_base_line(self, report, options, export_type, document, line_entry, line_index, even, has_taxes):
+        """
+        Returns the generic part of a line that is used by both '_get_lines_for_journal' and '_get_lines_for_bank_journal'
+
+        :return:                                    A dict with base values for the line
+            - line_class (mandatory):                   Css classes that applies to this whole line
+            - document (mandatory):                     A dict containing the cell data for the column document
+                - data (mandatory):                         The value of the cell formatted
+                - class (mandatory):                        css class for this cell
+            - account (mandatory):                      A dict containing the cell data for the column account
+                - data (mandatory):                         The value of the cell formatted
+            - account_code (mandatory):                 A dict containing the cell data for the column account_code
+                - data (mandatory):                         The value of the cell formatted
+            - account_label (mandatory):                A dict containing the cell data for the column account_label
+                - data (mandatory):                         The value of the cell formatted
+            - name (mandatory):                         A dict containing the cell data for the column name
+                - data (mandatory):                         The value of the cell formatted
+            - debit (mandatory):                        A dict containing the cell data for the column debit
+                - data (mandatory):                         The value of the cell formatted
+                - class (mandatory):                        css class for this cell
+            - credit (mandatory):                       A dict containing the cell data for the column credit
+                - data (mandatory):                         The value of the cell formatted
+                - class (mandatory):                        css class for this cell
+
+            - taxes(optional):                          A dict containing the cell data for the column taxes
+                - data (mandatory):                         The value of the cell formatted
+            - tax_grids(optional):                          A dict containing the cell data for the column taxes
+                - data (mandatory):                         The value of the cell formatted
+        """
+        company_currency = self.env.company.currency_id
+
+        name = line_entry['name'] or line_entry['reference']
+        account_label = line_entry['partner_name'] or line_entry['account_name']
+
+        if line_entry['account_type'] not in ('asset_receivable', 'liability_payable'):
+            account_label = line_entry['account_name']
+        elif line_entry['partner_name'] and line_entry['account_type'] in ('asset_receivable', 'liability_payable'):
+            name = f"{line_entry['partner_name']} {name or ''}"
+
+        line = {
+            'line_class': 'o_even ' if even else 'o_odd ',
+            'document': {'data': document, 'class': 'o_bold ' if line_index == 0 else ''},
+            'account_code': {'data': line_entry['account_code']},
+            'account_label': {
+                'data': (
+                    account_label
+                    if export_type != 'pdf'
+                    else (
+                        f"{line_entry['account_code']} "
+                        + (
+                            line_entry['account_name'][:35] + '...'
+                            if len(line_entry['account_name']) > 35
+                            else line_entry['account_name']
+                        )
+                    )
+                )
+            },
+            'name': {'data': name},
+            'debit': {
+                'data': report._format_value(options, line_entry['debit'], 'monetary'),
+                'class': 'o_muted ' if company_currency.is_zero(line_entry['debit']) else ''
+            },
+            'credit': {
+                'data': report._format_value(options, line_entry['credit'], 'monetary'),
+                'class': 'o_muted ' if company_currency.is_zero(line_entry['credit']) else ''
+            },
+        }
+
+        if has_taxes:
+            tax_val = ''
+            if line_entry['taxes']:
+                tax_val = _('T: %s', ', '.join(line_entry['taxes']))
+            elif line_entry['tax_base_amount'] is not None:
+                tax_val = _('B: %s', report._format_value(options, line_entry['tax_base_amount'], 'monetary'))
+
+            line.update({
+                'taxes': {'data': tax_val},
+                'tax_grids': {'data': ', '.join(line_entry['tax_grids'])},
+            })
+
+        return line
+
+    ##########################################################################
+    # Queries
+    ##########################################################################
+
+    def _get_payment_lines_filter_case_statement(self, options):
+        if not options.get('show_payment_lines'):
+            return SQL(
+                """
+                    (j.type != 'bank' OR EXISTS(
+                        SELECT
+                            1
+                        FROM account_move_line
+                        JOIN account_account acc ON acc.id = account_move_line.account_id
+                        WHERE account_move_line.move_id = am.id
+                        AND acc.account_type IN ('liability_credit_card', 'asset_cash')
+                    ))
+                """
+            )
+        else:
+            return SQL('TRUE')
+
+    def _query_bank_journal_initial_balance(self, options, journal_id):
+        report = self.env.ref('odex30_account_reports.journal_report')
+        query = report._get_report_query(options, 'to_beginning_of_period', domain=[('journal_id', '=', journal_id)])
+        query = SQL(
+            """
+                SELECT
+                    COALESCE(SUM(account_move_line.balance), 0) AS balance
+                FROM %(table)s
+                JOIN account_journal journal ON journal.id = "account_move_line".journal_id AND account_move_line.account_id = journal.default_account_id
+                WHERE %(search_conditions)s
+                GROUP BY journal.id
+            """,
+            table=query.from_clause,
+            search_conditions=query.where_clause,
+        )
+        self._cr.execute(query)
+        result = self._cr.dictfetchall()
+        init_balance = result[0]['balance'] if len(result) >= 1 else 0
+        return init_balance
+
+    ##########################################################################
+    # Tax Grids
+    ##########################################################################
+
+    def _section_has_tax(self, options, journal_id):
+        report = self.env['account.report'].browse(options.get('report_id'))
+        aml_has_tax_domain = [('tax_ids', '!=', False)]
+        if journal_id:
+            aml_has_tax_domain.append(('journal_id', '=', journal_id))
+        aml_has_tax_domain += report._get_options_domain(options, 'strict_range')
+        return bool(self.env['account.move.line'].search_count(aml_has_tax_domain, limit=1))
+
+    def _get_tax_summary_section(self, options, journal_vals=None):
+        """
+        Get the journal tax summary if it is passed as parameter.
+        In case no journal is passed, it will return the global tax summary data
+        """
+        tax_data = {
+            'date_from': options.get('date', {}).get('date_from'),
+            'date_to': options.get('date', {}).get('date_to'),
+        }
+
+        if journal_vals:
+            tax_data['journal_id'] = journal_vals['id']
+            tax_data['journal_type'] = journal_vals['type']
+
+        tax_report_lines = self._get_generic_tax_summary_for_sections(options, tax_data)
+        tax_non_deductible_column = any(line.get('tax_non_deductible_no_format') for country_vals_list in tax_report_lines.values() for line in country_vals_list)
+        tax_deductible_column = any(line.get('tax_deductible_no_format') for country_vals_list in tax_report_lines.values() for line in country_vals_list)
+        tax_due_column = any(line.get('tax_due_no_format') for country_vals_list in tax_report_lines.values() for line in country_vals_list)
+        extra_columns = int(tax_non_deductible_column) + int(tax_deductible_column) + int(tax_due_column)
+
+        tax_grid_summary_lines = self._get_tax_grids_summary(options, tax_data)
+
+        return {
+            'tax_report_lines': tax_report_lines,
+            'tax_non_deductible_column': tax_non_deductible_column,
+            'tax_deductible_column': tax_deductible_column,
+            'tax_due_column': tax_due_column,
+            'extra_columns': extra_columns,
+            'tax_grid_summary_lines': tax_grid_summary_lines,
+        }
+
+    def _get_generic_tax_report_options(self, options, data):
+        """
+        Return an option dictionnary set to fetch the reports with the parameters needed for this journal.
+        The important bits are the journals, date, and fetch the generic tax reports that contains all taxes.
+        We also provide the information about wether to take all entries or only posted ones.
+        """
+        generic_tax_report = self.env.ref('account.generic_tax_report')
+        previous_option = options.copy()
+        # Force the dates to the selected ones. Allows to get it correctly when grouped by months
+        previous_option.update({
+            'selected_variant_id': generic_tax_report.id,
+            'date_from': data.get('date_from'),
+            'date_to': data.get('date_to'),
+        })
+        tax_report_options = generic_tax_report.get_options(previous_option)
+        journal_report = self.env['account.report'].browse(options['report_id'])
+        tax_report_options['forced_domain'] = tax_report_options.get('forced_domain', []) + journal_report._get_options_domain(options, 'strict_range')
+
+        # Even though it doesn't have a journal selector, we can force a journal in the options to only get the lines for a specific journal.
+        if data.get('journal_id') or data.get('journal_type'):
+            tax_report_options['journals'] = [{
+                'id': data.get('journal_id'),
+                'model': 'account.journal',
+                'type': data.get('journal_type'),
+                'selected': True,
+            }]
+
+        return tax_report_options
+
+    def _get_tax_grids_summary(self, options, data):
+        """
+        Fetches the details of all grids that have been used in the provided journal.
+        The result is grouped by the country in which the tag exists in case of multivat environment.
+        Returns a dictionary with the following structure:
+        {
+            Country : {
+                tag_name: {+, -, impact},
+                tag_name: {+, -, impact},
+                tag_name: {+, -, impact},
+                ...
+            },
+            Country : [
+                tag_name: {+, -, impact},
+                tag_name: {+, -, impact},
+                tag_name: {+, -, impact},
+                ...
+            ],
+            ...
+        }
+        """
+        report = self.env.ref('odex30_account_reports.journal_report')
+        # Use the same option as we use to get the tax details, but this time to generate the query used to fetch the
+        # grid information
+        tax_report_options = self._get_generic_tax_report_options(options, data)
+        query = report._get_report_query(tax_report_options, 'strict_range')
+        country_name = self.env['res.country']._field_to_sql('country', 'name')
+        tag_name = self.env['account.account.tag']._field_to_sql('tag', 'name')
+        query = SQL("""
+            WITH tag_info (country_name, tag_id, tag_name, tag_sign, balance) AS (
+                SELECT
+                    %(country_name)s AS country_name,
+                    tag.id,
+                    %(tag_name)s AS name,
+                    CASE WHEN tag.tax_negate IS TRUE THEN '-' ELSE '+' END,
+                    SUM(COALESCE("account_move_line".balance, 0)
+                        * CASE WHEN "account_move_line".tax_tag_invert THEN -1 ELSE 1 END
+                        ) AS balance
+                FROM account_account_tag tag
+                JOIN account_account_tag_account_move_line_rel rel ON tag.id = rel.account_account_tag_id
+                JOIN res_country country ON country.id = tag.country_id
+                , %(table_references)s
+                WHERE %(search_condition)s
+                  AND applicability = 'taxes'
+                  AND "account_move_line".id = rel.account_move_line_id
+                GROUP BY country_name, tag.id
+            )
+            SELECT
+                country_name,
+                tag_id,
+                REGEXP_REPLACE(tag_name, '^[+-]', '') AS name, -- Remove the sign from the grid name
+                balance,
+                tag_sign AS sign
+            FROM tag_info
+            ORDER BY country_name, name
+        """, country_name=country_name, tag_name=tag_name, table_references=query.from_clause, search_condition=query.where_clause)
+        self._cr.execute(query)
+        query_res = self.env.cr.fetchall()
+
+        res = {}
+        opposite = {'+': '-', '-': '+'}
+        for country_name, tag_id, name, balance, sign in query_res:
+            res.setdefault(country_name, {}).setdefault(name, {})
+            res[country_name][name].setdefault('tag_ids', []).append(tag_id)
+            res[country_name][name][sign] = report._format_value(options, balance, 'monetary')
+
+            # We need them formatted, to ensure they are displayed correctly in the report. (E.g. 0.0, not 0)
+            if not opposite[sign] in res[country_name][name]:
+                res[country_name][name][opposite[sign]] = report._format_value(options, 0, 'monetary')
+
+            res[country_name][name][sign + '_no_format'] = balance
+            res[country_name][name]['impact'] = report._format_value(options, res[country_name][name].get('+_no_format', 0) - res[country_name][name].get('-_no_format', 0), 'monetary')
+
+        return res
+
+    def _get_generic_tax_summary_for_sections(self, options, data):
+        """
+        Overridden to make use of the generic tax report computation
+        Works by forcing specific options into the tax report to only get the lines we need.
+        The result is grouped by the country in which the tag exists in case of multivat environment.
+        Returns a dictionary with the following structure:
+        {
+            Country : [
+                {name, base_amount{_no_format}, tax_amount{_no_format}, tax_non_deductible{_no_format}, tax_deductible{_no_format}, tax_due{_no_format}},
+                {name, base_amount{_no_format}, tax_amount{_no_format}, tax_non_deductible{_no_format}, tax_deductible{_no_format}, tax_due{_no_format}},
+                {name, base_amount{_no_format}, tax_amount{_no_format}, tax_non_deductible{_no_format}, tax_deductible{_no_format}, tax_due{_no_format}},
+                ...
+            ],
+            Country : [
+                {name, base_amount{_no_format}, tax_amount{_no_format}, tax_non_deductible{_no_format}, tax_deductible{_no_format}, tax_due{_no_format}},
+                {name, base_amount{_no_format}, tax_amount{_no_format}, tax_non_deductible{_no_format}, tax_deductible{_no_format}, tax_due{_no_format}},
+                {name, base_amount{_no_format}, tax_amount{_no_format}, tax_non_deductible{_no_format}, tax_deductible{_no_format}, tax_due{_no_format}},
+                ...
+            ],
+            ...
+        }
+        """
+        report = self.env['account.report'].browse(options['report_id'])
+        tax_report_options = self._get_generic_tax_report_options(options, data)
+        tax_report_options['account_journal_report_tax_deductibility_columns'] = True
+        tax_report = self.env.ref('account.generic_tax_report')
+        tax_report_lines = tax_report._get_lines(tax_report_options)
+
+        tax_values = {}
+        for tax_report_line in tax_report_lines:
+            model, line_id = report._parse_line_id(tax_report_line.get('id'))[-1][1:]
+            if model == 'account.tax':
+                tax_values[line_id] = {
+                    'base_amount': tax_report_line['columns'][0]['no_format'],
+                    'tax_amount': tax_report_line['columns'][1]['no_format'],
+                    'tax_non_deductible': tax_report_line['columns'][2]['no_format'],
+                    'tax_deductible': tax_report_line['columns'][3]['no_format'],
+                    'tax_due': tax_report_line['columns'][4]['no_format'],
+                }
+
+        # Make the final data dict that will be used by the template, using the taxes information.
+        taxes = self.env['account.tax'].browse(tax_values.keys())
+        res = {}
+        for tax in taxes:
+            res.setdefault(tax.country_id.name, []).append({
+                'base_amount': report._format_value(options, tax_values[tax.id]['base_amount'], 'monetary'),
+                'base_amount_no_format': tax_values[tax.id]['base_amount'],
+                'tax_amount': report._format_value(options, tax_values[tax.id]['tax_amount'], 'monetary'),
+                'tax_amount_no_format': tax_values[tax.id]['tax_amount'],
+                'tax_non_deductible': report._format_value(options, tax_values[tax.id]['tax_non_deductible'], 'monetary'),
+                'tax_non_deductible_no_format': tax_values[tax.id]['tax_non_deductible'],
+                'tax_deductible': report._format_value(options, tax_values[tax.id]['tax_deductible'], 'monetary'),
+                'tax_deductible_no_format': tax_values[tax.id]['tax_deductible'],
+                'tax_due': report._format_value(options, tax_values[tax.id]['tax_due'], 'monetary'),
+                'tax_due_no_format': tax_values[tax.id]['tax_due'],
+                'name': tax.name,
+                'line_id': report._get_generic_line_id('account.tax', tax.id)
+            })
+
+        # Return the result, ordered by country name
+        return dict(sorted(res.items()))
+
+    ##########################################################################
+    # Actions
+    ##########################################################################
+
+    def journal_report_tax_tag_template_open_aml(self, options, params=None):
+        """ returns an action to open a list view of the account.move.line having the selected tax tag """
+        tag_ids = params.get('tag_ids')
+        domain = (
+            self.env['account.report'].browse(options['report_id'])._get_options_domain(options, 'strict_range')
+            + [('tax_tag_ids', 'in', tag_ids)]
+            + self.env['account.move.line']._get_tax_exigible_domain()
+        )
+
+        return {
+            'type': 'ir.actions.act_window',
+            'name': _('Journal Items for Tax Audit'),
+            'res_model': 'account.move.line',
+            'views': [[self.env.ref('account.view_move_line_tax_audit_tree').id, 'list']],
+            'domain': domain,
+            'context': self.env.context,
+        }
+
+    def journal_report_action_dropdown_audit_default_tax_report(self, options, params):
+        return self.env['account.generic.tax.report.handler'].caret_option_audit_tax(options, params)
+
+    def journal_report_action_open_tax_journal_items(self, options, params):
+        """
+        Open the journal items related to the tax on this line.
+        Take into account the given/options date and group by taxes then account.
+        :param options: the report options.
+        :param params: a dict containing the line params. (Dates, name, journal_id, tax_type)
+        :return: act_window on journal items grouped by tax or tags and accounts.
+        """
+        ctx = {
+            'search_default_posted': 0 if options.get('all_entries') else 1,
+            'search_default_date_between': 1,
+            'date_from': params and params.get('date_from') or options.get('date', {}).get('date_from'),
+            'date_to': params and params.get('date_to') or options.get('date', {}).get('date_to'),
+            'search_default_journal_id': params.get('journal_id'),
+            'expand': 1,
+        }
+        if params and params.get('tax_type') == 'tag':
+            ctx.update({
+                'search_default_group_by_tax_tags': 1,
+                'search_default_group_by_account': 2,
+            })
+        elif params and params.get('tax_type') == 'tax':
+            ctx.update({
+                'search_default_group_by_taxes': 1,
+                'search_default_group_by_account': 2,
+            })
+
+        if params and 'journal_id' in params:
+            ctx.update({
+                'search_default_journal_id': [params['journal_id']],
+            })
+
+        if options and options.get('journals') and not ctx.get('search_default_journal_id'):
+            selected_journals = [journal['id'] for journal in options['journals'] if journal.get('selected') and journal['model'] == 'account.journal']
+            if len(selected_journals) == 1:
+                ctx['search_default_journal_id'] = selected_journals
+
+        return {
+            'name': params.get('name'),
+            'view_mode': 'list,pivot,graph,kanban',
+            'res_model': 'account.move.line',
+            'views': [(self.env.ref('account.view_move_line_tree').id, 'list')],
+            'type': 'ir.actions.act_window',
+            'domain': [('display_type', 'not in', ('line_section', 'line_note'))],
+            'context': ctx,
+        }
+
+    def journal_report_action_open_account_move_lines_by_account(self, options, params):
+        """
+        Open a list view of the journal account move lines
+        corresponding to the date filter and the current account line clicked
+        :param options: The current options of the report
+        :param params: The params given from the report UI (journal_id, account_id, date)
+        :return: act_window on journal items filtered on the current journal and the current account within a date.
+        """
+        report = self.env['account.report'].browse(options['report_id'])
+        journal = self.env['account.journal'].browse(params['journal_id'])
+        account = self.env['account.account'].browse(params['account_id'])
+
+        domain = [
+            ('journal_id.id', '=', journal.id),
+            ('account_id.id', '=', account.id),
+        ]
+        domain += report._get_options_domain(options, 'strict_range')
+
+        return {
+            'type': 'ir.actions.act_window',
+            'name': _("%(journal)s - %(account)s", journal=journal.name, account=account.name),
+            'res_model': 'account.move.line',
+            'views': [[False, 'list']],
+            'domain': domain
+        }
+
+    def journal_report_open_aml_by_move(self, options, params):
+        report = self.env['account.report'].browse(options['report_id'])
+        journal = self.env['account.journal'].browse(params['journal_id'])
+
+        context_update = {
+            'search_default_group_by_account': 0,
+            'show_more_partner_info': 1,
+        }
+
+        if journal.type in ('bank', 'credit'):
+            params['view_ref'] = 'odex30_account_reports.view_journal_report_audit_bank_move_line_tree'
+            # context_update['search_default_exclude_bank_lines'] = 1
+        else:
+            params['view_ref'] = 'odex30_account_reports.view_journal_report_audit_move_line_tree'
+            context_update.update({
+                'search_default_group_by_partner': 1,
+                'search_default_group_by_move': 2,
+            })
+            if journal.type in ('sale', 'purchase'):
+                context_update['search_default_invoices_lines'] = 1
+
+        action = report.open_journal_items(options=options, params=params)
+        action.get('context', {}).update(context_update)
+        return action
diff --git a/dev_odex30_accounting/odex30_account_reports/models/account_move.py b/dev_odex30_accounting/odex30_account_reports/models/account_move.py
new file mode 100644
index 0000000..6262e70
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_reports/models/account_move.py
@@ -0,0 +1,293 @@
+# -*- coding: utf-8 -*-
+import ast
+
+from odoo.addons.account.models.exceptions import TaxClosingNonPostedDependingMovesError
+from odoo import api, models, fields, _
+from odoo.exceptions import UserError
+from odoo.tools.misc import format_date
+from odoo.tools import date_utils
+from odoo.addons.web.controllers.utils import clean_action
+
+from dateutil.relativedelta import relativedelta
+from markupsafe import Markup
+
+
+class AccountMove(models.Model):
+    _inherit = "account.move"
+
+    # used for VAT closing, containing the end date of the period this entry closes
+    tax_closing_report_id = fields.Many2one(comodel_name='account.report')
+    # technical field used to know whether to show the tax closing alert or not
+    tax_closing_alert = fields.Boolean(compute='_compute_tax_closing_alert')
+
+    def _post(self, soft=True):
+        # Overridden to create carryover external values and join the pdf of the report when posting the tax closing
+        for move in self.filtered(lambda m: m.tax_closing_report_id):
+            report = move.tax_closing_report_id
+            options = move._get_tax_closing_report_options(move.company_id, move.fiscal_position_id, report, move.date)
+            move._close_tax_period(report, options)
+
+        return super()._post(soft)
+
+    def action_post(self):
+
+        try:
+            res = super().action_post()
+        except TaxClosingNonPostedDependingMovesError as exception:
+            return {
+                "type": "ir.actions.client",
+                "tag": "odex30_account_reports.redirect_action",
+                "target": "new",
+                "name": "Depending Action",
+                "params": {
+                    "depending_action": exception.args[0],
+                    "message": _("It seems there is some depending closing move to be posted"),
+                    "button_text": _("Depending moves"),
+                },
+                'context': {
+                    'dialog_size': 'medium',
+                }
+            }
+        return res
+
+    def button_draft(self):
+        super().button_draft()
+        for closing_move in self.filtered(lambda m: m.tax_closing_report_id):
+            report = closing_move.tax_closing_report_id
+            options = closing_move._get_tax_closing_report_options(closing_move.company_id, closing_move.fiscal_position_id, report, closing_move.date)
+            closing_months_delay = closing_move.company_id._get_tax_periodicity_months_delay(report)
+
+            carryover_values = self.env['account.report.external.value'].search([
+                ('carryover_origin_report_line_id', 'in', report.line_ids.ids),
+                ('date', '=', options['date']['date_to']),
+            ])
+
+            carryover_impacted_period_end = fields.Date.from_string(options['date']['date_to']) + relativedelta(months=closing_months_delay)
+            violated_lock_dates = closing_move.company_id._get_lock_date_violations(
+                carryover_impacted_period_end, fiscalyear=False, sale=False, purchase=False, tax=True, hard=True,
+            ) if carryover_values else None
+
+            if violated_lock_dates:
+                raise UserError(_("You cannot reset this closing entry to draft, as it would delete carryover values impacting the tax report of a locked period. "
+                                  "Please change the following lock dates to proceed: %(lock_date_info)s.",
+                                  lock_date_info=self.env['res.company']._format_lock_dates(violated_lock_dates)))
+
+            if self._has_subsequent_posted_closing_moves():
+                raise UserError(_("You cannot reset this closing entry to draft, as another closing entry has been posted at a later date."))
+
+            carryover_values.unlink()
+
+    def _has_subsequent_posted_closing_moves(self):
+        self.ensure_one()
+        closing_domains = [
+            ('company_id', '=', self.company_id.id),
+            ('tax_closing_report_id', '!=', False),
+            ('state', '=', 'posted'),
+            ('date', '>', self.date),
+            ('fiscal_position_id', '=', self.fiscal_position_id.id)
+        ]
+        return bool(self.env['account.move'].search_count(closing_domains, limit=1))
+
+    def _get_tax_to_pay_on_closing(self):
+        self.ensure_one()
+        tax_payable_accounts = self.env['account.tax.group'].search([
+            ('company_id', '=', self.company_id.id),
+        ]).tax_payable_account_id
+        payable_lines = self.line_ids.filtered(lambda line: line.account_id in tax_payable_accounts)
+        return self.currency_id.round(-sum(payable_lines.mapped('balance')))
+
+    def _action_tax_to_pay_wizard(self):
+        # hook for l10n tax payment wizard
+        return self.action_open_tax_report()
+
+    def _action_tax_to_send(self):
+        return self.action_open_tax_report()
+
+    def _action_tax_report_error(self):
+        # hook for l10n tax report errors
+        return self.action_open_tax_report()
+
+    def action_open_tax_report(self):
+        action = self.env["ir.actions.actions"]._for_xml_id("odex30_account_reports.action_account_report_gt")
+        if not self.tax_closing_report_id:
+            raise UserError(_("You can't open a tax report from a move without a VAT closing date."))
+        options = self._get_tax_closing_report_options(self.company_id, self.fiscal_position_id, self.tax_closing_report_id, self.date)
+        # Pass options in context and set ignore_session: true to prevent using session options
+        action.update({'params': {'options': options, 'ignore_session': True}})
+        return action
+
+    def _close_tax_period(self, report, options):
+
+        self.ensure_one()
+        if not self.env.user.has_group('account.group_account_manager'):
+            raise UserError(_('Only Billing Administrators are allowed to change lock dates!'))
+        report = self.tax_closing_report_id
+        options = self._get_tax_closing_report_options(self.company_id, self.fiscal_position_id, report, self.date)
+
+        sender_company = report._get_sender_company_for_export(options)
+        company_ids = report.get_report_company_ids(options)
+        if sender_company == self.company_id:
+            depending_closings = self.env['account.tax.report.handler']._get_tax_closing_entries_for_closed_period(report, options, self.env['res.company'].browse(company_ids), posted_only=False) - self
+            depending_closings_to_post = depending_closings.filtered(lambda x: x.state == 'draft')
+            if depending_closings_to_post:
+                depending_action = self.env["ir.actions.actions"]._for_xml_id("account.action_move_journal_line")
+                depending_action = clean_action(depending_action, env=self.env)
+
+                if len(depending_closings_to_post) == 1:
+                    depending_action['views'] = [(self.env.ref('account.view_move_form').id, 'form')]
+                    depending_action['res_id'] = depending_closings_to_post.id
+                else:
+                    depending_action['domain'] = [('id', 'in', depending_closings_to_post.ids)]
+                    depending_action['context'] = dict(ast.literal_eval(depending_action['context']))
+                    depending_action['context'].pop('search_default_posted', None)
+
+
+                raise TaxClosingNonPostedDependingMovesError(depending_action)
+
+            report.with_context(allowed_company_ids=company_ids)._generate_carryover_external_values(options)
+
+            attachments = self._get_vat_report_attachments(report, options)
+            subject = _(
+                "Vat closing from %(date_from)s to %(date_to)s",
+                date_from=format_date(self.env, options['date']['date_from']),
+                date_to=format_date(self.env, options['date']['date_to']),
+            )
+            self.with_context(no_new_invoice=True).message_post(body=self.ref, subject=subject, attachments=attachments)
+
+            # Log a note on depending closings, redirecting to the main one
+            for closing_move in depending_closings:
+                closing_move.message_post(body=_(
+                    "The attachments of the tax report can be found on the %(link_start)sclosing entry%(link_end)s of the representative company.",
+                    link_start=Markup('<a href="#" data-oe-model="account.move" data-oe-id="%s">') % self.id,
+                    link_end=Markup("</a>"),
+                ))
+
+            # End activity
+            activity = self.company_id._get_tax_closing_reminder_activity(report.id, self.date, self.fiscal_position_id.id)
+            if activity:
+                activity.action_done()
+
+            # Generate next activity
+            self.company_id._generate_tax_closing_reminder_activity(self.tax_closing_report_id, self.date + relativedelta(days=1), self.fiscal_position_id if self.fiscal_position_id.foreign_vat else None)
+
+        if not self.fiscal_position_id and (not self.company_id.tax_lock_date or self.date > self.company_id.tax_lock_date):
+            self.env['account.report']._generate_default_external_values(options['date']['date_from'], options['date']['date_to'], True)
+            self.company_id.sudo().tax_lock_date = self.date
+
+        self._close_tax_period_create_activities()
+
+    def _get_tax_period_description(self):
+        self.ensure_one()
+        period_start, period_end = self.company_id._get_tax_closing_period_boundaries(self.date, self.tax_closing_report_id)
+        return self.company_id._get_tax_closing_move_description(self.company_id._get_tax_periodicity(self.tax_closing_report_id), period_start, period_end, self.fiscal_position_id, self.tax_closing_report_id)
+
+    def _close_tax_period_create_activities(self):
+        mat_to_send_xml_id = 'odex30_account_reports.mail_activity_type_tax_report_to_be_sent'
+        mat_to_send = self.env.ref(mat_to_send_xml_id, raise_if_not_found=False)
+        if not mat_to_send:
+            # As this is introduced in stable, we ensure data exists by creating them on the fly if needed
+            mat_to_send = self.env['mail.activity.type'].sudo()._load_records([{
+                'xml_id': mat_to_send_xml_id,
+                'noupdate': False,
+                'values': {
+                    'name': 'Tax Report Ready',
+                    'summary': 'Tax report is ready to be sent to the administration',
+                    'category': 'tax_report',
+                    'delay_count': '0',
+                    'delay_unit': 'days',
+                    'delay_from': 'current_date',
+                    'res_model': 'account.move',
+                    'chaining_type': 'suggest',
+                }
+            }])
+        mat_to_pay_xml_id = 'odex30_account_reports.mail_activity_type_tax_report_to_pay'
+        mat_to_pay = self.env.ref(mat_to_pay_xml_id, raise_if_not_found=False)
+
+        act_user = mat_to_send.default_user_id
+        if act_user and not (self.company_id in act_user.company_ids and act_user.has_group('account.group_account_manager')):
+            act_user = self.env['res.users']
+
+        moves_without_send_activity = self.filtered_domain([
+            '|',
+            ('activity_ids', '=', False),
+            ('activity_ids', 'not any', [('activity_type_id.id', '=', mat_to_send.id)]),
+        ])
+
+        for move in moves_without_send_activity:
+            period_desc = move._get_tax_period_description()
+            move.with_context(mail_activity_quick_update=True).activity_schedule(
+                act_type_xmlid=mat_to_send_xml_id,
+                summary=_("Send tax report: %s", period_desc),
+                date_deadline=fields.Date.context_today(move),
+                user_id=act_user.id or self.env.user.id,
+            )
+
+            if mat_to_pay and mat_to_pay not in move.activity_ids.activity_type_id and move._get_tax_to_pay_on_closing() > 0:
+                move.with_context(mail_activity_quick_update=True).activity_schedule(
+                    act_type_xmlid=mat_to_pay_xml_id,
+                    summary=_("Pay tax: %s", period_desc),
+                    date_deadline=fields.Date.context_today(move),
+                    user_id=act_user.id or self.env.user.id,
+                )
+
+    def refresh_tax_entry(self):
+        for move in self.filtered(lambda m: m.tax_closing_report_id and m.state == 'draft'):
+            report = move.tax_closing_report_id
+            options = move._get_tax_closing_report_options(move.company_id, move.fiscal_position_id, report, move.date)
+            self.env[report.custom_handler_model_name or 'account.generic.tax.report.handler']._generate_tax_closing_entries(report, options, closing_moves=move)
+
+    @api.model
+    def _get_tax_closing_report_options(self, company, fiscal_position, report, date_inside_period):
+        _dummy, date_to = company._get_tax_closing_period_boundaries(date_inside_period, report)
+
+        # In case the company submits its report in different regions, a closing entry
+        # is made for each fiscal position defining a foreign VAT.
+        # We hence need to make sure to select a tax report in the right country when opening
+        # the report (in case there are many, we pick the first one available; it doesn't impact the closing)
+        if fiscal_position and fiscal_position.foreign_vat:
+            fpos_option = fiscal_position.id
+            report_country = fiscal_position.country_id
+        else:
+            fpos_option = 'domestic'
+            report_country = company.account_fiscal_country_id
+
+        options = {
+            'date': {
+                'date_to': fields.Date.to_string(date_to),
+                'filter': 'custom_tax_period',
+                'mode': 'range',
+            },
+            'selected_variant_id': report.id,
+            'sections_source_id': report.id,
+            'fiscal_position': fpos_option,
+            'tax_unit': 'company_only',
+        }
+
+        if report.filter_multi_company == 'tax_units':
+            # Enforce multicompany if the closing is done for a tax unit
+            candidate_tax_unit = company.account_tax_unit_ids.filtered(lambda x: x.country_id == report_country)
+            if candidate_tax_unit:
+                options['tax_unit'] = candidate_tax_unit.id
+                company_ids = candidate_tax_unit.company_ids.ids
+            else:
+                same_vat_branches = self.env.company._get_branches_with_same_vat()
+                # Consider the one with the least number of parents (highest in hierarchy) as the active company, coming first
+                company_ids = same_vat_branches.sorted(lambda x: len(x.parent_ids)).ids
+        else:
+            company_ids = self.env.company.ids
+
+        return report.with_context(allowed_company_ids=company_ids).get_options(previous_options=options)
+
+    def _get_vat_report_attachments(self, report, options):
+        # Fetch pdf
+        pdf_data = report.export_to_pdf(options)
+        return [(pdf_data['file_name'], pdf_data['file_content'])]
+
+    def _compute_tax_closing_alert(self):
+        for move in self:
+            move.tax_closing_alert = (
+                move.state == 'posted'
+                and move.tax_closing_report_id
+                and move.company_id.tax_lock_date
+                and move.company_id.tax_lock_date < move.date
+            )
diff --git a/dev_odex30_accounting/odex30_account_reports/models/account_move_line.py b/dev_odex30_accounting/odex30_account_reports/models/account_move_line.py
new file mode 100644
index 0000000..b1a4d9f
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_reports/models/account_move_line.py
@@ -0,0 +1,75 @@
+# -*- coding: utf-8 -*-
+
+from odoo import api, models, fields, _
+
+from odoo.exceptions import UserError
+from odoo.tools import SQL
+
+class AccountMoveLine(models.Model):
+    _inherit = "account.move.line"
+
+    exclude_bank_lines = fields.Boolean(compute='_compute_exclude_bank_lines', store=True)
+
+    @api.depends('journal_id')
+    def _compute_exclude_bank_lines(self):
+        for move_line in self:
+            move_line.exclude_bank_lines = move_line.account_id != move_line.journal_id.default_account_id
+
+    @api.constrains('tax_ids', 'tax_tag_ids')
+    def _check_taxes_on_closing_entries(self):
+        for aml in self:
+            if aml.move_id.tax_closing_report_id and (aml.tax_ids or aml.tax_tag_ids):
+                raise UserError(_("You cannot add taxes on a tax closing move line."))
+
+    @api.depends('product_id', 'product_uom_id', 'move_id.tax_closing_report_id')
+    def _compute_tax_ids(self):
+        """ Some special cases may see accounts used in tax closing having default taxes.
+        They would trigger the constrains above, which we don't want. Instead, we don't trigger
+        the tax computation in this case.
+        """
+        # EXTEND account
+        lines_to_compute = self.filtered(lambda line: not line.move_id.tax_closing_report_id)
+        (self - lines_to_compute).tax_ids = False
+        super(AccountMoveLine, lines_to_compute)._compute_tax_ids()
+
+    @api.model
+    def _prepare_aml_shadowing_for_report(self, change_equivalence_dict):
+        """ Prepares the fields lists for creating a temporary table shadowing the account_move_line one.
+        This is used to switch the computation mode of the reports, with analytics or financial budgets, for example.
+
+        :param change_equivalence_dict: A dict, in the form {aml_field: sql_equivalence}, where:
+                                        - aml_field: is a string containing the name of field of account.move.line
+                                        - sql_equivalence: is the value to use to shadow aml_field. It can be an SQL object; if
+                                          it's not, it'll be escaped in the query.
+
+        :return: A tuple of 2 SQL objects, so that:
+                 - The first one is the fields list to pass into the INSERT TO part of the query filling up the temporary table
+                 - The second one contains the field values to insert into the SELECT clause of the same query, in the same order
+                   as in the first element of the returned tuple.
+        """
+        line_fields = self.env['account.move.line'].fields_get()
+        self.env.cr.execute("SELECT column_name FROM information_schema.columns WHERE table_name='account_move_line'")
+        stored_fields = {f[0] for f in self.env.cr.fetchall() if f[0] in line_fields}
+
+        fields_to_insert = []
+        for fname in stored_fields:
+            if fname in change_equivalence_dict:
+                fields_to_insert.append(SQL(
+                    "%(original)s AS %(asname)s",
+                    original=change_equivalence_dict[fname],
+                    asname=SQL('"account_move_line.%s"', SQL(fname)),
+                ))
+            else:
+                line_field = line_fields[fname]
+                if line_field.get("translate"):
+                    typecast = SQL('jsonb')
+                else:
+                    typecast = SQL(self.env['account.move.line']._fields[fname].column_type[0])
+
+                fields_to_insert.append(SQL(
+                    "CAST(NULL AS %(typecast)s) AS %(fname)s",
+                    typecast=typecast,
+                    fname=SQL('"account_move_line.%s"', SQL(fname)),
+                ))
+
+        return SQL(', ').join(SQL.identifier(fname) for fname in stored_fields), SQL(', ').join(fields_to_insert)
diff --git a/dev_odex30_accounting/odex30_account_reports/models/account_multicurrency_revaluation_report.py b/dev_odex30_accounting/odex30_account_reports/models/account_multicurrency_revaluation_report.py
new file mode 100644
index 0000000..5670b89
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_reports/models/account_multicurrency_revaluation_report.py
@@ -0,0 +1,386 @@
+# -*- coding: utf-8 -*-
+
+from odoo import models, fields, api, _
+from odoo.tools import float_is_zero, SQL
+from odoo.exceptions import UserError
+
+from itertools import chain
+
+
+class MulticurrencyRevaluationReportCustomHandler(models.AbstractModel):
+    """Manage Unrealized Gains/Losses.
+
+    In multi-currencies environments, we need a way to control the risk related
+    to currencies (in case some are higthly fluctuating) and, in some countries,
+    some laws also require to create journal entries to record the provisionning
+    of a probable future expense related to currencies. Hence, people need to
+    create a journal entry at the beginning of a period, to make visible the
+    probable expense in reports (and revert it at the end of the period, to
+    recon the real gain/loss.
+    """
+    _name = 'account.multicurrency.revaluation.report.handler'
+    _inherit = 'account.report.custom.handler'
+    _description = 'Multicurrency Revaluation Report Custom Handler'
+
+    def _get_custom_display_config(self):
+        return {
+            'components': {
+                'AccountReportFilters': 'odex30_account_reports.MulticurrencyRevaluationReportFilters',
+            },
+            'templates': {
+                'AccountReportLineName': 'odex30_account_reports.MulticurrencyRevaluationReportLineName',
+            },
+        }
+
+    def _custom_options_initializer(self, report, options, previous_options):
+        super()._custom_options_initializer(report, options, previous_options=previous_options)
+        active_currencies = self.env['res.currency'].search([('active', '=', True)])
+        if len(active_currencies) < 2:
+            raise UserError(_("You need to activate more than one currency to access this report."))
+        rates = active_currencies._get_rates(self.env.company, options.get('date').get('date_to'))
+        # Normalize the rates to the company's currency
+        company_rate = rates[self.env.company.currency_id.id]
+        for key in rates.keys():
+            rates[key] /= company_rate
+
+        options['currency_rates'] = {
+            str(currency_id.id): {
+                'currency_id': currency_id.id,
+                'currency_name': currency_id.name,
+                'currency_main': self.env.company.currency_id.name,
+                'rate': (rates[currency_id.id]
+                         if not previous_options.get('currency_rates', {}).get(str(currency_id.id), {}).get('rate') else
+                         float(previous_options['currency_rates'][str(currency_id.id)]['rate'])),
+            } for currency_id in active_currencies
+        }
+
+        for currency_rates in options['currency_rates'].values():
+            if currency_rates['rate'] == 0:
+                raise UserError(_("The currency rate cannot be equal to zero"))
+
+        options['company_currency'] = options['currency_rates'].pop(str(self.env.company.currency_id.id))
+        options['custom_rate'] = any(
+            not float_is_zero(cr['rate'] - rates[cr['currency_id']], 20)
+            for cr in options['currency_rates'].values()
+        )
+
+        options['multi_currency'] = True
+        options['buttons'].append({'name': _('Adjustment Entry'), 'sequence': 30, 'action': 'action_multi_currency_revaluation_open_revaluation_wizard', 'always_show': True})
+
+    def _customize_warnings(self, report, options, all_column_groups_expression_totals, warnings):
+        if len(self.env.companies) > 1:
+            warnings['odex30_account_reports.multi_currency_revaluation_report_warning_multicompany'] = {'alert_type': 'warning'}
+        if options['custom_rate']:
+            warnings['odex30_account_reports.multi_currency_revaluation_report_warning_custom_rate'] = {'alert_type': 'warning'}
+
+    def _custom_line_postprocessor(self, report, options, lines):
+        line_to_adjust_id = self.env.ref('odex30_account_reports.multicurrency_revaluation_to_adjust').id
+        line_excluded_id = self.env.ref('odex30_account_reports.multicurrency_revaluation_excluded').id
+
+        rslt = []
+        for index, line in enumerate(lines):
+            res_model_name, res_id = report._get_model_info_from_id(line['id'])
+
+            if res_model_name == 'account.report.line' and (
+                   (res_id == line_to_adjust_id and report._get_model_info_from_id(lines[index + 1]['id']) == ('account.report.line', line_excluded_id)) or
+                   (res_id == line_excluded_id and index == len(lines) - 1)
+            ):
+                # 'To Adjust' and 'Excluded' lines need to be hidden if they have no child
+                continue
+
+            elif res_model_name == 'res.currency':
+                # Include the rate in the currency_id group lines
+                line['name'] = '{for_cur} (1 {comp_cur} = {rate:.6} {for_cur})'.format(
+                    for_cur=line['name'],
+                    comp_cur=self.env.company.currency_id.display_name,
+                    rate=float(options['currency_rates'][str(res_id)]['rate']),
+                )
+
+            elif res_model_name == 'account.account':
+                # Mark the included/excluded lines, so that the custom component templates knows what label to put on them
+                line['is_included_line'] = report._get_res_id_from_line_id(line['id'], 'account.account') == line_to_adjust_id
+
+            # Inject the related model into the line dict in order to use it on the custom component template on js side to display buttons
+            line['cur_revaluation_line_model'] = res_model_name
+
+            rslt.append(line)
+
+        return rslt
+
+    def _custom_groupby_line_completer(self, report, options, line_dict):
+        model_info_from_id = report._get_model_info_from_id(line_dict['id'])
+        if model_info_from_id[0] == 'res.currency':
+            line_dict['unfolded'] = True
+            line_dict['unfoldable'] = False
+
+    def action_multi_currency_revaluation_open_revaluation_wizard(self, options):
+        """Open the revaluation wizard."""
+        form = self.env.ref('odex30_account_reports.view_account_multicurrency_revaluation_wizard', False)
+        return {
+            'name': _("Make Adjustment Entry"),
+            'type': 'ir.actions.act_window',
+            'res_model': 'account.multicurrency.revaluation.wizard',
+            'view_mode': 'form',
+            'view_id': form.id,
+            'views': [(form.id, 'form')],
+            'multi': 'True',
+            'target': 'new',
+            'context': {
+                **self._context,
+                'multicurrency_revaluation_report_options': options,
+            },
+        }
+
+    # ACTIONS
+    def action_multi_currency_revaluation_open_general_ledger(self, options, params):
+        report = self.env['account.report'].browse(options['report_id'])
+        account_id = report._get_res_id_from_line_id(params['line_id'], 'account.account')
+        account_line_id = report._get_generic_line_id('account.account', account_id)
+        general_ledger_options = self.env.ref('odex30_account_reports.general_ledger_report').get_options(options)
+        general_ledger_options['unfolded_lines'] = [account_line_id]
+
+        general_ledger_action = self.env['ir.actions.actions']._for_xml_id('odex30_account_reports.action_account_report_general_ledger')
+        general_ledger_action['params'] = {
+            'options': general_ledger_options,
+            'ignore_session': True,
+        }
+
+        return general_ledger_action
+
+    def action_multi_currency_revaluation_toggle_provision(self, options, params):
+        """ Include/exclude an account from the provision. """
+        res_ids_map = self.env['account.report']._get_res_ids_from_line_id(params['line_id'], ['res.currency', 'account.account'])
+        account = self.env['account.account'].browse(res_ids_map['account.account'])
+        currency = self.env['res.currency'].browse(res_ids_map['res.currency'])
+        if currency in account.exclude_provision_currency_ids:
+            account.exclude_provision_currency_ids -= currency
+        else:
+            account.exclude_provision_currency_ids += currency
+        return {
+            'type': 'ir.actions.client',
+            'tag': 'reload',
+        }
+
+    def action_multi_currency_revaluation_open_currency_rates(self, options, params=None):
+        """ Open the currency rate list. """
+        currency_id = self.env['account.report']._get_res_id_from_line_id(params['line_id'], 'res.currency')
+        return {
+            'type': 'ir.actions.act_window',
+            'name': _('Currency Rates (%s)', self.env['res.currency'].browse(currency_id).display_name),
+            'views': [(False, 'list')],
+            'res_model': 'res.currency.rate',
+            'context': {**self.env.context, **{'default_currency_id': currency_id, 'active_id': currency_id}},
+            'domain': [('currency_id', '=', currency_id)],
+        }
+
+    def _report_custom_engine_multi_currency_revaluation_to_adjust(self, expressions, options, date_scope, current_groupby, next_groupby, offset=0, limit=None, warnings=None):
+        return self._multi_currency_revaluation_get_custom_lines(options, 'to_adjust', current_groupby, next_groupby, offset=offset, limit=limit)
+
+    def _report_custom_engine_multi_currency_revaluation_excluded(self, expressions, options, date_scope, current_groupby, next_groupby, offset=0, limit=None, warnings=None):
+        return self._multi_currency_revaluation_get_custom_lines(options, 'excluded', current_groupby, next_groupby, offset=offset, limit=limit)
+
+    def _multi_currency_revaluation_get_custom_lines(self, options, line_code, current_groupby, next_groupby, offset=0, limit=None):
+        def build_result_dict(report, query_res):
+            return {
+                'balance_currency': query_res['balance_currency'] if len(query_res['currency_id']) == 1 else None,
+                'currency_id': query_res['currency_id'][0] if len(query_res['currency_id']) == 1 else None,
+                'balance_operation': query_res['balance_operation'],
+                'balance_current': query_res['balance_current'],
+                'adjustment': query_res['adjustment'],
+                'has_sublines': query_res['aml_count'] > 0,
+            }
+
+        report = self.env['account.report'].browse(options['report_id'])
+        report._check_groupby_fields((next_groupby.split(',') if next_groupby else []) + ([current_groupby] if current_groupby else []))
+
+        # No need to run any SQL if we're computing the main line: it does not display any total
+        if not current_groupby:
+            return {
+                'balance_currency': None,
+                'currency_id': None,
+                'balance_operation': None,
+                'balance_current': None,
+                'adjustment': None,
+                'has_sublines': False,
+            }
+
+        query = "(VALUES {})".format(', '.join("(%s, %s)" for rate in options['currency_rates']))
+        params = list(chain.from_iterable((cur['currency_id'], cur['rate']) for cur in options['currency_rates'].values()))
+        custom_currency_table_query = SQL(query, *params)
+        date_to = options['date']['date_to']
+        select_part_not_an_exchange_move_id = SQL(
+            """
+            NOT EXISTS (
+                SELECT 1
+                  FROM account_partial_reconcile part_exch
+                 WHERE part_exch.exchange_move_id = account_move_line.move_id
+                   AND part_exch.max_date <= %s
+            )
+            """,
+            date_to
+        )
+
+        query = report._get_report_query(options, 'strict_range')
+        groupby_field_sql = self.env['account.move.line']._field_to_sql("account_move_line", current_groupby, query)
+        tail_query = report._get_engine_query_tail(offset, limit)
+        full_query = SQL(
+            """
+            WITH custom_currency_table(currency_id, rate) AS (%(custom_currency_table_query)s)
+
+            -- Final select that gets the following lines:
+            -- (where there is a change in the rates of currency between the creation of the move and the full payments)
+            -- - Moves that don't have a payment yet at a certain date
+            -- - Moves that have a partial but are not fully paid at a certain date
+            SELECT
+                   subquery.grouping_key,
+                   ARRAY_AGG(DISTINCT(subquery.currency_id)) AS currency_id,
+                   SUM(subquery.balance_currency) AS balance_currency,
+                   SUM(subquery.balance_operation) AS balance_operation,
+                   SUM(subquery.balance_current) AS balance_current,
+                   SUM(subquery.adjustment) AS adjustment,
+                   COUNT(subquery.aml_id) AS aml_count
+              FROM (
+                -- Get moves that have at least one partial at a certain date and are not fully paid at that date
+                SELECT
+                       %(groupby_field_sql)s AS grouping_key,
+                       ROUND(account_move_line.balance - SUM(ara.amount_debit) + SUM(ara.amount_credit), aml_comp_currency.decimal_places) AS balance_operation,
+                       ROUND(account_move_line.amount_currency - SUM(ara.amount_debit_currency) + SUM(ara.amount_credit_currency), aml_currency.decimal_places) AS balance_currency,
+                       ROUND(account_move_line.amount_currency - SUM(ara.amount_debit_currency) + SUM(ara.amount_credit_currency), aml_currency.decimal_places) / custom_currency_table.rate AS balance_current,
+                       (
+                          -- adjustment is computed as: balance_current - balance_operation
+                          ROUND( account_move_line.amount_currency - SUM(ara.amount_debit_currency) + SUM(ara.amount_credit_currency), aml_currency.decimal_places) / custom_currency_table.rate
+                          - ROUND(account_move_line.balance - SUM(ara.amount_debit) + SUM(ara.amount_credit), aml_comp_currency.decimal_places)
+                       ) AS adjustment,
+                       account_move_line.currency_id AS currency_id,
+                       account_move_line.id AS aml_id
+                  FROM %(table_references)s,
+                       account_account AS account,
+                       res_currency AS aml_currency,
+                       res_currency AS aml_comp_currency,
+                       custom_currency_table,
+
+                       -- Get for each move line the amount residual and amount_residual currency
+                       -- both for matched "debit" and matched "credit" the same way as account.move.line
+                       -- '_compute_amount_residual()' method does
+                       -- (using LATERAL greatly reduce the number of lines for which we have to compute it)
+                       LATERAL (
+                               -- Get sum of matched "debit" amount and amount in currency for related move line at date
+                               SELECT COALESCE(SUM(part.amount), 0.0) AS amount_debit,
+                                      ROUND(
+                                          SUM(part.debit_amount_currency),
+                                          curr.decimal_places
+                                      ) AS amount_debit_currency,
+                                      0.0 AS amount_credit,
+                                      0.0 AS amount_credit_currency,
+                                      account_move_line.currency_id AS currency_id,
+                                      account_move_line.id AS aml_id
+                                 FROM account_partial_reconcile part
+                                 JOIN res_currency curr ON curr.id = part.debit_currency_id
+                                WHERE account_move_line.id = part.debit_move_id
+                                  AND part.max_date <= %(date_to)s
+                             GROUP BY aml_id,
+                                      curr.decimal_places
+                           UNION
+                               -- Get sum of matched "credit" amount and amount in currency for related move line at date
+                               SELECT 0.0 AS amount_debit,
+                                      0.0 AS amount_debit_currency,
+                                      COALESCE(SUM(part.amount), 0.0) AS amount_credit,
+                                      ROUND(
+                                          SUM(part.credit_amount_currency),
+                                          curr.decimal_places
+                                      ) AS amount_credit_currency,
+                                      account_move_line.currency_id AS currency_id,
+                                      account_move_line.id AS aml_id
+                                 FROM account_partial_reconcile part
+                                 JOIN res_currency curr ON curr.id = part.credit_currency_id
+                                WHERE account_move_line.id = part.credit_move_id
+                                  AND part.max_date <= %(date_to)s
+                             GROUP BY aml_id,
+                                      curr.decimal_places
+                            ) AS ara
+                 WHERE %(search_condition)s
+                   AND account_move_line.account_id = account.id
+                   AND account_move_line.currency_id = aml_currency.id
+                   AND account_move_line.company_currency_id = aml_comp_currency.id
+                   AND account_move_line.currency_id = custom_currency_table.currency_id
+                   AND account.account_type NOT IN ('income', 'income_other', 'expense', 'expense_depreciation', 'expense_direct_cost', 'off_balance')
+                   AND (
+                        account.currency_id != account_move_line.company_currency_id
+                        OR (
+                            account.account_type IN ('asset_receivable', 'liability_payable')
+                            AND (account_move_line.currency_id != account_move_line.company_currency_id)
+                        )
+                   )
+                   AND %(exist_condition)s (
+                        SELECT 1
+                          FROM account_account_exclude_res_currency_provision
+                         WHERE account_account_id = account_move_line.account_id
+                           AND res_currency_id = account_move_line.currency_id
+                   )
+                   AND (%(select_part_not_an_exchange_move_id)s)
+              GROUP BY account_move_line.id, grouping_key, aml_comp_currency.decimal_places,  aml_currency.decimal_places, custom_currency_table.rate
+                HAVING ROUND(account_move_line.balance - SUM(ara.amount_debit) + SUM(ara.amount_credit), aml_comp_currency.decimal_places) != 0
+                    OR ROUND(account_move_line.amount_currency - SUM(ara.amount_debit_currency) + SUM(ara.amount_credit_currency), aml_currency.decimal_places) != 0.0
+
+                UNION
+                -- Moves that don't have a payment yet at a certain date
+                SELECT
+                       %(groupby_field_sql)s AS grouping_key,
+                       account_move_line.balance AS balance_operation,
+                       account_move_line.amount_currency AS balance_currency,
+                       account_move_line.amount_currency / custom_currency_table.rate AS balance_current,
+                       account_move_line.amount_currency / custom_currency_table.rate - account_move_line.balance AS adjustment,
+                       account_move_line.currency_id AS currency_id,
+                       account_move_line.id AS aml_id
+                  FROM %(table_references)s
+                  JOIN account_account account ON account_move_line.account_id = account.id
+                  JOIN custom_currency_table ON custom_currency_table.currency_id = account_move_line.currency_id
+                 WHERE %(search_condition)s
+                   AND account.account_type NOT IN ('income', 'income_other', 'expense', 'expense_depreciation', 'expense_direct_cost', 'off_balance')
+                   AND (
+                        account.currency_id != account_move_line.company_currency_id
+                        OR (
+                            account.account_type IN ('asset_receivable', 'liability_payable')
+                            AND (account_move_line.currency_id != account_move_line.company_currency_id)
+                        )
+                   )
+                   AND %(exist_condition)s (
+                        SELECT 1
+                          FROM account_account_exclude_res_currency_provision
+                         WHERE account_account_id = account_id
+                           AND res_currency_id = account_move_line.currency_id
+                   )
+                   AND (%(select_part_not_an_exchange_move_id)s)
+                   AND NOT EXISTS (
+                        SELECT 1 FROM account_partial_reconcile part
+                        WHERE (part.debit_move_id = account_move_line.id OR part.credit_move_id = account_move_line.id)
+                          AND part.max_date <= %(date_to)s
+                   )
+                   AND (account_move_line.balance != 0.0 OR account_move_line.amount_currency != 0.0)
+
+            ) subquery
+
+            GROUP BY grouping_key
+            ORDER BY grouping_key
+            %(tail_query)s
+            """,
+            groupby_field_sql=groupby_field_sql,
+            custom_currency_table_query=custom_currency_table_query,
+            exist_condition=SQL('NOT EXISTS') if line_code == 'to_adjust' else SQL('EXISTS'),
+            table_references=query.from_clause,
+            date_to=date_to,
+            tail_query=tail_query,
+            search_condition=query.where_clause,
+            select_part_not_an_exchange_move_id=select_part_not_an_exchange_move_id,
+        )
+        self._cr.execute(full_query)
+        query_res_lines = self._cr.dictfetchall()
+
+        if not current_groupby:
+            return build_result_dict(report, query_res_lines and query_res_lines[0] or {})
+        else:
+            rslt = []
+            for query_res in query_res_lines:
+                grouping_key = query_res['grouping_key']
+                rslt.append((grouping_key, build_result_dict(report, query_res)))
+            return rslt
diff --git a/dev_odex30_accounting/odex30_account_reports/models/account_partner_ledger.py b/dev_odex30_accounting/odex30_account_reports/models/account_partner_ledger.py
new file mode 100644
index 0000000..d6ea0db
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_reports/models/account_partner_ledger.py
@@ -0,0 +1,815 @@
+
+from odoo import api, models, _, fields
+from odoo.exceptions import UserError
+from odoo.osv import expression
+from odoo.tools import SQL
+
+from datetime import timedelta
+from collections import defaultdict
+from copy import deepcopy
+
+
+class PartnerLedgerCustomHandler(models.AbstractModel):
+    _name = 'account.partner.ledger.report.handler'
+    _inherit = 'account.report.custom.handler'
+    _description = 'Partner Ledger Custom Handler'
+
+    def _get_custom_display_config(self):
+        return {
+            'css_custom_class': 'partner_ledger',
+            'components': {
+                'AccountReportLineCell': 'odex30_account_reports.PartnerLedgerLineCell',
+            },
+            'templates': {
+                'AccountReportFilters': 'odex30_account_reports.PartnerLedgerFilters',
+                'AccountReportLineName': 'odex30_account_reports.PartnerLedgerLineName',
+            },
+        }
+
+    def _dynamic_lines_generator(self, report, options, all_column_groups_expression_totals, warnings=None):
+        partner_lines, totals_by_column_group = self._build_partner_lines(report, options)
+        lines = report._regroup_lines_by_name_prefix(options, partner_lines, '_report_expand_unfoldable_line_partner_ledger_prefix_group', 0)
+
+        # Inject sequence on dynamic lines
+        lines = [(0, line) for line in lines]
+
+        # Report total line.
+        lines.append((0, self._get_report_line_total(options, totals_by_column_group)))
+
+        return lines
+
+    def _build_partner_lines(self, report, options, level_shift=0):
+        lines = []
+
+        totals_by_column_group = {
+            column_group_key: {
+                total: 0.0
+                for total in ['debit', 'credit', 'amount', 'balance']
+            }
+            for column_group_key in options['column_groups']
+        }
+
+        partners_results = self._query_partners(report, options)
+
+        search_filter = options.get('filter_search_bar', '')
+        accept_unknown_in_filter = search_filter.lower() in self._get_no_partner_line_label().lower()
+        for partner, results in partners_results:
+            if options['export_mode'] == 'print' and search_filter and not partner and not accept_unknown_in_filter:
+                # When printing and searching for a specific partner, make it so we only show its lines, not the 'Unknown Partner' one, that would be
+                # shown in case a misc entry with no partner was reconciled with one of the target partner's entries.
+                continue
+
+            partner_values = defaultdict(dict)
+            for column_group_key in options['column_groups']:
+                partner_sum = results.get(column_group_key, {})
+
+                partner_values[column_group_key]['debit'] = partner_sum.get('debit', 0.0)
+                partner_values[column_group_key]['credit'] = partner_sum.get('credit', 0.0)
+                partner_values[column_group_key]['amount'] = partner_sum.get('amount', 0.0)
+                partner_values[column_group_key]['balance'] = partner_sum.get('balance', 0.0)
+
+                totals_by_column_group[column_group_key]['debit'] += partner_values[column_group_key]['debit']
+                totals_by_column_group[column_group_key]['credit'] += partner_values[column_group_key]['credit']
+                totals_by_column_group[column_group_key]['amount'] += partner_values[column_group_key]['amount']
+                totals_by_column_group[column_group_key]['balance'] += partner_values[column_group_key]['balance']
+
+            lines.append(self._get_report_line_partners(options, partner, partner_values, level_shift=level_shift))
+
+        return lines, totals_by_column_group
+
+    def _report_expand_unfoldable_line_partner_ledger_prefix_group(self, line_dict_id, groupby, options, progress, offset, unfold_all_batch_data=None):
+        report = self.env['account.report'].browse(options['report_id'])
+        matched_prefix = report._get_prefix_groups_matched_prefix_from_line_id(line_dict_id)
+
+        prefix_domain = [('partner_id.name', '=ilike', f'{matched_prefix}%')]
+        if self._get_no_partner_line_label().upper().startswith(matched_prefix):
+            prefix_domain = expression.OR([prefix_domain, [('partner_id', '=', None)]])
+
+        expand_options = {
+            **options,
+            'forced_domain': options.get('forced_domain', []) + prefix_domain
+        }
+        parent_level = len(matched_prefix) * 2
+        partner_lines, dummy = self._build_partner_lines(report, expand_options, level_shift=parent_level)
+
+        for partner_line in partner_lines:
+            partner_line['id'] = report._build_subline_id(line_dict_id, partner_line['id'])
+            partner_line['parent_id'] = line_dict_id
+
+        lines = report._regroup_lines_by_name_prefix(
+            options,
+            partner_lines,
+            '_report_expand_unfoldable_line_partner_ledger_prefix_group',
+            parent_level,
+            matched_prefix=matched_prefix,
+            parent_line_dict_id=line_dict_id,
+        )
+
+        return {
+            'lines': lines,
+            'offset_increment': len(lines),
+            'has_more': False,
+        }
+
+    def _custom_options_initializer(self, report, options, previous_options):
+        super()._custom_options_initializer(report, options, previous_options=previous_options)
+        domain = []
+
+        company_ids = report.get_report_company_ids(options)
+        exch_code = self.env['res.company'].browse(company_ids).mapped('currency_exchange_journal_id')
+        if exch_code:
+            domain += ['!', '&', '&', '&', ('credit', '=', 0.0), ('debit', '=', 0.0), ('amount_currency', '!=', 0.0), ('journal_id', 'in', exch_code.ids)]
+
+        if options['export_mode'] == 'print' and options.get('filter_search_bar'):
+            domain += [
+                '|', ('matched_debit_ids.debit_move_id.partner_id.name', 'ilike', options['filter_search_bar']),
+                '|', ('matched_credit_ids.credit_move_id.partner_id.name', 'ilike', options['filter_search_bar']),
+                '|', ('partner_id.name', 'ilike', options['filter_search_bar']),
+                ('partner_id', '=', False),
+            ]
+
+        options['forced_domain'] = options.get('forced_domain', []) + domain
+
+        if self.env.user.has_group('base.group_multi_currency'):
+            options['multi_currency'] = True
+        else:
+            options['columns'] = [col for col in options['columns'] if col['expression_label'] != 'amount_currency']
+
+        if not self.env.ref('odex30_account_reports.customer_statement_report', raise_if_not_found=False):
+            # Deprecated, will be removed in master
+            columns_to_hide = []
+            options['hide_account'] = (previous_options or {}).get('hide_account', False)
+            columns_to_hide += ['journal_code', 'account_code', 'matching_number'] if options['hide_account'] else []
+
+            options['hide_debit_credit'] = (previous_options or {}).get('hide_debit_credit', False)
+            columns_to_hide += ['debit', 'credit'] if options['hide_debit_credit'] else ['amount']
+
+            options['columns'] = [col for col in options['columns'] if col['expression_label'] not in columns_to_hide]
+
+            options['buttons'].append({
+                'name': _('Send'),
+                'action': 'action_send_statements',
+                'sequence': 90,
+                'always_show': True,
+            })
+
+    def _custom_unfold_all_batch_data_generator(self, report, options, lines_to_expand_by_function):
+        partner_ids_to_expand = []
+
+        # Regular case
+        for line_dict in lines_to_expand_by_function.get('_report_expand_unfoldable_line_partner_ledger', []):
+            markup, model, model_id = self.env['account.report']._parse_line_id(line_dict['id'])[-1]
+            if model == 'res.partner':
+                partner_ids_to_expand.append(model_id)
+            elif markup == 'no_partner':
+                partner_ids_to_expand.append(None)
+
+        # In case prefix groups are used
+        no_partner_line_label = self._get_no_partner_line_label().upper()
+        partner_prefix_domains = []
+        for line_dict in lines_to_expand_by_function.get('_report_expand_unfoldable_line_partner_ledger_prefix_group', []):
+            prefix = report._get_prefix_groups_matched_prefix_from_line_id(line_dict['id'])
+            partner_prefix_domains.append([('name', '=ilike', f'{prefix}%')])
+
+            # amls without partners are regrouped "Unknown Partner", which is also used to create prefix groups
+            if no_partner_line_label.startswith(prefix):
+                partner_ids_to_expand.append(None)
+
+        if partner_prefix_domains:
+            partner_ids_to_expand += self.env['res.partner'].with_context(active_test=False).search(expression.OR(partner_prefix_domains)).ids
+
+        return {
+            'initial_balances': self._get_initial_balance_values(partner_ids_to_expand, options) if partner_ids_to_expand else {},
+
+            # load_more_limit cannot be passed to this call, otherwise it won't be applied per partner but on the whole result.
+            # We gain perf from batching, but load every result, even if the limit restricts them later.
+            'aml_values': self._get_aml_values(options, partner_ids_to_expand) if partner_ids_to_expand else {},
+        }
+
+    def _get_report_send_recipients(self, options):
+        # Deprecated, to be moved to customer statement handler in master
+        partners = options.get('partner_ids', [])
+        if not partners:
+            report = self.env['account.report'].browse(options['report_id'])
+            self._cr.execute(self._get_query_sums(report, options))
+            partners = [row['groupby'] for row in self._cr.dictfetchall() if row['groupby']]
+        return self.env['res.partner'].browse(partners)
+
+    def action_send_statements(self, options):
+        # Deprecated, to be moved to customer statement handler in master
+        template = self.env.ref('odex30_account_reports.email_template_customer_statement', False)
+        partners = self.env['res.partner'].browse(options.get('partner_ids', []))
+        return {
+            'name': _("Send %s Statement", partners.name) if len(partners) == 1 else _("Send Partner Ledgers"),
+            'type': 'ir.actions.act_window',
+            'views': [[False, 'form']],
+            'res_model': 'account.report.send',
+            'target': 'new',
+            'context': {
+                'default_mail_template_id': template.id if template else False,
+                'default_report_options': options,
+            },
+        }
+
+    @api.model
+    def action_open_partner(self, options, params):
+        dummy, record_id = self.env['account.report']._get_model_info_from_id(params['id'])
+        return {
+            'type': 'ir.actions.act_window',
+            'res_model': 'res.partner',
+            'res_id': record_id,
+            'views': [[False, 'form']],
+            'view_mode': 'form',
+            'target': 'current',
+        }
+
+    def _query_partners(self, report, options):
+        """ Executes the queries and performs all the computation.
+        :return:        A list of tuple (partner, column_group_values) sorted by the table's model _order:
+                        - partner is a res.parter record.
+                        - column_group_values is a dict(column_group_key, fetched_values), where
+                            - column_group_key is a string identifying a column group, like in options['column_groups']
+                            - fetched_values is a dictionary containing:
+                                - sum:                              {'debit': float, 'credit': float, 'balance': float}
+                                - (optional) initial_balance:       {'debit': float, 'credit': float, 'balance': float}
+                                - (optional) lines:                 [line_vals_1, line_vals_2, ...]
+        """
+        def assign_sum(row):
+            fields_to_assign = ['balance', 'debit', 'credit', 'amount']
+            if any(not company_currency.is_zero(row[field]) for field in fields_to_assign):
+                groupby_partners.setdefault(row['groupby'], defaultdict(lambda: defaultdict(float)))
+                for field in fields_to_assign:
+                    groupby_partners[row['groupby']][row['column_group_key']][field] += row[field]
+
+        company_currency = self.env.company.currency_id
+
+        # Execute the queries and dispatch the results.
+        query = self._get_query_sums(report, options)
+
+        groupby_partners = {}
+
+        self._cr.execute(query)
+        for res in self._cr.dictfetchall():
+            assign_sum(res)
+
+        # Correct the sums per partner, for the lines without partner reconciled with a line having a partner
+        self._add_sums_of_lines_without_partners(options, groupby_partners)
+
+        # Retrieve the partners to browse.
+        # groupby_partners.keys() contains all account ids affected by:
+        # - the amls in the current period.
+        # - the amls affecting the initial balance.
+        if groupby_partners:
+            # Note a search is done instead of a browse to preserve the table ordering.
+            partners = self.env['res.partner'].with_context(active_test=False).search_fetch([('id', 'in', list(groupby_partners.keys()))], ["id", "name", "trust", "company_registry", "vat"])
+        else:
+            partners = []
+
+        # Add 'Partner Unknown' if needed
+        if None in groupby_partners.keys():
+            partners = [p for p in partners] + [None]
+
+        return [(partner, groupby_partners[partner.id if partner else None]) for partner in partners]
+
+    def _get_query_sums(self, report, options) -> SQL:
+        """ Construct a query retrieving all the aggregated sums to build the report. It includes:
+        - sums for all partners.
+        - sums for the initial balances.
+        :param options:             The report options.
+        :return:                    query as SQL object
+        """
+        queries = []
+
+        # Create the currency table.
+        for column_group_key, column_group_options in report._split_options_per_column_group(options).items():
+            query = report._get_report_query(column_group_options, 'from_beginning')
+            date_from = options['date']['date_from']
+            queries.append(SQL(
+                """
+                (WITH partner_sums AS (
+                    SELECT
+                        account_move_line.partner_id            AS groupby,
+                        %(column_group_key)s                    AS column_group_key,
+                        SUM(%(debit_select)s)                   AS debit,
+                        SUM(%(credit_select)s)                  AS credit,
+                        SUM(%(balance_select)s)                 AS amount,
+                        SUM(%(balance_select)s)                 AS balance,
+                        BOOL_AND(account_move_line.reconciled)  AS all_reconciled,
+                        MAX(account_move_line.date)             AS latest_date
+                    FROM %(table_references)s
+                    %(currency_table_join)s
+                    WHERE %(search_condition)s
+                    GROUP BY account_move_line.partner_id
+                )
+                SELECT *
+                FROM partner_sums
+                WHERE partner_sums.balance != 0
+                OR partner_sums.all_reconciled = FALSE
+                OR partner_sums.latest_date >= %(date_from)s
+                )""",
+                column_group_key=column_group_key,
+                debit_select=report._currency_table_apply_rate(SQL("account_move_line.debit")),
+                credit_select=report._currency_table_apply_rate(SQL("account_move_line.credit")),
+                balance_select=report._currency_table_apply_rate(SQL("account_move_line.balance")),
+                table_references=query.from_clause,
+                currency_table_join=report._currency_table_aml_join(column_group_options),
+                search_condition=query.where_clause,
+                date_from=date_from,
+            ))
+
+        return SQL(' UNION ALL ').join(queries)
+
+    def _get_initial_balance_values(self, partner_ids, options):
+        queries = []
+        report = self.env.ref('odex30_account_reports.partner_ledger_report')
+        for column_group_key, column_group_options in report._split_options_per_column_group(options).items():
+            # Get sums for the initial balance.
+            # period: [('date' <= options['date_from'] - 1)]
+            new_options = self._get_options_initial_balance(column_group_options)
+            query = report._get_report_query(new_options, 'from_beginning', domain=[('partner_id', 'in', partner_ids)])
+            queries.append(SQL(
+                """
+                SELECT
+                    account_move_line.partner_id,
+                    %(column_group_key)s          AS column_group_key,
+                    SUM(%(debit_select)s)         AS debit,
+                    SUM(%(credit_select)s)        AS credit,
+                    SUM(%(balance_select)s)       AS amount,
+                    SUM(%(balance_select)s)       AS balance
+                FROM %(table_references)s
+                %(currency_table_join)s
+                WHERE %(search_condition)s
+                GROUP BY account_move_line.partner_id
+                """,
+                column_group_key=column_group_key,
+                debit_select=report._currency_table_apply_rate(SQL("account_move_line.debit")),
+                credit_select=report._currency_table_apply_rate(SQL("account_move_line.credit")),
+                balance_select=report._currency_table_apply_rate(SQL("account_move_line.balance")),
+                table_references=query.from_clause,
+                currency_table_join=report._currency_table_aml_join(column_group_options),
+                search_condition=query.where_clause,
+            ))
+
+        self._cr.execute(SQL(" UNION ALL ").join(queries))
+
+        init_balance_by_col_group = {
+            partner_id: {column_group_key: defaultdict(float) for column_group_key in options['column_groups']}
+            for partner_id in partner_ids
+        }
+        for result in self._cr.dictfetchall():
+            init_balance_by_col_group[result['partner_id']][result['column_group_key']] = result
+
+        # Correct the sums per partner, for the lines without partner reconciled with a line having a partner
+        new_options = self._get_options_initial_balance(options)
+        self._add_sums_of_lines_without_partners(new_options, init_balance_by_col_group)
+
+        return init_balance_by_col_group
+
+    def _get_options_initial_balance(self, options):
+        """ Create options used to compute the initial balances for each partner.
+        The resulting dates domain will be:
+        [('date' <= options['date_from'] - 1)]
+        :param options: The report options.
+        :return:        A copy of the options, modified to match the dates to use to get the initial balances.
+        """
+        new_date_to = fields.Date.from_string(options['date']['date_from']) - timedelta(days=1)
+        new_options = deepcopy(options)
+        new_options['date']['date_from'] = False
+        new_options['date']['date_to'] = fields.Date.to_string(new_date_to)
+        for column_group in new_options['column_groups'].values():
+            column_group['forced_options']['date'] = new_options['date']
+        return new_options
+
+    def _add_sums_of_lines_without_partners(self, options, result_dict):
+        fields2inverse = {
+            'balance': ('balance', -1),
+            'debit': ('credit', 1),
+            'amount': ('amount', 1),
+            'credit': ('debit', 1),
+        }
+        query = self._get_sums_without_partner(options)
+        self._cr.execute(query)
+        rows = self._cr.dictfetchall()
+        for row in rows:
+            for field, (inverse_field, inverse_sign) in fields2inverse.items():
+                if partner_vals := result_dict.get(row['groupby']):
+                    partner_vals[row['column_group_key']][field] += row[field]
+                if no_partner_vals := result_dict.get(None):
+                    # Debit/credit are inverted for the unknown partner as the computation is made regarding the balance of the known partner
+                    no_partner_vals[row['column_group_key']][inverse_field] += inverse_sign * row[field]
+
+    def _get_sums_without_partner(self, options):
+        """ Get the sum of lines without partner reconciled with a line with a partner, grouped by partner. Those lines
+        should be considered as belonging to the partner for the reconciled amount as it may clear some of the partner
+        invoice/bill and they have to be accounted in the partner balance."""
+        queries = []
+        report = self.env.ref('odex30_account_reports.partner_ledger_report')
+        for column_group_key, column_group_options in report._split_options_per_column_group(options).items():
+            query = report._get_report_query(column_group_options, 'from_beginning')
+            queries.append(SQL(
+                """
+                SELECT
+                    %(column_group_key)s        AS column_group_key,
+                    aml_with_partner.partner_id AS groupby,
+                    SUM(%(debit_select)s)       AS debit,
+                    SUM(%(credit_select)s)      AS credit,
+                    SUM(%(balance_select)s)     AS amount,
+                    SUM(%(balance_select)s)     AS balance
+                FROM %(table_references)s
+                JOIN account_partial_reconcile partial
+                    ON account_move_line.id = partial.debit_move_id OR account_move_line.id = partial.credit_move_id
+                JOIN account_move_line aml_with_partner ON
+                    (aml_with_partner.id = partial.debit_move_id OR aml_with_partner.id = partial.credit_move_id)
+                    AND aml_with_partner.partner_id IS NOT NULL
+                %(currency_table_join)s
+                WHERE partial.max_date <= %(date_to)s AND %(search_condition)s
+                    AND account_move_line.partner_id IS NULL
+                GROUP BY aml_with_partner.partner_id
+                """,
+                column_group_key=column_group_key,
+                debit_select=report._currency_table_apply_rate(SQL("CASE WHEN aml_with_partner.balance > 0 THEN 0 ELSE partial.amount END")),
+                credit_select=report._currency_table_apply_rate(SQL("CASE WHEN aml_with_partner.balance < 0 THEN 0 ELSE partial.amount END")),
+                balance_select=report._currency_table_apply_rate(SQL("-SIGN(aml_with_partner.balance) * partial.amount")),
+                table_references=query.from_clause,
+                currency_table_join=report._currency_table_aml_join(column_group_options, aml_alias=SQL("aml_with_partner")),
+                date_to=column_group_options['date']['date_to'],
+                search_condition=query.where_clause,
+            ))
+
+        return SQL(" UNION ALL ").join(queries)
+
+    def _report_expand_unfoldable_line_partner_ledger(self, line_dict_id, groupby, options, progress, offset, unfold_all_batch_data=None):
+        report = self.env['account.report'].browse(options['report_id'])
+        markup, model, record_id = report._parse_line_id(line_dict_id)[-1]
+
+        if model != 'res.partner':
+            raise UserError(_("Wrong ID for partner ledger line to expand: %s", line_dict_id))
+
+        prefix_groups_count = 0
+        for markup, dummy1, dummy2 in report._parse_line_id(line_dict_id):
+            if isinstance(markup, dict) and 'groupby_prefix_group' in markup:
+                prefix_groups_count += 1
+        level_shift = prefix_groups_count * 2
+
+        lines = []
+
+        # Get initial balance
+        if offset == 0 and not options.get('hide_initial_balance'):
+            if unfold_all_batch_data:
+                init_balance_by_col_group = unfold_all_batch_data['initial_balances'][record_id]
+            else:
+                init_balance_by_col_group = self._get_initial_balance_values([record_id], options)[record_id]
+            initial_balance_line = report._get_partner_and_general_ledger_initial_balance_line(options, line_dict_id, init_balance_by_col_group, level_shift=level_shift)
+            if initial_balance_line:
+                lines.append(initial_balance_line)
+
+                # For the first expansion of the line, the initial balance line gives the progress
+                progress = self._init_load_more_progress(options, initial_balance_line)
+
+        limit_to_load = report.load_more_limit + 1 if report.load_more_limit and options['export_mode'] != 'print' else None
+
+        if unfold_all_batch_data:
+            aml_results = unfold_all_batch_data['aml_values'][record_id]
+        else:
+            aml_results = self._get_aml_values(options, [record_id], offset=offset, limit=limit_to_load)[record_id]
+
+        aml_report_lines, next_progress, treated_results_count, has_more = self._get_partner_aml_report_lines(report, options, line_dict_id, aml_results, progress, offset, level_shift=level_shift)
+        lines.extend(aml_report_lines)
+
+        return {
+            'lines': lines,
+            'offset_increment': treated_results_count,
+            'has_more': has_more,
+            'progress': next_progress
+        }
+
+    def _init_load_more_progress(self, options, line_dict):
+        return {
+            column['column_group_key']: line_col.get('no_format', 0)
+            for column, line_col in zip(options['columns'], line_dict['columns'])
+            if column['expression_label'] == 'balance'
+        }
+
+    def _get_partner_aml_report_lines(self, report, options, partner_line_id, aml_results, progress, offset=0, level_shift=0):
+        lines = []
+        has_more = False
+        treated_results_count = 0
+        next_progress = progress
+        for result in aml_results:
+            if self._is_report_limit_reached(report, options, treated_results_count):
+                # We loaded one more than the limit on purpose: this way we know we need a "load more" line
+                has_more = True
+                break
+
+            new_line = self._get_report_line_move_line(options, result, partner_line_id, next_progress, level_shift=level_shift)
+            lines.append(new_line)
+            next_progress = self._init_load_more_progress(options, new_line)
+            treated_results_count += 1
+        return lines, next_progress, treated_results_count, has_more
+
+    def _is_report_limit_reached(self, report, options, results_count):
+        return options['export_mode'] != 'print' and report.load_more_limit and results_count == report.load_more_limit
+
+    def _get_additional_column_aml_values(self):
+        """
+        Allows customization of additional fields in the partner ledger query.
+
+        This method is intended to be overridden by other modules to add custom fields
+        to the partner ledger query, e.g. SQL("account_move_line.date AS date,").
+
+        By default, it returns an empty SQL object.
+        """
+        return SQL()
+
+    def _get_order_by_aml_values(self):
+        return SQL('account_move_line.date, account_move_line.id')
+
+    def _get_aml_values(self, options, partner_ids, offset=0, limit=None):
+        rslt = {partner_id: [] for partner_id in partner_ids}
+
+        partner_ids_wo_none = [x for x in partner_ids if x]
+        directly_linked_aml_partner_clauses = []
+        indirectly_linked_aml_partner_clause = SQL('aml_with_partner.partner_id IS NOT NULL')
+        if None in partner_ids:
+            directly_linked_aml_partner_clauses.append(SQL('account_move_line.partner_id IS NULL'))
+        if partner_ids_wo_none:
+            directly_linked_aml_partner_clauses.append(SQL('account_move_line.partner_id IN %s', tuple(partner_ids_wo_none)))
+            indirectly_linked_aml_partner_clause = SQL('aml_with_partner.partner_id IN %s', tuple(partner_ids_wo_none))
+        directly_linked_aml_partner_clause = SQL('(%s)', SQL(' OR ').join(directly_linked_aml_partner_clauses))
+
+        queries = []
+        journal_name = self.env['account.journal']._field_to_sql('journal', 'name')
+        report = self.env.ref('odex30_account_reports.partner_ledger_report')
+        additional_columns = self._get_additional_column_aml_values()
+        order_by = self._get_order_by_aml_values()
+        for column_group_key, group_options in report._split_options_per_column_group(options).items():
+            query = report._get_report_query(group_options, 'strict_range')
+            account_alias = query.left_join(lhs_alias='account_move_line', lhs_column='account_id', rhs_table='account_account', rhs_column='id', link='account_id')
+            account_code = self.env['account.account']._field_to_sql(account_alias, 'code', query)
+            account_name = self.env['account.account']._field_to_sql(account_alias, 'name')
+
+            # For the move lines directly linked to this partner
+            # ruff: noqa: FURB113
+            queries.append(SQL(
+                '''
+                SELECT
+                    account_move_line.id,
+                    COALESCE(account_move_line.date_maturity, account_move_line.date) AS date_maturity,
+                    account_move_line.name,
+                    account_move_line.ref,
+                    account_move_line.company_id,
+                    account_move_line.account_id,
+                    account_move_line.payment_id,
+                    account_move_line.partner_id,
+                    account_move_line.currency_id,
+                    account_move_line.amount_currency,
+                    account_move_line.matching_number,
+                    %(additional_columns)s
+                    COALESCE(account_move_line.invoice_date, account_move_line.date) AS invoice_date,
+                    %(debit_select)s                                                 AS debit,
+                    %(credit_select)s                                                AS credit,
+                    %(balance_select)s                                               AS amount,
+                    %(balance_select)s                                               AS balance,
+                    account_move.name                                                AS move_name,
+                    account_move.move_type                                           AS move_type,
+                    %(account_code)s                                                 AS account_code,
+                    %(account_name)s                                                 AS account_name,
+                    journal.code                                                     AS journal_code,
+                    %(journal_name)s                                                 AS journal_name,
+                    %(column_group_key)s                                             AS column_group_key,
+                    'directly_linked_aml'                                            AS key,
+                    0                                                                AS partial_id
+                    %(extra_select)s
+                FROM %(table_references)s
+                JOIN account_move ON account_move.id = account_move_line.move_id
+                %(currency_table_join)s
+                LEFT JOIN res_company company               ON company.id = account_move_line.company_id
+                LEFT JOIN res_partner partner               ON partner.id = account_move_line.partner_id
+                LEFT JOIN account_journal journal           ON journal.id = account_move_line.journal_id
+                WHERE %(search_condition)s AND %(directly_linked_aml_partner_clause)s
+                ORDER BY %(order_by)s
+                ''',
+                additional_columns=additional_columns,
+                debit_select=report._currency_table_apply_rate(SQL("account_move_line.debit")),
+                credit_select=report._currency_table_apply_rate(SQL("account_move_line.credit")),
+                balance_select=report._currency_table_apply_rate(SQL("account_move_line.balance")),
+                account_code=account_code,
+                account_name=account_name,
+                journal_name=journal_name,
+                column_group_key=column_group_key,
+                table_references=query.from_clause,
+                currency_table_join=report._currency_table_aml_join(group_options),
+                search_condition=query.where_clause,
+                directly_linked_aml_partner_clause=directly_linked_aml_partner_clause,
+                order_by=order_by,
+                extra_select=SQL(' ').join(self._get_aml_value_extra_select()),
+            ))
+
+            # For the move lines linked to no partner, but reconciled with this partner. They will appear in grey in the report
+            queries.append(SQL(
+                '''
+                SELECT
+                    account_move_line.id,
+                    COALESCE(account_move_line.date_maturity, account_move_line.date) AS date_maturity,
+                    account_move_line.name,
+                    account_move_line.ref,
+                    account_move_line.company_id,
+                    account_move_line.account_id,
+                    account_move_line.payment_id,
+                    aml_with_partner.partner_id,
+                    account_move_line.currency_id,
+                    account_move_line.amount_currency,
+                    account_move_line.matching_number,
+                    %(additional_columns)s
+                    COALESCE(account_move_line.invoice_date, account_move_line.date) AS invoice_date,
+                    %(debit_select)s                                                 AS debit,
+                    %(credit_select)s                                                AS credit,
+                    %(balance_select)s                                               AS amount,
+                    %(balance_select)s                                               AS balance,
+                    account_move.name                                                AS move_name,
+                    account_move.move_type                                           AS move_type,
+                    %(account_code)s                                                 AS account_code,
+                    %(account_name)s                                                 AS account_name,
+                    journal.code                                                     AS journal_code,
+                    %(journal_name)s                                                 AS journal_name,
+                    %(column_group_key)s                                             AS column_group_key,
+                    'indirectly_linked_aml'                                          AS key,
+                    partial.id                                                       AS partial_id
+                    %(extra_select)s
+                FROM %(table_references)s
+                    %(currency_table_join)s,
+                    account_partial_reconcile partial,
+                    account_move,
+                    account_move_line aml_with_partner,
+                    account_journal journal
+                WHERE
+                    (account_move_line.id = partial.debit_move_id OR account_move_line.id = partial.credit_move_id)
+                    AND account_move_line.partner_id IS NULL
+                    AND account_move.id = account_move_line.move_id
+                    AND (aml_with_partner.id = partial.debit_move_id OR aml_with_partner.id = partial.credit_move_id)
+                    AND %(indirectly_linked_aml_partner_clause)s
+                    AND journal.id = account_move_line.journal_id
+                    AND %(account_alias)s.id = account_move_line.account_id
+                    AND %(search_condition)s
+                    AND partial.max_date BETWEEN %(date_from)s AND %(date_to)s
+                ORDER BY %(order_by)s
+                ''',
+                additional_columns=additional_columns,
+                debit_select=report._currency_table_apply_rate(SQL("CASE WHEN aml_with_partner.balance > 0 THEN 0 ELSE partial.amount END")),
+                credit_select=report._currency_table_apply_rate(SQL("CASE WHEN aml_with_partner.balance < 0 THEN 0 ELSE partial.amount END")),
+                balance_select=report._currency_table_apply_rate(SQL("-SIGN(aml_with_partner.balance) * partial.amount")),
+                account_code=account_code,
+                account_name=account_name,
+                journal_name=journal_name,
+                column_group_key=column_group_key,
+                table_references=query.from_clause,
+                currency_table_join=report._currency_table_aml_join(group_options),
+                indirectly_linked_aml_partner_clause=indirectly_linked_aml_partner_clause,
+                account_alias=SQL.identifier(account_alias),
+                search_condition=query.where_clause,
+                date_from=group_options['date']['date_from'],
+                date_to=group_options['date']['date_to'],
+                order_by=order_by,
+                extra_select=SQL(' ').join(self._get_aml_value_extra_select()),
+            ))
+
+        query = SQL(" UNION ALL ").join(SQL("(%s)", query) for query in queries)
+
+        if offset:
+            query = SQL('%s OFFSET %s ', query, offset)
+
+        if limit:
+            query = SQL('%s LIMIT %s ', query, limit)
+
+        self._cr.execute(query)
+        for aml_result in self._cr.dictfetchall():
+            if aml_result['key'] == 'indirectly_linked_aml':
+
+                # Append the line to the partner found through the reconciliation.
+                if aml_result['partner_id'] in rslt:
+                    rslt[aml_result['partner_id']].append(aml_result)
+
+                # Balance it with an additional line in the Unknown Partner section but having reversed amounts.
+                if None in rslt:
+                    rslt[None].append({
+                        **aml_result,
+                        'debit': aml_result['credit'],
+                        'credit': aml_result['debit'],
+                        'amount': aml_result['credit'] - aml_result['debit'],
+                        'balance': -aml_result['balance'],
+                    })
+            else:
+                rslt[aml_result['partner_id']].append(aml_result)
+
+        return rslt
+
+    def _get_aml_value_extra_select(self):
+        """ Hook method to add extra select fields to the aml queries. """
+        return []
+
+    ####################################################
+    # COLUMNS/LINES
+    ####################################################
+    def _get_report_line_partners(self, options, partner, partner_values, level_shift=0):
+        company_currency = self.env.company.currency_id
+
+        partner_data = next(iter(partner_values.values()))
+        unfoldable = not company_currency.is_zero(partner_data.get('debit', 0) or partner_data.get('credit', 0))
+        column_values = []
+        report = self.env['account.report'].browse(options['report_id'])
+        for column in options['columns']:
+            col_expr_label = column['expression_label']
+            value = None if options.get('hide_partner_totals') else partner_values[column['column_group_key']].get(col_expr_label)
+            unfoldable = unfoldable or (col_expr_label in ('debit', 'credit', 'amount') and not company_currency.is_zero(value))
+            column_values.append(report._build_column_dict(value, column, options=options))
+
+
+        line_id = report._get_generic_line_id('res.partner', partner.id) if partner else report._get_generic_line_id('res.partner', None, markup='no_partner')
+
+        return {
+            'id': line_id,
+            'name': partner is not None and (partner.name or '')[:128] or self._get_no_partner_line_label(),
+            'columns': column_values,
+            'level': 1 + level_shift,
+            'trust': partner.trust if partner else None,
+            'unfoldable': unfoldable,
+            'unfolded': line_id in options['unfolded_lines'] or options['unfold_all'],
+            'expand_function': '_report_expand_unfoldable_line_partner_ledger',
+        }
+
+    def _get_no_partner_line_label(self):
+        return _('Unknown Partner')
+
+    @api.model
+    def _format_aml_name(self, line_name, move_ref, move_name=None):
+        ''' Format the display of an account.move.line record. As its very costly to fetch the account.move.line
+        records, only line_name, move_ref, move_name are passed as parameters to deal with sql-queries more easily.
+
+        :param line_name:   The name of the account.move.line record.
+        :param move_ref:    The reference of the account.move record.
+        :param move_name:   The name of the account.move record.
+        :return:            The formatted name of the account.move.line record.
+        '''
+        return self.env['account.move.line']._format_aml_name(line_name, move_ref, move_name=move_name)
+
+    def _get_report_line_move_line(self, options, aml_query_result, partner_line_id, init_bal_by_col_group, level_shift=0):
+        if aml_query_result['payment_id']:
+            caret_type = 'account.payment'
+        else:
+            caret_type = 'account.move.line'
+
+        columns = []
+        report = self.env['account.report'].browse(options['report_id'])
+        for column in options['columns']:
+            col_expr_label = column['expression_label']
+
+            if col_expr_label not in aml_query_result:
+                raise UserError(_("The column '%s' is not available for this report.", col_expr_label))
+
+            col_value = aml_query_result[col_expr_label] if column['column_group_key'] == aml_query_result['column_group_key'] else None
+
+            if col_value is None:
+                columns.append(report._build_column_dict(None, None))
+            else:
+                currency = False
+
+                if col_expr_label == 'balance':
+                    col_value += init_bal_by_col_group[column['column_group_key']]
+
+                if col_expr_label == 'amount_currency':
+                    currency = self.env['res.currency'].browse(aml_query_result['currency_id'])
+
+                    if currency == self.env.company.currency_id:
+                        col_value = ''
+
+                columns.append(report._build_column_dict(col_value, column, options=options, currency=currency))
+
+        return {
+            'id': report._get_generic_line_id('account.move.line', aml_query_result['id'], parent_line_id=partner_line_id, markup=aml_query_result['partial_id']),
+            'parent_id': partner_line_id,
+            'name': self._format_aml_name(aml_query_result['name'], aml_query_result['ref'], aml_query_result['move_name']),
+            'columns': columns,
+            'caret_options': caret_type,
+            'level': 3 + level_shift,
+        }
+
+    def _get_report_line_total(self, options, totals_by_column_group):
+        column_values = []
+        report = self.env['account.report'].browse(options['report_id'])
+        for column in options['columns']:
+            col_value = totals_by_column_group[column['column_group_key']].get(column['expression_label'])
+            column_values.append(report._build_column_dict(col_value, column, options=options))
+
+        return {
+            'id': report._get_generic_line_id(None, None, markup='total'),
+            'name': _('Total'),
+            'level': 1,
+            'columns': column_values,
+        }
+
+    def open_journal_items(self, options, params):
+        params['view_ref'] = 'account.view_move_line_tree_grouped_partner'
+        report = self.env['account.report'].browse(options['report_id'])
+        action = report.open_journal_items(options=options, params=params)
+        action.get('context', {}).update({'search_default_group_by_account': 0})
+        return action
diff --git a/dev_odex30_accounting/odex30_account_reports/models/account_report.py b/dev_odex30_accounting/odex30_account_reports/models/account_report.py
new file mode 100644
index 0000000..d743356
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_reports/models/account_report.py
@@ -0,0 +1,7553 @@
+
+import ast
+import base64
+import datetime
+import io
+import json
+import logging
+import re
+from ast import literal_eval
+from collections import defaultdict
+from functools import cmp_to_key
+from itertools import groupby
+
+import markupsafe
+from dateutil.relativedelta import relativedelta
+from PIL import ImageFont
+
+from odoo import models, fields, api, _, osv
+from odoo.addons.web.controllers.utils import clean_action
+from odoo.exceptions import RedirectWarning, UserError, ValidationError
+from odoo.service.model import get_public_method
+from odoo.tools import date_utils, get_lang, float_is_zero, float_repr, SQL, parse_version, Query
+from odoo.tools.float_utils import float_round, float_compare
+from odoo.tools.misc import file_path, format_date, formatLang, split_every, xlsxwriter
+from odoo.tools.safe_eval import expr_eval, safe_eval
+
+_logger = logging.getLogger(__name__)
+
+ACCOUNT_CODES_ENGINE_SPLIT_REGEX = re.compile(r"(?=[+-])")
+
+ACCOUNT_CODES_ENGINE_TERM_REGEX = re.compile(
+    r"^(?P<sign>[+-]?)"\
+    r"(?P<prefix>([A-Za-z\d.]*|tag\([\w.]+\))((?=\\)|(?<=[^CD])))"\
+    r"(\\\((?P<excluded_prefixes>([A-Za-z\d.]+,)*[A-Za-z\d.]*)\))?"\
+    r"(?P<balance_character>[DC]?)$"
+)
+
+ACCOUNT_CODES_ENGINE_TAG_ID_PREFIX_REGEX = re.compile(r"tag\(((?P<id>\d+)|(?P<ref>\w+\.\w+))\)")
+
+# Performance optimisation: those engines always will receive None as their next_groupby, allowing more efficient batching.
+NO_NEXT_GROUPBY_ENGINES = {'tax_tags', 'account_codes'}
+
+NUMBER_FIGURE_TYPES = ('float', 'integer', 'monetary', 'percentage')
+
+LINE_ID_HIERARCHY_DELIMITER = '|'
+
+CURRENCIES_USING_LAKH = {'AFN', 'BDT', 'INR', 'MMK', 'NPR', 'PKR', 'LKR'}
+
+
+class AccountReportAnnotation(models.Model):
+    _name = 'account.report.annotation'
+    _description = 'Account Report Annotation'
+
+    report_id = fields.Many2one('account.report', help="The id of the annotated report.")
+    line_id = fields.Char(index=True, help="The id of the annotated line.")
+    text = fields.Char(string="The annotation's content.")
+    date = fields.Date(help="Date considered as annotated by the annotation.")
+    fiscal_position_id = fields.Many2one('account.fiscal.position', help="The fiscal position used while annotating.")
+
+    @api.model_create_multi
+    def create(self, values):
+        fiscal_positions_with_foreign_vat = self.env['account.fiscal.position'].search([('foreign_vat', '!=', False)], limit=1)
+        for annotation in values:
+            if 'line_id' in annotation:
+                annotation['line_id'] = self._remove_tax_grouping_from_line_id(annotation['line_id'])
+            if 'fiscal_position_id' in annotation:
+                if annotation['fiscal_position_id'] == 'domestic':
+                    del annotation['fiscal_position_id']
+                elif annotation['fiscal_position_id'] == 'all':
+                    annotation['fiscal_position_id'] = fiscal_positions_with_foreign_vat.id
+                else:
+                    annotation['fiscal_position_id'] = int(annotation['fiscal_position_id'])
+
+        return super().create(values)
+
+    def _remove_tax_grouping_from_line_id(self, line_id):
+        """
+        Remove the tax grouping from the line_id. This is needed because the tax grouping is not relevant for the annotation.
+        Tax grouping are any group using 'account.group' in the line_id.
+        """
+        return self.env['account.report']._build_line_id([
+            (markup, model, res_id)
+            for markup, model, res_id in self.env['account.report']._parse_line_id(line_id, markup_as_string=True)
+            if model != 'account.group'
+        ])
+
+class AccountReport(models.Model):
+    _inherit = 'account.report'
+
+    horizontal_group_ids = fields.Many2many(string="Horizontal Groups", comodel_name='account.report.horizontal.group')
+    annotations_ids = fields.One2many(string="Annotations", comodel_name='account.report.annotation', inverse_name='report_id')
+
+    # Those fields allow case-by-case fine-tuning of the engine, for custom reports.
+    custom_handler_model_id = fields.Many2one(string='Custom Handler Model', comodel_name='ir.model')
+    custom_handler_model_name = fields.Char(string='Custom Handler Model Name', related='custom_handler_model_id.model')
+
+    # Account Coverage Report
+    is_account_coverage_report_available = fields.Boolean(compute='_compute_is_account_coverage_report_available')
+
+    tax_closing_start_date = fields.Date(  # the default value is set in _auto_init
+        string="Start Date",
+        company_dependent=True
+    )
+
+    # Fields used for send reports by cron
+    send_and_print_values = fields.Json(copy=False)
+
+    def _auto_init(self):
+        super()._auto_init()
+
+        def precommit():
+            self.env['ir.default'].set(
+                'account.report',
+                'tax_closing_start_date',
+                fields.Date.context_today(self).replace(month=1, day=1),
+            )
+        self.env.cr.precommit.add(precommit)
+
+    @api.constrains('custom_handler_model_id')
+    def _validate_custom_handler_model(self):
+        for report in self:
+            if report.custom_handler_model_id:
+                custom_handler_model = self.env.registry['account.report.custom.handler']
+                current_model = self.env[report.custom_handler_model_name]
+                if not isinstance(current_model, custom_handler_model):
+                    raise ValidationError(_(
+                        "Field 'Custom Handler Model' can only reference records inheriting from [%s].",
+                        custom_handler_model._name
+                    ))
+
+    def unlink(self):
+        for report in self:
+            action, menuitem = report._get_existing_menuitem()
+            menuitem.unlink()
+            action.unlink()
+        return super().unlink()
+
+    def write(self, vals):
+        if 'active' in vals:
+            reports = {r.id: r.name for r in self}
+            actions = self.env['ir.actions.client'] \
+                .search([('name', 'in', list(reports.values())), ('tag', '=', 'account_report')]) \
+                .filtered(lambda act: (ast.literal_eval(act.context).get('report_id'), act.name) in reports.items())
+            self.env['ir.ui.menu'] \
+                .search([
+                    ('active', '=', not vals['active']),
+                    ('action', 'in', [f'ir.actions.client,{action.id}' for action in actions]),
+                ])\
+                .active = vals['active']
+        return super().write(vals)
+
+    ####################################################
+    # CRON
+    ####################################################
+
+    @api.model
+    def _cron_account_report_send(self, job_count=10):
+        """ Handle Send & Print async processing.
+        :param job_count: maximum number of jobs to process if specified.
+        """
+        to_process = self.env['account.report'].search(
+            [('send_and_print_values', '!=', False)],
+        )
+        if not to_process:
+            return
+
+        processed_count = 0
+        need_retrigger = False
+
+        for report in to_process:
+            if need_retrigger:
+                break
+            send_and_print_vals = report.send_and_print_values
+            report_partner_ids = send_and_print_vals.get('report_options', {}).get('partner_ids', [])
+            need_retrigger = processed_count + len(report_partner_ids) > job_count
+            partner_ids = report_partner_ids[:job_count - processed_count]
+            company = self.env['res.company'].browse(send_and_print_vals['report_options']['companies'][0]['id'])
+            existing_partner_ids = set(self.env['res.partner'].browse(partner_ids).exists().ids)
+            for partner_id in partner_ids:
+                if partner_id in existing_partner_ids:
+                    options = {
+                        **send_and_print_vals['report_options'],
+                        'partner_ids': [partner_id],
+                    }
+                    self.env['account.report.send']._process_send_and_print(report=report.with_company(company), options=options)
+                    processed_count += 1
+                report_partner_ids.remove(partner_id)
+            if report_partner_ids:
+                send_and_print_vals['report_options']['partner_ids'] = report_partner_ids
+                report.send_and_print_values = send_and_print_vals
+            else:
+                report.send_and_print_values = False
+
+        if need_retrigger:
+            self.env.ref('odex30_account_reports.ir_cron_account_report_send')._trigger()
+
+    ####################################################
+    # MENU MANAGEMENT
+    ####################################################
+
+    def _get_existing_menuitem(self):
+        self.ensure_one()
+        action = self.env['ir.actions.client']\
+            .search([('name', '=', self.name), ('tag', '=', 'account_report')])\
+            .filtered(lambda act: ast.literal_eval(act.context).get('report_id') == self.id)
+        menuitem = self.env['ir.ui.menu']\
+            .with_context({'active_test': False, 'ir.ui.menu.full_list': True})\
+            .search([('action', '=', f'ir.actions.client,{action.id}')])
+        return action, menuitem
+
+    def _create_menu_item_for_report(self):
+        """ Adds a default menu item for this report. This is called by an action on the report, for reports created manually by the user.
+        """
+        self.ensure_one()
+
+        action, menuitem = self._get_existing_menuitem()
+
+        if menuitem:
+            raise UserError(_("This report already has a menuitem."))
+
+        if not action:
+            action = self.env['ir.actions.client'].create({
+                'name': self.name,
+                'tag': 'account_report',
+                'context': {'report_id': self.id},
+            })
+
+        self.env['ir.ui.menu'].create({
+            'name': self.name,
+            'parent_id': self.env['ir.model.data']._xmlid_to_res_id('account.menu_finance_reports'),
+            'action': f'ir.actions.client,{action.id}',
+        })
+
+        return {
+            'type': 'ir.actions.client',
+            'tag': 'reload',
+        }
+
+    ####################################################
+    # OPTIONS: journals
+    ####################################################
+
+    def _get_filter_journals(self, options, additional_domain=None):
+        return self.env['account.journal'].with_context(active_test=False).search([
+                *self.env['account.journal']._check_company_domain(self.get_report_company_ids(options)),
+                *(additional_domain or []),
+            ], order="company_id, name")
+
+    def _get_filter_journal_groups(self, options):
+        return self.env['account.journal.group'].search([
+            *self.env['account.journal.group']._check_company_domain(self.get_report_company_ids(options)),
+        ], order='sequence')
+
+    def _init_options_journals(self, options, previous_options, additional_journals_domain=None):
+        # The additional additional_journals_domain optional parameter allows calling this with an additional restriction on journals,
+        # to regenerate the journal options accordingly.
+        def option_value(value, selected=False, group_journals=None):
+            result = {
+                'id': value.id,
+                'model': value._name,
+                'name': value.display_name,
+                'selected': selected,
+            }
+
+            if value._name == 'account.journal.group':
+                result.update({
+                    'title': value.display_name,
+                    'journals': group_journals.ids,
+                    'journal_types': list(set(group_journals.mapped('type'))),
+                })
+            elif value._name == 'account.journal':
+                result.update({
+                    'title': f"{value.name} - {value.code}",
+                    'type': value.type,
+                    'visible': True,
+                })
+
+            return result
+
+        if not self.filter_journals:
+            return
+
+        previous_journals = previous_options.get('journals', [])
+        previous_journal_group_action = previous_options.get('__journal_group_action', {})
+
+        all_journals = self._get_filter_journals(options, additional_domain=additional_journals_domain)
+        all_journal_groups = self._get_filter_journal_groups(options)
+
+        options['journals'] = []
+        options['selected_journal_groups'] = {}
+
+        groups_journals_selected = set()
+        options_journal_groups = []
+
+        # First time opening the report, and make sure it's not specifically stated that we should not reset the filter
+        is_opening_report = previous_options.get('is_opening_report')  # key from JS controller when report is being opened
+        # a key to prevent the reset of the journals filter even when is_opening_report is True
+        can_reset_journals_filter = not previous_options.get('not_reset_journals_filter')
+
+        # 1. Handle journal group selection
+        for group in all_journal_groups:
+            group_journals = all_journals - group.excluded_journal_ids
+            selected = False
+            first_group_already_selected = bool(options['selected_journal_groups'])  # only one group should be selected at most
+
+            # select the first group by default when opening the report
+            if is_opening_report and not first_group_already_selected and can_reset_journals_filter:
+                selected = True
+            # Otherwise, select the previous selected group (if any)
+            elif group.id == previous_journal_group_action.get('id'):
+                selected = previous_journal_group_action.get('action') == 'add'
+
+            group_option = option_value(group, selected=selected, group_journals=group_journals)
+            options_journal_groups.append(group_option)
+
+            # Select all the group journals
+            if selected:
+                options['selected_journal_groups'] = group_option
+                groups_journals_selected |= set(group_journals.ids)
+
+        # 2. Handle journals selection
+        previous_selected_journals_ids = {
+            journal['id']
+            for journal in previous_journals
+            if journal.get('model') == 'account.journal' and journal.get('selected')
+        }
+
+        company_journals_map = defaultdict(list)
+        journals_selected = set()
+
+        for journal in all_journals:
+            selected = False
+
+            if journal.id in groups_journals_selected:
+                selected = True
+
+            elif not options['selected_journal_groups'] and previous_journal_group_action.get('action') != 'remove':
+                if journal.id in previous_selected_journals_ids:
+                    selected = True
+
+            if selected:
+                journals_selected.add(journal.id)
+
+            company_journals_map[journal.company_id].append(option_value(journal, selected=journal.id in journals_selected))
+
+        # 3. Recompute selected groups in case the set of selected journals is equal to a group's accepted journals
+        for group in options_journal_groups:
+            if journals_selected == set(group['journals']):
+                group['selected'] = True
+                options['selected_journal_groups'] = group
+
+        # 4. Unselect all journals if all are selected and no group is specifically selected
+        if journals_selected == set(all_journals.ids) and not options['selected_journal_groups']:
+            for company, journals in company_journals_map.items():
+                for journal in journals:
+                    journal['selected'] = False
+
+        # 5. Build group options
+        if all_journal_groups:
+            options['journals'] = [{
+                'id': 'divider',
+                'name': _("Multi-ledger"),
+                'model': 'account.journal.group',
+            }] + options_journal_groups
+
+        if not company_journals_map:
+            options['name_journal_group'] = _("No Journal")
+            return
+
+        # 6. Build journals options
+        if len(company_journals_map) > 1 or all_journal_groups:
+            for company, journals in company_journals_map.items():
+                # users may not have full access to the parent company in case they are in a branch, yet they have to see the company name
+                company_name = company.sudo().display_name
+
+                # if not is_opening_report, then gets the unfolded attribute of the company from the previous options
+                unfolded = False if is_opening_report else next(
+                    (entry.get('unfolded') for entry in previous_journals
+                     if entry['model'] == 'res.company' and entry['name'] == company_name), False)
+
+                for journal in journals:
+                    journal['visible'] = unfolded
+
+                options['journals'].append({
+                    'id': 'divider',
+                    'model': 'res.company',
+                    'name': company_name,
+                    'unfolded': unfolded,
+                })
+
+                options['journals'] += journals
+
+        else:
+            options['journals'].extend(next(iter(company_journals_map.values()), []))
+
+
+    def _init_options_journals_names(self, options, previous_options, additional_journals_domain=None):
+        all_journals = [
+            journal for journal in options.get('journals', [])
+            if journal['model'] == 'account.journal'
+        ]
+        journals_selected = [j for j in all_journals if j.get('selected')]
+        # 1. Compute the name to display on the widget
+        if options.get('selected_journal_groups'):
+            names_to_display = [options['selected_journal_groups']['name']]
+        elif len(all_journals) == len(journals_selected) or not journals_selected:
+            names_to_display = [_("All Journals")]
+        else:
+            names_to_display = []
+            for journal in options['journals']:
+                if journal.get('model') == 'account.journal' and journal['selected']:
+                    names_to_display += [journal['name']]
+
+        # 2. Abbreviate the name
+        max_nb_journals_displayed = 5
+        nb_remaining = len(names_to_display) - max_nb_journals_displayed
+        displayed_names = ', '.join(names_to_display[:max_nb_journals_displayed])
+        if nb_remaining == 1:
+            options['name_journal_group'] = _("%(names)s and one other", names=displayed_names)
+        elif nb_remaining > 1:
+            options['name_journal_group'] = _("%(names)s and %(remaining)s others", names=displayed_names, remaining=nb_remaining)
+        else:
+            options['name_journal_group'] = displayed_names
+
+    @api.model
+    def _get_options_journals(self, options):
+        selected_journals = [
+            journal for journal in options.get('journals', [])
+            if journal['model'] == 'account.journal' and journal['selected']
+        ]
+        if not selected_journals:
+            # If no journal is specifically selected, we actually want to select them all.
+            # This is needed, because some reports will not use ALL available journals and filter by type.
+            # Without getting them from the options, we will use them all, which is wrong.
+            selected_journals = [
+                journal for journal in options.get('journals', [])
+                if journal['model'] == 'account.journal'
+            ]
+        return selected_journals
+
+    @api.model
+    def _get_options_journals_domain(self, options):
+        # Make sure to return an empty array when nothing selected to handle archived journals.
+        selected_journals = self._get_options_journals(options)
+        return selected_journals and [('journal_id', 'in', [j['id'] for j in selected_journals])] or []
+
+    # ####################################################
+    # OPTIONS: USER DEFINED FILTERS ON AML
+    ####################################################
+    def _init_options_aml_ir_filters(self, options, previous_options):
+        options['aml_ir_filters'] = []
+        if not self.filter_aml_ir_filters:
+            return
+
+        ir_filters = self.env['ir.filters'].search([('model_id', '=', 'account.move.line')])
+        if not ir_filters:
+            return
+
+        aml_ir_filters = [{'id': x.id, 'name': x.name, 'selected': False} for x in ir_filters]
+        previous_options_aml_ir_filters = previous_options.get('aml_ir_filters', [])
+        previous_options_filters_map = {filter_item['id']: filter_item for filter_item in previous_options_aml_ir_filters}
+
+        for filter_item in aml_ir_filters:
+            if filter_item['id'] in previous_options_filters_map:
+                filter_item['selected'] = previous_options_filters_map[filter_item['id']]['selected']
+
+        options['aml_ir_filters'] = aml_ir_filters
+
+    @api.model
+    def _get_options_aml_ir_filters(self, options):
+        selected_filters_ids = [
+            filter_item['id']
+            for filter_item in options.get('aml_ir_filters', [])
+            if filter_item['selected']
+        ]
+
+        if not selected_filters_ids:
+            return []
+
+        selected_ir_filters = self.env['ir.filters'].browse(selected_filters_ids)
+        return osv.expression.OR([filter_record._get_eval_domain() for filter_record in selected_ir_filters])
+
+    ####################################################
+    # OPTIONS: date + comparison
+    ####################################################
+
+    @api.model
+    def _get_dates_period(self, date_from, date_to, mode, period_type=None):
+        '''Compute some information about the period:
+        * The name to display on the report.
+        * The period type (e.g. quarter) if not specified explicitly.
+        :param date_from:   The starting date of the period.
+        :param date_to:     The ending date of the period.
+        :param period_type: The type of the interval date_from -> date_to.
+        :return:            A dictionary containing:
+            * date_from * date_to * string * period_type * mode *
+        '''
+        def match(dt_from, dt_to):
+            return (dt_from, dt_to) == (date_from, date_to)
+
+        def get_quarter_name(date_to, date_from):
+            date_to_quarter_string = format_date(self.env, fields.Date.to_string(date_to), date_format='MMM yyyy')
+            date_from_quarter_string = format_date(self.env, fields.Date.to_string(date_from), date_format='MMM')
+            return f"{date_from_quarter_string} - {date_to_quarter_string}"
+
+        string = None
+        # If no date_from or not date_to, we are unable to determine a period
+        if not period_type or period_type == 'custom':
+            date = date_to or date_from
+            company_fiscalyear_dates = self.env.company.compute_fiscalyear_dates(date)
+            if match(company_fiscalyear_dates['date_from'], company_fiscalyear_dates['date_to']):
+                period_type = 'fiscalyear'
+                if company_fiscalyear_dates.get('record'):
+                    string = company_fiscalyear_dates['record'].name
+            elif match(*date_utils.get_month(date)):
+                period_type = 'month'
+            elif match(*date_utils.get_quarter(date)):
+                period_type = 'quarter'
+            elif match(*date_utils.get_fiscal_year(date)):
+                period_type = 'year'
+            elif match(date_utils.get_month(date)[0], fields.Date.today()):
+                period_type = 'today'
+            else:
+                period_type = 'custom'
+        elif period_type == 'fiscalyear':
+            date = date_to or date_from
+            company_fiscalyear_dates = self.env.company.compute_fiscalyear_dates(date)
+            record = company_fiscalyear_dates.get('record')
+            string = record and record.name
+        elif period_type == 'tax_period':
+            day, month = self.env.company._get_tax_closing_start_date_attributes(self)
+            months_per_period = self.env.company._get_tax_periodicity_months_delay(self)
+            # We need to format ourselves the date and not switch the period type to the actual period because we do not want to write the actual period in the options but keep tax_period
+            if day == 1 and month == 1 and months_per_period in (1, 3, 12):
+                match months_per_period:
+                    case 1:
+                        string = format_date(self.env, fields.Date.to_string(date_to), date_format='MMM yyyy')
+                    case 3:
+                        string = get_quarter_name(date_to, date_from)
+                    case 12:
+                        string = date_to.strftime('%Y')
+            else:
+                dt_from_str = format_date(self.env, fields.Date.to_string(date_from))
+                dt_to_str = format_date(self.env, fields.Date.to_string(date_to))
+                string = '%s - %s' % (dt_from_str, dt_to_str)
+
+        if not string:
+            fy_day = self.env.company.fiscalyear_last_day
+            fy_month = int(self.env.company.fiscalyear_last_month)
+            if mode == 'single':
+                string = _('As of %s', format_date(self.env, date_to))
+            elif period_type == 'year' or (
+                    period_type == 'fiscalyear' and (date_from, date_to) == date_utils.get_fiscal_year(date_to)):
+                string = date_to.strftime('%Y')
+            elif period_type == 'fiscalyear' and (date_from, date_to) == date_utils.get_fiscal_year(date_to, day=fy_day, month=fy_month):
+                string = '%s - %s' % (date_to.year - 1, date_to.year)
+            elif period_type == 'month':
+                string = format_date(self.env, fields.Date.to_string(date_to), date_format='MMM yyyy')
+            elif period_type == 'quarter':
+                string = get_quarter_name(date_to, date_from)
+            else:
+                dt_from_str = format_date(self.env, fields.Date.to_string(date_from))
+                dt_to_str = format_date(self.env, fields.Date.to_string(date_to))
+                string = _('From %(date_from)s\nto  %(date_to)s', date_from=dt_from_str, date_to=dt_to_str)
+
+        return {
+            'string': string,
+            'period_type': period_type,
+            'currency_table_period_key': f"{date_from if mode == 'range' else 'None'}_{date_to}",
+            'mode': mode,
+            'date_from': date_from and fields.Date.to_string(date_from) or False,
+            'date_to': fields.Date.to_string(date_to),
+        }
+
+    @api.model
+    def _get_shifted_dates_period(self, options, period_vals, periods, tax_period=False):
+        '''Shift the period.
+        :param period_vals: A dictionary generated by the _get_dates_period method.
+        :param periods:     The number of periods we want to move either in the future or the past
+        :return:            A dictionary containing:
+            * date_from * date_to * string * period_type *
+        '''
+        period_type = period_vals['period_type']
+        mode = period_vals['mode']
+        date_from = fields.Date.from_string(period_vals['date_from'])
+        date_to = fields.Date.from_string(period_vals['date_to'])
+        if period_type == 'month':
+            date_to = date_from + relativedelta(months=periods)
+        elif period_type == 'quarter':
+            date_to = date_from + relativedelta(months=3 * periods)
+        elif period_type == 'year':
+            date_to = date_from + relativedelta(years=periods)
+        elif period_type in {'custom', 'today'}:
+            date_to = date_from + relativedelta(days=periods)
+
+        if tax_period or 'tax_period' in period_type:
+            month_per_period = self.env.company._get_tax_periodicity_months_delay(self)
+            date_from, date_to = self.env.company._get_tax_closing_period_boundaries(date_from + relativedelta(months=month_per_period * periods), self)
+            return self._get_dates_period(date_from, date_to, mode, period_type='tax_period')
+        if period_type in ('fiscalyear', 'today'):
+            # Don't pass the period_type to _get_dates_period to be able to retrieve the account.fiscal.year record if
+            # necessary.
+            company_fiscalyear_dates = {}
+            # This loop is needed because a fiscal year can be a month, quarter, etc
+            for _ in range(abs(periods)):
+                date_to = (date_from if periods < 0 else date_to) + relativedelta(days=periods / abs(periods))
+                company_fiscalyear_dates = self.env.company.compute_fiscalyear_dates(date_to)
+                if periods < 0:
+                    date_from = company_fiscalyear_dates['date_from']
+                else:
+                    date_to = company_fiscalyear_dates['date_to']
+
+            return self._get_dates_period(company_fiscalyear_dates['date_from'], company_fiscalyear_dates['date_to'], mode)
+        if period_type in ('month', 'custom'):
+            return self._get_dates_period(*date_utils.get_month(date_to), mode, period_type='month')
+        if period_type == 'quarter':
+            return self._get_dates_period(*date_utils.get_quarter(date_to), mode, period_type='quarter')
+        if period_type == 'year':
+            return self._get_dates_period(*date_utils.get_fiscal_year(date_to), mode, period_type='year')
+        return None
+
+    @api.model
+    def _get_dates_previous_year(self, options, period_vals):
+        '''Shift the period to the previous year.
+        :param options:     The report options.
+        :param period_vals: A dictionary generated by the _get_dates_period method.
+        :return:            A dictionary containing:
+            * date_from * date_to * string * period_type *
+        '''
+        period_type = period_vals['period_type']
+        mode = period_vals['mode']
+        date_from = fields.Date.from_string(period_vals['date_from'])
+        date_from = date_from - relativedelta(years=1)
+        date_to = fields.Date.from_string(period_vals['date_to'])
+        date_to = date_to - relativedelta(years=1)
+
+        if period_type == 'month':
+            date_from, date_to = date_utils.get_month(date_to)
+
+        return self._get_dates_period(date_from, date_to, mode, period_type=period_type)
+
+    def _init_options_date(self, options, previous_options):
+        """ Initialize the 'date' options key.
+
+        :param options:             The current report options to build.
+        :param previous_options:    The previous options coming from another report.
+        """
+        date = previous_options.get('date', {})
+        period_date_to = date.get('date_to')
+        period_date_from = date.get('date_from')
+        mode = date.get('mode')
+        date_filter = date.get('filter', 'custom')
+
+        default_filter = self.default_opening_date_filter
+        options_mode = 'range' if self.filter_date_range else 'single'
+        date_from = date_to = period_type = False
+
+        if mode == 'single' and options_mode == 'range':
+            # 'single' date mode to 'range'.
+            if date_filter:
+                date_to = fields.Date.from_string(period_date_to or period_date_from)
+                date_from = self.env.company.compute_fiscalyear_dates(date_to)['date_from']
+                options_filter = 'custom'
+            else:
+                options_filter = default_filter
+        elif mode == 'range' and options_mode == 'single':
+            # 'range' date mode to 'single'.
+            if date_filter == 'custom':
+                date_to = fields.Date.from_string(period_date_to or period_date_from)
+                date_from = date_utils.get_month(date_to)[0]
+                options_filter = 'custom'
+            elif date_filter:
+                options_filter = date_filter
+            else:
+                options_filter = default_filter
+        elif (mode is None or mode == options_mode) and date:
+            # Same date mode.
+            if date_filter == 'custom':
+                if options_mode == 'range':
+                    date_from = fields.Date.from_string(period_date_from)
+                    date_to = fields.Date.from_string(period_date_to)
+                else:
+                    date_to = fields.Date.from_string(period_date_to or period_date_from)
+                    date_from = date_utils.get_month(date_to)[0]
+
+                options_filter = 'custom'
+            else:
+                options_filter = date_filter
+        else:
+            # Default.
+            options_filter = default_filter
+
+        # Compute 'date_from' / 'date_to'.
+        if not date_from or not date_to:
+            if options_filter == 'today':
+                date_to = fields.Date.context_today(self)
+                date_from = self.env.company.compute_fiscalyear_dates(date_to)['date_from']
+                period_type = 'today'
+            elif 'month' in options_filter:
+                date_from, date_to = date_utils.get_month(fields.Date.context_today(self))
+                period_type = 'month'
+            elif 'quarter' in options_filter:
+                date_from, date_to = date_utils.get_quarter(fields.Date.context_today(self))
+                period_type = 'quarter'
+            elif 'year' in options_filter:
+                company_fiscalyear_dates = self.env.company.compute_fiscalyear_dates(fields.Date.context_today(self))
+                curr_year = fields.Date.context_today(self).year
+                if company_fiscalyear_dates['date_from'].year < curr_year:
+                    company_fiscalyear_dates = self.env.company.compute_fiscalyear_dates(company_fiscalyear_dates['date_to'] + relativedelta(days=1))
+                date_from = company_fiscalyear_dates['date_from']
+                date_to = company_fiscalyear_dates['date_to']
+            elif 'tax_period' in options_filter:
+                if 'custom' in options_filter:
+                    base_date = fields.Date.from_string(period_date_to)
+                else:
+                    base_date = fields.Date.context_today(self)
+
+                date_from, date_to = self.env.company._get_tax_closing_period_boundaries(base_date, self)
+                period_type = 'tax_period'
+                start_day, start_month = self.env.company._get_tax_closing_start_date_attributes(self)
+                if start_day == 1 and start_month == 1:
+                    periods = self.env.company._get_tax_periodicity_months_delay(self)
+                    period_type_map = {
+                        1: 'month',
+                        3: 'quarter',
+                        12: 'year',
+                    }
+                    period_type = period_type_map.get(periods, 'tax_period')
+
+        options['date'] = self._get_dates_period(
+            date_from,
+            date_to,
+            options_mode,
+            period_type=period_type,
+        )
+
+        if any(option in options_filter for option in ['previous', 'next']):
+            new_period = date.get('period', -1 if 'previous' in options_filter else 1)
+            options['date'] = self._get_shifted_dates_period(options, options['date'], new_period, tax_period='tax_period' in options_filter)
+            # This line is useful for the export and tax closing so that the period is set in the options.
+            options['date']['period'] = new_period
+
+        options['date']['filter'] = options_filter if options_filter != 'custom_tax_period' else 'custom'
+
+    def _init_options_comparison(self, options, previous_options):
+        """ Initialize the 'comparison' options key.
+
+        This filter must be loaded after the 'date' filter.
+
+        :param options:             The current report options to build.
+        :param previous_options:    The previous options coming from another report.
+        """
+        if not self.filter_period_comparison:
+            return
+
+        previous_comparison = previous_options.get('comparison', {})
+        previous_filter = previous_comparison.get('filter')
+
+        period_order = previous_comparison.get('period_order') or 'descending'
+        if previous_filter == 'custom':
+            # Try to adapt the previous 'custom' filter.
+            date_from = previous_comparison.get('date_from')
+            date_to = previous_comparison.get('date_to')
+            number_period = 1
+            options_filter = 'custom'
+        else:
+            # Use the 'date' options.
+            date_from = options['date']['date_from']
+            date_to = options['date']['date_to']
+            number_period = max(previous_comparison.get('number_period', 1) or 0, 0)
+            options_filter = number_period and previous_filter or 'no_comparison'
+
+        options['comparison'] = {
+            'filter': options_filter,
+            'number_period': number_period,
+            'date_from': date_from,
+            'date_to': date_to,
+            'periods': [],
+            'period_order': period_order,
+        }
+
+        date_from_obj = fields.Date.from_string(date_from)
+        date_to_obj = fields.Date.from_string(date_to)
+
+        if options_filter == 'custom':
+            options['comparison']['periods'].append(self._get_dates_period(
+                date_from_obj,
+                date_to_obj,
+                options['date']['mode'],
+            ))
+        elif options_filter in ('previous_period', 'same_last_year'):
+            previous_period = options['date']
+            for dummy in range(0, number_period):
+                if options_filter == 'previous_period':
+                    period_vals = self._get_shifted_dates_period(options, previous_period, -1)
+                elif options_filter == 'same_last_year':
+                    period_vals = self._get_dates_previous_year(options, previous_period)
+                else:
+                    date_from_obj = fields.Date.from_string(date_from)
+                    date_to_obj = fields.Date.from_string(date_to)
+                    period_vals = self._get_dates_period(date_from_obj, date_to_obj, previous_period['mode'])
+                options['comparison']['periods'].append(period_vals)
+                previous_period = period_vals
+
+        if len(options['comparison']['periods']) > 0:
+            options['comparison'].update(options['comparison']['periods'][0])
+
+    def _init_options_column_percent_comparison(self, options, previous_options):
+        if options['selected_horizontal_group_id'] is None:
+            if self.filter_growth_comparison and len(options['columns']) == 2 and len(options.get('comparison', {}).get('periods', [])) == 1:
+                options['column_percent_comparison'] = 'growth'
+
+            if self.filter_budgets and any(budget['selected'] for budget in options.get('budgets', [])):
+                options['column_percent_comparison'] = 'budget'
+
+    def _get_options_date_domain(self, options, date_scope):
+        date_from, date_to = self._get_date_bounds_info(options, date_scope)
+
+        scope_domain = [('date', '<=', date_to)]
+        if date_from:
+            scope_domain += [('date', '>=', date_from)]
+
+        return scope_domain
+
+    def _get_date_bounds_info(self, options, date_scope):
+        # Default values (the ones from 'strict_range')
+        date_to = options['date']['date_to']
+        date_from = options['date']['date_from'] if options['date']['mode'] == 'range' else None
+
+        if date_scope == 'from_beginning':
+            date_from = None
+
+        elif date_scope == 'to_beginning_of_period':
+            date_tmp = fields.Date.from_string(date_from or date_to) - relativedelta(days=1)
+            date_to = date_tmp.strftime('%Y-%m-%d')
+            date_from = None
+
+        elif date_scope == 'from_fiscalyear':
+            date_tmp = fields.Date.from_string(date_to)
+            date_tmp = self.env.company.compute_fiscalyear_dates(date_tmp)['date_from']
+            date_from = date_tmp.strftime('%Y-%m-%d')
+
+        elif date_scope == 'to_beginning_of_fiscalyear':
+            date_tmp = fields.Date.from_string(date_to)
+            date_tmp = self.env.company.compute_fiscalyear_dates(date_tmp)['date_from'] - relativedelta(days=1)
+            date_to = date_tmp.strftime('%Y-%m-%d')
+            date_from = None
+
+        elif date_scope == 'previous_tax_period':
+            eve_of_date_from = fields.Date.from_string(options['date']['date_from']) - relativedelta(days=1)
+            date_from, date_to = self.env.company._get_tax_closing_period_boundaries(eve_of_date_from, self)
+
+        return date_from, date_to
+
+
+    ####################################################
+    # OPTIONS: analytic filter
+    ####################################################
+
+    def _init_options_analytic(self, options, previous_options):
+        if not self.filter_analytic:
+            return
+
+
+        if self.env.user.has_group('analytic.group_analytic_accounting'):
+            previous_analytic_accounts = previous_options.get('analytic_accounts', [])
+            analytic_account_ids = [int(x) for x in previous_analytic_accounts]
+            selected_analytic_accounts = self.env['account.analytic.account'].with_context(active_test=False).search([('id', 'in', analytic_account_ids)])
+
+            options['display_analytic'] = True
+            options['analytic_accounts'] = selected_analytic_accounts.ids
+            options['selected_analytic_account_names'] = selected_analytic_accounts.mapped('name')
+
+    ####################################################
+    # OPTIONS: partners
+    ####################################################
+
+    def _init_options_partner(self, options, previous_options):
+        if not self.filter_partner:
+            return
+
+        options['partner'] = True
+        previous_partner_ids = previous_options.get('partner_ids') or []
+        options['partner_categories'] = previous_options.get('partner_categories') or []
+
+        selected_partner_ids = [int(partner) for partner in previous_partner_ids]
+        # search instead of browse so that record rules apply and filter out the ones the user does not have access to
+        selected_partners = selected_partner_ids and self.env['res.partner'].with_context(active_test=False).search([('id', 'in', selected_partner_ids)]) or self.env['res.partner']
+        options['selected_partner_ids'] = selected_partners.filtered('name').mapped('name')
+        options['partner_ids'] = selected_partners.ids
+
+        selected_partner_category_ids = [int(category) for category in options['partner_categories']]
+        selected_partner_categories = selected_partner_category_ids and self.env['res.partner.category'].browse(selected_partner_category_ids) or self.env['res.partner.category']
+        options['selected_partner_categories'] = selected_partner_categories.mapped('name')
+
+    @api.model
+    def _get_options_partner_domain(self, options):
+        domain = []
+        if options.get('partner_ids'):
+            partner_ids = [int(partner) for partner in options['partner_ids']]
+            domain.append(('partner_id', 'in', partner_ids))
+        if options.get('partner_categories'):
+            partner_category_ids = [int(category) for category in options['partner_categories']]
+            domain.append(('partner_id.category_id', 'in', partner_category_ids))
+        return domain
+
+    ####################################################
+    # OPTIONS: all_entries
+    ####################################################
+
+    @api.model
+    def _get_options_all_entries_domain(self, options):
+        if not options.get('all_entries'):
+            return [('parent_state', '=', 'posted')]
+        else:
+            return [('parent_state', '!=', 'cancel')]
+
+    ####################################################
+    # OPTIONS: not reconciled entries
+    ####################################################
+    def _init_options_reconciled(self, options, previous_options):
+        if self.filter_unreconciled:
+            options['unreconciled'] = previous_options.get('unreconciled', False)
+        else:
+            options['unreconciled'] = False
+
+    @api.model
+    def _get_options_unreconciled_domain(self, options):
+        if options.get('unreconciled'):
+            return ['&', ('full_reconcile_id', '=', False), ('balance', '!=', '0')]
+        return []
+
+    ####################################################
+    # OPTIONS: account_type
+    ####################################################
+
+    def _init_options_account_type(self, options, previous_options):
+        '''
+        Initialize a filter based on the account_type of the line (trade/non trade, payable/receivable).
+        Selects a name to display according to the selections.
+        The group display name is selected according to the display name of the options selected.
+        '''
+        if self.filter_account_type in ('disabled', False):
+            return
+
+        account_type_list = [
+            {'id': 'trade_receivable', 'name': _("Receivable"), 'selected': True},
+            {'id': 'non_trade_receivable', 'name': _("Non Trade Receivable"), 'selected': False},
+            {'id': 'trade_payable', 'name': _("Payable"), 'selected': True},
+            {'id': 'non_trade_payable', 'name': _("Non Trade Payable"), 'selected': False},
+        ]
+
+        if self.filter_account_type == 'receivable':
+            options['account_type'] = account_type_list[:2]
+        elif self.filter_account_type == 'payable':
+            options['account_type'] = account_type_list[2:]
+        else:
+            options['account_type'] = account_type_list
+
+        if previous_options.get('account_type'):
+            previously_selected_ids = {x['id'] for x in previous_options['account_type'] if x.get('selected')}
+            for opt in options['account_type']:
+                opt['selected'] = opt['id'] in previously_selected_ids
+
+
+    @api.model
+    def _get_options_account_type_domain(self, options):
+        all_domains = []
+        selected_domains = []
+        if not options.get('account_type') or len(options.get('account_type')) == 0:
+            return []
+        for opt in options.get('account_type', []):
+            if opt['id'] == 'trade_receivable':
+                domain = [('account_id.non_trade', '=', False), ('account_id.account_type', '=', 'asset_receivable')]
+            elif opt['id'] == 'trade_payable':
+                domain = [('account_id.non_trade', '=', False), ('account_id.account_type', '=', 'liability_payable')]
+            elif opt['id'] == 'non_trade_receivable':
+                domain = [('account_id.non_trade', '=', True), ('account_id.account_type', '=', 'asset_receivable')]
+            elif opt['id'] == 'non_trade_payable':
+                domain = [('account_id.non_trade', '=', True), ('account_id.account_type', '=', 'liability_payable')]
+            if opt['selected']:
+                selected_domains.append(domain)
+            all_domains.append(domain)
+        return osv.expression.OR(selected_domains or all_domains)
+
+    ####################################################
+    # OPTIONS: order column
+    ####################################################
+
+    @api.model
+    def _init_options_order_column(self, options, previous_options):
+        # options['order_column'] is in the form {'expression_label': expression label of the column to order, 'direction': the direction order ('ASC' or 'DESC')}
+        options['order_column'] = None
+
+        previous_value = previous_options and previous_options.get('order_column')
+        if previous_value:
+            for col in options['columns']:
+                if col['sortable'] and col['expression_label'] == previous_value['expression_label']:
+                    options['order_column'] = previous_value
+                    break
+
+    ####################################################
+    # OPTIONS: hierarchy
+    ####################################################
+
+    def _init_options_hierarchy(self, options, previous_options):
+        company_ids = self.get_report_company_ids(options)
+        if self.filter_hierarchy != 'never' and self.env['account.group'].search_count(self.env['account.group']._check_company_domain(company_ids), limit=1):
+            options['display_hierarchy_filter'] = True
+            if 'hierarchy' in previous_options:
+                options['hierarchy'] = previous_options['hierarchy']
+            else:
+                options['hierarchy'] = self.filter_hierarchy == 'by_default'
+        else:
+            options['hierarchy'] = False
+            options['display_hierarchy_filter'] = False
+
+    @api.model
+    def _create_hierarchy(self, lines, options):
+        """Compute the hierarchy based on account groups when the option is activated.
+
+        The option is available only when there are account.group for the company.
+        It should be called when before returning the lines to the client/templater.
+        The lines are the result of _get_lines(). If there is a hierarchy, it is left
+        untouched, only the lines related to an account.account are put in a hierarchy
+        according to the account.group's and their prefixes.
+        """
+        if not lines:
+            return lines
+
+        def get_account_group_hierarchy(account):
+            # Create codes path in the hierarchy based on account.
+            groups = self.env['account.group']
+            if account.group_id:
+                group = account.group_id
+                while group:
+                    groups += group
+                    group = group.parent_id
+            return list(groups.sorted(reverse=True))
+
+        def create_hierarchy_line(account_group, column_totals, level, parent_id):
+            line_id = self._get_generic_line_id('account.group', account_group.id if account_group else None, parent_line_id=parent_id)
+            unfolded = line_id in options.get('unfolded_lines') or options['unfold_all']
+            name = account_group.display_name if account_group else _('(No Group)')
+            columns = []
+            for column_total, column in zip(column_totals, options['columns']):
+                columns.append(self._build_column_dict(column_total, column, options=options))
+            return {
+                'id': line_id,
+                'name': name,
+                'title_hover': name,
+                'unfoldable': True,
+                'unfolded': unfolded,
+                'level': level,
+                'parent_id': parent_id,
+                'columns': columns,
+            }
+
+        def compute_group_totals(line, group=None):
+            result = []
+            for total, column in zip(hierarchy[group]['totals'], line['columns']):
+                value = column.get('no_format')
+                if isinstance(total, float) and isinstance(value, (int, float)):
+                    result.append(total + value)
+                else:
+                    result.append('')
+            return result
+
+        def render_lines(account_groups, current_level, parent_line_id, skip_no_group=True):
+            to_treat = [(current_level, parent_line_id, group) for group in account_groups.sorted()]
+
+            if None in hierarchy and not skip_no_group:
+                to_treat.append((current_level, parent_line_id, None))
+
+            while to_treat:
+                level_to_apply, parent_id, group = to_treat.pop(0)
+                group_data = hierarchy[group]
+                hierarchy_line = create_hierarchy_line(group, group_data['totals'], level_to_apply, parent_id)
+                new_lines.append(hierarchy_line)
+                treated_child_groups = self.env['account.group']
+
+                for account_line in group_data['lines']:
+                    for child_group in group_data['child_groups']:
+                        if child_group not in treated_child_groups and child_group['code_prefix_end'] < account_line['name']:
+                            render_lines(child_group, hierarchy_line['level'] + 1, hierarchy_line['id'])
+                            treated_child_groups += child_group
+
+                    markup, model, account_id = self._parse_line_id(account_line['id'])[-1]
+                    account_line_id = self._get_generic_line_id(model, account_id, markup=markup, parent_line_id=hierarchy_line['id'])
+                    account_line.update({
+                        'id': account_line_id,
+                        'parent_id': hierarchy_line['id'],
+                        'level': hierarchy_line['level'] + 1,
+                    })
+                    new_lines.append(account_line)
+
+                    for child_line in account_line_children_map[account_id]:
+                        markup, model, res_id = self._parse_line_id(child_line['id'])[-1]
+                        child_line.update({
+                            'id': self._get_generic_line_id(model, res_id, markup=markup, parent_line_id=account_line_id),
+                            'parent_id': account_line_id,
+                            'level': account_line['level'] + 1,
+                        })
+                        new_lines.append(child_line)
+
+                to_treat = [
+                    (level_to_apply + 1, hierarchy_line['id'], child_group)
+                    for child_group
+                    in group_data['child_groups'].sorted()
+                    if child_group not in treated_child_groups
+                ] + to_treat
+
+        def create_hierarchy_dict():
+            return defaultdict(lambda: {
+                'lines': [],
+                'totals': [('' if column.get('figure_type') == 'string' else 0.0) for column in options['columns']],
+                'child_groups': self.env['account.group'],
+            })
+
+        # Precompute the account groups of the accounts in the report
+        account_ids = []
+        for line in lines:
+            markup, res_model, model_id = self._parse_line_id(line['id'])[-1]
+            if res_model == 'account.account':
+                account_ids.append(model_id)
+        self.env['account.account'].browse(account_ids).group_id
+
+        new_lines, total_lines = [], []
+
+        # root_line_id is the id of the parent line of the lines we want to render
+        root_line_id = self._build_parent_line_id(self._parse_line_id(lines[0]['id'])) or None
+        last_account_line_id = account_id = None
+        current_level = 0
+        account_line_children_map = defaultdict(list)
+        account_groups = self.env['account.group']
+        root_account_groups = self.env['account.group']
+        hierarchy = create_hierarchy_dict()
+
+        for line in lines:
+            markup, res_model, model_id = self._parse_line_id(line['id'])[-1]
+
+            # Account lines are used as the basis for the computation of the hierarchy.
+            if res_model == 'account.account':
+                last_account_line_id = line['id']
+                current_level = line['level']
+                account_id = model_id
+                account = self.env[res_model].browse(account_id)
+                account_groups = get_account_group_hierarchy(account)
+
+                if not account_groups:
+                    hierarchy[None]['lines'].append(line)
+                    hierarchy[None]['totals'] = compute_group_totals(line)
+                else:
+                    for i, group in enumerate(account_groups):
+                        if i == 0:
+                            hierarchy[group]['lines'].append(line)
+                        if i == len(account_groups) - 1 and group not in root_account_groups:
+                            root_account_groups += group
+                        if group.parent_id and group not in hierarchy[group.parent_id]['child_groups']:
+                            hierarchy[group.parent_id]['child_groups'] += group
+
+                        hierarchy[group]['totals'] = compute_group_totals(line, group=group)
+
+            # This is not an account line, so we check to see if it is a descendant of the last account line.
+            # If so, it is added to the mapping of the lines that are related to this account.
+            elif last_account_line_id and line.get('parent_id', '').startswith(last_account_line_id):
+                account_line_children_map[account_id].append(line)
+
+            # This is a total line that is not linked to an account. It is saved in order to be added at the end.
+            elif markup == 'total':
+                total_lines.append(line)
+
+            # This line ends the scope of the current hierarchy and is (possibly) the root of a new hierarchy.
+            # We render the current hierarchy and set up to build a new hierarchy
+            else:
+                render_lines(root_account_groups, current_level, root_line_id, skip_no_group=False)
+
+                new_lines.append(line)
+
+                # Reset the hierarchy-related variables for a new hierarchy
+                root_line_id = line['id']
+                last_account_line_id = account_id = None
+                current_level = 0
+                account_line_children_map = defaultdict(list)
+                root_account_groups = self.env['account.group']
+                account_groups = self.env['account.group']
+                hierarchy = create_hierarchy_dict()
+
+        render_lines(root_account_groups, current_level, root_line_id, skip_no_group=False)
+
+        return new_lines + total_lines
+
+    ####################################################
+    # OPTIONS: prefix groups threshold
+    ####################################################
+
+    def _init_options_prefix_groups_threshold(self, options, previous_options):
+        previous_threshold = previous_options.get('prefix_groups_threshold')
+        options['prefix_groups_threshold'] = self.prefix_groups_threshold
+
+    ####################################################
+    # OPTIONS: fiscal position (multi vat)
+    ####################################################
+
+    def _init_options_fiscal_position(self, options, previous_options):
+        if self.filter_fiscal_position and self.country_id and len(options['companies']) == 1:
+            vat_fpos_domain = [
+                *self.env['account.fiscal.position']._check_company_domain(next(comp_id for comp_id in self.get_report_company_ids(options))),
+                ('foreign_vat', '!=', False),
+            ]
+
+            vat_fiscal_positions = self.env['account.fiscal.position'].search([
+                *vat_fpos_domain,
+                ('country_id', '=', self.country_id.id),
+            ])
+
+            options['allow_domestic'] = self.env.company.account_fiscal_country_id == self.country_id
+
+            accepted_prev_vals = {*vat_fiscal_positions.ids}
+            if options['allow_domestic']:
+                accepted_prev_vals.add('domestic')
+            if len(vat_fiscal_positions) > (0 if options['allow_domestic'] else 1) or not accepted_prev_vals:
+                accepted_prev_vals.add('all')
+
+            if previous_options.get('fiscal_position') in accepted_prev_vals:
+                # Legit value from previous options; keep it
+                options['fiscal_position'] = previous_options['fiscal_position']
+            elif len(vat_fiscal_positions) == 1 and not options['allow_domestic']:
+                # Only one foreign fiscal position: always select it, menu will be hidden
+                options['fiscal_position'] = vat_fiscal_positions.id
+            else:
+                # Multiple possible values; by default, show the values of the company's area (if allowed), or everything
+                options['fiscal_position'] = options['allow_domestic'] and 'domestic' or 'all'
+        else:
+            # No country, or we're displaying data from several companies: disable fiscal position filtering
+            vat_fiscal_positions = []
+            options['allow_domestic'] = True
+            previous_fpos = previous_options.get('fiscal_position')
+            options['fiscal_position'] = previous_fpos if previous_fpos in ('all', 'domestic') else 'all'
+
+        options['available_vat_fiscal_positions'] = [{
+            'id': fiscal_pos.id,
+            'name': fiscal_pos.name,
+            'company_id': fiscal_pos.company_id.id,
+        } for fiscal_pos in vat_fiscal_positions]
+
+    def _get_options_fiscal_position_domain(self, options):
+        def get_foreign_vat_tax_tag_extra_domain(fiscal_position=None):
+            # We want to gather any line wearing a tag, whatever its fiscal position.
+            # Nevertheless, if a country is using the same report for several regions (e.g. India) we need to exclude
+            # the lines from the other regions to avoid reporting numbers that don't belong to the current region.
+            fp_ids_to_exclude = self.env['account.fiscal.position'].search([
+                ('id', '!=', fiscal_position.id if fiscal_position else False),
+                ('foreign_vat', '!=', False),
+                ('country_id', '=', self.country_id.id),
+            ]).ids
+
+            if fiscal_position and fiscal_position.country_id == self.env.company.account_fiscal_country_id:
+                # We are looking for a fiscal position inside our country which means we need to exclude
+                # the local fiscal position which is represented by `False`.
+                fp_ids_to_exclude.append(False)
+
+            return [
+                ('tax_tag_ids.country_id', '=', self.country_id.id),
+                ('move_id.fiscal_position_id', 'not in', fp_ids_to_exclude),
+            ]
+
+        fiscal_position_opt = options.get('fiscal_position')
+
+        if fiscal_position_opt == 'domestic':
+            domain = [
+                '|',
+                ('move_id.fiscal_position_id', '=', False),
+                ('move_id.fiscal_position_id.foreign_vat', '=', False),
+            ]
+            tax_tag_domain = get_foreign_vat_tax_tag_extra_domain()
+            return osv.expression.OR([domain, tax_tag_domain])
+
+        if isinstance(fiscal_position_opt, int):
+            # It's a fiscal position id
+            domain = [('move_id.fiscal_position_id', '=', fiscal_position_opt)]
+            fiscal_position = self.env['account.fiscal.position'].browse(fiscal_position_opt)
+            tax_tag_domain = get_foreign_vat_tax_tag_extra_domain(fiscal_position)
+            return osv.expression.OR([domain, tax_tag_domain])
+
+        # 'all', or option isn't specified
+        return []
+
+    ####################################################
+    # OPTIONS: MULTI COMPANY
+    ####################################################
+
+    def _init_options_companies(self, options, previous_options):
+        if previous_options.get('forced_companies'):
+            options['forced_companies'] = previous_options['forced_companies']
+            companies = self.env.company.browse(previous_options['forced_companies'])
+        elif self.filter_multi_company == 'selector':
+            companies = self.env.companies
+        elif self.filter_multi_company == 'tax_units':
+            companies = self._multi_company_tax_units_init_options(options, previous_options=previous_options)
+        else:
+            # Multi-company is disabled for this report ; only accept the sub-branches of the current company from the selector
+            companies = self.env.company._accessible_branches()
+
+        options['companies'] = [{'name': c.name, 'id': c.id, 'currency_id': c.currency_id.id} for c in companies]
+
+    def _multi_company_tax_units_init_options(self, options, previous_options):
+        """ Initializes the companies option for reports configured to compute it from tax units.
+        """
+        tax_units_domain = [('company_ids', 'in', self.env.company.id)]
+
+        if self.country_id:
+            tax_units_domain.append(('country_id', '=', self.country_id.id))
+
+        available_tax_units = self.env['account.tax.unit'].search(tax_units_domain)
+
+        # Filter available units to only consider the ones whose companies are all accessible to the user
+        available_tax_units = available_tax_units.filtered(
+            lambda x: all(unit_company in self.env.user.company_ids for unit_company in x.sudo().company_ids)
+            # sudo() to avoid bypassing companies the current user does not have access to
+        )
+
+        options['available_tax_units'] = [{
+            'id': tax_unit.id,
+            'name': tax_unit.name,
+            'company_ids': tax_unit.company_ids.ids
+        } for tax_unit in available_tax_units]
+
+        # Available tax_unit option values that are currently allowed by the company selector
+        # A js hack ensures the page is reloaded and the selected companies modified
+        # when clicking on a tax unit option in the UI, so we don't need to worry about that here.
+        companies_authorized_tax_unit_opt = {
+            *(available_tax_units.filtered(lambda x: set(self.env.companies) == set(x.company_ids)).ids),
+            'company_only'
+        }
+
+        if previous_options.get('tax_unit') in companies_authorized_tax_unit_opt:
+            options['tax_unit'] = previous_options['tax_unit']
+
+        else:
+            # No tax_unit gotten from previous options; initialize it
+            # A tax_unit will be set by default if only one tax unit is available for the report
+            # (which should always be true for non-generic reports, which have a country), and the companies of
+            # the unit are the only ones currently selected.
+            if companies_authorized_tax_unit_opt == {'company_only'}:
+                options['tax_unit'] = 'company_only'
+            elif len(available_tax_units) == 1 and available_tax_units[0].id in companies_authorized_tax_unit_opt:
+                options['tax_unit'] = available_tax_units[0].id
+            else:
+                options['tax_unit'] = 'company_only'
+
+        # Finally initialize multi_company filter
+        if options['tax_unit'] == 'company_only':
+            companies = self.env.company._get_branches_with_same_vat(accessible_only=True)
+        else:
+            tax_unit = available_tax_units.filtered(lambda x: x.id == options['tax_unit'])
+            companies = tax_unit.company_ids
+
+        return companies
+
+    ####################################################
+    # OPTIONS: MULTI CURRENCY
+    ####################################################
+    def _init_options_multi_currency(self, options, previous_options):
+        options['multi_currency'] = (
+            any([company.get('currency_id') != options['companies'][0].get('currency_id') for company in options['companies']])
+            or any([column.figure_type != 'monetary' for column in self.column_ids])
+            or any(expression.figure_type and expression.figure_type != 'monetary' for expression in self.line_ids.expression_ids)
+        )
+
+    ####################################################
+    # OPTIONS: CURRENCY TABLE
+    ####################################################
+    def _init_options_currency_table(self, options, previous_options):
+        companies = self.env['res.company'].browse(self.get_report_company_ids(options))
+        table_type = 'monocurrency' if self.env['res.currency']._check_currency_table_monocurrency(companies) else self.currency_translation
+
+        periods = {}
+        for col_group in options['column_groups'].values():
+            if col_group['forced_options'].get('no_impact_on_currency_table'):
+                # This key is used to ignore the colum group in the creation of the periods list for
+                # the currency table. This way, its dates won't influence. It's useful for groups corresponding
+                # to an initial balance of some sorts, like on the Trial Balance.
+                continue
+
+            col_group_date = col_group['forced_options'].get('date', options['date'])
+
+            col_group_date_from = col_group_date['date_from'] if col_group_date['mode'] == 'range' else None
+            col_group_date_to = col_group_date['date_to']
+            period_key = col_group_date['currency_table_period_key']
+
+            already_present_period = periods.get(period_key)
+            if already_present_period:
+                # This can happen for custom reports, needing to enforce the same rates on multiple column groups with
+                # different dates (e.g. Trial Balance). In that case, the date_from and date_to of the currency table period must respectively
+                # be the lowest and highest among those groups.
+                if col_group_date_from and already_present_period['from'] > col_group_date_from:
+                    already_present_period['from'] = col_group_date_from
+
+                if already_present_period['to'] < col_group_date_to:
+                    already_present_period['to'] = col_group_date_to
+            else:
+                periods[period_key] = {
+                    'from': col_group_date_from,
+                    'to': col_group_date_to,
+                }
+
+        options['currency_table'] = {'type': table_type, 'periods': periods}
+
+    @api.model
+    def _currency_table_apply_rate(self, value: SQL) -> SQL:
+        """ Returns an SQL term to use in a SELECT statement converting the value passed as parameter into the current company's currency, using the
+        currency table (which must be joined in the query as well ; using _currency_table_aml_join for account.move.line, or _get_currency_table for
+        other more specific uses).
+        """
+        return SQL("(%(value)s) * COALESCE(account_currency_table.rate, 1)", value=value)
+
+    @api.model
+    def _currency_table_aml_join(self, options, aml_alias=SQL('account_move_line')) -> SQL:
+        """ Returns the JOIN condition to the currency table in a query needing to use it to convert aml balances from one currency to another.
+        """
+        if options['currency_table']['type'] == 'cta':
+            return SQL(
+                """
+                    JOIN account_account aml_ct_account
+                        ON aml_ct_account.id = %(aml_table)s.account_id
+                    LEFT JOIN %(currency_table)s
+                        ON %(aml_table)s.company_id = account_currency_table.company_id
+                        AND (
+                            account_currency_table.rate_type = CASE
+                                WHEN aml_ct_account.account_type LIKE %(equity_prefix)s THEN 'historical'
+                                WHEN aml_ct_account.account_type LIKE ANY (ARRAY[%(income_prefix)s, %(expense_prefix)s, 'equity_unaffected']) THEN 'average'
+                                ELSE 'current'
+                            END
+                        )
+                        AND (account_currency_table.date_from IS NULL OR account_currency_table.date_from <= %(aml_table)s.date)
+                        AND (account_currency_table.date_next IS NULL OR account_currency_table.date_next > %(aml_table)s.date)
+                        AND (account_currency_table.period_key = %(period_key)s OR account_currency_table.period_key IS NULL)
+                """,
+                aml_table=aml_alias,
+                equity_prefix='equity%',
+                income_prefix='income%',
+                expense_prefix='expense%',
+                currency_table=self._get_currency_table(options),
+                period_key=options['date']['currency_table_period_key'],
+            )
+
+        return SQL(
+            """
+                JOIN %(currency_table)s
+                    ON %(aml_table)s.company_id = account_currency_table.company_id
+                    AND (account_currency_table.period_key = %(period_key)s OR account_currency_table.period_key IS NULL)
+            """,
+            aml_table=aml_alias,
+            currency_table=self._get_currency_table(options),
+            period_key=options['date']['currency_table_period_key'],
+        )
+
+    @api.model
+    def _get_currency_table(self, options) -> SQL:
+        """ Returns the currency table table definition to be injected in the JOIN condition of an SQL query needing to use it.
+        """
+        if options['currency_table']['type'] == 'monocurrency':
+            companies = self.env['res.company'].browse(self.get_report_company_ids(options))
+            return self.env['res.currency']._get_monocurrency_currency_table_sql(companies, use_cta_rates=options['currency_table']['type'] == 'cta')
+
+        return SQL('account_currency_table')
+
+    def _init_currency_table(self, options):
+        """ Creates the currency table temporary table if necessary, using the provided options to compute its periods.
+        This function should always be called before any query invovlving the currency table is run.
+        """
+        if options['currency_table']['type'] != 'monocurrency':
+            companies = self.env['res.company'].browse(self.get_report_company_ids(options))
+
+            self.env['res.currency']._create_currency_table(
+                companies,
+                [(period_key, period['from'], period['to']) for period_key, period in options['currency_table']['periods'].items()],
+                use_cta_rates=options['currency_table']['type'] == 'cta',
+            )
+
+    ####################################################
+    # OPTIONS: ROUNDING UNIT
+    ####################################################
+    def _init_options_rounding_unit(self, options, previous_options):
+        default = 'decimals'
+        options['rounding_unit'] = previous_options.get('rounding_unit', default)
+        options['rounding_unit_names'] = self._get_rounding_unit_names()
+
+    def _get_rounding_unit_names(self):
+        currency_symbol = self.env.company.currency_id.symbol
+        currency_name = self.env.company.currency_id.name
+
+        rounding_unit_names = [
+            ('decimals', (f'.{currency_symbol}', '')),
+            ('units', (f'{currency_symbol}', '')),
+            ('thousands', (f'K{currency_symbol}', _('Amounts in Thousands'))),
+            ('millions', (f'M{currency_symbol}', _('Amounts in Millions'))),
+        ]
+
+        if currency_name in CURRENCIES_USING_LAKH:
+            rounding_unit_names.insert(3, ('lakhs', (f'L{currency_symbol}', _('Amounts in Lakhs'))))
+
+        return dict(rounding_unit_names)
+
+    # ####################################################
+    # OPTIONS: ALL ENTRIES
+    ####################################################
+    def _init_options_all_entries(self, options, previous_options):
+        if self.filter_show_draft:
+            options['all_entries'] = previous_options.get('all_entries', False)
+        else:
+            options['all_entries'] = False
+
+    ####################################################
+    # OPTIONS: UNFOLDED LINES
+    ####################################################
+    def _init_options_unfolded(self, options, previous_options):
+        options['unfold_all'] = self.filter_unfold_all and previous_options.get('unfold_all', False)
+
+        previous_section_source_id = previous_options.get('sections_source_id')
+        if not previous_section_source_id or previous_section_source_id == options['sections_source_id']:
+            # Only keep the unfolded lines if they belong to the same report or a section of the same report
+            options['unfolded_lines'] = previous_options.get('unfolded_lines', [])
+        else:
+            options['unfolded_lines'] = []
+
+    ####################################################
+    # OPTIONS: HIDE LINE AT 0
+    ####################################################
+    def _init_options_hide_0_lines(self, options, previous_options):
+        if self.filter_hide_0_lines != 'never':
+            previous_val = previous_options.get('hide_0_lines')
+            if previous_val is not None:
+                options['hide_0_lines'] = previous_val
+            else:
+                options['hide_0_lines'] = self.filter_hide_0_lines == 'by_default'
+        else:
+            options['hide_0_lines'] = False
+
+    def _filter_out_0_lines(self, lines):
+        """ Returns a list containing all lines that are not zero or that are parent to non-zero lines.
+            Can be used to ensure printed report does not include 0 lines, when hide_0_lines is toggled.
+        """
+        lines_to_hide = set()  # contain line ids to remove from lines
+        has_visible_children = set()  # contain parent line ids
+        # Traverse lines in reverse to keep track of visible parent lines required by children lines
+        for line in reversed(lines):
+            is_zero_line = all(col.get('figure_type') not in NUMBER_FIGURE_TYPES or col.get('is_zero', True) for col in line['columns'])
+            if is_zero_line and line['id'] not in has_visible_children:
+                lines_to_hide.add(line['id'])
+            if line.get('parent_id') and line['id'] not in lines_to_hide:
+                has_visible_children.add(line['parent_id'])
+        return list(filter(lambda x: x['id'] not in lines_to_hide, lines))
+
+    ####################################################
+    # OPTIONS: HORIZONTAL GROUP
+    ####################################################
+    def _init_options_horizontal_groups(self, options, previous_options):
+        options['available_horizontal_groups'] = [
+            {
+                'id': horizontal_group.id,
+                'name': horizontal_group.name,
+            }
+            for horizontal_group in self.horizontal_group_ids
+        ]
+        previous_selected = previous_options.get('selected_horizontal_group_id')
+        options['selected_horizontal_group_id'] = previous_selected if previous_selected in self.horizontal_group_ids.ids else None
+
+    ####################################################
+    # OPTIONS: SEARCH BAR
+    ####################################################
+    def _init_options_search_bar(self, options, previous_options):
+        if self.search_bar:
+            options['search_bar'] = True
+            if 'default_filter_accounts' not in self._context and 'filter_search_bar' in previous_options:
+                options['filter_search_bar'] = previous_options['filter_search_bar']
+
+    ####################################################
+    # OPTIONS: COLUMN HEADERS
+    ####################################################
+
+    def _init_options_column_headers(self, options, previous_options):
+        # Prepare column headers, in case the order of the comparison is ascending we reverse the order of the columns
+        all_comparison_date_vals = ([options['date']] + options.get('comparison', {}).get('periods', []))
+        if options.get('comparison') and options['comparison']['period_order'] == 'ascending':
+            all_comparison_date_vals = all_comparison_date_vals[::-1]
+
+        column_headers = [
+            [
+                {
+                    'name': comparison_date_vals['string'],
+                    'forced_options': {'date': comparison_date_vals},
+                }
+                for comparison_date_vals in all_comparison_date_vals
+            ], # First level always consists of date comparison. Horizontal groupby are done on following levels.
+        ]
+
+        # Handle horizontal groups
+        selected_horizontal_group_id = options.get('selected_horizontal_group_id')
+        if selected_horizontal_group_id:
+            horizontal_group = self.env['account.report.horizontal.group'].browse(selected_horizontal_group_id)
+
+            for field_name, records in horizontal_group._get_header_levels_data():
+                header_level = [
+                    {
+                        'name': record.display_name,
+                        'horizontal_groupby_element': {field_name: record.id},
+                    }
+                    for record in records
+                ]
+                column_headers.append(header_level)
+        else:
+            # Insert budget column headers if needed
+            selected_budgets = [budget for budget in options.get('budgets', []) if budget['selected']]
+            if selected_budgets:
+                budget_headers = [{
+                    'name': '',
+                    'forced_options': {
+                        'budget_base': True,
+                    }
+                }]
+
+                for budget in selected_budgets:
+                    # Add budget amount column
+                    budget_headers.append({
+                        'name': budget['name'],
+                        'forced_options': {
+                            'compute_budget': budget['id'],
+                        },
+                        'colspan': 1,
+                    })
+                    if len(self.column_ids.filtered(lambda column: column.figure_type == 'monetary')) == 1:
+                        # Add budget percentage column (only if one column in the report)
+                        budget_headers.append({
+                            'name': "%",
+                            'forced_options': {
+                                'budget_percentage': budget['id'],
+                            },
+                            'colspan': 1,
+                        })
+
+                column_headers.append(budget_headers)
+
+        options['column_headers'] = column_headers
+
+    ####################################################
+    # OPTIONS: COLUMNS
+    ####################################################
+    def _init_options_columns(self, options, previous_options):
+        default_group_vals = {'horizontal_groupby_element': {}, 'forced_options': {}}
+        all_column_group_vals_in_order = self._generate_columns_group_vals_recursively(options['column_headers'], default_group_vals)
+
+        columns, column_groups = self._build_columns_from_column_group_vals(options, all_column_group_vals_in_order)
+
+        options['columns'] = columns
+        options['column_groups'] = column_groups
+
+        # Debug column is only shown when there is a single column group, so that we can display all the subtotals of the line in a clear way
+        options['show_debug_column'] = options['export_mode'] != 'print' \
+                                       and self.env.user.has_group('base.group_no_one') \
+                                       and len(options['column_groups']) == 1 \
+                                       and len(self.line_ids) > 0 # No debug column on fully dynamic reports by default (they can customize this)
+
+        # Show an additional column summing all the horizontal groups if there is no comparison and only one level of horizontal group
+        options['show_horizontal_group_total'] = options.get('selected_horizontal_group_id') \
+                                                 and options.get('comparison', {}).get('filter') == 'no_comparison' \
+                                                 and len(self.column_ids) == 1 \
+                                                 and len(options['column_headers']) == 2
+
+    def _generate_columns_group_vals_recursively(self, next_levels_headers, previous_levels_group_vals):
+        if next_levels_headers:
+            rslt = []
+            for header_element in next_levels_headers[0]:
+                current_level_group_vals = {}
+                for key in previous_levels_group_vals:
+                    current_level_group_vals[key] = {**previous_levels_group_vals.get(key, {}), **header_element.get(key, {})}
+
+                rslt += self._generate_columns_group_vals_recursively(next_levels_headers[1:], current_level_group_vals)
+            return rslt
+        else:
+            return [previous_levels_group_vals]
+
+    def _build_columns_from_column_group_vals(self, options, all_column_group_vals_in_order):
+        def _generate_domain_from_horizontal_group_hash_key_tuple(group_hash_key):
+            domain = []
+            for field_name, field_value in group_hash_key:
+                domain.append((field_name, '=', field_value))
+            return domain
+
+        columns = []
+        column_groups = {}
+        for column_group_val in all_column_group_vals_in_order:
+            horizontal_group_key_tuple = self._get_dict_hashable_key_tuple(column_group_val['horizontal_groupby_element']) # Empty tuple if no grouping
+            column_group_key = str(self._get_dict_hashable_key_tuple(column_group_val)) # Unique identifier for the column group
+
+            column_groups[column_group_key] = {
+                'forced_options': column_group_val['forced_options'],
+                'forced_domain': _generate_domain_from_horizontal_group_hash_key_tuple(horizontal_group_key_tuple),
+            }
+
+            # for budget, only one column in needed, regardless of the number of columns in the report
+            if any(budget_key in column_group_val['forced_options'] for budget_key in ('compute_budget', 'budget_percentage')):
+                columns.append({
+                    'name': "",
+                    'column_group_key': column_group_key,
+                    'expression_label': 'balance',
+                    'sortable': False,
+                    'figure_type': 'monetary',
+                    'blank_if_zero': False,
+                    'style': "text-align: center; white-space: nowrap;",
+                })
+
+            else:
+                for report_column in self.column_ids:
+                    columns.append({
+                        'name': report_column.name,
+                        'column_group_key': column_group_key,
+                        'expression_label': report_column.expression_label,
+                        'sortable': report_column.sortable,
+                        'figure_type': report_column.figure_type,
+                        'blank_if_zero': report_column.blank_if_zero,
+                        'style': "text-align: center; white-space: nowrap;",
+                    })
+
+        return columns, column_groups
+
+    def _get_dict_hashable_key_tuple(self, dict_to_convert):
+        rslt = []
+        for key, value in sorted(dict_to_convert.items()):
+            if isinstance(value, dict):
+                value = self._get_dict_hashable_key_tuple(value)
+            rslt.append((key, value))
+        return tuple(rslt)
+
+    ####################################################
+    # OPTIONS: BUTTONS
+    ####################################################
+
+    def action_open_report_form(self, options, params):
+        return {
+            'type': 'ir.actions.act_window',
+            'res_model': 'account.report',
+            'view_mode': 'form',
+            'views': [(False, 'form')],
+            'res_id': self.id,
+        }
+
+    def _init_options_buttons(self, options, previous_options):
+        options['buttons'] = [
+            {'name': _('PDF'), 'sequence': 10, 'action': 'export_file', 'action_param': 'export_to_pdf', 'file_export_type': _('PDF'), 'branch_allowed': True, 'always_show': True},
+            {'name': _('XLSX'), 'sequence': 20, 'action': 'export_file', 'action_param': 'export_to_xlsx', 'file_export_type': _('XLSX'), 'branch_allowed': True, 'always_show': True},
+        ]
+
+    def open_account_report_file_download_error_wizard(self, errors, content):
+        self.ensure_one()
+
+        model = 'account.report.file.download.error.wizard'
+        vals = {'actionable_errors': errors}
+
+        if content:
+            vals['file_name'] = content['file_name']
+            vals['file_content'] = base64.b64encode(re.sub(r'\n\s*\n', '\n', content['file_content']).encode())
+
+        return {
+            'type': 'ir.actions.act_window',
+            'res_model': model,
+            'res_id': self.env[model].create(vals).id,
+            'target': 'new',
+            'views': [(False, 'form')],
+        }
+
+    def get_export_mime_type(self, file_type):
+        """ Returns the MIME type associated with a report export file type,
+        for attachment generation.
+        """
+        type_mapping = {
+            'xlsx': 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
+            'pdf': 'application/pdf',
+            'xml': 'application/xml',
+            'xaf': 'application/vnd.sun.xml.writer',
+            'txt': 'text/plain',
+            'csv': 'text/csv',
+            'zip': 'application/zip',
+        }
+        return type_mapping.get(file_type, False)
+
+    def _init_options_section_buttons(self, options, previous_options):
+        """ In case we're displaying a section, we want to replace its buttons by its source report's. This needs to be done last, after calling the
+        custom handler, to avoid its _custom_options_initializer function to generate additional buttons.
+        """
+        if options['sections_source_id'] != self.id:
+            # We need to re-call a full get_options in case a custom options initializer adds new buttons depending on other options.
+            # This way, we're sure we always get all buttons that are needed.
+            sections_source = self.env['account.report'].browse(options['sections_source_id'])
+            options['buttons'] = sections_source.get_options(previous_options={**options, 'no_report_reroute': True})['buttons']
+
+    ####################################################
+    # OPTIONS: VARIANTS
+    ####################################################
+    def _init_options_variants(self, options, previous_options):
+        allowed_variant_ids = set()
+
+        previous_section_source_id = previous_options.get('sections_source_id')
+        if previous_section_source_id:
+            previous_section_source = self.env['account.report'].browse(previous_section_source_id)
+            if self in previous_section_source.section_report_ids:
+                options['variants_source_id'] = (previous_section_source.root_report_id or previous_section_source).id
+                allowed_variant_ids.add(previous_section_source_id)
+
+        if 'variants_source_id' not in options:
+            options['variants_source_id'] = (self.root_report_id or self).id
+
+        available_variants = self.env['account.report']
+        options['has_inactive_variants'] = False
+        allowed_country_variant_ids = {}
+        all_variants = self._get_variants(options['variants_source_id'])
+        for variant in all_variants.filtered(lambda x: x._is_available_for(options)):
+            if not self.root_report_id and variant != self and variant.active: # Non-route reports don't reroute the variant when computing their options
+                allowed_variant_ids.add(variant.id)
+                if variant.country_id:
+                    allowed_country_variant_ids.setdefault(variant.country_id.id, []).append(variant.id)
+
+            if variant.active:
+                available_variants += variant
+            else:
+                options['has_inactive_variants'] = True
+
+        options['available_variants'] = [
+            {
+                'id': variant.id,
+                'name': variant.display_name,
+                'country_id': variant.country_id.id,  # To ease selection of default variant to open, without needing browsing again
+            }
+            for variant in sorted(available_variants, key=lambda x: (x.country_id and 1 or 0, x.sequence, x.id))
+        ]
+
+        previous_opt_report_id = previous_options.get('selected_variant_id')
+        if previous_opt_report_id in allowed_variant_ids or previous_opt_report_id == self.id:
+            options['selected_variant_id'] = previous_opt_report_id
+        elif allowed_country_variant_ids:
+            country_id = self.env.company.account_fiscal_country_id.id
+            report_id = (allowed_country_variant_ids.get(country_id) or next(iter(allowed_country_variant_ids.values())))[0]
+            options['selected_variant_id'] = report_id
+        else:
+            options['selected_variant_id'] = self.id
+
+    def _get_variants(self, report_id):
+        source_report = self.env['account.report'].browse(report_id)
+        if source_report.root_report_id:
+            # We need to get the root report in order to get all variants
+            source_report = source_report.root_report_id
+        return source_report + source_report.with_context(active_test=False).variant_report_ids
+
+    ####################################################
+    # OPTIONS: SECTIONS
+    ####################################################
+    def _init_options_sections(self, options, previous_options):
+        if options.get('selected_variant_id'):
+            options['sections_source_id'] = options['selected_variant_id']
+        else:
+            options['sections_source_id'] = self.id
+
+        source_report = self.env['account.report'].browse(options['sections_source_id'])
+
+        available_sections = source_report.section_report_ids if source_report.use_sections else self.env['account.report']
+        options['sections'] = [{'name': section.name, 'id': section.id} for section in available_sections]
+
+        if available_sections:
+            section_id = previous_options.get('selected_section_id')
+            if not section_id or section_id not in available_sections.ids:
+                section_id = available_sections[0].id
+
+            options['selected_section_id'] = section_id
+
+        options['has_inactive_sections'] = bool(self.env['account.report'].with_context(active_test=False).search_count([
+                ('section_main_report_ids', 'in', options['sections_source_id']),
+                ('active', '=', False)
+        ]))
+
+    ####################################################
+    # OPTIONS: REPORT_ID
+    ####################################################
+    def _init_options_report_id(self, options, previous_options):
+        if previous_options.get('no_report_reroute'):
+            # Used for exports
+            options['report_id'] = self.id
+        else:
+            options['report_id'] = options.get('selected_section_id') or options.get('selected_variant_id') or self.id
+
+    ####################################################
+    # OPTIONS: EXPORT MODE
+    ####################################################
+    def _init_options_export_mode(self, options, previous_options):
+        options['export_mode'] = previous_options.get('export_mode')
+
+    ####################################################
+    # OPTIONS: HORIZONTAL SPLIT
+    ####################################################
+    def _init_options_horizontal_split(self, options, previous_options):
+        if any(line.horizontal_split_side for line in self.line_ids):
+            options['horizontal_split'] = previous_options.get('horizontal_split', False)
+
+    ####################################################
+    # OPTIONS: CUSTOM
+    ####################################################
+    def _init_options_custom(self, options, previous_options):
+        custom_handler_model = self._get_custom_handler_model()
+        if custom_handler_model:
+            self.env[custom_handler_model]._custom_options_initializer(self, options, previous_options)
+
+    ####################################################
+    # OPTIONS: INTEGER ROUNDING
+    ####################################################
+    def _init_options_integer_rounding(self, options, previous_options):
+        if self.integer_rounding:
+            options['integer_rounding'] = self.integer_rounding
+            if options.get('export_mode') == 'file':
+                options['integer_rounding_enabled'] = True
+            else:
+                options['integer_rounding_enabled'] = previous_options.get('integer_rounding_enabled', True)
+            return options
+
+    ####################################################
+    # OPTIONS: BUDGETS
+    ####################################################
+    def _init_options_budgets(self, options, previous_options):
+        if self.filter_budgets:
+            previous_selection = {budget_option['id'] for budget_option in previous_options.get('budgets', []) if budget_option.get('selected')}
+
+            options['budgets'] = [
+                {
+                    'id': budget.id,
+                    'name': budget.name,
+                    'selected': budget.id in previous_selection,
+                    'company_id': budget.company_id.id,
+                }
+                for budget in self.env['account.report.budget'].search([('company_id', '=', self.env.company.id)])
+            ]
+            options['show_all_accounts'] = previous_options.get('show_all_accounts') or False
+
+    ####################################################
+    # OPTIONS: LOADING CALL
+    ####################################################
+    def _init_options_loading_call(self, options, previous_options):
+        """ Used by the js to know if it needs to reload the options (to not overwrite new options from the js) """
+        options['loading_call_number'] = previous_options.get('loading_call_number') or 0
+        return options
+
+    ####################################################
+    # OPTIONS: READONLY QUERY
+    ####################################################
+    def _init_options_readonly_query(self, options, previous_options):
+        options['readonly_query'] = (
+            options['currency_table']['type'] == 'monocurrency'
+            and not any(budget_opt['selected'] for budget_opt in options.get('budgets', []))
+        )
+
+    ####################################################
+    # OPTIONS: CORE
+    ####################################################
+
+    @api.readonly
+    def get_options(self, previous_options):
+        self.ensure_one()
+
+        initializers_in_sequence = self._get_options_initializers_in_sequence()
+
+        options = {}
+
+        if previous_options.get('_running_export_test'):
+            options['_running_export_test'] = True
+
+        # We need report_id to be initialized. Compute the necessary options to check for reroute.
+        for reroute_initializer_index, initializer in enumerate(initializers_in_sequence):
+            initializer(options, previous_options=previous_options)
+
+            # pylint: disable=W0143
+            if initializer == self._init_options_report_id:
+                break
+
+        # Stop the computation to check for reroute once we have computed the necessary information
+        if (not self.root_report_id or (self.use_sections and self.section_report_ids)) and options['report_id'] != self.id:
+            # Load the variant/section instead of the root report
+            variant_options = {**previous_options}
+            for reroute_opt_key in ('selected_variant_id', 'selected_section_id', 'variants_source_id', 'sections_source_id'):
+                opt_val = options.get(reroute_opt_key)
+                if opt_val:
+                    variant_options[reroute_opt_key] = opt_val
+
+            return self.env['account.report'].browse(options['report_id']).get_options(variant_options)
+
+        # No reroute; keep on and compute the other options
+        for initializer_index in range(reroute_initializer_index + 1, len(initializers_in_sequence)):
+            initializer = initializers_in_sequence[initializer_index]
+            initializer(options, previous_options=previous_options)
+
+        options_companies = self.env['res.company'].browse(self.get_report_company_ids(options))
+        # Set export buttons to 'branch_allowed' if the currently selected company branches all share the same VAT
+        # number and no unselected sub-branch of the active company has the same VAT number. Companies with an empty VAT
+        # field will be considered as having the same VAT number as their closest parent with a non-empty VAT.
+        if options.get('enable_export_buttons_for_common_vat_in_branches'):
+            report_accepted_company_ids = set(options_companies.ids)
+            same_vat_branch_ids = set(self.env.company._get_branches_with_same_vat().ids)
+            if report_accepted_company_ids == same_vat_branch_ids:
+                options['buttons'] = [{**button, 'branch_allowed': button.get('branch_allowed', True)} for button in options['buttons']]
+
+        # Disable buttons without branch_allowed = True if not all branches are selected
+        if not options_companies._all_branches_selected():
+            for button in filter(lambda x: not x.get('branch_allowed'), options['buttons']):
+                button['error_action'] = 'show_error_branch_allowed'
+
+        # Sort the buttons list by sequence, for rendering
+        options['buttons'] = sorted(options['buttons'], key=lambda x: x.get('sequence', 90))
+
+        # Sanitizing date_from and date_to since they need to be JSON-serializable when exporting the report
+        # on the server side, since the ORM converts them to strings automatically when sending them to the client.
+        for date_dict in (
+            [options.get('date', {})] +
+            [group_data['forced_options']['date'] for group_data in options['column_groups'].values() if group_data.get('forced_options', {}).get('date')]
+        ):
+            if (date_from := date_dict.get('date_from')) and not isinstance(date_from, str):
+                date_dict['date_from'] = fields.Date.to_string(date_from)
+
+            if (date_to := date_dict.get('date_to')) and not isinstance(date_to, str):
+                date_dict['date_to'] = fields.Date.to_string(date_to)
+
+        return options
+
+    def _get_options_initializers_in_sequence(self):
+        """ Gets all filters in the right order to initialize them, so that each filter is
+        guaranteed to be after all of its dependencies in the resulting list.
+
+        :return: a list of initializer functions, each accepting two parameters:
+            - options (mandatory): The options dictionary to be modified by this initializer to include its related option's data
+
+            - previous_options (optional, defaults to None): A dict with default options values, coming from a previous call to the report.
+                                                             These values can be considered or ignored on a case-by-case basis by the initializer,
+                                                             depending on functional needs.
+        """
+        initializer_prefix = '_init_options_'
+        initializers = [
+            getattr(self, attr) for attr in dir(self)
+            if attr.startswith(initializer_prefix)
+        ]
+
+        # Order them in a dependency-compliant way
+        forced_sequence_map = self._get_options_initializers_forced_sequence_map()
+        initializers.sort(key=lambda x: forced_sequence_map.get(x, forced_sequence_map.get('default')))
+
+        return initializers
+
+    def _get_options_initializers_forced_sequence_map(self):
+        """ By default, not specific order is ensured for the filters when calling _get_options_initializers_in_sequence.
+        This function allows giving them a sequence number. It can be overridden
+        to make filters depend on each other.
+
+        :return: dict(str, int): str is the filter name, int is its sequence (lowest = first).
+                                 Multiple filters may share the same sequence, their relative order is then not guaranteed.
+        """
+        return {
+            self._init_options_companies: 10,
+            self._init_options_variants: 15,
+            self._init_options_sections: 16,
+            self._init_options_report_id: 17,
+            self._init_options_fiscal_position: 20,
+            self._init_options_date: 30,
+            self._init_options_horizontal_groups: 40,
+            self._init_options_comparison: 50,
+            self._init_options_export_mode: 60,
+            self._init_options_integer_rounding: 70,
+            self._init_options_journals: 80,
+            self._init_options_journals_names: 90,
+
+            'default': 200,
+
+            self._init_options_column_headers: 990,
+            self._init_options_columns: 1000,
+            self._init_options_column_percent_comparison: 1010,
+            self._init_options_order_column: 1020,
+            self._init_options_hierarchy: 1030,
+            self._init_options_prefix_groups_threshold: 1040,
+            self._init_options_custom: 1050,
+            self._init_options_currency_table: 1055,
+            self._init_options_section_buttons: 1060,
+            self._init_options_readonly_query: 1070,
+        }
+
+    def _get_options_domain(self, options, date_scope):
+        self.ensure_one()
+
+        available_scopes = dict(self.env['account.report.expression']._fields['date_scope'].selection)
+        if date_scope and date_scope not in available_scopes: # date_scope can be passed to None explicitly to ignore the dates
+            raise UserError(_("Unknown date scope: %s", date_scope))
+
+        domain = [
+            ('display_type', 'not in', ('line_section', 'line_note')),
+            ('company_id', 'in', self.get_report_company_ids(options)),
+        ]
+        if not options.get('compute_budget'):
+            domain += self._get_options_journals_domain(options)
+        if date_scope:
+            domain += self._get_options_date_domain(options, date_scope)
+        domain += self._get_options_partner_domain(options)
+        domain += self._get_options_all_entries_domain(options)
+        domain += self._get_options_unreconciled_domain(options)
+        domain += self._get_options_fiscal_position_domain(options)
+        domain += self._get_options_account_type_domain(options)
+        domain += self._get_options_aml_ir_filters(options)
+
+        if self.only_tax_exigible:
+            domain += self.env['account.move.line']._get_tax_exigible_domain()
+
+        if options.get('forced_domain'):
+            # That option key is set when splitting options between column groups
+            domain += options['forced_domain']
+
+        return domain
+
+    ####################################################
+    # QUERIES
+    ####################################################
+
+    def _get_report_query(self, options, date_scope, domain=None) -> Query:
+        """ Get a Query object that references the records needed for this report. """
+        domain = self._get_options_domain(options, date_scope) + (domain or [])
+
+        self.env['account.move.line'].check_access('read')
+
+        query = self.env['account.move.line']._where_calc(domain)
+
+        if options.get('compute_budget'):
+            self._create_report_budget_temp_table(options)
+            query._tables['account_move_line'] = SQL.identifier('account_report_budget_temp_aml')
+            query.add_where(SQL(
+                "%s AND budget_id = %s",
+                query.where_clause,
+                options['compute_budget'],
+            ))
+
+        # Wrap the query with 'company_id IN (...)' to avoid bypassing company access rights.
+        self.env['account.move.line']._apply_ir_rules(query)
+
+        return query
+
+    def _create_report_budget_temp_table(self, options):
+        self._cr.execute("SELECT 1 FROM information_schema.tables WHERE table_name='account_report_budget_temp_aml'")
+        if self._cr.fetchone():
+            return
+
+        stored_aml_fields, fields_to_insert = self.env['account.move.line']._prepare_aml_shadowing_for_report({
+            'id': SQL.identifier("id"),
+            'balance': SQL.identifier('amount'),
+            'company_id': self.env.company.id,
+            'parent_state': 'posted',
+            'date': SQL.identifier('date'),
+            'account_id': SQL.identifier("account_id"),
+            'debit': SQL("CASE WHEN (amount > 0) THEN amount else 0 END"),
+            'credit': SQL("CASE WHEN (amount < 0) THEN -amount else 0 END"),
+        })
+
+        self._cr.execute(SQL(
+            """
+                -- Create a temporary table, dropping not null constraints because we're not filling those columns
+                CREATE TEMPORARY TABLE IF NOT EXISTS account_report_budget_temp_aml () inherits (account_move_line) ON COMMIT DROP;
+                ALTER TABLE account_report_budget_temp_aml NO INHERIT account_move_line;
+                ALTER TABLE account_report_budget_temp_aml ALTER COLUMN move_id DROP NOT NULL;
+                ALTER TABLE account_report_budget_temp_aml ALTER COLUMN currency_id DROP NOT NULL;
+                ALTER TABLE account_report_budget_temp_aml ALTER COLUMN journal_id DROP NOT NULL;
+                ALTER TABLE account_report_budget_temp_aml ALTER COLUMN display_type DROP NOT NULL;
+                ALTER TABLE account_report_budget_temp_aml ADD budget_id INTEGER NOT NULL;
+
+                INSERT INTO account_report_budget_temp_aml (%(stored_aml_fields)s, budget_id)
+                SELECT %(fields_to_insert)s, budget_id
+                FROM account_report_budget_item
+                WHERE budget_id IN %(available_budget_ids)s;
+
+                -- Create a supporting index to avoid seq.scans
+                CREATE INDEX IF NOT EXISTS account_report_budget_temp_aml__composite_idx ON account_report_budget_temp_aml (account_id, journal_id, date, company_id);
+                -- Update statistics for correct planning
+                ANALYZE account_report_budget_temp_aml
+            """,
+            stored_aml_fields=stored_aml_fields,
+            fields_to_insert=fields_to_insert,
+            available_budget_ids=tuple(budget_option['id'] for budget_option in options['budgets']),
+        ))
+
+        if options.get('show_all_accounts'):
+            stored_aml_fields, fields_to_insert = self.env['account.move.line']._prepare_aml_shadowing_for_report({
+                # Using nextval will consume a sequence number, we decide to do it to avoid comparing apples and oranges
+                'id': SQL("(SELECT nextval('account_report_budget_item_id_seq'))"),
+                'balance': SQL("0"),
+                'company_id': self.env.company.id,
+                'parent_state': 'posted',
+                'date': SQL("%s", options['date']['date_from']),
+                'account_id': SQL.identifier("accounts", "id"),
+                'debit': SQL("0"),
+                'credit': SQL("0"),
+            })
+            accounts_subquery = self.env['account.account']._where_calc([
+                ('company_ids', 'in', self.get_report_company_ids(options)),
+                ('internal_group', 'in', ['income', 'expense']),
+            ])
+            self._cr.execute(SQL(
+                """
+                -- Insert dynamic combinations of account_id and budget_id into the temporary table
+                INSERT INTO account_report_budget_temp_aml (%(stored_aml_fields)s, budget_id)
+                     SELECT %(fields_to_insert)s, budgets.id AS budget_id
+                       FROM (%(accounts_subquery)s) AS accounts
+                 CROSS JOIN (
+                                SELECT id
+                                  FROM account_report_budget
+                                 WHERE id IN %(available_budget_ids)s
+                            ) AS budgets
+                """,
+                stored_aml_fields=stored_aml_fields,
+                fields_to_insert=fields_to_insert,
+                accounts_subquery=accounts_subquery.select(),
+                available_budget_ids=tuple(budget_option['id'] for budget_option in options['budgets']),
+                income='income%',
+                expense='expense%',
+                company_ids=tuple(),
+            ))
+
+    ####################################################
+    # LINE IDS MANAGEMENT HELPERS
+    ####################################################
+    def _get_generic_line_id(self, model_name, value, markup=None, parent_line_id=None):
+        """ Generates a generic line id from the provided parameters.
+
+        Such a generic id consists of a string repeating 1 to n times the following pattern:
+        markup-model-value, each occurence separated by a LINE_ID_HIERARCHY_DELIMITER character from the previous one.
+
+        Each pattern corresponds to a level of hierarchy in the report, so that
+        the n-1 patterns starting the id of a line actually form the id of its generator line.
+        EX: a~b~c|d~e~f|g~h~i => This line is a subline generated by a~b~c|d~e~f where | is the LINE_ID_HIERARCHY_DELIMITER.
+
+        Each pattern consists of the three following elements:
+        - markup:  a (possibly empty) free string or json-formatted dict allowing finer identification of the line
+                   (like the name of the field for account.accounting.reports)
+
+        - model:   the model this line has been generated for, or an empty string if there is none
+
+        - value:   the groupby value for this line (typically the id of a record
+                   or the value of a field), or an empty string if there isn't any.
+        """
+        self.ensure_one()
+
+        if parent_line_id:
+            parent_id_list = self._parse_line_id(parent_line_id, markup_as_string=True)
+        else:
+            parent_id_list = [(None, 'account.report', self.id)]
+
+        # In case the markup is a dict, it must be converted to a string, but in a way such that the keys are ordered alphabetically.
+        # This is useful, notably for annotations where the ids of the lines are stored, therefore requiring a consistent ordering
+        if isinstance(markup, dict):
+            markup = json.dumps(markup, sort_keys=True)
+
+        new_line = self._build_line_id(parent_id_list + [(markup, model_name, value)])
+        return new_line
+
+    @api.model
+    def _get_line_from_xml_id(self, lines, xml_id):
+        """ Helper function to get a specific account report line from the xmlid """
+        report_line = self.env.ref(xml_id, raise_if_not_found=False)
+        return next(
+            line for line in lines
+            if self._get_model_info_from_id(line['id']) == ('account.report.line', report_line.id)
+        )
+
+    @api.model
+    def _get_model_info_from_id(self, line_id):
+        """ Parse the provided generic report line id.
+
+        :param line_id: the report line id (i.e. markup~model~value|markup2~model2~value2 where | is the LINE_ID_HIERARCHY_DELIMITER)
+        :return: tuple(model, id) of the report line. Each of those values can be None if the id contains no information about them.
+        """
+        last_id_tuple = self._parse_line_id(line_id)[-1]
+        return last_id_tuple[-2:]
+
+    @api.model
+    def _build_line_id(self, current):
+        """ Build a generic line id string from its list representation, converting
+        the None values for model and value to empty strings.
+        :param current (list<tuple>): list of tuple(markup, model, value)
+        """
+        def convert_none(x):
+            return x if x is not None and x is not False else ''
+        return LINE_ID_HIERARCHY_DELIMITER.join(f'{convert_none(markup)}~{convert_none(model)}~{convert_none(value)}' for markup, model, value in current)
+
+    @api.model
+    def _build_parent_line_id(self, current):
+        """Build the parent_line id based on the current position in the report.
+
+        For instance, if current is [('markup1', 'account.account', 5), ('markup2', 'res.partner', 8)], it will return
+        markup1~account.account~5
+        :param current (list<tuple>): list of tuple(markup, model, value)
+        """
+        to_process = [(json.dumps(markup) if isinstance(markup, dict) else markup, model, value) for markup, model, value in current[:-1]]
+        return self._build_line_id(to_process)
+
+    @api.model
+    def _parse_markup(self, markup):
+        if not markup:
+            return markup
+        try:
+            result = json.loads(markup)
+        except json.JSONDecodeError:  # the markup is not a JSON object
+            return markup
+        if isinstance(result, dict):
+            return result
+
+        return markup
+
+    @api.model
+    def _parse_line_id(self, line_id, markup_as_string=False):
+        """Parse the provided string line id and convert it to its list representation.
+        Empty strings for model and value will be converted to None.
+
+        For instance if line_id is markup1~account.account~5|markup2~res.partner~8 (where | is the LINE_ID_HIERARCHY_DELIMITER),
+        it will return [('markup1', 'account.account', 5), ('markup2', 'res.partner', 8)]
+        :param line_id (str): the generic line id to parse
+        """
+        return line_id and [
+            # When there is a model, value is an id, so we cast it to and int. Else, we keep the original value (for groupby lines on
+            # non-relational fields, for example).
+            (self._parse_markup(markup) if not markup_as_string else markup, model or None, int(value) if model and value else (value or None))
+            for markup, model, value in (key.rsplit('~', 2) for key in line_id.split(LINE_ID_HIERARCHY_DELIMITER))
+        ] or []
+
+    @api.model
+    def _get_unfolded_lines(self, lines, parent_line_id):
+        """ Return a list of all children lines for specified parent_line_id.
+        NB: It will return the parent_line itself!
+
+        For instance if parent_line_ids is '~account.report.line~84|{"groupby": "currency_id"}~res.currency~174'
+        (where | is the LINE_ID_HIERARCHY_DELIMITER), it will return every subline for this currency.
+        :param lines: list of report lines
+        :param parent_line_id: id of a specified line
+        :return: A list of all children lines for a specified parent_line_id
+        """
+        return [
+            line for line in lines
+            if line['id'].startswith(parent_line_id)
+        ]
+
+    @api.model
+    def _get_res_id_from_line_id(self, line_id, target_model_name):
+        """ Parses the provided generic line id and returns the most local (i.e. the furthest on the right) record id it contains which
+        corresponds to the provided model name. If line_id does not contain anything related to target_model_name, None will be returned.
+
+        For example, parsing ~account.move~1|~res.partner~2|~account.move~3 (where | is the LINE_ID_HIERARCHY_DELIMITER)
+        with target_model_name='account.move' will return 3.
+        """
+        dict_result = self._get_res_ids_from_line_id(line_id, [target_model_name])
+        return dict_result[target_model_name] if dict_result else None
+
+
+    @api.model
+    def _get_res_ids_from_line_id(self, line_id, target_model_names):
+        """ Parses the provided generic line id and returns the most local (i.e. the furthest on the right) record ids it contains which
+        correspond to the provided model names, in the form {model_name: res_id}. If a model is not present in line_id, its model will be absent
+        from the resulting dict.
+
+        For example, parsing ~account.move~1|~res.partner~2|~account.move~3 with target_model_names=['account.move', 'res.partner'] will return
+        {'account.move': 3, 'res.partner': 2}.
+        """
+        result = {}
+        models_to_find = set(target_model_names)
+        for dummy, model, value in reversed(self._parse_line_id(line_id)):
+            if model in models_to_find:
+                result[model] = value
+                models_to_find.remove(model)
+
+        return result
+
+    @api.model
+    def _get_markup(self, line_id):
+        """ Directly returns the markup associated with the provided line_id.
+        """
+        return self._parse_line_id(line_id)[-1][0] if line_id else None
+
+    def _build_subline_id(self, parent_line_id, subline_id_postfix):
+        """ Creates a new subline id by concatanating parent_line_id with the provided id postfix.
+        """
+        return f"{parent_line_id}{LINE_ID_HIERARCHY_DELIMITER}{subline_id_postfix}"
+
+    ####################################################
+    # CARET OPTIONS MANAGEMENT
+    ####################################################
+
+    def _get_caret_options(self):
+        return {
+            **self._caret_options_initializer_default(),
+            **(self.env[self.custom_handler_model_name]._caret_options_initializer() if self.custom_handler_model_id else {}),
+        }
+
+    def _caret_options_initializer_default(self):
+        return {
+            'account.account': [
+                {'name': _("General Ledger"), 'action': 'caret_option_open_general_ledger'},
+            ],
+
+            'account.move': [
+                {'name': _("View Journal Entry"), 'action': 'caret_option_open_record_form'},
+            ],
+
+            'account.move.line': [
+                {'name': _("View Journal Entry"), 'action': 'caret_option_open_record_form', 'action_param': 'move_id'},
+            ],
+
+            'account.payment': [
+                {'name': _("View Payment"), 'action': 'caret_option_open_record_form', 'action_param': 'payment_id'},
+            ],
+
+            'account.bank.statement': [
+                {'name': _("View Bank Statement"), 'action': 'caret_option_open_statement_line_reco_widget'},
+            ],
+
+            'res.partner': [
+                {'name': _("View Partner"), 'action': 'caret_option_open_record_form'},
+            ],
+        }
+
+    def caret_option_open_record_form(self, options, params):
+        model, record_id = self._get_model_info_from_id(params['line_id'])
+        record = self.env[model].browse(record_id)
+        target_record = record[params['action_param']] if 'action_param' in params else record
+
+        view_id = self._resolve_caret_option_view(target_record)
+
+        action = {
+            'type': 'ir.actions.act_window',
+            'view_mode': 'form',
+            'views': [(view_id, 'form')], # view_id will be False in case the default view is needed
+            'res_model': target_record._name,
+            'res_id': target_record.id,
+            'context': self._context,
+        }
+
+        if view_id is not None:
+            action['view_id'] = view_id
+
+        return action
+
+    def _get_caret_option_view_map(self):
+        return {
+            'account.payment': 'account.view_account_payment_form',
+            'res.partner': 'base.view_partner_form',
+            'account.move': 'account.view_move_form',
+        }
+
+    def _resolve_caret_option_view(self, target):
+        '''Retrieve the target view of the caret option.
+
+        :param target:  The target record of the redirection.
+        :return: The id of the target view.
+        '''
+        view_map = self._get_caret_option_view_map()
+
+        view_xmlid = view_map.get(target._name)
+        if not view_xmlid:
+            return None
+
+        return self.env['ir.model.data']._xmlid_lookup(view_xmlid)[1]
+
+    def caret_option_open_general_ledger(self, options, params):
+        # When coming from a specific account, the unfold must only be retained
+        # on the specified account. Better performance and more ergonomic
+        # as it opens what client asked. And "Unfold All" is 1 clic away.
+        options["unfold_all"] = False
+
+        records_to_unfold = []
+        for _dummy, model, record_id in self._parse_line_id(params['line_id']):
+            if model in ('account.group', 'account.account'):
+                records_to_unfold.append((model, record_id))
+
+        if not records_to_unfold or records_to_unfold[-1][0] != 'account.account':
+            raise UserError(_("'Open General Ledger' caret option is only available form report lines targetting accounts."))
+
+        general_ledger = self.env.ref('odex30_account_reports.general_ledger_report')
+        lines_to_unfold = []
+        for model, record_id in records_to_unfold:
+            parent_line_id = lines_to_unfold[-1] if lines_to_unfold else None
+            # Re-create the hierarchy of account groups that should be unfolded in GL
+            generic_line_id = general_ledger._get_generic_line_id(model, record_id, parent_line_id=parent_line_id)
+            lines_to_unfold.append(generic_line_id)
+
+        options['not_reset_journals_filter'] = True  # prevents resetting the default journal group
+        gl_options = general_ledger.get_options(options)
+        gl_options['not_reset_journals_filter'] = True  # prevents resetting the default journal group
+        gl_options['unfolded_lines'] = lines_to_unfold
+
+        account_id = self.env['account.account'].browse(records_to_unfold[-1][1])
+        action_vals = self.env['ir.actions.actions']._for_xml_id('odex30_account_reports.action_account_report_general_ledger')
+        action_vals['params'] = {
+            'options': gl_options,
+            'ignore_session': True,
+        }
+        action_vals['context'] = dict(ast.literal_eval(action_vals['context']), default_filter_accounts=account_id.code)
+
+        return action_vals
+
+    def caret_option_open_statement_line_reco_widget(self, options, params):
+        model, record_id = self._get_model_info_from_id(params['line_id'])
+        record = self.env[model].browse(record_id)
+        if record._name == 'account.bank.statement.line':
+            return record.action_open_recon_st_line()
+        elif record._name == 'account.bank.statement':
+            return record.action_open_bank_reconcile_widget()
+        raise UserError(_("'View Bank Statement' caret option is only available for report lines targeting bank statements."))
+
+    ####################################################
+    # MISC
+    ####################################################
+
+    def _get_custom_handler_model(self):
+        """ Check whether the current report has a custom handler and if it does, return its name.
+            Otherwise, try to fall back on the root report.
+        """
+        return self.custom_handler_model_name or self.root_report_id.custom_handler_model_name or None
+
+    def dispatch_report_action(self, options, action, action_param=None, on_sections_source=False):
+        """ Dispatches calls made by the client to either the report itself, or its custom handler if it exists.
+            The action should be a public method, by definition, but a check is made to make sure
+            it is not trying to call a private method.
+        """
+        self.ensure_one()
+
+        if on_sections_source:
+            report_to_call = self.env['account.report'].browse(options['sections_source_id'])
+            options["report_id"] = report_to_call.id
+            return report_to_call.dispatch_report_action(options, action, action_param=action_param, on_sections_source=False)
+
+        if self.id not in (options['report_id'], options.get('sections_source_id')):
+            raise UserError(_("Trying to dispatch an action on a report not compatible with the provided options."))
+
+        args = [options, action_param] if action_param is not None else [options]
+        model = self
+        custom_handler_model = self._get_custom_handler_model()
+        if custom_handler_model and hasattr(self.env[custom_handler_model], action):
+            model = self.env[custom_handler_model]
+        report_method = get_public_method(model, action)
+        return report_method(model, *args)
+
+    def _get_custom_report_function(self, function_name, prefix):
+        """ Returns a report function from its name, first checking it to ensure it's private (and raising if it isn't).
+            This helper is used by custom report fields containing function names.
+            The function will be called on the report's custom handler if it exists, or on the report itself otherwise.
+        """
+        self.ensure_one()
+        function_name_prefix = f'_report_{prefix}_'
+        if not function_name.startswith(function_name_prefix):
+            raise UserError(_("Method '%(method_name)s' must start with the '%(prefix)s' prefix.", method_name=function_name, prefix=function_name_prefix))
+
+        if self.custom_handler_model_id:
+            handler = self.env[self.custom_handler_model_name]
+            if hasattr(handler, function_name):
+                return getattr(handler, function_name)
+
+        if not hasattr(self, function_name):
+            raise UserError(_("Invalid method “%s”", function_name))
+        # Call the check method without the private prefix to check for others security risks.
+        return getattr(self, function_name)
+
+    def _get_lines(self, options, all_column_groups_expression_totals=None, warnings=None):
+        self.ensure_one()
+
+        if options['report_id'] != self.id:
+            # Should never happen; just there to prevent BIG issues and directly spot them
+            raise UserError(_("Inconsistent report_id in options dictionary. Options says %(options_report)s; report is %(report)s.", options_report=options['report_id'], report=self.id))
+
+        # Necessary to ensure consistency of the data if some of them haven't been written in database yet
+        self.env.flush_all()
+
+        if warnings is not None:
+            self._generate_common_warnings(options, warnings)
+
+        # Merge static and dynamic lines in a common list
+        if all_column_groups_expression_totals is None:
+            self._init_currency_table(options)
+            all_column_groups_expression_totals = self._compute_expression_totals_for_each_column_group(
+                self.line_ids.expression_ids,
+                options,
+                warnings=warnings,
+            )
+
+        dynamic_lines = self._get_dynamic_lines(options, all_column_groups_expression_totals, warnings=warnings)
+
+        lines = []
+        line_cache = {} # {report_line: report line dict}
+        hide_if_zero_lines = self.env['account.report.line']
+
+        # There are two types of lines:
+        # - static lines: the ones generated from self.line_ids
+        # - dynamic lines: the ones generated from a call to the functions referred to by self.dynamic_lines_generator
+        # This loops combines both types of lines together within the lines list
+        for line in self.line_ids: # _order ensures the sequence of the lines
+            # Inject all the dynamic lines whose sequence is inferior to the next static line to add
+            while dynamic_lines and line.sequence > dynamic_lines[0][0]:
+                lines.append(dynamic_lines.pop(0)[1])
+
+            parent_generic_id = None
+
+            if line.parent_id:
+                # Normally, the parent line has necessarily been treated in a previous iteration
+                try:
+                    parent_generic_id = line_cache[line.parent_id]['id']
+                except KeyError as e:
+                    raise UserError(_(
+                        "Line '%(child)s' is configured to appear before its parent '%(parent)s'. This is not allowed.",
+                        child=line.name, parent=e.args[0].name
+                    ))
+
+            line_dict = self._get_static_line_dict(options, line, all_column_groups_expression_totals, parent_id=parent_generic_id)
+            line_cache[line] = line_dict
+
+            if line.hide_if_zero:
+                hide_if_zero_lines += line
+
+            lines.append(line_dict)
+
+        for dummy, left_dynamic_line in dynamic_lines:
+            lines.append(left_dynamic_line)
+
+        # Manage growth comparison
+        if options.get('column_percent_comparison') == 'growth':
+            for line in lines:
+                first_value, second_value = line['columns'][0]['no_format'], line['columns'][1]['no_format']
+
+                green_on_positive = True
+                model, line_id = self._get_model_info_from_id(line['id'])
+
+                if model == 'account.report.line' and line_id:
+                    report_line = self.env['account.report.line'].browse(line_id)
+                    compared_expression = report_line.expression_ids.filtered(
+                        lambda expr: expr.label == line['columns'][0]['expression_label']
+                    )
+                    green_on_positive = compared_expression.green_on_positive
+
+                line['column_percent_comparison_data'] = self._compute_column_percent_comparison_data(
+                    options, first_value, second_value, green_on_positive=green_on_positive
+                )
+        # Manage budget comparison
+        elif options.get('column_percent_comparison') == 'budget':
+            for line in lines:
+                self._set_budget_column_comparisons(options, line)
+
+        # Manage hide_if_zero lines:
+        # - If they have column values: hide them if all those values are 0 (or empty)
+        # - If they don't: hide them if all their children's column values are 0 (or empty)
+        # Also, hide all the children of a hidden line.
+        hidden_lines_dict_ids = set()
+        for line in hide_if_zero_lines:
+            children_to_check = line
+            current = line
+            while current:
+                children_to_check |= current
+                current = current.children_ids
+
+            all_children_zero = True
+            hide_candidates = set()
+            for child in children_to_check:
+                child_line_dict_id = line_cache[child]['id']
+
+                if child_line_dict_id in hidden_lines_dict_ids:
+                    continue
+                elif all(col.get('is_zero', True) for col in line_cache[child]['columns']):
+                    hide_candidates.add(child_line_dict_id)
+                else:
+                    all_children_zero = False
+                    break
+
+            if all_children_zero:
+                hidden_lines_dict_ids |= hide_candidates
+
+        lines[:] = filter(lambda x: x['id'] not in hidden_lines_dict_ids and x.get('parent_id') not in hidden_lines_dict_ids, lines)
+
+        # Create the hierarchy of lines if necessary
+        if options.get('hierarchy'):
+            lines = self._create_hierarchy(lines, options)
+
+        # Handle totals below sections for static lines
+        lines = self._add_totals_below_sections(lines, options)
+
+        # Unfold lines (static or dynamic) if necessary and add totals below section to dynamic lines
+        lines = self._fully_unfold_lines_if_needed(lines, options)
+
+        self._inject_account_names_for_consolidation(lines)
+
+        if self.custom_handler_model_id:
+            lines = self.env[self.custom_handler_model_name]._custom_line_postprocessor(self, options, lines)
+
+        if warnings is not None:
+            custom_handler_name = self.custom_handler_model_name or self.root_report_id.custom_handler_model_name
+            if custom_handler_name:
+                self.env[custom_handler_name]._customize_warnings(self, options, all_column_groups_expression_totals, warnings)
+
+        # Format values in columns of lines that will be displayed
+        self._format_column_values(options, lines)
+
+        if options.get('export_mode') == 'print' and options.get('hide_0_lines'):
+            lines = self._filter_out_0_lines(lines)
+
+        return lines
+
+    # Deprecated, removed in master.
+    @api.model
+    def format_column_values(self, options, lines):
+        self._format_column_values(options, lines, force_format=True)
+
+        return lines
+
+    def format_column_values_from_client(self, options, lines):
+        """ Format column values for display. Called via dispatch_report_action when rounding unit changes on client side."""
+        self._format_column_values(options, lines, force_format=True)
+
+        return lines
+
+    def _format_column_values(self, options, line_dict_list, force_format=False):
+        for line_dict in line_dict_list:
+            for column_dict in line_dict['columns']:
+                if 'name' in column_dict and not force_format:
+                    # Columns which have already received a name are assumed to be already formatted; nothing needs to be done for them.
+                    # This gives additional flexibility to custom reports, if needed.
+                    continue
+
+                if not column_dict:
+                    continue
+                elif column_dict.get('is_zero') and column_dict.get('blank_if_zero'):
+                    rslt = ''
+                elif options.get('export_mode') == 'file':
+                    rslt = column_dict.get('no_format', '')
+                else:
+                    rslt = self.format_value(
+                        options,
+                        column_dict.get('no_format'),
+                        column_dict.get('figure_type'),
+                        format_params=column_dict.get('format_params'),
+                    )
+
+                column_dict['name'] = rslt
+
+            # Handle the total in case of an horizontal group when there is no comparison and only one level of horizontal group
+            if options.get('show_horizontal_group_total'):
+                # In case the line has no formula
+                if all(column['no_format'] is None for column in line_dict['columns']):
+                    continue
+                # In case total below section, some line don't have the value displayed
+                if self.env.company.totals_below_sections and not options.get('ignore_totals_below_sections') and line_dict['unfolded']:
+                    continue
+
+                figure_type_is_valid = all(column['figure_type'] in {'float', 'integer', 'monetary'} for column in line_dict['columns'])
+                total_value = sum(column["no_format"] for column in line_dict['columns']) if figure_type_is_valid else None
+                line_dict['horizontal_group_total_data'] = {
+                    'name': self.format_value(
+                        options,
+                        total_value,
+                        line_dict['columns'][0]['figure_type'],
+                        format_params=line_dict['columns'][0]['format_params'],
+                    ),
+                    'no_format': total_value,
+                }
+
+    def _generate_common_warnings(self, options, warnings):
+        # Display a warning if we're displaying only the data of the current company, but it's also part of a tax unit
+        if options.get('available_tax_units') and options['tax_unit'] == 'company_only':
+            warnings['odex30_account_reports.common_warning_tax_unit'] = {}
+
+        report_company_ids = self.get_report_company_ids(options)
+        # The _accessible_branches function will return the accessible branches from the ones that are already selected,
+        # and the report_company_ids function will return the current company and its branches (that are selected) with the same VAT
+        # or tax unit. Therefore, we will display the warning only when the selected companies do not have the same VAT
+        # and in the context of branches.
+        if self.filter_multi_company == 'tax_units' and any(accessible_branch.id not in report_company_ids for accessible_branch in self.env.company._accessible_branches()):
+            warnings['odex30_account_reports.tax_report_warning_tax_id_selected_companies'] = {'alert_type': 'warning'}
+
+        # Check whether there are unposted entries for the selected period and partner or not (if the report allows it)
+        if options.get('date') and options.get('all_entries') is not None:
+            domain = osv.expression.AND([
+                self.env['account.move']._check_company_domain(report_company_ids),
+                [('state', '=', 'draft')],
+                [('date', '<=', options['date']['date_to'])],
+            ])
+            if options.get('partner_ids'):
+                domain = osv.expression.AND([
+                    domain,
+                    osv.expression.OR([
+                        [('partner_id', 'in', options['partner_ids'])],
+                        [('partner_shipping_id', 'in', options['partner_ids'])],
+                        [('commercial_partner_id', 'in', options['partner_ids'])],
+                    ])
+                ])
+            if self.env['account.move'].search_count(domain, limit=1):
+                warnings['odex30_account_reports.common_warning_draft_in_period'] = {}
+
+    def _fully_unfold_lines_if_needed(self, lines, options):
+        def line_need_expansion(line_dict):
+            return line_dict.get('unfolded') and line_dict.get('expand_function')
+
+        custom_unfold_all_batch_data = None
+
+        # If it's possible to batch unfold and we're unfolding all lines, compute the batch, so that individual expansions are more efficient
+        if options['unfold_all'] and self.custom_handler_model_id:
+            lines_to_expand_by_function = {}
+            for line_dict in lines:
+                if line_need_expansion(line_dict):
+                    lines_to_expand_by_function.setdefault(line_dict['expand_function'], []).append(line_dict)
+
+            custom_unfold_all_batch_data = self.env[self.custom_handler_model_name]._custom_unfold_all_batch_data_generator(self, options, lines_to_expand_by_function)
+
+        i = 0
+        while i < len(lines):
+            # We iterate in such a way that if the lines added by an expansion need expansion, they will get it as well
+            line_dict = lines[i]
+            if line_need_expansion(line_dict):
+                groupby = line_dict.get('groupby')
+                progress = line_dict.get('progress')
+                to_insert = self._expand_unfoldable_line(
+                    line_dict['expand_function'], line_dict['id'], groupby, options, progress, 0, line_dict.get('horizontal_split_side'),
+                    unfold_all_batch_data=custom_unfold_all_batch_data,
+                )
+                lines = lines[:i+1] + to_insert + lines[i+1:]
+            i += 1
+
+        return lines
+
+    def _generate_total_below_section_line(self, section_line_dict):
+        return {
+            **section_line_dict,
+            'id': self._get_generic_line_id(None, None, parent_line_id=section_line_dict['id'], markup='total'),
+            'level': section_line_dict['level'] if section_line_dict['level'] != 0 else 1, # Total line should not be level 0
+            'name': _("Total %s", section_line_dict['name']),
+            'parent_id': section_line_dict['id'],
+            'unfoldable': False,
+            'unfolded': False,
+            'caret_options': None,
+            'action_id': None,
+            'page_break': False, # If the section's line possesses a page break, we don't want the total to have it.
+        }
+
+    def _get_static_line_dict(self, options, line, all_column_groups_expression_totals, parent_id=None):
+        line_id = self._get_generic_line_id('account.report.line', line.id, parent_line_id=parent_id)
+        columns = self._build_static_line_columns(line, options, all_column_groups_expression_totals)
+        groupby = line._get_groupby(options)
+        has_children = (groupby and any(col['has_sublines'] for col in columns)) or bool(line.children_ids)
+
+        rslt = {
+            'id': line_id,
+            'name': line.name,
+            'groupby': groupby,
+            'unfoldable': line.foldable and has_children,
+            'unfolded': (not line.foldable and (groupby or has_children)) or line_id in options['unfolded_lines'] or has_children and options['unfold_all'],
+            'columns': columns,
+            'level': line.hierarchy_level,
+            'page_break': line.print_on_new_page,
+            'action_id': line.action_id.id,
+            'expand_function': groupby and '_report_expand_unfoldable_line_with_groupby' or None,
+        }
+
+        if line.horizontal_split_side:
+            rslt['horizontal_split_side'] = line.horizontal_split_side
+
+        if parent_id:
+            rslt['parent_id'] = parent_id
+
+        if options['export_mode'] == 'file':
+            rslt['code'] = line.code
+
+        if options['show_debug_column']:
+            first_group_key = list(options['column_groups'].keys())[0]
+            column_group_totals = all_column_groups_expression_totals[first_group_key]
+            # Only consider the first column group, as show_debug_column is only true if there is but one.
+
+            engine_selection_labels = dict(self.env['account.report.expression']._fields['engine']._description_selection(self.env))
+            expressions_detail = defaultdict(lambda: [])
+            col_expression_to_figure_type = {
+                column.get('expression_label'): column.get('figure_type') for column in options['columns']
+            }
+            for expression in line.expression_ids.filtered(lambda x: not x.label.startswith('_default')):
+                engine_label = engine_selection_labels[expression.engine]
+                figure_type = expression.figure_type or col_expression_to_figure_type.get(expression.label) or 'none'
+                expressions_detail[engine_label].append((
+                    expression.label,
+                    {'formula': expression.formula, 'subformula': expression.subformula, 'value': self.format_value(options, column_group_totals[expression]['value'], figure_type)}
+                ))
+
+            # Sort results so that they can be rendered nicely in the UI
+            for details in expressions_detail.values():
+                details.sort(key=lambda x: x[0])
+            sorted_expressions_detail = sorted(expressions_detail.items(), key=lambda x: x[0])
+
+            if sorted_expressions_detail:
+                try:
+                    rslt['debug_popup_data'] = json.dumps({'expressions_detail': sorted_expressions_detail})
+                except TypeError:
+                    raise UserError(_(
+                        'Invalid subformula in expression "%(expression)s" of line "%(line)s": %(subformula)s',
+                        expression=expression.label,
+                        line=expression.report_line_id.name,
+                        subformula=expression.subformula,
+                    ))
+        return rslt
+
+    @api.model
+    def _build_static_line_columns(self, line, options, all_column_groups_expression_totals, groupby_model=None):
+        line_expressions_map = {expr.label: expr for expr in line.expression_ids}
+        columns = []
+        for column_data in options['columns']:
+            col_group_key = column_data['column_group_key']
+            current_group_expression_totals = all_column_groups_expression_totals[col_group_key]
+            target_line_res_dict = {expr.label: current_group_expression_totals[expr] for expr in line.expression_ids if not expr.label.startswith('_default')}
+
+            column_expr_label = column_data['expression_label']
+            column_res_dict = target_line_res_dict.get(column_expr_label, {})
+            column_value = column_res_dict.get('value')
+            column_has_sublines = column_res_dict.get('has_sublines', False)
+            column_expression = line_expressions_map.get(column_expr_label, self.env['account.report.expression'])
+            figure_type = column_expression.figure_type or column_data['figure_type']
+
+            # Handle info popup
+            info_popup_data = {}
+
+            # Check carryover
+            carryover_expr_label = '_carryover_%s' % column_expr_label
+            carryover_value = target_line_res_dict.get(carryover_expr_label, {}).get('value', 0)
+            if self.env.company.currency_id.compare_amounts(0, carryover_value) != 0:
+                info_popup_data['carryover'] = self._format_value(options, carryover_value, 'monetary')
+
+                carryover_expression = line_expressions_map[carryover_expr_label]
+                if carryover_expression.carryover_target:
+                    info_popup_data['carryover_target'] = carryover_expression._get_carryover_target_expression(options).report_line_name
+                # If it's not set, it means the carryover needs to target the same expression
+
+            applied_carryover_value = target_line_res_dict.get('_applied_carryover_%s' % column_expr_label, {}).get('value', 0)
+            if self.env.company.currency_id.compare_amounts(0, applied_carryover_value) != 0:
+                info_popup_data['applied_carryover'] = self._format_value(options, applied_carryover_value, 'monetary')
+                info_popup_data['allow_carryover_audit'] = self.env.user.has_group('base.group_no_one')
+                info_popup_data['expression_id'] = line_expressions_map['_applied_carryover_%s' % column_expr_label]['id']
+                info_popup_data['column_group_key'] = col_group_key
+
+            # Handle manual edition popup
+            edit_popup_data = {}
+            formatter_params = {}
+            if column_expression.engine == 'external' and column_expression.subformula \
+                and len(options['companies']) == 1 \
+                and (not options['available_vat_fiscal_positions'] or options['fiscal_position'] != 'all'):
+
+                # Compute rounding for manual values
+                rounding = None
+                if figure_type == 'integer':
+                    rounding = 0
+                else:
+                    rounding_opt_match = re.search(r"\Wrounding\W*=\W*(?P<rounding>\d+)", column_expression.subformula)
+                    if rounding_opt_match:
+                        rounding = int(rounding_opt_match.group('rounding'))
+                    elif figure_type == 'monetary':
+                        rounding = self.env.company.currency_id.decimal_places
+
+                if 'editable' in column_expression.subformula:
+                    edit_popup_data = {
+                        'column_group_key': col_group_key,
+                        'target_expression_id': column_expression.id,
+                        'rounding': rounding,
+                        'figure_type': figure_type,
+                        'column_value': column_value,
+                    }
+
+                formatter_params['digits'] = rounding
+
+            # Handle editable financial budgets
+            editable_budget = groupby_model == 'account.account' and options['column_groups'][col_group_key]['forced_options'].get('compute_budget')
+            if editable_budget and self.env.user.has_group('account.group_account_manager'):
+                edit_popup_data = {
+                    'column_group_key': col_group_key,
+                    'target_expression_id': column_expression.id,
+                    'rounding': self.env.company.currency_id.decimal_places,
+                    'figure_type': 'monetary',
+                    'column_value': column_value,
+                }
+
+            # Build result
+            if column_value is not None: #In case column value is zero, we still want to go through the condition
+                foreign_currency_id = target_line_res_dict.get(f'_currency_{column_expr_label}', {}).get('value')
+                if foreign_currency_id:
+                    formatter_params['currency'] = self.env['res.currency'].browse(foreign_currency_id)
+
+            column_data = self._build_column_dict(
+                column_value,
+                column_data,
+                options=options,
+                column_expression=column_expression if column_expression else None,
+                has_sublines=column_has_sublines,
+                report_line_id=line.id,
+                **formatter_params,
+            )
+
+            if info_popup_data:
+                column_data['info_popup_data'] = json.dumps(info_popup_data)
+
+            if edit_popup_data:
+                column_data['edit_popup_data'] = json.dumps(edit_popup_data)
+
+            columns.append(column_data)
+
+        return columns
+
+    def _build_column_dict(
+            self, col_value, col_data,
+            options=None, currency=False, digits=1,
+            column_expression=None, has_sublines=False,
+            report_line_id=None,
+    ):
+        # Empty column
+        if col_value is None and col_data is None:
+            return {}
+
+        col_data = col_data or {}
+        column_expression = column_expression or self.env['account.report.expression']
+        options = options or {}
+
+        blank_if_zero = column_expression.blank_if_zero or col_data.get('blank_if_zero', False)
+        figure_type = column_expression.figure_type or col_data.get('figure_type', 'string')
+
+        format_params = {}
+        if figure_type == 'monetary' and currency:
+            format_params['currency_id'] = currency.id
+        elif figure_type in ('float', 'percentage'):
+            format_params['digits'] = digits
+
+        col_group_key = col_data.get('column_group_key')
+
+        return {
+            'auditable': col_value is not None
+                         and column_expression.auditable
+                         and not options['column_groups'][col_group_key]['forced_options'].get('compute_budget'),
+            'blank_if_zero': blank_if_zero,
+            'column_group_key': col_group_key,
+            'currency': currency,
+            'currency_symbol': (currency or self.env.company.currency_id).symbol if options.get('multi_currency') else None,
+            'digits': digits,
+            'expression_label': col_data.get('expression_label'),
+            'figure_type': figure_type,
+            'green_on_positive': column_expression.green_on_positive,
+            'has_sublines': has_sublines,
+            'is_zero': col_value is None or (
+                isinstance(col_value, (int, float))
+                and figure_type in NUMBER_FIGURE_TYPES
+                and self._is_value_zero(col_value, figure_type, format_params)
+            ),
+            'no_format': col_value,
+            'format_params': format_params,
+            'report_line_id': report_line_id,
+            'sortable': col_data.get('sortable', False),
+            'comparison_mode': col_data.get('comparison_mode'),
+        }
+
+    def _inject_account_names_for_consolidation(self, lines):
+        """ When grouping by account_code, in order to make the consolidation clearer, we add the account name in the context
+            of the current company next to the account_code.
+        """
+        account_codes = []
+        for line in lines:
+            markup = self._get_markup(line['id'])
+            if isinstance(markup, dict) and markup.get('groupby') == 'account_code':
+                account_codes.append(line['name'])
+        if not account_codes:
+            return
+
+        account_code_to_account_name_dict = {account.code: account.name for account in self.env['account.account'].search([
+            *self.env['account.account']._check_company_domain(self.env.company),
+            ('code', 'in', account_codes),
+        ])}
+        for line in lines:
+            markup = self._get_markup(line['id'])
+            if isinstance(markup, dict) and markup.get('groupby') == 'account_code':
+                account_code = line['name']
+                account_name = account_code_to_account_name_dict.get(account_code)
+                if account_code and account_name:
+                    line['name'] = f'{account_code} {account_name}'
+
+    def _get_dynamic_lines(self, options, all_column_groups_expression_totals, warnings=None):
+        if self.custom_handler_model_id:
+            rslt = self.env[self.custom_handler_model_name]._dynamic_lines_generator(self, options, all_column_groups_expression_totals, warnings=warnings)
+            self._apply_integer_rounding_to_dynamic_lines(options, (line for _sequence, line in rslt))
+            return rslt
+        return []
+
+    def _apply_integer_rounding_to_dynamic_lines(self, options, dynamic_lines):
+        if options.get('integer_rounding_enabled'):
+            for line in dynamic_lines:
+                for column_dict in line.get('columns', []):
+                    if 'name' not in column_dict and column_dict.get('figure_type') == 'monetary' and column_dict.get('no_format'):
+                        # If 'name' is already in it, no need to round the amount ; it is forced by the custom report already
+                        column_dict['no_format'] = float_round(
+                            column_dict['no_format'],
+                            precision_digits=0,
+                            rounding_method=options['integer_rounding'],
+                        )
+
+    def _compute_expression_totals_for_each_column_group(self, expressions, options,
+        groupby_to_expand=None, forced_all_column_groups_expression_totals=None, col_groups_restrict=None, offset=0, limit=None, include_default_vals=False, warnings=None):
+        """
+            Main computation function for static lines.
+
+            :param expressions: The account.report.expression objects to evaluate.
+
+            :param options: The options dict for this report, obtained from.get_options({}).
+
+            :param groupby_to_expand: The full groupby string for the grouping we want to evaluate. If None, the aggregated value will be computed.
+                                      For example, when evaluating a group by partner_id, which further will be divided in sub-groups by account_id,
+                                      then id, the full groupby string will be: 'partner_id, account_id, id'.
+
+            :param forced_all_column_groups_expression_totals: The expression totals already computed for this report, to which we will add the
+                                                               new totals we compute for expressions (or update the existing ones if some
+                                                               expressions are already in forced_all_column_groups_expression_totals). This is
+                                                               a dict in the same format as returned by this function.
+                                                               This parameter is for example used when adding manual values, where only
+                                                               the expressions possibly depending on the new manual value
+                                                               need to be updated, while we want to keep all the other values as-is.
+
+            :param col_groups_restrict: List of column group keys of the groups to compute. Other column groups will be ignored, and will
+                                        not be added to the result of this function (they can still be provided beforehand through
+                                        forced_all_column_groups_expression_totals). If not provided, all colum groups will be computed.
+
+            :param offset: The SQL offset to use when computing the result of these expressions. Used if self.load_more_limit is set, to handle
+                           the load more feature.
+
+            :param limit: The SQL limit to apply when computing these expressions' result. Used if self.load_more_limit is set, to handle
+                          the load more feature.
+
+            :return: dict(column_group_key, expressions_totals), where:
+                - column group key is string identifying each column group in a unique way ; as in options['column_groups']
+                - expressions_totals is a dict in the format returned by _compute_expression_totals_for_single_column_group
+        """
+
+        def add_expressions_to_groups(expressions_to_add, grouped_formulas, force_date_scope=None):
+            """ Groups the expressions that should be computed together.
+            """
+            for expression in expressions_to_add:
+                engine = expression.engine
+
+                if engine not in grouped_formulas:
+                    grouped_formulas[engine] = {}
+
+                date_scope = force_date_scope or self._standardize_date_scope_for_date_range(expression.date_scope)
+                groupby_data = expression.report_line_id._parse_groupby(options, groupby_to_expand=groupby_to_expand)
+
+                next_groupby = groupby_data['next_groupby'] if engine not in NO_NEXT_GROUPBY_ENGINES else None
+                grouping_key = (date_scope, groupby_data['current_groupby'], next_groupby)
+
+                if grouping_key not in grouped_formulas[engine]:
+                    grouped_formulas[engine][grouping_key] = {}
+
+                formula = expression.formula
+
+                if expression.engine == 'aggregation' and expression.formula == 'sum_children':
+                    formula = ' + '.join(
+                        f'_expression:{child_expr.id}'
+                        for child_expr in expression.report_line_id.children_ids.expression_ids.filtered(lambda e: e.label == expression.label)
+                    )
+
+                if formula not in grouped_formulas[engine][grouping_key]:
+                    grouped_formulas[engine][grouping_key][formula] = expression
+                else:
+                    grouped_formulas[engine][grouping_key][formula] |= expression
+
+        if groupby_to_expand and any(not expression.report_line_id._get_groupby(options) for expression in expressions):
+            raise UserError(_("Trying to expand groupby results on lines without a groupby value."))
+
+        # Group formulas for batching (when possible)
+        grouped_formulas = {}
+        if expressions and not include_default_vals:
+            expressions = expressions.filtered(lambda x: not x.label.startswith('_default'))
+        for expression in expressions:
+            add_expressions_to_groups(expression, grouped_formulas)
+
+            if expression.engine == 'aggregation' and expression.subformula == 'cross_report':
+                # Always expand aggregation expressions, in case their subexpressions are not in expressions parameter
+                # (this can happen in cross report, or when auditing an individual aggregation expression)
+                expanded_cross = expression._expand_aggregations()
+                forced_date_scope = self._standardize_date_scope_for_date_range(expression.date_scope)
+                add_expressions_to_groups(expanded_cross, grouped_formulas, force_date_scope=forced_date_scope)
+
+        # Treat each formula batch for each column group
+        all_column_groups_expression_totals = {}
+        for group_key, group_options in self._split_options_per_column_group(options).items():
+            if forced_all_column_groups_expression_totals:
+                forced_column_group_totals = forced_all_column_groups_expression_totals.get(group_key, None)
+            else:
+                forced_column_group_totals = None
+
+            if not col_groups_restrict or group_key in col_groups_restrict:
+                current_group_expression_totals = self._compute_expression_totals_for_single_column_group(
+                    group_options,
+                    grouped_formulas,
+                    forced_column_group_expression_totals=forced_column_group_totals,
+                    offset=offset,
+                    limit=limit,
+                    warnings=warnings,
+                )
+            else:
+                current_group_expression_totals = forced_column_group_totals
+
+            all_column_groups_expression_totals[group_key] = current_group_expression_totals
+
+        return all_column_groups_expression_totals
+
+    def _standardize_date_scope_for_date_range(self, date_scope):
+        """ Depending on the fact the report accepts date ranges or not, different date scopes might mean the same thing.
+        This function is used so that, in those cases, only one of these date_scopes' values is used, to avoid useless creation
+        of multiple computation batches and improve the overall performance as much as possible.
+        """
+        if not self.filter_date_range and date_scope == 'strict_range':
+            return 'from_beginning'
+        else:
+            return date_scope
+
+    def _split_options_per_column_group(self, options):
+        """ Get a specific option dict per column group, each enforcing the comparison and horizontal grouping associated
+        with the column group. Each of these options dict will contain a new key 'owner_column_group', with the column group key of the
+        group it was generated for.
+
+        :param options: The report options upon which the returned options be be based.
+
+        :return:        A dict(column_group_key, options_dict), where column_group_key is the string identifying each column group (the keys
+                        of options['column_groups'], and options_dict the generated options for this group.
+        """
+        options_per_group = {}
+        for group_key in options['column_groups']:
+            group_options = self._get_column_group_options(options, group_key)
+            options_per_group[group_key] = group_options
+
+        return options_per_group
+
+    def _get_column_group_options(self, options, group_key):
+        column_group = options['column_groups'][group_key]
+        return {
+            **options,
+            **column_group['forced_options'],
+            'forced_domain': options.get('forced_domain', []) + column_group['forced_domain'] + column_group['forced_options'].get('forced_domain', []),
+            'owner_column_group': group_key,
+        }
+
+    def _compute_expression_totals_for_single_column_group(self, column_group_options, grouped_formulas, forced_column_group_expression_totals=None, offset=0, limit=None, warnings=None):
+        """ Evaluates expressions for a single column group.
+
+            :param column_group_options: The options dict obtained from _split_options_per_column_group() for the column group to evaluate.
+
+            :param grouped_formulas: A dict(engine, formula_dict), where:
+                                     - engine is a string identifying a report engine, in the same format as in account.report.expression's engine
+                                       field's technical labels.
+                                     - formula_dict is a dict in the same format as _compute_formula_batch's formulas_dict parameter,
+                                       containing only aggregation formulas.
+
+            :param forced_column_group_expression_totals: The expression totals previously computed, in the same format as this function's result.
+                                                          If provided, the result of this function will be an updated version of this parameter,
+                                                          recomputing the expressions in grouped_fomulas.
+
+            :param offset: The SQL offset to use when computing the result of these expressions. Used if self.load_more_limit is set, to handle
+                           the load more feature.
+
+            :param limit: The SQL limit to apply when computing these expressions' result. Used if self.load_more_limit is set, to handle
+                          the load more feature.
+
+            :return: A dict(expression, {'value': value, 'has_sublines': has_sublines}), where:
+                     - expression is one of the account.report.expressions that got evaluated
+
+                     - value is the result of that evaluation. Two cases are possible:
+                        - if we're evaluating a groupby: value will then be a in the form [(groupby_key, group_val)], where
+                            - groupby_key is the key used in the SQL GROUP BY clause to generate this result
+                            - group_val: The result computed by the engine for this group. Typically a float.
+
+                        - else: value will directly be the result computed for this expression
+
+                     - has_sublines: [optional key, will default to False if absent]
+                                       Whether or not this result corresponds to 1 or more subelements in the database (typically move lines).
+                                       This is used to know whether an unfoldable line has results to unfold in the UI.
+        """
+        def inject_formula_results(formula_results, column_group_expression_totals, cross_report_expression_totals=None):
+            for (_key, expressions), result in formula_results.items():
+                for expression in expressions:
+                    subformula_error_format = _(
+                        'Invalid subformula in expression "%(expression)s" of line "%(line)s": %(subformula)s',
+                        expression=expression.label,
+                        line=expression.report_line_id.name,
+                        subformula=expression.subformula,
+                    )
+                    if expression.engine not in ('aggregation', 'external') and expression.subformula:
+                        # aggregation subformulas behave differently (cross_report is markup ; if_below, if_above and force_between need evaluation)
+                        # They are directly handled in aggregation engine
+                        result_value_key = expression.subformula
+                    else:
+                        result_value_key = 'result'
+
+                    # The expression might be signed, so we can't just access the dict key, and directly evaluate it instead.
+
+                    if isinstance(result, list):
+                        # Happens when expanding a groupby line, to compute its children.
+                        # We then want to keep a list(grouping key, total) as the final result of each total
+                        expression_value = []
+                        expression_has_sublines = False
+                        for key, result_dict in result:
+                            try:
+                                expression_value.append((key, safe_eval(result_value_key, result_dict)))
+                            except (ValueError, SyntaxError):
+                                raise UserError(subformula_error_format)
+                            expression_has_sublines = expression_has_sublines or result_dict.get('has_sublines')
+                    else:
+                        # For non-groupby lines, we directly set the total value for the line.
+                        try:
+                            expression_value = safe_eval(result_value_key, result)
+                        except (ValueError, SyntaxError):
+                            raise UserError(subformula_error_format)
+                        expression_has_sublines = result.get('has_sublines')
+
+                    if column_group_options.get('integer_rounding_enabled'):
+                        in_monetary_column = any(
+                            col['expression_label'] == expression.label
+                            for col in column_group_options['columns']
+                            if col['figure_type'] == 'monetary'
+                        )
+
+                        if (in_monetary_column and not expression.figure_type) or expression.figure_type == 'monetary':
+                            method = column_group_options['integer_rounding']
+                            if isinstance(expression_value, list):
+                                expression_value = [(key, float_round(value, precision_digits=0, rounding_method=method)) for key, value in expression_value]
+                            else:
+                                expression_value = float_round(expression_value, precision_digits=0, rounding_method=method)
+
+                    expression_result = {
+                        'value': expression_value,
+                        'has_sublines': expression_has_sublines,
+                    }
+
+                    if expression.report_line_id.report_id == self:
+                        if expression in column_group_expression_totals:
+                            # This can happen because of a cross report aggregation referencing an expression of its own report,
+                            # but forcing a different date_scope onto it. This case is not supported for now ; splitting the aggregation can be
+                            # used as a workaround.
+                            raise UserError(_(
+                                "Expression labelled '%(label)s' of line '%(line)s' is being overwritten when computing the current report. "
+                                "Make sure the cross-report aggregations of this report only reference terms belonging to other reports.",
+                                label=expression.label, line=expression.report_line_id.name
+                            ))
+                        column_group_expression_totals[expression] = expression_result
+                    elif cross_report_expression_totals is not None:
+                        # Entering this else means this expression needs to be evaluated because of a cross_report aggregation
+                        cross_report_expression_totals[expression] = expression_result
+
+        # Batch each engine that can be
+        column_group_expression_totals = dict(forced_column_group_expression_totals) if forced_column_group_expression_totals else {}
+        cross_report_expr_totals_by_scope = {}
+        batchable_engines = [
+            selection_val[0]
+            for selection_val in self.env['account.report.expression']._fields['engine'].selection
+            if selection_val[0] != 'aggregation'
+        ]
+        for engine in batchable_engines:
+            for (date_scope, current_groupby, next_groupby), formulas_dict in grouped_formulas.get(engine, {}).items():
+                formula_results = self._compute_formula_batch(column_group_options, engine, date_scope, formulas_dict, current_groupby, next_groupby,
+                                                              offset=offset, limit=limit, warnings=warnings)
+                inject_formula_results(
+                    formula_results,
+                    column_group_expression_totals,
+                    cross_report_expression_totals=cross_report_expr_totals_by_scope.setdefault(date_scope, {})
+                )
+
+        # Now that everything else has been computed, resolve aggregation expressions
+        # (they can't be treated as the other engines, as if we batch them per date_scope, we'll not be able
+        # to compute expressions depending on other expressions with a different date scope).
+        aggregation_formulas_dict = {}
+        for (date_scope, _current_groupby, _next_groupby), formulas_dict in grouped_formulas.get('aggregation', {}).items():
+            for formula, expressions in formulas_dict.items():
+                for expression in expressions:
+                    # group_by are ignored by this engine, so we merge every grouped entry into a common dict
+                    forced_date_scope = date_scope if expression.subformula == 'cross_report' or expression.report_line_id.report_id != self else None
+                    aggreation_formula_dict_key = (formula, forced_date_scope)
+                    aggregation_formulas_dict.setdefault(aggreation_formula_dict_key, self.env['account.report.expression'])
+                    aggregation_formulas_dict[aggreation_formula_dict_key] |= expression
+
+        if aggregation_formulas_dict:
+            aggregation_formula_results = self._compute_totals_no_batch_aggregation(column_group_options, aggregation_formulas_dict, column_group_expression_totals, cross_report_expr_totals_by_scope)
+            inject_formula_results(aggregation_formula_results, column_group_expression_totals)
+
+        return column_group_expression_totals
+
+    def _compute_totals_no_batch_aggregation(self, column_group_options, formulas_dict, other_current_report_expr_totals, other_cross_report_expr_totals_by_scope):
+        """ Computes expression totals for 'aggregation' engine, after all other engines have been evaluated.
+
+        :param column_group_options: The options for the column group being evaluated, as obtained from _split_options_per_column_group.
+
+        :param formulas_dict: A dict {(formula, forced_date_scope): expressions}, containing only aggregation formulas.
+                              forced_date_scope will only be set in case of cross_report expressions. Else, it will be None
+
+        :param other_current_report_expr_totals: The expressions_totals obtained after computing all non-aggregation engines, for the expressions
+                                                 belonging directly to self (so, not the ones referenced by a cross_report aggreation).
+                                                 This is a dict in the same format as _compute_expression_totals_for_single_column_group's result
+                                                 (the only difference being it does not contain any aggregation expression yet).
+
+        :param other_cross_report_expr_totals: A dict(forced_date_scope, expression_totals), where expression_totals is in the same form as
+                                               _compute_expression_totals_for_single_column_group's result. This parameter contains the results
+                                               of the non-aggregation expressions used by cross_report expressions ; they all belong to different
+                                               reports than self. The forced_date_scope corresponds to the original date_scope set on the
+                                               cross_report expression referencing them. The same expressions can be referenced multiple times
+                                               under different date scopes.
+
+        :return : A dict((formula, expressions), result), where result is in the form {'result': numeric_value}
+        """
+        def _resolve_subformula_on_dict(result, line_codes_expression_map, subformula):
+            split_subformula = subformula.split('.')
+            if len(split_subformula) > 1:
+                line_code, expression_label = split_subformula
+                return result[line_codes_expression_map[line_code][expression_label]]
+
+            if subformula.startswith('_expression:'):
+                expression_id = int(subformula.split(':')[1])
+                return result[expression_id]
+
+            # Wrong subformula; the KeyError is caught in the function below
+            raise KeyError()
+
+        def _check_is_float(to_test):
+            try:
+                float(to_test)
+                return True
+            except ValueError:
+                return False
+
+        def add_expression_to_map(expression, expression_res, figure_types_cache, current_report_eval_dict, current_report_codes_map, other_reports_eval_dict, other_reports_codes_map, cross_report=False):
+            """
+                Process an expression and its result, updating various dictionaries with relevant information.
+                Parameters:
+                - expression (object): The expression object to process.
+                - expression_res (dict): The result of the expression.
+                - figure_types_cache (dict): {report : {label: figure_type}}.
+                - current_report_eval_dict (dict): {expression_id: value}.
+                - current_report_codes_map (dict): {line_code: {expression_label: expression_id}}.
+                - other_reports_eval_dict (dict): {forced_date_scope: {expression_id: value}}.
+                - other_reports_codes_map (dict): {forced_date_scope: {line_code: {expression_label: expression_id}}}.
+                - cross_report: A boolean to know if we are processsing cross_report expression.
+            """
+
+            expr_report = expression.report_line_id.report_id
+            report_default_figure_types = figure_types_cache.setdefault(expr_report, {})
+            expression_label = report_default_figure_types.get(expression.label, '_not_in_cache')
+            if expression_label == '_not_in_cache':
+                report_default_figure_types[expression.label] = expr_report.column_ids.filtered(
+                    lambda x: x.expression_label == expression.label).figure_type
+
+            default_figure_type = figure_types_cache[expr_report][expression.label]
+            figure_type = expression.figure_type or default_figure_type
+            value = expression_res['value']
+            if figure_type == 'monetary' and value:
+                value = self.env.company.currency_id.round(value)
+
+            if cross_report:
+                other_reports_eval_dict.setdefault(forced_date_scope, {})[expression.id] = value
+            else:
+                current_report_eval_dict[expression.id] = value
+
+        current_report_eval_dict = {} # {expression_id: value}
+        other_reports_eval_dict = {} # {forced_date_scope: {expression_id: value}}
+        current_report_codes_map = {} # {line_code: {expression_label: expression_id}}
+        other_reports_codes_map = {} # {forced_date_scope: {line_code: {expression_label: expression_id}}}
+
+        figure_types_cache = {}  # {report : {label: figure_type}}
+        for expression, expression_res in other_current_report_expr_totals.items():
+            add_expression_to_map(expression, expression_res, figure_types_cache, current_report_eval_dict, current_report_codes_map, other_reports_eval_dict, other_reports_codes_map)
+            if expression.report_line_id.code:
+                current_report_codes_map.setdefault(expression.report_line_id.code, {})[expression.label] = expression.id
+
+        for forced_date_scope, scope_expr_totals in other_cross_report_expr_totals_by_scope.items():
+            for expression, expression_res in scope_expr_totals.items():
+                add_expression_to_map(expression, expression_res, figure_types_cache, current_report_eval_dict, current_report_codes_map, other_reports_eval_dict, other_reports_codes_map, True)
+                if expression.report_line_id.code:
+                    other_reports_codes_map.setdefault(forced_date_scope, {}).setdefault(expression.report_line_id.code, {})[expression.label] = expression.id
+
+        # Complete current_report_eval_dict with the formulas of uncomputed aggregation lines
+        aggregations_terms_to_evaluate = set() # Those terms are part of the formulas to evaluate; we know they will get a value eventually
+        for (formula, forced_date_scope), expressions in formulas_dict.items():
+            for expression in expressions:
+                aggregations_terms_to_evaluate.add(f"_expression:{expression.id}") # In case it needs to be called by sum_children
+
+                if expression.report_line_id.code:
+                    if expression.report_line_id.report_id == self:
+                        current_report_codes_map.setdefault(expression.report_line_id.code, {})[expression.label] = expression.id
+                    else:
+                        other_reports_codes_map.setdefault(forced_date_scope, {}).setdefault(expression.report_line_id.code, {})[expression.label] = expression.id
+
+                    aggregations_terms_to_evaluate.add(f"{expression.report_line_id.code}.{expression.label}")
+
+                    if not expression.subformula:
+                        # Expressions with bounds cannot be replaced by their formula in formulas calling them (otherwize, bounds would be ignored).
+                        # Same goes for cross_report, otherwise the forced_date_scope will be ignored, leading to an impossibility to get evaluate the expression.
+                        if expression.report_line_id.report_id == self:
+                            eval_dict = current_report_eval_dict
+                        else:
+                            eval_dict = other_reports_eval_dict.setdefault(forced_date_scope, {})
+
+                        eval_dict[expression.id] = formula
+
+        rslt = {}
+        to_treat = [(formula, formula, forced_date_scope) for (formula, forced_date_scope) in formulas_dict.keys()] # Formed like [(expanded formula, original unexpanded formula)]
+        term_separator_regex = r'(?<!\de)[+-]|[ ()/*]'
+        term_replacement_regex = r"(^|(?<=[ ()+/*-]))%s((?=[ ()+/*-])|$)"
+        while to_treat:
+            formula, unexpanded_formula, forced_date_scope = to_treat.pop(0)
+
+            full_eval_dict = {**current_report_eval_dict, **other_reports_eval_dict.get(forced_date_scope, {})}
+            full_codes_map = {**current_report_codes_map, **other_reports_codes_map.get(forced_date_scope, {})}
+
+            # Evaluate the formula
+            terms_to_eval = [term for term in re.split(term_separator_regex, formula) if term and not _check_is_float(term)]
+            if terms_to_eval:
+                # The formula can't be evaluated as-is. Replace the terms by their value or formula,
+                # and enqueue the formula back; it'll be tried anew later in the loop.
+                for term in terms_to_eval:
+                    try:
+                        expanded_term = _resolve_subformula_on_dict(
+                            full_eval_dict,
+                            full_codes_map,
+                            term,
+                        )
+                    except KeyError:
+                        if term in aggregations_terms_to_evaluate:
+                            # Then, the term is probably an aggregation with bounds that still needs to be computed. We need to keep on looping
+                            continue
+                        else:
+                            raise UserError(_("Could not expand term %(term)s while evaluating formula %(unexpanded_formula)s", term=term, unexpanded_formula=unexpanded_formula))
+
+                    formula = re.sub(term_replacement_regex % re.escape(term), f'({expanded_term})', formula)
+
+                to_treat.append((formula, unexpanded_formula, forced_date_scope))
+
+            else:
+                # The formula contains only digits and operators; it can be evaluated
+                if all(expr.subformula == "ignore_zero_division" for expr in formulas_dict[(unexpanded_formula, forced_date_scope)]):
+                    try:
+                        formula_result = expr_eval(formula)
+                    except ZeroDivisionError:
+                        # Arbitrary choice; for clarity of the report. A 0 division could typically happen when there is no result in the period.
+                        formula_result = 0
+                else:
+                    formula_result = expr_eval(formula)
+
+                for expression in formulas_dict[(unexpanded_formula, forced_date_scope)]:
+                    # Apply subformula
+                    if expression.subformula and expression.subformula.startswith('if_other_expr_'):
+                        other_expr_criterium_match = re.match(
+                            r"^(?P<criterium>\w+)\("
+                            r"(?P<line_code>\w+)[.](?P<expr_label>\w+),[ ]*"
+                            r"(?P<bound_params>.*)\)$",
+                            expression.subformula
+                        )
+                        if not other_expr_criterium_match:
+                            raise UserError(_("Wrong format for if_other_expr_above/if_other_expr_below formula: %s", expression.subformula))
+
+                        criterium_code = other_expr_criterium_match['line_code']
+                        criterium_label = other_expr_criterium_match['expr_label']
+                        criterium_expression_id = full_codes_map.get(criterium_code, {}).get(criterium_label)
+                        criterium_val = full_eval_dict.get(criterium_expression_id)
+
+                        if not criterium_expression_id:
+                            raise UserError(_("This subformula references an unknown expression: %s", expression.subformula))
+
+                        if not isinstance(criterium_val, (float, int)):
+                            # The criterium expression has not be evaluated yet. Postpone the evaluation of this formula, and skip this expression
+                            # for now. We still try to evaluate other expressions using this formula if any; this means those expressions will
+                            # be processed a second time later, giving the same result. This is a rare corner case, and not so costly anyway.
+                            to_treat.append((formula, unexpanded_formula, forced_date_scope))
+                            continue
+
+                        bound_subformula = other_expr_criterium_match['criterium'].replace('other_expr_', '') # e.g. 'if_other_expr_above' => 'if_above'
+                        bound_params = other_expr_criterium_match['bound_params']
+                        bound_value = self._aggregation_apply_bounds(column_group_options, f"{bound_subformula}({bound_params})", criterium_val)
+                        expression_result = formula_result * int(bool(bound_value))
+
+                    else:
+                        expression_result = self._aggregation_apply_bounds(column_group_options, expression.subformula, formula_result)
+
+                    if column_group_options.get('integer_rounding_enabled'):
+                        expression_result = float_round(expression_result, precision_digits=0, rounding_method=column_group_options['integer_rounding'])
+
+                    # Store result
+                    standardized_expression_scope = self._standardize_date_scope_for_date_range(expression.date_scope)
+                    if (forced_date_scope == standardized_expression_scope or not forced_date_scope) and expression.report_line_id.report_id == self:
+                        # This condition ensures we don't return necessary subcomputations in the final result
+                        rslt[(unexpanded_formula, expression)] = {'result': expression_result}
+
+                    # Handle recursive aggregations (explicit or through the sum_children shortcut).
+                    # We need to make the result of our computation available to other aggregations, as they are still waiting in to_treat to be evaluated.
+                    if expression.report_line_id.report_id == self:
+                        current_report_eval_dict[expression.id] = expression_result
+                    else:
+                        other_reports_eval_dict.setdefault(forced_date_scope, {})[expression.id] = expression_result
+
+        return rslt
+
+    def _aggregation_apply_bounds(self, column_group_options, subformula, unbound_value):
+        """ Applies the bounds of the provided aggregation expression to an unbounded value that got computed for it and returns the result.
+        Bounds can be defined as subformulas of aggregation expressions, with the following possible values:
+
+            - if_above(CUR(bound_value)):
+                                    => Result will be 0 if it's <= the provided bound value; else it'll be unbound_value
+
+            - if_below(CUR(bound_value)):
+                                    => Result will be 0 if it's >= the provided bound value; else it'll be unbound_value
+
+            - if_between(CUR(bound_value1), CUR(bound_value2)):
+                                    => Result will be unbound_value if it's strictly between the provided bounds. Else, it will
+                                       be brought back to the closest bound.
+
+            - round(decimal_places):
+                                    => Result will be round(unbound_value, decimal_places)
+
+            (where CUR is a currency code, and bound_value* are float amounts in CUR currency)
+        """
+        if not subformula:
+            return unbound_value
+
+        # So an expression can't have bounds and be cross_reports, for simplicity.
+        # To do that, just split the expression in two parts.
+        if subformula and subformula.startswith('round'):
+            precision_string = re.match(r"round\((?P<precision>\d+)\)", subformula)['precision']
+            return round(unbound_value, int(precision_string))
+
+        if subformula not in {'cross_report', 'ignore_zero_division'}:
+            company_currency = self.env.company.currency_id
+            date_to = column_group_options['date']['date_to']
+
+            match = re.match(
+                r"(?P<criterium>\w*)"
+                r"\((?P<currency_1>[A-Z]{3})\((?P<amount_1>[-]?\d+(\.\d+)?)\)"
+                r"(,(?P<currency_2>[A-Z]{3})\((?P<amount_2>[-]?\d+(\.\d+)?)\))?\)$",
+                subformula.replace(' ', '')
+            )
+            group_values = match.groupdict()
+
+            # Convert the provided bounds into company currency
+            currency_code_1 = group_values.get('currency_1')
+            currency_code_2 = group_values.get('currency_2')
+            currency_codes = [
+                currency_code
+                for currency_code in [currency_code_1, currency_code_2]
+                if currency_code and currency_code != company_currency.name
+            ]
+
+            if currency_codes:
+                currencies = self.env['res.currency'].with_context(active_test=False).search([('name', 'in', currency_codes)])
+            else:
+                currencies = self.env['res.currency']
+
+            amount_1 = float(group_values['amount_1'] or 0)
+            amount_2 = float(group_values['amount_2'] or 0)
+            for currency in currencies:
+                if currency != company_currency:
+                    if currency.name == currency_code_1:
+                        amount_1 = currency._convert(amount_1, company_currency, self.env.company, date_to)
+                    if amount_2 and currency.name == currency_code_2:
+                        amount_2 = currency._convert(amount_2, company_currency, self.env.company, date_to)
+
+            # Evaluate result
+            criterium = group_values['criterium']
+            if criterium == 'if_below':
+                if company_currency.compare_amounts(unbound_value, amount_1) >= 0:
+                    return 0
+            elif criterium == 'if_above':
+                if company_currency.compare_amounts(unbound_value, amount_1) <= 0:
+                    return 0
+            elif criterium == 'if_between':
+                if company_currency.compare_amounts(unbound_value, amount_1) < 0 or company_currency.compare_amounts(unbound_value, amount_2) > 0:
+                    return 0
+            else:
+                raise UserError(_("Unknown bound criterium: %s", criterium))
+
+        return unbound_value
+
+    def _compute_formula_batch(self, column_group_options, formula_engine, date_scope, formulas_dict, current_groupby, next_groupby, offset=0, limit=None, warnings=None):
+        """ Evaluates a batch of formulas.
+
+        :param column_group_options: The options for the column group being evaluated, as obtained from _split_options_per_column_group.
+
+        :param formula_engine: A string identifying a report engine. Must be one of account.report.expression's engine field's technical labels.
+
+        :param date_scope: The date_scope under which to evaluate the fomulas. Must be one of account.report.expression's date_scope field's
+                           technical labels.
+
+        :param formulas_dict: A dict in the dict(formula, expressions), where:
+                                - formula: a formula to be evaluated with the engine referred to by parent dict key
+                                - expressions: a recordset of all the expressions to evaluate using formula (possibly with distinct subformulas)
+
+        :param current_groupby: The groupby to evaluate, or None if there isn't any. In case of multi-level groupby, only contains the element
+                                that needs to be computed (so, if unfolding a line doing 'partner_id,account_id,id'; current_groupby will only be
+                                'partner_id'). Subsequent groupby will be in next_groupby.
+
+        :param next_groupby: Full groupby string of the groups that will have to be evaluated next for these expressions, or None if there isn't any.
+                             For example, in the case depicted in the example of current_groupby, next_groupby will be 'account_id,id'.
+
+        :param offset: The SQL offset to use when computing the result of these expressions.
+
+        :param limit: The SQL limit to apply when computing these expressions' result.
+
+        :return: The result might have two different formats depending on the situation:
+            - if we're computing a groupby: {(formula, expressions): [(grouping_key, {'result': value, 'has_sublines': boolean}), ...], ...}
+            - if we're not: {(formula, expressions): {'result': value, 'has_sublines': boolean}, ...}
+            'result' key is the default; different engines might use one or multiple other keys instead, depending of the subformulas they allow
+            (e.g. 'sum', 'sum_if_pos', ...)
+        """
+        engine_function_name = f'_compute_formula_batch_with_engine_{formula_engine}'
+        return getattr(self, engine_function_name)(
+            column_group_options, date_scope, formulas_dict, current_groupby, next_groupby,
+            offset=offset, limit=limit, warnings=warnings,
+        )
+
+    def _compute_formula_batch_with_engine_tax_tags(self, options, date_scope, formulas_dict, current_groupby, next_groupby, offset=0, limit=None, warnings=None):
+        """ Report engine.
+
+        The formulas made for this report simply consist of a tag label. When an expression using this engine is created, it also creates two
+        account.account.tag objects, namely -tag and +tag, where tag is the chosen formula. The balance of the expressions using this engine is
+        computed by gathering all the move lines using their tags, and applying the sign of their tag to their balance, together with a -1 factor
+        if the tax_tag_invert field of the move line is True.
+
+        This engine does not support any subformula.
+        """
+        self._check_groupby_fields((next_groupby.split(',') if next_groupby else []) + ([current_groupby] if current_groupby else []))
+        all_expressions = self.env['account.report.expression']
+        for expressions in formulas_dict.values():
+            all_expressions |= expressions
+        tags = all_expressions._get_matching_tags()
+
+        query = self._get_report_query(options, date_scope)
+        groupby_sql = self.env['account.move.line']._field_to_sql('account_move_line', current_groupby, query) if current_groupby else None
+        tail_query = self._get_engine_query_tail(offset, limit)
+        lang = get_lang(self.env, self.env.user.lang).code
+        acc_tag_name = self.with_context(lang='en_US').env['account.account.tag']._field_to_sql('acc_tag', 'name')
+        sql = SQL(
+            """
+            SELECT
+                SUBSTRING(%(acc_tag_name)s, 2, LENGTH(%(acc_tag_name)s) - 1) AS formula,
+                SUM(%(balance_select)s
+                    * CASE WHEN acc_tag.tax_negate THEN -1 ELSE 1 END
+                    * CASE WHEN account_move_line.tax_tag_invert THEN -1 ELSE 1 END
+                ) AS balance,
+                COUNT(account_move_line.id) AS aml_count
+                %(select_groupby_sql)s
+
+            FROM %(table_references)s
+
+            JOIN account_account_tag_account_move_line_rel aml_tag
+                ON aml_tag.account_move_line_id = account_move_line.id
+            JOIN account_account_tag acc_tag
+                ON aml_tag.account_account_tag_id = acc_tag.id
+                AND acc_tag.id IN %(tag_ids)s
+            %(currency_table_join)s
+
+            WHERE %(search_condition)s
+
+            GROUP BY %(groupby_clause)s
+
+            ORDER BY %(groupby_clause)s
+
+            %(tail_query)s
+            """,
+            acc_tag_name=acc_tag_name,
+            select_groupby_sql=SQL(', %s AS grouping_key', groupby_sql) if groupby_sql else SQL(),
+            table_references=query.from_clause,
+            tag_ids=tuple(tags.ids),
+            balance_select=self._currency_table_apply_rate(SQL("account_move_line.balance")),
+            currency_table_join=self._currency_table_aml_join(options),
+            search_condition=query.where_clause,
+            groupby_clause=SQL(
+                "SUBSTRING(%(acc_tag_name)s, 2, LENGTH(%(acc_tag_name)s) - 1)%(groupby_sql)s",
+                acc_tag_name=acc_tag_name,
+                groupby_sql=SQL(', %s', groupby_sql) if groupby_sql else SQL(),
+            ),
+            tail_query=tail_query,
+        )
+
+        self._cr.execute(sql)
+
+        rslt = {formula_expr: [] if current_groupby else {'result': 0, 'has_sublines': False} for formula_expr in formulas_dict.items()}
+        for query_res in self._cr.dictfetchall():
+
+            formula = query_res['formula']
+            rslt_dict = {'result': query_res['balance'], 'has_sublines': query_res['aml_count'] > 0}
+            if current_groupby:
+                rslt[(formula, formulas_dict[formula])].append((query_res['grouping_key'], rslt_dict))
+            else:
+                rslt[(formula, formulas_dict[formula])] = rslt_dict
+
+        return rslt
+
+    def _compute_formula_batch_with_engine_domain(self, options, date_scope, formulas_dict, current_groupby, next_groupby, offset=0, limit=None, warnings=None):
+        """ Report engine.
+
+        Formulas made for this engine consist of a domain on account.move.line. Only those move lines will be used to compute the result.
+
+        This engine supports a few subformulas, each returning a slighlty different result:
+        - sum: the result will be sum of the matched move lines' balances
+
+        - sum_if_pos: the result will be the same as sum only if it's positive; else, it will be 0
+
+        - sum_if_neg: the result will be the same as sum only if it's negative; else, it will be 0
+
+        - count_rows: the result will be the number of sublines this expression has. If the parent report line has no groupby,
+                      then it will be the number of matching amls. If there is a groupby, it will be the number of distinct grouping
+                      keys at the first level of this groupby (so, if groupby is 'partner_id, account_id', the number of partners).
+        """
+        def _format_result_depending_on_groupby(formula_rslt):
+            if not current_groupby:
+                if formula_rslt:
+                    # There should be only one element in the list; we only return its totals (a dict) ; so that a list is only returned in case
+                    # of a groupby being unfolded.
+                    return formula_rslt[0][1]
+                else:
+                    # No result at all
+                    return {
+                        'sum': 0,
+                        'sum_if_pos': 0,
+                        'sum_if_neg': 0,
+                        'count_rows': 0,
+                        'has_sublines': False,
+                    }
+            return formula_rslt
+
+        self._check_groupby_fields((next_groupby.split(',') if next_groupby else []) + ([current_groupby] if current_groupby else []))
+
+        rslt = {}
+
+        for formula, expressions in formulas_dict.items():
+            try:
+                line_domain = literal_eval(formula)
+            except (ValueError, SyntaxError):
+                raise UserError(_(
+                    'Invalid domain formula in expression "%(expression)s" of line "%(line)s": %(formula)s',
+                    expression=expressions.label,
+                    line=expressions.report_line_id.name,
+                    formula=formula,
+                ))
+            query = self._get_report_query(options, date_scope, domain=line_domain)
+
+            groupby_sql = self.env['account.move.line']._field_to_sql('account_move_line', current_groupby, query) if current_groupby else None
+            select_count_field = self.env['account.move.line']._field_to_sql('account_move_line', next_groupby.split(',')[0] if next_groupby else 'id', query)
+
+            tail_query = self._get_engine_query_tail(offset, limit)
+            query = SQL(
+                """
+                SELECT
+                    COALESCE(SUM(%(balance_select)s), 0.0) AS sum,
+                    COUNT(DISTINCT %(select_count_field)s) AS count_rows
+                    %(select_groupby_sql)s
+                FROM %(table_references)s
+                %(currency_table_join)s
+                WHERE %(search_condition)s
+                %(group_by_groupby_sql)s
+                %(order_by_sql)s
+                %(tail_query)s
+                """,
+                select_count_field=select_count_field,
+                select_groupby_sql=SQL(', %s AS grouping_key', groupby_sql) if groupby_sql else SQL(),
+                table_references=query.from_clause,
+                balance_select=self._currency_table_apply_rate(SQL("account_move_line.balance")),
+                currency_table_join=self._currency_table_aml_join(options),
+                search_condition=query.where_clause,
+                group_by_groupby_sql=SQL('GROUP BY %s', groupby_sql) if groupby_sql else SQL(),
+                order_by_sql=SQL(' ORDER BY %s', groupby_sql) if groupby_sql else SQL(),
+                tail_query=tail_query,
+            )
+
+            # Fetch the results.
+            formula_rslt = []
+            self._cr.execute(query)
+            all_query_res = self._cr.dictfetchall()
+
+            total_sum = 0
+            for query_res in all_query_res:
+                res_sum = query_res['sum']
+                total_sum += res_sum
+                totals = {
+                    'sum': res_sum,
+                    'sum_if_pos': 0,
+                    'sum_if_neg': 0,
+                    'count_rows': query_res['count_rows'],
+                    'has_sublines': query_res['count_rows'] > 0,
+                }
+                formula_rslt.append((query_res.get('grouping_key', None), totals))
+
+            # Handle sum_if_pos, -sum_if_pos, sum_if_neg and -sum_if_neg
+            expressions_by_sign_policy = defaultdict(lambda: self.env['account.report.expression'])
+            for expression in expressions:
+                subformula_without_sign = expression.subformula.replace('-', '').strip()
+                if subformula_without_sign in ('sum_if_pos', 'sum_if_neg'):
+                    expressions_by_sign_policy[subformula_without_sign] += expression
+                else:
+                    expressions_by_sign_policy['no_sign_check'] += expression
+
+            # Then we have to check the total of the line and only give results if its sign matches the desired policy.
+            # This is important for groupby managements, for which we can't just check the sign query_res by query_res
+            if expressions_by_sign_policy['sum_if_pos'] or expressions_by_sign_policy['sum_if_neg']:
+                sign_policy_with_value = 'sum_if_pos' if self.env.company.currency_id.compare_amounts(total_sum, 0.0) >= 0 else 'sum_if_neg'
+                # >= instead of > is intended; usability decision: 0 is considered positive
+
+                formula_rslt_with_sign = [(grouping_key, {**totals, sign_policy_with_value: totals['sum']}) for grouping_key, totals in formula_rslt]
+
+                for sign_policy in ('sum_if_pos', 'sum_if_neg'):
+                    policy_expressions = expressions_by_sign_policy[sign_policy]
+
+                    if policy_expressions:
+                        if sign_policy == sign_policy_with_value:
+                            rslt[(formula, policy_expressions)] = _format_result_depending_on_groupby(formula_rslt_with_sign)
+                        else:
+                            rslt[(formula, policy_expressions)] = _format_result_depending_on_groupby([])
+
+            if expressions_by_sign_policy['no_sign_check']:
+                rslt[(formula, expressions_by_sign_policy['no_sign_check'])] = _format_result_depending_on_groupby(formula_rslt)
+
+        return rslt
+
+    def _compute_formula_batch_with_engine_account_codes(self, options, date_scope, formulas_dict, current_groupby, next_groupby, offset=0, limit=None, warnings=None):
+        r""" Report engine.
+
+        Formulas made for this engine target account prefixes. Each of the prefix used in the formula will be evaluated as the sum of the move
+        lines made on the accounts matching it. Those prefixes can be used together with arithmetic operations to perform them on the obtained
+        results.
+        Example: '123 - 456' will substract the balance of all account starting with 456 from the one of all accounts starting with 123.
+
+        It is also possible to exclude some subprefixes, with \ operator.
+        Example: '123\(1234)' will match prefixes all accounts starting with '123', except the ones starting with '1234'
+
+        To only match the balance of an account is it's positive (debit) or negative (credit), the letter D or C can be put just next to the prefix:
+        Example '123D': will give the total balance of accounts starting with '123' if it's positive, else it will be evaluated as 0.
+
+        Multiple subprefixes can be excluded if needed.
+        Example: '123\(1234,1236)
+
+        All these syntaxes can be mixed together.
+        Example: '123D\(1235) + 56 - 416C'
+
+        Note: if C or D character needs to be part of the prefix, it is possible to differentiate them of debit and credit match characters
+        by using an empty prefix exclusion.
+        Example 1: '123D\' will take the total balance of accounts starting with '123D'
+        Example 2: '123D\C' will return the balance of accounts starting with '123D' if it's negative, 0 otherwise.
+        """
+        self._check_groupby_fields((next_groupby.split(',') if next_groupby else []) + ([current_groupby] if current_groupby else []))
+
+        # Gather the account code prefixes to compute the total from
+        prefix_details_by_formula = {}  # in the form {formula: [(1, prefix1), (-1, prefix2)]}
+        prefixes_to_compute = set()
+        for formula in formulas_dict:
+            prefix_details_by_formula[formula] = []
+            for token in ACCOUNT_CODES_ENGINE_SPLIT_REGEX.split(formula.replace(' ', '')):
+                if token:
+                    token_match = ACCOUNT_CODES_ENGINE_TERM_REGEX.match(token)
+
+                    if not token_match:
+                        raise UserError(_("Invalid token '%(token)s' in account_codes formula '%(formula)s'", token=token, formula=formula))
+
+                    parsed_token = token_match.groupdict()
+
+                    if not parsed_token:
+                        raise UserError(_("Could not parse account_code formula from token '%s'", token))
+
+                    multiplicator = -1 if parsed_token['sign'] == '-' else 1
+                    excluded_prefixes_match = token_match['excluded_prefixes']
+                    excluded_prefixes = excluded_prefixes_match.split(',') if excluded_prefixes_match else []
+                    prefix = token_match['prefix']
+
+                    # We group using both prefix and excluded_prefixes as keys, for the case where two expressions would
+                    # include the same prefix, but exlcude different prefixes (example 104\(1041) and 104\(1042))
+                    prefix_key = (prefix, *excluded_prefixes)
+                    prefix_details_by_formula[formula].append((multiplicator, prefix_key, token_match['balance_character']))
+                    prefixes_to_compute.add((prefix, tuple(excluded_prefixes)))
+
+        # Create the subquery for the WITH linking our prefixes with account.account entries
+        all_prefixes_queries: list[SQL] = []
+        prefilter = self.env['account.account']._check_company_domain(self.get_report_company_ids(options))
+        for prefix, excluded_prefixes in prefixes_to_compute:
+            account_domain = [
+                *prefilter,
+            ]
+
+            tag_match = ACCOUNT_CODES_ENGINE_TAG_ID_PREFIX_REGEX.match(prefix)
+
+            if tag_match:
+                if tag_match['ref']:
+                    tag_id = self.env['ir.model.data']._xmlid_to_res_id(tag_match['ref'])
+                else:
+                    tag_id = int(tag_match['id'])
+
+                account_domain.append(('tag_ids', 'in', [tag_id]))
+            else:
+                account_domain.append(('code', '=like', f'{prefix}%'))
+
+            excluded_prefixes_domains = []
+
+            for excluded_prefix in excluded_prefixes:
+                excluded_prefixes_domains.append([('code', '=like', f'{excluded_prefix}%')])
+
+            if excluded_prefixes_domains:
+                account_domain.append('!')
+                account_domain += osv.expression.OR(excluded_prefixes_domains)
+
+            prefix_query = self.env['account.account']._where_calc(account_domain)
+            all_prefixes_queries.append(prefix_query.select(
+                SQL("%s AS prefix", [prefix, *excluded_prefixes]),
+                SQL("account_account.id AS account_id"),
+            ))
+
+        # Build a map to associate each account with the prefixes it matches
+        accounts_prefix_map = defaultdict(list)
+        for prefix, account_id in self.env.execute_query(SQL(' UNION ALL ').join(all_prefixes_queries)):
+            accounts_prefix_map[account_id].append(tuple(prefix))
+
+        # Run main query
+        query = self._get_report_query(options, date_scope)
+
+        current_groupby_aml_sql = self.env['account.move.line']._field_to_sql('account_move_line', current_groupby, query) if current_groupby else None
+        tail_query = self._get_engine_query_tail(offset, limit)
+        if current_groupby_aml_sql and tail_query:
+            tail_query_additional_groupby_where_sql = SQL(
+                """
+                AND %(current_groupby_aml_sql)s IN (
+                    SELECT DISTINCT %(current_groupby_aml_sql)s
+                    FROM account_move_line
+                    WHERE %(search_condition)s
+                    ORDER BY %(current_groupby_aml_sql)s
+                    %(tail_query)s
+                )
+                """,
+                current_groupby_aml_sql=current_groupby_aml_sql,
+                search_condition=query.where_clause,
+                tail_query=tail_query,
+            )
+        else:
+            tail_query_additional_groupby_where_sql = SQL()
+
+        extra_groupby_sql =  SQL(", %s", current_groupby_aml_sql) if current_groupby_aml_sql else SQL()
+        extra_select_sql = SQL(", %s AS grouping_key", current_groupby_aml_sql) if current_groupby_aml_sql else SQL()
+
+        query = SQL(
+            """
+            SELECT
+                account_move_line.account_id AS account_id,
+                SUM(%(balance_select)s) AS sum,
+                COUNT(account_move_line.id) AS aml_count
+                %(extra_select_sql)s
+            FROM %(table_references)s
+            %(currency_table_join)s
+            WHERE %(search_condition)s
+            %(tail_query_additional_groupby_where_sql)s
+            GROUP BY account_move_line.account_id%(extra_groupby_sql)s
+            %(order_by_sql)s
+            %(tail_query)s
+            """,
+            extra_select_sql=extra_select_sql,
+            table_references=query.from_clause,
+            balance_select=self._currency_table_apply_rate(SQL("account_move_line.balance")),
+            currency_table_join=self._currency_table_aml_join(options),
+            search_condition=query.where_clause,
+            extra_groupby_sql=extra_groupby_sql,
+            tail_query_additional_groupby_where_sql=tail_query_additional_groupby_where_sql,
+            order_by_sql=SQL('ORDER BY %s', current_groupby_aml_sql) if current_groupby_aml_sql else SQL(),
+            tail_query=tail_query if not tail_query_additional_groupby_where_sql else SQL(),
+        )
+        self._cr.execute(query)
+
+        # Parse result
+        rslt = {}
+
+        res_by_prefix_account_id = {}
+        for query_res in self._cr.dictfetchall():
+            # Done this way so that we can run similar code for groupby and non-groupby
+            grouping_key = query_res['grouping_key'] if current_groupby else None
+            account_id = query_res['account_id']
+            for prefix_key in accounts_prefix_map[account_id]:
+                res_by_prefix_account_id.setdefault(prefix_key, {})\
+                                        .setdefault(account_id, [])\
+                                        .append((grouping_key, {'result': query_res['sum'], 'has_sublines': query_res['aml_count'] > 0}))
+
+        for formula, prefix_details in prefix_details_by_formula.items():
+            rslt_key = (formula, formulas_dict[formula])
+            rslt_destination = rslt.setdefault(rslt_key, [] if current_groupby else {'result': 0, 'has_sublines': False})
+            rslt_groups_by_grouping_keys = {}
+            for multiplicator, prefix_key, balance_character in prefix_details:
+                res_by_account_id = res_by_prefix_account_id.get(prefix_key, {})
+
+                for account_results in res_by_account_id.values():
+                    account_total_value = sum(group_val['result'] for (group_key, group_val) in account_results)
+                    comparator = self.env.company.currency_id.compare_amounts(account_total_value, 0.0)
+
+                    # Manage balance_character.
+                    if not balance_character or (balance_character == 'D' and comparator >= 0) or (balance_character == 'C' and comparator < 0):
+
+                        for group_key, group_val in account_results:
+                            rslt_group = {
+                                **group_val,
+                                'result': multiplicator * group_val['result'],
+                            }
+                            if not current_groupby:
+                                rslt_destination['result'] += rslt_group['result']
+                                rslt_destination['has_sublines'] = rslt_destination['has_sublines'] or rslt_group['has_sublines']
+                            elif group_key in rslt_groups_by_grouping_keys:
+                                # Will happen if the same grouping key is used on move lines with different accounts.
+                                # This comes from the GROUPBY in the SQL query, which uses both grouping key and account.
+                                # When this happens, we want to aggregate the results of each grouping key, to avoid duplicates in the end result.
+                                already_treated_rslt_group = rslt_groups_by_grouping_keys[group_key]
+                                already_treated_rslt_group['has_sublines'] = already_treated_rslt_group['has_sublines'] or rslt_group['has_sublines']
+                                already_treated_rslt_group['result'] += rslt_group['result']
+                            else:
+                                rslt_groups_by_grouping_keys[group_key] = rslt_group
+                                rslt_destination.append((group_key, rslt_group))
+
+        return rslt
+
+    def _compute_formula_batch_with_engine_external(self, options, date_scope, formulas_dict, current_groupby, next_groupby, offset=0, limit=None, warnings=None):
+        """ Report engine.
+
+        This engine computes its result from the account.report.external.value objects that are linked to the expression.
+
+        Two different formulas are possible:
+        - sum: if the result must be the sum of all the external values in the period.
+        - most_recent: it the result must be the value of the latest external value in the period, which can be a number or a text
+
+        No subformula is allowed for this engine.
+        """
+        self._check_groupby_fields((next_groupby.split(',') if next_groupby else []) + ([current_groupby] if current_groupby else []))
+
+        if current_groupby or next_groupby or offset or limit:
+            raise UserError(_("'external' engine does not support groupby, limit nor offset."))
+
+        # Date clause
+        date_from, date_to = self._get_date_bounds_info(options, date_scope)
+        external_value_domain = [('date', '<=', date_to)]
+        if date_from:
+            external_value_domain.append(('date', '>=', date_from))
+
+        # Company clause
+        external_value_domain.append(('company_id', 'in', self.get_report_company_ids(options)))
+
+        # Fiscal Position clause
+        fpos_option = options['fiscal_position']
+        if fpos_option == 'domestic':
+            external_value_domain.append(('foreign_vat_fiscal_position_id', '=', False))
+        elif fpos_option != 'all':
+            # Then it's a fiscal position id
+            external_value_domain.append(('foreign_vat_fiscal_position_id', '=', int(fpos_option)))
+
+        # Do the computation
+        where_clause = self.env['account.report.external.value']._where_calc(external_value_domain).where_clause
+
+        # We have to execute two separate queries, one for text values and one for numeric values
+        num_queries = []
+        string_queries = []
+        monetary_queries = []
+        for formula, expressions in formulas_dict.items():
+            query_end = SQL()
+            if formula == 'most_recent':
+                query_end = SQL(
+                    """
+                    GROUP BY date
+                    ORDER BY date DESC
+                    LIMIT 1
+                    """,
+                )
+            string_query = """
+                    SELECT %(expression_id)s, text_value
+                    FROM account_report_external_value
+                    WHERE %(where_clause)s AND target_report_expression_id = %(expression_id)s
+                """
+            monetary_query = """
+                SELECT
+                    %(expression_id)s,
+                    COALESCE(SUM(COALESCE(%(balance_select)s, 0)), 0)
+                FROM account_report_external_value
+                    %(currency_table_join)s
+                WHERE %(where_clause)s AND target_report_expression_id = %(expression_id)s
+                %(query_end)s
+            """
+            num_query = """
+                    SELECT %(expression_id)s, SUM(COALESCE(value, 0))
+                      FROM account_report_external_value
+                     WHERE %(where_clause)s AND target_report_expression_id = %(expression_id)s
+               %(query_end)s
+            """
+
+            for expression in expressions:
+                if expression.figure_type == "string":
+                    string_queries.append(SQL(
+                        string_query,
+                        expression_id=expression.id,
+                        where_clause=where_clause,
+                    ))
+                elif expression.figure_type == "monetary":
+                    monetary_queries.append(SQL(
+                        monetary_query,
+                        expression_id=expression.id,
+                        balance_select=self._currency_table_apply_rate(SQL("CAST(value AS numeric)")),
+                        currency_table_join=SQL(
+                            """
+                                JOIN %(currency_table)s
+                                ON account_currency_table.company_id = account_report_external_value.company_id
+                                AND account_currency_table.rate_type = 'current'
+                            """,
+                            currency_table=self._get_currency_table(options),
+                        ),
+                        where_clause=where_clause,
+                        query_end=query_end,
+                    ))
+                else:
+                    num_queries.append(SQL(
+                        num_query,
+                        expression_id=expression.id,
+                        where_clause=where_clause,
+                        query_end=query_end,
+                    ))
+
+        # Convert to dict to have expression ids as keys
+        query_results_dict = {}
+        for query_list in (num_queries, string_queries, monetary_queries):
+            if query_list:
+                query_results = self.env.execute_query(SQL(' UNION ALL ').join(SQL("(%s)", query) for query in query_list))
+                query_results_dict.update(dict(query_results))
+
+        # Build result dict
+        rslt = {}
+        for formula, expressions in formulas_dict.items():
+            for expression in expressions:
+                expression_value = query_results_dict.get(expression.id)
+                # If expression_value is None, we have no previous value for this expression (set default at 0.0)
+                expression_value = expression_value or ('' if expression.figure_type == 'string' else 0.0)
+                rslt[(formula, expression)] = {'result': expression_value, 'has_sublines': False}
+
+        return rslt
+
+    def _compute_formula_batch_with_engine_custom(self, options, date_scope, formulas_dict, current_groupby, next_groupby, offset=0, limit=None, warnings=None):
+        self._check_groupby_fields((next_groupby.split(',') if next_groupby else []) + ([current_groupby] if current_groupby else []))
+
+        rslt = {}
+        for formula, expressions in formulas_dict.items():
+            custom_engine_function = self._get_custom_report_function(formula, 'custom_engine')
+            rslt[(formula, expressions)] = custom_engine_function(
+                expressions, options, date_scope, current_groupby, next_groupby, offset=offset, limit=limit, warnings=warnings)
+        return rslt
+
+    def _get_engine_query_tail(self, offset, limit) -> SQL:
+        """ Helper to generate the OFFSET, LIMIT and ORDER conditions of formula engines' queries.
+        """
+        query_tail = SQL()
+
+        if offset:
+            query_tail = SQL("%s OFFSET %s", query_tail, offset)
+
+        if limit:
+            query_tail = SQL("%s LIMIT %s", query_tail, limit)
+
+        return query_tail
+
+    def _generate_carryover_external_values(self, options):
+        """ Generates the account.report.external.value objects corresponding to this report's carryover under the provided options.
+
+        In case of multicompany setup, we need to split the carryover per company, for ease of audit, and so that the carryover isn't broken when
+        a company leaves a tax unit.
+
+        We first generate the carryover for the wholy-aggregated report, so that we can see what final result we want.
+        Indeed due to force_between, if_above and if_below conditions, each carryover might be different from the sum of the individidual companies'
+        carryover values. To handle this case, we generate each company's carryover values separately, then do a carryover adjustment on the
+        main company (main for tax units, first one selected else) in order to bring their total to the result we computed for the whole unit.
+        """
+        self.ensure_one()
+
+        if len(options['column_groups']) > 1:
+            # The options must be forged in order to generate carryover values. Entering this conditions means this hasn't been done in the right way.
+            raise UserError(_("Carryover can only be generated for a single column group."))
+
+        # Get the expressions to evaluate from the report
+        carryover_expressions = self.line_ids.expression_ids.filtered(lambda x: x.label.startswith('_carryover_'))
+        expressions_to_evaluate = carryover_expressions._expand_aggregations()
+
+        # Expression totals for all selected companies
+        expression_totals_per_col_group = self._compute_expression_totals_for_each_column_group(expressions_to_evaluate, options)
+        expression_totals = expression_totals_per_col_group[list(options['column_groups'].keys())[0]]
+        carryover_values = {expression: expression_totals[expression]['value'] for expression in carryover_expressions}
+
+        if len(options['companies']) == 1:
+            company = self.env['res.company'].browse(self.get_report_company_ids(options))
+            self._create_carryover_for_company(options, company, {expr: result for expr, result in carryover_values.items()})
+        else:
+            multi_company_carryover_values_sum = defaultdict(lambda: 0)
+
+            column_group_key = next(col_group_key for col_group_key in options['column_groups'])
+            for company_opt in options['companies']:
+                company = self.env['res.company'].browse(company_opt['id'])
+                company_options = {**options, 'companies': [{'id': company.id, 'name': company.name}]}
+                company_expressions_totals = self._compute_expression_totals_for_each_column_group(expressions_to_evaluate, company_options)
+                company_carryover_values = {expression: company_expressions_totals[column_group_key][expression]['value'] for expression in carryover_expressions}
+                self._create_carryover_for_company(options, company, company_carryover_values)
+
+                for carryover_expr, carryover_val in company_carryover_values.items():
+                    multi_company_carryover_values_sum[carryover_expr] += carryover_val
+
+            # Adjust multicompany amounts on main company
+            main_company = self._get_sender_company_for_export(options)
+            for expr in carryover_expressions:
+                difference = carryover_values[expr] - multi_company_carryover_values_sum[expr]
+                self._create_carryover_for_company(options, main_company, {expr: difference}, label=_("Carryover adjustment for tax unit"))
+
+    @api.model
+    def _generate_default_external_values(self, date_from, date_to, is_tax_report=False):
+        """ Generates the account.report.external.value objects for the given dates.
+        If is_tax_report, the values are only created for tax reports, else for all other reports.
+        """
+        options_dict = {}
+        default_expr_by_report = defaultdict(list)
+        tax_report = self.env.ref('account.generic_tax_report')
+        company = self.env.company
+        previous_options = {
+            'date': {
+                'date_from': date_from,
+                'date_to': date_to,
+            }
+        }
+
+        # Get all the default expressions from all reports
+        default_expressions = self.env['account.report.expression'].search([('label', '=like', '_default_%')])
+        # Options depend on the report, also we need to filter out tax report/other reports depending on is_tax_report
+        # Hence we need to group the default expressions by report
+        for expr in default_expressions:
+            report = expr.report_line_id.report_id
+            if is_tax_report == (tax_report in (report + report.root_report_id + report.section_main_report_ids.root_report_id)):
+                if report not in options_dict:
+                    options = report.with_context(allowed_company_ids=[company.id]).get_options(previous_options)
+                    options_dict[report] = options
+
+                if report._is_available_for(options_dict[report]):
+                    default_expr_by_report[report].append(expr)
+
+        external_values_create_vals = []
+        for report, report_default_expressions in default_expr_by_report.items():
+            options = options_dict[report]
+            fpos_options = {options['fiscal_position']}
+
+            for available_fp in options['available_vat_fiscal_positions']:
+                fpos_options.add(available_fp['id'])
+
+            # remove 'all' from fiscal positions if we have several of them - all will then include the sum of other fps
+            # but if there aren't any other fps, we need to keep 'all'
+            if len(fpos_options) > 1 and 'all' in fpos_options:
+                fpos_options.remove('all')
+
+            # The default values should be created for every fiscal position available
+            for fiscal_pos in fpos_options:
+                fiscal_pos_id = int(fiscal_pos) if fiscal_pos not in {'domestic', 'all'} else None
+                fp_options = {**options, 'fiscal_position': fiscal_pos}
+
+                expressions_to_compute = {}
+                for default_expression in report_default_expressions:
+                    # The default expression needs to have the same label as the target external expression, e.g. '_default_balance'
+                    target_label = default_expression.label[len('_default_'):]
+                    target_external_expression = default_expression.report_line_id.expression_ids.filtered(lambda x: x.label == target_label)
+                    # If the value has been created before/modified manually, we shouldn't create anything
+                    # and we won't recompute expression totals for them
+                    external_value = self.env['account.report.external.value'].search([
+                        ('company_id', '=', company.id),
+                        ('date', '>=', date_from),
+                        ('date', '<=', date_to),
+                        ('foreign_vat_fiscal_position_id', '=', fiscal_pos_id),
+                        ('target_report_expression_id', '=', target_external_expression.id),
+                    ])
+
+                    if not external_value:
+                        expressions_to_compute[default_expression] = target_external_expression.id
+
+                # Evaluate the expressions for the report to fetch the value of the default expression
+                # These have to be computed for each fiscal position
+                expression_totals_per_col_group = report.with_company(company)\
+                    ._compute_expression_totals_for_each_column_group(expressions_to_compute, fp_options, include_default_vals=True)
+                expression_totals = expression_totals_per_col_group[list(fp_options['column_groups'].keys())[0]]
+
+                for expression, target_expression in expressions_to_compute.items():
+                    external_values_create_vals.append({
+                        'name': _("Manual value"),
+                        'value': expression_totals[expression]['value'],
+                        'date': date_to,
+                        'target_report_expression_id': target_expression,
+                        'foreign_vat_fiscal_position_id': fiscal_pos_id,
+                        'company_id': company.id,
+                    })
+
+        self.env['account.report.external.value'].create(external_values_create_vals)
+
+    @api.model
+    def _get_sender_company_for_export(self, options):
+        """ Return the sender company when generating an export file from this report.
+            :return: self.env.company if not using a tax unit, else the main company of that unit
+        """
+        if options.get('tax_unit', 'company_only') != 'company_only':
+            tax_unit = self.env['account.tax.unit'].browse(options['tax_unit'])
+            return tax_unit.main_company_id
+
+        report_companies = self.env['res.company'].browse(self.get_report_company_ids(options))
+        options_main_company = report_companies[0]
+
+        if options.get('tax_unit') is not None and options_main_company._get_branches_with_same_vat() == report_companies:
+            # The line with the smallest number of parents in the VAT sub-hierarchy is assumed to be the root
+            return report_companies.sorted(lambda x: len(x.parent_ids))[0]
+        elif options_main_company._all_branches_selected():
+            return options_main_company.root_id
+
+        return options_main_company
+
+    def _create_carryover_for_company(self, options, company, carryover_per_expression, label=None):
+        date_from = options['date']['date_from']
+        date_to = options['date']['date_to']
+        fiscal_position_opt = options['fiscal_position']
+
+        if carryover_per_expression and fiscal_position_opt == 'all':
+            # Not supported, as it wouldn't make sense, and would make the code way more complicated (because of if_below/if_above/force_between,
+            # just in the same way as it is explained below for multi company)
+            raise UserError(_("Cannot generate carryover values for all fiscal positions at once!"))
+
+        external_values_create_vals = []
+        for expression, carryover_value in carryover_per_expression.items():
+            if not company.currency_id.is_zero(carryover_value):
+                target_expression = expression._get_carryover_target_expression(options)
+                external_values_create_vals.append({
+                    'name': label or _("Carryover from %(date_from)s to %(date_to)s", date_from=format_date(self.env, date_from), date_to=format_date(self.env, date_to)),
+                    'value': carryover_value,
+                    'date': date_to,
+                    'target_report_expression_id': target_expression.id,
+                    'foreign_vat_fiscal_position_id': fiscal_position_opt if isinstance(fiscal_position_opt, int) else None,
+                    'carryover_origin_expression_label': expression.label,
+                    'carryover_origin_report_line_id': expression.report_line_id.id,
+                    'company_id': company.id,
+                })
+
+        self.env['account.report.external.value'].create(external_values_create_vals)
+
+    def get_default_report_filename(self, options, extension):
+        """The default to be used for the file when downloading pdf,xlsx,..."""
+        self.ensure_one()
+
+        sections_source_id = options['sections_source_id']
+        if sections_source_id != self.id:
+            sections_source = self.env['account.report'].browse(sections_source_id)
+        else:
+            sections_source = self
+
+        return f"{sections_source.name.lower().replace(' ', '_')}.{extension}"
+
+    def execute_action(self, options, params=None):
+        action_id = int(params.get('actionId'))
+        action = self.env['ir.actions.actions'].sudo().browse([action_id])
+        action_type = action.type
+        action = self.env[action.type].sudo().browse([action_id])
+        action_read = clean_action(action.read()[0], env=action.env)
+
+        if action_type == 'ir.actions.client':
+            # Check if we are opening another report. If so, generate options for it from the current options.
+            if action.tag == 'account_report':
+                target_report = self.env['account.report'].browse(ast.literal_eval(action_read['context'])['report_id'])
+                new_options = target_report.get_options(previous_options=options)
+                action_read.update({'params': {'options': new_options, 'ignore_session': True}})
+
+        if params.get('id'):
+            # Add the id of the calling object in the action's context
+            if isinstance(params['id'], int):
+                # id of the report line might directly be the id of the model we want.
+                model_id = params['id']
+            else:
+                # It can also be a generic account.report id, as defined by _get_generic_line_id
+                model_id = self._get_model_info_from_id(params['id'])[1]
+
+            context = action_read.get('context') and literal_eval(action_read['context']) or {}
+            context.setdefault('active_id', model_id)
+            action_read['context'] = context
+
+        return action_read
+
+    def action_audit_cell(self, options, params):
+        report_line = self.env['account.report.line'].browse(params['report_line_id'])
+        expression_label = params['expression_label']
+        expression = report_line.expression_ids.filtered(lambda x: x.label == expression_label)
+        column_group_options = self._get_column_group_options(options, params['column_group_key'])
+
+        # Audit of external values
+        if expression.engine == 'external':
+            date_from, date_to = self._get_date_bounds_info(column_group_options, expression.date_scope)
+            external_values_domain = [('target_report_expression_id', '=', expression.id), ('date', '<=', date_to)]
+            if date_from:
+                external_values_domain.append(('date', '>=', date_from))
+
+            if expression.formula == 'most_recent':
+                query = self.env['account.report.external.value']._where_calc(external_values_domain)
+                rows = self.env.execute_query(SQL("""
+                    SELECT ARRAY_AGG(id)
+                    FROM %s
+                    WHERE %s
+                    GROUP BY date
+                    ORDER BY date DESC
+                    LIMIT 1
+                """, query.from_clause, query.where_clause or SQL("TRUE")))
+                if rows:
+                    external_values_domain = [('id', 'in', rows[0][0])]
+
+            return {
+                'name': _("Manual values"),
+                'type': 'ir.actions.act_window',
+                'res_model': 'account.report.external.value',
+                'view_mode': 'list',
+                'views': [(False, 'list')],
+                'domain': external_values_domain,
+            }
+
+        # Audit of move lines
+        # If we're auditing a groupby line, we need to make sure to restrict the result of what we audit to the right group values
+        column = next((col for col in report_line.report_id.column_ids if col.expression_label == expression_label), self.env['account.report.column'])
+        if column.custom_audit_action_id:
+            action_dict = column.custom_audit_action_id._get_action_dict()
+        else:
+            action_dict = {
+                'name': _("Journal Items"),
+                'type': 'ir.actions.act_window',
+                'res_model': 'account.move.line',
+                'view_mode': 'list',
+                'views': [(False, 'list')],
+            }
+
+        action = clean_action(action_dict, env=self.env)
+        action['domain'] = self._get_audit_line_domain(column_group_options, expression, params)
+        return action
+
+    def action_view_all_variants(self, options, params):
+        return {
+            'name': _('All Report Variants'),
+            'type': 'ir.actions.act_window',
+            'res_model': 'account.report',
+            'view_mode': 'list',
+            'views': [(False, 'list'), (False, 'form')],
+            'context': {
+                'active_test': False,
+            },
+            'domain': [('id', 'in', self._get_variants(options['variants_source_id']).filtered(
+                lambda x: x._is_available_for(options)
+            ).mapped('id'))],
+        }
+
+    def _get_audit_line_domain(self, column_group_options, expression, params):
+        groupby_domain = self._get_audit_line_groupby_domain(params['calling_line_dict_id'])
+        # Aggregate all domains per date scope, then create the final domain.
+        audit_or_domains_per_date_scope = {}
+        for expression_to_audit in expression._expand_aggregations():
+            expression_domain = self._get_expression_audit_aml_domain(expression_to_audit, column_group_options)
+
+            if expression_domain is None:
+                continue
+
+            date_scope = expression.date_scope if expression.subformula == 'cross_report' else expression_to_audit.date_scope
+            audit_or_domains = audit_or_domains_per_date_scope.setdefault(date_scope, [])
+            audit_or_domains.append(osv.expression.AND([
+                expression_domain,
+                groupby_domain,
+            ]))
+
+        if audit_or_domains_per_date_scope:
+            domain = osv.expression.OR([
+                osv.expression.AND([
+                    osv.expression.OR(audit_or_domains),
+                    self._get_options_domain(column_group_options, date_scope),
+                    groupby_domain,
+                ])
+                for date_scope, audit_or_domains in audit_or_domains_per_date_scope.items()
+            ])
+        else:
+            # Happens when no expression was provided (empty recordset), or if none of the expressions had a standard engine
+            domain = osv.expression.AND([
+                self._get_options_domain(column_group_options, 'strict_range'),
+                groupby_domain,
+            ])
+
+        # Analytic Filter
+        if column_group_options.get("analytic_accounts"):
+            domain = osv.expression.AND([
+                domain,
+                [("analytic_distribution", "in", column_group_options["analytic_accounts"])],
+            ])
+
+        return domain
+
+    def _get_audit_line_groupby_domain(self, calling_line_dict_id):
+        parsed_line_dict_id = self._parse_line_id(calling_line_dict_id)
+        groupby_domain = []
+        for markup, dummy, grouping_key in parsed_line_dict_id:
+            if isinstance(markup, dict) and 'groupby' in markup:
+                groupby_field_name = markup['groupby']
+                custom_handler_model = self._get_custom_handler_model()
+                if custom_handler_model and (custom_groupby_data := self.env[custom_handler_model]._get_custom_groupby_map().get(groupby_field_name)):
+                    groupby_domain += custom_groupby_data['domain_builder'](grouping_key)
+                else:
+                    groupby_domain.append((groupby_field_name, '=', grouping_key))
+
+        return groupby_domain
+
+    def _get_expression_audit_aml_domain(self, expression_to_audit, options):
+        """ Returns the domain used to audit a single provided expression.
+
+        'account_codes' engine's D and C formulas can't be handled by a domain: we make the choice to display
+        everything for them (so, audit shows all the lines that are considered by the formula). To avoid confusion from the user
+        when auditing such lines, a default group by account can be used in the list view.
+        """
+        if expression_to_audit.engine == 'account_codes':
+            formula = expression_to_audit.formula.replace(' ', '')
+
+            account_codes_domains = []
+            for token in ACCOUNT_CODES_ENGINE_SPLIT_REGEX.split(formula.replace(' ', '')):
+                if token:
+                    match_dict = ACCOUNT_CODES_ENGINE_TERM_REGEX.match(token).groupdict()
+                    tag_match = ACCOUNT_CODES_ENGINE_TAG_ID_PREFIX_REGEX.match(match_dict['prefix'])
+                    account_codes_domain = []
+
+                    if tag_match:
+                        if tag_match['ref']:
+                            tag_id = self.env['ir.model.data']._xmlid_to_res_id(tag_match['ref'])
+                        else:
+                            tag_id = int(tag_match['id'])
+
+                        account_codes_domain.append(('account_id.tag_ids', 'in', [tag_id]))
+                    else:
+                        account_codes_domain.append(('account_id.code', '=like', f"{match_dict['prefix']}%"))
+
+                    excluded_prefix_str = match_dict['excluded_prefixes']
+                    if excluded_prefix_str:
+                        for excluded_prefix in excluded_prefix_str.split(','):
+                            # "'not like', prefix%" doesn't work
+                            account_codes_domain += ['!', ('account_id.code', '=like', f"{excluded_prefix}%")]
+
+                    account_codes_domains.append(account_codes_domain)
+
+            return osv.expression.OR(account_codes_domains)
+
+        if expression_to_audit.engine == 'tax_tags':
+            tags = self.env['account.account.tag']._get_tax_tags(expression_to_audit.formula, expression_to_audit.report_line_id.report_id.country_id.id)
+            return [('tax_tag_ids', 'in', tags.ids)]
+
+        if expression_to_audit.engine == 'domain':
+            return ast.literal_eval(expression_to_audit.formula)
+
+        return None
+
+    def open_journal_items(self, options, params):
+        ''' Open the journal items view with the proper filters and groups '''
+        record_model, record_id = self._get_model_info_from_id(params.get('line_id'))
+        view_id = self.env.ref(params['view_ref']).id if params.get('view_ref') else None
+
+        ctx = {
+            'search_default_group_by_account': 1,
+            'search_default_posted': 0 if options.get('all_entries') else 1,
+            'date_from': options.get('date').get('date_from'),
+            'date_to': options.get('date').get('date_to'),
+            'search_default_journal_id': params.get('journal_id', False),
+            'expand': 1,
+        }
+
+        if options['date'].get('date_from'):
+            ctx['search_default_date_between'] = 1
+        else:
+            ctx['search_default_date_before'] = 1
+
+        if options.get('selected_journal_groups'):
+            ctx.update({
+                'search_default_journal_group_id': [options['selected_journal_groups']['id']],
+            })
+
+        journal_type = params.get('journal_type')
+        if journal_type or options.get('selected_journal_groups') and options['selected_journal_groups']['journal_types']:
+            type_to_view_param = {
+                'bank': {
+                    'filter': 'search_default_bank',
+                    'view_id': self.env.ref('account.view_move_line_tree_grouped_bank_cash').id
+                },
+                'cash': {
+                    'filter': 'search_default_cash',
+                    'view_id': self.env.ref('account.view_move_line_tree_grouped_bank_cash').id
+                },
+                'general': {
+                    'filter': 'search_default_misc_filter',
+                    'view_id': self.env.ref('account.view_move_line_tree_grouped_misc').id
+                },
+                'sale': {
+                    'filter': 'search_default_sales',
+                    'view_id': self.env.ref('account.view_move_line_tree_grouped_sales_purchases').id
+                },
+                'purchase': {
+                    'filter': 'search_default_purchases',
+                    'view_id': self.env.ref('account.view_move_line_tree_grouped_sales_purchases').id
+                },
+                'credit': {
+                    'filter': 'search_default_credit',
+                    'view_id': self.env.ref('account.view_move_line_tree').id
+                },
+            }
+            if options.get('selected_journal_groups'):
+                ctx_to_update = {}
+                for journal_type in options['selected_journal_groups']['journal_types']:
+                    ctx_to_update[type_to_view_param[journal_type]['filter']] = 1
+                ctx.update(ctx_to_update)
+            else:
+                ctx.update({
+                    type_to_view_param[journal_type]['filter']: 1,
+                })
+            view_id = type_to_view_param[journal_type]['view_id']
+
+        action_domain = [('display_type', 'not in', ('line_section', 'line_note'))]
+
+        if record_id is None:
+            # Default filters don't support the 'no set' value. For this case, we use a domain on the action instead
+            model_fields_map = {
+                'account.account': 'account_id',
+                'res.partner': 'partner_id',
+                'account.journal': 'journal_id',
+            }
+            model_field = model_fields_map.get(record_model)
+            if model_field:
+                action_domain += [(model_field, '=', False)]
+        else:
+            model_default_filters = {
+                'account.account': 'search_default_account_id',
+                'res.partner': 'search_default_partner_id',
+                'account.journal': 'search_default_journal_id',
+                'product.product': 'search_default_product_id',
+                'product.category': 'search_default_product_category_id',
+            }
+            model_filter = model_default_filters.get(record_model)
+            if model_filter:
+                ctx.update({
+                    'active_id': record_id,
+                    model_filter: [record_id],
+                })
+
+        if options:
+            for account_type in options.get('account_type', []):
+                ctx.update({
+                    f"search_default_{account_type['id']}": account_type['selected'] and 1 or 0,
+                })
+
+            if options.get('journals') and 'search_default_journal_id' not in ctx:
+                selected_journals = [journal['id'] for journal in options['journals'] if journal.get('selected')]
+                if len(selected_journals) == 1:
+                    ctx['search_default_journal_id'] = selected_journals
+
+            if options.get('analytic_accounts'):
+                analytic_ids = [int(r) for r in options['analytic_accounts']]
+                ctx.update({
+                    'search_default_analytic_accounts': 1,
+                    'analytic_ids': analytic_ids,
+                })
+
+        return {
+            'name': self._get_action_name(params, record_model, record_id),
+            'view_mode': 'list,pivot,graph,kanban',
+            'res_model': 'account.move.line',
+            'views': [(view_id, 'list')],
+            'type': 'ir.actions.act_window',
+            'domain': action_domain,
+            'context': ctx,
+        }
+
+    def open_unposted_moves(self, options, params=None):
+        ''' Open the list of draft journal entries that might impact the reporting'''
+        action = self.env["ir.actions.actions"]._for_xml_id("account.action_move_journal_line")
+        action = clean_action(action, env=self.env)
+        action['domain'] = [('state', '=', 'draft'), ('date', '<=', options['date']['date_to'])]
+        #overwrite the context to avoid default filtering on 'misc' journals
+        action['context'] = {}
+        return action
+
+    def _get_generated_deferral_entries_domain(self, options):
+        """Get the search domain for the generated deferral entries of the current period.
+
+        :param options: the report's `options` dict containing `date_from`, `date_to` and `deferred_report_type`
+        :return: a search domain that can be used to get the deferral entries
+        """
+        if options.get('deferred_report_type') == 'expense':
+            account_types = ('expense', 'expense_depreciation', 'expense_direct_cost')
+        else:
+            account_types = ('income', 'income_other')
+        date_to = fields.Date.from_string(options['date']['date_to'])
+        date_to_next_reversal = fields.Date.to_string(date_to + datetime.timedelta(days=1))
+        return [
+            ('company_id', '=', self.env.company.id),
+            # We exclude the reversal entries of the previous period that fall on the first day of this period
+            ('date', '>', options['date']['date_from']),
+            # We include the reversal entries of the current period that fall on the first day of the next period
+            ('date', '<=', date_to_next_reversal),
+            ('deferred_original_move_ids', '!=', False),
+            ('line_ids.account_id.account_type', 'in', account_types),
+            ('state', '!=', 'cancel'),
+        ]
+
+    def open_deferral_entries(self, options, params):
+        domain = self._get_generated_deferral_entries_domain(options)
+        deferral_line_ids = self.env['account.move'].search(domain).line_ids.ids
+        return {
+            'type': 'ir.actions.act_window',
+            'name': _('Deferred Entries'),
+            'res_model': 'account.move.line',
+            'domain': [('id', 'in', deferral_line_ids)],
+            'views': [(False, 'list'), (False, 'form')],
+            'context': {
+                'search_default_group_by_move': True,
+                'expand': True,
+            }
+        }
+
+    def action_modify_manual_value(self, line_id, options, column_group_key, new_value_str, target_expression_id, rounding, json_friendly_column_group_totals):
+        """ Edit a manual value from the report, updating or creating the corresponding account.report.external.value object.
+
+        :param options: The option dict the report is evaluated with.
+
+        :param column_group_key: The string identifying the column group into which the change as manual value needs to be done.
+
+        :param new_value_str: The new value to be set, as a string.
+
+        :param rounding: The number of decimal digits to round with.
+
+        :param json_friendly_column_group_totals: The expression totals by column group already computed for this report, in the format returned
+                                                  by _get_json_friendly_column_group_totals. These will be used to reevaluate the report, recomputing
+                                                  only the expressions depending on the newly-modified manual value, and keeping all the results
+                                                  from the previous computations for the other ones.
+        """
+        self.ensure_one()
+
+        target_column_group_options = self._get_column_group_options(options, column_group_key)
+        self._init_currency_table(target_column_group_options)
+
+        if target_column_group_options.get('compute_budget'):
+            expressions_to_recompute = self.env['account.report.expression'].browse(target_expression_id) \
+                                       + self.line_ids.expression_ids.filtered(lambda x: x.engine == 'aggregation')
+            self._action_modify_manual_budget_value(line_id, target_column_group_options, new_value_str, target_expression_id, rounding)
+        else:
+            expressions_to_recompute = self.line_ids.expression_ids.filtered(lambda x: x.engine in ('external', 'aggregation'))
+            self._action_modify_manual_external_value(target_column_group_options, new_value_str, target_expression_id, rounding)
+
+        # We recompute values for each column group, not only the one we modified a value in; this is important in case some date_scope is used to
+        # retrieve the manual value from a previous period.
+
+        all_column_groups_expression_totals = self._convert_json_friendly_column_group_totals(
+            json_friendly_column_group_totals,
+            expressions_to_exclude=expressions_to_recompute,
+        )
+
+        recomputed_expression_totals = self._compute_expression_totals_for_each_column_group(
+            expressions_to_recompute, options, forced_all_column_groups_expression_totals=all_column_groups_expression_totals)
+
+        return {
+            'lines': self._get_lines(options, all_column_groups_expression_totals=recomputed_expression_totals),
+            'column_groups_totals': self._get_json_friendly_column_group_totals(recomputed_expression_totals),
+        }
+
+    def _convert_json_friendly_column_group_totals(self, json_friendly_column_group_totals, expressions_to_exclude=None, col_groups_to_exclude=None):
+        """ json_friendly_column_group_totals contains ids instead of expressions (because it comes from js) ; this function is used
+        to convert them back to records.
+        """
+        all_column_groups_expression_totals = {}
+        for column_group_key, expression_totals in json_friendly_column_group_totals.items():
+            if col_groups_to_exclude and column_group_key in col_groups_to_exclude:
+                continue
+
+            all_column_groups_expression_totals[column_group_key] = {}
+            for expr_id, expr_totals in expression_totals.items():
+                expression = self.env['account.report.expression'].browse(int(expr_id))  # Should already be in cache, so acceptable
+                if not expressions_to_exclude or expression not in expressions_to_exclude:
+                    all_column_groups_expression_totals[column_group_key][expression] = expr_totals
+
+        return all_column_groups_expression_totals
+
+    def _action_modify_manual_external_value(self, target_column_group_options, new_value_str, target_expression_id, rounding):
+        """ Edit a manual value from the report, updating or creating the corresponding account.report.external.value object.
+
+        :param target_column_group_options: The options dict of the column group where the modification happened.
+
+        :param column_group_key: The string identifying the column group into which the change as manual value needs to be done.
+
+        :param new_value_str: The new value to be set, as a string.
+
+        :param rounding: The number of decimal digits to round with.
+
+        """
+        if len(target_column_group_options['companies']) > 1:
+            raise UserError(_("Editing a manual report line is not allowed when multiple companies are selected."))
+
+        if target_column_group_options['fiscal_position'] == 'all' and target_column_group_options['available_vat_fiscal_positions']:
+            raise UserError(_("Editing a manual report line is not allowed in multivat setup when displaying data from all fiscal positions."))
+
+        # Create the manual value
+        target_expression = self.env['account.report.expression'].browse(target_expression_id)
+        date_from, date_to = self._get_date_bounds_info(target_column_group_options, target_expression.date_scope)
+        fiscal_position_id = target_column_group_options['fiscal_position'] if isinstance(target_column_group_options['fiscal_position'], int) else False
+
+        external_values_domain = [
+            ('target_report_expression_id', '=', target_expression.id),
+            ('company_id', '=', self.env.company.id),
+            ('foreign_vat_fiscal_position_id', '=', fiscal_position_id),
+        ]
+
+        if target_expression.formula == 'most_recent':
+            value_to_adjust = 0
+            existing_value_to_modify = self.env['account.report.external.value'].search([
+                *external_values_domain,
+                ('date', '=', date_to),
+            ])
+
+            # There should be at most 1
+            if len(existing_value_to_modify) > 1:
+                raise UserError(_("Inconsistent data: more than one external value at the same date for a 'most_recent' external line."))
+        else:
+            existing_external_values = self.env['account.report.external.value'].search([
+                *external_values_domain,
+                ('date', '>=', date_from),
+                ('date', '<=', date_to),
+            ], order='date ASC')
+            existing_value_to_modify = existing_external_values[-1] if existing_external_values and str(existing_external_values[-1].date) == date_to  else None
+            value_to_adjust = sum(existing_external_values.filtered(lambda x: x != existing_value_to_modify).mapped('value'))
+
+        if not new_value_str and target_expression.figure_type != 'string':
+            new_value_str = '0'
+
+        try:
+            float(new_value_str)
+            is_number = True
+        except ValueError:
+            is_number = False
+
+        if target_expression.figure_type == 'string':
+            value_to_set = new_value_str
+        else:
+            if not is_number:
+                raise UserError(_("%s is not a numeric value", new_value_str))
+            if target_expression.figure_type == 'boolean':
+                rounding = 0
+            value_to_set = float_round(float(new_value_str) - value_to_adjust, precision_digits=rounding)
+
+        field_name = 'value' if target_expression.figure_type != 'string' else 'text_value'
+
+        if existing_value_to_modify:
+            existing_value_to_modify[field_name] = value_to_set
+            existing_value_to_modify.flush_recordset()
+        else:
+            self.env['account.report.external.value'].create({
+                'name': _("Manual value"),
+                field_name: value_to_set,
+                'date': date_to,
+                'target_report_expression_id': target_expression.id,
+                'company_id': self.env.company.id,
+                'foreign_vat_fiscal_position_id': fiscal_position_id,
+            })
+
+    def _action_modify_manual_budget_value(self, line_id, target_column_group_options, new_value_str, target_expression_id, rounding):
+        target_expression = self.env['account.report.expression'].browse(target_expression_id)
+
+        if not new_value_str and target_expression.figure_type != 'string':
+            new_value_str = '0'
+
+        try:
+            value_to_set = float_round(float(new_value_str), precision_digits=rounding)
+        except ValueError:
+            raise UserError(_("%s is not a numeric value", new_value_str))
+
+        model, account_id = self._get_model_info_from_id(line_id)
+        if model != 'account.account':
+            raise UserError(_("Budget items can only be edited from account lines."))
+
+        # Depending on the expression's formula, the balance of the account could be multiplied by -1
+        # within the report. We need to apply the same multiplier on the budget item we create.
+        if target_expression.engine == 'domain' and target_expression.subformula.startswith('-'):
+            value_to_set *= -1
+        elif target_expression.engine == 'account_codes':
+            account = self.env['account.account'].browse(account_id)
+
+            # Search for the sign to apply to this account
+            for token in ACCOUNT_CODES_ENGINE_SPLIT_REGEX.split(target_expression.formula.replace(' ', '')):
+                if not token:
+                    continue
+
+                token_match = ACCOUNT_CODES_ENGINE_TERM_REGEX.match(token)
+                multiplicator = -1 if token_match['sign'] == '-' else 1
+                prefix = token_match['prefix']
+
+                tag_match = ACCOUNT_CODES_ENGINE_TAG_ID_PREFIX_REGEX.match(prefix)
+                if tag_match:
+                    if tag_match['ref']:
+                        tag = self.env.ref(tag_match['ref'])
+                    else:
+                        tag = self.env['account.account.tag'].browse(tag_match['id'])
+
+                    account_matches = tag in account.tag_ids
+                else:
+                    account_matches = account.code.startswith(prefix)
+
+                if account_matches:
+                    value_to_set *= multiplicator
+                    break
+
+        self.env['account.report.budget'].browse(target_column_group_options['compute_budget'])._create_or_update_budget_items(
+            value_to_set,
+            account_id,
+            rounding,
+            target_column_group_options['date']['date_from'],
+            target_column_group_options['date']['date_to'],
+        )
+
+    def action_display_inactive_sections(self, options):
+        self.ensure_one()
+
+        return {
+            'type': 'ir.actions.act_window',
+            'name': _("Enable Sections"),
+            'view_mode': 'list,form',
+            'res_model': 'account.report',
+            'domain': [('section_main_report_ids', 'in', options['sections_source_id']), ('active', '=', False)],
+            'views': [(False, 'list'), (False, 'form')],
+            'context': {
+                'list_view_ref': 'odex30_account_reports.account_report_add_sections_tree',
+                'active_test': False,
+            },
+        }
+
+    @api.model
+    def sort_lines(self, lines, options, result_as_index=False):
+        ''' Sort report lines based on the 'order_column' key inside the options.
+        The value of options['order_column'] is an integer, positive or negative, indicating on which column
+        to sort and also if it must be an ascending sort (positive value) or a descending sort (negative value).
+        Note that for this reason, its indexing is made starting at 1, not 0.
+        If this key is missing or falsy, lines is returned directly.
+
+        This method has some limitations:
+        - The selected_column must have 'sortable' in its classes.
+        - All lines are sorted except:
+            - lines having the 'total' class
+            - static lines (lines with model 'account.report.line')
+        - This only works when each line has an unique id.
+        - All lines inside the selected_column must have a 'no_format' value.
+
+        Example:
+
+        parent_line_1           balance=11
+            child_line_1        balance=1
+            child_line_2        balance=3
+            child_line_3        balance=2
+            child_line_4        balance=7
+            child_line_5        balance=4
+            child_line_6        (total line)
+        parent_line_2           balance=10
+            child_line_7        balance=5
+            child_line_8        balance=6
+            child_line_9        (total line)
+
+
+        The resulting lines will be:
+
+        parent_line_2           balance=10
+            child_line_7        balance=5
+            child_line_8        balance=6
+            child_line_9        (total line)
+        parent_line_1           balance=11
+            child_line_1        balance=1
+            child_line_3        balance=2
+            child_line_2        balance=3
+            child_line_5        balance=4
+            child_line_4        balance=7
+            child_line_6        (total line)
+
+        :param lines:   The report lines.
+        :param options: The report options.
+        :return:        Lines sorted by the selected column.
+        '''
+        def needs_to_be_at_bottom(line_elem):
+            return self._get_markup(line_elem.get('id')) in ('total', 'load_more')
+
+        def compare_values(a_line, b_line):
+            if column_index is False:
+                return 0
+            type_seq = {
+                type(None): 0,
+                bool: 1,
+                float: 2,
+                int: 2,
+                str: 3,
+                datetime.date: 4,
+                datetime.datetime: 5,
+            }
+
+            a_line_dict = lines[a_line] if result_as_index else a_line
+            b_line_dict = lines[b_line] if result_as_index else b_line
+            a_total = needs_to_be_at_bottom(a_line_dict)
+            b_total = needs_to_be_at_bottom(b_line_dict)
+            a_model = self._get_model_info_from_id(a_line_dict['id'])[0]
+            b_model = self._get_model_info_from_id(b_line_dict['id'])[0]
+
+            # static lines are not sorted
+            if a_model == b_model == 'account.report.line':
+                return 0
+
+            if a_total:
+                if b_total:  # a_total & b_total
+                    return 0
+                else:    # a_total & !b_total
+                    return -1 if descending else 1
+            if b_total:  # => !a_total & b_total
+                return 1 if descending else -1
+
+            a_val = a_line_dict['columns'][column_index].get('no_format')
+            b_val = b_line_dict['columns'][column_index].get('no_format')
+            type_a, type_b = type_seq[type(a_val)], type_seq[type(b_val)]
+
+            if type_a == type_b:
+                return 0 if a_val == b_val else 1 if a_val > b_val else -1
+            else:
+                return type_a - type_b
+
+        def merge_tree(tree_elem, ls):
+            nonlocal descending  # The direction of the sort is needed to compare total lines
+            ls.append(tree_elem)
+
+            elem = tree[lines[tree_elem]['id']] if result_as_index else tree[tree_elem['id']]
+
+            for tree_subelem in sorted(elem, key=comp_key, reverse=descending):
+                merge_tree(tree_subelem, ls)
+
+        descending = options['order_column']['direction'] == 'DESC' # To keep total lines at the end, used in compare_values & merge_tree scopes
+
+        column_index = False
+        for index, col in enumerate(options['columns']):
+            if options['order_column']['expression_label'] == col['expression_label']:
+                column_index = index # To know from which column to sort, used in merge_tree scope
+                break
+
+        comp_key = cmp_to_key(compare_values)
+        sorted_list = []
+        tree = defaultdict(list)
+        non_total_parents = set()
+
+        for index, line in enumerate(lines):
+            line_parent = line.get('parent_id') or None
+
+            if result_as_index:
+                tree[line_parent].append(index)
+            else:
+                tree[line_parent].append(line)
+
+            line_markup = self._get_markup(line['id'])
+
+            if line_markup != 'total':
+                non_total_parents.add(line_parent)
+
+        if None not in tree and len(non_total_parents) == 1:
+            # Happens when unfolding a groupby line, to sort its children.
+            sorting_root = next(iter(non_total_parents))
+        else:
+            sorting_root = None
+
+        for line in sorted(tree[sorting_root], key=comp_key, reverse=descending):
+            merge_tree(line, sorted_list)
+
+        return sorted_list
+
+    def _get_annotations_domain_date_from(self, options):
+        if options['date']['filter'] in {'today', 'custom'} and options['date']['mode'] == 'single':
+            options_company_ids = [company['id'] for company in options['companies']]
+            root_companies_ids = self.env['res.company'].browse(options_company_ids).root_id.ids
+            fiscal_year = self.env['account.fiscal.year'].search_fetch([
+                ('company_id', 'in', root_companies_ids),
+                ('date_from', '<=', options['date']['date_to']),
+                ('date_to', '>=', options['date']['date_to']),
+            ], limit=1, field_names=['date_from'])
+            if fiscal_year:
+                return datetime.datetime.combine(fiscal_year.date_from, datetime.time.min)
+
+            period_date_from, _ = date_utils.get_fiscal_year(
+                datetime.datetime.strptime(options['date']['date_to'], '%Y-%m-%d'),
+                day=self.env.company.fiscalyear_last_day,
+                month=int(self.env.company.fiscalyear_last_month)
+            )
+            return period_date_from
+
+        date_from = datetime.datetime.strptime(options['date']['date_from'], '%Y-%m-%d')
+        if options['date']['period_type'] == "fiscalyear":
+            period_date_from, _ = date_utils.get_fiscal_year(date_from)
+        elif options['date']['period_type'] in ["year", "quarter", "month", "week", "day", "hour"]:
+            period_date_from = date_utils.start_of(date_from, options['date']['period_type'])
+        else:
+            period_date_from = date_from
+        return period_date_from
+
+    def _adjust_date_for_joined_comparison(self, options, period_date_from):
+        comparison_filter = options.get('comparison', {}).get('filter')
+        if comparison_filter == 'previous_period':
+            comparison_date_from = datetime.datetime.strptime(options['comparison'].get('periods', [{}])[-1].get('date_from'), '%Y-%m-%d')
+            return min(period_date_from, comparison_date_from)
+        return period_date_from
+
+    def _adjust_domain_for_unjoined_comparison(self, options, dates_domain):
+        comparison_filter = options.get('comparison', {}).get('filter')
+        if comparison_filter and comparison_filter not in {'no_comparison', 'previous_period'}:
+            unlinked_comparison_periods_domains_list = [
+                ['&', ('date', '>=', period['date_from']), ('date', '<=', period['date_to'])]
+                for period in options['comparison']['periods']
+            ]
+            dates_domain = osv.expression.OR([dates_domain, *unlinked_comparison_periods_domains_list])
+
+        return dates_domain
+
+    def _build_annotations_domain(self, options):
+        domain = [('report_id', '=', options['report_id'])]
+        if options.get('date'):
+            period_date_from = self._get_annotations_domain_date_from(options)
+            period_date_from = self._adjust_date_for_joined_comparison(options, period_date_from)
+            dates_domain = osv.expression.AND([
+                [('date', '>=', period_date_from)],
+                [('date', '<=', options['date']['date_to'])],
+            ])
+            dates_domain = self._adjust_domain_for_unjoined_comparison(options, dates_domain)
+
+            domain = osv.expression.AND([
+                domain,
+                osv.expression.OR([
+                    [('date', '=', False)],
+                    dates_domain,
+                ]),
+            ])
+
+        fiscal_position_option = options.get('fiscal_position')
+        if isinstance(fiscal_position_option, int):
+            domain = osv.expression.AND([domain, [('fiscal_position_id', '=', fiscal_position_option)]])
+        elif fiscal_position_option == 'domestic':
+            domain = osv.expression.AND([domain, [('fiscal_position_id', '=', False)]])
+        return domain
+
+    def get_annotations(self, options):
+        """
+        This method handles which annotations have to be displayed on the report.
+        This decision is based on the different dates and mode of display of those dates in the report.
+
+        param options: dict of options used to generate the report
+        return: dict of lists containing for each annotated line_id of the report the list of annotations linked to it
+        """
+        self.ensure_one()
+        annotations_by_line = defaultdict(list)
+        annotations = self.env['account.report.annotation'].search_read(self._build_annotations_domain(options))
+        for annotation in annotations:
+            line_id_without_tax_grouping = self.env['account.report.annotation']._remove_tax_grouping_from_line_id(annotation['line_id'])
+            annotation['create_date'] = annotation['create_date'].date()
+            annotations_by_line[line_id_without_tax_grouping].append(annotation)
+        return annotations_by_line
+
+    def get_report_information(self, options):
+        """
+        return a dictionary of information that will be consumed by the AccountReport component.
+        """
+        self.ensure_one()
+        self.env.flush_all()
+
+        warnings = {}
+        self._init_currency_table(options)
+        all_column_groups_expression_totals = self._compute_expression_totals_for_each_column_group(self.line_ids.expression_ids, options, warnings=warnings)
+
+        # Convert all_column_groups_expression_totals to a json-friendly form (its keys are records)
+        json_friendly_column_group_totals = self._get_json_friendly_column_group_totals(all_column_groups_expression_totals)
+
+        if self.custom_handler_model_name:
+            custom_display_config = self.env[self.custom_handler_model_name]._get_custom_display_config()
+        elif self.root_report_id and self.root_report_id.custom_handler_model_name:
+            custom_display_config = self.env[self.root_report_id.custom_handler_model_name]._get_custom_display_config()
+        else:
+            custom_display_config = {}
+
+        return {
+            'caret_options': self._get_caret_options(),
+            'column_headers_render_data': self._get_column_headers_render_data(options),
+            'column_groups_totals': json_friendly_column_group_totals,
+            'context': self.env.context,
+            'custom_display': custom_display_config,
+            'filters': {
+                'show_all': self.filter_unfold_all,
+                'show_analytic': options.get('display_analytic', False),
+                'show_analytic_groupby': options.get('display_analytic_groupby', False),
+                'show_analytic_plan_groupby': options.get('display_analytic_plan_groupby', False),
+                'show_draft': self.filter_show_draft,
+                'show_hierarchy': options.get('display_hierarchy_filter', False),
+                'show_period_comparison': self.filter_period_comparison,
+                'show_totals': self.env.company.totals_below_sections and not options.get('ignore_totals_below_sections'),
+                'show_unreconciled': self.filter_unreconciled,
+                'show_hide_0_lines': self.filter_hide_0_lines,
+            },
+            'annotations': self.get_annotations(options),
+            'groups': {
+                'analytic_accounting': self.env.user.has_group('analytic.group_analytic_accounting'),
+                'account_readonly': self.env.user.has_group('account.group_account_readonly'),
+                'account_user': self.env.user.has_group('account.group_account_user'),
+            },
+            'lines': self._get_lines(options, all_column_groups_expression_totals=all_column_groups_expression_totals, warnings=warnings),
+            'warnings': warnings,
+            'report': {
+                'company_name': self.env.company.name,
+                'company_country_code': self.env.company.country_code,
+                'company_currency_symbol': self.env.company.currency_id.symbol,
+                'name': self.name,
+                'root_report_id': self.root_report_id,
+            }
+        }
+
+    @api.readonly
+    def get_report_information_readonly(self, options):
+        """ Readonly version of get_report_information, to be called from RPC when options['readonly_query'] is True,
+        to better spread the load on servers when possible.
+        """
+        return self.get_report_information(options)
+
+    def _get_json_friendly_column_group_totals(self, all_column_groups_expression_totals):
+        # Convert all_column_groups_expression_totals to a json-friendly form (its keys are records)
+        json_friendly_column_group_totals = {}
+        for column_group_key, expressions_totals in all_column_groups_expression_totals.items():
+            json_friendly_column_group_totals[column_group_key] = {expression.id: totals for expression, totals in expressions_totals.items()}
+        return json_friendly_column_group_totals
+
+    def _is_available_for(self, options):
+        """ Called on report variants to know whether they are available for the provided options or not, computed for their root report,
+        computing their availability_condition field.
+
+        Note that only the options initialized by the init_options with a more prioritary sequence than _init_options_variants are guaranteed to
+        be in the provided options' dict (since this function is called by _init_options_variants, while resolving a call to get_options()).
+        """
+        self.ensure_one()
+
+        companies = self.env['res.company'].browse(self.get_report_company_ids(options))
+
+        if self.availability_condition == 'country':
+            countries = companies.account_fiscal_country_id
+            if self.filter_fiscal_position:
+                foreign_vat_fpos = self.env['account.fiscal.position'].search([
+                    ('foreign_vat', '!=', False),
+                    ('company_id', 'in', companies.ids),
+                ])
+                countries += foreign_vat_fpos.country_id
+
+            return not self.country_id or self.country_id in countries
+
+        elif self.availability_condition == 'coa':
+            # When restricting to 'coa', the report is only available is all the companies have the same CoA as the report
+            return self.chart_template in set(companies.mapped('chart_template'))
+
+        return True
+
+    def _get_column_headers_render_data(self, options):
+        column_headers_render_data = {}
+
+        # We only want to consider the columns that are visible in the current report and don't rely on self.column_ids
+        # since custom reports could alter them (e.g. for multi-currency purposes)
+        columns = [col for col in options['columns'] if col['column_group_key'] == next(k for k in options['column_groups'])]
+
+        # Compute the colspan of each header level, aka the number of single columns it contains at the base of the hierarchy
+        level_colspan_list = column_headers_render_data['level_colspan'] = []
+        for i in range(len(options['column_headers'])):
+            colspan = max(len(columns), 1)
+            for column_header in options['column_headers'][i + 1:]:
+                # Separate non-budget and budget headers
+                budget_count = sum(
+                    any(key in header.get('forced_options', {}) for key in ('compute_budget', 'budget_percentage'))
+                    for header in column_header
+                )
+                non_budget_count = len(column_header) - budget_count
+
+                # budget headers (amount and percentage) can only contain a single column each, regardless of the amount of columns in the report.
+                # This implies that we first need to multiply for the 'regular' columns and then add the budget columns.
+                colspan *= non_budget_count
+                colspan += budget_count
+
+            level_colspan_list.append(colspan)
+
+        # Compute the number of times each header level will have to be repeated, and its colspan to properly handle horizontal groups/comparisons
+        column_headers_render_data['level_repetitions'] = []
+        for i in range(len(options['column_headers'])):
+            colspan = 1
+            for column_header in options['column_headers'][:i]:
+                colspan *= len(column_header)
+            column_headers_render_data['level_repetitions'].append(colspan)
+
+        # Custom reports have the possibility to define custom subheaders that will be displayed between the generic header and the column names.
+        column_headers_render_data['custom_subheaders'] = options.get('custom_columns_subheaders', []) * len(options['column_groups'])
+
+        return column_headers_render_data
+
+    def _get_action_name(self, params, record_model=None, record_id=None):
+        if not (record_model or record_id):
+            record_model, record_id = self._get_model_info_from_id(params.get('line_id'))
+        return params.get('name') or self.env[record_model].browse(record_id).display_name or ''
+
+    def _format_lines_for_display(self, lines, options):
+        """
+        This method should be overridden in a report in order to apply specific formatting when printing
+        the report lines.
+
+        Used for example by the carryover functionnality in the generic tax report.
+        :param lines: A list with the lines for this report.
+        :param options: The options for this report.
+        :return: The formatted list of lines
+        """
+        return lines
+
+    def get_expanded_lines(self, options, line_dict_id, groupby, expand_function_name, progress, offset, horizontal_split_side):
+        self.env.flush_all()
+        self._init_currency_table(options)
+
+        lines = self._expand_unfoldable_line(expand_function_name, line_dict_id, groupby, options, progress, offset, horizontal_split_side)
+        lines = self._fully_unfold_lines_if_needed(lines, options)
+
+        self._inject_account_names_for_consolidation(lines)
+
+        if self.custom_handler_model_id:
+            lines = self.env[self.custom_handler_model_name]._custom_line_postprocessor(self, options, lines)
+
+        self._format_column_values(options, lines)
+        return lines
+
+    @api.readonly
+    def get_expanded_lines_readonly(self, options, line_dict_id, groupby, expand_function_name, progress, offset, horizontal_split_side):
+        """ Readonly version of get_expanded_lines_readonly, to be called from RPC when options['readonly_query'] is True,
+        to better spread the load on servers when possible.
+        """
+        return self.get_expanded_lines(options, line_dict_id, groupby, expand_function_name, progress, offset, horizontal_split_side)
+
+    def _expand_unfoldable_line(self, expand_function_name, line_dict_id, groupby, options, progress, offset, horizontal_split_side, unfold_all_batch_data=None):
+        if not expand_function_name:
+            raise UserError(_("Trying to expand a line without an expansion function."))
+
+        if not progress:
+            progress = {column_group_key: 0 for column_group_key in options['column_groups']}
+
+        expand_function = self._get_custom_report_function(expand_function_name, 'expand_unfoldable_line')
+        expansion_result = expand_function(line_dict_id, groupby, options, progress, offset, unfold_all_batch_data=unfold_all_batch_data)
+
+        rslt = expansion_result['lines']
+
+        if horizontal_split_side:
+            for line in rslt:
+                line['horizontal_split_side'] = horizontal_split_side
+
+        # Apply integer rounding to the result if needed.
+        # The groupby expansion function is the only one guaranteed to call the expressions computation,
+        # so the values computed for it will already have been rounded if integer rounding is enabled. No need to round them again.
+        if expand_function_name != '_report_expand_unfoldable_line_with_groupby':
+            self._apply_integer_rounding_to_dynamic_lines(options, rslt)
+
+        if expansion_result.get('has_more'):
+            # We only add load_more line for groupby
+            next_offset = offset + expansion_result['offset_increment']
+            rslt.append(self._get_load_more_line(next_offset, line_dict_id, expand_function_name, groupby, expansion_result.get('progress', 0), options))
+
+        # In some specific cases, we may want to add lines that are always at the end. So they need to be added after the load more line.
+        if expansion_result.get('after_load_more_lines'):
+            rslt.extend(expansion_result['after_load_more_lines'])
+
+        return self._add_totals_below_sections(rslt, options)
+
+    def _add_totals_below_sections(self, lines, options):
+        """ Returns a new list, corresponding to lines with the required total lines added as sublines of the sections it contains.
+        """
+        if not self.env.company.totals_below_sections or options.get('ignore_totals_below_sections'):
+            return lines
+
+        # Gather the lines needing the totals
+        lines_needing_total_below = set()
+        for line_dict in lines:
+            line_markup = self._get_markup(line_dict['id'])
+
+            if line_markup != 'total':
+                # If we are on the first level of an expandable line, we arelady generate its total
+                if line_dict.get('unfoldable') or (line_dict.get('unfolded') and line_dict.get('expand_function')):
+                    lines_needing_total_below.add(line_dict['id'])
+
+                # All lines that are parent of other lines need to receive a total
+                line_parent_id = line_dict.get('parent_id')
+                if line_parent_id:
+                    lines_needing_total_below.add(line_parent_id)
+
+        # Inject the totals
+        if lines_needing_total_below:
+            lines_with_totals_below = []
+            totals_below_stack = []
+            for line_dict in lines:
+                while totals_below_stack and not line_dict['id'].startswith(totals_below_stack[-1]['parent_id'] + LINE_ID_HIERARCHY_DELIMITER):
+                    lines_with_totals_below.append(totals_below_stack.pop())
+
+                lines_with_totals_below.append(line_dict)
+
+                if line_dict['id'] in lines_needing_total_below and any(col.get('no_format') is not None for col in line_dict['columns']):
+                    totals_below_stack.append(self._generate_total_below_section_line(line_dict))
+
+            while totals_below_stack:
+                lines_with_totals_below.append(totals_below_stack.pop())
+
+            return lines_with_totals_below
+
+        return lines
+
+    @api.model
+    def _get_load_more_line(self, offset, parent_line_id, expand_function_name, groupby, progress, options):
+        """ Returns a 'Load more' line allowing to reach the subsequent elements of an unfolded line with an expand function if the maximum
+        limit of sublines is reached (we load them by batch, using the load_more_limit field's value).
+
+        :param offset: The offset to be passed to the expand function to generate the next results, when clicking on this 'load more' line.
+
+        :param parent_line_id: The generic id of the line this load more line is created for.
+
+        :param expand_function_name: The name of the expand function this load_more is created for (so, the one of its parent).
+
+        :param progress: A json-formatted dict(column_group_key, value) containing the progress value for each column group, as it was
+                         returned by the expand function. This is for example used by reports such as the general ledger, whose lines display a c
+                         cumulative sum of their balance and the one of all the previous lines under the same parent. In this case, progress
+                         will be the total sum of all the previous lines before the load_more line, that the subsequent lines will need to use as
+                         base for their own cumulative sum.
+
+        :param options: The options dict corresponding to this report's state.
+        """
+        return {
+            'id': self._get_generic_line_id(None, None, parent_line_id=parent_line_id, markup='load_more'),
+            'name': _("Load more..."),
+            'parent_id': parent_line_id,
+            'expand_function': expand_function_name,
+            'columns': [{} for col in options['columns']],
+            'unfoldable': False,
+            'unfolded': False,
+            'offset': offset,
+            'groupby': groupby, # We keep the groupby value from the parent, so that it can be propagated through js
+            'progress': progress,
+        }
+
+    def _report_expand_unfoldable_line_with_groupby(self, line_dict_id, groupby, options, progress, offset, unfold_all_batch_data=None):
+        # The line we're expanding might be an inner groupby; we first need to find the report line generating it
+        report_line_id = None
+        for dummy, model, model_id in reversed(self._parse_line_id(line_dict_id)):
+            if model == 'account.report.line':
+                report_line_id = model_id
+                break
+
+        if report_line_id is None:
+            raise UserError(_("Trying to expand a group for a line which was not generated by a report line: %s", line_dict_id))
+
+        line = self.env['account.report.line'].browse(report_line_id)
+
+        if ',' not in groupby and options['export_mode'] is None:
+            # if ',' not in groupby, then its a terminal groupby (like 'id' in 'partner_id, id'), so we can use the 'load more' feature if necessary
+            # When printing, we want to ignore the limit.
+            limit_to_load = self.load_more_limit or None
+        else:
+            # Else, we disable it
+            limit_to_load = None
+            offset = 0
+
+        rslt_lines = line._expand_groupby(line_dict_id, groupby, options, offset=offset, limit=limit_to_load, load_one_more=bool(limit_to_load), unfold_all_batch_data=unfold_all_batch_data)
+        lines_to_load = rslt_lines[:self.load_more_limit] if limit_to_load else rslt_lines
+
+        if not limit_to_load and options['export_mode'] is None:
+            lines_to_load = self._regroup_lines_by_name_prefix(options, rslt_lines, '_report_expand_unfoldable_line_groupby_prefix_group', line.hierarchy_level,
+                                                               groupby=groupby, parent_line_dict_id=line_dict_id)
+
+        return {
+            'lines': lines_to_load,
+            'offset_increment': len(lines_to_load),
+            'has_more': len(lines_to_load) < len(rslt_lines) if limit_to_load else False,
+        }
+
+    def _regroup_lines_by_name_prefix(self, options, lines_to_group, expand_function_name, parent_level, matched_prefix='', groupby=None, parent_line_dict_id=None):
+        """ Postprocesses a list of report line dictionaries in order to regroup them by name prefix and reduce the overall number of lines
+        if their number is above a provided threshold (set in the report configuration).
+
+        The lines regrouped under a common prefix will be removed from the returned list of lines; only the prefix line will stay, folded.
+        Its expand function must ensure the right sublines are reloaded when unfolding it.
+
+        :param options: Option dict for this report.
+        :lines_to_group: The lines list to regroup by prefix if necessary. They must all have the same parent line (which might be no line at all).
+        :expand_function_name: Name of the expand function to be called on created prefix group lines, when unfolding them
+        :parent_level: Level of the parent line, which generated the lines in lines_to_group. It will be used to compute the level of the prefix group lines.
+        :matched_prefix': A string containing the parent prefix that's already matched. For example, when computing prefix 'ABC', matched_prefix will be 'AB'.
+        :groupby: groupby value of the parent line, which generated the lines in lines_to_group.
+        :parent_line_dict_id: id of the parent line, which generated the lines in lines_to_group.
+
+        :return: lines_to_group, grouped by prefix if it was necessary.
+        """
+        threshold = options['prefix_groups_threshold']
+
+        # When grouping by prefix, we ignore the totals
+        lines_to_group_without_totals = list(filter(lambda x: self._get_markup(x['id']) != 'total', lines_to_group))
+
+        if options['export_mode'] == 'print' or threshold <= 0 or len(lines_to_group_without_totals) < threshold:
+            # No grouping needs to be done
+            return lines_to_group
+
+        char_index = len(matched_prefix)
+        prefix_groups = defaultdict(list)
+        rslt = []
+        for line in lines_to_group_without_totals:
+            line_name = line['name'].strip()
+
+            if len(line_name) - 1 < char_index:
+                rslt.append(line)
+            else:
+                prefix_groups[line_name[char_index].lower()].append(line)
+
+        float_figure_types = {'monetary', 'integer', 'float'}
+        unfold_all = options['export_mode'] == 'print' or options.get('unfold_all')
+        for prefix_key, prefix_sublines in sorted(prefix_groups.items(), key=lambda x: x[0]):
+            # Compute the total of this prefix line, summming all of its content
+            prefix_expression_totals_by_group = {}
+            for column_index, column_data in enumerate(options['columns']):
+                if column_data['figure_type'] in float_figure_types:
+                    # Then we want to sum this column's value in our children
+                    for prefix_subline in prefix_sublines:
+                        prefix_expr_label_result = prefix_expression_totals_by_group.setdefault(column_data['column_group_key'], {})
+                        prefix_expr_label_result.setdefault(column_data['expression_label'], 0)
+                        prefix_expr_label_result[column_data['expression_label']] += (prefix_subline['columns'][column_index]['no_format'] or 0)
+
+            column_values = []
+            for column in options['columns']:
+                col_value = prefix_expression_totals_by_group.get(column['column_group_key'], {}).get(column['expression_label'])
+
+                column_values.append(self._build_column_dict(col_value, column, options=options))
+
+            line_id = self._get_generic_line_id(None, None, parent_line_id=parent_line_dict_id, markup={'groupby_prefix_group': prefix_key})
+
+            sublines_nber = len(prefix_sublines)
+            prefix_to_display = prefix_key.upper()
+
+            if re.match(r'\s', prefix_to_display[-1]):
+                # In case the last character of the prefix to_display is blank, replace it by "[ ]", to make the space more visible to the user.
+                prefix_to_display = f'{prefix_to_display[:-1]}[ ]'
+
+            if sublines_nber == 1:
+                prefix_group_line_name = f"{matched_prefix}{prefix_to_display} " + _("(1 line)")
+            else:
+                prefix_group_line_name = f"{matched_prefix}{prefix_to_display} " + _("(%s lines)", sublines_nber)
+
+            prefix_group_line = {
+                'id': line_id,
+                'name': prefix_group_line_name,
+                'unfoldable': True,
+                'unfolded': unfold_all or line_id in options['unfolded_lines'],
+                'columns': column_values,
+                'groupby': groupby,
+                'level': parent_level + 1,
+                'parent_id': parent_line_dict_id,
+                'expand_function': expand_function_name,
+                'hide_line_buttons': True,
+            }
+            rslt.append(prefix_group_line)
+
+        return rslt
+
+    def _report_expand_unfoldable_line_groupby_prefix_group(self, line_dict_id, groupby, options, progress, offset, unfold_all_batch_data=None):
+        """ Expand function used by prefix_group lines generated for groupby lines.
+        """
+        report_line_id = None
+        parent_groupby_count = 0
+        for markup, model, model_id in reversed(self._parse_line_id(line_dict_id)):
+            if model == 'account.report.line':
+                report_line_id = model_id
+                break
+            elif isinstance(markup, dict) and 'groupby' in markup or 'groupby_prefix_group' in markup:
+                parent_groupby_count += 1
+
+        if report_line_id is None:
+            raise UserError(_("Trying to expand a group for a line which was not generated by a report line: %s", line_dict_id))
+
+        report_line = self.env['account.report.line'].browse(report_line_id)
+
+
+        matched_prefix = self._get_prefix_groups_matched_prefix_from_line_id(line_dict_id)
+        first_groupby = groupby.split(',')[0]
+        expand_options = {
+            **options,
+            'forced_domain': options.get('forced_domain', []) + [(f"{f'{first_groupby}.' if first_groupby != 'id' else ''}name", '=ilike', f'{matched_prefix}%')]
+        }
+        expanded_groupby_lines = report_line._expand_groupby(line_dict_id, groupby, expand_options)
+        parent_level = report_line.hierarchy_level + parent_groupby_count * 2
+
+        lines = self._regroup_lines_by_name_prefix(
+            options,
+            expanded_groupby_lines,
+            '_report_expand_unfoldable_line_groupby_prefix_group',
+            parent_level,
+            groupby=groupby,
+            matched_prefix=matched_prefix,
+            parent_line_dict_id=line_dict_id,
+        )
+
+        return {
+            'lines': lines,
+            'offset_increment': len(lines),
+            'has_more': False,
+        }
+
+    @api.model
+    def _get_prefix_groups_matched_prefix_from_line_id(self, line_dict_id):
+        matched_prefix = ''
+        for markup, dummy1, dummy2 in self._parse_line_id(line_dict_id):
+            if markup and isinstance(markup, dict) and 'groupby_prefix_group' in markup:
+                prefix_piece = markup['groupby_prefix_group']
+                matched_prefix += prefix_piece.upper()
+            else:
+                # Might happen if a groupby is grouped by prefix, then a subgroupby is grouped by another subprefix.
+                # In this case, we want to reset the prefix group to only consider the one used in the subgroupby.
+                matched_prefix = ''
+
+        return matched_prefix
+
+    @api.model
+    def format_value(self, options, value, figure_type, format_params=None):
+        if format_params is None:
+            format_params = {}
+
+        if 'currency' in format_params:
+            format_params['currency'] = self.env['res.currency'].browse(format_params['currency'].id)
+
+        return self._format_value(options=options, value=value, figure_type=figure_type, format_params=format_params)
+
+    def _format_value(self, options, value, figure_type, format_params=None):
+        """ Formats a value for display in a report (not especially numerical). figure_type provides the type of formatting we want.
+        """
+        if value is None:
+            return ''
+
+        if figure_type == 'none':
+            return value
+
+        if isinstance(value, str) or figure_type == 'string':
+            return str(value)
+
+        if format_params is None:
+            format_params = {}
+
+        formatLang_params = {
+            'rounding_method': 'HALF-UP',
+            'rounding_unit': options.get('rounding_unit'),
+        }
+
+        if figure_type == 'monetary':
+            currency = self.env['res.currency'].browse(format_params['currency_id']) if 'currency_id' in format_params else self.env.company.currency_id
+            if options.get('multi_currency'):
+                formatLang_params['currency_obj'] = currency
+            else:
+                formatLang_params['digits'] = currency.decimal_places
+
+        elif figure_type == 'integer':
+            formatLang_params['digits'] = 0
+
+        elif figure_type == 'boolean':
+            return _("Yes") if bool(value) else _("No")
+
+        elif figure_type in ('date', 'datetime'):
+            return format_date(self.env, value)
+
+        else:
+            formatLang_params['digits'] = format_params.get('digits', 1)
+
+        if self._is_value_zero(value, figure_type, format_params):
+            # Make sure -0.0 becomes 0.0
+            value = abs(value)
+
+        if self._context.get('no_format'):
+            return value
+
+        formatted_amount = formatLang(self.env, value, **formatLang_params)
+
+        if figure_type == 'percentage':
+            return f"{formatted_amount}%"
+
+        return formatted_amount
+
+    @api.model
+    def _is_value_zero(self, amount, figure_type, format_params):
+        if amount is None:
+            return True
+
+        if figure_type == 'monetary':
+            currency = self.env['res.currency'].browse(format_params['currency_id']) if 'currency_id' in format_params else self.env.company.currency_id
+            return currency.is_zero(amount)
+        elif figure_type in NUMBER_FIGURE_TYPES:
+            return float_is_zero(amount, precision_digits=format_params.get('digits', 0))
+        else:
+            return False
+
+    def format_date(self, options, dt_filter='date'):
+        date_from = fields.Date.from_string(options[dt_filter]['date_from'])
+        date_to = fields.Date.from_string(options[dt_filter]['date_to'])
+        return self._get_dates_period(date_from, date_to, options['date']['mode'])['string']
+
+    def export_file(self, options, file_generator):
+        self.ensure_one()
+
+        export_options = {**options, 'export_mode': 'file'}
+
+        return {
+            'type': 'ir_actions_account_report_download',
+            'data': {
+                'options': json.dumps(export_options),
+                'file_generator': file_generator,
+            }
+        }
+
+    def _get_report_send_recipients(self, options):
+        custom_handler_model = self._get_custom_handler_model()
+        if custom_handler_model and hasattr(self.env[custom_handler_model], '_get_report_send_recipients'):
+            return self.env[custom_handler_model]._get_report_send_recipients(options)
+        return self.env['res.partner']
+
+    def export_to_pdf(self, options):
+        self.ensure_one()
+
+        base_url = self.env['ir.config_parameter'].sudo().get_param('report.url') or self.env['ir.config_parameter'].sudo().get_param('web.base.url')
+        rcontext = {
+            'mode': 'print',
+            'base_url': base_url,
+            'company': self.env.company,
+        }
+
+        print_options = self.get_options(previous_options={**options, 'export_mode': 'print'})
+        if print_options['sections']:
+            reports_to_print = self.env['account.report'].browse([section['id'] for section in print_options['sections']])
+        else:
+            reports_to_print = self
+
+        reports_options = []
+        for report in reports_to_print:
+            reports_options.append(report.get_options(previous_options={**print_options, 'selected_section_id': report.id}))
+
+        grouped_reports_by_format = groupby(
+            zip(reports_to_print, reports_options),
+            key=lambda report: len(report[1]['columns']) > 5 or report[1].get('horizontal_split')
+        )
+
+        footer = self.env['ir.actions.report']._render_template("odex30_account_reports.internal_layout", values=rcontext)
+        footer = self.env['ir.actions.report']._render_template("web.minimal_layout", values=dict(rcontext, subst=True, body=markupsafe.Markup(footer.decode())))
+
+        action_report = self.env['ir.actions.report']
+        files_stream = []
+        for is_landscape, reports_with_options in grouped_reports_by_format:
+            bodies = []
+
+            for report, report_options in reports_with_options:
+                bodies.append(report._get_pdf_export_html(
+                    report_options,
+                    report._filter_out_folded_children(report._get_lines(report_options)),
+                    additional_context={'base_url': base_url}
+                ))
+
+            files_stream.append(
+                io.BytesIO(action_report._run_wkhtmltopdf(
+                    bodies,
+                    footer=footer.decode(),
+                    landscape=is_landscape or self._context.get('force_landscape_printing'),
+                    specific_paperformat_args={
+                        'data-report-margin-top': 10,
+                        'data-report-header-spacing': 10,
+                        'data-report-margin-bottom': 15,
+                    }
+                )
+            ))
+
+        if len(files_stream) > 1:
+            result_stream = action_report._merge_pdfs(files_stream)
+            result = result_stream.getvalue()
+            # Close the different stream
+            result_stream.close()
+            for file_stream in files_stream:
+                file_stream.close()
+        else:
+            result = files_stream[0].read()
+
+        return {
+            'file_name': self.get_default_report_filename(options, 'pdf'),
+            'file_content': result,
+            'file_type': 'pdf',
+        }
+
+    def _get_pdf_export_html(self, options, lines, additional_context=None, template=None):
+        report_info = self.get_report_information(options)
+
+        custom_print_templates = report_info['custom_display'].get('pdf_export', {})
+        template = custom_print_templates.get('pdf_export_main', 'odex30_account_reports.pdf_export_main')
+
+        render_values = {
+            'report': self,
+            'report_title': self.name,
+            'options': options,
+            'table_start': markupsafe.Markup('<tbody>'),
+            'table_end': markupsafe.Markup('''
+                </tbody></table></div>
+                <div style="page-break-after: always"></div>
+                <div class="d-flex align-items-start">
+                <table class="o_table">
+            '''),
+            'column_headers_render_data': self._get_column_headers_render_data(options),
+            'custom_templates': custom_print_templates,
+        }
+        if additional_context:
+            render_values.update(additional_context)
+
+        if options.get('order_column'):
+            lines = self.sort_lines(lines, options)
+
+        lines = self._format_lines_for_display(lines, options)
+
+        render_values['lines'] = lines
+
+        # Manage annotations.
+        render_values['annotations'] = self._build_annotations_list_for_pdf_export(options['date'], lines, report_info['annotations'])
+
+        options['css_custom_class'] = report_info['custom_display'].get('css_custom_class', '')
+
+        # Render.
+        return self.env['ir.qweb']._render(template, render_values)
+
+    def _build_annotations_list_for_pdf_export(self, date_options, lines, annotations_per_line_id):
+        annotations_to_render = []
+        number = 0
+        for line in lines:
+            if line_annotations := annotations_per_line_id.get(line['id']):
+                line['annotations'] = []
+                for annotation in line_annotations:
+                    report_period_date_from = datetime.datetime.strptime(date_options['date_from'], '%Y-%m-%d').date()
+                    report_period_date_to = datetime.datetime.strptime(date_options['date_to'], '%Y-%m-%d').date()
+                    if not annotation['date'] or report_period_date_from <= annotation['date'] <= report_period_date_to:
+                        number += 1
+                        line['annotations'].append(str(number))
+                        annotations_to_render.append({
+                            'number': str(number),
+                            'text': annotation['text'],
+                            'date': format_date(self.env, annotation['date']) if annotation['date'] else None,
+                        })
+        return annotations_to_render
+
+    def _filter_out_folded_children(self, lines):
+        """ Returns a list containing all the lines of the provided list that need to be displayed when printing,
+        hence removing the children whose parent is folded (especially useful to remove total lines).
+        """
+        rslt = []
+        folded_lines = set()
+        for line in lines:
+            if line.get('unfoldable') and not line.get('unfolded'):
+                folded_lines.add(line['id'])
+
+            if 'parent_id' not in line or line['parent_id'] not in folded_lines:
+                rslt.append(line)
+        return rslt
+
+    def export_to_xlsx(self, options, response=None):
+        def add_worksheet_unique_name(workbook, sheet_name):
+            existing_names = set(workbook.sheetnames.keys())
+            count = 1
+            max_length = 31
+            new_sheet_name = sheet_name[:max_length]
+
+            while new_sheet_name in existing_names:
+                suffix = f" ({count})"
+                truncated_name = sheet_name[:max_length - len(suffix)]
+                new_sheet_name = f"{truncated_name}{suffix}"
+                count += 1
+            return workbook.add_worksheet(new_sheet_name)
+
+        self.ensure_one()
+        output = io.BytesIO()
+        workbook = xlsxwriter.Workbook(output, {
+            'in_memory': True,
+            'strings_to_formulas': False,
+        })
+
+        print_options = self.get_options(previous_options={**options, 'export_mode': 'print'})
+        if print_options['sections']:
+            reports_to_print = self.env['account.report'].browse([section['id'] for section in print_options['sections']])
+        else:
+            reports_to_print = self
+
+        reports_options = []
+        for report in reports_to_print:
+            report_options = report.get_options(previous_options={**print_options, 'selected_section_id': report.id})
+            reports_options.append(report_options)
+            report._inject_report_into_xlsx_sheet(report_options, workbook, add_worksheet_unique_name(workbook, report.name))
+
+        self._add_options_xlsx_sheet(workbook, reports_options)
+
+        workbook.close()
+        output.seek(0)
+        generated_file = output.read()
+        output.close()
+
+        return {
+            'file_name': self.get_default_report_filename(options, 'xlsx'),
+            'file_content': generated_file,
+            'file_type': 'xlsx',
+        }
+
+    @api.model
+    def _set_xlsx_cell_sizes(self, sheet, fonts, col, row, value, style, has_colspan):
+        """ This small helper will resize the cells if needed, to allow to get a better output. """
+        def get_string_width(font, string):
+            return font.getlength(string) / 5
+
+        # Get the correct font for the row style
+        font_type = ('Bol' if style.bold else 'Reg') + ('Ita' if style.italic else '')
+        report_font = fonts[font_type]
+
+        # 8.43 is the default width of a column in Excel.
+        if parse_version(xlsxwriter.__version__) >= parse_version('3.0.6'):
+            # cols_sizes was removed in 3.0.6 and colinfo was replaced by col_info
+            try:
+                col_width = sheet.col_info[col][0]
+            except KeyError:
+                col_width = 8.43
+        else:
+            col_width = sheet.col_sizes.get(col, [8.43])[0]
+
+        row_height = sheet.row_sizes.get(row, [8.43])[0]
+
+        if value is None:
+            value = ''
+        else:
+            try:  # noqa: SIM105
+                # This is needed, otherwise we could compute width on very long number such as 12.0999999998
+                # which wouldn't show well in the end result as the numbers are rounded.
+                value = float_repr(float(value), self.env.company.currency_id.decimal_places)
+            except (ValueError, OverflowError):
+                pass
+
+        # Start by computing the width of the cell if we are not using colspans.
+        if not has_colspan:
+            # Ensure to take indents into account when computing the width.
+            formatted_value = f"{'  ' * style.indent}{value}"
+            width = get_string_width(
+                report_font,
+                max(formatted_value.split('\n'), key=lambda line: get_string_width(report_font, line))
+            )
+            # We set the width if it is bigger than the current one, with a limit at 75 (max to avoid taking excessive space).
+            if width > col_width:
+                sheet.set_column(col, col, min(width + 4, 75))  # We need to add a little extra padding to ensure our columns are not clipping the text
+
+    def _get_xlsx_export_fonts(self):
+        """ Get the bold, italic and regular LATO font information so that we can use them for format purposes. """
+        fonts = {}
+        for font_type in ('Reg', 'Bol', 'RegIta', 'BolIta'):
+            try:
+                lato_path = f'web/static/fonts/lato/Lato-{font_type}-webfont.ttf'
+                fonts[font_type] = ImageFont.truetype(file_path(lato_path), 12)
+            except (OSError, FileNotFoundError):
+                # This won't give great result, but it will work.
+                fonts[font_type] = ImageFont.load_default()
+        return fonts
+
+    def _inject_report_into_xlsx_sheet(self, options, workbook, sheet):
+        fonts = self._get_xlsx_export_fonts()
+
+        def write_cell(sheet, x, y, value, style, colspan=1, datetime=False):
+            self._set_xlsx_cell_sizes(sheet, fonts, x, y, value, style, colspan > 1)
+            if colspan == 1:
+                if datetime:
+                    sheet.write_datetime(y, x, value, style)
+                else:
+                    sheet.write(y, x, value, style)
+            else:
+                sheet.merge_range(y, x, y, x + colspan - 1, value, style)
+
+        default_format_props = {'font_name': 'Lato', 'font_size': 12, 'font_color': '#666666', 'num_format': '#,##0.00'}
+        text_format_props = {'font_name': 'Lato', 'font_size': 12, 'font_color': '#666666'}
+        date_format_props = {'font_name': 'Lato', 'font_size': 12, 'font_color': '#666666', 'align': 'left', 'num_format': 'yyyy-mm-dd'}
+        title_format = workbook.add_format({'font_name': 'Lato', 'font_size': 12, 'bold': True, 'bottom': 2})
+        annotation_format = workbook.add_format({**text_format_props, 'text_wrap': True})
+        workbook_formats = {
+            0: {
+                'default': workbook.add_format({**default_format_props, 'bold': True, 'font_size': 13, 'bottom': 6}),
+                'text': workbook.add_format({**text_format_props, 'bold': True, 'font_size': 13, 'bottom': 6}),
+                'date': workbook.add_format({**date_format_props, 'bold': True, 'font_size': 13, 'bottom': 6}),
+                'total': workbook.add_format({**default_format_props, 'bold': True, 'font_size': 13, 'bottom': 6}),
+            },
+            1: {
+                'default': workbook.add_format({**default_format_props, 'bold': True, 'font_size': 13, 'bottom': 1}),
+                'text': workbook.add_format({**text_format_props, 'bold': True, 'font_size': 13, 'bottom': 1}),
+                'date': workbook.add_format({**date_format_props, 'bold': True, 'font_size': 13, 'bottom': 1}),
+                'total': workbook.add_format({**default_format_props, 'bold': True, 'font_size': 13, 'bottom': 1}),
+                'default_indent': workbook.add_format({**default_format_props, 'bold': True, 'font_size': 13, 'bottom': 1, 'indent': 1}),
+                'date_indent': workbook.add_format({**date_format_props, 'bold': True, 'font_size': 13, 'bottom': 1, 'indent': 1}),
+            },
+            2: {
+                'default': workbook.add_format({**default_format_props, 'bold': True}),
+                'text': workbook.add_format({**text_format_props, 'bold': True}),
+                'date': workbook.add_format({**date_format_props, 'bold': True}),
+                'initial': workbook.add_format(default_format_props),
+                'total': workbook.add_format({**default_format_props, 'bold': True}),
+                'default_indent': workbook.add_format({**default_format_props, 'bold': True, 'indent': 2}),
+                'date_indent': workbook.add_format({**date_format_props, 'bold': True, 'indent': 2}),
+                'initial_indent': workbook.add_format({**default_format_props, 'indent': 2}),
+                'total_indent': workbook.add_format({**default_format_props, 'bold': True, 'indent': 1}),
+            },
+            'default': {
+                'default': workbook.add_format(default_format_props),
+                'text': workbook.add_format(text_format_props),
+                'date': workbook.add_format(date_format_props),
+                'total': workbook.add_format(default_format_props),
+                'default_indent': workbook.add_format({**default_format_props, 'indent': 2}),
+                'date_indent': workbook.add_format({**date_format_props, 'indent': 2}),
+                'total_indent': workbook.add_format({**default_format_props, 'indent': 2}),
+            },
+        }
+
+        def get_format(content_type='default', level='default'):
+            if isinstance(level, int) and level not in workbook_formats:
+                workbook_formats[level] = {
+                    **workbook_formats['default'],
+                    'default_indent': workbook.add_format({**default_format_props, 'indent': level}),
+                    'date_indent': workbook.add_format({**date_format_props, 'indent': level}),
+                    'total_indent': workbook.add_format({**default_format_props, 'bold': True, 'indent': level - 1}),
+                }
+
+            level_formats = workbook_formats[level]
+            if '_indent' in content_type and not level_formats.get(content_type):
+                return level_formats.get('default_indent', level_formats.get(content_type.removesuffix('_indent'), level_formats['default']))
+            return level_formats.get(content_type, level_formats['default'])
+
+        print_mode_self = self.with_context(no_format=True)
+        lines = self._filter_out_folded_children(print_mode_self._get_lines(options))
+        annotations = self.get_annotations(options)
+
+        # For reports with lines generated for accounts, the account name and codes are shown in a single column.
+        # To help user post-process the report if they need, we should in such a case split the account name and code in two columns.
+        account_lines_split_names = {}
+        for line in lines:
+            line_model = self._get_model_info_from_id(line['id'])[0]
+            if line_model == 'account.account':
+                # Reuse the _split_code_name to split the name and code in two values.
+                account_lines_split_names[line['id']] = self.env['account.account']._split_code_name(line['name'])
+
+        # Set the (Account) Name column width to 50.
+        # If we have account lines and split the name and code in two columns, we will also set the code column.
+        if len(account_lines_split_names) > 0:
+            sheet.set_column(0, 0, 13)
+            sheet.set_column(1, 1, 50)
+        else:
+            sheet.set_column(0, 0, 50)
+
+        if not options.get('no_xlsx_currency_code_columns'):
+            self._add_xlsx_currency_codes_columns(options, lines)
+
+        original_x_offset = 1 if len(account_lines_split_names) > 0 else 0
+
+        y_offset = 0
+        # 1 and not 0 to leave space for the line name. original_x_offset allows making place for the code column if needed.
+        x_offset = original_x_offset + 1
+
+        # Add headers.
+        # For this, iterate in the same way as done in main_table_header template
+        column_headers_render_data = self._get_column_headers_render_data(options)
+        for header_level_index, header_level in enumerate(options['column_headers']):
+            for header_to_render in header_level * column_headers_render_data['level_repetitions'][header_level_index]:
+                colspan = header_to_render.get('colspan', column_headers_render_data['level_colspan'][header_level_index])
+                write_cell(sheet, x_offset, y_offset, header_to_render.get('name', ''), title_format, colspan + (1 if options['show_horizontal_group_total'] and header_level_index == 0 else 0))
+                x_offset += colspan
+            if options.get('column_percent_comparison') == 'growth':
+                write_cell(sheet, x_offset, y_offset, '%', title_format)
+                x_offset += 1
+
+            if options['show_horizontal_group_total'] and header_level_index != 0:
+                horizontal_group_name = next((group['name'] for group in options['available_horizontal_groups'] if group['id'] == options['selected_horizontal_group_id']), None)
+                write_cell(sheet, x_offset, y_offset, horizontal_group_name, title_format)
+                x_offset += 1
+            if annotations:
+                annotations_x_offset = x_offset
+                write_cell(sheet, annotations_x_offset, y_offset, 'Annotations', title_format)
+                x_offset += 1
+            y_offset += 1
+            x_offset = original_x_offset + 1
+
+        for subheader in column_headers_render_data['custom_subheaders']:
+            colspan = subheader.get('colspan', 1)
+            write_cell(sheet, x_offset, y_offset, subheader.get('name', ''), title_format, colspan)
+            x_offset += colspan
+        y_offset += 1
+        x_offset = original_x_offset + 1
+
+        if account_lines_split_names:
+            # If we have a separate account code column, add a title for it
+            write_cell(sheet, x_offset - 2, y_offset, _("Code"), title_format)
+            write_cell(sheet, x_offset - 1, y_offset, _("Account Name"), title_format)
+        sheet.set_column(x_offset, x_offset + len(options['columns']), 10)
+
+        for column in options['columns']:
+            colspan = column.get('colspan', 1)
+            write_cell(sheet, x_offset, y_offset, column.get('name', ''), title_format, colspan)
+            x_offset += colspan
+
+        if options['show_horizontal_group_total']:
+            write_cell(sheet, x_offset, y_offset, options['columns'][0].get('name', ''), title_format, colspan)
+
+        if options.get('column_percent_comparison') == 'growth':
+            write_cell(sheet, x_offset, y_offset, '', title_format, colspan)
+        y_offset += 1
+
+        if options.get('order_column'):
+            lines = self.sort_lines(lines, options)
+
+        # Disable bold styling for the max level.
+        max_level = max(line.get('level', -1) for line in lines) if lines else -1
+        if max_level in {0, 1, 2}:
+            # Total lines are supposed to be a level above, so we don't touch them.
+            for wb_format in (s for s in workbook_formats[max_level] if 'total' not in s):
+                workbook_formats[max_level][wb_format].set_bold(False)
+
+        # Add lines.
+        counter = 1
+        for y, line in enumerate(lines):
+            level = line.get('level')
+            if level == 0:
+                y_offset += 1
+            elif not level:
+                level = 'default'
+
+            line_id = self._parse_line_id(line.get('id'))
+            is_initial_line = line_id[-1][0] == 'initial' if line_id else False
+            is_total_line = line_id[-1][0] == 'total' if line_id else False
+
+            # Write the first column(s), with a specific style to manage the indentation.
+            cell_type, cell_value = self._get_cell_type_value(line)
+            account_code_cell_format = get_format('text', level)
+
+            if cell_type == 'date':
+                cell_format = get_format('date_indent', level)
+            elif is_initial_line:
+                cell_format = get_format('initial_indent', level)
+            elif is_total_line:
+                cell_format = get_format('total_indent', level)
+            else:
+                cell_format = get_format('default_indent', level)
+
+            x_offset = original_x_offset + 1
+            if lines[y]['id'] in account_lines_split_names:
+                # Write the Account Code and Name columns.
+                code, name = account_lines_split_names[lines[y]['id']]
+                # Don't indent the account code and don't format is as a monetary value either.
+                write_cell(sheet, 0, y + y_offset, code, account_code_cell_format)
+                write_cell(sheet, 1, y + y_offset, name, cell_format)
+            else:
+                write_cell(sheet, original_x_offset, y + y_offset, cell_value, cell_format, datetime=cell_type == 'date')
+
+                if 'parent_id' in line and line['parent_id'] in account_lines_split_names:
+                    write_cell(sheet, 1 + original_x_offset, y + y_offset, account_lines_split_names[line['parent_id']][0], account_code_cell_format)
+                elif account_lines_split_names:
+                    write_cell(sheet, 1 + original_x_offset, y + y_offset, "", account_code_cell_format)
+
+            # Write all the remaining cells.
+            columns = line['columns']
+            if options.get('column_percent_comparison') and 'column_percent_comparison_data' in line:
+                columns += [line['column_percent_comparison_data']]
+
+            if options['show_horizontal_group_total']:
+                columns += [line.get('horizontal_group_total_data', {'name': 0})]
+            for x, column in enumerate(columns, start=x_offset):
+                cell_type, cell_value = self._get_cell_type_value(column)
+                if cell_type == 'date':
+                    cell_format = get_format('date', level)
+                elif is_initial_line:
+                    cell_format = get_format('initial', level)
+                elif is_total_line:
+                    cell_format = get_format('total', level)
+                else:
+                    cell_format = get_format('default', level)
+                write_cell(sheet, x + line.get('colspan', 1) - 1, y + y_offset, cell_value, cell_format, datetime=cell_type == 'date')
+
+            # Write annotations.
+            if annotations and (line_annotations := annotations.get(line['id'])):
+                line_annotation_text = []
+                for line_annotation in line_annotations:
+                    line_annotation_text.append(f"{counter} - {line_annotation['text']}")
+                    counter += 1
+                write_cell(sheet, annotations_x_offset, y + y_offset, "\n".join(line_annotation_text), annotation_format)
+
+    def _add_xlsx_currency_codes_columns(self, options, lines):
+        """ Adds a 'Currency Code' column for each column displaying amounts in foreign currencies. This is done because
+        the raw number is displayed on the xlsx file, making it impossible to know the currency used.
+        To have it displayed, the line must have an expression label starting with '_currency_' """
+        required_currency_code_columns = {
+            label.removeprefix('_currency_')
+            for label in self.line_ids.expression_ids.mapped('label')
+            if label.startswith('_currency_')
+        }
+
+        new_columns = []
+        for col in options['columns']:
+            new_columns.append(col)
+
+            if col['expression_label'] in required_currency_code_columns:
+                new_columns.append({
+                    **col,
+                    'name': _("Currency Code"),
+                    'figure_type': 'string',
+                    'expression_label': f"_xlsx_currency_code_{col['expression_label']}"
+                })
+
+        options['columns'] = new_columns
+
+        # Add 'Currency Code' values to each line
+        for line in lines:
+            new_column_values = []
+
+            for index, col_data in enumerate(line['columns']):
+                new_column_values.append(col_data)
+
+                if col_data.get('expression_label') in required_currency_code_columns:
+                    currency = col_data.get('currency')
+                    currency_code = currency.name if currency else ''
+                    new_column = self._build_column_dict(currency_code, options['columns'][index+1], options)
+                    new_column['name'] = new_column['no_format']
+                    new_column_values.append(new_column)
+
+            line['columns'] = new_column_values
+
+    def _add_options_xlsx_sheet(self, workbook, options_list):
+        """Adds a new sheet for xlsx report exports with a summary of all filters and options activated at the moment of the export."""
+        filters_sheet = workbook.add_worksheet(_("Filters"))
+        # Set first and second column widths.
+        filters_sheet.set_column(0, 0, 20)
+        filters_sheet.set_column(1, 1, 50)
+        name_style = workbook.add_format({'font_name': 'Arial', 'bold': True, 'bottom': 2})
+        y_offset = 0
+
+        if len(options_list) == 1:
+            self.env['account.report'].browse(options_list[0]['report_id'])._inject_report_options_into_xlsx_sheet(options_list[0], filters_sheet, y_offset)
+            return
+
+        # Find uncommon keys
+        options_sets = list(map(set, options_list))
+        common_keys = set.intersection(*options_sets)
+        all_keys = set.union(*options_sets)
+        uncommon_options_keys = all_keys - common_keys
+        # Try to find the common filter values between all reports to avoid duplication.
+        common_options_values = {}
+        for key in common_keys:
+            first_value = options_list[0][key]
+            if all(options[key] == first_value for options in options_list[1:]):
+                common_options_values[key] = first_value
+            else:
+                uncommon_options_keys.add(key)
+
+        # Write common options to the sheet.
+        filters_sheet.write(y_offset, 0, _("All"), name_style)
+        y_offset += 1
+        y_offset = self._inject_report_options_into_xlsx_sheet(common_options_values, filters_sheet, y_offset)
+
+        for report_options in options_list:
+            report = self.env['account.report'].browse(report_options['report_id'])
+
+            filters_sheet.write(y_offset, 0, report.name, name_style)
+            y_offset += 1
+            new_offset = report._inject_report_options_into_xlsx_sheet(report_options, filters_sheet, y_offset, uncommon_options_keys)
+
+            if y_offset == new_offset:
+                y_offset -= 1
+                # Clear the report name's cell since it didn't add any data to the xlsx.
+                filters_sheet.write(y_offset, 0, " ")
+            else:
+                y_offset = new_offset
+
+    def _inject_report_options_into_xlsx_sheet(self, options, sheet, y_offset, options_to_print=None):
+        """
+        Injects the report options into the filters sheet.
+
+        :param options: Dictionary containing report options.
+        :param sheet: XLSX sheet to inject options into.
+        :param y_offset: Offset for the vertical position in the sheet.
+        :param options_to_print: Optional list of names to print. If not provided, all printable options will be included.
+        """
+        def write_filter_lines(filter_title, filter_lines, y_offset):
+            sheet.write(y_offset, 0, filter_title)
+            for line in filter_lines:
+                sheet.write(y_offset, 1, line)
+                y_offset += 1
+            return y_offset
+
+        def should_print_option(option_key):
+            """Check if the option should be printed based on options_to_print."""
+            return not options_to_print or option_key in options_to_print
+
+        # Company
+        if should_print_option('companies'):
+            companies = options['companies']
+            title = _("Companies") if len(companies) > 1 else _("Company")
+            lines = [company['name'] for company in companies]
+            y_offset = write_filter_lines(title, lines, y_offset)
+
+        # Journals
+        if should_print_option('journals') and (journals := options.get('journals')):
+            journal_titles = [journal.get('title') for journal in journals if journal.get('selected')]
+            if journal_titles:
+                y_offset = write_filter_lines(_("Journals"), journal_titles, y_offset)
+
+        # Partners
+        if should_print_option('selected_partner_ids') and (partner_names := options.get('selected_partner_ids')):
+            y_offset = write_filter_lines(_("Partners"), partner_names, y_offset)
+
+        # Partner categories
+        if should_print_option('selected_partner_categories') and (partner_categories := options.get('selected_partner_categories')):
+            y_offset = write_filter_lines(_("Partner Categories"), partner_categories, y_offset)
+
+        # Horizontal groups
+        if should_print_option('selected_horizontal_group_id') and (group_id := options.get('selected_horizontal_group_id')):
+            for horizontal_group in options['available_horizontal_groups']:
+                if horizontal_group['id'] == group_id:
+                    filter_name = horizontal_group['name']
+                    y_offset = write_filter_lines(_("Horizontal Group"), [filter_name], y_offset)
+                    break
+
+        # Currency
+        if should_print_option('company_currency') and options.get('company_currency'):
+            y_offset = write_filter_lines(_("Company Currency"), [options['company_currency']['currency_name']], y_offset)
+
+        # Filters
+        if should_print_option('aml_ir_filters'):
+            if options.get('aml_ir_filters') and any(opt['selected'] for opt in options['aml_ir_filters']):
+                filter_names = [opt['name'] for opt in options['aml_ir_filters'] if opt['selected']]
+                y_offset = write_filter_lines(_("Filters"), filter_names, y_offset)
+
+        # Extra options
+        # Array of tuples for the extra options: (name, option_key, condition)
+        extra_options = [
+            (_("With Draft Entries"), 'all_entries', self.filter_show_draft),
+            (_("Unreconciled Entries"), 'unreconciled', self.filter_unreconciled),
+            (_("Including Analytic Simulations"), 'include_analytic_without_aml', True)
+        ]
+        filter_names = [
+            name for name, option_key, condition in extra_options
+            if (not options_to_print or option_key in options_to_print) and condition and options.get(option_key)
+        ]
+        if filter_names:
+            y_offset = write_filter_lines(_("Options"), filter_names, y_offset)
+
+        return y_offset
+
+    def _get_cell_type_value(self, cell):
+        if 'date' not in cell.get('class', '') or not cell.get('name'):
+            # cell is not a date
+            return ('text', cell.get('name', ''))
+        if isinstance(cell['name'], (float, datetime.date, datetime.datetime)):
+            # the date is xlsx compatible
+            return ('date', cell['name'])
+        try:
+            # the date is parsable to a xlsx compatible date
+            lg = get_lang(self.env, self.env.user.lang)
+            return ('date', datetime.datetime.strptime(cell['name'], lg.date_format))
+        except:
+            # the date is not parsable thus is returned as text
+            return ('text', cell['name'])
+
+    def get_vat_for_export(self, options, raise_warning=True):
+        """ Returns the VAT number to use when exporting this report with the provided
+        options. If a single fiscal_position option is set, its VAT number will be
+        used; else the current company's will be, raising an error if its empty.
+        """
+        self.ensure_one()
+
+        if self.filter_multi_company == 'tax_units' and options['tax_unit'] != 'company_only':
+            tax_unit = self.env['account.tax.unit'].browse(options['tax_unit'])
+            return tax_unit.vat
+
+        if options['fiscal_position'] in {'all', 'domestic'}:
+            company = self._get_sender_company_for_export(options)
+            if not company.vat and raise_warning:
+                action = self.env.ref('base.action_res_company_form')
+                raise RedirectWarning(_('No VAT number associated with your company. Please define one.'), action.id, _("Company Settings"))
+            return company.vat
+
+        fiscal_position = self.env['account.fiscal.position'].browse(options['fiscal_position'])
+        return fiscal_position.foreign_vat
+
+    @api.model
+    def get_report_company_ids(self, options):
+        """ Returns a list containing the ids of the companies to be used to
+        render this report, following the provided options.
+        """
+        return [comp_data['id'] for comp_data in options['companies']]
+
+    def _get_partner_and_general_ledger_initial_balance_line(self, options, parent_line_id, eval_dict, account_currency=None, level_shift=0):
+        """ Helper to generate dynamic 'initial balance' lines, used by general ledger and partner ledger.
+        """
+        line_columns = []
+        for column in options['columns']:
+            col_value = eval_dict[column['column_group_key']].get(column['expression_label'])
+            col_expr_label = column['expression_label']
+
+            if col_value is None or (col_expr_label == 'amount_currency' and not account_currency):
+                line_columns.append(self._build_column_dict(None, None))
+            else:
+                line_columns.append(self._build_column_dict(
+                    col_value,
+                    column,
+                    options=options,
+                    currency=account_currency if col_expr_label == 'amount_currency' else None,
+                ))
+
+        # Display unfold & initial balance even when debit/credit column is hidden and the balance == 0
+        if not any(isinstance(column.get('no_format'), (int, float)) and column.get('expression_label') != 'balance' for column in line_columns):
+            return None
+
+        return {
+            'id': self._get_generic_line_id(None, None, parent_line_id=parent_line_id, markup='initial'),
+            'name': _("Initial Balance"),
+            'level': 3 + level_shift,
+            'parent_id': parent_line_id,
+            'columns': line_columns,
+        }
+
+    def _compute_column_percent_comparison_data(self, options, value1, value2, green_on_positive=True):
+        ''' Helper to get the additional columns due to the growth comparison feature. When only one comparison is
+        requested, an additional column is there to show the percentage of growth based on the compared period.
+        :param options:             The report options.
+        :param value1:              The value in the current period.
+        :param value2:              The value in the compared period.
+        :param green_on_positive:   A flag customizing the value with a green color depending if the growth is positive.
+        :return:                    The new columns to add to line['columns'].
+        '''
+        if value1 is None or value2 is None or float_is_zero(value2, precision_rounding=0.1):
+            return {'name': _('n/a'), 'mode': 'muted'}
+
+        comparison_type = options['column_percent_comparison']
+        if comparison_type == 'growth':
+
+            values_diff = value1 - value2
+            growth = round(values_diff / value2 * 100, 1)
+
+            # In case the comparison is made on a negative figure, the color should be the other
+            # way around. For example:
+            #                       2018         2017           %
+            # Product Sales      1000.00     -1000.00     -200.0%
+            #
+            # The percentage is negative, which is mathematically correct, but my sales increased
+            # => it should be green, not red!
+            if float_is_zero(growth, 1):
+                return {'name': '0.0%', 'mode': 'muted'}
+            else:
+                return {
+                    'name': f"{float_repr(growth, 1)}%",
+                    'mode': 'red' if ((values_diff > 0) ^ green_on_positive) else 'green',
+                }
+
+        elif comparison_type == 'budget':
+            percentage_value = value1 / value2 * 100
+            if float_is_zero(percentage_value, 1):
+                # To avoid negative 0
+                return {'name': '0.0%', 'mode': 'green'}
+
+            comparison_value = float_compare(value1, value2, 1)
+            return {
+                'name': f"{float_repr(percentage_value, 1)}%",
+                'mode': 'green' if (comparison_value >= 0 and green_on_positive) or (comparison_value == -1 and not green_on_positive) else 'red',
+            }
+
+    def _set_budget_column_comparisons(self, options, line):
+        """
+            Set the percentage values in the budget columns
+        """
+        for col_index, col in enumerate(line['columns']):
+            col_group_data = options['column_groups'][col['column_group_key']]
+            if 'budget_percentage' in col_group_data.get('forced_options'):
+                budget_id = col_group_data['forced_options']['budget_percentage']
+                date_key = col_group_data.get('forced_options', {}).get('date')
+                if not date_key:
+                    continue
+
+                budget_base_col = None
+                budget_amount_col = None
+                for line_col in line['columns']:
+                    other_col_group_key = line_col['column_group_key']
+                    other_col_options = options['column_groups'][other_col_group_key]
+                    if other_col_options.get('forced_options', {}).get('date') == date_key:
+                        if other_col_options.get('forced_options', {}).get('budget_base') and line_col['figure_type'] == 'monetary':
+                            budget_base_col = line_col
+                        elif other_col_options.get('forced_options', {}).get('compute_budget') == budget_id:
+                            budget_amount_col = line_col
+
+                value = self._compute_column_percent_comparison_data(
+                    options,
+                    budget_base_col['no_format'],
+                    budget_amount_col['no_format'],
+                    green_on_positive=budget_base_col['green_on_positive'],
+                )
+                comparison_column = self._build_column_dict(
+                    value['name'],
+                    {
+                        **budget_amount_col,
+                        'figure_type': 'string',
+                        'comparison_mode': value['mode'],
+                    }
+                )
+                line['columns'][col_index] = comparison_column
+
+    def _check_groupby_fields(self, groupby_fields_name: list[str] | str):
+        """ Checks that each string in the groupby_fields_name list is a valid groupby value for an accounting report.
+            So it must be:
+            - a field from account.move.line which is (1) searchable and (2) for which _field_to_sql is implemented,
+              this includes stored and related non-stored fields, or
+            - a custom value allowed by the _get_custom_groupby_map function of the custom handler
+        """
+        self.ensure_one()
+        if isinstance(groupby_fields_name, str | bool):
+            groupby_fields_name = groupby_fields_name.split(',') if groupby_fields_name else []
+
+        for field_name in (fname.strip() for fname in groupby_fields_name):
+            groupby_field = self.env['account.move.line']._fields.get(field_name)
+            if groupby_field:
+                if not groupby_field._description_searchable:
+                    raise UserError(self.env._("Field %s of account.move.line is not searchable and can therefore not be used in a groupby expression.", field_name))
+                try:
+                    self.env['account.move.line']._field_to_sql('account_move_line', field_name, Query(self.env, 'account_move_line'))
+                except ValueError:
+                    raise UserError(self.env._("Field %s of account.move.line cannot be used in a groupby expression.", field_name)) from None
+            elif (custom_handler_name := self._get_custom_handler_model()):
+                if field_name not in self.env[custom_handler_name]._get_custom_groupby_map():
+                    raise UserError(_("Field %s does not exist on account.move.line, and is not supported by this report's custom handler.", field_name))
+            else:
+                raise UserError(_("Field %s does not exist on account.move.line.", field_name))
+
+    # ============ Accounts Coverage Debugging Tool - START ================
+    @api.depends('country_id', 'chart_template', 'root_report_id')
+    def _compute_is_account_coverage_report_available(self):
+        for report in self:
+            report.is_account_coverage_report_available = (
+                (
+                    report.availability_condition == 'country' and self.env.company.account_fiscal_country_id == report.country_id
+                    or
+                    report.availability_condition == 'coa' and self.env.company.chart_template == report.chart_template
+                    or
+                    report.availability_condition == 'always'
+                )
+                and
+                report.root_report_id in (
+                    self.env.ref('odex30_account_reports.profit_and_loss', raise_if_not_found=False),
+                    self.env.ref('odex30_account_reports.balance_sheet', raise_if_not_found=False)
+                )
+            )
+
+    def action_download_xlsx_accounts_coverage_report(self):
+        """
+        Generate an XLSX file that can be used to debug the
+        report by issuing the following warnings if applicable:
+        - an account exists in the Chart of Accounts but is not mentioned in any line of the report (red)
+        - an account is reported in multiple lines of the report (orange)
+        - an account is reported in a line of the report but does not exist in the Chart of Accounts (yellow)
+        """
+        self.ensure_one()
+        if not self.is_account_coverage_report_available:
+            raise UserError(_("The Accounts Coverage Report is not available for this report."))
+
+        output = io.BytesIO()
+        workbook = xlsxwriter.Workbook(output, {'in_memory': True})
+        worksheet = workbook.add_worksheet(_('Accounts coverage'))
+        worksheet.set_column(0, 0, 20)
+        worksheet.set_column(1, 1, 75)
+        worksheet.set_column(2, 2, 80)
+        worksheet.freeze_panes(1, 0)
+
+        headers = [_("Account Code / Tag"), _("Error message"), _("Report lines mentioning the account code"), '#FFFFFF']
+        lines = [headers] + self._generate_accounts_coverage_report_xlsx_lines()
+        for i, line in enumerate(lines):
+            worksheet.write_row(i, 0, line[:-1], workbook.add_format({'bg_color': line[-1]}))
+
+        workbook.close()
+        attachment_id = self.env['ir.attachment'].create({
+            'name': f"{self.display_name} - {_('Accounts Coverage Report')}",
+            'datas': base64.encodebytes(output.getvalue())
+        })
+        return {
+            "type": "ir.actions.act_url",
+            "url": f"/web/content/{attachment_id.id}",
+            "target": "download",
+        }
+
+    def _generate_accounts_coverage_report_xlsx_lines(self):
+        """
+        Generate the lines of the XLSX file that can be used to debug the
+        report by issuing the following warnings if applicable:
+        - an account exists in the Chart of Accounts but is not mentioned in any line of the report (red)
+        - an account is reported in multiple lines of the report (orange)
+        - an account is reported in a line of the report but does not exist in the Chart of Accounts (yellow)
+        """
+        def get_account_domain(prefix):
+            # Helper function to get the right domain to find the account
+            # This function verifies if we have to look for a tag or if we have
+            # to look for an account code.
+            if tag_matching := ACCOUNT_CODES_ENGINE_TAG_ID_PREFIX_REGEX.match(prefix):
+                if tag_matching['ref']:
+                    account_tag_id = self.env['ir.model.data']._xmlid_to_res_id(tag_matching['ref'])
+                else:
+                    account_tag_id = int(tag_matching['id'])
+                return 'tag_ids', 'in', (account_tag_id,)
+            else:
+                return 'code', '=like', f'{prefix}%'
+
+        self.ensure_one()
+
+        all_reported_accounts = self.env["account.account"]  # All accounts mentioned in the report (including those reported without using the account code)
+        accounts_by_expressions = {}    # {expression_id: account.account objects}
+        reported_account_codes = []     # [{'prefix': ..., 'balance': ..., 'exclude': ..., 'line': ...}, ...]
+        non_existing_codes = defaultdict(lambda: self.env["account.report.line"])  # {non_existing_account_code: {lines_with_that_code,}}
+        lines_per_non_linked_tag = defaultdict(lambda: self.env['account.report.line'])
+        lines_using_bad_operator_per_tag = defaultdict(lambda: self.env['account.report.line'])
+        candidate_duplicate_codes = defaultdict(lambda: self.env["account.report.line"])  # {candidate_duplicate_account_code: {lines_with_that_code,}}
+        duplicate_codes = defaultdict(lambda: self.env["account.report.line"])  # {verified duplicate_account_code: {lines_with_that_code,}}
+        duplicate_codes_same_line = defaultdict(lambda: self.env["account.report.line"])  # {duplicate_account_code: {line_with_that_code_multiple_times,}}
+        common_account_domain = [
+            *self.env['account.account']._check_company_domain(self.env.company),
+            ('deprecated', '=', False),
+        ]
+
+        # tag_ids already linked to an account - avoid several search_count to know if the tag is used or not
+        tag_ids_linked_to_account = set(self.env['account.account'].search([('tag_ids', '!=', False)]).tag_ids.ids)
+
+        expressions = self.line_ids.expression_ids._expand_aggregations()
+        for i, expr in enumerate(expressions):
+            reported_accounts = self.env["account.account"]
+            if expr.engine == "domain":
+                domain = literal_eval(expr.formula.strip())
+                accounts_domain = []
+                for j, operand in enumerate(domain):
+                    if isinstance(operand, tuple):
+                        operand = list(operand)
+                        # Skip tuples that will not be used in the new domain to retrieve the reported accounts
+                        if not operand[0].startswith('account_id.'):
+                            if domain[j - 1] in ("&", "|", "!"):  # Remove the operator linked to the tuple if it exists
+                                accounts_domain.pop()
+                            continue
+                        operand[0] = operand[0].replace('account_id.', '')
+                        # Check that the code exists in the CoA
+                        if operand[0] == 'code' and not self.env["account.account"].search_count([operand]):
+                            non_existing_codes[operand[2]] |= expr.report_line_id
+                        elif operand[0] == 'tag_ids':
+                            tag_ids = operand[2]
+                            if not isinstance(tag_ids, (list, tuple, set)):
+                                tag_ids = [tag_ids]
+
+                            if operand[1] in ('=', 'in'):
+                                tag_ids_to_browse = [tag_id for tag_id in tag_ids if tag_id not in tag_ids_linked_to_account]
+                                for tag in self.env['account.account.tag'].browse(tag_ids_to_browse):
+                                    lines_per_non_linked_tag[f'{tag.name} ({tag.id})'] |= expr.report_line_id
+                            else:
+                                for tag in self.env['account.account.tag'].browse(tag_ids):
+                                    lines_using_bad_operator_per_tag[f'{tag.name} ({tag.id}) - Operator: {operand[1]}'] |= expr.report_line_id
+
+                    accounts_domain.append(operand)
+                reported_accounts += self.env['account.account'].search(accounts_domain)
+            elif expr.engine == "account_codes":
+                account_codes = []
+                for token in ACCOUNT_CODES_ENGINE_SPLIT_REGEX.split(expr.formula.replace(' ', '')):
+                    if not token:
+                        continue
+                    token_match = ACCOUNT_CODES_ENGINE_TERM_REGEX.match(token)
+                    if not token_match:
+                        continue
+
+                    parsed_token = token_match.groupdict()
+                    account_codes.append({
+                        'prefix': parsed_token['prefix'],
+                        'balance': parsed_token['balance_character'],
+                        'exclude': parsed_token['excluded_prefixes'].split(',') if parsed_token['excluded_prefixes'] else [],
+                        'line': expr.report_line_id,
+                    })
+
+                for account_code in account_codes:
+                    reported_account_codes.append(account_code)
+                    exclude_domain_accounts = [get_account_domain(exclude_code) for exclude_code in account_code['exclude']]
+                    reported_accounts += self.env["account.account"].search([
+                        *common_account_domain,
+                        get_account_domain(account_code['prefix']),
+                        *[excl_domain for excl_tuple in exclude_domain_accounts for excl_domain in ("!", excl_tuple)],
+                    ])
+
+                    # Check that the code exists in the CoA or that the tag is linked to an account
+                    prefixes_to_check = [account_code['prefix']] + account_code['exclude']
+                    for prefix_to_check in prefixes_to_check:
+                        account_domain = get_account_domain(prefix_to_check)
+                        if not self.env["account.account"].search_count([
+                            *common_account_domain,
+                            account_domain,
+                        ]):
+                            # Identify if we're working with account codes or account tags
+                            if account_domain[0] == 'code':
+                                non_existing_codes[prefix_to_check] |= account_code['line']
+                            elif account_domain[0] == 'tag_ids':
+                                lines_per_non_linked_tag[prefix_to_check] |= account_code['line']
+
+            all_reported_accounts |= reported_accounts
+            accounts_by_expressions[expr.id] = reported_accounts
+
+            # Check if an account is reported multiple times in the same line of the report
+            if len(reported_accounts) != len(set(reported_accounts)):
+                seen = set()
+                for reported_account in reported_accounts:
+                    if reported_account not in seen:
+                        seen.add(reported_account)
+                    else:
+                        duplicate_codes_same_line[reported_account.code] |= expr.report_line_id
+
+            # Check if the account is reported in multiple lines of the report
+            for expr2 in expressions[:i + 1]:
+                reported_accounts2 = accounts_by_expressions[expr2.id]
+                for duplicate_account in (reported_accounts & reported_accounts2):
+                    if len(expr.report_line_id | expr2.report_line_id) > 1 \
+                       and expr.date_scope == expr2.date_scope \
+                       and expr.subformula == expr2.subformula:
+                        candidate_duplicate_codes[duplicate_account.code] |= expr.report_line_id | expr2.report_line_id
+
+        # Check that the duplicates are not false positives because of the balance character
+        for candidate_duplicate_code, candidate_duplicate_lines in candidate_duplicate_codes.items():
+            seen_balance_chars = []
+            for reported_account_code in reported_account_codes:
+                if candidate_duplicate_code.startswith(reported_account_code['prefix']) and reported_account_code['balance']:
+                    seen_balance_chars.append(reported_account_code['balance'])
+            if not seen_balance_chars or seen_balance_chars.count("C") > 1 or seen_balance_chars.count("D") > 1:
+                duplicate_codes[candidate_duplicate_code] |= candidate_duplicate_lines
+
+        # Check that all codes in CoA are correctly reported
+        if self.root_report_id == self.env.ref('odex30_account_reports.profit_and_loss'):
+            accounts_in_coa = self.env["account.account"].search([
+                *common_account_domain,
+                ('account_type', 'in', ("income", "income_other", "expense", "expense_depreciation", "expense_direct_cost")),
+                ('account_type', '!=', "off_balance"),
+            ])
+        else:  # Balance Sheet
+            accounts_in_coa = self.env["account.account"].search([
+                *common_account_domain,
+                ('account_type', 'not in', ("off_balance", "income", "income_other", "expense", "expense_depreciation", "expense_direct_cost"))
+            ])
+
+        # Compute codes that exist in the CoA but are not reported in the report
+        non_reported_codes = set((accounts_in_coa - all_reported_accounts).mapped('code'))
+
+        # Create the lines that will be displayed in the xlsx
+        all_reported_codes = sorted(set(all_reported_accounts.mapped("code")) | non_reported_codes | non_existing_codes.keys())
+        errors_trie = self._get_accounts_coverage_report_errors_trie(all_reported_codes, non_reported_codes, duplicate_codes, duplicate_codes_same_line, non_existing_codes)
+        errors_trie['children'].update(**self._get_account_tag_coverage_report_errors_trie(lines_per_non_linked_tag, lines_using_bad_operator_per_tag))  # Add tags that are not linked to an account
+
+        errors_trie = self._regroup_accounts_coverage_report_errors_trie(errors_trie)
+        return self._get_accounts_coverage_report_coverage_lines("", errors_trie)
+
+    def _get_accounts_coverage_report_errors_trie(self, all_reported_codes, non_reported_codes, duplicate_codes, duplicate_codes_same_line, non_existing_codes):
+        """
+        Create the trie that will be used to regroup the same errors on the same subcodes.
+        This trie will be in the form of:
+        {
+            "children": {
+                "1": {
+                    "children": {
+                        "10": { ... },
+                        "11": { ... },
+                    },
+                    "lines": {
+                        "Line1",
+                        "Line2",
+                    },
+                    "errors": {
+                        "DUPLICATE"
+                    }
+                },
+            "lines": {
+                "",
+            },
+            "errors": {
+                None    # Avoid that all codes are merged into the root with the code "" in case all of the errors are the same
+            },
+        }
+        """
+        errors_trie = {"children": {}, "lines": {}, "errors": {None}}
+        for reported_code in all_reported_codes:
+            current_trie = errors_trie
+            lines = self.env["account.report.line"]
+            errors = set()
+            if reported_code in non_reported_codes:
+                errors.add("NON_REPORTED")
+            elif reported_code in duplicate_codes_same_line:
+                lines |= duplicate_codes_same_line[reported_code]
+                errors.add("DUPLICATE_SAME_LINE")
+            elif reported_code in duplicate_codes:
+                lines |= duplicate_codes[reported_code]
+                errors.add("DUPLICATE")
+            elif reported_code in non_existing_codes:
+                lines |= non_existing_codes[reported_code]
+                errors.add("NON_EXISTING")
+            else:
+                errors.add("NONE")
+
+            for j in range(1, len(reported_code) + 1):
+                current_trie = current_trie["children"].setdefault(reported_code[:j], {
+                    "children": {},
+                    "lines": lines,
+                    "errors": errors
+                })
+        return errors_trie
+
+    @api.model
+    def _get_account_tag_coverage_report_errors_trie(self, lines_per_non_linked_tag, lines_per_bad_operator_tag):
+        """ As we don't want to make a hierarchy for tags, we use a specific
+            function to handle tags.
+        """
+        errors = {
+            non_linked_tag: {
+                'children': {},
+                'lines': line,
+                'errors': {'NON_LINKED'},
+            }
+            for non_linked_tag, line in lines_per_non_linked_tag.items()
+        }
+        errors.update({
+            bad_operator_tag: {
+                'children': {},
+                'lines': line,
+                'errors': {'BAD_OPERATOR'},
+            }
+            for bad_operator_tag, line in lines_per_bad_operator_tag.items()
+        })
+        return errors
+
+    def _regroup_accounts_coverage_report_errors_trie(self, trie):
+        """
+        Regroup the codes that have the same error under the same common subcode/prefix.
+        This is done in-place on the given trie.
+        """
+        if trie.get("children"):
+            children_errors = set()
+            children_lines = self.env["account.report.line"]
+            if trie.get("errors"):  # Add own error
+                children_errors |= set(trie.get("errors"))
+            for child in trie["children"].values():
+                regroup = self._regroup_accounts_coverage_report_errors_trie(child)
+                children_lines |= regroup["lines"]
+                children_errors |= set(regroup["errors"])
+            if len(children_errors) == 1 and children_lines and children_lines == trie["lines"]:
+                trie["children"] = {}
+                trie["lines"] = children_lines
+                trie["errors"] = children_errors
+        return trie
+
+    def _get_accounts_coverage_report_coverage_lines(self, subcode, trie, coverage_lines=None):
+        """
+        Create the coverage lines from the grouped trie. Each line has
+        - the account code
+        - the error message
+        - the lines on which the account code is used
+        - the color of the error message for the xlsx
+        """
+        # Dictionnary of the three possible errors, their message and the corresponding color for the xlsx file
+        ERRORS = {
+            "NON_REPORTED": {
+                "msg": _("This account exists in the Chart of Accounts but is not mentioned in any line of the report"),
+                "color": "#FF0000"
+            },
+            "DUPLICATE": {
+                "msg": _("This account is reported in multiple lines of the report"),
+                "color": "#FF8916"
+            },
+            "DUPLICATE_SAME_LINE": {
+                "msg": _("This account is reported multiple times on the same line of the report"),
+                "color": "#E6A91D"
+            },
+            "NON_EXISTING": {
+                "msg": _("This account is reported in a line of the report but does not exist in the Chart of Accounts"),
+                "color": "#FFBF00"
+            },
+            "NON_LINKED": {
+                "msg": _("This tag is reported in a line of the report but is not linked to any account of the Chart of Accounts"),
+                "color": "#FFBF00",
+            },
+            "BAD_OPERATOR": {
+                "msg": _("The used operator is not supported for this expression."),
+                "color": "#FFBF00",
+            }
+        }
+        if coverage_lines is None:
+            coverage_lines = []
+        if trie.get("children"):
+            for child in trie.get("children"):
+                self._get_accounts_coverage_report_coverage_lines(child, trie["children"][child], coverage_lines)
+        else:
+            error = list(trie["errors"])[0] if trie["errors"] else False
+            if error and error != "NONE":
+                coverage_lines.append([
+                    subcode,
+                    ERRORS[error]["msg"],
+                    " + ".join(trie["lines"].sorted().mapped("name")),
+                    ERRORS[error]["color"]
+                ])
+        return coverage_lines
+
+    # ============ Accounts Coverage Debugging Tool - END ================
+
+    def _generate_file_data_with_error_check(self, options, content_generator, generator_params, errors):
+        """ Checks for critical errors (i.e. errors that would cause the rendering to fail) in the generator values.
+            If at least one error is critical, the 'account.report.file.download.error.wizard' wizard is opened
+            before rendering the file, so they can be fixed.
+            If there are only non-critical errors, the wizard is opened after the file has been generated,
+            allowing the user to download it anyway.
+
+            :param dict options: The report options.
+            :param def content_generator: The function used to generate the exported content.
+            :param dict generator_params: The parameters passed to the 'content_generator' method (List).
+            :param list errors: A list of errors in the following format:
+                [
+                    {
+                        'message': The error message to be displayed in the wizard (String),
+                        'action_text': The text of the action button (String),
+                        'action': Contains the action values (Dictionary),
+                        'level': One of 'info', 'warning', 'danger'. (String).
+                                 Only the 'danger' level represents a blocking error.
+                    },
+                    {...},
+                ]
+            :returns: The data that will be used by the file generator.
+            :rtype: dict
+        """
+        if errors is None:
+            errors = []
+        self.ensure_one()
+        if any(error_value.get('level') == 'danger' for error_value in errors.values()):
+            raise AccountReportFileDownloadException(errors)
+
+        content = content_generator(**generator_params)
+
+        file_data = {
+            'file_name': self.get_default_report_filename(options, generator_params['file_type']),
+            'file_content': re.sub(r'\n\s*\n', '\n', content).encode(),
+            'file_type': generator_params['file_type'],
+        }
+
+        if errors:
+            raise AccountReportFileDownloadException(errors, file_data)
+
+        return file_data
+
+    def action_create_composite_report(self):
+        return {
+            'type': 'ir.actions.act_window',
+            'res_model': 'account.report',
+            'views': [[False, 'form']],
+            'context': {
+                'default_section_report_ids': self.ids,
+            }
+        }
+
+    def show_error_branch_allowed(self, *args, **kwargs):
+        raise UserError(_("Please select the main company and its branches in the company selector to proceed."))
+
+
+class AccountReportLine(models.Model):
+    _inherit = 'account.report.line'
+
+    display_custom_groupby_warning = fields.Boolean(compute='_compute_display_custom_groupby_warning')
+
+    @api.depends('groupby', 'user_groupby')
+    def _compute_display_custom_groupby_warning(self):
+        for line in self:
+            line.display_custom_groupby_warning = line.get_external_id()[line.id] and line.user_groupby != line.groupby
+
+    @api.constrains('groupby', 'user_groupby')
+    def _validate_groupby(self):
+        super()._validate_groupby()
+        for report_line in self:
+            report_line.report_id._check_groupby_fields(report_line.user_groupby)
+            report_line.report_id._check_groupby_fields(report_line.groupby)
+
+    def _expand_groupby(self, line_dict_id, groupby, options, offset=0, limit=None, load_one_more=False, unfold_all_batch_data=None):
+        """ Expand function used to get the sublines of a groupby.
+        groupby param is a string consisting of one or more coma-separated field names. Only the first one
+        will be used for the expansion; if there are subsequent ones, the generated lines will themselves used them as
+        their groupby value, and point to this expand_function, hence generating a hierarchy of groupby).
+        """
+        self.ensure_one()
+
+        group_indent = 0
+        line_id_list = self.report_id._parse_line_id(line_dict_id)
+
+        # Parse groupby
+        groupby_data = self._parse_groupby(options, groupby_to_expand=groupby)
+        groupby_model = groupby_data['current_groupby_model']
+        next_groupby = groupby_data['next_groupby']
+        current_groupby = groupby_data['current_groupby']
+        custom_groupby_map = groupby_data['custom_groupby_map']
+
+        # If this line is a sub-groupby of groupby line (for example, when grouping by partner, id; the id line is a subgroup of partner),
+        # we need to add the domain of the parent groupby criteria to the options
+        prefix_groups_count = 0
+        sub_groupby_domain = []
+        full_sub_groupby_key_elements = []
+        for markup, model, value in line_id_list:
+            if isinstance(markup, dict) and 'groupby' in markup:
+                field_name = markup['groupby']
+                if field_name in custom_groupby_map:
+                    sub_groupby_domain += custom_groupby_map[field_name]['domain_builder'](value)
+                else:
+                    sub_groupby_domain.append((field_name, '=', value))
+                full_sub_groupby_key_elements.append(f"{field_name}:{value}")
+            elif isinstance(markup, dict) and 'groupby_prefix_group' in markup:
+                prefix_groups_count += 1
+
+            if model == 'account.group':
+                group_indent += 1
+
+        if sub_groupby_domain:
+            forced_domain = options.get('forced_domain', []) + sub_groupby_domain
+            options = {**options, 'forced_domain': forced_domain}
+
+        # If the report transmitted custom_unfold_all_batch_data dictionary, use it
+        full_sub_groupby_key = f"[{self.id}]{','.join(full_sub_groupby_key_elements)}=>{current_groupby}"
+
+        cached_result = (unfold_all_batch_data or {}).get(full_sub_groupby_key)
+
+        if cached_result is not None:
+            all_column_groups_expression_totals = cached_result
+        else:
+            all_column_groups_expression_totals = self.report_id._compute_expression_totals_for_each_column_group(
+                self.expression_ids,
+                options,
+                groupby_to_expand=groupby,
+                offset=offset,
+                limit=limit + 1 if limit and load_one_more else limit,
+            )
+
+        # Put similar grouping keys from different totals/periods together, so that we don't display multiple
+        # lines for the same grouping key
+
+        figure_types_defaulting_to_0 = {'monetary', 'percentage', 'integer', 'float'}
+
+        default_value_per_expr_label = {
+            col_opt['expression_label']: 0 if col_opt['figure_type'] in figure_types_defaulting_to_0 else None
+            for col_opt in options['columns']
+        }
+
+        # Gather default value for each expression, in case it has no value for a given grouping key
+        default_value_per_expression = {}
+        for expression in self.expression_ids:
+            if expression.figure_type:
+                default_value = 0 if expression.figure_type in figure_types_defaulting_to_0 else None
+            else:
+                default_value = default_value_per_expr_label.get(expression.label)
+
+            default_value_per_expression[expression] = {'value': default_value}
+
+        # Build each group's result
+        aggregated_group_totals = defaultdict(lambda: defaultdict(default_value_per_expression.copy))
+        for column_group_key, expression_totals in all_column_groups_expression_totals.items():
+            for expression in self.expression_ids:
+                for grouping_key, result in expression_totals[expression]['value']:
+                    aggregated_group_totals[grouping_key][column_group_key][expression] = {'value': result}
+
+        # Generate groupby lines
+        group_lines_by_keys = {}
+        for grouping_key, group_totals in aggregated_group_totals.items():
+            # For this, we emulate a dict formatted like the result of _compute_expression_totals_for_each_column_group, so that we can call
+            # _build_static_line_columns like on non-grouped lines
+            line_id = self.report_id._get_generic_line_id(groupby_model, grouping_key, parent_line_id=line_dict_id, markup={'groupby': current_groupby})
+            group_line_dict = {
+                # 'name' key will be set later, so that we can browse all the records of this expansion at once (in case we're dealing with records)
+                'id': line_id,
+                'unfoldable': bool(next_groupby),
+                'unfolded': (next_groupby and options['unfold_all']) or line_id in options['unfolded_lines'],
+                'groupby': next_groupby,
+                'columns': self.report_id._build_static_line_columns(self, options, group_totals, groupby_model=groupby_model),
+                'level': self.hierarchy_level + 2 * (prefix_groups_count + len(sub_groupby_domain) + 1) + (group_indent - 1),
+                'parent_id': line_dict_id,
+                'expand_function': '_report_expand_unfoldable_line_with_groupby' if next_groupby else None,
+                'caret_options': groupby_model if not next_groupby else None,
+            }
+
+            if self.report_id.custom_handler_model_id:
+                self.env[self.report_id.custom_handler_model_name]._custom_groupby_line_completer(self.report_id, options, group_line_dict)
+
+            # Growth comparison column.
+            if options.get('column_percent_comparison') == 'growth':
+                compared_expression = self.expression_ids.filtered(lambda expr: expr.label == group_line_dict['columns'][0]['expression_label'])
+                group_line_dict['column_percent_comparison_data'] = self.report_id._compute_column_percent_comparison_data(
+                    options, group_line_dict['columns'][0]['no_format'], group_line_dict['columns'][1]['no_format'], green_on_positive=compared_expression.green_on_positive)
+            # Manage budget comparison
+            elif options.get('column_percent_comparison') == 'budget':
+                self.report_id._set_budget_column_comparisons(options, group_line_dict)
+
+            group_lines_by_keys[grouping_key] = group_line_dict
+
+        # Sort grouping keys in the right order and generate line names
+        keys_and_names_in_sequence = {}  # Order of this dict will matter
+
+        if groupby_model:
+            browsed_groupby_keys = self.env[groupby_model].browse(list(key for key in group_lines_by_keys if key is not None))
+
+            out_of_sorting_record = None
+            records_to_sort = browsed_groupby_keys
+            if browsed_groupby_keys and load_one_more and len(browsed_groupby_keys) >= limit:
+                out_of_sorting_record = browsed_groupby_keys[-1]
+                records_to_sort = records_to_sort[:-1]
+
+            for record in records_to_sort.with_context(active_test=False).sorted():
+                keys_and_names_in_sequence[record.id] = record.display_name
+
+            if None in group_lines_by_keys:
+                keys_and_names_in_sequence[None] = _("Unknown")
+
+            if out_of_sorting_record:
+                keys_and_names_in_sequence[out_of_sorting_record.id] = out_of_sorting_record.display_name
+
+        else:
+            for non_relational_key in sorted(group_lines_by_keys.keys(), key=lambda k: (k is None, k)):
+                if custom_groupby_name_builder := custom_groupby_map.get(current_groupby, {}).get('label_builder'):
+                    keys_and_names_in_sequence[non_relational_key] = custom_groupby_name_builder(non_relational_key)
+                else:
+                    if non_relational_key is None:
+                        keys_and_names_in_sequence[non_relational_key] = _("Undefined")
+                    else:
+                        groupby_field = self.env['account.move.line']._fields[groupby_data['current_groupby']]
+                        if groupby_field.type == 'selection':
+                            selection_options = dict(groupby_field._description_selection(self.env))
+                            keys_and_names_in_sequence[non_relational_key] = selection_options.get(non_relational_key) or _("Undefined")
+                        else:
+                            keys_and_names_in_sequence[non_relational_key] = str(non_relational_key)
+
+        # Build result: add a name to the groupby lines and handle totals below section for multi-level groupby
+        group_lines = []
+        for grouping_key, line_name in keys_and_names_in_sequence.items():
+            group_line_dict = group_lines_by_keys[grouping_key]
+            group_line_dict['name'] = line_name
+            group_lines.append(group_line_dict)
+
+        if options.get('hierarchy'):
+            group_lines = self.report_id._create_hierarchy(group_lines, options)
+
+        return group_lines
+
+    def _get_groupby_line_name(self, groupby_field_name, groupby_model, grouping_key):
+        # TODO master: remove this method as it is dead code
+        if groupby_model is None:
+            return grouping_key
+
+        if grouping_key is None:
+            return _("Unknown")
+
+        return self.env[groupby_model].browse(grouping_key).display_name
+
+    def _parse_groupby(self, options, groupby_to_expand=None):
+        """ Retrieves the information needed to handle the groupby feature on the current line.
+
+        :param groupby_to_expand:    A coma-separated string containing, in order, all the fields that are used in the groupby we're expanding.
+                                     None if we're not expanding anything.
+
+        :return: A dictionary with 4 keys:
+            'current_groupby':       The name of the value to be used to retrieve the results of the current groupby we're
+                                     expanding, or None if nothing is being expanded. That value can be either a field of account.move.line, or
+                                     a custom groupby value defined in this report's custom handler's _get_custom_groupby_map function.
+
+            'next_groupby':          The subsequent groupings to be applied after current_groupby, as a string of coma-separated values (again,
+                                     either field names from account.move.line or a custom groupby defined on the handler).
+                                     If no subsequent grouping exists, next_groupby will be None.
+
+            'current_groupby_model': The model name corresponding to current_groupby, or None if current_groupby is None.
+
+            'custom_groupby_map';    The groupby map, used to handle custom groupby values, as returned by the _get_custom_groupby_map function
+                                     of the custom handler (by default, it will be an empty dict)
+
+        EXAMPLE:
+            When computing a line with groupby=partner_id,account_id,id , without expanding it:
+            - groupby_to_expand will be None
+            - current_groupby will be None
+            - next_groupby will be 'partner_id,account_id,id'
+            - current_groupby_model will be None
+
+            When expanding the first group level of the line:
+            - groupby_to_expand will be: partner_id,account_id,id
+            - current_groupby will be 'partner_id'
+            - next_groupby will be 'account_id,id'
+            - current_groupby_model will be 'res.partner'
+
+            When expanding further:
+            - groupby_to_expand will be: account_id,id ; corresponding to the next_groupby computed when expanding partner_id
+            - current_groupby will be 'account_id'
+            - next_groupby will be 'id'
+            - current_groupby_model will be 'account.account'
+        """
+        self.ensure_one()
+
+        if groupby_to_expand:
+            groupby_to_expand = groupby_to_expand.replace(' ', '')
+            split_groupby = groupby_to_expand.split(',')
+            current_groupby = split_groupby[0]
+            next_groupby = ','.join(split_groupby[1:]) if len(split_groupby) > 1 else None
+        else:
+            current_groupby = None
+            groupby = self._get_groupby(options)
+            next_groupby = groupby.replace(' ', '') if groupby else None
+
+        custom_handler_name = self.report_id._get_custom_handler_model()
+        custom_groupby_map = self.env[custom_handler_name]._get_custom_groupby_map() if custom_handler_name else {}
+        if current_groupby in custom_groupby_map:
+            groupby_model = custom_groupby_map[current_groupby]['model']
+        elif current_groupby == 'id':
+            groupby_model = 'account.move.line'
+        elif current_groupby:
+            groupby_model = self.env['account.move.line']._fields[current_groupby].comodel_name
+        else:
+            groupby_model = None
+
+        return {
+            'current_groupby': current_groupby,
+            'next_groupby': next_groupby,
+            'current_groupby_model': groupby_model,
+            'custom_groupby_map': custom_groupby_map,
+        }
+
+    def _get_groupby(self, options):
+        self.ensure_one()
+        if options['export_mode'] == 'file':
+            return self.groupby
+        return self.user_groupby
+
+    def action_reset_custom_groupby(self):
+        self.ensure_one()
+        self.user_groupby = self.groupby
+
+
+class AccountReportExpression(models.Model):
+    _inherit = 'account.report.expression'
+
+    def action_view_carryover_lines(self, options, column_group_key=None):
+        if column_group_key:
+            options = self.report_line_id.report_id._get_column_group_options(options, column_group_key)
+
+        date_from, date_to = self.report_line_id.report_id._get_date_bounds_info(options, self.date_scope)
+
+        return {
+            'type': 'ir.actions.act_window',
+            'name': _('Carryover lines for: %s', self.report_line_name),
+            'res_model': 'account.report.external.value',
+            'views': [(False, 'list')],
+            'domain': [
+                ('target_report_expression_id', '=', self.id),
+                ('date', '>=', date_from),
+                ('date', '<=', date_to),
+            ],
+        }
+
+
+class AccountReportExternalValue(models.Model):
+    _inherit = 'account.report.external.value'
+
+    @api.model_create_multi
+    def create(self, vals_list):
+        records = super().create(vals_list)
+        self._check_lock_date_violation(set(self._build_vals_to_check_for_lock_date(records)))
+        return records
+
+    def write(self, vals):
+        # We need to build vals_to_check before the super() call because of the 'target_report_expression_id' field :
+        # if the user tries to modify this specific field, it'll potentially change the linked report id, and so he can
+        # bypass the lock dates from the original report (if it was a tax report for example)
+        vals_to_check = set(self._build_vals_to_check_for_lock_date(self))
+        res = super().write(vals)
+        # Then we add the modified records
+        for lock_date_to_check in self._build_vals_to_check_for_lock_date(self):
+            vals_to_check.add(lock_date_to_check)
+        self._check_lock_date_violation(vals_to_check)
+        return res
+
+    @api.model
+    def _build_vals_to_check_for_lock_date(self, records):
+        """
+        Generator method to build tuples out of records. The tuples will contain 3 values:
+        - is tax, bool: is the external value linked to a tax report
+        - date to check, date: the date we want to check the lock dates for
+        - company, res.company: the company we want to check the lock dates for
+        """
+        generic_tax_report = self.env.ref('account.generic_tax_report')
+        for external_value in records:
+            report = external_value.target_report_expression_id.report_line_id.report_id
+            yield (
+                not self.env.context.get('ignore_tax_lock_date') and generic_tax_report in (report + report.root_report_id + report.section_main_report_ids.root_report_id),  # is tax
+                external_value.date,  # date to check
+                external_value.company_id,  # company
+            )
+
+    def _check_lock_date_violation(self, vals_to_check):
+        """
+        This method raises an error if the companies have lock dates after the date we want to create/write the values
+        :param vals_to_check: a set of tuples like: `{(is_tax, date, company_id)}`
+        """
+        for is_tax, date, company_id in vals_to_check:
+            violated_lock_dates = company_id._get_lock_date_violations(
+                date,
+                sale=False,
+                purchase=False,
+                tax=is_tax,
+            )
+            if violated_lock_dates:
+                lock_date_names = [company_id._fields[lock_date[1]].get_description(self.env)['string'] for lock_date in violated_lock_dates]
+                lock_dates = "\n- " + "\n- ".join(lock_date_names)
+                raise ValidationError(_("You cannot update this value as it's locked by: %s", lock_dates))
+
+
+class AccountReportHorizontalGroup(models.Model):
+    _name = "account.report.horizontal.group"
+    _description = "Horizontal group for reports"
+
+    name = fields.Char(string="Name", required=True, translate=True)
+    rule_ids = fields.One2many(string="Rules", comodel_name='account.report.horizontal.group.rule', inverse_name='horizontal_group_id', required=True)
+    report_ids = fields.Many2many(string="Reports", comodel_name='account.report')
+
+    _sql_constraints = [
+        ('name_uniq', 'unique (name)', "A horizontal group with the same name already exists."),
+    ]
+
+    def _get_header_levels_data(self):
+        return [
+            (rule.field_name, rule._get_matching_records())
+            for rule in self.rule_ids
+        ]
+
+class AccountReportHorizontalGroupRule(models.Model):
+    _name = "account.report.horizontal.group.rule"
+    _description = "Horizontal group rule for reports"
+
+    def _field_name_selection_values(self):
+        return [
+            (aml_field['name'], aml_field['string'])
+            for aml_field in self.env['account.move.line'].fields_get().values()
+            if aml_field['type'] in ('many2one', 'many2many')
+        ]
+
+    horizontal_group_id = fields.Many2one(string="Horizontal Group", comodel_name='account.report.horizontal.group', required=True)
+    domain = fields.Char(string="Domain", required=True, default='[]')
+    field_name = fields.Selection(string="Field", selection='_field_name_selection_values', required=True)
+    res_model_name = fields.Char(string="Model", compute='_compute_res_model_name')
+
+    @api.depends('field_name')
+    def _compute_res_model_name(self):
+        for record in self:
+            if record.field_name:
+                record.res_model_name = self.env['account.move.line']._fields[record.field_name].comodel_name
+            else:
+                record.res_model_name = None
+
+    def _get_matching_records(self):
+        self.ensure_one()
+        model_name = self.env['account.move.line']._fields[self.field_name].comodel_name
+        domain = ast.literal_eval(self.domain)
+        return self.env[model_name].search(domain)
+
+
+class AccountReportCustomHandler(models.AbstractModel):
+    _name = 'account.report.custom.handler'
+    _description = 'Account Report Custom Handler'
+
+    # This abstract model allows case-by-case localized changes of behaviors of reports.
+    # This is used for custom reports, for cases that cannot be supported by the standard engines.
+
+    def _dynamic_lines_generator(self, report, options, all_column_groups_expression_totals, warnings=None):
+        """ Generates lines dynamically for reports that require a custom processing which cannot be handled
+        by regular report engines.
+        :return:    A list of tuples [(sequence, line_dict), ...], where:
+                    - sequence is the sequence to apply when rendering the line (can be mixed with static lines),
+                    - line_dict is a dict containing all the line values.
+        """
+        return []
+
+    def _caret_options_initializer(self):
+        """ Returns the caret options dict to be used when rendering this report,
+        in the same format as the one used in _caret_options_initializer_default (defined on 'account.report').
+        If the result is empty, the engine will use the default caret options.
+        """
+        return self.env['account.report']._caret_options_initializer_default()
+
+    def _custom_options_initializer(self, report, options, previous_options):
+        """ To be overridden to add report-specific _init_options... code to the report. """
+        if report.root_report_id and report.root_report_id.custom_handler_model_id != report.custom_handler_model_id:
+            report.root_report_id._init_options_custom(options, previous_options)
+
+    def _custom_line_postprocessor(self, report, options, lines):
+        """ Postprocesses the result of the report's _get_lines() before returning it. """
+        return lines
+
+    def _custom_groupby_line_completer(self, report, options, line_dict):
+        """ Postprocesses the dict generated by the group_by_line, to customize its content. """
+
+    def _custom_unfold_all_batch_data_generator(self, report, options, lines_to_expand_by_function):
+        """ When using the 'unfold all' option, some reports might end up recomputing the same query for
+        each line to unfold, leading to very inefficient computation. This function allows batching this computation,
+        and returns a dictionary where all results are cached, for use in expansion functions.
+        """
+        return None
+
+    def _get_custom_display_config(self):
+        """ To be overridden in order to change the templates used by Javascript to render this report (keeping the same
+        OWL components), and/or replace some of the default OWL components by custom-made ones.
+
+        This function returns a dict (possibly empty, if there is no custom display config):
+
+        {
+            'css_custom_class: 'class',
+            'components': {
+
+            },
+            'pdf_export': {
+
+            },
+            'templates': {
+
+            },
+        },
+        """
+        return {}
+
+    def _get_custom_groupby_map(self):
+        """ Allows the use of custom values in the groupby field of account.report.line, to use them in custom engines. Those custom
+        values can be anything, and need to be properly handled by the custom engine using them. This allows adding support for grouping on
+        something else than just the fields of account.move.line, which is the default.
+
+        :return:    A dict, in the form {groupby_name: {'model': model, 'domain_builder': domain_builder}}, where:
+                        - groupby_name is the custom value to use in groupby instead of one of aml's field names
+                        - model: is a model name (a string), representing the model the value returned for this custom groupby targets.
+                                 The model will be used to compute the display_name to show for each generated groupby line, in the UI.
+                                 This value can be passed to None ; in such case, the raw value returned by the engine will be shown.
+                        - domain_builder is a function to be called when expanding a groupby line generated by this custom groupby, to compute the
+                                 domain to apply in order to restrict the computation to the content of this groupby line.
+                                 This function must accept a single parameter, corresponding to the groupby value to compute the domain for.
+                        - label_builder is a function to be called to compute a label for the groupby value, that will be shown as the line name
+                                 in the UI. This ways, translatable labels and multi-values keys serialized to json can be fully supported.
+        """
+        return {}
+
+    def _customize_warnings(self, report, options, all_column_groups_expression_totals, warnings):
+        """ To be overridden to add report-specific warnings in the warnings dictionary.
+        When a root report defines something in this function, its variants without any custom handler will also call the root report's
+        _customize_warnings function. This can hence be used to share warnings between all variants.
+
+        Should only be used when necessary, _dynamic_lines_generator is preferred.
+        """
+
+    def _enable_export_buttons_for_common_vat_groups_in_branches(self, options):
+        """ DEPRECATED: to be removed in master. Buttons are now set to 'branch_allowed' when needed in get_options() """
+        pass
+
+
+class AccountReportFileDownloadException(Exception):
+    def __init__(self, errors, content=None):
+        super().__init__()
+        self.errors = errors
+        self.content = content
diff --git a/dev_odex30_accounting/odex30_account_reports/models/account_sales_report.py b/dev_odex30_accounting/odex30_account_reports/models/account_sales_report.py
new file mode 100644
index 0000000..0f55676
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_reports/models/account_sales_report.py
@@ -0,0 +1,420 @@
+from collections import defaultdict
+
+from odoo import _, api, fields, models
+from odoo.tools import SQL
+
+
+class ECSalesReportCustomHandler(models.AbstractModel):
+    _name = 'account.ec.sales.report.handler'
+    _inherit = 'account.report.custom.handler'
+    _description = 'EC Sales Report Custom Handler'
+
+    def _get_custom_display_config(self):
+        return {
+            'components': {
+                'AccountReportFilters': 'odex30_account_reports.SalesReportFilters',
+            },
+        }
+
+    def _dynamic_lines_generator(self, report, options, all_column_groups_expression_totals, warnings=None):
+        """
+        Generate the dynamic lines for the report in a vertical style (one line per tax per partner).
+        """
+        lines = []
+        totals_by_column_group = {
+            column_group_key: {
+                'balance': 0.0,
+                'goods': 0.0,
+                'triangular': 0.0,
+                'services': 0.0,
+                'vat_number': '',
+                'country_code': '',
+                'sales_type_code': '',
+            }
+            for column_group_key in options['column_groups']
+        }
+
+        operation_categories = options['sales_report_taxes'].get('operation_category', {})
+        ec_tax_filter_selection = {v.get('id'): v.get('selected') for v in options.get('ec_tax_filter_selection', [])}
+        for partner, results in self._query_partners(report, options, warnings):
+            for tax_ec_category in ('goods', 'triangular', 'services'):
+                if not ec_tax_filter_selection[tax_ec_category]:
+                    # Skip the line if the tax is not selected
+                    continue
+                partner_values = defaultdict(dict)
+                country_specific_code = operation_categories.get(tax_ec_category)
+                has_found_a_line = False
+                for col_grp_key in options['column_groups']:
+                    partner_sum = results.get(col_grp_key, {})
+                    partner_values[col_grp_key]['vat_number'] = partner_sum.get('vat_number', 'UNKNOWN')
+                    partner_values[col_grp_key]['country_code'] = partner_sum.get('country_code', 'UNKNOWN')
+                    partner_values[col_grp_key]['sales_type_code'] = []
+                    partner_values[col_grp_key]['balance'] = partner_sum.get(tax_ec_category, 0.0)
+                    totals_by_column_group[col_grp_key]['balance'] += partner_sum.get(tax_ec_category, 0.0)
+                    for i, operation_id in enumerate(partner_sum.get('tax_element_id', [])):
+                        if operation_id in options['sales_report_taxes'][tax_ec_category]:
+                            has_found_a_line = True
+                            partner_values[col_grp_key]['sales_type_code'] += [
+                                country_specific_code or
+                                (partner_sum.get('sales_type_code') and partner_sum.get('sales_type_code')[i])
+                                or None]
+                    partner_values[col_grp_key]['sales_type_code'] = ', '.join(set(partner_values[col_grp_key]['sales_type_code']))
+                if has_found_a_line:
+                    lines.append((0, self._get_report_line_partner(report, options, partner, partner_values, markup=tax_ec_category)))
+
+        # Report total line.
+        if lines:
+            lines.append((0, self._get_report_line_total(report, options, totals_by_column_group)))
+
+        return lines
+
+    def _caret_options_initializer(self):
+        """
+        Add custom caret option for the report to link to the partner and allow cleaner overrides.
+        """
+        return {
+            'ec_sales': [
+                {'name': _("View Partner"), 'action': 'caret_option_open_record_form'}
+            ],
+        }
+
+    def _custom_options_initializer(self, report, options, previous_options):
+        """
+        Add the invoice lines search domain that is specific to the country.
+        Typically, the taxes tag_ids relative to the country for the triangular, sale of goods or services
+        :param dict options: Report options
+        :param dict previous_options: Previous report options
+        """
+        super()._custom_options_initializer(report, options, previous_options=previous_options)
+        self._init_core_custom_options(report, options, previous_options)
+        options.update({
+            'sales_report_taxes': {
+                'goods': tuple(self.env['account.tax'].search([
+                    *self.env['account.tax']._check_company_domain(self.env.company),
+                    ('amount', '=', 0.0),
+                    ('amount_type', '=', 'percent'),
+                    ('type_tax_use', '=', 'sale'),
+                ]).ids),
+                'services': tuple(),
+                'triangular': tuple(),
+                'use_taxes_instead_of_tags': True,
+                # We can't use tags as we don't have a country tax report correctly set, 'use_taxes_instead_of_tags'
+                # should never be used outside this case
+            }
+        })
+        country_ids = self.env['res.country'].search([
+            ('code', 'in', tuple(self._get_ec_country_codes(options)))
+        ]).ids
+        other_country_ids = tuple(set(country_ids) - {self.env.company.account_fiscal_country_id.id})
+        options.setdefault('forced_domain', []).extend([
+            '|',
+            ('move_id.partner_shipping_id.country_id', 'in', other_country_ids),
+            '&',
+            ('move_id.partner_shipping_id', '=', False),
+            ('partner_id.country_id', 'in', other_country_ids),
+        ])
+
+        report._init_options_journals(options, previous_options=previous_options)
+
+        options['enable_export_buttons_for_common_vat_in_branches'] = True
+
+    def _init_core_custom_options(self, report, options, previous_options):
+        """
+        Add the invoice lines search domain that is common to all countries.
+        :param dict options: Report options
+        :param dict previous_options: Previous report options
+        """
+        default_tax_filter = [
+            {'id': 'goods', 'name': _('Goods'), 'selected': True},
+            {'id': 'triangular', 'name': _('Triangular'), 'selected': True},
+            {'id': 'services', 'name': _('Services'), 'selected': True},
+        ]
+
+        ec_tax_filter_selection = previous_options.get('ec_tax_filter_selection', default_tax_filter)
+        # In case we have a EC sale list report with more ec_tax_filter_selection the previous options will have extra
+        # item we just keep the default ones, and we let variant extend the function to add the ones they need
+        if ec_tax_filter_selection != default_tax_filter:
+            filtered_ec_tax_filter_selection = [item for item in ec_tax_filter_selection if item['id'] in {item['id'] for item in default_tax_filter}]
+            options['ec_tax_filter_selection'] = filtered_ec_tax_filter_selection
+        else:
+            options['ec_tax_filter_selection'] = ec_tax_filter_selection
+
+    def _get_report_line_partner(self, report, options, partner, partner_values, markup=''):
+        """
+        Convert the partner values to a report line.
+        :param dict options: Report options
+        :param recordset partner: the corresponding res.partner record
+        :param dict partner_values: Dictionary of values for the report line
+        :return dict: Return a dict with the values for the report line.
+        """
+        column_values = []
+        for column in options['columns']:
+            value = partner_values[column['column_group_key']].get(column['expression_label'])
+            column_values.append(report._build_column_dict(value, column, options=options))
+
+        return {
+            'id': report._get_generic_line_id('res.partner', partner.id, markup=markup),
+            'name': partner is not None and (partner.name or '')[:128] or _('Unknown Partner'),
+            'columns': column_values,
+            'level': 2,
+            'trust': partner.trust if partner else None,
+            'caret_options': 'ec_sales',
+        }
+
+    def _get_report_line_total(self, report, options, totals_by_column_group):
+        """
+        Convert the total values to a report line.
+        :param dict options: Report options
+        :param dict totals_by_column_group: Dictionary of values for the total line
+        :return dict: Return a dict with the values for the report line.
+        """
+        column_values = []
+        for column in options['columns']:
+            col_value = totals_by_column_group[column['column_group_key']].get(column['expression_label'])
+            col_value = col_value if column['figure_type'] == 'monetary' else ''
+
+            column_values.append(report._build_column_dict(col_value, column, options=options))
+
+        return {
+            'id': report._get_generic_line_id(None, None, markup='total'),
+            'name': _('Total'),
+            'class': 'total',
+            'level': 1,
+            'columns': column_values,
+        }
+
+    def _query_partners(self, report, options, warnings=None):
+        ''' Execute the queries, perform all the computation, then
+        returns a lists of tuple (partner, fetched_values) sorted by the table's model _order:
+            - partner is a res.parter record.
+            - fetched_values is a dictionary containing:
+                - sums by operation type:           {'goods': float,
+                                                     'triangular': float,
+                                                     'services': float,
+
+                - tax identifiers:                   'tax_element_id': list[int], > the tag_id in almost every case
+                                                     'sales_type_code': list[str],
+
+                - partner identifier elements:       'vat_number': str,
+                                                     'full_vat_number': str,
+                                                     'country_code': str}
+
+        :param options:             The report options.
+        :return:                    (accounts_values, taxes_results)
+        '''
+        groupby_partners = {}
+        vat_set = set()
+
+        def assign_sum(row):
+            """
+            Assign corresponding values from the SQL querry row to the groupby_partners dictionary.
+            If the line balance isn't 0, find the tax tag_id and check in which column/report line the SQL line balance
+            should be displayed.
+
+            The tricky part is to allow for the report to be displayed in vertical or horizontal format.
+            In vertical, you have up to 3 lines per partner (one for each operation type).
+            In horizontal, you have one line with 3 columns per partner (one for each operation type).
+
+            Add then the more straightforward data (vat number, country code, ...)
+            :param dict row:
+            """
+            if not company_currency.is_zero(row['balance']):
+                vat = row['vat_number'] or ''
+                vat_country_code = vat[:2] if vat[:2].isalpha() else None
+                duplicated_vat = vat and vat in vat_set and row['groupby'] not in groupby_partners
+                if vat:
+                    vat_set.add(vat)
+
+                groupby_partners.setdefault(row['groupby'], defaultdict(lambda: defaultdict(float)))
+                groupby_partners_keyed = groupby_partners[row['groupby']][row['column_group_key']]
+                for key in options['sales_report_taxes']:
+                    # options['sales_report_taxes'][key] could be either a list, set, tuple or boolean, in case of boolean
+                    # the in operator would traceback
+                    if not isinstance(options['sales_report_taxes'][key], bool) and row['tax_element_id'] in options['sales_report_taxes'][key]:
+                        groupby_partners_keyed[key] += row['balance']
+
+                groupby_partners_keyed.setdefault('tax_element_id', []).append(row['tax_element_id'])
+                groupby_partners_keyed.setdefault('sales_type_code', []).append(row['sales_type_code'])
+
+                groupby_partners_keyed.setdefault('vat_number', vat if not vat_country_code else vat[2:])
+                groupby_partners_keyed.setdefault('full_vat_number', vat)
+                groupby_partners_keyed.setdefault('country_code', vat_country_code or row.get('country_code'))
+
+                if warnings is not None:
+                    if row['country_code'] not in self._get_ec_country_codes(options):
+                        warnings['odex30_account_reports.sales_report_warning_non_ec_country'] = {'alert_type': 'warning'}
+                    elif not row.get('vat_number'):
+                        warnings['odex30_account_reports.sales_report_warning_missing_vat'] = {'alert_type': 'warning'}
+                    if row.get('same_country') and row['country_code']:
+                        warnings['odex30_account_reports.sales_report_warning_same_country'] = {'alert_type': 'warning'}
+                    if duplicated_vat:
+                        if warnings.get('odex30_account_reports.sales_report_warning_duplicated_vat'):
+                            warnings['odex30_account_reports.sales_report_warning_duplicated_vat']['duplicated_partners_vat'].append(vat)
+                        else:
+                            warnings['odex30_account_reports.sales_report_warning_duplicated_vat'] = {'alert_type': 'warning', 'duplicated_partners_vat': [vat]}
+
+        company_currency = self.env.company.currency_id
+
+        # Execute the queries and dispatch the results.
+        query = self._get_query_sums(report, options)
+        self._cr.execute(query)
+
+        dictfetchall = self._cr.dictfetchall()
+        for res in dictfetchall:
+            assign_sum(res)
+
+        if groupby_partners:
+            partners = self.env['res.partner'].with_context(active_test=False).browse(groupby_partners.keys())
+        else:
+            partners = self.env['res.partner']
+
+        return [(partner, groupby_partners[partner.id]) for partner in partners.sorted()]
+
+    def _get_query_sums(self, report, options) -> SQL:
+        ''' Construct a query retrieving all the aggregated sums to build the report. It includes:
+        - sums for all partners.
+        - sums for the initial balances.
+        :param options:             The report options.
+        :return:                    query as SQL object
+        '''
+        queries = []
+        # Create the currency table.
+        allowed_ids = self._get_tag_ids_filtered(options)
+
+        # In the case of the generic report, we don't have a country defined. So no reliable tax report whose
+        # tag_ids can be used. So we have a fallback to tax_ids.
+
+        if options.get('sales_report_taxes', {}).get('use_taxes_instead_of_tags'):
+            tax_elem_table = SQL('account_tax')
+            tax_elem_table_id = SQL('account_tax_id')
+            aml_rel_table = SQL('account_move_line_account_tax_rel')
+            tax_elem_table_name = self.env['account.tax']._field_to_sql('account_tax', 'name')
+        else:
+            tax_elem_table = SQL('account_account_tag')
+            tax_elem_table_id = SQL('account_account_tag_id')
+            aml_rel_table = SQL('account_account_tag_account_move_line_rel')
+            tax_elem_table_name = self.env['account.account.tag']._field_to_sql('account_account_tag', 'name')
+
+        for column_group_key, column_group_options in report._split_options_per_column_group(options).items():
+            query = report._get_report_query(column_group_options, 'strict_range')
+            if allowed_ids:
+                query.add_where(SQL('%s.id IN %s', tax_elem_table, tuple(allowed_ids)))
+            queries.append(SQL(
+                """
+                SELECT
+                    %(column_group_key)s            AS column_group_key,
+                    account_move_line.partner_id    AS groupby,
+                    res_partner.vat                 AS vat_number,
+                    res_country.code                AS country_code,
+                    -SUM(%(balance_select)s)        AS balance,
+                    %(tax_elem_table_name)s         AS sales_type_code,
+                    %(tax_elem_table)s.id           AS tax_element_id,
+                    (comp_partner.country_id = res_partner.country_id) AS same_country
+                FROM %(table_references)s
+                %(currency_table_join)s
+                JOIN %(aml_rel_table)s ON %(aml_rel_table)s.account_move_line_id = account_move_line.id
+                JOIN %(tax_elem_table)s ON %(aml_rel_table)s.%(tax_elem_table_id)s = %(tax_elem_table)s.id
+                JOIN res_partner ON account_move_line.partner_id = res_partner.id
+                JOIN res_country ON res_partner.country_id = res_country.id
+                JOIN res_company ON res_company.id = account_move_line.company_id
+                JOIN res_partner comp_partner ON comp_partner.id = res_company.partner_id
+                WHERE %(search_condition)s
+                GROUP BY %(tax_elem_table)s.id, %(tax_elem_table)s.name, account_move_line.partner_id,
+                res_partner.vat, res_country.code, comp_partner.country_id, res_partner.country_id
+                """,
+                column_group_key=column_group_key,
+                tax_elem_table_name=tax_elem_table_name,
+                tax_elem_table=tax_elem_table,
+                table_references=query.from_clause,
+                balance_select=report._currency_table_apply_rate(SQL("account_move_line.balance")),
+                currency_table_join=report._currency_table_aml_join(column_group_options),
+                aml_rel_table=aml_rel_table,
+                tax_elem_table_id=tax_elem_table_id,
+                search_condition=query.where_clause,
+            ))
+        return SQL(' UNION ALL ').join(queries)
+
+    @api.model
+    def _get_tag_ids_filtered(self, options):
+        """
+        Helper function to get all the tag_ids concerned by the report for the given options.
+        :param dict options: Report options
+        :return tuple: tag_ids untyped after filtering
+        """
+        allowed_taxes = set()
+        for operation_type in options.get('ec_tax_filter_selection', []):
+            if operation_type.get('selected'):
+                allowed_taxes.update(options['sales_report_taxes'][operation_type.get('id')])
+        return allowed_taxes
+
+    @api.model
+    def _get_ec_country_codes(self, options):
+        """
+        Return the list of country codes for the EC countries.
+        :param dict options: Report options
+        :return set: List of country codes for a given date (UK case)
+        """
+        rslt = {'AT', 'BE', 'BG', 'HR', 'CY', 'CZ', 'DK', 'EE', 'FI', 'FR', 'DE', 'GR', 'HU',
+                'IE', 'IT', 'LV', 'LT', 'LU', 'MT', 'NL', 'PL', 'PT', 'RO', 'SK', 'SI', 'ES', 'SE', 'XI'}
+
+        # GB left the EU on January 1st 2021. But before this date, it's still to be considered as a EC country
+        if fields.Date.from_string(options['date']['date_from']) < fields.Date.from_string('2021-01-01'):
+            rslt.add('GB')
+        # Monaco  is treated as part of France for VAT purposes (but should not be displayed within FR context)
+        if self.env.company.account_fiscal_country_id.code != 'FR':
+            rslt.add('MC')
+
+        return rslt
+
+    def get_warning_act_window(self, options, params):
+        act_window = {'type': 'ir.actions.act_window', 'context': {}}
+        if params['type'] == 'no_vat':
+            aml_domains = [
+                ('partner_id.vat', '=', None),
+                ('partner_id.country_id.code', 'in', tuple(self._get_ec_country_codes(options))),
+            ]
+            act_window.update({
+                'name': _("Entries with partners with no VAT"),
+                'context': {'search_default_group_by_partner': 1, 'expand': 1}
+            })
+        elif params['type'] == 'non_ec_country':
+            aml_domains = [('partner_id.country_id.code', 'not in', tuple(self._get_ec_country_codes(options)))]
+            act_window['name'] = _("EC tax on non EC countries")
+        elif params['type'] == 'duplicated_vat':
+            return self._get_duplicated_vat_partners(tuple(params['duplicated_partners_vat']))
+        else:
+            aml_domains = [('partner_id.country_id.code', '=', options.get('same_country_warning'))]
+            act_window['name'] = _("EC tax on same country")
+        use_taxes_instead_of_tags = options.get('sales_report_taxes', {}).get('use_taxes_instead_of_tags')
+        tax_or_tag_field = 'tax_ids.id' if use_taxes_instead_of_tags else 'tax_tag_ids.id'
+        amls = self.env['account.move.line'].search([
+            *aml_domains,
+            *self.env['account.report']._get_options_date_domain(options, 'strict_range'),
+            (tax_or_tag_field, 'in', tuple(self._get_tag_ids_filtered(options)))
+        ])
+
+        if params['model'] == 'move':
+            act_window.update({
+                'views': [[self.env.ref('account.view_move_tree').id, 'list'], (False, 'form')],
+                'res_model': 'account.move',
+                'domain': [('id', 'in', amls.move_id.ids)],
+            })
+        else:
+            act_window.update({
+                'views': [(False, 'list'), (False, 'form')],
+                'res_model': 'res.partner',
+                'domain': [('id', 'in', amls.move_id.partner_id.ids)],
+            })
+
+        return act_window
+
+    def _get_duplicated_vat_partners(self, duplicated_partners_vat):
+        view_ref = self.env.ref('odex30_account_reports.duplicated_vat_partner_tree_view', raise_if_not_found=False)
+        return {
+            'type': 'ir.actions.act_window',
+            'name': _('Partners with duplicated VAT numbers'),
+            'context': {'group_by': 'vat', 'expand': 1, 'duplicated_partners_vat': duplicated_partners_vat},
+            'views': [(view_ref and view_ref.id or False, 'list'), (False, 'form')],
+            'res_model': 'res.partner',
+            'domain': [('vat', 'in', duplicated_partners_vat)],
+        }
diff --git a/dev_odex30_accounting/odex30_account_reports/models/account_tax.py b/dev_odex30_accounting/odex30_account_reports/models/account_tax.py
new file mode 100644
index 0000000..b116dc5
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_reports/models/account_tax.py
@@ -0,0 +1,158 @@
+# -*- coding: utf-8 -*-
+
+from odoo import api, models, fields, Command, _
+from odoo.exceptions import ValidationError
+
+
+class AccountTaxUnit(models.Model):
+    _name = "account.tax.unit"
+    _description = "Tax Unit"
+
+    name = fields.Char(string="Name", required=True)
+    country_id = fields.Many2one(string="Country", comodel_name='res.country', required=True, help="The country in which this tax unit is used to group your companies' tax reports declaration.")
+    vat = fields.Char(string="Tax ID", required=True, help="The identifier to be used when submitting a report for this unit.")
+    company_ids = fields.Many2many(string="Companies", comodel_name='res.company', required=True, help="Members of this unit")
+    main_company_id = fields.Many2one(string="Main Company", comodel_name='res.company', required=True, help="Main company of this unit; the one actually reporting and paying the taxes.")
+    fpos_synced = fields.Boolean(string="Fiscal Positions Synchronised", compute='_compute_fiscal_position_completion', help="Technical field indicating whether Fiscal Positions exist for all companies in the unit")
+
+    def create(self, vals_list):
+        res = super().create(vals_list)
+
+        horizontal_groups = self.env['account.report.horizontal.group'].create([
+            {
+                'name': tax_unit.name,
+                'rule_ids': [
+                    Command.create({
+                        'field_name': 'company_id',
+                        'domain': f"[('account_tax_unit_ids', 'in', {tax_unit.id})]",
+                    }),
+                ],
+            }
+            for tax_unit in res
+        ])
+
+        generic_tax_report = self.env.ref('account.generic_tax_report')
+        generic_tax_report.horizontal_group_ids |= horizontal_groups
+
+        generic_tax_report_account_tax = self.env.ref('account.generic_tax_report_account_tax')
+        generic_tax_report_account_tax.horizontal_group_ids |= horizontal_groups
+
+        generic_tax_report_tax_account = self.env.ref('account.generic_tax_report_tax_account')
+        generic_tax_report_tax_account.horizontal_group_ids |= horizontal_groups
+
+        generic_ec_sales_report = self.env.ref('odex30_account_reports.generic_ec_sales_report')
+        generic_ec_sales_report.horizontal_group_ids |= horizontal_groups
+
+        for tax_unit in res:
+            generic_tax_report.variant_report_ids.filtered(lambda variant: variant.country_id == tax_unit.country_id).write(
+                {
+                    'horizontal_group_ids': [Command.link(group.id) for group in horizontal_groups],
+                }
+            )
+
+        return res
+
+    @api.depends('company_ids')
+    def _compute_fiscal_position_completion(self):
+        for unit in self:
+            synced = True
+            for company in unit.company_ids:
+                origin_company = company._origin if isinstance(company.id, models.NewId) else company
+                fp = unit._get_tax_unit_fiscal_positions(companies=origin_company)
+                all_partners_with_fp = self.env['res.company'].search([]).with_company(origin_company).partner_id\
+                    .filtered(lambda p: p.property_account_position_id == fp) if fp else self.env['res.partner']
+                synced = all_partners_with_fp == (unit.company_ids - origin_company).partner_id
+                if not synced:
+                    break
+            unit.fpos_synced = synced
+
+    def _get_tax_unit_fiscal_positions(self, companies, create_or_refresh=False):
+        """
+        Retrieves or creates fiscal positions for all companies specified.
+        Each Fiscal Position contains all the taxes of the company mapped to no tax
+
+        @param {recordset} companies: companies for which to find/create fiscal positions
+        @param {boolean} create_or_refresh: a boolean indicating whether the fiscal positions should be created if not found
+        @return {recordset} all the fiscal positions found/created for the companies requested.
+        """
+        fiscal_positions = self.env['account.fiscal.position'].with_context(allowed_company_ids=self.env.user.company_ids.ids)
+        for unit in self:
+            for company in companies:
+                fp_identifier = 'account.tax_unit_%s_fp_%s' % (unit.id, company.id)
+                existing_fp = self.env.ref(fp_identifier, raise_if_not_found=False)
+                if create_or_refresh:
+                    taxes_to_map = self.env['account.tax'].with_context(
+                        allowed_company_ids=self.env.user.company_ids.ids,
+                    ).search(self.env['account.tax']._check_company_domain(company))
+                    data = {
+                        'xml_id': fp_identifier,
+                        'values': {
+                            'name': unit.name,
+                            'company_id': company.id,
+                            'tax_ids': [Command.clear()] + [Command.create({'tax_src_id': tax.id}) for tax in taxes_to_map]
+                        }
+                    }
+                    existing_fp = fiscal_positions._load_records([data])
+                if existing_fp:
+                    fiscal_positions += existing_fp
+        return fiscal_positions
+
+    def action_sync_unit_fiscal_positions(self):
+        self._get_tax_unit_fiscal_positions(companies=self.env['res.company'].search([])).unlink()
+        for unit in self:
+            for company in unit.company_ids:
+                fp = unit._get_tax_unit_fiscal_positions(companies=company, create_or_refresh=True)
+                (unit.company_ids - company).with_company(company).partner_id.property_account_position_id = fp
+
+    def unlink(self):
+        # EXTENDS base
+        self._get_tax_unit_fiscal_positions(companies=self.env['res.company'].search([])).unlink()
+        return super().unlink()
+
+    @api.constrains('country_id', 'company_ids')
+    def _validate_companies_country(self):
+        for record in self:
+            currencies = set()
+            for company in record.company_ids:
+                currencies.add(company.currency_id)
+
+                if any(unit != record and unit.country_id == record.country_id for unit in company.account_tax_unit_ids):
+                    raise ValidationError(_("Company %(company)s already belongs to a tax unit in %(country)s. A company can at most be part of one tax unit per country.", company=company.name, country=record.country_id.name))
+
+            if len(currencies) > 1:
+                raise ValidationError(_("A tax unit can only be created between companies sharing the same main currency."))
+
+    @api.constrains('company_ids', 'main_company_id')
+    def _validate_main_company(self):
+        for record in self:
+            if record.main_company_id not in record.company_ids:
+                raise ValidationError(_("The main company of a tax unit has to be part of it."))
+
+    @api.constrains('company_ids')
+    def _validate_companies(self):
+        for record in self:
+            if len(record.company_ids) < 2:
+                raise ValidationError(_("A tax unit must contain a minimum of two companies. You might want to delete the unit."))
+
+    @api.constrains('country_id', 'vat')
+    def _validate_vat(self):
+        for record in self:
+            if not record.vat:
+                continue
+
+            checked_country_code = self.env['res.partner']._run_vat_test(record.vat, record.country_id)
+
+            if checked_country_code and checked_country_code != record.country_id.code.lower():
+                raise ValidationError(_("The country detected for this VAT number does not match the one set on this Tax Unit."))
+
+            if not checked_country_code:
+                tu_label = _("tax unit [%s]", record.name)
+                error_message = self.env['res.partner']._build_vat_error_message(record.country_id.code.lower(), record.vat, tu_label)
+                raise ValidationError(error_message)
+
+    @api.onchange('company_ids')
+    def _onchange_company_ids(self):
+        if self.main_company_id not in self.company_ids and self.company_ids:
+            self.main_company_id = self.company_ids[0]._origin
+        elif not self.company_ids:
+            self.main_company_id = False
diff --git a/dev_odex30_accounting/odex30_account_reports/models/account_trial_balance_report.py b/dev_odex30_accounting/odex30_account_reports/models/account_trial_balance_report.py
new file mode 100644
index 0000000..5f9bb16
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_reports/models/account_trial_balance_report.py
@@ -0,0 +1,195 @@
+# -*- coding: utf-8 -*-
+
+from odoo import api, models, _, fields
+from odoo.tools import float_compare
+from odoo.tools.misc import DEFAULT_SERVER_DATE_FORMAT
+
+
+class TrialBalanceCustomHandler(models.AbstractModel):
+    _name = 'account.trial.balance.report.handler'
+    _inherit = 'account.report.custom.handler'
+    _description = 'Trial Balance Custom Handler'
+
+    def _dynamic_lines_generator(self, report, options, all_column_groups_expression_totals, warnings=None):
+        def _update_column(line, column_key, new_value):
+            line['columns'][column_key]['no_format'] = new_value
+            line['columns'][column_key]['is_zero'] = self.env.company.currency_id.is_zero(new_value)
+
+        def _update_balance_columns(line, debit_column_key, credit_column_key, balance_column_key=None):
+            debit_value = line['columns'][debit_column_key]['no_format'] if debit_column_key is not None else False
+            credit_value = line['columns'][credit_column_key]['no_format'] if credit_column_key is not None else False
+
+            if debit_value and credit_value:
+                new_debit_value = 0.0
+                new_credit_value = 0.0
+
+                if self.env.company.currency_id.compare_amounts(debit_value, credit_value) == 1:
+                    new_debit_value = debit_value - credit_value
+                else:
+                    new_credit_value = (debit_value - credit_value) * -1
+
+                _update_column(line, debit_column_key, new_debit_value)
+                _update_column(line, credit_column_key, new_credit_value)
+
+            if balance_column_key is not None:
+                _update_column(line, balance_column_key, debit_value - credit_value)
+
+        def is_end_balance_column(column):
+            return options['column_groups'][column['column_group_key']].get('forced_options').get('is_end_balance')
+
+        lines = [line[1] for line in self.env['account.general.ledger.report.handler']._dynamic_lines_generator(report, options, all_column_groups_expression_totals, warnings=warnings)]
+
+        # We need to find the index of debit and credit columns for initial and end balance in case of extra custom columns
+        init_balance_debit_index = next((index for index, column in enumerate(options['columns']) if column.get('expression_label') == 'debit'), None)
+        init_balance_credit_index = next((index for index, column in enumerate(options['columns']) if column.get('expression_label') == 'credit'), None)
+
+        end_balance_debit_index = next((index for index, column in enumerate(options['columns']) if column.get('expression_label') == 'debit' and is_end_balance_column(column)), None)
+        end_balance_credit_index = next((index for index, column in enumerate(options['columns']) if column.get('expression_label') == 'credit' and is_end_balance_column(column)), None)
+        end_balance_balance_index = next((index for index, column in enumerate(options['columns']) if column.get('expression_label') == 'balance' and is_end_balance_column(column)), None)
+
+        currency = self.env.company.currency_id
+        for line in lines[:-1]:
+            # Initial balance
+            _update_balance_columns(line, init_balance_debit_index, init_balance_credit_index)
+            _update_balance_columns(line, end_balance_debit_index, end_balance_credit_index, end_balance_balance_index)
+
+            line.pop('expand_function', None)
+            line.pop('groupby', None)
+            line.update({
+                'unfoldable': False,
+                'unfolded': False,
+            })
+
+            res_model = report._get_model_info_from_id(line['id'])[0]
+            if res_model == 'account.account':
+                line['caret_options'] = 'trial_balance'
+
+        # Total line
+        if lines:
+            total_line = lines[-1]
+
+            for index in (init_balance_debit_index, init_balance_credit_index, end_balance_debit_index, end_balance_credit_index):
+                if index is not None:
+                    total_line['columns'][index]['no_format'] = sum(currency.round(line['columns'][index]['no_format']) for line in lines[:-1] if report._get_model_info_from_id(line['id'])[0] == 'account.account')
+                    total_line['columns'][index]['blank_if_zero'] = False
+
+        return [(0, line) for line in lines]
+
+    def _caret_options_initializer(self):
+        return {
+            'trial_balance': [
+                {'name': _("General Ledger"), 'action': 'caret_option_open_general_ledger'},
+                {'name': _("Journal Items"), 'action': 'open_journal_items'},
+            ],
+        }
+
+    def _get_column_group_creation_data(self, report, options, previous_options=None):
+        """
+        Return tuple of tuples containing a reference to the column_group creation function and on which side ('left' | 'right') of the report the column_group goes
+        """
+        return (
+            (self._create_column_group_initial_balance, 'left'),
+            (self._create_column_group_end_balance, 'right'),
+        )
+
+    @api.model
+    def _create_and_append_column_group(self, report, options, header_name, forced_options, side_to_append, group_vals, exclude_initial_balance=False, append_col_groups=True):
+        header_element = [{'name': header_name, 'forced_options': forced_options}]
+        column_headers = [header_element, *options['column_headers'][1:]]
+        column_group_vals = report._generate_columns_group_vals_recursively(column_headers, group_vals)
+
+        if exclude_initial_balance:
+            # This column group must not include initial balance; we use a special option key for that in general ledger
+            for column_group in column_group_vals:
+                column_group['forced_options']['general_ledger_strict_range'] = True
+
+        columns, column_groups = report._build_columns_from_column_group_vals(forced_options, column_group_vals)
+
+        side_to_append['column_headers'] += header_element
+        if append_col_groups:
+            side_to_append['column_groups'] |= column_groups
+        side_to_append['columns'] += columns
+
+    def _custom_options_initializer(self, report, options, previous_options):
+        """ Modifies the provided options to add a column group for initial balance and end balance, as well as the appropriate columns.
+        """
+        default_group_vals = {'horizontal_groupby_element': {}, 'forced_options': {}}
+        left_side = {'column_headers': [], 'column_groups': {}, 'columns': []}
+        right_side = {'column_headers': [], 'column_groups': {}, 'columns': []}
+
+        # Columns between initial and end balance must not include initial balance; we use a special option key for that in general ledger
+        for column_group in options['column_groups'].values():
+            column_group['forced_options']['general_ledger_strict_range'] = True
+
+        if options.get('comparison') and not options['comparison'].get('periods'):
+            options['comparison']['period_order'] = 'ascending'
+
+        # Create column groups
+        for function, side in self._get_column_group_creation_data(report, options, previous_options):
+            function(report, options, previous_options, default_group_vals, left_side if side == 'left' else right_side)
+
+        # Update options
+        options['column_headers'][0] = left_side['column_headers'] + options['column_headers'][0] + right_side['column_headers']
+        options['column_groups'].update(left_side['column_groups'])
+        options['column_groups'].update(right_side['column_groups'])
+        options['columns'] = left_side['columns'] + options['columns'] + right_side['columns']
+        options['ignore_totals_below_sections'] = True  # So that GL does not compute them
+
+        # All the periods displayed between initial and end balance need to use the same rates, so we manually change the period key.
+        # account.report will then compute the currency table periods accordingly
+        middle_periods_period_key = '_trial_balance_middle_periods'
+        for col_group in options['column_groups'].values():
+            col_group_date = col_group['forced_options'].get('date')
+            if col_group_date:
+                col_group_date['currency_table_period_key'] = middle_periods_period_key
+
+        report._init_options_order_column(options, previous_options)
+
+    def _custom_line_postprocessor(self, report, options, lines):
+        # If the hierarchy is enabled, ensure to add the o_account_coa_column_contrast class to the hierarchy lines
+        if options.get('hierarchy'):
+            for line in lines:
+                model, dummy = report._get_model_info_from_id(line['id'])
+                if model == 'account.group':
+                    line_classes = line.get('class', '')
+                    line['class'] = line_classes + ' o_account_coa_column_contrast_hierarchy'
+
+        return lines
+
+    def _create_column_group_initial_balance(self, report, options, previous_options, default_group_vals, side_to_append):
+        initial_balance_options = self.env['account.general.ledger.report.handler']._get_options_initial_balance(options)
+        initial_forced_options = {
+            'date': initial_balance_options['date'],
+            'include_current_year_in_unaff_earnings': initial_balance_options['include_current_year_in_unaff_earnings'],
+            'no_impact_on_currency_table': True,
+        }
+
+        self._create_and_append_column_group(
+            report,
+            options,
+            _("Initial Balance"),
+            initial_forced_options,
+            side_to_append,
+            default_group_vals,
+        )
+
+    def _create_column_group_end_balance(self, report, options, previous_options, default_group_vals, side_to_append):
+        end_date_to = options['date']['date_to']
+        end_date_from = options['date']['date_from']
+        end_forced_options = {
+            'date': report._get_dates_period(
+                fields.Date.from_string(end_date_from),
+                fields.Date.from_string(end_date_to),
+                'range',
+            ),
+            'is_end_balance': True,
+        }
+
+        self._create_and_append_column_group(
+            report,
+            options,
+            _("End Balance"),
+            end_forced_options,
+            side_to_append,
+            default_group_vals,
+        )
diff --git a/dev_odex30_accounting/odex30_account_reports/models/balance_sheet.py b/dev_odex30_accounting/odex30_account_reports/models/balance_sheet.py
new file mode 100644
index 0000000..189098a
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_reports/models/balance_sheet.py
@@ -0,0 +1,11 @@
+from odoo import models
+
+
+class BalanceSheetCustomHandler(models.AbstractModel):
+    _name = 'account.balance.sheet.report.handler'
+    _inherit = 'account.report.custom.handler'
+    _description = "Balance Sheet Custom Handler"
+
+    def _customize_warnings(self, report, options, all_column_groups_expression_totals, warnings):
+        if options['currency_table']['type'] == 'cta':
+            warnings['odex30_account_reports.common_possibly_unbalanced_because_cta'] = {}
diff --git a/dev_odex30_accounting/odex30_account_reports/models/bank_reconciliation_report.py b/dev_odex30_accounting/odex30_account_reports/models/bank_reconciliation_report.py
new file mode 100644
index 0000000..e2ad93d
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_reports/models/bank_reconciliation_report.py
@@ -0,0 +1,620 @@
+from datetime import date
+import logging
+from odoo import models, fields, _
+from odoo.exceptions import UserError
+from odoo.tools import SQL
+from odoo.osv import expression
+
+_logger = logging.getLogger(__name__)
+
+
+class BankReconciliationReportCustomHandler(models.AbstractModel):
+    _name = 'account.bank.reconciliation.report.handler'
+    _inherit = 'account.report.custom.handler'
+    _description = 'Bank Reconciliation Report Custom Handler'
+
+    ######################
+    # Options
+    ######################
+    def _custom_options_initializer(self, report, options, previous_options):
+        super()._custom_options_initializer(report, options, previous_options=previous_options)
+
+        # Options is needed otherwise some elements added in the post processor go on the total line
+        options['ignore_totals_below_sections'] = True
+        options['no_xlsx_currency_code_columns'] = True
+        if 'active_id' in self._context and self._context.get('active_model') == 'account.journal':
+            options['bank_reconciliation_report_journal_id'] = self._context['active_id']
+        elif 'bank_reconciliation_report_journal_id' in previous_options:
+            options['bank_reconciliation_report_journal_id'] = previous_options['bank_reconciliation_report_journal_id']
+        else:
+            # This should never happen except in some test cases
+            options['bank_reconciliation_report_journal_id'] = self.env['account.journal'].search([('type', '=', 'bank')], limit=1).id
+
+        # Remove multi-currency columns if needed
+        is_multi_currency = self.env.user.has_group('base.group_multi_currency') and self.env.user.has_group('base.group_no_one')
+        if not is_multi_currency:
+            options['columns'] = [
+                column for column in options['columns']
+                if column['expression_label'] not in ('amount_currency', 'currency')
+            ]
+
+    ######################
+    # Getter
+    ######################
+    def _get_bank_journal_and_currencies(self, options):
+        journal = self.env['account.journal'].browse(options.get('bank_reconciliation_report_journal_id'))
+        company_currency = journal.company_id.currency_id
+        journal_currency = journal.currency_id or company_currency
+        return journal, journal_currency, company_currency
+
+    ######################
+    # Return function
+    ######################
+    def _build_custom_engine_result(self, date=None, label=None, amount_currency=None, amount_currency_currency_id=None, currency=None, amount=0, amount_currency_id=None, has_sublines=False):
+        return {
+            'date': date,
+            'label': label,
+            'amount_currency': amount_currency,
+            'amount_currency_currency_id': amount_currency_currency_id,
+            'currency': currency,
+            'amount': amount,
+            'amount_currency_id': amount_currency_id,
+            'has_sublines': has_sublines,
+        }
+
+    ######################
+    # Engine
+    ######################
+    def _report_custom_engine_forced_currency_amount(self, expressions, options, date_scope, current_groupby, next_groupby, offset=0, limit=None, warnings=None):
+        _journal, journal_currency, _company_currency = self._get_bank_journal_and_currencies(options)
+        return self._build_custom_engine_result(amount_currency_id=journal_currency.id)
+
+    def _report_custom_engine_unreconciled_last_statement_receipts(self, expressions, options, date_scope, current_groupby, next_groupby, offset=0, limit=None, warnings=None):
+        return self._bank_reconciliation_report_custom_engine_common(options, 'receipts', current_groupby, True)
+
+    def _report_custom_engine_unreconciled_last_statement_payments(self, expressions, options, date_scope, current_groupby, next_groupby, offset=0, limit=None, warnings=None):
+        return self._bank_reconciliation_report_custom_engine_common(options, 'payments', current_groupby, True)
+
+    def _report_custom_engine_unreconciled_receipts(self, expressions, options, date_scope, current_groupby, next_groupby, offset=0, limit=None, warnings=None):
+        return self._bank_reconciliation_report_custom_engine_common(options, 'receipts', current_groupby, False)
+
+    def _report_custom_engine_unreconciled_payments(self, expressions, options, date_scope, current_groupby, next_groupby, offset=0, limit=None, warnings=None):
+        return self._bank_reconciliation_report_custom_engine_common(options, 'payments', current_groupby, False)
+
+    def _report_custom_engine_outstanding_receipts(self, expressions, options, date_scope, current_groupby, next_groupby, offset=0, limit=None, warnings=None):
+        return self._bank_reconciliation_report_custom_engine_outstanding_common(options, 'receipts', current_groupby)
+
+    def _report_custom_engine_outstanding_payments(self, expressions, options, date_scope, current_groupby, next_groupby, offset=0, limit=None, warnings=None):
+        return self._bank_reconciliation_report_custom_engine_outstanding_common(options, 'payments', current_groupby)
+
+    def _report_custom_engine_misc_operations(self, expressions, options, date_scope, current_groupby, next_groupby, offset=0, limit=None, warnings=None):
+        report = self.env['account.report'].browse(options['report_id'])
+        report._check_groupby_fields([current_groupby] if current_groupby else [])
+
+        journal, journal_currency, _company_currency = self._get_bank_journal_and_currencies(options)
+        exchange_journal = journal.company_id.currency_exchange_journal_id
+
+        bank_miscellaneous_domain = self._get_bank_miscellaneous_move_lines_domain(options, journal)
+        bank_miscellaneous_domain = expression.AND([
+            bank_miscellaneous_domain,
+            [('journal_id', '!=', exchange_journal.id)]
+        ])
+
+        base_query = report._get_report_query(options, 'strict_range', domain=bank_miscellaneous_domain or [])
+
+        groupby_field_sql = self.env['account.move.line']._field_to_sql("account_move_line", current_groupby, base_query) if current_groupby else None
+        query_sql = SQL(
+            """
+            SELECT
+                %(select_from_groupby)s,
+                COALESCE(SUM(COALESCE(NULLIF(account_move_line.amount_currency, 0), account_move_line.balance)), 0)
+            FROM %(table_references)s
+            WHERE %(search_condition)s
+            %(groupby_sql)s
+            """,
+            select_from_groupby=groupby_field_sql,
+            table_references=base_query.from_clause,
+            search_condition=base_query.where_clause,
+            groupby_sql=SQL("GROUP BY %s", groupby_field_sql) if groupby_field_sql else SQL(),
+        )
+
+        self._cr.execute(query_sql)
+        query_res_lines = self._cr.fetchall()
+
+        if not current_groupby:
+            return self._build_custom_engine_result(amount=query_res_lines[-1][1], amount_currency_id=journal_currency.id)
+        else:
+            return [
+                (grouping_key, self._build_custom_engine_result(amount=amount, amount_currency_id=journal_currency.id))
+                for grouping_key, amount in query_res_lines
+            ]
+
+    def _report_custom_engine_last_statement_balance_amount(self, expressions, options, date_scope, current_groupby, next_groupby, offset=0, limit=None, warnings=None):
+        if current_groupby:
+            raise UserError(_("Custom engine _report_custom_engine_last_statement_balance_amount does not support groupby"))
+
+        journal, journal_currency, _company_currency = self._get_bank_journal_and_currencies(options)
+        last_statement = self._get_last_bank_statement(journal, options)
+
+        return self._build_custom_engine_result(amount=last_statement.balance_end_real, amount_currency_id=journal_currency.id)
+
+    def _report_custom_engine_transaction_without_statement_amount(self, expressions, options, date_scope, current_groupby, next_groupby, offset=0, limit=None, warnings=None):
+        return self._bank_reconciliation_report_custom_engine_common(options, 'all', current_groupby, False, unreconciled=False)
+
+    def _bank_reconciliation_report_custom_engine_common(self, options, internal_type, current_groupby, from_last_statement, unreconciled=True):
+        """
+            Retrieve entries for bank reconciliation based on specified parameters.
+            Parameters:
+            - options (dict): A dictionary containing options of the report.
+            - internal_type (str): The internal type used for classification (e.g., receipt, payment). For the receipt
+                                   we will query the entries with a positive amounts and for the payment
+                                   the negative amounts.
+                                   If the internal type is another thing that receipt or payment it will get all the
+                                   entries position or negative
+            - current_groupby (str): The current grouping criteria.
+            - last_statement (bool, optional): If True, query entries from the last bank statement.
+                                               Otherwise, query entries that are not part of the last bank
+                                               statement.
+            - unreconciled (bool, optional): If True, query the unreconciled entries only
+
+        """
+        journal, journal_currency, _company_currency = self._get_bank_journal_and_currencies(options)
+        if not journal:
+            return self._build_custom_engine_result()
+
+        report = self.env['account.report'].browse(options['report_id'])
+        report._check_groupby_fields([current_groupby] if current_groupby else [])
+
+        def build_result_dict(query_res_lines):
+            # The query should find exactly one account move line per bank statement line
+            if current_groupby == 'id':
+                res = query_res_lines[0]
+                foreign_currency = self.env['res.currency'].browse(res['foreign_currency_id'])
+                rate = 1  # journal_currency / foreign_currency
+                if foreign_currency:
+                    rate = (res['amount'] / res['amount_currency']) if res['amount_currency'] else 0
+
+                return self._build_custom_engine_result(
+                    date=res['date'] if res['date'] else None,
+                    label=res['payment_ref'] or res['ref'] or '/',
+                    amount_currency=-res['amount_residual'] if res['foreign_currency_id'] else None,
+                    amount_currency_currency_id=foreign_currency.id if res['foreign_currency_id'] else None,
+                    currency=foreign_currency.display_name if res['foreign_currency_id'] else None,
+                    amount=-res['amount_residual'] * rate if res['amount_residual'] else None,
+                    amount_currency_id=journal_currency.id,
+                )
+            else:
+                amount = 0
+                for res in query_res_lines:
+                    rate = 1  # journal_currency / foreign_currency
+                    if res['foreign_currency_id']:
+                        rate = (res['amount'] / res['amount_currency']) if res['amount_currency'] else 0
+                    amount += -res.get('amount_residual', 0) * rate if unreconciled else res.get('amount', 0)
+
+                return self._build_custom_engine_result(
+                    amount=amount,
+                    amount_currency_id=journal_currency.id,
+                    has_sublines=bool(len(query_res_lines)),
+                )
+
+        query = report._get_report_query(options, 'strict_range', domain=[
+            ('journal_id', '=', journal.id),
+            ('account_id', '=', journal.default_account_id.id),  # There should be only 1 line per move with that account
+        ])
+
+        if from_last_statement:
+            last_statement_id = self._get_last_bank_statement(journal, options).id
+            if last_statement_id:
+                last_statement_id_condition = SQL("st_line.statement_id = %s", last_statement_id)
+            else:
+                # If there is no last statement, the last statement section must be empty and the other must have all
+                # transaction
+                return self._compute_result([], current_groupby, build_result_dict)
+        else:
+            last_statement_id_condition = SQL("st_line.statement_id IS NULL")
+
+        if internal_type == 'receipts':
+            st_line_amount_condition = SQL("AND st_line.amount > 0")
+        elif internal_type == 'payments':
+            st_line_amount_condition = SQL("AND st_line.amount < 0")
+        else:
+            # For the Transaction without statement, the internal type is 'all'
+            st_line_amount_condition = SQL("")
+
+        groupby_field_sql = self.env['account.move.line']._field_to_sql("account_move_line", current_groupby, query) if current_groupby else SQL('NULL')
+        # Build query
+        query = SQL(
+            """
+           SELECT %(select_from_groupby)s,
+                  st_line.id,
+                  move.name,
+                  move.ref,
+                  move.date,
+                  st_line.payment_ref,
+                  st_line.amount,
+                  st_line.amount_residual,
+                  st_line.amount_currency,
+                  st_line.foreign_currency_id
+             FROM %(table_references)s
+             JOIN account_bank_statement_line st_line ON st_line.move_id = account_move_line.move_id
+             JOIN account_move move ON move.id = st_line.move_id
+            WHERE %(search_condition)s
+                  %(is_unreconciled)s
+                  %(st_line_amount_condition)s
+              AND %(last_statement_id_condition)s
+         GROUP BY %(group_by)s,
+                  st_line.id,
+                  move.id
+            """,
+            select_from_groupby=SQL("%s AS grouping_key", groupby_field_sql),
+            table_references=query.from_clause,
+            search_condition=query.where_clause,
+            is_receipt=SQL("st_line.amount > 0") if internal_type == "receipts" else SQL("st_line.amount < 0"),
+            is_unreconciled=SQL("AND NOT st_line.is_reconciled") if unreconciled else SQL(""),
+            st_line_amount_condition=st_line_amount_condition,
+            last_statement_id_condition=last_statement_id_condition,
+            group_by=groupby_field_sql if current_groupby else SQL('st_line.id'),  # Same key in the groupby because we can't put a null key in a group by
+        )
+
+        self._cr.execute(query)
+        query_res_lines = self._cr.dictfetchall()
+
+        return self._compute_result(query_res_lines, current_groupby, build_result_dict)
+
+    def _bank_reconciliation_report_custom_engine_outstanding_common(self, options, internal_type, current_groupby):
+        """
+            This engine retrieves the data of all recorded payments/receipts that have not been matched with a bank
+            statement yet
+        """
+        journal, journal_currency, company_currency = self._get_bank_journal_and_currencies(options)
+        if not journal:
+            return self._build_custom_engine_result()
+
+        report = self.env['account.report'].browse(options['report_id'])
+        report._check_groupby_fields([current_groupby] if current_groupby else [])
+
+        def build_result_dict(query_res_lines):
+            if current_groupby == 'id':
+                res = query_res_lines[0]
+                convert = not (journal_currency and res['currency_id'] == journal_currency.id)
+                amount_currency = res['amount_residual_currency'] if res['is_account_reconcile'] else res['amount_currency']
+                balance = res['amount_residual'] if res['is_account_reconcile'] else res['balance']
+                foreign_currency = self.env['res.currency'].browse(res['currency_id'])
+
+                return self._build_custom_engine_result(
+                    date=res['date'] if res['date'] else None,
+                    label=res['ref'] if res['ref'] else None,
+                    amount_currency=amount_currency if convert else None,
+                    amount_currency_currency_id=foreign_currency.id if convert else None,
+                    currency=foreign_currency.display_name if convert else None,
+                    amount=company_currency._convert(balance, journal_currency, journal.company_id, options['date']['date_to']) if convert else amount_currency,
+                    amount_currency_id=journal_currency.id,
+                )
+            else:
+                amount = 0
+                for res in query_res_lines:
+                    convert = not (journal_currency and res['currency_id'] == journal_currency.id)
+                    if convert:
+                        balance = res['amount_residual'] if res['is_account_reconcile'] else res['balance']
+                        amount += company_currency._convert(balance, journal_currency, journal.company_id, options['date']['date_to'])
+                    else:
+                        amount += res['amount_residual_currency'] if res['is_account_reconcile'] else res['amount_currency']
+
+                return self._build_custom_engine_result(
+                    amount=amount,
+                    amount_currency_id=journal_currency.id,
+                    has_sublines=bool(len(query_res_lines)),
+                )
+
+        accounts = journal._get_journal_inbound_outstanding_payment_accounts() + journal._get_journal_outbound_outstanding_payment_accounts()
+
+        query = report._get_report_query(options, 'from_beginning', domain=[
+            ('journal_id', '=', journal.id),
+            ('account_id', 'in', accounts.ids),
+            ('full_reconcile_id', '=', False),
+            ('amount_residual_currency', '!=', 0.0)
+        ])
+
+        # Build query
+        groupby_field_sql = self.env['account.move.line']._field_to_sql("account_move_line", current_groupby, query) if current_groupby else SQL('NULL')
+        query = SQL(
+            """
+           SELECT %(select_from_groupby)s,
+                  account_move_line.account_id,
+                  account_move_line.payment_id,
+                  account_move_line.move_id,
+                  account_move_line.currency_id,
+                  account_move_line.move_name AS name,
+                  account_move_line.ref,
+                  account_move_line.date,
+                  account.reconcile AS is_account_reconcile,
+                  SUM(account_move_line.amount_residual) AS amount_residual,
+                  SUM(account_move_line.balance) AS balance,
+                  SUM(account_move_line.amount_residual_currency) AS amount_residual_currency,
+                  SUM(account_move_line.amount_currency) AS amount_currency
+             FROM %(table_references)s
+             JOIN account_account account ON account.id = account_move_line.account_id
+            WHERE %(search_condition)s
+              AND %(is_receipt)s
+         GROUP BY %(group_by)s,
+                  account_move_line.account_id,
+                  account_move_line.payment_id,
+                  account_move_line.move_id,
+                  account_move_line.currency_id,
+                  account_move_line.move_name,
+                  account_move_line.ref,
+                  account_move_line.date,
+                  account.reconcile
+           """,
+            select_from_groupby=SQL("%s AS grouping_key", groupby_field_sql),
+            table_references=query.from_clause,
+            search_condition=query.where_clause,
+            is_receipt=SQL("account_move_line.balance > 0") if internal_type == "receipts" else SQL("account_move_line.balance < 0"),
+            group_by=groupby_field_sql if current_groupby else SQL('account_move_line.account_id'),  # Same key in the groupby because we can't put a null key in a group by
+        )
+        self._cr.execute(query)
+        query_res_lines = self._cr.dictfetchall()
+
+        return self._compute_result(query_res_lines, current_groupby, build_result_dict)
+
+    def _compute_result(self, query_res_lines, current_groupby, build_result_dict):
+        if not current_groupby:
+            return build_result_dict(query_res_lines)
+        else:
+            rslt = []
+
+            all_res_per_grouping_key = {}
+            for query_res in query_res_lines:
+                grouping_key = query_res['grouping_key']
+                all_res_per_grouping_key.setdefault(grouping_key, []).append(query_res)
+
+            for grouping_key, query_res_lines in all_res_per_grouping_key.items():
+                rslt.append((grouping_key, build_result_dict(query_res_lines)))
+
+            return rslt
+
+    def _custom_line_postprocessor(self, report, options, lines):
+        lines = super()._custom_line_postprocessor(report, options, lines)
+        journal, _journal_currency, _company_currency = self._get_bank_journal_and_currencies(options)
+        if not journal:
+            return lines
+
+        last_statement = self._get_last_bank_statement(journal, options)
+
+        for line in lines:
+            line_id = report._get_res_id_from_line_id(line['id'], 'account.report.line')
+            code = self.env['account.report.line'].browse(line_id).code
+
+            if code == "balance_bank":
+                line['name'] = _("Balance of '%s'", journal.default_account_id.display_name)
+
+            if code == "last_statement_balance":
+                line['class'] = 'o_bold_tr'
+                if last_statement:
+                    line['columns'][1].update({
+                        'name': last_statement.display_name,
+                        'auditable': True,
+                    })
+
+            if code == "transaction_without_statement":
+                line['class'] = 'o_bold_tr'
+
+            if code == "misc_operations":
+                line['class'] = 'o_bold_tr'
+
+            # Check if it's a leaf node
+            model, _model_id = report._get_model_info_from_id(line['id'])
+            if model == "account.move.line":
+                line_name = line['name'].split()
+                line['name'] = line_name[0]  # This will give just the name without the ref or label
+
+        return lines
+
+    def _customize_warnings(self, report, options, all_column_groups_expression_totals, warnings):
+        journal, journal_currency, _company_currency = self._get_bank_journal_and_currencies(options)
+        inconsistent_statement = self._get_inconsistent_statements(options, journal).ids
+        bank_miscellaneous_domain = self._get_bank_miscellaneous_move_lines_domain(options, journal)
+        has_bank_miscellaneous_move_lines = bank_miscellaneous_domain and bool(self.env['account.move.line'].search_count(bank_miscellaneous_domain, limit=1))
+        last_statement, balance_gl, balance_end, unexplained_difference, general_ledger_not_matching = self._compute_journal_balances(report, options, journal, journal_currency)
+
+        if warnings is not None:
+            if last_statement and general_ledger_not_matching:
+                warnings['odex30_account_reports.journal_balance'] = {
+                    'alert_type': 'warning',
+                    'general_ledger_amount': balance_gl,
+                    'last_bank_statement_amount': balance_end,
+                    'unexplained_difference': unexplained_difference,
+                }
+            if inconsistent_statement:
+                warnings['odex30_account_reports.inconsistent_statement_warning'] = {'alert_type': 'warning', 'args': inconsistent_statement}
+            if has_bank_miscellaneous_move_lines:
+                warnings['odex30_account_reports.has_bank_miscellaneous_move_lines'] = {'alert_type': 'warning', 'args': journal.default_account_id.display_name}
+
+    def _compute_journal_balances(self, report, options, journal, journal_currency):
+        """
+            This function compute all necessary information for the warning 'odex30_account_reports.journal_balance'
+            :param report:          The bank reconciliation report.
+            :param options:         The report options.
+            :param journal:         The journal used.
+        """
+        # Get domain and balances
+        domain = report._get_options_domain(options, 'from_beginning')
+        balance_gl = journal._get_journal_bank_account_balance(domain=domain)[0]
+        last_statement, balance_end, difference, general_ledger_not_matching = self._compute_balances(options, journal, balance_gl, journal_currency)
+
+        # Format values
+        balance_gl = report.format_value(options, balance_gl, format_params={'currency_id': journal_currency.id}, figure_type='monetary')
+        balance_end = report.format_value(options, balance_end, format_params={'currency_id': journal_currency.id}, figure_type='monetary')
+        difference = report.format_value(options, difference, format_params={'currency_id': journal_currency.id}, figure_type='monetary')
+
+        return last_statement, balance_gl, balance_end, difference, general_ledger_not_matching
+
+    def _compute_balances(self, options, journal, balance_gl, report_currency):
+        """
+            This function will compute the balance of the last statement and the unexplained difference.
+            :param options:         The report options.
+            :param journal:         The journal used.
+            :param balance_gl:      The balance of the general ledger.
+            :param report_currency: The currency of the report.
+        """
+        report_date = fields.Date.from_string(options['date']['date_to'])
+        last_statement = self._get_last_bank_statement(journal, options)
+        balance_end = 0
+        difference = 0
+        general_ledger_not_matching = False
+
+        if last_statement:
+            lines_before_date_to = last_statement.line_ids.filtered(lambda line: line.date <= report_date)
+            balance_end = last_statement.balance_start + sum(lines_before_date_to.mapped('amount'))
+            difference = balance_gl - balance_end
+            general_ledger_not_matching = not report_currency.is_zero(difference)
+
+        return last_statement, balance_end, difference, general_ledger_not_matching
+
+    def _get_last_bank_statement(self, journal, options):
+        """
+            Retrieve the last bank statement created using this journal.
+            :param journal: The journal used.
+            :param domain:  An additional domain to be applied on the account.bank.statement model.
+            :return:        An account.bank.statement record or an empty recordset.
+        """
+        report_date = fields.Date.from_string(options['date']['date_to'])
+        last_statement_domain = [('journal_id', '=', journal.id), ('statement_id', '!=', False), ('date', '<=', report_date)]
+        last_st_line = self.env['account.bank.statement.line'].search(last_statement_domain, order='date desc, id desc', limit=1)
+        return last_st_line.statement_id
+
+    def _get_inconsistent_statements(self, options, journal):
+        """
+            Retrieve the account.bank.statements records on the range of the options date having different starting
+            balance regarding its previous statement.
+            :param options: The report options.
+            :param journal: The account.journal from which this report has been opened.
+            :return:        An account.bank.statements recordset.
+        """
+        return self.env['account.bank.statement'].search([
+            ('journal_id', '=', journal.id),
+            ('date', '<=', options['date']['date_to']),
+            ('is_valid', '=', False),
+        ])
+
+    def _get_bank_miscellaneous_move_lines_domain(self, options, journal):
+        """
+            Get the domain to be used to retrieve the journal items affecting the bank accounts but not linked to
+            a statement line. (Limited in a year)
+            :param options: The report options.
+            :param journal: The account.journal from which this report has been opened.
+            :return:        A domain to search on the account.move.line model.
+
+        """
+        if not journal.default_account_id:
+            return None
+
+        report = self.env['account.report'].browse(options['report_id'])
+        domain = [
+            ('account_id', '=', journal.default_account_id.id),
+            ('statement_line_id', '=', False),
+            *report._get_options_domain(options, 'from_beginning'),
+        ]
+
+        fiscal_lock_date = journal.company_id._get_user_fiscal_lock_date(journal)
+        if fiscal_lock_date != date.min:
+            domain.append(('date', '>', fiscal_lock_date))
+
+        if journal.company_id.account_opening_move_id:
+            domain.append(('move_id', '!=', journal.company_id.account_opening_move_id.id))
+
+        return domain
+
+    ################
+    # Audit
+    ################
+    def action_audit_cell(self, options, params):
+        report_line = self.env['account.report.line'].browse(params['report_line_id'])
+        if report_line.code == "balance_bank":
+            return self.action_redirect_to_general_ledger(options)
+        elif report_line.code == "misc_operations":
+            return self.open_bank_miscellaneous_move_lines(options)
+        elif report_line.code == "last_statement_balance":
+            return self.action_redirect_to_bank_statement_widget(options)
+        else:
+            return report_line.report_id.action_audit_cell(options, params)
+
+    ################
+    # ACTIONS
+    ################
+    def action_redirect_to_general_ledger(self, options):
+        """
+            Action to redirect to the general ledger
+            :param options:     The report options.
+            :return:            Actions to the report
+        """
+        general_ledger_action = self.env['ir.actions.actions']._for_xml_id('odex30_account_reports.action_account_report_general_ledger')
+        general_ledger_action['params'] = {
+            'options': options,
+            'ignore_session': True,
+        }
+
+        return general_ledger_action
+
+    def action_redirect_to_bank_statement_widget(self, options):
+        """
+            Redirect the user to the requested bank statement, if empty displays all bank transactions of the journal.
+            :param options:     The report options.
+            :param params:      The action params containing at least 'statement_id', can be false.
+            :return:            A dictionary representing an ir.actions.act_window.
+        """
+        journal = self.env['account.journal'].browse(options.get('bank_reconciliation_report_journal_id'))
+        last_statement = self._get_last_bank_statement(journal, options)
+        return self.env['account.bank.statement.line']._action_open_bank_reconciliation_widget(
+            default_context={'create': False, 'search_default_statement_id': last_statement.id},
+            name=last_statement.display_name,
+        )
+
+    def open_bank_miscellaneous_move_lines(self, options):
+        """
+            An action opening the account.move.line list view affecting the bank account balance but not linked to
+            a bank statement line.
+            :param options: The report options.
+            :param params:  -Not used-.
+            :return:        An action redirecting to the list view of journal items.
+        """
+        journal = self.env['account.journal'].browse(options['bank_reconciliation_report_journal_id'])
+
+        return {
+            'name': _('Journal Items'),
+            'type': 'ir.actions.act_window',
+            'res_model': 'account.move.line',
+            'view_type': 'list',
+            'view_mode': 'list',
+            'target': 'current',
+            'views': [(self.env.ref('account.view_move_line_tree').id, 'list')],
+            'domain': self.env['account.bank.reconciliation.report.handler']._get_bank_miscellaneous_move_lines_domain(options, journal),
+        }
+
+    def bank_reconciliation_report_open_inconsistent_statements(self, options, params=None):
+        """
+            An action opening the account.bank.statement view (form or list) depending the 'inconsistent_statement_ids'
+            key set on the options.
+            :param options: The report options.
+            :param params:  -Not used-.
+            :return:        An action redirecting to a view of statements.
+        """
+        inconsistent_statement_ids = params['args']
+        action = {
+            'name': _("Inconsistent Statements"),
+            'type': 'ir.actions.act_window',
+            'res_model': 'account.bank.statement',
+        }
+        if len(inconsistent_statement_ids) == 1:
+            action.update({
+                'view_mode': 'form',
+                'res_id': inconsistent_statement_ids[0],
+                'views': [(False, 'form')],
+            })
+        else:
+            action.update({
+                'view_mode': 'list',
+                'domain': [('id', 'in', inconsistent_statement_ids)],
+                'views': [(False, 'list')],
+            })
+        return action
diff --git a/dev_odex30_accounting/odex30_account_reports/models/budget.py b/dev_odex30_accounting/odex30_account_reports/models/budget.py
new file mode 100644
index 0000000..ddf15a8
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_reports/models/budget.py
@@ -0,0 +1,116 @@
+from itertools import zip_longest
+from dateutil.relativedelta import relativedelta
+
+from odoo import api, Command, fields, models, _
+from odoo.exceptions import ValidationError
+from odoo.tools import date_utils, float_is_zero, float_round
+
+
+class AccountReportBudget(models.Model):
+    _name = 'account.report.budget'
+    _description = "Accounting Report Budget"
+    _order = 'sequence, id'
+
+    sequence = fields.Integer(string="Sequence")
+    name = fields.Char(string="Name", required=True)
+    item_ids = fields.One2many(string="Items", comodel_name='account.report.budget.item', inverse_name='budget_id')
+    company_id = fields.Many2one(string="Company", comodel_name='res.company', required=True, default=lambda x: x.env.company)
+
+    @api.constrains('name')
+    def _contrains_name(self):
+        for budget in self:
+            if not budget.name:
+                raise ValidationError(_("Please enter a valid budget name."))
+
+    @api.model_create_multi
+    def create(self, create_values):
+        for values in create_values:
+            if name := values.get('name'):
+                values['name'] = name.strip()
+        return super().create(create_values)
+
+    def _create_or_update_budget_items(self, value_to_set, account_id, rounding, date_from, date_to):
+        """ This method will create / update several budget items following the number
+            of months between date_from(include) and date_to(include).
+
+            :param value_to_set: The value written by the user in the report cell.
+            :param account_id: The related account id.
+            :param rounding: The rounding for the decimal precision.
+            :param date_from: The start date for the budget item creation.
+            :param date_to: The end date for the budget item creation.
+        """
+        self.ensure_one()
+
+        date_from, date_to = fields.Date.to_date(date_from), fields.Date.to_date(date_to)
+        if date_from != date_utils.start_of(date_from, 'month'):
+            date_from = (date_from.replace(day=1) + relativedelta(months=1))
+        existing_budget_items = self.env['account.report.budget.item'].search_fetch([
+            ('budget_id', '=', self.id),
+            ('account_id', '=', account_id),
+            ('date', '<=', date_to),
+            ('date', '>=', date_from),
+        ], ['id', 'amount'])
+        existing_budget_items_by_date = {item.date: item for item in existing_budget_items}
+        total_amount = sum(existing_budget_items.mapped('amount'))
+
+        value_to_compute = value_to_set - total_amount
+        if float_is_zero(value_to_compute, precision_digits=rounding):
+            # In case the computed amount equals 0, we do an early return as
+            # it's not necessary to create new budget item
+            return
+
+        start_month_dates = [
+            date_utils.start_of(date, 'month')
+            for date in date_utils.date_range(date_from, date_to)
+        ]
+
+        # Fill a list with the same amounts for each month
+        amounts = [float_round(value_to_compute / len(start_month_dates), precision_digits=rounding, rounding_method='DOWN')] * len(start_month_dates)
+        # Add the remainder in the last amount
+        amounts[-1] += float_round(value_to_compute - sum(amounts), precision_digits=rounding)
+
+        budget_items_commands = []
+        for start_month_date, amount in zip_longest(start_month_dates, amounts):
+            existing_budget_item = existing_budget_items_by_date.get(start_month_date)
+            if existing_budget_item:
+                budget_items_commands.append(Command.update(existing_budget_item.id, {
+                    'amount': existing_budget_item.amount + amount,
+                }))
+            else:
+                budget_items_commands.append(Command.create({
+                    'account_id': account_id,
+                    'amount': amount,
+                    'date': start_month_date,
+                }))
+
+        if budget_items_commands:
+            self.item_ids = budget_items_commands
+            # Make sure that the model is flushed before continuing the code and fetching these new items
+            self.env['account.report.budget.item'].flush_model()
+
+    def copy_data(self, default=None):
+        vals_list = super().copy_data(default=default)
+        return [dict(vals, name=self.env._("%s (copy)", budget.name)) for budget, vals in zip(self, vals_list)]
+
+    def copy(self, default=None):
+        new_budgets = super().copy(default)
+        for old_budget, new_budget in zip(self, new_budgets):
+            for item in old_budget.item_ids:
+                item.copy({
+                    'budget_id': new_budget.id,
+                    'account_id': item.account_id.id,
+                    'amount': item.amount,
+                    'date': item.date,
+                })
+
+        return new_budgets
+
+
+class AccountReportBudgetItem(models.Model):
+    _name = 'account.report.budget.item'
+    _description = "Accounting Report Budget Item"
+
+    budget_id = fields.Many2one(string="Budget", comodel_name='account.report.budget', required=True, ondelete='cascade')
+    account_id = fields.Many2one(string="Account", comodel_name='account.account', required=True)
+    amount = fields.Float(string="Amount", default=0)
+    date = fields.Date(required=True)
diff --git a/dev_odex30_accounting/odex30_account_reports/models/chart_template.py b/dev_odex30_accounting/odex30_account_reports/models/chart_template.py
new file mode 100644
index 0000000..0a9728b
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_reports/models/chart_template.py
@@ -0,0 +1,39 @@
+# coding: utf-8
+from odoo import fields, models, _
+from odoo.exceptions import ValidationError
+
+
+class AccountChartTemplate(models.AbstractModel):
+    _inherit = 'account.chart.template'
+
+    def _post_load_data(self, template_code, company, template_data):
+        super()._post_load_data(template_code, company, template_data)
+
+        company = company or self.env.company
+        default_misc_journal = self.env['account.journal'].search([
+                *self.env['account.journal']._check_company_domain(company),
+                ('type', '=', 'general')
+            ], limit=1)
+        if not default_misc_journal:
+            raise ValidationError(_("No default miscellaneous journal could be found for the active company"))
+
+        company.update({
+            'totals_below_sections': company.anglo_saxon_accounting,
+            'account_tax_periodicity_journal_id': default_misc_journal,
+            'account_tax_periodicity_reminder_day': 7,
+        })
+        default_misc_journal.show_on_dashboard = True
+
+        generic_tax_report = self.env.ref('account.generic_tax_report')
+        tax_report = self.env['account.report'].search([
+            ('availability_condition', '=', 'country'),
+            ('country_id', '=', company.country_id.id),
+            ('root_report_id', '=', generic_tax_report.id),
+        ], limit=1)
+        if not tax_report:
+            tax_report = generic_tax_report
+
+        _dummy, period_end = company._get_tax_closing_period_boundaries(fields.Date.today(), tax_report)
+        activity = company._get_tax_closing_reminder_activity(tax_report.id, period_end)
+        if not activity:
+            company._generate_tax_closing_reminder_activity(tax_report, period_end)
diff --git a/dev_odex30_accounting/odex30_account_reports/models/executive_summary_report.py b/dev_odex30_accounting/odex30_account_reports/models/executive_summary_report.py
new file mode 100644
index 0000000..dd409a4
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_reports/models/executive_summary_report.py
@@ -0,0 +1,14 @@
+# -*- coding: utf-8 -*-
+
+from odoo import fields, models
+from odoo.exceptions import UserError
+
+class ExecutiveSummaryReport(models.Model):
+    _inherit = 'account.report'
+
+    def _report_custom_engine_executive_summary_ndays(self, expressions, options, date_scope, current_groupby, next_groupby, offset=0, limit=None, warnings=None):
+        if current_groupby or next_groupby:
+            raise UserError("NDays expressions of executive summary report don't support the 'group by' feature.")
+
+        date_diff = fields.Date.from_string(options['date']['date_to']) - fields.Date.from_string(options['date']['date_from'])
+        return {'result': date_diff.days}
diff --git a/dev_odex30_accounting/odex30_account_reports/models/ir_actions.py b/dev_odex30_accounting/odex30_account_reports/models/ir_actions.py
new file mode 100644
index 0000000..cfe18b9
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_reports/models/ir_actions.py
@@ -0,0 +1,12 @@
+# -*- coding: utf-8 -*-
+
+from odoo import models
+
+class IrActionsAccountReportDownload(models.AbstractModel):
+
+    _name = 'ir_actions_account_report_download'
+    _description = 'Technical model for accounting report downloads'
+
+    def _get_readable_fields(self):
+
+        return self.env['ir.actions.actions']._get_readable_fields() | {'data'}
diff --git a/dev_odex30_accounting/odex30_account_reports/models/mail_activity.py b/dev_odex30_accounting/odex30_account_reports/models/mail_activity.py
new file mode 100644
index 0000000..8ca2a7f
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_reports/models/mail_activity.py
@@ -0,0 +1,35 @@
+# -*- coding: utf-8 -*-
+
+from odoo import fields, models, _
+
+
+class AccountTaxReportActivity(models.Model):
+    _inherit = "mail.activity"
+
+    account_tax_closing_params = fields.Json(string="Tax closing additional params")
+
+    def action_open_tax_activity(self):
+        self.ensure_one()
+        if self.activity_type_id == self.env.ref('odex30_account_reports.mail_activity_type_tax_report_to_pay'):
+            move = self.env['account.move'].browse(self.res_id)
+            return move._action_tax_to_pay_wizard()
+        elif self.activity_type_id == self.env.ref('odex30_account_reports.mail_activity_type_tax_report_to_be_sent'):
+            move = self.env['account.move'].browse(self.res_id)
+            return move._action_tax_to_send()
+
+        if self.activity_type_id == self.env.ref('odex30_account_reports.mail_activity_type_tax_report_error'):
+            move = self.env['account.move'].browse(self.res_id)
+            return move._action_tax_report_error()
+
+        journal = self.env['account.journal'].browse(self.res_id)
+        options = {}
+        if self.account_tax_closing_params:
+            options = self.env['account.move']._get_tax_closing_report_options(
+                journal.company_id,
+                self.env['account.fiscal.position'].browse(self.account_tax_closing_params['fpos_id']) if self.account_tax_closing_params['fpos_id'] else False,
+                self.env['account.report'].browse(self.account_tax_closing_params['report_id']),
+                fields.Date.from_string(self.account_tax_closing_params['tax_closing_end_date'])
+            )
+        action = self.env["ir.actions.actions"]._for_xml_id("odex30_account_reports.action_account_report_gt")
+        action.update({'params': {'options': options, 'ignore_session': True}})
+        return action
diff --git a/dev_odex30_accounting/odex30_account_reports/models/mail_activity_type.py b/dev_odex30_accounting/odex30_account_reports/models/mail_activity_type.py
new file mode 100644
index 0000000..d02c57e
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_reports/models/mail_activity_type.py
@@ -0,0 +1,26 @@
+# -*- coding: utf-8 -*-
+
+from odoo import api, fields, models
+
+
+class AccountTaxReportActivityType(models.Model):
+    _inherit = "mail.activity.type"
+
+    category = fields.Selection(selection_add=[('tax_report', 'Tax report')])
+
+    @api.model
+    def _get_model_info_by_xmlid(self):
+        info = super()._get_model_info_by_xmlid()
+        info['odex30_account_reports.tax_closing_activity_type'] = {
+            'res_model': 'account.journal',
+            'unlink': False,
+        }
+        info['odex30_account_reports.mail_activity_type_tax_report_to_pay'] = {
+            'res_model': 'account.move',
+            'unlink': False,
+        }
+        info['odex30_account_reports.mail_activity_type_tax_report_to_be_sent'] = {
+            'res_model': 'account.move',
+            'unlink': False,
+        }
+        return info
diff --git a/dev_odex30_accounting/odex30_account_reports/models/res_company.py b/dev_odex30_accounting/odex30_account_reports/models/res_company.py
new file mode 100644
index 0000000..fd3dd36
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_reports/models/res_company.py
@@ -0,0 +1,465 @@
+# -*- coding: utf-8 -*-
+
+import datetime
+from dateutil.relativedelta import relativedelta
+import itertools
+
+from odoo import api, fields, models, _
+from odoo.exceptions import UserError
+from odoo.tools import date_utils
+from odoo.tools.misc import format_date
+
+
+class ResCompany(models.Model):
+    _inherit = "res.company"
+
+    totals_below_sections = fields.Boolean(
+        string='Add totals below sections',
+        help='When ticked, totals and subtotals appear below the sections of the report.')
+    account_tax_periodicity = fields.Selection([
+        ('year', 'annually'),
+        ('semester', 'semi-annually'),
+        ('4_months', 'every 4 months'),
+        ('trimester', 'quarterly'),
+        ('2_months', 'every 2 months'),
+        ('monthly', 'monthly')], string="Delay units", help="Periodicity", default='monthly', required=True)
+    account_tax_periodicity_reminder_day = fields.Integer(string='Start from', default=7, required=True)
+    account_tax_periodicity_journal_id = fields.Many2one('account.journal', string='Journal', domain=[('type', '=', 'general')], check_company=True)
+    account_revaluation_journal_id = fields.Many2one('account.journal', domain=[('type', '=', 'general')], check_company=True)
+    account_revaluation_expense_provision_account_id = fields.Many2one('account.account', string='Expense Provision Account', check_company=True)
+    account_revaluation_income_provision_account_id = fields.Many2one('account.account', string='Income Provision Account', check_company=True)
+    account_tax_unit_ids = fields.Many2many(string="Tax Units", comodel_name='account.tax.unit', help="The tax units this company belongs to.")
+    account_representative_id = fields.Many2one('res.partner', string='Accounting Firm',
+                                                help="Specify an Accounting Firm that will act as a representative when exporting reports.")
+    account_display_representative_field = fields.Boolean(compute='_compute_account_display_representative_field')
+
+    @api.depends('account_fiscal_country_id.code')
+    def _compute_account_display_representative_field(self):
+        country_set = self._get_countries_allowing_tax_representative()
+        for record in self:
+            record.account_display_representative_field = record.account_fiscal_country_id.code in country_set
+
+    def _get_countries_allowing_tax_representative(self):
+        """ Returns a set containing the country codes of the countries for which
+        it is possible to use a representative to submit the tax report.
+        This function is a hook that needs to be overridden in localisation modules.
+        """
+        return set()
+
+    def _get_default_misc_journal(self):
+        """ Returns a default 'miscellanous' journal to use for
+        account_tax_periodicity_journal_id field. This is useful in case a
+        CoA was already installed on the company at the time the module
+        is installed, so that the field is set automatically when added."""
+        return self.env['account.journal'].search([
+            *self.env['account.journal']._check_company_domain(self),
+            ('type', '=', 'general'),
+        ], limit=1)
+
+    def _get_tax_closing_journal(self):
+        journals = self.env['account.journal']
+        for company in self:
+            journals |= company.account_tax_periodicity_journal_id or company._get_default_misc_journal()
+
+        return journals
+
+    @api.model_create_multi
+    def create(self, vals_list):
+        companies = super().create(vals_list)
+        companies._initiate_account_onboardings()
+        return companies
+
+    def write(self, values):
+        tax_closing_update_dependencies = ('account_tax_periodicity', 'account_tax_periodicity_journal_id.id')
+        to_update = self.env['res.company']
+        for company in self:
+            if company._get_tax_closing_journal():
+                need_tax_closing_update = any(
+                    update_dep in values and company.mapped(update_dep)[0] != values[update_dep]
+                    for update_dep in tax_closing_update_dependencies
+                )
+
+                if need_tax_closing_update:
+                    to_update += company
+
+        res = super().write(values)
+
+        # Early return
+        if not to_update:
+            return res
+
+        to_reset_closing_moves = self.env['account.move'].sudo().search([
+            ('company_id', 'in', to_update.ids),
+            ('tax_closing_report_id', '!=', False),
+            ('state', '=', 'draft'),
+        ])
+        to_reset_closing_moves.button_cancel()
+        misc_journals = self.env['account.journal'].sudo().search([
+            *self.env['account.journal']._check_company_domain(to_update),
+            ('type', '=', 'general'),
+        ])
+        to_reset_closing_reminder_activities = self.env['mail.activity'].sudo().search([
+            ('res_id', 'in', misc_journals.ids),
+            ('res_model_id', '=', self.env['ir.model']._get_id('account.journal')),
+            ('activity_type_id', '=', self.env.ref('odex30_account_reports.tax_closing_activity_type').id),
+            ('active', '=', True),
+        ])
+        to_reset_closing_reminder_activities.action_cancel()
+        generic_tax_report = self.env.ref('account.generic_tax_report')
+
+        # Create a new reminder
+        # The user is unlikely to change the periodicity often and for multiple companies at once
+        # So it is fair enough to make this that way as we are obliged to get the tax report for each company
+        # And then loop over all the reports to get their period boudaries and look for activity
+        for company in to_update:
+            tax_reports = self.env['account.report'].search([
+                ('availability_condition', '=', 'country'),
+                ('country_id', 'in', company.account_enabled_tax_country_ids.ids),
+                ('root_report_id', '=', generic_tax_report.id),
+            ])
+            if not tax_reports.filtered(lambda x: x.country_id == company.account_fiscal_country_id):
+                tax_reports += generic_tax_report
+
+            for tax_report in tax_reports:
+                period_start, period_end = company._get_tax_closing_period_boundaries(fields.Date.today(), tax_report)
+                activity = company._get_tax_closing_reminder_activity(tax_report.id, period_end)
+                if not activity and self.env['account.move'].search_count([
+                    ('date', '<=', period_end),
+                    ('date', '>=', period_start),
+                    ('tax_closing_report_id', '=', tax_report.id),
+                    ('company_id', '=', company.id),
+                    ('state', '=', 'posted')
+                ]) == 0:
+                    company._generate_tax_closing_reminder_activity(tax_report, period_end)
+
+        hidden_tax_journals = self._get_tax_closing_journal().sudo().filtered(lambda j: not j.show_on_dashboard)
+        if hidden_tax_journals:
+            hidden_tax_journals.show_on_dashboard = True
+
+        return res
+
+    def _get_closing_report_for_tax_closing_move(self, report, fpos):
+        closing_report = report
+
+        if not closing_report.country_id and closing_report.root_report_id:
+            # Fallback to root report if we're using a non-localized variant (typically the grouped tax reports)
+            closing_report = closing_report.root_report_id
+
+        target_country = (fpos and fpos.country_id) or self.env.company.account_fiscal_country_id
+        country_variants = [variant for variant in (closing_report.root_report_id or closing_report).variant_report_ids if variant.country_id == target_country]
+        if len(country_variants) > 1:
+            # More than one national variant available: use the generic tax report
+            closing_report = self.env.ref('account.generic_tax_report')
+        elif country_variants and closing_report.country_id != target_country:
+            # Only one national variant available: select it
+            closing_report = country_variants[0]
+
+        return closing_report
+
+    def _get_and_update_tax_closing_moves(self, in_period_date, report, fiscal_positions=None, include_domestic=False):
+        """ Searches for tax closing moves. If some are missing for the provided parameters,
+        they are created in draft state. Also, existing moves get updated in case of configuration changes
+        (closing journal or periodicity, for example). Note the content of these moves stays untouched.
+
+        :param in_period_date: A date within the tax closing period we want the closing for.
+        :param fiscal_positions: The fiscal positions we want to generate the closing for (as a recordset).
+        :param include_domestic: Whether or not the domestic closing (i.e. the one without any fiscal_position_id) must be included
+
+        :return: The closing moves, as a recordset.
+        """
+        self.ensure_one()
+
+        if not fiscal_positions:
+            fiscal_positions = []
+
+        # Compute period dates depending on the date
+        tax_closing_journal = self._get_tax_closing_journal()
+
+        all_closing_moves = self.env['account.move']
+        for fpos in itertools.chain(fiscal_positions, [False] if include_domestic else []):
+            closing_report = self._get_closing_report_for_tax_closing_move(report, fpos)
+
+            period_start, period_end = self._get_tax_closing_period_boundaries(in_period_date, closing_report)
+            periodicity = self._get_tax_periodicity(closing_report)
+
+            fpos_id = fpos.id if fpos else False
+            tax_closing_move = self.env['account.move'].search([
+                ('state', '=', 'draft'),
+                ('company_id', '=', self.id),
+                ('tax_closing_report_id', '=', closing_report.id),
+                ('date', '>=', period_start),
+                ('date', '<=', period_end),
+                ('fiscal_position_id', '=', fpos.id if fpos else None),
+            ])
+
+            # This should never happen, but can be caused by wrong manual operations
+            if len(tax_closing_move) > 1:
+                if fpos:
+                    error = _("Multiple draft tax closing entries exist for fiscal position %(position)s after %(period_start)s. There should be at most one. \n %(closing_entries)s",
+                              position=fpos.name, period_start=period_start, closing_entries=tax_closing_move.mapped('display_name'))
+
+                else:
+                    error = _("Multiple draft tax closing entries exist for your domestic region after %(period_start)s. There should be at most one. \n %(closing_entries)s",
+                              period_start=period_start, closing_entries=tax_closing_move.mapped('display_name'))
+
+                raise UserError(error)
+
+            # Compute tax closing description
+            ref = _("%(report_label)s: %(period)s", report_label=self._get_tax_closing_report_display_name(closing_report), period=self._get_tax_closing_move_description(periodicity, period_start, period_end, fpos, closing_report))
+
+            # Values for update/creation of closing move
+            closing_vals = {
+                'company_id': self.id,# Important to specify together with the journal, for branches
+                'journal_id': tax_closing_journal.id,
+                'date': period_end,
+                'tax_closing_report_id': closing_report.id,
+                'fiscal_position_id': fpos_id,
+                'ref': ref,
+                'name': '/', # Explicitly set a void name so that we don't set the sequence for the journal and don't consume a sequence number
+            }
+
+            if tax_closing_move:
+                tax_closing_move.write(closing_vals)
+            else:
+                # Create a new, empty, tax closing move
+                tax_closing_move = self.env['account.move'].create(closing_vals)
+
+            # Create a reminder activity if it doesn't exist
+            activity = self._get_tax_closing_reminder_activity(closing_report.id, period_end, fpos_id)
+            tax_closing_options = tax_closing_move._get_tax_closing_report_options(tax_closing_move.company_id, tax_closing_move.fiscal_position_id, tax_closing_move.tax_closing_report_id, tax_closing_move.date)
+            if not activity and closing_report._get_sender_company_for_export(tax_closing_options) == tax_closing_move.company_id:
+                self._generate_tax_closing_reminder_activity(closing_report, period_end, fpos)
+
+            all_closing_moves += tax_closing_move
+
+        return all_closing_moves
+
+    def _get_tax_closing_report_display_name(self, report):
+        if report.get_external_id().get(report.id) in ('account.generic_tax_report', 'account.generic_tax_report_account_tax', 'account.generic_tax_report_tax_account'):
+            return _("Tax return")
+
+        return report.display_name
+
+    def _generate_tax_closing_reminder_activity(self, report, date_in_period=None, fiscal_position=None):
+        """
+        Create a reminder on the current tax_closing_journal for a certain report with a fiscal_position or not if None.
+        The reminder will target the period from which the date sits in
+        """
+        self.ensure_one()
+        if not date_in_period:
+            date_in_period = fields.Date.today()
+        # Search for an existing tax closing move
+        tax_closing_activity_type = self.env.ref('odex30_account_reports.tax_closing_activity_type')
+
+        # Tax period
+        period_start, period_end = self._get_tax_closing_period_boundaries(date_in_period, report)
+        periodicity = self._get_tax_periodicity(report)
+        activity_deadline = period_end + relativedelta(days=self.account_tax_periodicity_reminder_day)
+
+        # Reminder title
+        summary = _(
+            "%(report_label)s: %(period)s",
+            report_label=self._get_tax_closing_report_display_name(report),
+            period=self._get_tax_closing_move_description(periodicity, period_start, period_end, fiscal_position, report)
+        )
+
+        activity_user = tax_closing_activity_type.default_user_id if tax_closing_activity_type else self.env['res.users']
+        if activity_user and not (self in activity_user.company_ids and activity_user.has_group('account.group_account_manager')):
+            activity_user = self.env['res.users']
+
+        if not activity_user:
+            activity_user = self.env['res.users'].search(
+                [('company_ids', 'in', self.ids), ('groups_id', 'in', self.env.ref('account.group_account_manager').ids)],
+                limit=1, order="id ASC",
+            )
+
+        self.env['mail.activity'].with_context(mail_activity_quick_update=True).create({
+            'res_id': self._get_tax_closing_journal().id,
+            'res_model_id': self.env['ir.model']._get_id('account.journal'),
+            'activity_type_id': tax_closing_activity_type.id,
+            'date_deadline': activity_deadline,
+            'automated': True,
+            'summary': summary,
+            'user_id':  activity_user.id or self.env.user.id,
+            'account_tax_closing_params': {
+                'report_id': report.id,
+                'tax_closing_end_date': fields.Date.to_string(period_end),
+                'fpos_id': fiscal_position.id if fiscal_position else False,
+            },
+        })
+
+    def _get_tax_closing_reminder_activity(self, report_id, period_end, fpos_id=False):
+        self.ensure_one()
+        tax_closing_activity_type = self.env.ref('odex30_account_reports.tax_closing_activity_type')
+        return self._get_tax_closing_journal().activity_ids.filtered(
+            lambda act: act.account_tax_closing_params and (act.activity_type_id == tax_closing_activity_type and act.account_tax_closing_params['report_id'] == report_id
+                                                            and fields.Date.from_string(act.account_tax_closing_params['tax_closing_end_date']) == period_end
+                                                            and act.account_tax_closing_params['fpos_id'] == fpos_id)
+        )
+
+    def _get_tax_closing_move_description(self, periodicity, period_start, period_end, fiscal_position, report):
+        """ Returns a string description of the provided period dates, with the
+        given tax periodicity.
+        """
+        self.ensure_one()
+
+        foreign_vat_fpos_count = self.env['account.fiscal.position'].search_count([
+            ('company_id', '=', self.id),
+            ('foreign_vat', '!=', False)
+        ])
+        if foreign_vat_fpos_count:
+            if fiscal_position:
+                country_code = fiscal_position.country_id.code
+                state_codes = fiscal_position.mapped('state_ids.code') if fiscal_position.state_ids else []
+            else:
+                # On domestic country
+                country_code = self.account_fiscal_country_id.code
+
+                # Only consider the state in case there are foreign VAT fpos on states in this country
+                vat_fpos_with_state_count = self.env['account.fiscal.position'].search_count([
+                    ('company_id', '=', self.id),
+                    ('foreign_vat', '!=', False),
+                    ('country_id', '=', self.account_fiscal_country_id.id),
+                    ('state_ids', '!=', False),
+                ])
+                state_codes = [self.state_id.code] if self.state_id and vat_fpos_with_state_count else []
+
+            if state_codes:
+                region_string = " (%s - %s)" % (country_code, ', '.join(state_codes))
+            else:
+                region_string = " (%s)" % country_code
+        else:
+            # Don't add region information in case there is no foreign VAT fpos
+            region_string = ''
+
+        # Shift back to normal dates if we are using a start date so periods aren't broken
+        start_day, start_month = self._get_tax_closing_start_date_attributes(report)
+        if start_day != 1 or start_month != 1:
+            return f"{format_date(self.env, period_start)} - {format_date(self.env, period_end)}{region_string}"
+
+        if periodicity == 'year':
+            return f"{period_start.year}{region_string}"
+        elif periodicity == 'trimester':
+            return f"{format_date(self.env, period_start, date_format='qqq yyyy')}{region_string}"
+        elif periodicity == 'monthly':
+            return f"{format_date(self.env, period_start, date_format='LLLL yyyy')}{region_string}"
+        else:
+            return f"{format_date(self.env, period_start)} - {format_date(self.env, period_end)}{region_string}"
+
+    def _get_tax_closing_period_boundaries(self, date, report):
+        """ Returns the boundaries of the tax period containing the provided date
+        for this company, as a tuple (start, end).
+
+        This function needs to stay consitent with the one inside Javascript in the filters for the tax report
+        """
+        self.ensure_one()
+        period_months = self._get_tax_periodicity_months_delay(report)
+        start_day, start_month = self._get_tax_closing_start_date_attributes(report)
+        aligned_date = date + relativedelta(days=-(start_day - 1))  # we offset the date back from start_day amount of day - 1 so we can compute months periods aligned to the start and end of months
+        year = aligned_date.year
+        month_offset = aligned_date.month - start_month
+        period_number = (month_offset // period_months) + 1
+
+        # If the date is before the start date and start month of this year, this mean we are in the previous period
+        # So the initial_date should be one year before and the period_number should be computed in reverse because month_offset is negative
+        if date < datetime.date(date.year, start_month, start_day):
+            year -= 1
+            period_number = ((12 + month_offset) // period_months) + 1
+
+        month_delta = period_number * period_months
+
+        # We need to work with offsets because it handle automatically the end of months (28, 29, 30, 31)
+        end_date = datetime.date(year, start_month, 1) + relativedelta(months=month_delta, days=start_day - 2)  # -1 because the first days is aldready counted and -1 because the first day of the next period must not be in this range
+        start_date = datetime.date(year, start_month, 1) + relativedelta(months=month_delta - period_months, day=start_day)
+
+        return start_date, end_date
+
+    def _get_available_tax_unit(self, report):
+        """
+        Must ensures that report has a country_id to search for a tax unit
+
+        :return: A recordset of available tax units for this report country_id and this company
+        """
+        self.ensure_one()
+        return self.env['account.tax.unit'].search([
+            ('company_ids', 'in', self.id),
+            ('country_id', '=', report.country_id.id),
+        ], limit=1)
+
+    def _get_tax_periodicity(self, report):
+        main_company = self
+        if report.filter_multi_company == 'tax_units' and report.country_id and (tax_unit := self._get_available_tax_unit(report)):
+            main_company = tax_unit.main_company_id
+
+        return main_company.account_tax_periodicity
+
+    def _get_tax_closing_start_date_attributes(self, report):
+        if not report.tax_closing_start_date:
+            start_year = fields.Date.start_of(fields.Date.today(), 'year')
+            return start_year.day, start_year.month
+
+        main_company = self
+        if report.filter_multi_company == 'tax_units' and report.country_id and (tax_unit := self._get_available_tax_unit(report)):
+            main_company = tax_unit.main_company_id
+
+        start_date = report.with_company(main_company).tax_closing_start_date
+
+        return start_date.day, start_date.month
+
+    def _get_tax_periodicity_months_delay(self, report):
+        """ Returns the number of months separating two tax returns with the provided periodicity
+        """
+        self.ensure_one()
+        periodicities = {
+            'year': 12,
+            'semester': 6,
+            '4_months': 4,
+            'trimester': 3,
+            '2_months': 2,
+            'monthly': 1,
+        }
+        return periodicities[self._get_tax_periodicity(report)]
+
+    def  _get_branches_with_same_vat(self, accessible_only=False):
+        """ Returns all companies among self and its branch hierachy (considering children and parents) that share the same VAT number
+        as self. An empty VAT number is considered as being the same as the one of the closest parent with a VAT number.
+
+        self is always returned as the first element of the resulting recordset (so that this can safely be used to restore the active company).
+
+        Example:
+        - main company ; vat = 123
+            - branch 1
+                - branch 1_1
+            - branch 2 ; vat = 456
+                - branch 2_1 ; vat = 789
+                - branch 2_2
+
+        In this example, the following VAT numbers will be considered for each company:
+        - main company: 123
+        - branch 1: 123
+        - branch 1_1: 123
+        - branch 2: 456
+        - branch 2_1: 789
+        - branch 2_2: 456
+
+        :param accessible_only: whether the returned companies should exclude companies that are not in self.env.companies
+        """
+        self.ensure_one()
+
+        current = self.sudo()
+        same_vat_branch_ids = [current.id] # Current is always available
+        current_strict_parents = current.parent_ids - current
+        if accessible_only:
+            candidate_branches = current.root_id._accessible_branches()
+        else:
+            candidate_branches = self.env['res.company'].sudo().search([('id', 'child_of', current.root_id.ids)])
+
+        current_vat_check_set = {current.vat} if current.vat else set()
+        for branch in candidate_branches - current:
+            parents_vat_set = set(filter(None, (branch.parent_ids - current_strict_parents).mapped('vat')))
+            if parents_vat_set == current_vat_check_set:
+                # If all the branches between the active company and branch (both included) share the same VAT number as the active company,
+                # we want to add the branch to the selection.
+                same_vat_branch_ids.append(branch.id)
+
+        return self.browse(same_vat_branch_ids)
diff --git a/dev_odex30_accounting/odex30_account_reports/models/res_config_settings.py b/dev_odex30_accounting/odex30_account_reports/models/res_config_settings.py
new file mode 100644
index 0000000..f589d33
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_reports/models/res_config_settings.py
@@ -0,0 +1,74 @@
+# -*- coding: utf-8 -*-
+
+from calendar import monthrange
+
+from odoo import api, fields, models, _
+from dateutil.relativedelta import relativedelta
+from odoo.tools.misc import format_date
+from odoo.tools import date_utils
+
+
+class ResConfigSettings(models.TransientModel):
+    _inherit = 'res.config.settings'
+
+    totals_below_sections = fields.Boolean(related='company_id.totals_below_sections', string='Add totals below sections', readonly=False,
+                                           help='When ticked, totals and subtotals appear below the sections of the report.')
+    account_tax_periodicity = fields.Selection(related='company_id.account_tax_periodicity', string='Periodicity', readonly=False, required=True)
+    account_tax_periodicity_reminder_day = fields.Integer(related='company_id.account_tax_periodicity_reminder_day', string='Reminder', readonly=False, required=True)
+    account_tax_periodicity_journal_id = fields.Many2one(related='company_id.account_tax_periodicity_journal_id', string='Journal', readonly=False)
+
+    account_reports_show_per_company_setting = fields.Boolean(compute="_compute_account_reports_show_per_company_setting")
+
+    def open_tax_group_list(self):
+        self.ensure_one()
+        return {
+            'type': 'ir.actions.act_window',
+            'name': 'Tax groups',
+            'res_model': 'account.tax.group',
+            'view_mode': 'list',
+            'context': {
+                'default_country_id': self.account_fiscal_country_id.id,
+                'search_default_country_id': self.account_fiscal_country_id.id,
+            },
+        }
+
+    @api.depends('account_tax_periodicity', 'company_id', 'fiscalyear_last_day', 'fiscalyear_last_month')
+    def _compute_account_reports_show_per_company_setting(self):
+        custom_start_country_codes = self._get_country_codes_with_another_tax_closing_start_date()
+        countries = self.env['account.fiscal.position'].search([
+            ('company_id', '=', self.env.company.id),
+            ('foreign_vat', '!=', False),
+        ]).mapped('country_id') + self.env.company.account_fiscal_country_id
+        countries_to_always_show = bool(set(countries.mapped('code')) & custom_start_country_codes)
+        for config_settings in self:
+            if countries_to_always_show:
+                config_settings.account_reports_show_per_company_setting = True
+            else:
+                max_last_day = monthrange(fields.Date.today().year, int(config_settings.fiscalyear_last_month))[1]
+                if config_settings.account_tax_periodicity == 'monthly':
+                    config_settings.account_reports_show_per_company_setting = max_last_day != config_settings.fiscalyear_last_day
+                else:
+                    config_settings.account_reports_show_per_company_setting = config_settings.fiscalyear_last_month != '12' or config_settings.fiscalyear_last_day != max_last_day
+
+    def open_company_dependent_report_settings(self):
+        self.ensure_one()
+        generic_tax_report = self.env.ref('account.generic_tax_report')
+        available_reports = generic_tax_report._get_variants(generic_tax_report.id)
+
+        return {
+            'type': 'ir.actions.act_window',
+            'name': _('Configure your start dates'),
+            'res_model': 'account.report',
+            'domain': [('id', 'in', available_reports.ids)],
+            'views': [(self.env.ref('odex30_account_reports.account_report_tree_configure_start_dates').id, 'list')]
+        }
+
+    def _get_country_codes_with_another_tax_closing_start_date(self):
+        """
+        To be overridden by specific countries that wants this
+
+        Used to know which countries can have specific start dates settings on reports
+
+        :returns set(str):   A set of country codes from which the start date settings should be shown
+        """
+        return set()
diff --git a/dev_odex30_accounting/odex30_account_reports/models/res_partner.py b/dev_odex30_accounting/odex30_account_reports/models/res_partner.py
new file mode 100644
index 0000000..f767469
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_reports/models/res_partner.py
@@ -0,0 +1,104 @@
+# -*- coding: utf-8 -*-
+
+from odoo import api, fields, models, _
+
+
+class ResPartner(models.Model):
+    _name = 'res.partner'
+    _inherit = 'res.partner'
+
+    account_represented_company_ids = fields.One2many('res.company', 'account_representative_id')
+
+    def _get_followup_responsible(self):
+        return self.env.user
+
+    def open_partner_ledger(self):
+        # Deprecated, will be removed in master
+        action = self.env["ir.actions.actions"]._for_xml_id("odex30_account_reports.action_account_report_partner_ledger")
+        action['params'] = {
+            'options': {'partner_ids': self.ids, 'unfold_all': len(self.ids) == 1},
+            'ignore_session': True,
+        }
+        return action
+
+    def open_customer_statement(self):
+        if not self.env.ref('odex30_account_reports.customer_statement_report', raise_if_not_found=False):
+            return self.open_partner_ledger()
+        action = self.env["ir.actions.actions"]._for_xml_id("odex30_account_reports.action_account_report_customer_statement")
+        action['params'] = {
+            'options': {
+                'partner_ids': (self | self.commercial_partner_id).ids,
+                'unfold_all': len(self.ids) == 1,
+            },
+            'ignore_session': True,
+        }
+        return action
+
+    def open_partner(self):
+        return {
+            'type': 'ir.actions.act_window',
+            'res_model': 'res.partner',
+            'res_id': self.id,
+            'views': [[False, 'form']],
+            'view_mode': 'form',
+            'target': 'current',
+        }
+
+    @api.depends_context('show_more_partner_info')
+    def _compute_display_name(self):
+        if not self.env.context.get('show_more_partner_info'):
+            return super()._compute_display_name()
+        for partner in self:
+            res = ""
+            if partner.vat:
+                res += f" {partner.vat},"
+            if partner.country_id:
+                res += f" {partner.country_id.code},"
+            partner.display_name = f"{partner.name} - " + res
+
+    def _get_partner_account_report_attachment(self, report, options=None):
+        self.ensure_one()
+        if self.lang:
+            # Print the followup in the customer's language
+            report = report.with_context(lang=self.lang)
+
+        if not options:
+            options = report.get_options({
+                'forced_companies': self.env.company.search([('id', 'child_of', self.env.context.get('allowed_company_ids', self.env.company.id))]).ids,
+                'partner_ids': self.ids,
+                'unfold_all': True,
+                'unreconciled': True,
+                # The following two options are Deprecated, will be removed in master
+                'hide_account': True,
+                'hide_debit_credit': True,
+                'all_entries': False,
+            })
+        attachment_file = report.export_to_pdf(options)
+        return self.env['ir.attachment'].create([
+            {
+                'name': f"{self.name} - {attachment_file['file_name']}",
+                'res_model': self._name,
+                'res_id': self.id,
+                'type': 'binary',
+                'raw': attachment_file['file_content'],
+                'mimetype': 'application/pdf',
+            },
+        ])
+
+    def set_commercial_partner_main(self):
+        self.ensure_one()
+
+        main_partner = self
+        duplicated_partners = self.env['res.partner'].search([
+            ('vat', '=', main_partner.vat),
+            ('id', '!=', main_partner.id)
+        ])
+        # Update commercial partner of all duplicates
+        duplicated_partners.write({
+            'is_company': False,
+            'parent_id': main_partner.id,
+            'type': 'invoice',
+        })
+        duplicated_partners_vat = self._context.get('duplicated_partners_vat', [])
+        remaining_vats = [pvat for pvat in duplicated_partners_vat if pvat != main_partner.vat]
+        return self.env['account.ec.sales.report.handler']._get_duplicated_vat_partners(remaining_vats)
diff --git a/dev_odex30_accounting/odex30_account_reports/security/ir.model.access.csv b/dev_odex30_accounting/odex30_account_reports/security/ir.model.access.csv
new file mode 100644
index 0000000..beaceee
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_reports/security/ir.model.access.csv
@@ -0,0 +1,19 @@
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+access_account_report_annotation_readonly,account.account_report_annotation_readonly,model_account_report_annotation,account.group_account_readonly,1,0,0,0
+access_account_report_annotation,account.account_report_annotation,model_account_report_annotation,account.group_account_user,1,1,1,1
+access_account_report_annotation_invoice,account.account_report_annotation,model_account_report_annotation,account.group_account_invoice,1,0,0,0
+access_account_reports_export_wizard,access.account_reports.export.wizard,model_account_reports_export_wizard,account.group_account_user,1,1,1,0
+access_account_reports_export_wizard_format,access.account_reports.export.wizard.format,model_account_reports_export_wizard_format,account.group_account_user,1,1,1,0
+access_account_report_file_download_error_wizard,account.report.file.download.error.wizard,model_account_report_file_download_error_wizard,account.group_account_user,1,1,1,0
+access_account_multicurrency_revaluation_wizard,access.account.multicurrency.revaluation.wizard,model_account_multicurrency_revaluation_wizard,account.group_account_user,1,1,1,0
+access_account_tax_unit_readonly,access_account_tax_unit_readonly,model_account_tax_unit,account.group_account_readonly,1,0,0,0
+access_account_tax_unit_manager,access_account_tax_unit_manager,model_account_tax_unit,account.group_account_manager,1,1,1,1
+access_account_report_horizontal_group_readonly,account.report.horizontal.group.readonly,model_account_report_horizontal_group,account.group_account_readonly,1,0,0,0
+access_account_report_horizontal_group_ac_user,account.report.horizontal.group.ac.user,model_account_report_horizontal_group,account.group_account_manager,1,1,1,1
+access_account_report_horizontal_group_rule_readonly,account.report.horizontal.group.rule.readonly,model_account_report_horizontal_group_rule,account.group_account_readonly,1,0,0,0
+access_account_report_horizontal_group_rule_ac_user,account.report.horizontal.group.rule.ac.user,model_account_report_horizontal_group_rule,account.group_account_manager,1,1,1,1
+access_account_report_budget_readonly,account.report.budget.readonly,model_account_report_budget,account.group_account_readonly,1,0,0,0
+access_account_report_budget_ac_user,account.report.budget.ac.user,model_account_report_budget,account.group_account_manager,1,1,1,1
+access_account_report_budget_item_readonly,account.report.budget.item.readonly,model_account_report_budget_item,account.group_account_readonly,1,0,0,0
+access_account_report_budget_item_ac_user,account.report.budget.item.ac.user,model_account_report_budget_item,account.group_account_manager,1,1,1,1
+access_account_report_send,access.account.report.send,model_account_report_send,account.group_account_invoice,1,1,1,1
diff --git a/dev_odex30_accounting/odex30_account_reports/static/src/components/account_report/account_report.js b/dev_odex30_accounting/odex30_account_reports/static/src/components/account_report/account_report.js
new file mode 100644
index 0000000..79b5307
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_reports/static/src/components/account_report/account_report.js
@@ -0,0 +1,125 @@
+/** @odoo-module */
+
+import { registry } from "@web/core/registry";
+import { useService } from "@web/core/utils/hooks";
+import { ControlPanel } from "@web/search/control_panel/control_panel";
+
+import { Component, onWillStart, useRef, useState, useSubEnv } from "@odoo/owl";
+
+import { AccountReportController } from "@odex30_account_reports/components/account_report/controller";
+import { AccountReportButtonsBar } from "@odex30_account_reports/components/account_report/buttons_bar/buttons_bar";
+import { AccountReportCogMenu } from "@odex30_account_reports/components/account_report/cog_menu/cog_menu";
+import { AccountReportEllipsis } from "@odex30_account_reports/components/account_report/ellipsis/ellipsis";
+import { AccountReportFilters } from "@odex30_account_reports/components/account_report/filters/filters";
+import { AccountReportHeader } from "@odex30_account_reports/components/account_report/header/header";
+import { AccountReportLine } from "@odex30_account_reports/components/account_report/line/line";
+import { AccountReportLineCell } from "@odex30_account_reports/components/account_report/line_cell/line_cell";
+import { AccountReportLineName } from "@odex30_account_reports/components/account_report/line_name/line_name";
+import { AccountReportSearchBar } from "@odex30_account_reports/components/account_report/search_bar/search_bar";
+import { standardActionServiceProps } from "@web/webclient/actions/action_service";
+import { useSetupAction } from "@web/search/action_hook";
+
+
+export class AccountReport extends Component {
+    static template = "odex30_account_reports.AccountReport";
+    static props = { ...standardActionServiceProps };
+    static components = {
+        ControlPanel,
+        AccountReportButtonsBar,
+        AccountReportCogMenu,
+        AccountReportSearchBar,
+    };
+
+    static customizableComponents = [
+        AccountReportEllipsis,
+        AccountReportFilters,
+        AccountReportHeader,
+        AccountReportLine,
+        AccountReportLineCell,
+        AccountReportLineName,
+    ];
+    static defaultComponentsMap = [];
+
+    setup() {
+        this.rootRef = useRef("root");
+        useSetupAction({
+            rootRef: this.rootRef,
+            getLocalState: () => {
+                return {
+                    keep_journal_groups_options: true,  // used when using the breadcrumb
+                };
+            }
+        })
+        if (this.props?.state?.keep_journal_groups_options !== undefined) {
+            this.props.action.keep_journal_groups_options = true;
+        }
+
+        // Can not use 'control-panel-bottom-right' slot without this, as viewSwitcherEntries doesn't exist here.
+        this.env.config.viewSwitcherEntries = [];
+
+        this.orm = useService("orm");
+        this.actionService = useService("action");
+        this.controller = useState(new AccountReportController(this.props.action));
+        this.initialQuery = this.props.action.context.default_filter_accounts || '';
+
+        for (const customizableComponent of AccountReport.customizableComponents)
+            AccountReport.defaultComponentsMap[customizableComponent.name] = customizableComponent;
+
+        onWillStart(async () => {
+            await this.controller.load(this.env);
+        });
+
+        useSubEnv({
+            controller: this.controller,
+            component: this.getComponent.bind(this),
+            template: this.getTemplate.bind(this),
+        });
+    }
+
+    // -----------------------------------------------------------------------------------------------------------------
+    // Custom overrides
+    // -----------------------------------------------------------------------------------------------------------------
+    static registerCustomComponent(customComponent) {
+        registry.category("account_reports_custom_components").add(customComponent.template, customComponent);
+    }
+
+    get cssCustomClass() {
+        return this.controller.data.custom_display.css_custom_class || "";
+    }
+
+    getComponent(name) {
+        const customComponents = this.controller.data.custom_display.components;
+
+        if (customComponents && customComponents[name])
+            return registry.category("account_reports_custom_components").get(customComponents[name]);
+
+        return AccountReport.defaultComponentsMap[name];
+    }
+
+    getTemplate(name) {
+        const customTemplates = this.controller.data.custom_display.templates;
+
+        if (customTemplates && customTemplates[name])
+            return customTemplates[name];
+
+        return `odex30_account_reports.${ name }Customizable`;
+    }
+
+    // -----------------------------------------------------------------------------------------------------------------
+    // Table
+    // -----------------------------------------------------------------------------------------------------------------
+    get tableClasses() {
+        let classes = "";
+
+        if (this.controller.options.columns.length > 1) {
+            classes += " striped";
+        }
+
+        if (this.controller.options['horizontal_split'])
+            classes += " w-50 mx-2";
+
+        return classes;
+    }
+}
+
+registry.category("actions").add("account_report", AccountReport);
diff --git a/dev_odex30_accounting/odex30_account_reports/static/src/components/account_report/account_report.scss b/dev_odex30_accounting/odex30_account_reports/static/src/components/account_report/account_report.scss
new file mode 100644
index 0000000..1c6cfe1
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_reports/static/src/components/account_report/account_report.scss
@@ -0,0 +1,465 @@
+.account_report {
+    .fit-content { width: fit-content }
+
+    //------------------------------------------------------------------------------------------------------------------
+    // Control panel
+    //------------------------------------------------------------------------------------------------------------------
+    .o_control_panel_main_buttons {
+        .dropdown-item {
+            padding: 0;
+            .btn-link {
+                width: 100%;
+                text-align: left;
+                padding: 3px 20px;
+                border-radius: 0;
+            }
+        }
+    }
+
+    .o_control_panel_breadcrumbs {
+        flex-basis: min-content;
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    // Sections
+    //------------------------------------------------------------------------------------------------------------------
+    .section_selector {
+        display: flex;
+        gap: 4px;
+        margin: 16px 16px 8px 16px;
+        justify-content: center;
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    // Alert
+    //------------------------------------------------------------------------------------------------------------------
+    .warnings { margin-bottom: 1rem }
+    .alert {
+        margin-bottom: 0;
+        border-radius: 0;
+
+        a:hover { cursor:pointer }
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    // No content
+    //------------------------------------------------------------------------------------------------------------------
+    .o_view_nocontent { z-index: -1 }
+
+    //------------------------------------------------------------------------------------------------------------------
+    // Table
+    //------------------------------------------------------------------------------------------------------------------
+    .table {
+        background-color: $o-view-background-color;
+        border-collapse: separate; //!\\ Allows to add padding to the table
+        border-spacing: 0; //!\\ Removes default spacing between cells due to 'border-collapse: separate'
+        font-size: 0.8rem;
+        margin: 0 auto 24px;
+        padding: 24px;
+        width: auto;
+        min-width: 800px;
+        border: 1px solid $o-gray-300;
+        border-radius: 0.25rem;
+
+        > :not(caption) > * > * { padding: 0.25rem 0.75rem } //!\\ Override of bootstrap, keep selector
+
+        > thead {
+            > tr {
+                th:first-child {
+                    color: lightgrey;
+                }
+                th:not(:first-child) {
+                    text-align: center;
+                    vertical-align: middle;
+                }
+            }
+            > tr:not(:last-child) > th:not(:first-child) { border: 1px solid $o-gray-300 }
+        }
+
+        > tbody {
+            > tr {
+                &.unfolded { font-weight: bold }
+                > td {
+                    a { cursor: pointer }
+                    .clickable { color: $o-enterprise-action-color }
+                    &.muted { color: var(--AccountReport-muted-data-color, $o-gray-300) }
+                    &:empty::after{ content: "\00a0" } //!\\ Prevents the collapse of empty table rows
+                    &:empty { line-height: 1 }
+                    .btn_annotation { color: $o-enterprise-action-color }
+                }
+
+                &:not(.empty) > td { border-bottom: 1px solid var(--AccountReport-fine-line-separator-color, $o-gray-200) }
+                &.total { font-weight: bold }
+                &.o_bold_tr { font-weight: bold }
+
+                &.unfolded {
+                    > td { border-bottom: 1px solid $o-gray-300 }
+                    .btn_action { opacity: 1 }
+                    .btn_more { opacity: 1 }
+                }
+
+                &:hover {
+                    &.empty > * { --table-accent-bg: transparent }
+                    .auditable {
+                        color: $o-enterprise-action-color !important;
+
+                        > a:hover { cursor: pointer }
+                    }
+                    .muted { color: $o-gray-800 }
+                    .btn_action, .btn_more {
+                        opacity: 1;
+                        color: $o-enterprise-action-color;
+                    }
+                    .btn_edit { color: $o-enterprise-action-color }
+                    .btn_dropdown { color: $o-enterprise-action-color }
+                    .btn_foldable { color: $o-enterprise-action-color }
+                    .btn_ellipsis { color: $o-enterprise-action-color }
+                    .btn_annotation_go { color: $o-enterprise-action-color }
+                    .btn_debug { color: $o-enterprise-action-color }
+                }
+            }
+        }
+    }
+
+    table.striped {
+        //!\\ Changes the background of every even column starting with the 3rd one
+        > thead > tr:not(:first-child) > th:nth-child(2n+3) { background: $o-gray-100 }
+        > tbody {
+            > tr:not(.line_level_0):not(.empty) > td:nth-child(2n+3) { background: $o-gray-100 }
+            > tr.line_level_0 > td:nth-child(2n+3) { background: $o-gray-300 }
+        }
+    }
+
+    thead.sticky {
+        background-color: $o-view-background-color;
+        position: sticky;
+        top: 0;
+        z-index: 999;
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    // Line
+    //------------------------------------------------------------------------------------------------------------------
+    .line_name {
+        vertical-align: middle;
+        > .wrapper {
+            display: flex;
+            align-items: center;
+
+            > .content {
+                display: flex;
+                align-items: center;
+                sup { top: auto }
+            }
+        }
+
+        .name { white-space: nowrap }
+        &.unfoldable:hover { cursor: pointer }
+    }
+
+    .line_cell {
+        vertical-align: middle;
+        > .wrapper {
+            display: flex;
+            align-items: center;
+
+            > .content {
+                display: flex;
+                align-items: center;
+            }
+        }
+
+        &.date > .wrapper { justify-content: center }
+        &.numeric > .wrapper { justify-content: flex-end }
+        .name { white-space: nowrap }
+    }
+
+    .editable-cell {
+        input {
+            color: $o-enterprise-action-color;
+            border: none;
+            max-width: 100px;
+            float: right;
+
+            &:hover {
+                cursor: pointer;
+            }
+        }
+
+        &:hover {
+            cursor: pointer;
+        }
+
+        &:focus-within {
+            border-bottom-color: $o-enterprise-action-color !important;
+
+            input {
+                color: $o-black;
+            }
+        }
+    }
+
+    .line_level_0 {
+        color: $o-gray-700;
+        font-weight: bold;
+
+        > td {
+            border-bottom: 0 !important;
+            background-color: $o-gray-300;
+        }
+        .muted { color: $o-gray-400 !important }
+        .btn_debug { color: $o-gray-400 }
+    }
+
+    @for $i from 2 through 16 {
+        .line_level_#{$i} {
+            $indentation: (($i + 1) * 8px) - 20px; // 20px are for the btn_foldable width
+
+            > td {
+                color: $o-gray-700;
+
+                &.line_name.unfoldable .wrapper { column-gap: calc(#{ $indentation }) }
+                &.line_name:not(.unfoldable) .wrapper { padding-left: $indentation }
+            }
+        }
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    // Link
+    //------------------------------------------------------------------------------------------------------------------
+    .link { color: $o-enterprise-action-color }
+
+    //------------------------------------------------------------------------------------------------------------------
+    // buttons
+    //------------------------------------------------------------------------------------------------------------------
+    .btn_debug, .btn_dropdown, .btn_foldable, .btn_foldable_empty, .btn_sortable, .btn_ellipsis,
+    .btn_more, .btn_annotation, .btn_annotation_go, .btn_annotation_delete, .btn_action, .btn_edit {
+        border: none;
+        color: $o-gray-300;
+        font-size: inherit;
+        font-weight: normal;
+        padding: 0;
+        text-align: center;
+        width: 20px;
+        white-space: nowrap;
+
+        &:hover {
+            color: $o-enterprise-action-color !important;
+            cursor: pointer;
+        }
+    }
+
+    .btn_sortable > .fa-long-arrow-up, .btn_sortable > .fa-long-arrow-down { color: $o-enterprise-action-color }
+    .btn_foldable { color: $o-gray-500 }
+    .btn_foldable_empty:hover { cursor: default  }
+    .btn_ellipsis > i { vertical-align: bottom }
+    .btn_more { opacity: 1 }
+    .btn_annotation { margin-left: 6px }
+    .btn_annotation_go { color: $o-gray-600 }
+    .btn_annotation_delete {
+        margin-left: 4px;
+        vertical-align: baseline;
+    }
+    .btn_action {
+        opacity: 0;
+        background-color: $o-view-background-color;
+        color: $o-gray-600;
+        width: auto;
+        padding: 0 0.25rem;
+        margin: 0 0.25rem;
+        border: 1px solid $o-gray-300;
+        border-radius: 0.25rem;
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    // Dropdown
+    //------------------------------------------------------------------------------------------------------------------
+    .dropdown { display: inline }
+
+    //------------------------------------------------------------------------------------------------------------------
+    // Annotation
+    //------------------------------------------------------------------------------------------------------------------
+    .annotations {
+        border-top: 1px solid $o-gray-300;
+        font-size: 0.8rem;
+        padding: 24px 0;
+
+        > li {
+            line-height: 24px;
+            margin-left: 24px;
+            &:hover > button { color: $o-enterprise-action-color }
+        }
+    }
+}
+
+//----------------------------------------------------------------------------------------------------------------------
+// Dialogs
+//----------------------------------------------------------------------------------------------------------------------
+.account_report_annotation_dialog {
+    textarea {
+        border: 1px solid $o-gray-300;
+        border-radius: 0.25rem;
+        height: 120px;
+        padding: .5rem;
+    }
+}
+
+//----------------------------------------------------------------------------------------------------------------------
+// Popovers
+//----------------------------------------------------------------------------------------------------------------------
+.account_report_popover_edit {
+    padding: .5rem 1rem;
+    box-sizing: content-box;
+
+    .edit_popover_boolean label { padding: 0 12px 0 4px }
+
+    .edit_popover_string {
+        width: 260px;
+        padding: 8px;
+        border-color: $o-gray-200;
+    }
+
+    .btn {
+        color: $o-white;
+        background-color: $o-enterprise-action-color;
+    }
+}
+
+.account_report_popover_ellipsis {
+    > p {
+        float: left;
+        margin: 1rem;
+        width: 360px;
+    }
+}
+
+.account_report_btn_clone {
+    margin: 1rem 1rem 0 0;
+    border: none;
+    color: $o-gray-300;
+    font-size: inherit;
+    font-weight: normal;
+    padding: 0;
+    text-align: center;
+    width: 20px;
+
+    &:hover {
+        color: $o-enterprise-action-color !important;
+        cursor: pointer;
+    }
+}
+
+.account_report_popover_debug {
+    width: 350px;
+    overflow-x: auto;
+
+    > .line_debug {
+        display: flex;
+        flex-direction: row;
+        padding: .25rem 1rem;
+
+        &:first-child { padding-top: 1rem }
+        &:last-child { padding-bottom: 1rem }
+
+        > span:first-child {
+            color: $o-gray-600;
+            max-width: 25%; //!\\ Not the same as 'width' because of 'display: flex'
+            min-width: 25%; //!\\ Not the same as 'width' because of 'display: flex'
+            white-space: nowrap;
+            margin-right: 10px;
+        }
+        > span:last-child {
+            color: $o-gray-800;
+            max-width: 75%; //!\\ Not the same as 'width' because of 'display: flex'
+            min-width: 75%; //!\\ Not the same as 'width' because of 'display: flex'
+        }
+    }
+
+    > .totals_separator { margin: .25rem 1rem }
+    > .engine_separator { margin: 1rem }
+}
+
+.carryover_popover {
+    margin: 12px;
+    width: 300px;
+}
+
+.o_web_client:has(.annotation_popover) {
+
+    .popover:has(.annotation_tooltip) { visibility: hidden; }
+
+    .popover:has(.annotation_popover) {
+        max-height: 45%;
+        max-width: 60%;
+        white-space: pre-wrap;
+        overflow-y: auto;
+
+        .annotation_popover {
+            overflow: scroll;
+
+            .annotation_popover_line th{
+                background-color: $o-white;
+                position: sticky;
+                top: 0;
+                z-index: 10;
+            }
+
+        }
+
+        .annotation_popover_line:nth-child(2n+2) { background: $o-gray-200; }
+
+        .annotation_popover_line {
+            .o_datetime_input {
+                border: none;
+            }
+        }
+
+        tr, th, td:not(:has(.btn_annotation_update)):not(:has(.btn_annotation_delete)) {
+            padding: .5rem 1rem .5rem .5rem;
+            vertical-align: top;
+        }
+
+        .annotation_popover_editable_cell {
+            background-color: transparent;
+            border: 0;
+            box-shadow: none;
+            color: $o-gray-700;
+            resize: none;
+            width: 85px;
+            outline: none;
+        }
+    }
+}
+
+label:focus-within input { border: 0; }
+
+.popover:has(.annotation_tooltip) {
+
+    > .tooltip-inner {
+        padding: 0;
+        color: $o-white;
+        background-color: $o-white;
+
+        > .annotation_tooltip {
+            color: $o-gray-700;
+            background-color: $o-white;
+            white-space: pre-wrap;
+
+            > .annotation_tooltip_line:nth-child(2n+2) { background: $o-gray-200; }
+
+            tr, th, td {
+                padding: .25rem .5rem .25rem .25rem;
+                overflow: hidden;
+                text-overflow: ellipsis;
+                vertical-align: top;
+            }
+        }
+
+        + .popover-arrow {
+            &.top-0::after { border-right-color: $o-white; }
+            &.bottom-0::after { border-left-color: $o-white; }
+            &.start-0::after { border-bottom-color: $o-white; }
+            &.end-0::after { border-top-color: $o-white; }
+        }
+    }
+}
diff --git a/dev_odex30_accounting/odex30_account_reports/static/src/components/account_report/account_report.xml b/dev_odex30_accounting/odex30_account_reports/static/src/components/account_report/account_report.xml
new file mode 100644
index 0000000..cb3a036
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_reports/static/src/components/account_report/account_report.xml
@@ -0,0 +1,107 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<templates>
+    <t t-name="odex30_account_reports.AccountReport">
+        <t t-call="{{ env.template('AccountReport') }}"/>
+    </t>
+
+    <t t-name="odex30_account_reports.AccountReportCustomizable">
+        <div class="o_action account_report" t-att-class="cssCustomClass" t-ref="root">
+            <ControlPanel>
+                <!-- Buttons bar -->
+                <t t-set-slot="control-panel-create-button">
+                    <AccountReportButtonsBar/>
+                </t>
+                <t t-set-slot="control-panel-additional-actions">
+                    <AccountReportCogMenu/>
+                </t>
+
+                <!-- Search bar (if configured for report) and filters -->
+                <t t-set-slot="layout-actions">
+                   <div class="d-flex gap-1 flex-wrap">
+                       <t t-if="controller.options.search_bar">
+                           <AccountReportSearchBar initialQuery="initialQuery"/>
+                           <br/>
+                       </t>
+                       <t t-component="env.component('AccountReportFilters')"/>
+                   </div>
+                </t>
+            </ControlPanel>
+
+            <div class="o_content">
+                <!-- Sections -->
+                <t t-if="controller.options.sections.length">
+                    <div id="section_selector" class="section_selector">
+                        <t t-foreach="controller.options.sections" t-as="section" t-key="section_index">
+                            <button
+                                t-att-class="(controller.options.selected_section_id === section.id) ? 'btn btn-secondary' : 'btn btn-primary'"
+                                t-on-click="() => controller.switchToSection(section.id)"
+                                t-out="section.name"
+                            />
+                        </t>
+
+                        <t t-if="controller.options['has_inactive_sections']">
+                            <button class="btn btn-secondary" t-on-click="(ev) => controller.reportAction(ev, 'action_display_inactive_sections')" >+</button>
+                        </t>
+                    </div>
+                </t>
+
+                <!-- Warnings -->
+                <t t-if="controller.warnings">
+                    <div id="warnings" class="warnings d-print-none">
+                        <t t-foreach="controller.warnings" t-as="warningTemplateRef" t-key="warningTemplateRef">
+                            <t t-set="warningParams" t-value="controller.warnings[warningTemplateRef]"/>
+
+                            <div t-att-class="`alert alert-${warningParams['alert_type'] || 'info'} text-center`">
+                                <t t-call="{{ warningTemplateRef }}"/>
+                            </div>
+                        </t>
+                    </div>
+                </t>
+
+                <t t-if="controller.lines.length">
+                    <!-- Table -->
+                    <div class="mx-auto fit-content w-print-100">
+                        <div class="d-flex align-items-start">
+                            <t t-foreach="controller.options['horizontal_split'] ? ['left', 'right'] : [null]" t-as="splitSide" t-key="splitSide">
+                                <table
+                                    class="table table-borderless table-hover w-print-100"
+                                    t-att-class="tableClasses"
+                                >
+                                    <t t-component="env.component('AccountReportHeader')"/>
+                                    <tbody>
+                                        <t t-foreach="controller.lines" t-as="line" t-key="line_index">
+                                            <t t-if="!splitSide || splitSide === (line.horizontal_split_side || 'left')">
+                                                <!--
+                                                    We filter lines directly in the template so that the indices passed to AccountReportLine component
+                                                    correspond to indices in the global lines list ; for genericity of the code.
+                                                -->
+                                                <t t-if="controller.areLinesOrdered()">
+                                                    <t t-set="orderedIndex" t-value="controller.linesOrder[line_index]"/>
+                                                    <t t-set="orderedLine" t-value="controller.lines[orderedIndex]"/>
+
+                                                    <t t-component="env.component('AccountReportLine')" t-props="{ lineIndex: orderedIndex, line: orderedLine }"/>
+                                                </t>
+                                                <t t-else="">
+                                                    <t t-component="env.component('AccountReportLine')" t-props="{ lineIndex: line_index, line: line }"/>
+                                                </t>
+                                            </t>
+                                        </t>
+                                    </tbody>
+                                </table>
+                            </t>
+                        </div>
+                    </div>
+                </t>
+                <t t-else="">
+                    <!-- No content -->
+                    <div class="o_view_nocontent">
+                        <div class="o_nocontent_help">
+                            <p class="o_view_nocontent_neutral_face">No data to display !</p>
+                            <p>There is no data to display for the given filters.</p>
+                        </div>
+                    </div>
+                </t>
+            </div>
+        </div>
+    </t>
+</templates>
diff --git a/dev_odex30_accounting/odex30_account_reports/static/src/components/account_report/buttons_bar/buttons_bar.js b/dev_odex30_accounting/odex30_account_reports/static/src/components/account_report/buttons_bar/buttons_bar.js
new file mode 100644
index 0000000..a3c1e7b
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_reports/static/src/components/account_report/buttons_bar/buttons_bar.js
@@ -0,0 +1,27 @@
+/** @odoo-module */
+
+import { Component, useState } from "@odoo/owl";
+
+export class AccountReportButtonsBar extends Component {
+    static template = "odex30_account_reports.AccountReportButtonsBar";
+    static props = {};
+
+    setup() {
+        this.controller = useState(this.env.controller);
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    // Buttons
+    //------------------------------------------------------------------------------------------------------------------
+    get barButtons() {
+        const buttons = [];
+
+        for (const button of this.controller.buttons) {
+            if (button.always_show) {
+                buttons.push(button);
+            }
+        }
+
+        return buttons;
+    }
+}
diff --git a/dev_odex30_accounting/odex30_account_reports/static/src/components/account_report/buttons_bar/buttons_bar.xml b/dev_odex30_accounting/odex30_account_reports/static/src/components/account_report/buttons_bar/buttons_bar.xml
new file mode 100644
index 0000000..47a5501
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_reports/static/src/components/account_report/buttons_bar/buttons_bar.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<templates>
+    <t t-name="odex30_account_reports.AccountReportButtonsBar">
+        <t t-if="controller.buttons.length">
+            <t t-foreach="barButtons" t-as="barButton" t-key="barButton_index">
+                <button
+                    t-att-class="'btn text-nowrap' + (barButton.disabled ? ' disabled' : '') + (barButton_first ? ' btn-primary' : ' btn-secondary')"
+                    t-on-click="(ev) => controller.buttonAction(ev, barButton)"
+                >
+                    <t t-out="barButton.name"/>
+                </button>
+            </t>
+        </t>
+    </t>
+</templates>
diff --git a/dev_odex30_accounting/odex30_account_reports/static/src/components/account_report/cog_menu/cog_menu.js b/dev_odex30_accounting/odex30_account_reports/static/src/components/account_report/cog_menu/cog_menu.js
new file mode 100644
index 0000000..45d262d
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_reports/static/src/components/account_report/cog_menu/cog_menu.js
@@ -0,0 +1,31 @@
+/** @odoo-module **/
+
+import {Component, useState} from "@odoo/owl";
+import { Dropdown } from "@web/core/dropdown/dropdown";
+import { DropdownItem } from "@web/core/dropdown/dropdown_item";
+
+
+export class AccountReportCogMenu extends Component {
+    static template = "odex30_account_reports.AccountReportCogMenu";
+    static components = {Dropdown, DropdownItem};
+    static props = {};
+
+    setup() {
+        this.controller = useState(this.env.controller);
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    // Buttons
+    //------------------------------------------------------------------------------------------------------------------
+    get cogButtons() {
+        const buttons = [];
+
+        for (const button of this.controller.buttons) {
+            if (!button.always_show) {
+                buttons.push(button);
+            }
+        }
+
+        return buttons;
+    }
+}
diff --git a/dev_odex30_accounting/odex30_account_reports/static/src/components/account_report/cog_menu/cog_menu.xml b/dev_odex30_accounting/odex30_account_reports/static/src/components/account_report/cog_menu/cog_menu.xml
new file mode 100644
index 0000000..3efa3b1
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_reports/static/src/components/account_report/cog_menu/cog_menu.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<templates xml:space="preserve">
+    <t t-name="odex30_account_reports.AccountReportCogMenu">
+        <t t-if="cogButtons.length">
+            <Dropdown>
+                <button class="btn p-0 ms-1 border-0">
+                    <i class="fa fa-fw fa-cog"/>
+                </button>
+                <t t-set-slot="content">
+                    <t t-foreach="cogButtons" t-as="cogButton" t-key="cogButton_index">
+                        <DropdownItem
+                            onSelected="(ev) => controller.buttonAction(ev, cogButton)"
+                        >
+                            <t t-out="cogButton.name"/>
+                        </DropdownItem>
+                    </t>
+                </t>
+            </Dropdown>
+        </t>
+    </t>
+</templates>
diff --git a/dev_odex30_accounting/odex30_account_reports/static/src/components/account_report/controller.js b/dev_odex30_accounting/odex30_account_reports/static/src/components/account_report/controller.js
new file mode 100644
index 0000000..1d9623a
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_reports/static/src/components/account_report/controller.js
@@ -0,0 +1,820 @@
+/* global owl:readonly */
+
+import { browser } from "@web/core/browser/browser";
+import { session } from "@web/session";
+import { useService } from "@web/core/utils/hooks";
+
+import { removeTaxGroupingFromLineId } from "@odex30_account_reports/js/util";
+
+export class AccountReportController {
+    constructor(action) {
+        this.action = action;
+        this.actionService = useService("action");
+        this.dialog = useService("dialog");
+        this.orm = useService("orm");
+    }
+
+    async load(env) {
+        this.env = env;
+        this.reportOptionsMap = {};
+        this.reportInformationMap = {};
+        this.lastOpenedSectionByReport = {};
+        this.loadingCallNumberByCacheKey = new Proxy(
+            {},
+            {
+                get(target, name) {
+                    return name in target ? target[name] : 0;
+                },
+                set(target, name, newValue) {
+                    target[name] = newValue;
+                    return true;
+                },
+            }
+        );
+        this.actionReportId = this.action.context.report_id;
+        const isOpeningReport = !this.action?.keep_journal_groups_options  // true when opening the report, except when coming from the breadcrumb
+        const mainReportOptions = await this.loadReportOptions(this.actionReportId, false, this.action.params?.ignore_session, isOpeningReport);
+        const cacheKey = this.getCacheKey(mainReportOptions['sections_source_id'], mainReportOptions['report_id']);
+
+        // We need the options to be set and saved in order for the loading to work properly
+        this.options = mainReportOptions;
+        this.reportOptionsMap[cacheKey] = mainReportOptions;
+        this.incrementCallNumber(cacheKey);
+        this.options["loading_call_number"] = this.loadingCallNumberByCacheKey[cacheKey];
+        this.saveSessionOptions(mainReportOptions);
+
+        const activeSectionPromise = this.displayReport(mainReportOptions['report_id']);
+        this.preLoadClosedSections();
+        await activeSectionPromise;
+    }
+
+    getCacheKey(sectionsSourceId, reportId) {
+        return `${sectionsSourceId}_${reportId}`
+    }
+
+    incrementCallNumber(cacheKey = null) {
+        if (!cacheKey) {
+            cacheKey = this.getCacheKey(this.options['sections_source_id'], this.options['report_id']);
+        }
+        this.loadingCallNumberByCacheKey[cacheKey] += 1;
+    }
+
+    async displayReport(reportId) {
+        const cacheKey = await this.loadReport(reportId);
+        const options = await this.reportOptionsMap[cacheKey];
+        const informationMap = await this.reportInformationMap[cacheKey];
+        if (
+            options !== undefined
+            && this.loadingCallNumberByCacheKey[cacheKey] === options["loading_call_number"]
+            && (this.lastOpenedSectionByReport === {} || this.lastOpenedSectionByReport[options['selected_variant_id']] === options['selected_section_id'])
+        ) {
+            // the options gotten from the python correspond to the ones that called this displayReport
+            this.options = options;
+
+            // informationMap might be undefined if the promise has been deleted by another call.
+            // Don't need to set data, the call that deleted it is coming to re-put data
+            if (informationMap !== undefined) {
+                this.data = informationMap;
+                // If there is a specific order for lines in the options, we want to use it by default
+                if (this.areLinesOrdered()) {
+                    await this.sortLines();
+                }
+                this.setLineVisibility(this.lines);
+                this.refreshVisibleAnnotations();
+                this.saveSessionOptions(this.options);
+            }
+
+        }
+    }
+
+    async reload(optionPath, newOptions) {
+        const rootOptionKey = optionPath ? optionPath.split(".")[0] : "";
+
+        /*
+        When reloading the UI after setting an option filter, invalidate the cached options and data of all sections supporting this filter.
+        This way, those sections will be reloaded (either synchronously when the user tries to access them or asynchronously via the preloading
+        feature), and will then use the new filter value. This ensures the filters are always applied consistently to all sections.
+        */
+        for (const [cacheKey, cachedOptionsPromise] of Object.entries(this.reportOptionsMap)) {
+            let cachedOptions = await cachedOptionsPromise;
+
+            if (rootOptionKey === "" || cachedOptions.hasOwnProperty(rootOptionKey)) {
+                delete this.reportOptionsMap[cacheKey];
+                delete this.reportInformationMap[cacheKey];
+            }
+        }
+
+        this.saveSessionOptions(newOptions); // The new options will be loaded from the session. Saving them now ensures the new filter is taken into account.
+        await this.displayReport(newOptions['report_id']);
+    }
+
+    async preLoadClosedSections() {
+        let sectionLoaded = false;
+        for (const section of this.options['sections']) {
+            // Preload the first non-loaded section we find amongst this report's sections.
+            const cacheKey = this.getCacheKey(this.options['sections_source_id'], section.id);
+            if (section.id != this.options['report_id'] && !this.reportInformationMap[cacheKey]) {
+                await this.loadReport(section.id, true);
+
+                sectionLoaded = true;
+                // Stop iterating and schedule next call. We don't go on in the loop in case the cache is reset and we need to restart preloading.
+                break;
+            }
+        }
+
+        let nextCallDelay = (sectionLoaded) ? 100 : 1000;
+
+        const self = this;
+        setTimeout(() => self.preLoadClosedSections(), nextCallDelay);
+    }
+
+    async loadReport(reportId, preloading=false) {
+        const options = await this.loadReportOptions(reportId, preloading, false); // This also sets the promise in the cache
+        const reportToDisplayId = options['report_id']; // Might be different from reportId, in case the report to open uses sections
+
+        const cacheKey = this.getCacheKey(options['sections_source_id'], reportToDisplayId)
+        if (!this.reportInformationMap[cacheKey]) {
+            this.reportInformationMap[cacheKey] = this.orm.call(
+                "account.report",
+                options.readonly_query ? "get_report_information_readonly" : "get_report_information",
+                [
+                    reportToDisplayId,
+                    options,
+                ],
+                {
+                    context: this.action.context,
+                },
+            );
+        }
+
+        await this.reportInformationMap[cacheKey];
+
+        if (!preloading) {
+            if (options['sections'].length)
+                this.lastOpenedSectionByReport[options['sections_source_id']] = options['selected_section_id'];
+        }
+
+        return cacheKey;
+    }
+
+    async loadReportOptions(reportId, preloading=false, ignore_session=false, isOpeningReport=false) {
+        const loadOptions = (ignore_session || !this.hasSessionOptions()) ? (this.action.params?.options || {}) : this.sessionOptions();
+        const cacheKey = this.getCacheKey(loadOptions['sections_source_id'] || reportId, reportId);
+
+        if (!(cacheKey in this.loadingCallNumberByCacheKey)) {
+            this.incrementCallNumber(cacheKey);
+        }
+        loadOptions["loading_call_number"] = this.loadingCallNumberByCacheKey[cacheKey];
+
+        loadOptions["is_opening_report"] = isOpeningReport;
+
+        if (!this.reportOptionsMap[cacheKey]) {
+            // The options for this section are not loaded nor loading. Let's load them !
+
+            if (preloading)
+                loadOptions['selected_section_id'] = reportId;
+            else {
+                /* Reopen the last opened section by default (cannot be done through regular caching, because composite reports' options are not
+                cached (since they always reroute). */
+                if (this.lastOpenedSectionByReport[reportId])
+                    loadOptions['selected_section_id'] = this.lastOpenedSectionByReport[reportId];
+            }
+
+            this.reportOptionsMap[cacheKey] = this.orm.call(
+                "account.report",
+                "get_options",
+                [
+                   reportId,
+                   loadOptions,
+                ],
+                {
+                   context: this.action.context,
+                },
+            );
+
+            // Wait for the result, and check the report hasn't been rerouted to a section or variant; fix the cache if it has
+            let reportOptions = await this.reportOptionsMap[cacheKey];
+
+            // In case of a reroute, also set the cached options into the reroute target's key
+            const loadedOptionsCacheKey = this.getCacheKey(reportOptions['sections_source_id'], reportOptions['report_id']);
+            if (loadedOptionsCacheKey !== cacheKey) {
+                /* We delete the rerouting report from the cache, to avoid redoing this reroute when reloading the cached options, as it would mean
+                route reports can never be opened directly if they open some variant by default.*/
+                delete this.reportOptionsMap[cacheKey];
+                this.reportOptionsMap[loadedOptionsCacheKey] = reportOptions;
+
+                this.loadingCallNumberByCacheKey[loadedOptionsCacheKey] = 1;
+                delete this.loadingCallNumberByCacheKey[cacheKey];
+                return reportOptions;
+            }
+        }
+
+        return this.reportOptionsMap[cacheKey];
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    // Generic data getters
+    //------------------------------------------------------------------------------------------------------------------
+    get buttons() {
+        return this.options.buttons;
+    }
+
+    get caretOptions() {
+        return this.data.caret_options;
+    }
+
+    get columnHeadersRenderData() {
+        return this.data.column_headers_render_data;
+    }
+
+    get columnGroupsTotals() {
+        return this.data.column_groups_totals;
+    }
+
+    get context() {
+        return this.data.context;
+    }
+
+    get filters() {
+        return this.data.filters;
+    }
+
+    get annotations() {
+        return this.data.annotations;
+    }
+
+    get groups() {
+        return this.data.groups;
+    }
+
+    get lines() {
+        return this.data.lines;
+    }
+
+    get warnings() {
+        return this.data.warnings;
+    }
+
+    get linesOrder() {
+        return this.data.lines_order;
+    }
+
+    get report() {
+        return this.data.report;
+    }
+
+    get visibleAnnotations() {
+        return this.data.visible_annotations;
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    // Generic data setters
+    //------------------------------------------------------------------------------------------------------------------
+    set annotations(value) {
+        this.data.annotations = value;
+    }
+
+    set columnGroupsTotals(value) {
+        this.data.column_groups_totals = value;
+    }
+
+    set lines(value) {
+        this.data.lines = value;
+        this.setLineVisibility(this.lines);
+    }
+
+    set linesOrder(value) {
+        this.data.lines_order = value;
+    }
+
+    set visibleAnnotations(value) {
+        this.data.visible_annotations = value;
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    // Helpers
+    //------------------------------------------------------------------------------------------------------------------
+    get needsColumnPercentComparison() {
+        return this.options.column_percent_comparison === "growth";
+    }
+
+    get hasCustomSubheaders() {
+        return this.columnHeadersRenderData.custom_subheaders.length > 0;
+    }
+
+    get hasDebugColumn() {
+        return Boolean(this.options.show_debug_column);
+    }
+
+    get hasStringDate() {
+        return "date" in this.options && "string" in this.options.date;
+    }
+
+    get hasVisibleAnnotations() {
+        return Boolean(this.visibleAnnotations.length);
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    // Options
+    //------------------------------------------------------------------------------------------------------------------
+    async _updateOption(operationType, optionPath, optionValue=null, reloadUI=false) {
+        const optionKeys = optionPath.split(".");
+
+        let currentOptionKey = null;
+        let option = this.options;
+
+        while (optionKeys.length > 1) {
+            currentOptionKey = optionKeys.shift();
+            option = option[currentOptionKey];
+
+            if (option === undefined)
+                throw new Error(`Invalid option key in _updateOption(): ${ currentOptionKey } (${ optionPath })`);
+        }
+
+        switch (operationType) {
+            case "update":
+                option[optionKeys[0]] = optionValue;
+                break;
+            case "delete":
+                delete option[optionKeys[0]];
+                break;
+            case "toggle":
+                option[optionKeys[0]] = !option[optionKeys[0]];
+                break;
+            default:
+                throw new Error(`Invalid operation type in _updateOption(): ${ operationType }`);
+        }
+
+        if (reloadUI) {
+            this.incrementCallNumber();
+            await this.reload(optionPath, this.options);
+        }
+    }
+
+    async updateOption(optionPath, optionValue, reloadUI=false) {
+        await this._updateOption('update', optionPath, optionValue, reloadUI);
+    }
+
+    async deleteOption(optionPath, reloadUI=false) {
+        await this._updateOption('delete', optionPath, null, reloadUI);
+    }
+
+    async toggleOption(optionPath, reloadUI=false) {
+        await this._updateOption('toggle', optionPath, null, reloadUI);
+    }
+
+    async switchToSection(reportId) {
+        this.saveSessionOptions({...this.options, 'selected_section_id': reportId});
+        this.displayReport(reportId);
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    // Session options
+    //------------------------------------------------------------------------------------------------------------------
+    sessionOptionsID() {
+        /* Options are stored by action report (so, the report that was targetted by the original action triggering this flow).
+        This allows a more intelligent reloading of the previous options during user navigation (especially concerning sections and variants;
+        you expect your report to open by default the same section as last time you opened it in this http session).
+        */
+        return `account.report:${ this.actionReportId }:${ session.user_companies.current_company }`;
+    }
+
+    hasSessionOptions() {
+        return Boolean(browser.sessionStorage.getItem(this.sessionOptionsID()))
+    }
+
+    saveSessionOptions(options) {
+        browser.sessionStorage.setItem(this.sessionOptionsID(), JSON.stringify(options));
+    }
+
+    sessionOptions() {
+        return JSON.parse(browser.sessionStorage.getItem(this.sessionOptionsID()));
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    // Lines
+    //------------------------------------------------------------------------------------------------------------------
+    lineHasDebugData(lineIndex) {
+        return 'debug_popup_data' in this.lines[lineIndex];
+    }
+
+    lineHasGrowthComparisonData(lineIndex) {
+        return Boolean(this.lines[lineIndex].column_percent_comparison_data);
+    }
+
+    isLineAncestorOf(ancestorLineId, lineId) {
+        return lineId.startsWith(`${ancestorLineId}|`);
+    }
+
+    isLineChildOf(childLineId, lineId) {
+        return childLineId.startsWith(`${lineId}|`);
+    }
+
+    isLineRelatedTo(relatedLineId, lineId) {
+        return this.isLineAncestorOf(relatedLineId, lineId) || this.isLineChildOf(relatedLineId, lineId);
+    }
+
+    isNextLineChild(index, lineId) {
+        return index < this.lines.length && this.lines[index].id.startsWith(`${lineId}|`);
+    }
+
+    isNextLineDirectChild(index, lineId) {
+        return index < this.lines.length && this.lines[index].parent_id === lineId;
+    }
+
+    isTotalLine(lineIndex) {
+        return this.lines[lineIndex].id.includes("|total~~");
+    }
+
+    isLoadMoreLine(lineIndex) {
+        return this.lines[lineIndex].id.includes("|load_more~~");
+    }
+
+    isLoadedLine(lineIndex) {
+        const lineID = this.lines[lineIndex].id;
+        const nextLineIndex = lineIndex + 1;
+
+        return this.isNextLineChild(nextLineIndex, lineID) && !this.isTotalLine(nextLineIndex) && !this.isLoadMoreLine(nextLineIndex);
+    }
+
+    async replaceLineWith(replaceIndex, newLines) {
+        await this.insertLines(replaceIndex, 1, newLines);
+    }
+
+    async insertLinesAfter(insertIndex, newLines) {
+        await this.insertLines(insertIndex + 1, 0, newLines);
+    }
+
+    async insertLines(lineIndex, deleteCount, newLines) {
+        this.lines.splice(lineIndex, deleteCount, ...newLines);
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    // Unfolded/Folded lines
+    //------------------------------------------------------------------------------------------------------------------
+    async unfoldLoadedLine(lineIndex) {
+        const lineId = this.lines[lineIndex].id;
+        let nextLineIndex = lineIndex + 1;
+
+        while (this.isNextLineChild(nextLineIndex, lineId)) {
+            if (this.isNextLineDirectChild(nextLineIndex, lineId)) {
+                const nextLine = this.lines[nextLineIndex];
+                nextLine.visible = true;
+                if (!nextLine.unfoldable && this.isNextLineChild(nextLineIndex + 1, nextLine.id)) {
+                    await this.unfoldLine(nextLineIndex);
+                }
+            }
+            nextLineIndex += 1;
+        }
+        return nextLineIndex;
+    }
+
+    async unfoldNewLine(lineIndex) {
+        const options = await this.options;
+        const newLines = await this.orm.call(
+            "account.report",
+            options.readonly_query ? "get_expanded_lines_readonly" : "get_expanded_lines",
+            [
+                this.options['report_id'],
+                this.options,
+                this.lines[lineIndex].id,
+                this.lines[lineIndex].groupby,
+                this.lines[lineIndex].expand_function,
+                this.lines[lineIndex].progress,
+                0,
+                this.lines[lineIndex].horizontal_split_side,
+            ],
+        );
+
+        if (this.areLinesOrdered()) {
+            this.updateLinesOrderIndexes(lineIndex, newLines, false)
+        }
+        this.insertLinesAfter(lineIndex, newLines);
+
+        const totalIndex = lineIndex + newLines.length + 1;
+
+        if (this.filters.show_totals && this.lines[totalIndex] && this.isTotalLine(totalIndex))
+            this.lines[totalIndex].visible = true;
+
+        // Update options
+        this.options.unfolded_lines.push(
+            ...newLines.filter(line => line.unfolded).map(({ id }) => id)
+        );
+
+        this.saveSessionOptions(this.options);
+
+        return totalIndex
+    }
+
+    /**
+     * When unfolding a line of a sorted report, we need to update the linesOrder array by adding the new lines,
+     * which will require subsequent updates on the array.
+     *
+     * - lineOrderValue represents the line index before sorting the report.
+     * @param {Integer} lineIndex: Index of the current line
+     * @param {Array} newLines: Array of lines to be added
+     * @param {Boolean} replaceLine: Useful for the splice of the linesOrder array in case we want to replace some line
+     *                               example: With the load more, we want to replace the line with others
+     **/
+    updateLinesOrderIndexes(lineIndex, newLines, replaceLine) {
+        let unfoldedLineIndex;
+        // The offset is useful because in case we use 'replaceLineWith' we want to replace the line at index
+        // unfoldedLineIndex with the new lines.
+        const offset = replaceLine ? 0 : 1;
+        for (const [lineOrderIndex, lineOrderValue] of Object.entries(this.linesOrder)) {
+            // Since we will have to add new lines into the linesOrder array, we have to update the index of the lines
+            // having a bigger index than the one we will unfold.
+            // deleteCount of 1 means that a line need to be replaced so the index need to be increase by 1 less than usual
+            if (lineOrderValue > lineIndex) {
+                this.linesOrder[lineOrderIndex] += newLines.length - replaceLine;
+            }
+            // The unfolded line is found, providing a reference for adding children in the 'linesOrder' array.
+            if (lineOrderValue === lineIndex) {
+                unfoldedLineIndex = parseInt(lineOrderIndex)
+            }
+        }
+
+        const arrayOfNewIndex = Array.from({ length: newLines.length }, (dummy, index) => this.linesOrder[unfoldedLineIndex] + index + offset);
+        this.linesOrder.splice(unfoldedLineIndex + offset, replaceLine, ...arrayOfNewIndex);
+    }
+
+    async unfoldLine(lineIndex) {
+        const targetLine = this.lines[lineIndex];
+        let lastLineIndex = lineIndex + 1;
+
+        if (this.isLoadedLine(lineIndex))
+            lastLineIndex = await this.unfoldLoadedLine(lineIndex);
+        else if (targetLine.expand_function) {
+            lastLineIndex = await this.unfoldNewLine(lineIndex);
+        }
+
+        this.setLineVisibility(this.lines.slice(lineIndex + 1, lastLineIndex));
+        targetLine.unfolded = true;
+        this.refreshVisibleAnnotations();
+
+        // Update options
+        if (!this.options.unfolded_lines.includes(targetLine.id))
+            this.options.unfolded_lines.push(targetLine.id);
+
+        this.saveSessionOptions(this.options);
+    }
+
+    foldLine(lineIndex) {
+        const targetLine = this.lines[lineIndex];
+
+        let foldedLinesIDs = new Set([targetLine.id]);
+        let nextLineIndex = lineIndex + 1;
+
+        while (this.isNextLineChild(nextLineIndex, targetLine.id)) {
+            this.lines[nextLineIndex].unfolded = false;
+            this.lines[nextLineIndex].visible = false;
+
+            foldedLinesIDs.add(this.lines[nextLineIndex].id);
+
+            nextLineIndex += 1;
+        }
+
+        targetLine.unfolded = false;
+
+        this.refreshVisibleAnnotations();
+
+        // Update options
+        this.options.unfolded_lines = this.options.unfolded_lines.filter(
+            unfoldedLineID => !foldedLinesIDs.has(unfoldedLineID)
+        );
+
+        this.saveSessionOptions(this.options);
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    // Ordered lines
+    //------------------------------------------------------------------------------------------------------------------
+    linesCurrentOrderByColumn(columnIndex) {
+        if (this.areLinesOrderedByColumn(columnIndex))
+            return this.options.order_column.direction;
+
+        return "default";
+    }
+
+    areLinesOrdered() {
+        return this.linesOrder != null && this.options.order_column != null;
+    }
+
+    areLinesOrderedByColumn(columnIndex) {
+        return this.areLinesOrdered() && this.options.order_column.expression_label === this.options.columns[columnIndex].expression_label;
+    }
+
+    async sortLinesByColumnAsc(columnIndex) {
+        this.options.order_column = {
+            expression_label: this.options.columns[columnIndex].expression_label,
+            direction: "ASC",
+        };
+
+        await this.sortLines();
+        this.saveSessionOptions(this.options);
+    }
+
+    async sortLinesByColumnDesc(columnIndex) {
+        this.options.order_column = {
+            expression_label: this.options.columns[columnIndex].expression_label,
+            direction: "DESC",
+        };
+
+        await this.sortLines();
+        this.saveSessionOptions(this.options);
+    }
+
+    sortLinesByDefault() {
+        delete this.options.order_column;
+        delete this.data.lines_order;
+
+        this.saveSessionOptions(this.options);
+    }
+
+    async sortLines() {
+        this.linesOrder = await this.orm.call(
+            "account.report",
+            "sort_lines",
+            [
+                this.lines,
+                this.options,
+                true,
+            ],
+            {
+                context: this.action.context,
+            },
+        );
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    // Annotations
+    //------------------------------------------------------------------------------------------------------------------
+    async refreshAnnotations() {
+        this.annotations = await this.orm.call("account.report", "get_annotations", [
+            this.action.context.report_id,
+            this.options,
+        ]);
+
+        this.refreshVisibleAnnotations();
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    // Visibility
+    //------------------------------------------------------------------------------------------------------------------
+
+    refreshVisibleAnnotations() {
+        const visibleAnnotations = new Proxy(
+            {},
+            {
+                get(target, name) {
+                    return name in target ? target[name] : [];
+                },
+                set(target, name, newValue) {
+                    target[name] = newValue;
+                    return true;
+                },
+            }
+        );
+
+        this.lines.forEach((line) => {
+            line["visible_annotations"] = [];
+            const lineWithoutTaxGrouping = removeTaxGroupingFromLineId(line.id);
+            if (line.visible && this.annotations[lineWithoutTaxGrouping]) {
+                for (const index in this.annotations[lineWithoutTaxGrouping]) {
+                    const annotation = this.annotations[lineWithoutTaxGrouping][index];
+                    visibleAnnotations[lineWithoutTaxGrouping] = [
+                        ...visibleAnnotations[lineWithoutTaxGrouping],
+                        { ...annotation },
+                    ];
+                    line["visible_annotations"].push({
+                        ...annotation,
+                    });
+                }
+            }
+
+            if (
+                line.visible_annotations &&
+                (!this.annotations[lineWithoutTaxGrouping] || !line.visible)
+            ) {
+                delete line.visible_annotations;
+            }
+        });
+
+        this.visibleAnnotations = visibleAnnotations;
+    }
+
+    /**
+        Defines which lines should be visible in the provided list of lines (depending on what is folded).
+    **/
+    setLineVisibility(linesToAssign) {
+        let needHidingChildren = new Set();
+
+        linesToAssign.forEach((line) => {
+            line.visible = !needHidingChildren.has(line.parent_id);
+
+            if (!line.visible || (line.unfoldable &! line.unfolded))
+                needHidingChildren.add(line.id);
+        });
+
+        // If the hide 0 lines is activated we will go through the lines to set the visibility.
+        if (this.options.hide_0_lines) {
+            this.hideZeroLines(linesToAssign);
+        }
+    }
+
+    /**
+     * Defines whether the line should be visible depending on its value and the ones of its children.
+     * For parent lines, it's visible if there is at least one child with a value different from zero
+     * or if a child is visible, indicating it's a parent line.
+     * For leaf nodes, it's visible if the value is different from zero.
+     *
+     * By traversing the 'lines' array in reverse, we can set the visibility of the lines easily by keeping
+     * a dict of visible lines for each parent.
+     *
+     * @param {Object} lines - The lines for which we want to determine visibility.
+     */
+    hideZeroLines(lines) {
+        const hasVisibleChildren = new Set();
+        const reversed_lines = [...lines].reverse()
+
+        const number_figure_types = ['integer', 'float', 'monetary', 'percentage'];
+        reversed_lines.forEach((line) => {
+            const isZero = line.columns.every(column => !number_figure_types.includes(column.figure_type) || column.is_zero);
+
+            // If the line has no visible children and all the columns are equals to zero then the line needs to be hidden
+            if (!hasVisibleChildren.has(line.id) && isZero) {
+                line.visible = false;
+            }
+
+            // If the line has a parent_id and is not hidden then we fill the set 'hasVisibleChildren'. Each parent
+            // will have an array of his visible children
+            if (line.parent_id && line.visible) {
+                // This line allows the initialization of that list.
+                hasVisibleChildren.add(line.parent_id);
+            }
+        })
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    // Server calls
+    //------------------------------------------------------------------------------------------------------------------
+    buttonAction(ev, button) {
+        // Might be overidden to add specific functionality to button
+        // For instance adding context to a call ...
+        this.reportAction(ev, button.error_action || button.action, button.action_param, true);
+    }
+
+    async reportAction(ev, action, actionParam = null, callOnSectionsSource = false, actionContext=null) {
+        // 'ev' might be 'undefined' if event is not triggered from a button/anchor
+        ev?.preventDefault();
+        ev?.stopPropagation();
+
+        let actionOptions = this.options;
+        if (callOnSectionsSource) {
+            // When calling the sections source, we want to keep track of all unfolded lines of all sections
+            const allUnfoldedLines =  this.options.sections.length ? [] : [...this.options['unfolded_lines']]
+
+            for (const sectionData of this.options['sections']) {
+                const cacheKey = this.getCacheKey(this.options['sections_source_id'], sectionData['id']);
+                const sectionOptions = await this.reportOptionsMap[cacheKey];
+                if (sectionOptions)
+                    allUnfoldedLines.push(...sectionOptions['unfolded_lines']);
+            }
+
+            actionOptions = {...this.options, unfolded_lines: allUnfoldedLines};
+        }
+
+        const dispatchReportAction = await this.orm.call(
+            "account.report",
+            "dispatch_report_action",
+            [
+                this.options['report_id'],
+                actionOptions,
+                action,
+                actionParam,
+                callOnSectionsSource,
+            ],
+            {
+                context: Object.assign({}, this.context, actionContext)
+            }
+        );
+        if (dispatchReportAction?.help) {
+            dispatchReportAction.help = owl.markup(dispatchReportAction.help)
+        }
+
+        return dispatchReportAction ? this.actionService.doAction(dispatchReportAction) : null;
+    }
+
+    // -----------------------------------------------------------------------------------------------------------------
+    // Budget
+    // -----------------------------------------------------------------------------------------------------------------
+
+    async openBudget(budget) {
+        this.actionService.doAction({
+            type: "ir.actions.act_window",
+            res_model: "account.report.budget",
+            res_id: budget.id,
+            views: [[false, "form"]],
+        });
+    }
+}
diff --git a/dev_odex30_accounting/odex30_account_reports/static/src/components/account_report/ellipsis/ellipsis.js b/dev_odex30_accounting/odex30_account_reports/static/src/components/account_report/ellipsis/ellipsis.js
new file mode 100644
index 0000000..c448c09
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_reports/static/src/components/account_report/ellipsis/ellipsis.js
@@ -0,0 +1,64 @@
+/** @odoo-module **/
+
+import { _t } from "@web/core/l10n/translation";
+import { localization } from "@web/core/l10n/localization";
+import { useService } from "@web/core/utils/hooks";
+import { Component, useState } from "@odoo/owl";
+
+import { AccountReportEllipsisPopover } from "@odex30_account_reports/components/account_report/ellipsis/popover/ellipsis_popover";
+
+export class AccountReportEllipsis extends Component {
+    static template = "odex30_account_reports.AccountReportEllipsis";
+    static props = {
+        name: { type: String, optional: true },
+        no_format: { optional: true },
+        type: { type: String, optional: true },
+        maxCharacters: Number,
+    };
+
+    setup() {
+        this.popover = useService("popover");
+        this.notification = useService("notification");
+        this.controller = useState(this.env.controller);
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    // Ellipsis
+    //------------------------------------------------------------------------------------------------------------------
+    get triggersEllipsis() {
+        if (this.props.name)
+            return this.props.name.length > this.props.maxCharacters;
+
+        return false;
+    }
+
+    copyEllipsisText() {
+        navigator.clipboard.writeText(this.props.name);
+        this.notification.add(_t("Text copied"), { type: 'success' });
+        this.popoverCloseFn();
+        this.popoverCloseFn = null;
+    }
+
+    showEllipsisPopover(ev) {
+        ev.preventDefault();
+        ev.stopPropagation();
+
+        if (this.popoverCloseFn) {
+            this.popoverCloseFn();
+            this.popoverCloseFn = null;
+        }
+
+        this.popoverCloseFn = this.popover.add(
+            ev.currentTarget,
+            AccountReportEllipsisPopover,
+            {
+                name: this.props.name,
+                copyEllipsisText: this.copyEllipsisText.bind(this),
+            },
+            {
+                closeOnClickAway: true,
+                position: localization.direction === "rtl" ? "left" : "right",
+            },
+        );
+    }
+}
diff --git a/dev_odex30_accounting/odex30_account_reports/static/src/components/account_report/ellipsis/ellipsis.xml b/dev_odex30_accounting/odex30_account_reports/static/src/components/account_report/ellipsis/ellipsis.xml
new file mode 100644
index 0000000..ffc0798
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_reports/static/src/components/account_report/ellipsis/ellipsis.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<templates>
+    <t t-name="odex30_account_reports.AccountReportEllipsis">
+        <t t-call="{{ env.template('AccountReportEllipsis') }}"/>
+    </t>
+
+    <t t-name="odex30_account_reports.AccountReportEllipsisCustomizable">
+        <t t-if="props.type === 'string'">
+            <div class="name">
+                <t t-out="(props.name) ? props.name.substring(0, props.maxCharacters) : ''"/>
+            </div>
+
+            <t t-if="triggersEllipsis">
+                <button
+                    class="btn btn_ellipsis"
+                    t-on-click="(ev) => this.showEllipsisPopover(ev)"
+                >
+                    <i class="fa fa-ellipsis-h"/>
+                </button>
+            </t>
+        </t>
+        <t t-else="">
+            <div class="name">
+                <t t-out="props.name"/>
+            </div>
+        </t>
+    </t>
+</templates>
diff --git a/dev_odex30_accounting/odex30_account_reports/static/src/components/account_report/ellipsis/popover/ellipsis_popover.js b/dev_odex30_accounting/odex30_account_reports/static/src/components/account_report/ellipsis/popover/ellipsis_popover.js
new file mode 100644
index 0000000..2f73313
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_reports/static/src/components/account_report/ellipsis/popover/ellipsis_popover.js
@@ -0,0 +1,12 @@
+/** @odoo-module */
+
+import { Component } from "@odoo/owl";
+
+export class AccountReportEllipsisPopover extends Component {
+    static template = "odex30_account_reports.AccountReportEllipsisPopover";
+    static props = {
+        close: Function,
+        name: String,
+        copyEllipsisText: Function,
+    };
+}
diff --git a/dev_odex30_accounting/odex30_account_reports/static/src/components/account_report/ellipsis/popover/ellipsis_popover.xml b/dev_odex30_accounting/odex30_account_reports/static/src/components/account_report/ellipsis/popover/ellipsis_popover.xml
new file mode 100644
index 0000000..a8f6f7f
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_reports/static/src/components/account_report/ellipsis/popover/ellipsis_popover.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<templates>
+    <t t-name="odex30_account_reports.AccountReportEllipsisPopover">
+        <div class="account_report_popover_ellipsis">
+            <p t-out="props.name"/>
+            <button class="btn account_report_btn_clone" t-on-click="() => props.copyEllipsisText()">
+                <i class="fa fa-clone"/>
+            </button>
+        </div>
+    </t>
+</templates>
diff --git a/dev_odex30_accounting/odex30_account_reports/static/src/components/account_report/filters/filter_account_type.xml b/dev_odex30_accounting/odex30_account_reports/static/src/components/account_report/filters/filter_account_type.xml
new file mode 100644
index 0000000..df0496b
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_reports/static/src/components/account_report/filters/filter_account_type.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<templates>
+    <t t-name="odex30_account_reports.AccountReportFilterAccountType">
+        <Dropdown>
+            <button class="btn btn-secondary">
+                <i class="fa fa-user me-1"/>Account: <t t-out="selectedAccountType"/>
+            </button>
+
+            <t t-set-slot="content">
+                <t t-foreach="controller.options.account_type" t-as="accountTypeItem" t-key="accountTypeItem_index">
+                    <DropdownItem
+                        class="{ selected: accountTypeItem.selected }"
+                        onSelected="() => this.filterClicked({ optionKey: 'account_type.' + accountTypeItem_index + '.selected', reload: true})"
+                        closingMode="'none'"
+                        t-out="accountTypeItem.name"
+                    />
+                </t>
+            </t>
+        </Dropdown>
+    </t>
+</templates>
diff --git a/dev_odex30_accounting/odex30_account_reports/static/src/components/account_report/filters/filter_aml_ir_filters.xml b/dev_odex30_accounting/odex30_account_reports/static/src/components/account_report/filters/filter_aml_ir_filters.xml
new file mode 100644
index 0000000..edc34ad
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_reports/static/src/components/account_report/filters/filter_aml_ir_filters.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<templates>
+    <t t-name="odex30_account_reports.AccountReportAmlIrFilters">
+        <Dropdown>
+            <button class="btn btn-secondary">
+                <i class="fa fa-star me-1"/>Filters: <t t-out="selectedAmlIrFilters"/>
+            </button>
+
+            <t t-set-slot="content">
+                <t t-foreach="controller.options.aml_ir_filters" t-as="amlIrFilter" t-key="amlIrFilter_index">
+                    <DropdownItem
+                        class="{ 'selected': amlIrFilter.selected }"
+                        onSelected="() => this.filterClicked({ optionKey: 'aml_ir_filters.' + amlIrFilter_index + '.selected', reload: true})"
+                        closingMode="'none'"
+                        t-out="amlIrFilter.name"
+                    />
+                </t>
+            </t>
+        </Dropdown>
+    </t>
+</templates>
diff --git a/dev_odex30_accounting/odex30_account_reports/static/src/components/account_report/filters/filter_analytic.xml b/dev_odex30_accounting/odex30_account_reports/static/src/components/account_report/filters/filter_analytic.xml
new file mode 100644
index 0000000..ef4a05f
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_reports/static/src/components/account_report/filters/filter_analytic.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<templates>
+    <t t-name="odex30_account_reports.AccountReportFilterAnalytic">
+        <Dropdown
+            menuClass="'account_report_filter analytic'"
+        >
+            <button class="btn btn-secondary">
+                <i class="fa fa-filter me-1"/>Analytic
+            </button>
+
+            <t t-set-slot="content">
+                <div class="dropdown-item gap-2 align-items-center">
+                    <label>Accounts</label>
+                    <MultiRecordSelector t-props="getMultiRecordSelectorProps('account.analytic.account', 'analytic_accounts')"/>
+                </div>
+            </t>
+        </Dropdown>
+    </t>
+</templates>
diff --git a/dev_odex30_accounting/odex30_account_reports/static/src/components/account_report/filters/filter_analytic_groupby.xml b/dev_odex30_accounting/odex30_account_reports/static/src/components/account_report/filters/filter_analytic_groupby.xml
new file mode 100644
index 0000000..f26fb87
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_reports/static/src/components/account_report/filters/filter_analytic_groupby.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<templates>
+    <t t-name="odex30_account_reports.AccountReportFilterAnalyticGroupby">
+        <Dropdown
+            menuClass="'account_report_filter analytic_groupby'"
+        >
+            <button class="btn btn-secondary">
+                <i class="oi oi-group me-1"/>Analytic
+            </button>
+
+            <t t-set-slot="content">
+                <div class="dropdown-item gap-2 align-items-center">
+                    <label>Accounts</label>
+                    <MultiRecordSelector t-props="getMultiRecordSelectorProps('account.analytic.account', 'analytic_accounts_groupby')"/>
+                </div>
+
+                <div class="dropdown-item gap-2 align-items-center">
+                    <label>Plans</label>
+                    <MultiRecordSelector t-props="getMultiRecordSelectorProps('account.analytic.plan', 'analytic_plans_groupby')"/>
+                </div>
+            </t>
+        </Dropdown>
+    </t>
+</templates>
diff --git a/dev_odex30_accounting/odex30_account_reports/static/src/components/account_report/filters/filter_budgets.xml b/dev_odex30_accounting/odex30_account_reports/static/src/components/account_report/filters/filter_budgets.xml
new file mode 100644
index 0000000..a5da3fa
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_reports/static/src/components/account_report/filters/filter_budgets.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<templates>
+    <t t-name="odex30_account_reports.AccountReportFilterBudget">
+        <Dropdown
+            navigationOptions="dropdownProps"
+        >
+            <button class="btn btn-secondary">
+                <i class="fa fa-bar-chart me-1"/>Budget
+            </button>
+
+            <t t-set-slot="content">
+                <t t-foreach="controller.options.budgets" t-as="budget" t-key="budget_index">
+                    <div class="o-dropdown-item dropdown-item o-navigable d-flex justify-content-between ps-4 pe-1"
+                         t-att-class="{ 'selected': budget.selected }"
+                         t-on-click="() => this.selectBudget(budget)"
+                    >
+                        <span t-out="budget.name"/>
+                        <button class="btn p-0 px-1" t-on-click.prevent.stop="() => controller.openBudget(budget)">
+                            <i class="fa fa-pencil" />
+                        </button>
+                    </div>
+                </t>
+
+                <div class="dropdown-divider"/>
+
+                <t t-if="controller.options.budgets.filter(x => x.selected).length > 0">
+                    <DropdownItem
+                        class="{ 'filter_show_all_accounts_hook': true, 'selected': controller.options.show_all_accounts }"
+                        onSelected="() => this.filterClicked({ optionKey: 'show_all_accounts', reload: true})"
+                        closingMode="'none'"
+                    >
+                        Show All Accounts
+                    </DropdownItem>
+                </t>
+
+                <div class="o-dropdown-item dropdown-item d-flex align-items-center ps-4 pe-1">
+                    <input
+                        class="o_input"
+                        t-att-class="{ 'o_field_invalid': budgetName.invalid }"
+                        type="text"
+                        placeholder="Budget Name"
+                        t-model="budgetName.value"
+                    />
+                    <button class="btn btn-link" data-hotkey="s" t-on-click="createBudget">
+                        Create
+                    </button>
+                </div>
+            </t>
+        </Dropdown>
+    </t>
+</templates>
diff --git a/dev_odex30_accounting/odex30_account_reports/static/src/components/account_report/filters/filter_comparison.xml b/dev_odex30_accounting/odex30_account_reports/static/src/components/account_report/filters/filter_comparison.xml
new file mode 100644
index 0000000..66e8ecd
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_reports/static/src/components/account_report/filters/filter_comparison.xml
@@ -0,0 +1,163 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<templates>
+    <t t-name="odex30_account_reports.AccountReportComparisonPeriod">
+        <div t-att-class="(controller.options.comparison.filter !== filter) ? 'invisible' : ''">
+            <input
+                min="1"
+                type="number"
+                t-att-value="controller.options.comparison.number_period"
+                t-on-change="(ev) => this.setNumberPeriods(ev)"
+            />
+            <label>
+                <t t-out="periodLabel"/>
+            </label>
+        </div>
+    </t>
+
+    <t t-name="odex30_account_reports.AccountReportFilterComparison">
+        <Dropdown
+            menuClass="'account_report_filter comparison'"
+            navigationOptions="dropdownProps"
+        >
+            <button class="btn btn-secondary">
+                <i class="fa fa-percent me-1"/>
+                <span>Comparison</span>
+                <t t-if="controller.options.comparison.string">
+                    <span>: </span>
+                    <t t-if="controller.options.comparison.filter === 'previous_period'">
+                        <t t-if="controller.options.comparison.number_period === 1">
+                            <span>Previous Period</span>
+                        </t>
+                        <t t-elif="controller.options.comparison.number_period > 1">
+                            <t t-esc="`${ controller.options.comparison.number_period } `"/>
+                            <span>Previous Periods</span>
+                        </t>
+                    </t>
+                    <t t-elif="controller.options.comparison.filter === 'same_last_year'">
+                        <t t-if="controller.options.comparison.number_period === 1">
+                            <span>Previous Year</span>
+                        </t>
+                        <t t-elif="controller.options.comparison.number_period > 1">
+                            <t t-esc="`${ controller.options.comparison.number_period } `"/>
+                            <span>Previous Years</span>
+                        </t>
+                    </t>
+                    <t t-else="">
+                        <t t-esc="`${ controller.options.comparison.string }`"/>
+                    </t>
+                </t>
+            </button>
+
+            <t t-set-slot="content">
+                <DropdownItem
+                    class="{ 'selected': (controller.options.comparison.filter === 'no_comparison') }"
+                    onSelected="() => this.filterClicked({ optionKey: 'comparison.filter', optionValue: 'no_comparison', reload: true})"
+                    closingMode="'none'"
+                >
+                    No Comparison
+                </DropdownItem>
+
+                <DropdownItem
+                    class="{ 'selected': controller.options.comparison.filter === 'previous_period', 'dropdown-item': true, 'period': true }"
+                    onSelected="() => this.filterClicked({ optionKey: 'comparison.filter', optionValue: 'previous_period', reload: true})"
+                    closingMode="'none'"
+                >
+                    <label class="d-flex align-items-center">
+                        Previous Period
+                    </label>
+
+                    <t t-call="odex30_account_reports.AccountReportComparisonPeriod">
+                        <t t-set="filter" t-value="'previous_period'"/>
+                    </t>
+                </DropdownItem>
+
+                <DropdownItem
+                    class="{ 'selected': controller.options.comparison.filter === 'same_last_year', 'dropdown-item': true, 'period': true }"
+                    attrs="{ 'name': 'filter_comparison_same_period_last_year' }"
+                    onSelected="() => this.filterClicked({ optionKey: 'comparison.filter', optionValue: 'same_last_year', reload: true})"
+                    closingMode="'none'"
+                >
+                    <label class="d-flex align-items-center">
+                        Same Period Last Year
+                    </label>
+
+                    <t t-call="odex30_account_reports.AccountReportComparisonPeriod">
+                        <t t-set="filter" t-value="'same_last_year'"/>
+                    </t>
+                </DropdownItem>
+
+                <t t-if="controller.options.date.mode === 'range'">
+                    <DropdownItem
+                        class="{ 'selected': controller.options.comparison.filter === 'custom', 'dropdown-item': true, 'date': true }"
+                        attrs="{ 'name': 'filter_comparison_custom' }"
+                        onSelected="() => this.filterClicked({ optionKey: 'comparison.filter', optionValue: 'custom'})"
+                        closingMode="'none'"
+                    >
+                        <label class="d-flex align-items-center">
+                            Custom Dates
+                        </label>
+
+                        <div class="d-flex flex-row"
+                             t-att-class="(controller.options.comparison.filter !== 'custom') ? 'invisible' : ''">
+                            <DateTimeInput
+                                type="'date'"
+                                value="dateFrom('comparison')"
+                                onChange="(dateFrom) => this.setDateFrom('comparison', dateFrom)"
+                            />
+                            <label class="d-flex align-items-center">
+                                to
+                            </label>
+                            <DateTimeInput
+                                type="'date'"
+                                value="dateTo('comparison')"
+                                onChange="(dateTo) => this.setDateTo('comparison', dateTo)"
+                            />
+                        </div>
+                    </DropdownItem>
+                </t>
+
+                <t t-if="controller.options.date.mode === 'single'">
+                    <DropdownItem
+                        class="{ 'selected': controller.options.comparison.filter === 'custom', 'dropdown-item': true, 'date': true }"
+                        onSelected="() => this.filterClicked({ optionKey: 'comparison.filter', optionValue: 'custom'})"
+                        closingMode="'none'"
+                    >
+                        <label class="d-flex align-items-center">
+                            Specific Date
+                        </label>
+
+                        <div t-att-class="(controller.options.comparison.filter !== 'custom') ? 'invisible' : ''">
+                            <DateTimeInput
+                                type="'date'"
+                                value="dateTo('comparison')"
+                                onChange="(dateTo) => this.setDateTo('comparison', dateTo)"
+                            />
+                        </div>
+                    </DropdownItem>
+                </t>
+
+                <div class="dropdown-divider"/>
+
+                <div class="dropdown-item period order">
+                    <label class="d-flex align-items-center pe-none">
+                        Period order
+                    </label>
+
+                    <div>
+                        <select name="select_order"
+                                class="o_input pe-3"
+                                t-on-change="(ev) => this.filterClicked({ optionKey: 'comparison.period_order', optionValue: ev.target.value, reload: true})">
+                            <option t-foreach="availablePeriodOrder"
+                                    t-as="order"
+                                    t-key="order_index"
+                                    t-att-value="order"
+                                    t-att-selected="availablePeriodOrder[order] === periodOrder"
+                                    t-out="availablePeriodOrder[order]"
+                            />
+                        </select>
+                    </div>
+                </div>
+            </t>
+        </Dropdown>
+    </t>
+</templates>
diff --git a/dev_odex30_accounting/odex30_account_reports/static/src/components/account_report/filters/filter_date.xml b/dev_odex30_accounting/odex30_account_reports/static/src/components/account_report/filters/filter_date.xml
new file mode 100644
index 0000000..10e839b
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_reports/static/src/components/account_report/filters/filter_date.xml
@@ -0,0 +1,110 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<templates>
+    <t t-name="odex30_account_reports.AccountReportFilterDateSelection">
+        <t t-foreach="this.dateFilters(controller.options.date.mode)" t-as="dateFilter" t-key="dateFilter_index">
+            <DropdownItem
+                class="{ 'd-flex justify-content-between date_filter': true, 'selected': (this.isPeriodSelected(dateFilter.period)) }"
+                onSelected="() => this.selectDateFilter(dateFilter.period, dateFilter.period != controller.options.date.period_type)"
+                closingMode="'none'"
+            >
+                <div class="filter_name pe-3">
+                    <t t-out="dateFilter.name"/>
+                </div>
+
+                <div class="d-flex justify-content-between">
+                    <button
+                        class="btn_previous_date fa fa-caret-left"
+                        t-on-click="() => this.selectPreviousPeriod(dateFilter.period)"
+                    />
+                    <time class="d-flex justify-content-center time_text">
+                        <t t-out="this.displayPeriod(dateFilter.period)"/>
+                    </time>
+                    <button
+                        class="btn_next_date fa fa-caret-right"
+                        t-on-click="() => this.selectNextPeriod(dateFilter.period)"
+                    />
+                </div>
+            </DropdownItem>
+        </t>
+    </t>
+
+    <t t-name="odex30_account_reports.AccountReportFilterDate">
+        <Dropdown
+            menuClass="'account_report_filter date'"
+        >
+            <button class="btn btn-secondary">
+                <i class="fa fa-calendar me-1"/>
+                <t t-out="controller.options.date.string"/>
+            </button>
+
+            <t t-set-slot="content">
+                <t t-if="controller.options.date.mode === 'single'">
+                    <DropdownItem
+                        class="{ 'selected': controller.options.date.filter === 'today' }"
+                        onSelected="() => this.filterClicked({ optionKey: 'date.filter', optionValue: 'today', reload: true})"
+                        closingMode="'none'"
+                    >
+                        Today
+                    </DropdownItem>
+
+                    <t t-call="odex30_account_reports.AccountReportFilterDateSelection"/>
+
+                    <div id="filter_date_divider_single" class="dropdown-divider"/>
+
+                    <div
+                        class="dropdown-item date d-flex justify-content-between"
+                        t-att-class="{ 'selected': controller.options.date.filter === 'custom' }"
+                        t-on-click="() => this.filterClicked({ optionKey: 'date.filter', optionValue: 'custom'})"
+                    >
+                        <label class="d-flex align-items-center filter_name">
+                            Specific Date
+                        </label>
+
+                        <div
+                            class="d-flex justify-content-center flex-grow-1"
+                            t-att-class="{ 'invisible': controller.options.date.filter !== 'custom' }"
+                        >
+                            <DateTimeInput
+                                type="'date'"
+                                value="dateTo('date')"
+                                onChange="(dateTo) => this.setDateTo('date', dateTo)"
+                            />
+                        </div>
+                    </div>
+                </t>
+
+                <t t-if="controller.options.date.mode === 'range'">
+                    <t t-call="odex30_account_reports.AccountReportFilterDateSelection"/>
+
+                    <div id="filter_date_divider_range" class="dropdown-divider"/>
+
+                    <div
+                        class="dropdown-item date d-flex flex-row justify-space-between"
+                        t-att-class="{ 'selected': controller.options.date.filter === 'custom' }"
+                        t-on-click="() => this.filterClicked({ optionKey: 'date.filter', optionValue: 'custom'})"
+                    >
+                        <label class="d-flex align-items-center">
+                            Custom Dates
+                        </label>
+                        <div class="d-flex flex-row"
+                             t-att-class="{ 'invisible': controller.options.date.filter !== 'custom' }">
+                            <DateTimeInput
+                                type="'date'"
+                                value="dateFrom('date')"
+                                onChange="(dateFrom) => this.setDateFrom('date', dateFrom)"
+                            />
+                            <label class="d-flex align-items-center">
+                                to
+                            </label>
+                            <DateTimeInput
+                                type="'date'"
+                                value="dateTo('date')"
+                                onChange="(dateTo) => this.setDateTo('date', dateTo)"
+                            />
+                        </div>
+                    </div>
+                </t>
+            </t>
+        </Dropdown>
+    </t>
+</templates>
diff --git a/dev_odex30_accounting/odex30_account_reports/static/src/components/account_report/filters/filter_extra_options.xml b/dev_odex30_accounting/odex30_account_reports/static/src/components/account_report/filters/filter_extra_options.xml
new file mode 100644
index 0000000..381c50a
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_reports/static/src/components/account_report/filters/filter_extra_options.xml
@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<templates>
+    <t t-name="odex30_account_reports.AccountReportFilterExtraOptions">
+        <Dropdown>
+            <button class="btn btn-secondary">
+                <i class="fa fa-sliders me-1"/>
+                <t t-if="selectedExtraOptions">
+                    <t t-out="selectedExtraOptions"/>
+                </t>
+                <t t-else="">
+                    Options
+                </t>
+            </button>
+
+            <t t-set-slot="content">
+                <t t-if="controller.groups.account_readonly and controller.filters.show_draft">
+                    <DropdownItem
+                        class="{ 'filter_show_draft_hook': true, 'selected': controller.options.all_entries }"
+                        onSelected="() => this.filterClicked({ optionKey: 'all_entries', reload: true})"
+                        closingMode="'none'"
+                    >
+                        Draft Entries
+                    </DropdownItem>
+                </t>
+
+                <t t-if="controller.groups.account_readonly and controller.filters.show_analytic_groupby">
+                    <DropdownItem
+                        class="{ 'selected': controller.options.include_analytic_without_aml }"
+                        onSelected="() => this.filterClicked({ optionKey: 'include_analytic_without_aml', reload: true})"
+                        closingMode="'none'"
+                    >
+                        Analytic Simulations
+                    </DropdownItem>
+                </t>
+
+                <t t-if="controller.filters.show_hierarchy">
+                    <DropdownItem
+                        class="{ 'selected': controller.options.hierarchy }"
+                        onSelected="() => this.filterClicked({ optionKey: 'hierarchy', reload: true})"
+                        closingMode="'none'"
+                    >
+                        Hierarchy and Subtotals
+                    </DropdownItem>
+                </t>
+
+                <t t-if="controller.filters.show_unreconciled">
+                    <DropdownItem
+                        class="{ 'selected': controller.options.unreconciled }"
+                        onSelected="() => this.filterClicked({ optionKey: 'unreconciled', reload: true})"
+                        closingMode="'none'"
+                    >
+                        Unreconciled Entries
+                    </DropdownItem>
+                </t>
+
+                <t t-if="controller.filters.show_all">
+                    <DropdownItem
+                        class="{ 'filter_show_all_hook': true, 'selected': controller.options.unfold_all }"
+                        onSelected="() => this.filterClicked({ optionKey: 'unfold_all', reload: true})"
+                        closingMode="'none'"
+                    >
+                        Unfold All
+                    </DropdownItem>
+                </t>
+
+                <t t-if="controller.options.integer_rounding">
+                    <DropdownItem
+                        class="{ 'selected': controller.options.integer_rounding_enabled }"
+                        onSelected="() => this.filterClicked({ optionKey: 'integer_rounding_enabled'})"
+                        closingMode="'none'"
+                    >
+                        Integer Rounding
+                    </DropdownItem>
+                </t>
+
+                <div class="dropdown-divider" t-if="hasUIFilter"/>
+
+                <t t-if="controller.filters.show_hide_0_lines !== 'never'">
+                    <DropdownItem
+                        class="{ 'selected': controller.options.hide_0_lines }"
+                        onSelected="() => this.toggleHideZeroLines()"
+                    >
+                        Hide lines at 0
+                    </DropdownItem>
+                </t>
+
+                <t t-if="'horizontal_split' in controller.options">
+                    <DropdownItem
+                        class="{ 'selected': controller.options.horizontal_split }"
+                        onSelected="() => this.toggleHorizontalSplit()"
+                    >
+                        Split Horizontally
+                    </DropdownItem>
+                </t>
+            </t>
+        </Dropdown>
+    </t>
+</templates>
diff --git a/dev_odex30_accounting/odex30_account_reports/static/src/components/account_report/filters/filter_fiscal_position.xml b/dev_odex30_accounting/odex30_account_reports/static/src/components/account_report/filters/filter_fiscal_position.xml
new file mode 100644
index 0000000..2d9c6e8
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_reports/static/src/components/account_report/filters/filter_fiscal_position.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<templates>
+    <t t-name="odex30_account_reports.AccountReportFilterFiscalPosition">
+        <Dropdown>
+            <button class="btn btn-secondary">
+                <i class="fa fa-book me-1"/>Fiscal Position: <t t-esc="selectedFiscalPositionName"/>
+            </button>
+
+            <t t-set-slot="content">
+                <t t-if="controller.groups.account_readonly and controller.options.allow_domestic">
+                    <DropdownItem
+                        class="{ 'selected': controller.options.fiscal_position === 'domestic' }"
+                        onSelected="() => this.filterClicked({ optionKey: 'fiscal_position', optionValue: 'domestic', reload: true})"
+                    >
+                        Domestic
+                    </DropdownItem>
+                </t>
+
+                <t t-if="controller.groups.account_readonly">
+                    <DropdownItem
+                        class="{ 'selected': controller.options.fiscal_position === 'all' }"
+                        onSelected="() => this.filterClicked({ optionKey: 'fiscal_position', optionValue: 'all', reload: true})"
+                    >
+                        All
+                    </DropdownItem>
+                </t>
+
+                <t t-foreach="controller.options.available_vat_fiscal_positions" t-as="fiscalPosition" t-key="fiscalPosition_index">
+                    <t t-if="fiscalPosition_first">
+                        <div class="dropdown-divider"/>
+                    </t>
+
+                    <DropdownItem
+                        class="{ 'selected': controller.options.fiscal_position === fiscalPosition.id }"
+                        onSelected="() => this.filterClicked({ optionKey: 'fiscal_position', optionValue: fiscalPosition.id, reload: true})"
+                    >
+                        <t t-esc="fiscalPosition.name"/>
+                    </DropdownItem>
+                </t>
+            </t>
+        </Dropdown>
+    </t>
+</templates>
diff --git a/dev_odex30_accounting/odex30_account_reports/static/src/components/account_report/filters/filter_horizontal_groups.xml b/dev_odex30_accounting/odex30_account_reports/static/src/components/account_report/filters/filter_horizontal_groups.xml
new file mode 100644
index 0000000..3426cd7
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_reports/static/src/components/account_report/filters/filter_horizontal_groups.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<templates>
+    <t t-name="odex30_account_reports.AccountReportFilterHorizontalGroups">
+        <Dropdown>
+            <button class="btn btn-secondary">
+                <i class="fa fa-filter me-1"/>Horizontal Group: <t t-out="selectedHorizontalGroupName"/>
+            </button>
+
+            <t t-set-slot="content">
+                <DropdownItem
+                    class="{ 'selected': controller.options.selected_horizontal_group_id === null }"
+                    onSelected="() => this.selectHorizontalGroup(null)"
+                    closingMode="'none'"
+                >
+                    None
+                </DropdownItem>
+
+                <t t-foreach="controller.options.available_horizontal_groups" t-as="horizontalGroup" t-key="horizontalGroup_index">
+                    <DropdownItem
+                        class="{ 'selected': controller.options.selected_horizontal_group_id === horizontalGroup.id }"
+                        onSelected="() => this.selectHorizontalGroup(horizontalGroup.id)"
+                        closingMode="'none'"
+                    >
+                        <t t-out="horizontalGroup.name"/>
+                    </DropdownItem>
+                </t>
+            </t>
+        </Dropdown>
+    </t>
+</templates>
diff --git a/dev_odex30_accounting/odex30_account_reports/static/src/components/account_report/filters/filter_journal.xml b/dev_odex30_accounting/odex30_account_reports/static/src/components/account_report/filters/filter_journal.xml
new file mode 100644
index 0000000..3c56f65
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_reports/static/src/components/account_report/filters/filter_journal.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<templates>
+    <t t-name="odex30_account_reports.AccountReportFilterJournal">
+        <Dropdown disabled="!controller.options.journals.length">
+            <button class="btn btn-secondary">
+                <i class="fa fa-book me-1"/><t t-out="controller.options.name_journal_group"/>
+            </button>
+
+            <t t-set-slot="content">
+                <t t-foreach="controller.options.journals" t-as="journal" t-key="journal_index">
+                    <t t-if="journal.id === 'divider'">
+                        <div t-att-class="'d-flex dropdown-header w-100 align-items-center' + (journal.model == 'res.company' ? ' pt-0 ps-0 mx-0 my-1' : '')">
+                            <t t-if="journal.model == 'account.journal.group'">
+                                <t t-out="journal.name"/>
+                            </t>
+                            <t t-if="journal.model == 'res.company'">
+                                <button class="btn btn_foldable d-flex align-items-center w-100 border-0"
+                                        t-on-click="() => this.unfoldCompanyJournals(journal)"
+                                >
+                                    <i t-att-class="journal.unfolded ? 'fa fa-caret-down' : 'fa fa-caret-right'"/>
+                                    <span class="pt-0 mt-0 ps-2 dropdown-header" t-out="journal.name"/>
+                                </button>
+                           </t>
+                        </div>
+
+                    </t>
+                    <t t-elif="['account.journal', 'account.journal.group'].includes(journal.model)">
+                        <DropdownItem
+                            class="{ 'selected': journal.selected, 'ps-4': true, 'd-none': (journal.model == 'account.journal' and !journal.visible) }"
+                            onSelected="() => this.selectJournal(journal)"
+                            closingMode="'none'"
+                            t-out="journal.name"
+                        />
+                    </t>
+                </t>
+            </t>
+        </Dropdown>
+    </t>
+</templates>
diff --git a/dev_odex30_accounting/odex30_account_reports/static/src/components/account_report/filters/filter_partner.xml b/dev_odex30_accounting/odex30_account_reports/static/src/components/account_report/filters/filter_partner.xml
new file mode 100644
index 0000000..7606305
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_reports/static/src/components/account_report/filters/filter_partner.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<templates>
+    <t t-name="odex30_account_reports.AccountReportFilterPartner">
+        <Dropdown
+            menuClass="'account_report_filter partner'"
+        >
+            <button class="btn btn-secondary">
+                <i class="fa fa-folder-open me-1"/>Partners
+            </button>
+
+            <t t-set-slot="content">
+                <div class="dropdown-item gap-2 align-items-center">
+                    <label>Partners</label>
+                    <MultiRecordSelector t-props="getMultiRecordSelectorProps('res.partner', 'partner_ids')" domain="['|', ['parent_id', '=', false], ['is_company', '=', true]]"/>
+                </div>
+
+                <div class="dropdown-item gap-2 align-items-center">
+                    <label>Tags</label>
+                    <MultiRecordSelector t-props="getMultiRecordSelectorProps('res.partner.category', 'partner_categories')"/>
+                </div>
+            </t>
+        </Dropdown>
+    </t>
+</templates>
diff --git a/dev_odex30_accounting/odex30_account_reports/static/src/components/account_report/filters/filter_rounding_unit.xml b/dev_odex30_accounting/odex30_account_reports/static/src/components/account_report/filters/filter_rounding_unit.xml
new file mode 100644
index 0000000..c1fd688
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_reports/static/src/components/account_report/filters/filter_rounding_unit.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<templates>
+    <t t-name="odex30_account_reports.AccountReportFilterRoundingUnit">
+        <Dropdown>
+            <button class="btn btn-secondary">
+                <t t-out="roundingUnitName(this.controller.options['rounding_unit'])"/>
+            </button>
+
+            <t t-set-slot="content">
+                <t t-foreach="controller.options.rounding_unit_names" t-as="roundingUnitValue" t-key="roundingUnitValue_index">
+                    <DropdownItem
+                        class="{ 'selected': (controller.options.rounding_unit == roundingUnitValue) }"
+                        onSelected="() => this.filterRoundingUnit(roundingUnitValue)"
+                    >
+                        <t t-out="roundingUnitName(roundingUnitValue)"/>
+                    </DropdownItem>
+                </t>
+            </t>
+        </Dropdown>
+    </t>
+</templates>
diff --git a/dev_odex30_accounting/odex30_account_reports/static/src/components/account_report/filters/filter_tax_unit.xml b/dev_odex30_accounting/odex30_account_reports/static/src/components/account_report/filters/filter_tax_unit.xml
new file mode 100644
index 0000000..903b22c
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_reports/static/src/components/account_report/filters/filter_tax_unit.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<templates>
+    <t t-name="odex30_account_reports.AccountReportFilterTaxUnit">
+        <Dropdown>
+            <button class="btn btn-secondary">
+                <i class="fa fa-home me-1"/>Tax Unit: <t t-esc="selectedTaxUnitName"/>
+            </button>
+
+            <t t-set-slot="content">
+                <t t-if="controller.groups.account_readonly">
+                    <DropdownItem
+                        class="{ 'selected': controller.options.tax_unit === 'company_only' }"
+                        onSelected="() => this.filterClicked({ optionKey: 'tax_unit', optionValue: 'company_only', reload: true})"
+                    >
+                        Company Only
+                    </DropdownItem>
+                </t>
+
+                <t t-foreach="controller.options.available_tax_units" t-as="taxUnit" t-key="taxUnit_index">
+                    <t t-if="taxUnit_first">
+                        <div class="dropdown-divider"/>
+                    </t>
+
+                    <DropdownItem
+                        class="{ 'selected': controller.options.tax_unit === taxUnit.id }"
+                        onSelected="() => this.filterTaxUnit(taxUnit)"
+                        t-out="taxUnit.name"
+                    />
+                </t>
+            </t>
+        </Dropdown>
+    </t>
+</templates>
diff --git a/dev_odex30_accounting/odex30_account_reports/static/src/components/account_report/filters/filter_variant.xml b/dev_odex30_accounting/odex30_account_reports/static/src/components/account_report/filters/filter_variant.xml
new file mode 100644
index 0000000..6df0b06
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_reports/static/src/components/account_report/filters/filter_variant.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<templates>
+    <t t-name="odex30_account_reports.AccountReportFilterVariant">
+        <Dropdown>
+            <button class="btn btn-secondary">
+                <i class="fa fa-book me-1"/>Report: <t t-esc="selectedVariantName"/>
+            </button>
+
+            <t t-set-slot="content">
+                <t t-foreach="controller.options.available_variants" t-as="variant" t-key="variant_index">
+                    <DropdownItem
+                        class="{ 'selected': controller.options.selected_variant_id === variant.id }"
+                        onSelected="() => this.filterVariant(variant.id)"
+                        t-out="variant.name"
+                    />
+                </t>
+                <t t-if="controller.options.has_inactive_variants">
+                    <div role="separator" class="dropdown-divider"/>
+                    <DropdownItem onSelected="(ev) => controller.reportAction(ev, 'action_view_all_variants', {})">
+                        Enable more ...
+                    </DropdownItem>
+                </t>
+            </t>
+        </Dropdown>
+    </t>
+</templates>
diff --git a/dev_odex30_accounting/odex30_account_reports/static/src/components/account_report/filters/filters.js b/dev_odex30_accounting/odex30_account_reports/static/src/components/account_report/filters/filters.js
new file mode 100644
index 0000000..3d41fa1
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_reports/static/src/components/account_report/filters/filters.js
@@ -0,0 +1,647 @@
+import { _t } from "@web/core/l10n/translation";
+import { status, Component, useState } from "@odoo/owl";
+
+import { useService } from "@web/core/utils/hooks";
+import { WarningDialog } from "@web/core/errors/error_dialogs";
+
+import { DateTimeInput } from '@web/core/datetime/datetime_input';
+import { Dropdown } from "@web/core/dropdown/dropdown";
+import { DropdownItem } from "@web/core/dropdown/dropdown_item";
+import { MultiRecordSelector } from "@web/core/record_selectors/multi_record_selector";
+import { formatDate} from "@web/core/l10n/dates";
+const { DateTime } = luxon;
+
+export class AccountReportFilters extends Component {
+    static template = "odex30_account_reports.AccountReportFilters";
+    static props = {};
+    static components = {
+        DateTimeInput,
+        Dropdown,
+        DropdownItem,
+        MultiRecordSelector,
+    };
+
+    setup() {
+        this.dialog = useService("dialog");
+        this.orm = useService("orm");
+        this.notification = useService("notification");
+        this.companyService = useService("company");
+        this.controller = useState(this.env.controller);
+        if (this.env.controller.options.date) {
+            this.dateFilter = useState(this.initDateFilters());
+        }
+        this.budgetName = useState({
+            value: "",
+            invalid: false,
+        });
+        this.timeout = null;
+    }
+
+    focusInnerInput(index, items) {
+        const selectedItem = items[index];
+        selectedItem.el.querySelector(":scope input")?.focus();
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    // Getters
+    //------------------------------------------------------------------------------------------------------------------
+    get selectedFiscalPositionName() {
+        switch (this.controller.options.fiscal_position) {
+            case "domestic":
+                return _t("Domestic");
+            case "all":
+                return _t("All");
+            default:
+                for (const fiscalPosition of this.controller.options.available_vat_fiscal_positions) {
+                    if (fiscalPosition.id === this.controller.options.fiscal_position) {
+                        return fiscalPosition.name;
+                    }
+                }
+        }
+        return _t("None");
+    }
+
+    get selectedHorizontalGroupName() {
+        for (const horizontalGroup of this.controller.options.available_horizontal_groups) {
+            if (horizontalGroup.id === this.controller.options.selected_horizontal_group_id) {
+                return horizontalGroup.name;
+            }
+        }
+        return _t("None");
+    }
+
+    get isHorizontalGroupSelected() {
+        return this.controller.options.available_horizontal_groups.some((group) => {
+            return group.id === this.controller.options.selected_horizontal_group_id;
+        });
+    }
+
+    get selectedTaxUnitName() {
+        for (const taxUnit of this.controller.options.available_tax_units) {
+            if (taxUnit.id === this.controller.options.tax_unit) {
+                return taxUnit.name;
+            }
+        }
+        return _t("Company Only");
+    }
+
+    get selectedVariantName() {
+        for (const variant of this.controller.options.available_variants) {
+            if (variant.id === this.controller.options.selected_variant_id) {
+                return variant.name;
+            }
+        }
+        return _t("None");
+    }
+
+    get selectedSectionName() {
+        for (const section of this.controller.options.sections)
+            if (section.id === this.controller.options.selected_section_id)
+                return section.name;
+    }
+
+    get selectedAccountType() {
+        let selectedAccountType = this.controller.options.account_type.filter(
+            (accountType) => accountType.selected,
+        );
+        if (
+            !selectedAccountType.length ||
+            selectedAccountType.length === this.controller.options.account_type.length
+        ) {
+            return _t("All");
+        }
+
+        const accountTypeMappings = [
+            { list: ["trade_receivable", "non_trade_receivable"], name: _t("All Receivable") },
+            { list: ["trade_payable", "non_trade_payable"], name: _t("All Payable") },
+            { list: ["trade_receivable", "trade_payable"], name: _t("Trade Partners") },
+            { list: ["non_trade_receivable", "non_trade_payable"], name: _t("Non Trade Partners") },
+        ];
+
+        const listToDisplay = [];
+        for (const mapping of accountTypeMappings) {
+            if (
+                mapping.list.every((accountType) =>
+                    selectedAccountType.map((accountType) => accountType.id).includes(accountType),
+                )
+            ) {
+                listToDisplay.push(mapping.name);
+                // Delete already checked id
+                selectedAccountType = selectedAccountType.filter(
+                    (accountType) => !mapping.list.includes(accountType.id),
+                );
+            }
+        }
+
+        return listToDisplay
+            .concat(selectedAccountType.map((accountType) => accountType.name))
+            .join(", ");
+    }
+
+    get selectedAmlIrFilters() {
+        const selectedFilters = this.controller.options.aml_ir_filters.filter(
+            (irFilter) => irFilter.selected,
+        );
+
+        if (selectedFilters.length === 1) {
+            return selectedFilters[0].name;
+        } else if (selectedFilters.length > 1) {
+            return _t("%s selected", selectedFilters.length);
+        } else {
+            return _t("None");
+        }
+    }
+
+    get availablePeriodOrder() {
+        return { descending: _t("Descending"), ascending: _t("Ascending") };
+    }
+
+    get periodOrder() {
+        return this.controller.options.comparison.period_order === "descending"
+            ? _t("Descending")
+            : _t("Ascending");
+    }
+
+    get selectedExtraOptions() {
+        const selectedExtraOptions = [];
+
+        if (this.controller.groups.account_readonly && this.controller.filters.show_draft) {
+            selectedExtraOptions.push(
+                this.controller.options.all_entries
+                    ? _t("With Draft Entries")
+                    : _t("Posted Entries"),
+            );
+        }
+        if (this.controller.filters.show_unreconciled && this.controller.options.unreconciled) {
+            selectedExtraOptions.push(_t("Unreconciled Entries"));
+        }
+        if (this.controller.options.include_analytic_without_aml) {
+            selectedExtraOptions.push(_t("Including Analytic Simulations"));
+        }
+        return selectedExtraOptions.join(", ");
+    }
+
+    get dropdownProps() {
+        return {
+            shouldFocusChildInput: false,
+            hotkeys: {
+                arrowright: (index, items) => this.focusInnerInput(index, items),
+            },
+        };
+    }
+
+    get periodLabel() {
+        return this.controller.options.comparison.number_period > 1 ? _t("Periods") : _t("Period");
+    }
+    //------------------------------------------------------------------------------------------------------------------
+    // Helpers
+    //------------------------------------------------------------------------------------------------------------------
+    get hasAnalyticGroupbyFilter() {
+        return Boolean(this.controller.groups.analytic_accounting) && (Boolean(this.controller.filters.show_analytic_groupby) || Boolean(this.controller.filters.show_analytic_plan_groupby));
+    }
+
+    get hasCodesFilter() {
+        return Boolean(this.controller.options.sales_report_taxes?.operation_category?.goods);
+    }
+
+    get hasExtraOptionsFilter() {
+        return (
+            "report_cash_basis" in this.controller.options ||
+            this.controller.filters.show_draft ||
+            this.controller.filters.show_all ||
+            this.controller.filters.show_unreconciled ||
+            this.hasUIFilter
+        );
+    }
+
+    get hasUIFilter() {
+        return (
+            this.controller.filters.show_hide_0_lines !== "never" ||
+            "horizontal_split" in this.controller.options
+        );
+    }
+
+    get hasFiscalPositionFilter() {
+        const isMultiCompany = this.controller.options.companies.length > 1;
+        const minimumFiscalPosition = this.controller.options.allow_domestic ? 0 : 1;
+        const hasFiscalPositions =
+            this.controller.options.available_vat_fiscal_positions.length > minimumFiscalPosition;
+        return hasFiscalPositions && isMultiCompany;
+    }
+
+    get isBudgetSelected() {
+        return this.controller.options.budgets?.some((budget) => {
+            return budget.selected;
+        });
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    // Dates
+    //------------------------------------------------------------------------------------------------------------------
+    // Getters
+    dateFrom(optionKey) {
+        return DateTime.fromISO(this.controller.options[optionKey].date_from);
+    }
+
+    dateTo(optionKey) {
+        return DateTime.fromISO(this.controller.options[optionKey].date_to);
+    }
+
+    // Setters
+    setDate(optionKey, type, date) {
+        if (date) {
+            this.controller.options[optionKey][`date_${type}`] = date;
+            this.applyFilters(optionKey);
+        }
+        else {
+            this.dialog.add(WarningDialog, {
+                title: _t("Odoo Warning"),
+                message: _t("Date cannot be empty"),
+            });
+        }
+    }
+
+    setDateFrom(optionKey, dateFrom) {
+        this.setDate(optionKey, 'from', dateFrom);
+    }
+
+    setDateTo(optionKey, dateTo) {
+        this.setDate(optionKey, 'to', dateTo);
+    }
+
+    dateFilters(mode) {
+        switch (mode) {
+            case "single":
+                return [
+                    {"name": _t("End of Month"), "period": "month"},
+                    {"name": _t("End of Quarter"), "period": "quarter"},
+                    {"name": _t("End of Year"), "period": "year"},
+                ];
+            case "range":
+                return [
+                    {"name": _t("Month"), "period": "month"},
+                    {"name": _t("Quarter"), "period": "quarter"},
+                    {"name": _t("Year"), "period": "year"},
+                ];
+            default:
+                throw new Error(`Invalid mode in dateFilters(): ${ mode }`);
+        }
+    }
+
+    initDateFilters() {
+        const filters = {
+            "month": 0,
+            "quarter": 0,
+            "year": 0,
+            "tax_period": 0
+        };
+
+        const specifier = this.controller.options.date.filter.split('_')[0];
+        const periodType = this.controller.options.date.period_type;
+        // In case the period is fiscalyear it will be computed exactly like a year period.
+        const period = periodType === "fiscalyear" ? "year" : periodType;
+        // Set the filter value based on the specifier
+        filters[period] = this.controller.options.date.period || (specifier === 'previous' ? -1 : specifier === 'next' ? 1 : 0);
+
+        return filters;
+    }
+
+    getDateFilter(periodType) {
+        if (this.dateFilter[periodType] > 0) {
+            return `next_${periodType}`;
+        } else if (this.dateFilter[periodType] === 0) {
+            return `this_${periodType}`;
+        } else {
+            return `previous_${periodType}`;
+        }
+    }
+
+    selectDateFilter(periodType, reload = false) {
+        this.filterClicked({ optionKey: "date.filter", optionValue: this.getDateFilter(periodType)});
+        this.filterClicked({ optionKey: "date.period", optionValue: this.dateFilter[periodType], reload: reload});
+    }
+
+    selectPreviousPeriod(periodType) {
+        this._changePeriod(periodType, -1);
+    }
+
+    selectNextPeriod(periodType) {
+        this._changePeriod(periodType, 1);
+    }
+
+    _changePeriod(periodType, increment) {
+        this.dateFilter[periodType] = this.dateFilter[periodType] + increment;
+
+        this.controller.updateOption("date.filter", this.getDateFilter(periodType));
+        this.controller.updateOption("date.period", this.dateFilter[periodType]);
+
+        this.applyFilters("date.period");
+    }
+
+    isPeriodSelected(periodType) {
+        return this.controller.options.date.filter.includes(periodType)
+    }
+
+    displayPeriod(periodType) {
+        const dateTo = DateTime.now();
+
+        switch (periodType) {
+            case "month":
+                return this._displayMonth(dateTo);
+            case "quarter":
+                return this._displayQuarter(dateTo);
+            case "year":
+                return this._displayYear(dateTo);
+            case "tax_period":
+                return this._displayTaxPeriod(dateTo);
+            default:
+                throw new Error(`Invalid period type in displayPeriod(): ${ periodType }`);
+        }
+    }
+
+    _displayMonth(dateTo) {
+        return dateTo.plus({ months: this.dateFilter.month }).toFormat("MMMM yyyy");
+    }
+
+    _displayQuarter(dateTo) {
+        const quarterMonths = {
+            1: { 'start': 1, 'end': 3 },
+            2: { 'start': 4, 'end': 6 },
+            3: { 'start': 7, 'end': 9 },
+            4: { 'start': 10, 'end': 12 },
+        }
+
+        dateTo = dateTo.plus({ months: this.dateFilter.quarter * 3 });
+
+        const quarterDateFrom = DateTime.utc(dateTo.year, quarterMonths[dateTo.quarter]['start'], 1)
+        const quarterDateTo = DateTime.utc(dateTo.year, quarterMonths[dateTo.quarter]['end'], 1)
+
+        return `${ formatDate(quarterDateFrom, {format: "MMM"}) } - ${ formatDate(quarterDateTo, {format: "MMM yyyy"}) }`;
+    }
+
+    _displayYear(dateTo) {
+        return dateTo.plus({ years: this.dateFilter.year }).toFormat("yyyy");
+    }
+
+    _displayTaxPeriod(dateTo) {
+        const periodicitySettings = this.controller.options.tax_periodicity;
+        const targetDateInPeriod = dateTo.plus({months: periodicitySettings.months_per_period * this.dateFilter['tax_period']})
+        const [start, end] = this._computeTaxPeriodDates(periodicitySettings, targetDateInPeriod);
+
+        if (periodicitySettings.start_month == 1 && periodicitySettings.start_day == 1) {
+            switch (periodicitySettings.months_per_period) {
+                case 1: return end.toFormat("MMMM yyyy");
+                case 3: return `Q${end.quarter} ${dateTo.year}`;
+                case 12: return end.toFormat("yyyy");
+            }
+        }
+
+        return formatDate(start) + ' - ' + formatDate(end);
+    }
+
+    _computeTaxPeriodDates(periodicitySettings, dateInsideTargettesPeriod) {
+
+        const startMonth = periodicitySettings.start_month;
+        const startDay = periodicitySettings.start_day
+        const monthsPerPeriod = periodicitySettings.months_per_period;
+        const aligned_date = dateInsideTargettesPeriod.minus({days: startDay - 1}) 
+        let year = aligned_date.year;
+        const monthOffset = aligned_date.month - startMonth;
+
+        let periodNumber = Math.floor(monthOffset / monthsPerPeriod) + 1;
+
+        if (dateInsideTargettesPeriod < DateTime.now().set({year: year, month: startMonth, day: startDay})) {
+            year -= 1;
+            periodNumber = Math.floor((12 + monthOffset) / monthsPerPeriod) + 1;
+        }
+
+        let deltaMonth = periodNumber * monthsPerPeriod;
+
+        const endDate = DateTime.utc(year, startMonth, 1).plus({ months: deltaMonth, days: startDay-2})
+        const startDate = DateTime.utc(year, startMonth, 1).plus({ months: deltaMonth-monthsPerPeriod }).set({ day: startDay})
+        return [startDate, endDate];
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    // Number of periods
+    //------------------------------------------------------------------------------------------------------------------
+    setNumberPeriods(ev) {
+        const numberPeriods = ev.target.value;
+
+        if (numberPeriods >= 1)
+            this.controller.options.comparison.number_period = parseInt(numberPeriods);
+        else
+            this.dialog.add(WarningDialog, {
+                title: _t("Odoo Warning"),
+                message: _t("Number of periods cannot be smaller than 1"),
+            });
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    // Records
+    //------------------------------------------------------------------------------------------------------------------
+    getMultiRecordSelectorProps(resModel, optionKey) {
+        return {
+            resModel,
+            resIds: this.controller.options[optionKey],
+            update: (resIds) => {
+                this.filterClicked({ optionKey: optionKey, optionValue: resIds, reload: true});
+            },
+        };
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    // Rounding unit
+    //------------------------------------------------------------------------------------------------------------------
+    roundingUnitName(roundingUnit) {
+        return _t("In %s", this.controller.options["rounding_unit_names"][roundingUnit][0]);
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    // Generic filters
+    //------------------------------------------------------------------------------------------------------------------
+    async filterClicked({ optionKey, optionValue = undefined, reload = false}) {
+        if (optionValue !== undefined) {
+            await this.controller.updateOption(optionKey, optionValue);
+        } else {
+            await this.controller.toggleOption(optionKey);
+        }
+
+        if (reload) {
+            await this.applyFilters(optionKey);
+        }
+    }
+
+    async applyFilters(optionKey = null, delay = 500) {
+        // We only call the reload after the delay is finished, to avoid doing 5 calls if you want to click on 5 journals
+        if (this.timeout) {
+            clearTimeout(this.timeout);
+        }
+
+        this.controller.incrementCallNumber();
+
+        this.timeout = setTimeout(async () => {
+            if (status(this) !== "destroyed") 
+                await this.controller.reload(optionKey, this.controller.options);
+        }, delay);
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    // Custom filters
+    //------------------------------------------------------------------------------------------------------------------
+    selectJournal(journal) {
+        if (journal.model === "account.journal.group") {
+            const wasSelected = journal.selected;
+            this.ToggleSelectedJournal(journal);
+            this.controller.options.__journal_group_action = {
+                action: wasSelected ? "remove" : "add",
+                id: parseInt(journal.id),
+            };
+            // Toggle the selected status after the action is set
+            journal.selected = !wasSelected;
+        } else {
+            journal.selected = !journal.selected;
+        }
+        this.applyFilters("journals");
+    }
+
+    ToggleSelectedJournal(selectedJournal) {
+        if (selectedJournal.selected) {
+            this.controller.options.journals.forEach((journal) => {
+                journal.selected = false;
+            });
+        } else {
+            this.controller.options.journals.forEach((journal) => {
+                journal.selected = selectedJournal.journals.includes(journal.id) && journal.model === "account.journal";
+            });
+        }
+    }
+
+    unfoldCompanyJournals(selectedCompany) {
+        let inSelectedCompanySection = false;
+        for (const journal of this.controller.options.journals) {
+            if (journal.id === "divider" && journal.model === "res.company") {
+                if (journal.name === selectedCompany.name) {
+                    journal.unfolded = !journal.unfolded;
+                    inSelectedCompanySection = true;
+                } else if (inSelectedCompanySection) {
+                    break;  // Reached another company divider, exit the loop
+                }
+            }
+            if (inSelectedCompanySection && journal.model === "account.journal") {
+                journal.visible = !journal.visible;
+            }
+        }
+    }
+
+    async filterVariant(reportId) {
+        this.controller.saveSessionOptions({
+            ...this.controller.options,
+            selected_variant_id: reportId,
+            sections_source_id: reportId,
+        });
+        const cacheKey = this.controller.getCacheKey(reportId, reportId);
+        // if the variant hasn't been loaded yet, set up the call number
+        if (!(cacheKey in this.controller.loadingCallNumberByCacheKey)) {
+            this.controller.incrementCallNumber(cacheKey);
+        }
+        await this.controller.displayReport(reportId);
+    }
+
+    async filterTaxUnit(taxUnit) {
+        await this.filterClicked({ optionKey: "tax_unit", optionValue: taxUnit.id});
+        this.controller.saveSessionOptions(this.controller.options);
+
+        // force the company to those impacted by the tax units, the reload will be force by this function
+        this.companyService.setCompanies(taxUnit.company_ids);
+    }
+
+    async toggleHideZeroLines() {
+        // Avoid calling the database when this filter is toggled; as the exact same lines would be returned; just reassign visibility.
+        await this.controller.toggleOption("hide_0_lines", false);
+
+        this.controller.saveSessionOptions(this.controller.options);
+        this.controller.setLineVisibility(this.controller.lines);
+    }
+
+    async toggleHorizontalSplit() {
+        await this.controller.toggleOption("horizontal_split", false);
+        this.controller.saveSessionOptions(this.controller.options);
+    }
+
+    async filterRoundingUnit(rounding) {
+        await this.controller.updateOption('rounding_unit', rounding, false);
+
+        this.controller.saveSessionOptions(this.controller.options);
+
+        this.controller.lines = await this.controller.orm.call(
+            "account.report",
+            "dispatch_report_action",
+            [
+                this.controller.options.report_id,
+                this.controller.options,
+                "format_column_values_from_client",
+                this.controller.lines,
+            ],
+            {
+                context: this.controller.context,
+            }
+        );
+    }
+
+    async selectHorizontalGroup(horizontalGroupId) {
+        if (horizontalGroupId === this.controller.options.selected_horizontal_group_id) {
+            return;
+        }
+
+        if (this.isBudgetSelected) {
+            this.notification.add(
+                _t("It's not possible to select a budget with the horizontal group feature."),
+                {
+                    type: "warning",
+                }
+            );
+            return;
+        }
+        await this.filterClicked({ optionKey: "selected_horizontal_group_id", optionValue: horizontalGroupId, reload: true});
+    }
+
+    selectBudget(budget) {
+        if (this.isHorizontalGroupSelected) {
+            this.notification.add(
+                _t("It's not possible to select a horizontal group with the budget feature."),
+                {
+                    type: "warning",
+                }
+            );
+            return;
+        }
+        budget.selected = !budget.selected;
+        this.applyFilters( 'budgets')
+    }
+
+    async createBudget() {
+        const budgetName = this.budgetName.value.trim();
+        if (!budgetName.length) {
+            this.budgetName.invalid = true;
+            this.notification.add(_t("Please enter a valid budget name."), {
+                type: "danger",
+            });
+            return;
+        }
+        const createdId = await this.orm.call("account.report.budget", "create", [
+            { name: budgetName },
+        ]);
+        this.budgetName.value = "";
+        this.budgetName.invalid = false;
+        const options = this.controller.options;
+        this.controller.reload("budgets", {
+            ...options,
+            budgets: [
+                ...options.budgets,
+                // Selected by default if we don't have any horizontal group selected
+                { id: createdId, selected: !this.isHorizontalGroupSelected },
+            ],
+        });
+    }
+}
diff --git a/dev_odex30_accounting/odex30_account_reports/static/src/components/account_report/filters/filters.scss b/dev_odex30_accounting/odex30_account_reports/static/src/components/account_report/filters/filters.scss
new file mode 100644
index 0000000..fdd682a
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_reports/static/src/components/account_report/filters/filters.scss
@@ -0,0 +1,98 @@
+.account_report_filter {
+    &.date {
+        .date_filter:hover .btn_previous_date,
+        .date_filter:hover .btn_next_date:not(:disabled) {
+            color: $o-gray-600;
+        }
+        .filter_name {
+            min-width: 10ch;
+        }
+        .time_text { width: 120px }
+        .btn_previous_date, .btn_next_date {
+            background: inherit;
+            border: none;
+            padding: 0;
+            width: 20px;
+            height: 20px;
+            color: $o-gray-300;
+        }
+        .dropdown-item.focus {
+            background: transparent;
+            &:hover { background: rgba(0, 0, 0, 0.08) }
+        }
+    }
+
+    &.date, &.comparison {
+        .dropdown-item.date {
+            display: flex;
+            justify-content: space-between;
+
+            .o_datetime_input {
+                display: inline;
+                width: 10ch;
+                margin: 0 8px;
+                text-align: center;
+            }
+        }
+    }
+
+    &.comparison, &.intervals {
+        .dropdown-item.period, .dropdown-item.interval {
+            display: flex;
+            justify-content: space-between;
+
+            &.order:hover {
+                background-color: unset;
+                color: unset;
+                cursor: default;
+            }
+
+            input[type=number] {
+                display: inline;
+                width: 86px;
+                margin: 0 8px;
+                border-top: none;
+                border-left: none;
+                border-right: none;
+                border-bottom: 1px solid var(--o-input-border-color);
+                text-align: center;
+                background-color: inherit;
+            }
+        }
+
+        .dropdown-item.date {
+            .o_datetime_input {
+                display: inline;
+                width: 86px;
+                margin: 0 8px;
+                padding: 0 4px;
+                text-align: center;
+            }
+        }
+
+        .dropdown-item.link {
+            cursor: default;
+
+            &.focus, &.selected:hover, &.selected:focus { background-color: inherit; }
+        }
+    }
+
+    &.analytic, &.analytic_groupby, &.partner {
+        .dropdown {
+            display: inherit;
+        }
+        .dropdown-item {
+            display: flex;
+            label { width: 60px }
+        }
+        .dropdown-item.focus, .dropdown-item.selected:hover, .dropdown-item.selected:focus { background-color: inherit; }
+        .o_input_dropdown { width: 100% }
+        .o_field_tags {
+            margin-left: 8px;
+            flex-direction: column;
+            flex-grow: 9;
+
+            .o_tag { width: fit-content }
+        }
+    }
+}
diff --git a/dev_odex30_accounting/odex30_account_reports/static/src/components/account_report/filters/filters.xml b/dev_odex30_accounting/odex30_account_reports/static/src/components/account_report/filters/filters.xml
new file mode 100644
index 0000000..ae89f06
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_reports/static/src/components/account_report/filters/filters.xml
@@ -0,0 +1,121 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<templates>
+    <t t-name="odex30_account_reports.AccountReportFilters">
+        <t t-call="{{ env.template('AccountReportFilters') }}"/>
+    </t>
+
+    <t t-name="odex30_account_reports.AccountReportFiltersCustomizable">
+        <!-- Date filter -->
+        <t t-if="'date' in controller.options">
+            <div id="filter_date" class="filter_date">
+                <t t-call="odex30_account_reports.AccountReportFilterDate"/>
+            </div>
+        </t>
+
+        <!-- Comparison filter -->
+        <t t-if="controller.filters.show_period_comparison">
+            <div id="filter_comparison" class="filter_comparison">
+                <t t-call="odex30_account_reports.AccountReportFilterComparison"/>
+            </div>
+        </t>
+
+        <!-- Journal filter -->
+        <t t-if="'journals' in controller.options">
+            <div id="filter_journal">
+                <t t-call="odex30_account_reports.AccountReportFilterJournal"/>
+            </div>
+        </t>
+
+        <!-- Account type filter -->
+        <t t-if="'account_type' in controller.options">
+            <div id="filter_account_type">
+                <t t-call="odex30_account_reports.AccountReportFilterAccountType"/>
+            </div>
+        </t>
+
+        <!-- Analytic filter -->
+        <t t-if="controller.groups.analytic_accounting and controller.filters.show_analytic">
+            <div id="filter_analytic" class="filter_analytic">
+                <t t-call="odex30_account_reports.AccountReportFilterAnalytic"/>
+            </div>
+        </t>
+
+        <!-- Analytic groupby filter -->
+        <t t-if="hasAnalyticGroupbyFilter">
+            <div id="filter_analytic_groupby" class="filter_analytic_groupby">
+                <t t-call="odex30_account_reports.AccountReportFilterAnalyticGroupby"/>
+            </div>
+        </t>
+
+        <!-- Horizontal groups filter -->
+        <t t-if="controller.options.available_horizontal_groups.length > 0">
+            <div id="filter_horizontal_groups">
+                <t t-call="odex30_account_reports.AccountReportFilterHorizontalGroups"/>
+            </div>
+        </t>
+
+        <!-- Partner filter -->
+        <t t-if="'partner' in controller.options">
+            <div id="filter_partner" class="filter_partner">
+                <t t-call="odex30_account_reports.AccountReportFilterPartner"/>
+            </div>
+        </t>
+
+        <!-- Extra options filter -->
+        <t t-if="hasExtraOptionsFilter">
+            <div id="filter_extra_options">
+                <t t-call="odex30_account_reports.AccountReportFilterExtraOptions"/>
+            </div>
+        </t>
+
+        <!-- Variant filter -->
+        <t t-if="controller.options.available_variants.length > 1">
+            <div id="filter_variant">
+                <t t-call="odex30_account_reports.AccountReportFilterVariant"/>
+            </div>
+        </t>
+
+        <!-- Tax unit filter -->
+        <t t-if="'available_tax_units' in this.controller.options and controller.options.available_tax_units.length > 0">
+            <div id="filter_tax_unit">
+                <t t-call="odex30_account_reports.AccountReportFilterTaxUnit"/>
+            </div>
+        </t>
+
+        <!-- Fiscal position filter -->
+        <t t-if="hasFiscalPositionFilter">
+            <div id="filter_fiscal_position">
+                <t t-call="odex30_account_reports.AccountReportFilterFiscalPosition"/>
+            </div>
+        </t>
+
+        <!-- Budget filter -->
+        <t t-if="'budgets' in controller.options">
+            <div id="filter_budget">
+                <t t-call="odex30_account_reports.AccountReportFilterBudget"/>
+            </div>
+        </t>
+
+        <!-- User defined filter on journal items -->
+        <t t-if="'aml_ir_filters' in controller.options and controller.options.aml_ir_filters.length > 0">
+            <div id="filter_aml_ir_filters">
+                <t t-call="odex30_account_reports.AccountReportAmlIrFilters"/>
+            </div>
+        </t>
+
+        <div id="filter_rounding_unit">
+            <t t-call="odex30_account_reports.AccountReportFilterRoundingUnit"/>
+        </div>
+
+        <t t-if="env.debug">
+            <div id="filter_configuration" class="o-dropdown dropdown o-dropdown--no-caret">
+                <button
+                    class="btn btn-secondary"
+                    t-on-click="(ev) => this.controller.reportAction(ev, 'action_open_report_form', {}, true)"
+                >
+                    <i class="fa fa-cogs me-1"/>
+                </button>
+            </div>
+        </t>
+    </t>
+</templates>
diff --git a/dev_odex30_accounting/odex30_account_reports/static/src/components/account_report/header/header.js b/dev_odex30_accounting/odex30_account_reports/static/src/components/account_report/header/header.js
new file mode 100644
index 0000000..d5273fc
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_reports/static/src/components/account_report/header/header.js
@@ -0,0 +1,118 @@
+/** @odoo-module */
+
+import { Dropdown } from "@web/core/dropdown/dropdown";
+import { DropdownItem } from "@web/core/dropdown/dropdown_item";
+import { useService } from "@web/core/utils/hooks"
+
+import { Component, useState } from "@odoo/owl";
+
+export class AccountReportHeader extends Component {
+    static template = "odex30_account_reports.AccountReportHeader";
+    static props = {};
+    static components = {
+        Dropdown,
+        DropdownItem,
+    }
+
+    setup() {
+        this.orm = useService("orm");
+        this.controller = useState(this.env.controller);
+    }
+    // -----------------------------------------------------------------------------------------------------------------
+    // Headers
+    // -----------------------------------------------------------------------------------------------------------------
+    get columnHeaders() {
+        let columnHeaders = [];
+
+        this.controller.options.column_headers.forEach((columnHeader, columnHeaderIndex) => {
+            let columnHeadersRow = [];
+
+            for (let i = 0; i < this.controller.columnHeadersRenderData.level_repetitions[columnHeaderIndex]; i++) {
+                columnHeadersRow = [ ...columnHeadersRow, ...columnHeader];
+            }
+
+            columnHeaders.push(columnHeadersRow);
+        });
+
+        return columnHeaders;
+    }
+
+    columnHeadersColspan(column_index, header, compactOffset = 0) {
+        let colspan = header.colspan || this.controller.columnHeadersRenderData.level_colspan[column_index]
+        // In case of we need the total column for horizontal we need to increase the colspan of the first row
+        if(this.controller.options.show_horizontal_group_total && column_index === 0) {
+           colspan += 1;
+        }
+        return colspan;
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    // Subheaders
+    //------------------------------------------------------------------------------------------------------------------
+    get subheaders() {
+        const columns = JSON.parse(JSON.stringify(this.controller.options.columns));
+        const columnsPerGroupKey = {};
+
+        columns.forEach((column) => {
+            columnsPerGroupKey[`${column.column_group_key}_${column.expression_label}`] = column;
+        });
+
+        return this.controller.lines[0].columns.map((column) => {
+            if (columnsPerGroupKey[`${column.column_group_key}_${column.expression_label}`]) {
+                return columnsPerGroupKey[`${column.column_group_key}_${column.expression_label}`];
+            } else {
+                return {
+                    expression_label: "",
+                    sortable: false,
+                    name: "",
+                    colspan: 1,
+                };
+            }
+        });
+    }
+
+    // -----------------------------------------------------------------------------------------------------------------
+    // Custom subheaders
+    // -----------------------------------------------------------------------------------------------------------------
+    get customSubheaders() {
+        let customSubheaders = [];
+
+        this.controller.columnHeadersRenderData.custom_subheaders.forEach(customSubheader => {
+            customSubheaders.push(customSubheader);
+        });
+
+        return customSubheaders;
+    }
+
+    // -----------------------------------------------------------------------------------------------------------------
+    // Sortable
+    // -----------------------------------------------------------------------------------------------------------------
+    sortableClasses(columIndex) {
+        switch (this.controller.linesCurrentOrderByColumn(columIndex)) {
+            case "ASC":
+                return "fa fa-long-arrow-up";
+            case "DESC":
+                return "fa fa-long-arrow-down";
+            default:
+                return "fa fa-arrows-v";
+        }
+    }
+
+    async sortLinesByColumn(columnIndex, column) {
+        if (column.sortable) {
+            switch (this.controller.linesCurrentOrderByColumn(columnIndex)) {
+                case "default":
+                    await this.controller.sortLinesByColumnAsc(columnIndex);
+                    break;
+                case "ASC":
+                    await this.controller.sortLinesByColumnDesc(columnIndex);
+                    break;
+                case "DESC":
+                    this.controller.sortLinesByDefault();
+                    break;
+                default:
+                    throw new Error(`Invalid value: ${ this.controller.linesCurrentOrderByColumn(columnIndex) }`);
+            }
+        }
+    }
+}
diff --git a/dev_odex30_accounting/odex30_account_reports/static/src/components/account_report/header/header.xml b/dev_odex30_accounting/odex30_account_reports/static/src/components/account_report/header/header.xml
new file mode 100644
index 0000000..2b4860d
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_reports/static/src/components/account_report/header/header.xml
@@ -0,0 +1,128 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<templates>
+    <t t-name="odex30_account_reports.AccountReportHeader">
+        <t t-call="{{ env.template('AccountReportHeader') }}"/>
+    </t>
+
+    <t t-name="odex30_account_reports.AccountReportHeaderCustomizable">
+        <thead id="table_header" class="sticky">
+            <!-- Headers -->
+            <t t-foreach="columnHeaders" t-as="columnHeader" t-key="columnHeader_index">
+                <tr data-id="column_headers_row">
+                    <!-- First empty column -->
+                    <th>
+                        <t t-if="columnHeader_first and controller.options.companies.length > 1">
+                            <span class="companies_header" t-out="controller.options.companies.map(company => company.name).join(', ')"/>
+                        </t>
+                    </th>
+
+                    <!-- Other columns -->
+                    <t t-foreach="columnHeader" t-as="header" t-key="header_index">
+                        <th
+                            class="column_header"
+                            t-att-colspan="this.columnHeadersColspan(columnHeader_index, header)"
+                        >
+                            <t t-out="header.name"/>
+                        </th>
+                    </t>
+
+                    <t t-if="controller.options.show_horizontal_group_total">
+                        <t t-if="!columnHeader_first">
+                            <th class="column_header">
+                                <t t-out="controller.options.available_horizontal_groups.find(group => group.id === controller.options.selected_horizontal_group_id)?.name"/>
+                            </th>
+                        </t>
+                    </t>
+
+                    <!-- Growth comparison column -->
+                    <t t-if="controller.needsColumnPercentComparison">
+                        <!-- We only want to display it once on the first row -->
+                        <t t-if="columnHeader_first">
+                            <th class="column_percent_comparison_header">
+                                <i class="fa fa-percent"/>
+                            </th>
+                        </t>
+                    </t>
+
+                    <!-- Debug column -->
+                    <t t-if="controller.hasDebugColumn">
+                        <!-- We only want to display it once on the first row -->
+                        <t t-if="columnHeader_first">
+                            <th class="debug_header">
+                                <i class="fa fa-bug"/>
+                            </th>
+                        </t>
+                    </t>
+                </tr>
+            </t>
+
+            <!-- Custom subheaders -->
+            <t t-if="controller.hasCustomSubheaders">
+                <tr data-id="column_custom_subheaders_row">
+                    <!-- First empty column -->
+                    <th/>
+
+                    <!-- Other columns -->
+                    <t t-foreach="customSubheaders" t-as="customSubheader" t-key="customSubheader_index">
+                        <th
+                            t-att-colspan="customSubheader.colspan || 1"
+                            t-att-data-expression_label="customSubheader.expression_label"
+                        >
+                            <t t-out="customSubheader.name"/>
+                        </th>
+                    </t>
+
+                    <!-- Debug column -->
+                    <t t-if="controller.hasDebugColumn">
+                        <!-- Empty to prevent a gap beneath the debug label -->
+                        <th/>
+                    </t>
+                </tr>
+            </t>
+
+            <!-- Subheaders -->
+            <tr data-id="column_subheaders_row">
+                <!-- First empty column -->
+                <th/>
+
+                <!-- Other columns -->
+                <t t-foreach="subheaders" t-as="subheader" t-key="subheader_index">
+                    <th
+                        t-att-colspan="subheader.colspan || 1"
+                        t-att-data-expression_label="subheader.expression_label"
+                    >
+                        <!-- Sortable -->
+                        <t t-if="subheader.sortable">
+                            <button
+                                class="btn btn_sortable"
+                                t-on-click="() => this.sortLinesByColumn(subheader_index, subheader)"
+                            >
+                                <i t-att-class="sortableClasses(subheader_index)"/>
+                            </button>
+                        </t>
+
+                        <t t-if="subheader.template">
+                            <t t-call="{{ subheader.template }}"/>
+                        </t>
+                        <t t-else="">
+                            <t t-out="subheader.name"/>
+                        </t>
+                    </th>
+                </t>
+
+                <!-- Debug column -->
+                <t t-if="controller.hasDebugColumn">
+                    <!-- Empty to prevent a gap beneath the debug label -->
+                    <th/>
+                </t>
+
+                <t t-if="controller.options.show_horizontal_group_total">
+                    <th>
+                        <!-- Since we have only one column possible with horizontal group totals taking the first element is ok -->
+                        <t t-out="subheaders[0].name"/>
+                    </th>
+                </t>
+            </tr>
+        </thead>
+    </t>
+</templates>
diff --git a/dev_odex30_accounting/odex30_account_reports/static/src/components/account_report/line/line.js b/dev_odex30_accounting/odex30_account_reports/static/src/components/account_report/line/line.js
new file mode 100644
index 0000000..c42fdbd
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_reports/static/src/components/account_report/line/line.js
@@ -0,0 +1,143 @@
+/** @odoo-module */
+
+import { localization } from "@web/core/l10n/localization";
+
+import { useService } from "@web/core/utils/hooks";
+import { Component, useState } from "@odoo/owl";
+
+import { AccountReportDebugPopover } from "@odex30_account_reports/components/account_report/line/popover/debug_popover";
+import { AccountReportLineCellEditable } from "@odex30_account_reports/components/account_report/line_cell_editable/line_cell_editable";
+
+export class AccountReportLine extends Component {
+    static template = "odex30_account_reports.AccountReportLine";
+    static props = {
+        lineIndex: Number,
+        line: Object,
+    };
+    static components = {
+        AccountReportLineCellEditable,
+    };
+
+    setup() {
+        this.popover = useService("popover");
+        this.controller = useState(this.env.controller);
+    }
+
+    // -----------------------------------------------------------------------------------------------------------------
+    // Line
+    // -----------------------------------------------------------------------------------------------------------------
+    get lineClasses() {
+        let classes = ('level' in this.props.line) ? `line_level_${this.props.line.level}` : 'line_level_default';
+
+        if (!this.props.line.visible || this.isHiddenBySearchFilter())
+            classes += " d-none";
+
+        if (this.props.line.unfolded && this.hasVisibleChild())
+            classes += " unfolded";
+
+        if (this.controller.isTotalLine(this.props.lineIndex))
+            classes += " total";
+
+        if (this.props.line.class)
+            classes += ` ${this.props.line.class}`;
+
+        return classes;
+    }
+
+    hasVisibleChild() {
+        let nextLineIndex = this.props.lineIndex + 1;
+
+        while (this.controller.isNextLineChild(nextLineIndex, this.props.line['id'])) {
+            if (this.controller.lines[nextLineIndex].visible && !this.isHiddenBySearchFilter(this.controller.lines[nextLineIndex].id))
+                return true;
+
+            nextLineIndex += 1;
+        }
+        return false;
+    }
+
+    // -----------------------------------------------------------------------------------------------------------------
+    // Growth comparison
+    // -----------------------------------------------------------------------------------------------------------------
+    get growthComparisonClasses() {
+        let classes = "text-end";
+
+        switch(this.props.line.column_percent_comparison_data.mode) {
+            case "green":
+                classes += " text-success";
+                break;
+            case "muted":
+                classes += " muted";
+                break;
+            case "red":
+                classes += " text-danger";
+                break;
+        }
+
+        return classes;
+    }
+
+    // -----------------------------------------------------------------------------------------------------------------
+    // Total Horizontal Group
+    // -----------------------------------------------------------------------------------------------------------------
+    get HorizontalGroupTotalClasses() {
+        let classes = "text-end";
+        switch(Math.sign(this.props.line.horizontal_group_total_data?.no_format)) {
+            case 1:
+                break;
+            case 0:
+                classes += " muted";
+                break;
+            case -1:
+                classes += " text-danger";
+                break;
+        }
+
+        return classes;
+    }
+
+
+    //------------------------------------------------------------------------------------------------------------------
+    // Search
+    //------------------------------------------------------------------------------------------------------------------
+    isHiddenBySearchFilter(lineId = null) {
+        // If no lineId is provided, this will execute on the current line object
+        // Otherwise, it will execute on the given lineId
+        lineId ||= this.props.line.id;
+
+        if (!("lines_searched" in this.controller))
+            return false;
+
+        for (let searchLineId of this.controller.lines_searched)
+            if (this.controller.isLineRelatedTo(searchLineId, lineId) || lineId === searchLineId)
+                return false;
+
+        return true;
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    // Debug popover
+    //------------------------------------------------------------------------------------------------------------------
+    showDebugPopover(ev) {
+        const close = () => {
+            this.popoverCloseFn();
+            this.popoverCloseFn = null;
+        }
+
+        if (this.popoverCloseFn)
+            close();
+
+        this.popoverCloseFn = this.popover.add(
+            ev.currentTarget,
+            AccountReportDebugPopover,
+            {
+                expressionsDetail: JSON.parse(this.props.line.debug_popup_data).expressions_detail,
+                onClose: close,
+            },
+            {
+                closeOnClickAway: true,
+                position: localization.direction === "rtl" ? "left" : "right",
+            },
+        );
+    }
+}
diff --git a/dev_odex30_accounting/odex30_account_reports/static/src/components/account_report/line/line.xml b/dev_odex30_accounting/odex30_account_reports/static/src/components/account_report/line/line.xml
new file mode 100644
index 0000000..10933d2
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_reports/static/src/components/account_report/line/line.xml
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<templates>
+    <t t-name="odex30_account_reports.AccountReportLine">
+        <t t-call="{{ env.template('AccountReportLine') }}"/>
+    </t>
+
+    <t t-name="odex30_account_reports.AccountReportLineCustomizable">
+        <!-- Adds an empty row above line with level 0 to add some spacing (it is the easiest and cleanest way) -->
+        <t t-if="props.line.level === 0">
+            <tr class="empty">
+                <td/>
+                <t t-foreach="props.line.columns" t-as="cell" t-key="cell_index">
+                    <td/>
+                </t>
+                <t t-if="controller.needsColumnPercentComparison">
+                    <td/>
+                </t>
+                <t t-if="controller.hasDebugColumn">
+                    <td/>
+                </t>
+            </tr>
+        </t>
+
+        <tr
+            data-id="line"
+            t-att-class="lineClasses"
+        >
+            <!-- Name column -->
+            <t t-component="env.component('AccountReportLineName')" t-props="{ lineIndex: props.lineIndex, line: props.line }"/>
+
+            <!-- Value columns -->
+            <t data-id="line_column" t-foreach="props.line.columns" t-as="cell" t-key="cell_index">
+                <!-- Condition for budget column only, should be changed in the future when we'll remove popover for editable cell -->
+                <t t-if="cell.column_group_key?.includes('compute_budget')">
+                    <AccountReportLineCellEditable t-props="{ line: props.line, cell: cell }"/>
+                </t>
+                <t t-else="">
+                    <t t-component="env.component('AccountReportLineCell')" t-props="{ line: props.line, cell: cell }"/>
+                </t>
+            </t>
+
+            <!-- Growth comparison column -->
+            <t t-if="controller.needsColumnPercentComparison">
+                <t t-if="controller.lineHasGrowthComparisonData(props.lineIndex)">
+                    <td t-att-class="growthComparisonClasses">
+                        <t t-out="props.line.column_percent_comparison_data.name"/>
+                    </td>
+                </t>
+                <t t-else="">
+                    <td/>
+                </t>
+            </t>
+
+            <!-- Debug column -->
+            <t t-if="controller.hasDebugColumn">
+                <td class="text-center">
+                    <t t-if="props.line.code">
+                        <t t-out="props.line.code"/>
+                    </t>
+
+                    <t t-if="controller.lineHasDebugData(props.lineIndex)">
+                        <button class="btn btn_debug" t-on-click="(ev) => this.showDebugPopover(ev)">
+                            <i class="fa fa-info-circle"/>
+                        </button>
+                    </t>
+                </td>
+            </t>
+
+            <t t-if="controller.options.show_horizontal_group_total">
+                <td t-att-class="HorizontalGroupTotalClasses">
+                    <t t-out="props.line.horizontal_group_total_data?.name"/>
+                </td>
+            </t>
+        </tr>
+    </t>
+</templates>
diff --git a/dev_odex30_accounting/odex30_account_reports/static/src/components/account_report/line/popover/debug_popover.js b/dev_odex30_accounting/odex30_account_reports/static/src/components/account_report/line/popover/debug_popover.js
new file mode 100644
index 0000000..732d52d
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_reports/static/src/components/account_report/line/popover/debug_popover.js
@@ -0,0 +1,12 @@
+/** @odoo-module */
+
+import { Component } from "@odoo/owl";
+
+export class AccountReportDebugPopover extends Component {
+    static template = "odex30_account_reports.AccountReportDebugPopover";
+    static props = {
+        close: Function,
+        expressionsDetail: Array,
+        onClose: Function,
+    };
+}
diff --git a/dev_odex30_accounting/odex30_account_reports/static/src/components/account_report/line/popover/debug_popover.xml b/dev_odex30_accounting/odex30_account_reports/static/src/components/account_report/line/popover/debug_popover.xml
new file mode 100644
index 0000000..f57eb4f
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_reports/static/src/components/account_report/line/popover/debug_popover.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<templates>
+    <t t-name="odex30_account_reports.AccountReportDebugPopover">
+        <div class="account_report_popover_debug">
+            <t t-foreach="props.expressionsDetail" t-as="expressionEngineAndTotals" t-key="expressionEngineAndTotals_index">
+                <t t-set="expressionEngine" t-value="expressionEngineAndTotals[0]"/>
+                <t t-set="expressionTotals" t-value="expressionEngineAndTotals[1]"/>
+
+                <div class="line_debug">
+                    <span>Engine</span>
+                    <span class="fw-bold" t-out="expressionEngine"/>
+                </div>
+
+                <t t-foreach="expressionTotals" t-as="labelAndInfo" t-key="labelAndInfo_index">
+                    <t t-set="expressionLabel" t-value="labelAndInfo[0]"/>
+                    <t t-set="expressionInfo" t-value="labelAndInfo[1]"/>
+
+                    <div class="line_debug">
+                        <span>Label</span>
+                        <span t-out="expressionLabel"/>
+                    </div>
+
+                    <div class="line_debug">
+                        <span>Formula</span>
+                        <code t-out="expressionInfo.formula"/>
+                    </div>
+
+                    <t t-if="expressionInfo.subformula">
+                        <div class="line_debug">
+                            <span>Subformula</span>
+                            <code t-out="expressionInfo.subformula"/>
+                        </div>
+                    </t>
+
+                    <div class="line_debug">
+                        <span>Value</span>
+                        <span t-out="expressionInfo.value"/>
+                    </div>
+
+                    <t t-if="!labelAndInfo_last">
+                        <div class="totals_separator"/>
+                    </t>
+                </t>
+
+                <t t-if="!expressionEngineAndTotals_last">
+                    <div class="engine_separator"/>
+                </t>
+            </t>
+        </div>
+    </t>
+</templates>
diff --git a/dev_odex30_accounting/odex30_account_reports/static/src/components/account_report/line_cell/line_cell.js b/dev_odex30_accounting/odex30_account_reports/static/src/components/account_report/line_cell/line_cell.js
new file mode 100644
index 0000000..6dda9e1
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_reports/static/src/components/account_report/line_cell/line_cell.js
@@ -0,0 +1,178 @@
+/** @odoo-module */
+
+import { localization } from "@web/core/l10n/localization";
+import { useService } from "@web/core/utils/hooks";
+
+import { AccountReportCarryoverPopover } from "@odex30_account_reports/components/account_report/line_cell/popover/carryover_popover";
+import { AccountReportEditPopover } from "@odex30_account_reports/components/account_report/line_cell/popover/edit_popover";
+
+import { Component, markup, useState } from "@odoo/owl";
+
+export class AccountReportLineCell extends Component {
+    static template = "odex30_account_reports.AccountReportLineCell";
+    static props = {
+        line: {
+            type: Object,
+            optional: true,
+        },
+        cell: Object,
+    };
+
+    setup() {
+        this.action = useService("action");
+        this.orm = useService("orm");
+        this.popover = useService("popover");
+        this.controller = useState(this.env.controller);
+    }
+
+    // -----------------------------------------------------------------------------------------------------------------
+    // Helpers
+    // -----------------------------------------------------------------------------------------------------------------
+    isNumeric(type) {
+        return ['float', 'integer', 'monetary', 'percentage'].includes(type);
+    }
+
+    // -----------------------------------------------------------------------------------------------------------------
+    // Attributes
+    // -----------------------------------------------------------------------------------------------------------------
+    get cellClasses() {
+        if (this.props.cell.comparison_mode) {
+            return this.comparisonClasses;
+        }
+
+        let classes = "";
+
+        if (this.props.cell.auditable)
+            classes += " auditable";
+
+        if (this.props.cell.figure_type === 'date')
+            classes += " date";
+
+        if (this.props.cell.figure_type === 'string')
+            classes += " text";
+
+        if (this.isNumeric(this.props.cell.figure_type)) {
+            classes += " numeric text-end";
+
+            if (this.props.cell.no_format !== undefined)
+                switch (Math.sign(this.props.cell.no_format)) {
+                    case 1:
+                        break;
+                    case 0:
+                    case -0:
+                        classes += " muted";
+                        break;
+                    case -1:
+                        classes += " text-danger";
+                        break;
+                }
+        }
+
+        if (this.props.cell.class)
+            classes += ` ${this.props.cell.class}`;
+
+        return classes;
+    }
+
+    // -----------------------------------------------------------------------------------------------------------------
+    // Audit
+    // -----------------------------------------------------------------------------------------------------------------
+    async audit() {
+        const auditAction = await this.orm.call(
+            "account.report",
+            "dispatch_report_action",
+            [
+                this.controller.options.report_id,
+                this.controller.options,
+                "action_audit_cell",
+                {
+                    report_line_id: this.props.cell.report_line_id,
+                    expression_label: this.props.cell.expression_label,
+                    calling_line_dict_id: this.props.line.id,
+                    column_group_key: this.props.cell.column_group_key,
+                },
+            ],
+            {
+                context: this.controller.context,
+            }
+        );
+        if (auditAction.help) {
+            auditAction.help = markup(auditAction.help);
+        }
+
+        return this.action.doAction(auditAction);
+    }
+
+    // -----------------------------------------------------------------------------------------------------------------
+    // Edit Popover
+    // -----------------------------------------------------------------------------------------------------------------
+    editPopover(ev) {
+        const close = () => {
+            this.popoverCloseFn();
+            this.popoverCloseFn = null;
+        }
+
+        if (this.popoverCloseFn)
+            close();
+
+        this.popoverCloseFn = this.popover.add(
+            ev.currentTarget,
+            AccountReportEditPopover,
+            {
+                line_id: this.props.line.id,
+                cell: this.props.cell,
+                controller: this.controller,
+                onClose: close,
+            },
+            {
+                closeOnClickAway: true,
+                position: localization.direction === "rtl" ? "bottom" : "left",
+            },
+        );
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    // Carryover popover
+    //------------------------------------------------------------------------------------------------------------------
+    carryoverPopover(ev) {
+        if (this.popoverCloseFn) {
+            this.popoverCloseFn();
+            this.popoverCloseFn = null;
+        }
+
+        this.popoverCloseFn = this.popover.add(
+            ev.currentTarget,
+            AccountReportCarryoverPopover,
+            {
+                carryoverData: JSON.parse(this.props.cell.info_popup_data),
+                options: this.controller.options,
+                context: this.controller.context,
+            },
+            {
+                closeOnClickAway: true,
+                position: localization.direction === "rtl" ? "bottom" : "right",
+            },
+        );
+    }
+
+    // -----------------------------------------------------------------------------------------------------------------
+    // Comparison cell
+    // -----------------------------------------------------------------------------------------------------------------
+    get comparisonClasses() {
+        let classes = "text-end";
+
+        switch (this.props.cell.comparison_mode) {
+            case "green":
+                classes += " text-success";
+                break;
+            case "muted":
+                classes += " muted";
+                break;
+            case "red":
+                classes += " text-danger";
+                break;
+        }
+
+        return classes;
+    }
+}
diff --git a/dev_odex30_accounting/odex30_account_reports/static/src/components/account_report/line_cell/line_cell.xml b/dev_odex30_accounting/odex30_account_reports/static/src/components/account_report/line_cell/line_cell.xml
new file mode 100644
index 0000000..9b7d572
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_reports/static/src/components/account_report/line_cell/line_cell.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<templates>
+    <t t-name="odex30_account_reports.AccountReportLineCell">
+        <t t-call="{{ env.template('AccountReportLineCell') }}"/>
+    </t>
+
+    <t t-name="odex30_account_reports.AccountReportLineCellCustomizable">
+        <td
+            data-id="line_cell"
+            class="line_cell"
+            t-att-class="cellClasses"
+            t-att-data-expression_label="props.cell.expression_label"
+        >
+            <div class="wrapper">
+                <t t-if="!controller.filters.show_totals or !props.line.unfolded">
+                    <t t-if="props.cell.info_popup_data">
+                        <a
+                            class="fa fa-question-circle me-2"
+                            t-on-click="(ev) => this.carryoverPopover(ev)"
+                        />
+                    </t>
+
+                    <t t-if="props.cell.edit_popup_data">
+                        <button
+                            class="btn btn_edit me-auto"
+                            t-on-click="(ev) => this.editPopover(ev)"
+                        >
+                            <i class="fa fa-pencil"/>
+                        </button>
+                    </t>
+
+                    <div class="content">
+                        <t t-if="props.cell.auditable">
+                            <a t-on-click="() => this.audit()">
+                                <t t-component="env.component('AccountReportEllipsis')" t-props="{
+                                    name: props.cell.name?.toString(),
+                                    no_format: props.cell.no_format,
+                                    type: props.cell.figure_type,
+                                    maxCharacters: 50,
+                                }"/>
+                            </a>
+                        </t>
+                        <t t-else="">
+                            <t t-component="env.component('AccountReportEllipsis')" t-props="{
+                                name: props.cell.name?.toString(),
+                                no_format: props.cell.no_format,
+                                type: props.cell.figure_type,
+                                maxCharacters: 50,
+                            }"/>
+                        </t>
+                    </div>
+                </t>
+            </div>
+        </td>
+    </t>
+</templates>
diff --git a/dev_odex30_accounting/odex30_account_reports/static/src/components/account_report/line_cell/popover/carryover_popover.js b/dev_odex30_accounting/odex30_account_reports/static/src/components/account_report/line_cell/popover/carryover_popover.js
new file mode 100644
index 0000000..bd74eb7
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_reports/static/src/components/account_report/line_cell/popover/carryover_popover.js
@@ -0,0 +1,39 @@
+/** @odoo-module */
+
+import { useService } from "@web/core/utils/hooks";
+import { Component } from "@odoo/owl";
+
+export class AccountReportCarryoverPopover extends Component {
+    static template = "odex30_account_reports.AccountReportCarryoverPopover";
+    static props = {
+        close: Function,
+        carryoverData: Object,
+        options: Object,
+        context: Object,
+    };
+
+    setup() {
+        this.actionService = useService("action");
+        this.orm = useService("orm");
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    //
+    //------------------------------------------------------------------------------------------------------------------
+    async viewCarryoverLinesAction(expressionId, columnGroupKey) {
+        const viewCarryoverLinesAction = await this.orm.call(
+            "account.report.expression",
+            "action_view_carryover_lines",
+            [
+                expressionId,
+                this.props.options,
+                columnGroupKey,
+            ],
+            {
+                context: this.props.context,
+            }
+        );
+        this.props.close()
+        return this.actionService.doAction(viewCarryoverLinesAction);
+    }
+}
diff --git a/dev_odex30_accounting/odex30_account_reports/static/src/components/account_report/line_cell/popover/carryover_popover.xml b/dev_odex30_accounting/odex30_account_reports/static/src/components/account_report/line_cell/popover/carryover_popover.xml
new file mode 100644
index 0000000..1e575fb
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_reports/static/src/components/account_report/line_cell/popover/carryover_popover.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<templates>
+    <t t-name="odex30_account_reports.AccountReportCarryoverPopover">
+        <table class="carryover_popover">
+            <t t-if="props.carryoverData.carryover || props.carryoverData.applied_carryover">
+                <tr>
+                    <td>
+                        <strong>Carryover</strong>
+                    </td>
+                    <td/>
+                </tr>
+
+                <t t-if="props.carryoverData.applied_carryover">
+                    <tr>
+                        <td colspan="2">
+                            <span>
+                                <strong t-out="props.carryoverData.applied_carryover"/> were carried over to this line from previous period.
+                            </span>
+                        </td>
+                    </tr>
+                </t>
+
+                <t t-if="props.carryoverData.carryover">
+                    <tr>
+                        <td colspan="2">
+                            <t t-if="props.carryoverData.carryover_target">
+                                <span>
+                                    <strong t-out="props.carryoverData.carryover"/> will be carried over to <strong t-out="props.carryoverData.carryover_target"/> in the next period.
+                                </span>
+                            </t>
+                            <t t-else="">
+                                <span>
+                                    <strong t-out="props.carryoverData.carryover"/> will be carried over to this line in the next period.
+                                </span>
+                            </t>
+                        </td>
+                    </tr>
+                </t>
+
+                <t t-if="props.carryoverData.allow_carryover_audit">
+                    <tr>
+                        <td/>
+                        <td>
+                            <button
+                                class="btn btn-secondary"
+                                t-on-click="() => this.viewCarryoverLinesAction(props.carryoverData.expression_id, props.carryoverData.column_group_key)"
+                            >
+                                View Carryover Lines
+                            </button>
+                        </td>
+                    </tr>
+                </t>
+            </t>
+        </table>
+    </t>
+</templates>
diff --git a/dev_odex30_accounting/odex30_account_reports/static/src/components/account_report/line_cell/popover/edit_popover.js b/dev_odex30_accounting/odex30_account_reports/static/src/components/account_report/line_cell/popover/edit_popover.js
new file mode 100644
index 0000000..1e386bd
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_reports/static/src/components/account_report/line_cell/popover/edit_popover.js
@@ -0,0 +1,64 @@
+/** @odoo-module */
+
+import { useAutofocus, useService } from "@web/core/utils/hooks";
+
+import { Component, useRef } from "@odoo/owl";
+
+export class AccountReportEditPopover extends Component {
+    static template = "odex30_account_reports.AccountReportEditPopover";
+    static props = {
+        line_id: String,
+        cell: Object,
+        controller: Object,
+        onClose: Function,
+        close: Function,
+    };
+
+    setup() {
+        this.orm = useService("orm");
+
+        if (this.props.cell.figure_type === 'boolean') {
+            this.booleanTrue = useRef("booleanTrue");
+            this.booleanFalse = useRef("booleanFalse");
+        } else {
+            this.input = useRef("input");
+            useAutofocus({ refName: "input" });
+        }
+    }
+
+    // -----------------------------------------------------------------------------------------------------------------
+    // Edit
+    // -----------------------------------------------------------------------------------------------------------------
+    async edit() {
+        let editValue;
+        const editPopupData = JSON.parse(this.props.cell.edit_popup_data);
+
+        if (this.props.cell.figure_type === 'boolean')
+            editValue = Number(this.booleanTrue.el.checked && !this.booleanFalse.el.checked);
+        else
+            editValue = this.input.el.value;
+
+        const res = await this.orm.call(
+            "account.report",
+            "action_modify_manual_value",
+            [
+                this.props.controller.options.report_id,
+                this.props.line_id,
+                this.props.controller.options,
+                editPopupData.column_group_key,
+                editValue,
+                editPopupData.target_expression_id,
+                editPopupData.rounding,
+                this.props.controller.columnGroupsTotals,
+            ],
+            {
+                context: this.props.controller.context,
+            }
+        );
+
+        this.props.controller.lines = res.lines;
+        this.props.controller.columnGroupsTotals = res.column_groups_totals;
+
+        this.props.onClose();
+    }
+}
diff --git a/dev_odex30_accounting/odex30_account_reports/static/src/components/account_report/line_cell/popover/edit_popover.xml b/dev_odex30_accounting/odex30_account_reports/static/src/components/account_report/line_cell/popover/edit_popover.xml
new file mode 100644
index 0000000..fa69233
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_reports/static/src/components/account_report/line_cell/popover/edit_popover.xml
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<templates>
+    <t t-name="odex30_account_reports.AccountReportEditPopover">
+        <div class="account_report_popover_edit">
+            <t t-if="props.cell.figure_type === 'boolean'">
+                <div class="edit_popover_boolean">
+                    <!-- Yes -->
+                    <input
+                        id="edit_popover_boolean_true"
+                        name="edit_popover_boolean"
+                        type="radio"
+                        value="1"
+                        t-att-checked="props.cell.no_format"
+                        t-ref="booleanTrue"
+                    />
+                    <label for="edit_popover_boolean_true">Yes</label>
+
+                    <!-- No -->
+                    <input
+                        id="edit_popover_boolean_false"
+                        name="edit_popover_boolean"
+                        type="radio"
+                        value="0"
+                        t-att-checked="!props.cell.no_format"
+                        t-ref="booleanFalse"
+                    />
+                    <label for="edit_popover_boolean_false">No</label>
+                </div>
+            </t>
+            <t t-elif="props.cell.figure_type === 'string'">
+                <textarea class="edit_popover_string" rows="3" t-ref="input">
+                    <t t-out="props.cell.no_format"/>
+                </textarea>
+            </t>
+            <t t-elif="props.cell.figure_type === 'percentage'">
+                <div class="input-group">
+                    <input
+                        class="form-control"
+                        type="text"
+                        inputmode="numeric"
+                        t-ref="input"
+                        t-att-value="props.cell.no_format"
+                    />
+                    <span class="input-group-text">%</span>
+                </div>
+            </t>
+            <t t-elif="props.cell.figure_type === 'monetary' and props.cell.currency_symbol">
+                <div class="input-group">
+                    <input
+                        class="form-control"
+                        type="text"
+                        inputmode="numeric"
+                        t-ref="input"
+                        t-att-value="props.cell.no_format"
+                    />
+                    <span class="input-group-text">
+                        <t t-out="props.cell.currency_symbol"/>
+                    </span>
+                </div>
+            </t>
+            <t t-else="">
+                <input
+                    type="text"
+                    inputmode="numeric"
+                    t-ref="input"
+                    t-att-value="props.cell.no_format"
+                />
+            </t>
+
+            <button class="btn btn-sm mt-2" t-on-click="() => this.edit()">
+                Post
+            </button>
+        </div>
+    </t>
+</templates>
diff --git a/dev_odex30_accounting/odex30_account_reports/static/src/components/account_report/line_cell_editable/line_cell_editable.js b/dev_odex30_accounting/odex30_account_reports/static/src/components/account_report/line_cell_editable/line_cell_editable.js
new file mode 100644
index 0000000..653b56f
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_reports/static/src/components/account_report/line_cell_editable/line_cell_editable.js
@@ -0,0 +1,79 @@
+import { useRef, useState } from "@odoo/owl";
+import { useHotkey } from "@web/core/hotkeys/hotkey_hook";
+
+import { AccountReportLineCell } from "@odex30_account_reports/components/account_report/line_cell/line_cell";
+
+export class AccountReportLineCellEditable extends AccountReportLineCell {
+    static template = "odex30_account_reports.AccountReportLineCellEditable";
+
+    setup() {
+        super.setup();
+        this.input = useRef("input");
+        this.focused = useState({ value: false });
+
+        useHotkey(
+            "Enter",
+            (ev) => {
+                ev.target.blur();
+            },
+            { bypassEditableProtection: true }
+        );
+    }
+
+    get cellClasses() {
+        let classes = super.cellClasses;
+        if (this.hasEditPopupData) {
+            classes += " editable-cell";
+        }
+        return classes;
+    }
+
+    get hasEditPopupData() {
+        return Boolean(this.props.cell?.edit_popup_data);
+    }
+
+    async onChange() {
+        if (!this.input.el.value.trim()) {
+            return;
+        }
+        const editValue = this.input.el.value;
+        const cellEditData = this.hasEditPopupData
+            ? JSON.parse(this.props.cell.edit_popup_data)
+            : {};
+
+        const res = await this.orm.call(
+            "account.report",
+            "action_modify_manual_value",
+            [
+                this.controller.options.report_id,
+                this.props.line.id,
+                this.controller.options,
+                cellEditData.column_group_key,
+                editValue,
+                cellEditData.target_expression_id,
+                cellEditData.rounding,
+                this.controller.columnGroupsTotals,
+            ],
+            {
+                context: this.controller.context,
+            }
+        );
+        this.controller.lines = res.lines;
+        this.controller.columnGroupsTotals = res.column_groups_totals;
+        this.focused.value = false;
+    }
+
+    get inputValue() {
+        return this.focused.value ? this.props.cell.no_format : this.props.cell.name;
+    }
+
+    onFocus() {
+        this.focused.value = true;
+    }
+
+    onBlur() {
+        if (JSON.stringify(this.props.cell.no_format) === this.input.el.value) {
+            this.focused.value = false;
+        }
+    }
+}
diff --git a/dev_odex30_accounting/odex30_account_reports/static/src/components/account_report/line_cell_editable/line_cell_editable.xml b/dev_odex30_accounting/odex30_account_reports/static/src/components/account_report/line_cell_editable/line_cell_editable.xml
new file mode 100644
index 0000000..c8d8a8f
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_reports/static/src/components/account_report/line_cell_editable/line_cell_editable.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<templates>
+    <t t-name="odex30_account_reports.AccountReportLineCellEditable" t-inherit="odex30_account_reports.AccountReportLineCellCustomizable" t-inherit-mode="primary">
+        <xpath expr="//div[contains(@class, 'wrapper')]" position="replace">
+            <t t-if="hasEditPopupData">
+                <div class="content">
+                    <input type="text"
+                           class="o_input text-end"
+                           t-ref="input"
+                           t-on-change="onChange"
+                           t-on-focus="onFocus"
+                           t-on-blur="onBlur"
+                           t-att-value="inputValue"
+                    />
+                </div>
+            </t>
+            <t t-else="">$0</t>
+        </xpath>
+    </t>
+</templates>
diff --git a/dev_odex30_accounting/odex30_account_reports/static/src/components/account_report/line_name/line_name.js b/dev_odex30_accounting/odex30_account_reports/static/src/components/account_report/line_name/line_name.js
new file mode 100644
index 0000000..a1f0b3d
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_reports/static/src/components/account_report/line_name/line_name.js
@@ -0,0 +1,173 @@
+/** @odoo-module */
+
+import { Dropdown } from "@web/core/dropdown/dropdown";
+import { DropdownItem } from "@web/core/dropdown/dropdown_item";
+import { useService } from "@web/core/utils/hooks";
+import { usePopover } from "@web/core/popover/popover_hook";
+import { Component, useState, useRef } from "@odoo/owl";
+
+import { AccountReportAnnotationsPopover } from "@odex30_account_reports/components/account_report/line_name/popover/annotations_popover";
+
+export class AccountReportLineName extends Component {
+    static template = "odex30_account_reports.AccountReportLineName";
+    static props = {
+        lineIndex: Number,
+        line: Object,
+    };
+    static components = {
+        Dropdown,
+        DropdownItem,
+    }
+
+    setup() {
+        this.action = useService("action");
+        this.orm = useService("orm");
+        this.controller = useState(this.env.controller);
+        this.annotationPopOver = usePopover(AccountReportAnnotationsPopover, {
+            setActiveElement: false,
+            position: "bottom",
+            animation: false,
+            closeOnClickAway: (target) => !target.closest(".annotation_popover"),
+        });
+
+        this.lineNameCell = useRef("lineNameCell");
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    // Caret options
+    //------------------------------------------------------------------------------------------------------------------
+    get caretOptions() {
+        return this.controller.caretOptions[this.props.line.caret_options];
+    }
+
+    get hasCaretOptions() {
+        return this.caretOptions?.length > 0;
+    }
+
+    async caretAction(caretOption) {
+        const res = await this.orm.call(
+            "account.report",
+            "dispatch_report_action",
+            [
+                this.controller.options.report_id,
+                this.controller.options,
+                caretOption.action,
+                {
+                    line_id: this.props.line.id,
+                    action_param: caretOption.action_param,
+                },
+            ],
+            {
+                context: this.controller.context,
+            }
+        );
+
+        return this.action.doAction(res);
+    }
+
+    // -----------------------------------------------------------------------------------------------------------------
+    // Classes
+    // -----------------------------------------------------------------------------------------------------------------
+    get lineNameClasses() {
+        let classes = "text";
+
+        if (this.props.line.unfoldable)
+            classes += " unfoldable";
+
+        if (this.props.line.class)
+            classes += ` ${ this.props.line.class }`;
+
+        return classes;
+    }
+
+    // -----------------------------------------------------------------------------------------------------------------
+    // Action
+    // -----------------------------------------------------------------------------------------------------------------
+    async triggerAction() {
+        const res = await this.orm.call(
+            "account.report",
+            "execute_action",
+            [
+                this.controller.options.report_id,
+                this.controller.options,
+                {
+                    id: this.props.line.id,
+                    actionId: this.props.line.action_id,
+                },
+            ],
+            {
+                context: this.controller.context,
+            }
+        );
+
+        return this.action.doAction(res);
+    }
+
+    // -----------------------------------------------------------------------------------------------------------------
+    // Load more
+    // -----------------------------------------------------------------------------------------------------------------
+    async loadMore() {
+        const newLines = await this.orm.call(
+            "account.report",
+            "get_expanded_lines",
+            [
+                this.controller.options.report_id,
+                this.controller.options,
+                this.props.line.parent_id,
+                this.props.line.groupby,
+                this.props.line.expand_function,
+                this.props.line.progress,
+                this.props.line.offset,
+                this.props.line.horizontal_split_side,
+            ],
+        );
+
+        this.controller.setLineVisibility(newLines)
+        if (this.controller.areLinesOrdered()) {
+            this.controller.updateLinesOrderIndexes(this.props.lineIndex, newLines, true)
+        }
+        await this.controller.replaceLineWith(this.props.lineIndex, newLines);
+    }
+
+    // -----------------------------------------------------------------------------------------------------------------
+    // Fold / Unfold
+    // -----------------------------------------------------------------------------------------------------------------
+    toggleFoldable() {
+        if (this.props.line.unfoldable)
+            if (this.props.line.unfolded)
+                this.controller.foldLine(this.props.lineIndex);
+            else
+                this.controller.unfoldLine(this.props.lineIndex);
+    }
+
+    // -----------------------------------------------------------------------------------------------------------------
+    // Annotation
+    // -----------------------------------------------------------------------------------------------------------------
+    get hasVisibleAnnotation() {
+        return this.props.line.visible_annotations;
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    // Annotation Popover
+    //------------------------------------------------------------------------------------------------------------------
+    async toggleAnnotationPopover() {
+        if (this.annotationPopOver.isOpen) {
+            this.annotationPopOver.close();
+        } else {
+            this.annotationPopOver.open(this.lineNameCell.el, {
+                controller: this.controller,
+                lineName: this,
+                lineID: this.props.line.id,
+            });
+        }
+    }
+
+    async addAnnotation(ev) {
+        this.annotationPopOver.open(this.lineNameCell.el, {
+            controller: this.controller,
+            lineName: this,
+            isAddingAnnotation: true,
+            lineID: this.props.line.id,
+        });
+    }
+}
diff --git a/dev_odex30_accounting/odex30_account_reports/static/src/components/account_report/line_name/line_name.xml b/dev_odex30_accounting/odex30_account_reports/static/src/components/account_report/line_name/line_name.xml
new file mode 100644
index 0000000..642405b
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_reports/static/src/components/account_report/line_name/line_name.xml
@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<templates>
+    <t t-name="odex30_account_reports.AccountReportLineName">
+        <t t-call="{{ env.template('AccountReportLineName') }}"/>
+    </t>
+
+    <t t-name="odex30_account_reports.AccountReportLineNameCustomizable">
+        <td
+            data-id="line_name"
+            class="line_name"
+            t-att-class="lineNameClasses"
+            t-on-click="() => this.toggleFoldable()"
+            t-att-colspan="props.line.colspan || 1"
+            tabindex="-1"
+            t-ref="lineNameCell"
+        >
+            <div class="wrapper">
+                <t t-if="props.line.unfoldable">
+                    <!-- Foldable -->
+                    <button data-id="btn_foldable" class="btn btn_foldable" tabindex="-1">
+                        <i t-att-class="props.line.unfolded ? 'fa fa-caret-down' : 'fa fa-caret-right'"/>
+                    </button>
+                </t>
+                <t t-else="">
+                    <!-- This keeps the same indentation for when we don't have a btn_foldable button -->
+                    <button class="btn btn_foldable_empty" tabindex="-1"/>
+                </t>
+
+                <t t-if="props.line.action_id">
+                    <!-- Actions -->
+                    <a class="clickable" t-on-click="() => this.triggerAction()" tabindex="-1">
+                        <t t-out="props.line.name"/>
+                    </a>
+                </t>
+                <t t-elif="controller.isLoadMoreLine(props.lineIndex)">
+                    <!-- Load more -->
+                    <a class="clickable" t-on-click="() => this.loadMore()" tabindex="-1">
+                        <t t-out="props.line.name"/>
+                    </a>
+                </t>
+                <t t-else="">
+                    <div data-id="content" class="content">
+                        <t t-component="env.component('AccountReportEllipsis')" t-props="{
+                            name: props.line.name?.toString(),
+                            type: 'string',
+                            maxCharacters: 80,
+                        }"/>
+
+                        <t t-if="props.line.visible_annotations?.length">
+                            <button
+                                tabindex="-1"
+                                class="btn btn_annotation"
+                                t-on-click="toggleAnnotationPopover"
+                            >
+                                <i class="fa fa-commenting"/>
+                            </button>
+                        </t>
+
+                        <t t-if="hasCaretOptions">
+                            <!-- Caret options -->
+                            <Dropdown position="'right-start'">
+                                <button class="btn btn_dropdown" tabindex="-1">
+                                    <i class="fa fa-ellipsis-v"/>
+                                </button>
+                                <t t-set-slot="content">
+                                    <div data-id="caret_options">
+                                        <t t-foreach="caretOptions" t-as="caretOption" t-key="caretOption_index">
+                                            <DropdownItem onSelected="() => this.caretAction(caretOption)">
+                                                <t t-out="caretOption.name"/>
+                                            </DropdownItem>
+                                        </t>
+
+                                        <t t-if="!props.line.visible_annotations?.length">
+                                            <div class="o-dropdown-item dropdown-item o-navigable"
+                                                 t-on-click="(ev) => this.addAnnotation(ev, props.line.id)"
+                                            >
+                                                Annotate
+                                            </div>
+                                        </t>
+                                    </div>
+                                </t>
+                            </Dropdown>
+                        </t>
+
+                        <t data-id="line_buttons" t-if="!props.line['hide_line_buttons']"/>
+                    </div>
+                </t>
+            </div>
+        </td>
+    </t>
+</templates>
diff --git a/dev_odex30_accounting/odex30_account_reports/static/src/components/account_report/line_name/popover/annotations_popover.js b/dev_odex30_accounting/odex30_account_reports/static/src/components/account_report/line_name/popover/annotations_popover.js
new file mode 100644
index 0000000..b75968b
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_reports/static/src/components/account_report/line_name/popover/annotations_popover.js
@@ -0,0 +1,137 @@
+import { Component, useState, useRef, onWillDestroy } from "@odoo/owl";
+import { useService } from "@web/core/utils/hooks";
+import { DateTimeInput } from "@web/core/datetime/datetime_input";
+import { serializeDate } from "@web/core/l10n/dates";
+import { AnnotationPopoverLine } from "@odex30_account_reports/components/account_report/line_name/popover_line/annotation_popover_line";
+import { removeTaxGroupingFromLineId } from "@odex30_account_reports/js/util";
+
+const { DateTime } = luxon;
+
+export class AccountReportAnnotationsPopover extends Component {
+    static template = "odex30_account_reports.AccountReportAnnotationsPopover";
+    static props = {
+        controller: Object,
+        lineName: Object,
+        lineID: String,
+        close: { type: Function, optional: true },
+        isAddingAnnotation: { type: Boolean, optional: true },
+    };
+    static components = {
+        DateTimeInput,
+        AnnotationPopoverLine,
+    };
+
+    setup() {
+        this.notificationService = useService("notification");
+
+        this.newAnnotation = useState({
+            value: this.props.isAddingAnnotation ? this._getNewAnnotation() : {},
+        });
+
+        this.annotations = useState(this.props.controller.visibleAnnotations[removeTaxGroupingFromLineId(this.props.lineID)]);
+
+        this.popoverTable = useRef("popoverTable");
+        this.currentPromise = null;
+
+        onWillDestroy(async () => {
+            if (this.currentPromise) {
+                await this.currentPromise;
+            }
+        });
+    }
+
+    get isAddingAnnotation() {
+        return Object.keys(this.newAnnotation.value).length !== 0;
+    }
+
+    async refreshAnnotations() {
+        this.currentPromise = null;
+        await this.props.controller.refreshAnnotations();
+        this.annotations = this.props.controller.visibleAnnotations[removeTaxGroupingFromLineId(this.props.lineID)];
+        if (this.isAddingAnnotation) {
+            this.cleanNewAnnotation();
+        }
+    }
+
+    _getNewAnnotation() {
+        const date =
+            this.props.controller.options.date.filter === "today"
+                ? new Date().toISOString().split("T")[0]
+                : this.props.controller.options.date.date_to;
+        return {
+            date: DateTime.fromISO(date),
+            text: "",
+            lineID: this.props.lineID,
+        };
+    }
+
+    cleanNewAnnotation() {
+        this.newAnnotation.value = {};
+    }
+
+    addAnnotation() {
+        this.newAnnotation.value = this._getNewAnnotation();
+    }
+
+    formatAnnotation(annotation) {
+        return {
+            id: annotation.id,
+            date: annotation.date ? DateTime.fromISO(annotation.date) : null,
+            text: annotation.text,
+            lineID: annotation.line_id,
+        };
+    }
+
+    async saveNewAnnotation(newAnnotation) {
+        if (newAnnotation.text) {
+            this.currentPromise = this.env.services.orm.call(
+                "account.report.annotation",
+                "create",
+                [
+                    {
+                        report_id: this.props.controller.options.report_id,
+                        line_id: newAnnotation.lineID,
+                        text: newAnnotation.text,
+                        date: newAnnotation.date ? serializeDate(newAnnotation.date) : null,
+                        fiscal_position_id: this.props.controller.options.fiscal_position,
+                    },
+                ],
+                {
+                    context: this.props.context,
+                }
+            );
+            // We're using a .then() here to make sure that even if the component is destroyed
+            // we'll call the function to finalize the logic.
+            this.currentPromise.then(async () => {
+                await this.refreshAnnotations();
+                if (this.popoverTable.el) {
+                    this.popoverTable.el.scrollIntoView({ behavior: "smooth", block: "end" });
+                }
+            });
+        }
+    }
+
+    async deleteAnnotation(annotationId) {
+        this.currentPromise = this.env.services.orm.call(
+            "account.report.annotation",
+            "unlink",
+            [annotationId],
+            { context: this.props.controller.context }
+        );
+        await this.currentPromise;
+        await this.refreshAnnotations();
+    }
+
+    async editAnnotation(editedAnnotation, existingAnnotation) {
+        this.currentPromise = this.env.services.orm.call(
+            "account.report.annotation",
+            "write",
+            [[existingAnnotation.id], { text: editedAnnotation.text, date: editedAnnotation.date }],
+            {
+                context: this.props.controller.context,
+            }
+        );
+        await this.currentPromise;
+        await this.refreshAnnotations();
+    }
+}
diff --git a/dev_odex30_accounting/odex30_account_reports/static/src/components/account_report/line_name/popover/annotations_popover.xml b/dev_odex30_accounting/odex30_account_reports/static/src/components/account_report/line_name/popover/annotations_popover.xml
new file mode 100644
index 0000000..31fdf71
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_reports/static/src/components/account_report/line_name/popover/annotations_popover.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<templates>
+    <t t-name="odex30_account_reports.AccountReportAnnotationsPopover">
+        <div class="d-flex flex-column flex-start gap-2">
+            <table class="annotation_popover" t-ref="popoverTable">
+                <tr class="annotation_popover_line">
+                    <th>Date</th>
+                    <th>Annotation</th>
+                    <th/>
+                </tr>
+
+                <t t-foreach="annotations" t-as="annotation" t-key="annotation.id">
+                    <AnnotationPopoverLine
+                        annotation="this.formatAnnotation(annotation)"
+                        onDelete="(annotationId) => this.deleteAnnotation(annotationId)"
+                        onEdit="(editedAnnotation) => this.editAnnotation(editedAnnotation, annotation)"
+                    />
+                </t>
+                <AnnotationPopoverLine
+                    t-if="isAddingAnnotation"
+                    annotation="newAnnotation.value"
+                    onDelete="() => this.cleanNewAnnotation()"
+                    onEdit="(annotationToCreate) => this.saveNewAnnotation(annotationToCreate)"
+                />
+                <tr class="annotation_popover_line">
+                    <td colspan="4">
+                        <a class="oe_link" href="#" t-on-click.prevent="addAnnotation" data-hotkey="c">
+                            Add a line
+                        </a>
+                    </td>
+                </tr>
+            </table>
+        </div>
+    </t>
+</templates>
diff --git a/dev_odex30_accounting/odex30_account_reports/static/src/components/account_report/line_name/popover_line/annotation_popover_line.js b/dev_odex30_accounting/odex30_account_reports/static/src/components/account_report/line_name/popover_line/annotation_popover_line.js
new file mode 100644
index 0000000..6e4f52b
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_reports/static/src/components/account_report/line_name/popover_line/annotation_popover_line.js
@@ -0,0 +1,79 @@
+import { Component, useState, useRef, useEffect } from "@odoo/owl";
+import { useAutofocus, useService } from "@web/core/utils/hooks";
+import { _t } from "@web/core/l10n/translation";
+import { DateTimeInput } from "@web/core/datetime/datetime_input";
+
+const { DateTime } = luxon;
+
+export class AnnotationPopoverLine extends Component {
+    static template = "account_report.AnnotationPopoverLine";
+    static props = {
+        annotation: {
+            type: Object,
+            shape: {
+                date: { type: [DateTime, { value: false }, { value: null }], optional: true },
+                text: String,
+                lineID: String,
+                id: { type: Number, optional: true },
+            },
+        },
+        onEdit: Function,
+        onDelete: Function,
+    };
+    static components = {
+        DateTimeInput,
+    };
+
+    setup() {
+        this.applyAutoresizeToAll(".annotation_popover_autoresize_textarea");
+        this.annotation = useState(this.props.annotation);
+        this.notificationService = useService("notification");
+        if (this.annotation.text.length) {
+            this.textArea = useRef("annotationText");
+        } else {
+            this.textArea = useAutofocus({ refName: "annotationText" });
+        }
+    }
+
+    applyAutoresizeToAll(selector) {
+        useEffect(() => {
+            const resizeTextArea = (textarea) => {
+                textarea.style.height = `${textarea.scrollHeight}px`;
+                textarea.parentElement.style.height = `${textarea.scrollHeight}px`;
+            };
+
+            const textareas = document.querySelectorAll(selector);
+            for (const textarea of textareas) {
+                Object.assign(textarea.style, {
+                    width: "auto",
+                    paddingTop: 0,
+                    paddingBottom: 0,
+                });
+                resizeTextArea(textarea);
+                textarea.addEventListener("input", () => {
+                    resizeTextArea(textarea);
+                });
+            }
+        });
+    }
+
+    annotationEditDate(date) {
+        this.annotation.date = date;
+        this.props.onEdit(this.annotation);
+    }
+
+    annotationEditText() {
+        if (this.textArea.el.value) {
+            if (this.textArea.el.value !== this.annotation.text) {
+                this.annotation.text = this.textArea.el.value;
+                this.props.onEdit(this.annotation);
+            }
+        } else {
+            this.notificationService.add(_t("The annotation shouldn't have an empty value."));
+        }
+    }
+
+    deleteAnnotation() {
+        this.props.onDelete(this.annotation.id);
+    }
+}
diff --git a/dev_odex30_accounting/odex30_account_reports/static/src/components/account_report/line_name/popover_line/annotation_popover_line.xml b/dev_odex30_accounting/odex30_account_reports/static/src/components/account_report/line_name/popover_line/annotation_popover_line.xml
new file mode 100644
index 0000000..ab69265
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_reports/static/src/components/account_report/line_name/popover_line/annotation_popover_line.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<templates>
+    <t t-name="account_report.AnnotationPopoverLine">
+        <tr class="annotation_popover_line">
+            <td class="w-25">
+                <DateTimeInput
+                    type="'date'"
+                    value="annotation.date"
+                    onChange="(date) => this.annotationEditDate(date)"
+                />
+            </td>
+            <td>
+                <textarea
+                    class="annotation_popover_editable_cell annotation_popover_autoresize_textarea w-100"
+                    t-att-value="annotation.text"
+                    t-on-change="annotationEditText"
+                    t-ref="annotationText"
+                />
+            </td>
+            <td>
+                <button
+                    class="btn btn_annotation_delete"
+                    t-on-click="deleteAnnotation"
+                >
+                    <i class="fa fa-trash-o"/>
+                </button>
+            </td>
+        </tr>
+    </t>
+</templates>
diff --git a/dev_odex30_accounting/odex30_account_reports/static/src/components/account_report/search_bar/search_bar.js b/dev_odex30_accounting/odex30_account_reports/static/src/components/account_report/search_bar/search_bar.js
new file mode 100644
index 0000000..a38d168
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_reports/static/src/components/account_report/search_bar/search_bar.js
@@ -0,0 +1,49 @@
+/** @odoo-module */
+
+import { Component, useRef, useState, onMounted } from "@odoo/owl";
+
+export class AccountReportSearchBar extends Component {
+    static template = "odex30_account_reports.AccountReportSearchBar";
+    static props = {
+        initialQuery: { type: String, optional: true },
+    };
+
+    setup() {
+        this.searchText = useRef("search_bar_input");
+        this.controller = useState(this.env.controller);
+
+        onMounted(() => {
+            if (this.props.initialQuery) {
+                this.searchText.el.value = this.props.initialQuery;
+                this.search();
+            }
+        });
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    // Search
+    //------------------------------------------------------------------------------------------------------------------
+    search() {
+        const inputText = this.searchText.el.value.trim();
+        const query = inputText.toLowerCase();
+        const linesIDsMatched = [];
+
+        if (query.length) {
+            for (const line of this.controller.lines) {
+                if (!line.name) continue;
+
+                const lineName = line.name.trim().toLowerCase();
+                const match = (lineName.indexOf(query) !== -1);
+
+                if (match) {
+                    linesIDsMatched.push(line.id);
+                }
+            }
+            this.controller.lines_searched = linesIDsMatched;
+            this.controller.updateOption("filter_search_bar", inputText);
+        } else {
+            delete this.controller.lines_searched;
+            this.controller.deleteOption("filter_search_bar");
+        }        
+    }
+}
diff --git a/dev_odex30_accounting/odex30_account_reports/static/src/components/account_report/search_bar/search_bar.xml b/dev_odex30_accounting/odex30_account_reports/static/src/components/account_report/search_bar/search_bar.xml
new file mode 100644
index 0000000..cddc3f6
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_reports/static/src/components/account_report/search_bar/search_bar.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<templates>
+    <t t-name="odex30_account_reports.AccountReportSearchBar">
+        <div class="o_searchview form-control d-print-contents d-flex align-items-center py-1 w-auto" role="search" aria-autocomplete="list">
+            <i class="o_searchview_icon d-print-none oi oi-search me-2"
+                role="img"
+                aria-label="Search..."
+                title="Search..."
+            />
+            <div class="o_searchview_input_container d-flex flex-grow-1 flex-wrap gap-1">
+                <input type="text"
+                    class="o_searchview_input o_input d-print-none flex-grow-1 w-auto border-0"
+                    accesskey="Q"
+                    placeholder="Search..."
+                    role="searchbox"
+                    t-ref="search_bar_input"
+                    t-on-input="() => this.search()"
+                />
+            </div>
+        </div>
+    </t>
+</templates>
diff --git a/dev_odex30_accounting/odex30_account_reports/static/src/components/account_report/warnings.xml b/dev_odex30_accounting/odex30_account_reports/static/src/components/account_report/warnings.xml
new file mode 100644
index 0000000..f887afe
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_reports/static/src/components/account_report/warnings.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<templates>
+    <t t-name="odex30_account_reports.common_warning_tax_unit">
+        This company is part of a tax unit. You're currently not viewing the whole unit.
+    </t>
+
+    <t t-name="odex30_account_reports.common_warning_draft_in_period">
+        There are
+        <a type="button" t-on-click="(ev) => controller.reportAction(ev, 'open_unposted_moves', {})">unposted Journal Entries</a>
+        prior or included in this period.
+    </t>
+
+    <t t-name="odex30_account_reports.common_possibly_unbalanced_because_cta">
+        This report uses the CTA conversion method to consolidate multiple companies using different currencies,
+        which can lead the report to be unbalanced.
+    </t>
+</templates>
diff --git a/dev_odex30_accounting/odex30_account_reports/static/src/components/aged_partner_balance/aged_partner_balance.scss b/dev_odex30_accounting/odex30_account_reports/static/src/components/aged_partner_balance/aged_partner_balance.scss
new file mode 100644
index 0000000..bf01a90
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_reports/static/src/components/aged_partner_balance/aged_partner_balance.scss
@@ -0,0 +1,4 @@
+.account_report.aged_partner_balance {
+    .partner_trust { line-height: 20px }
+    td[data-expression_label='currency'] > .wrapper { justify-content: center }
+}
diff --git a/dev_odex30_accounting/odex30_account_reports/static/src/components/aged_partner_balance/filter_aging.xml b/dev_odex30_accounting/odex30_account_reports/static/src/components/aged_partner_balance/filter_aging.xml
new file mode 100644
index 0000000..ad23020
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_reports/static/src/components/aged_partner_balance/filter_aging.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<templates>
+    <t t-name="odex30_account_reports.AccountReportAgingBasedOn">
+        <Dropdown>
+            <button class="btn btn-secondary">
+                <i class="fa fa-file me-1"/>Based on
+                <t t-if="controller.options.aging_based_on === 'base_on_invoice_date'">
+                    Invoice Date
+                </t>
+                <t t-else="">
+                    Due Date
+                </t>
+            </button>
+            <t t-set-slot="content">
+                <DropdownItem
+                    class="{ 'selected': controller.options.aging_based_on === 'base_on_maturity_date' }"
+                    onSelected="() => this.filterClicked({ optionKey: 'aging_based_on', optionValue: 'base_on_maturity_date', reload: true})"
+                >
+                    Due Date
+                </DropdownItem>
+
+                <DropdownItem
+                    class="{ 'selected': controller.options.aging_based_on === 'base_on_invoice_date' }"
+                    onSelected="() => this.filterClicked({ optionKey: 'aging_based_on', optionValue: 'base_on_invoice_date', reload: true})"
+                >
+                    Invoice Date
+                </DropdownItem>
+            </t>
+        </Dropdown>
+    </t>
+
+    <t t-name="odex30_account_reports.AccountReportAgingInterval">
+        <Dropdown
+            menuClass="'account_report_filter intervals'"
+        >
+            <button class="btn btn-secondary">
+                <i class="fa fa-calendar-o me-1"/>
+                <t t-out="controller.options.aging_interval"/> Days
+            </button>
+            <t t-set-slot="content">
+                <div class="dropdown-item interval">
+                    <input
+                        min="1"
+                        type="number"
+                        t-att-value="controller.options.aging_interval"
+                        t-on-change="(ev) => this.setAgingInterval(ev)"
+                    />
+                    <span class="mx-2">Days</span>
+                </div>
+            </t>
+        </Dropdown>
+    </t>
+</templates>
diff --git a/dev_odex30_accounting/odex30_account_reports/static/src/components/aged_partner_balance/filter_extra_options.xml b/dev_odex30_accounting/odex30_account_reports/static/src/components/aged_partner_balance/filter_extra_options.xml
new file mode 100644
index 0000000..44d87aa
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_reports/static/src/components/aged_partner_balance/filter_extra_options.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<templates>
+    <t t-name="odex30_account_reports.AgedPartnerBalanceFilterExtraOptions" t-inherit="odex30_account_reports.AccountReportFilterExtraOptions">
+        <xpath expr="//DropdownItem[contains(@class, 'filter_show_all_hook')]" position="after">
+            <DropdownItem
+                t-if="controller.options.multi_currency"
+                class="{ 'selected': controller.options.show_currency }"
+                onSelected="() => this.filterClicked({ optionKey: 'show_currency', reload: true})"
+                closingMode="'none'"
+            >
+                Show Currency
+            </DropdownItem>
+            <DropdownItem
+                class="{ 'selected': controller.options.show_account }"
+                onSelected="() => this.filterClicked({ optionKey: 'show_account', reload: true})"
+                closingMode="'none'"
+            >
+                Show Account
+            </DropdownItem>
+        </xpath>
+    </t>
+</templates>
diff --git a/dev_odex30_accounting/odex30_account_reports/static/src/components/aged_partner_balance/filters.js b/dev_odex30_accounting/odex30_account_reports/static/src/components/aged_partner_balance/filters.js
new file mode 100644
index 0000000..f993fab
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_reports/static/src/components/aged_partner_balance/filters.js
@@ -0,0 +1,29 @@
+/** @odoo-module */
+
+import { _t } from "@web/core/l10n/translation";
+import { WarningDialog } from "@web/core/errors/error_dialogs";
+import { AccountReport } from "@odex30_account_reports/components/account_report/account_report";
+import { AccountReportFilters } from "@odex30_account_reports/components/account_report/filters/filters";
+
+export class AgedPartnerBalanceFilters extends AccountReportFilters {
+    static template = "odex30_account_reports.AgedPartnerBalanceFilters";
+
+    //------------------------------------------------------------------------------------------------------------------
+    // Aging Interval
+    //------------------------------------------------------------------------------------------------------------------
+    async setAgingInterval(ev) {
+        const agingInterval = parseInt(ev.target.value);
+        if (agingInterval < 1) {
+            this.dialog.add(WarningDialog, {
+                title: _t("Odoo Warning"),
+                message: _t("Intervals cannot be smaller than 1"),
+            });
+            return;
+        }
+
+        await this.filterClicked({ optionKey:"aging_interval", optionValue: agingInterval, reload: true });
+    }
+
+}
+
+AccountReport.registerCustomComponent(AgedPartnerBalanceFilters);
diff --git a/dev_odex30_accounting/odex30_account_reports/static/src/components/aged_partner_balance/filters.xml b/dev_odex30_accounting/odex30_account_reports/static/src/components/aged_partner_balance/filters.xml
new file mode 100644
index 0000000..5256477
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_reports/static/src/components/aged_partner_balance/filters.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<templates>
+    <t t-name="odex30_account_reports.AgedPartnerBalanceFilters" t-inherit="odex30_account_reports.AccountReportFiltersCustomizable">
+        <xpath expr="//div[@id='filter_extra_options']" position="before">
+            <t t-if="'aging_based_on' in controller.options">
+                <div>
+                    <t t-call="odex30_account_reports.AccountReportAgingBasedOn"/>
+                </div>
+            </t>
+            <t>
+                <div id="filter_aging_interval">
+                    <t t-call="odex30_account_reports.AccountReportAgingInterval"/>
+                </div>
+            </t>
+        </xpath>
+
+        <xpath expr="//div[@id='filter_extra_options']" position="replace">
+            <t t-call="odex30_account_reports.AgedPartnerBalanceFilterExtraOptions"/>
+        </xpath>
+    </t>
+</templates>
diff --git a/dev_odex30_accounting/odex30_account_reports/static/src/components/aged_partner_balance/line_name/line_name.xml b/dev_odex30_accounting/odex30_account_reports/static/src/components/aged_partner_balance/line_name/line_name.xml
new file mode 100644
index 0000000..61bf3c6
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_reports/static/src/components/aged_partner_balance/line_name/line_name.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<templates>
+    <t t-name="odex30_account_reports.AgedPartnerBalanceLineName" t-inherit="odex30_account_reports.AccountReportLineNameCustomizable">
+        <xpath expr="//td[@data-id='line_name']" position="attributes">
+            <t t-if="props.line.unfoldable">
+                <attribute name="class" add="more" separator=" "/>
+            </t>
+        </xpath>
+
+        <xpath expr="//t[@data-id='line_buttons']" position="inside">
+            <t t-if="props.line.unfoldable">
+                <button
+                    class="btn btn_action"
+                    t-on-click="(ev) => controller.reportAction(ev, 'caret_option_open_record_form', { line_id: props.line.id })"
+                >
+                    Partner
+                </button>
+
+                <button
+                    class="btn btn_action"
+                    t-on-click="(ev) => controller.reportAction(ev, 'open_customer_statement', { line_id: props.line.id })"
+                >
+                    Statement
+                </button>
+            </t>
+        </xpath>
+
+        <xpath expr="//button[@data-id='btn_foldable']" position="after">
+            <t t-if="props.line.trust === 'good'">
+                <i class="fa fa-circle text-success partner_trust" title="Partner is good"/>
+            </t>
+            <t t-elif="props.line.trust === 'bad'">
+                <i class="fa fa-circle text-danger partner_trust" title="Partner is bad"/>
+            </t>
+        </xpath>
+
+    </t>
+</templates>
diff --git a/dev_odex30_accounting/odex30_account_reports/static/src/components/bank_reconciliation_report/warnings.xml b/dev_odex30_accounting/odex30_account_reports/static/src/components/bank_reconciliation_report/warnings.xml
new file mode 100644
index 0000000..eaa4492
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_reports/static/src/components/bank_reconciliation_report/warnings.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<templates>
+
+    <t t-name="odex30_account_reports.inconsistent_statement_warning">
+        Some
+        <a t-on-click="(ev) => controller.reportAction(ev, 'bank_reconciliation_report_open_inconsistent_statements', warningParams)">statements</a>
+        have a starting balance different from the previous ending balance.
+    </t>
+
+    <t t-name="odex30_account_reports.has_bank_miscellaneous_move_lines">
+        <span>
+            "<t t-out="warningParams.args"/>" account balance is affected by
+            <a t-on-click="(ev) => controller.reportAction(ev, 'open_bank_miscellaneous_move_lines')">journal items</a>
+            which don't originate from a bank statement nor payment.
+        </span>
+    </t>
+
+    <t t-name="odex30_account_reports.journal_balance">
+        <span>
+            The current balance in the
+            <a t-on-click="(ev) => controller.reportAction(ev, 'action_redirect_to_general_ledger')">
+                General Ledger
+                <t t-out="warningParams.general_ledger_amount"/>
+            </a>
+
+            doesn't match the balance of your
+            <a t-on-click="(ev) => controller.reportAction(ev, 'action_redirect_to_bank_statement_widget')">
+                last bank statement
+                <t t-out="warningParams.last_bank_statement_amount"/>
+            </a>
+            , leading to an unexplained difference of
+            <t t-out="warningParams.unexplained_difference"/>
+        </span>
+    </t>
+</templates>
diff --git a/dev_odex30_accounting/odex30_account_reports/static/src/components/customer_statement/customer_statement.scss b/dev_odex30_accounting/odex30_account_reports/static/src/components/customer_statement/customer_statement.scss
new file mode 100644
index 0000000..47f3a6f
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_reports/static/src/components/customer_statement/customer_statement.scss
@@ -0,0 +1,12 @@
+.account_report.customer_statement {
+    .o_control_panel_breadcrumbs {
+        height: auto !important;
+
+        @include media-breakpoint-up(md) {
+            min-width: auto !important;
+        }
+    }
+    .o_breadcrumb {
+        flex-direction: column !important;
+    }
+}
diff --git a/dev_odex30_accounting/odex30_account_reports/static/src/components/deferred_reports/filters.xml b/dev_odex30_accounting/odex30_account_reports/static/src/components/deferred_reports/filters.xml
new file mode 100644
index 0000000..39b55bb
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_reports/static/src/components/deferred_reports/filters.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<templates>
+    <t t-name="odex30_account_reports.DeferredFilterComparison" t-inherit="odex30_account_reports.AccountReportFilterComparison">
+        <xpath expr="//DropdownItem[contains(@attrs, 'filter_comparison_same_period_last_year')]" position="replace"/>
+        <xpath expr="//DropdownItem[contains(@attrs, 'filter_comparison_custom')]" position="replace"/>
+    </t>
+
+    <t t-name="odex30_account_reports.DeferredFilters" t-inherit="odex30_account_reports.AccountReportFiltersCustomizable">
+        <xpath expr="//div[@id='filter_comparison']/t" position="replace">
+            <t t-call="odex30_account_reports.DeferredFilterComparison"/>
+        </xpath>
+
+        <xpath expr="//div[@id='filter_extra_options']" position="before">
+            <t t-call="odex30_account_reports.AccountReportDeferredGroupBy"/>
+        </xpath>
+    </t>
+</templates>
diff --git a/dev_odex30_accounting/odex30_account_reports/static/src/components/deferred_reports/groupby.xml b/dev_odex30_accounting/odex30_account_reports/static/src/components/deferred_reports/groupby.xml
new file mode 100644
index 0000000..c04b9ce
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_reports/static/src/components/deferred_reports/groupby.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<templates>
+    <t t-name="odex30_account_reports.AccountReportDeferredGroupBy">
+        <Dropdown>
+            <button class="btn btn-secondary">
+                <i class="fa fa-list me-1"/>Group by
+                <t t-if="controller.options.deferred_grouping_field === 'account_id'">
+                    Account
+                </t>
+                <t t-elif="controller.options.deferred_grouping_field === 'product_category_id'">
+                    Product Category
+                </t>
+                <t t-else="">
+                    Product
+                </t>
+            </button>
+
+            <t t-set-slot="content">
+                <DropdownItem
+                    class="{ 'selected': controller.options.deferred_grouping_field === 'account_id' }"
+                    onSelected="() => this.filterClicked({ optionKey: 'deferred_grouping_field', optionValue: 'account_id', reload: true})"
+                >
+                    Account
+                </DropdownItem>
+
+                <DropdownItem
+                    class="{ 'selected': controller.options.deferred_grouping_field === 'product_category_id' }"
+                    onSelected="() => this.filterClicked({ optionKey: 'deferred_grouping_field', optionValue: 'product_category_id', reload: true})"
+                >
+                    Product Category
+                </DropdownItem>
+
+                <DropdownItem
+                    class="{ 'selected': controller.options.deferred_grouping_field === 'product_id' }"
+                    onSelected="() => this.filterClicked({ optionKey: 'deferred_grouping_field', optionValue: 'product_id', reload: true})"
+                >
+                    Product
+                </DropdownItem>
+            </t>
+        </Dropdown>
+    </t>
+</templates>
diff --git a/dev_odex30_accounting/odex30_account_reports/static/src/components/deferred_reports/warnings.xml b/dev_odex30_accounting/odex30_account_reports/static/src/components/deferred_reports/warnings.xml
new file mode 100644
index 0000000..1b2cdab
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_reports/static/src/components/deferred_reports/warnings.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<templates>
+    <t t-name="odex30_account_reports.deferred_report_warning_partially_generated">
+        Deferrals have not yet been completely generated for this period.
+        <div>
+            <a type="button" t-on-click="(ev) => controller.reportAction(ev, 'open_deferral_entries', {})">
+                Show already generated deferrals.
+            </a>
+        </div>
+    </t>
+    <t t-name="odex30_account_reports.deferred_report_warning_never_generated">
+        Deferrals have not yet been generated for this period.
+    </t>
+    <t t-name="odex30_account_reports.deferred_report_info_fully_generated">
+        <a type="button" t-on-click="(ev) => controller.reportAction(ev, 'open_deferral_entries', {})">
+            Show already generated deferrals.
+        </a>
+    </t>
+</templates>
diff --git a/dev_odex30_accounting/odex30_account_reports/static/src/components/general_ledger/line_name.xml b/dev_odex30_accounting/odex30_account_reports/static/src/components/general_ledger/line_name.xml
new file mode 100644
index 0000000..a56f3af
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_reports/static/src/components/general_ledger/line_name.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<templates>
+    <t t-name="odex30_account_reports.GeneralLedgerLineName" t-inherit="odex30_account_reports.AccountReportLineNameCustomizable">
+        <xpath expr="//t[@data-id='line_buttons']" position="inside">
+            <t t-if="props.line.unfoldable">
+                <button
+                    class="btn btn_action"
+                    t-on-click="(ev) => controller.reportAction(ev, 'open_journal_items', {
+                        line_id: props.line.id,
+                        view_ref: 'account.view_move_line_tree_grouped_partner',
+                    })"
+                >
+                    Journal Items
+                </button>
+            </t>
+        </xpath>
+    </t>
+</templates>
diff --git a/dev_odex30_accounting/odex30_account_reports/static/src/components/journal_dashboard_activity/journal_dashboard_activity.js b/dev_odex30_accounting/odex30_account_reports/static/src/components/journal_dashboard_activity/journal_dashboard_activity.js
new file mode 100644
index 0000000..65146fe
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_reports/static/src/components/journal_dashboard_activity/journal_dashboard_activity.js
@@ -0,0 +1,30 @@
+/** @odoo-module */
+import { registry } from "@web/core/registry";
+import { useService } from "@web/core/utils/hooks";
+
+import { JournalDashboardActivity, journalDashboardActivity } from "@account/components/journal_dashboard_activity/journal_dashboard_activity";
+
+export class JournalDashboardActivityTaxReport extends JournalDashboardActivity {
+    setup() {
+        super.setup();
+        this.orm = useService("orm");
+    }
+
+    async openActivity(activity) {
+        if (activity.activity_category === 'tax_report') {
+            const act = await this.orm.call("mail.activity", "action_open_tax_activity", [activity.id], {});
+            this.action.doAction(act);
+        } else {
+            super.openActivity(activity);
+        }
+    }
+}
+
+export const journalDashboardActivityTaxReport = {
+    ...journalDashboardActivity,
+    component: JournalDashboardActivityTaxReport,
+};
+
+registry
+    .category("fields")
+    .add("kanban_vat_activity", journalDashboardActivityTaxReport, { force: true });
diff --git a/dev_odex30_accounting/odex30_account_reports/static/src/components/journal_dashboard_activity/journal_dashboard_activity.xml b/dev_odex30_accounting/odex30_account_reports/static/src/components/journal_dashboard_activity/journal_dashboard_activity.xml
new file mode 100644
index 0000000..b3dc0b7
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_reports/static/src/components/journal_dashboard_activity/journal_dashboard_activity.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<templates>
+    <t t-name="odex30_account_reports.JournalDashboardActivity" t-inherit="account.JournalDashboardActivity" t-inherit-mode="extension">
+        <xpath expr="//div[hasclass('o_mail_activity')]//a" position="attributes" type="add">
+            <attribute name="t-attf-class" add="{{ activity.is_tax_report_error and activity.status != 'late' ? 'text-warning' : '' }}" separator=" "/>
+        </xpath>
+
+        <xpath expr="//div[hasclass('o_mail_activity')]//a//t" position="before">
+            <i t-if="activity.is_tax_report_error" class="fa fa-exclamation-triangle me-1"/>
+        </xpath>
+    </t>
+</templates>
diff --git a/dev_odex30_accounting/odex30_account_reports/static/src/components/journal_report/filter_extra_options.xml b/dev_odex30_accounting/odex30_account_reports/static/src/components/journal_report/filter_extra_options.xml
new file mode 100644
index 0000000..237eca3
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_reports/static/src/components/journal_report/filter_extra_options.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<templates>
+    <t t-name="odex30_account_reports.JournalReportFilterExtraOptions" t-inherit="odex30_account_reports.AccountReportFilterExtraOptions">
+        <xpath expr="//Dropdown/t[@t-set-slot='content']" position="inside">
+            <DropdownItem
+                class="{ 'selected': controller.options.show_payment_lines }"
+                onSelected="() => this.filterClicked({ optionKey: 'show_payment_lines', reload: true})"
+                closingMode="'none'"
+            >
+                Include Payments
+            </DropdownItem>
+        </xpath>
+    </t>
+</templates>
diff --git a/dev_odex30_accounting/odex30_account_reports/static/src/components/journal_report/filters.js b/dev_odex30_accounting/odex30_account_reports/static/src/components/journal_report/filters.js
new file mode 100644
index 0000000..5778ec9
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_reports/static/src/components/journal_report/filters.js
@@ -0,0 +1,8 @@
+import { patch } from "@web/core/utils/patch";
+import { AccountReportFilters } from "@odex30_account_reports/components/account_report/filters/filters";
+
+patch(AccountReportFilters.prototype, {
+    get hasExtraOptionsFilter() {
+        return super.hasExtraOptionsFilter || "show_payment_lines" in this.controller.options;
+    },
+});
diff --git a/dev_odex30_accounting/odex30_account_reports/static/src/components/journal_report/filters.xml b/dev_odex30_accounting/odex30_account_reports/static/src/components/journal_report/filters.xml
new file mode 100644
index 0000000..b50223f
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_reports/static/src/components/journal_report/filters.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<templates>
+    <t t-name="odex30_account_reports.JournalReportFilters" t-inherit="odex30_account_reports.AccountReportFiltersCustomizable">
+        <xpath expr="//div[@id='filter_extra_options']" position="replace">
+            <t t-call="odex30_account_reports.JournalReportFilterExtraOptions"/>
+        </xpath>
+    </t>
+</templates>
diff --git a/dev_odex30_accounting/odex30_account_reports/static/src/components/journal_report/journal_report.scss b/dev_odex30_accounting/odex30_account_reports/static/src/components/journal_report/journal_report.scss
new file mode 100644
index 0000000..dbe0a37
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_reports/static/src/components/journal_report/journal_report.scss
@@ -0,0 +1,38 @@
+.journal_report {
+    .sheet { min-width: 1140px }
+
+    table.striped > tbody > tr:not(.line_level_0):not(.empty) > td:nth-child(2n+3) { background: inherit }
+
+
+    .table > tbody > tr {
+        &.accent_header { background-color: $o-gray-200 }
+        &.accent_line {
+            background-color: $o-gray-100;
+            > td.muted { color: $o-gray-300 }
+        }
+        &.subtable {
+            > td { border-bottom: none }
+            &:hover > * { --table-accent-bg: none }
+        }
+    }
+
+    tr.subtable {
+        .table {
+            table-layout: fixed;
+            width: 100%;
+            max-width: 480px;
+            margin-top: 24px;
+            padding: 0;
+            border: 1px solid $o-gray-300;
+            border-radius: 0.25rem;
+
+            > thead > tr > th {
+                background-color: $o-gray-100;
+                text-align: left;
+
+                .btn_action { opacity: 1 }
+            }
+            :not(caption) > *:not(.btn_action) > *:not(.btn_action) { padding: 0.5rem 0.3rem }
+        }
+    }
+}
diff --git a/dev_odex30_accounting/odex30_account_reports/static/src/components/journal_report/line/line.js b/dev_odex30_accounting/odex30_account_reports/static/src/components/journal_report/line/line.js
new file mode 100644
index 0000000..3b92d4c
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_reports/static/src/components/journal_report/line/line.js
@@ -0,0 +1,39 @@
+/** @odoo-module */
+
+import { AccountReport } from "@odex30_account_reports/components/account_report/account_report";
+import { AccountReportLine } from "@odex30_account_reports/components/account_report/line/line";
+
+export class JournalReportLine extends AccountReportLine {
+    static template = "odex30_account_reports.JournalReportLine";
+
+    // -----------------------------------------------------------------------------------------------------------------
+    // Classes
+    // -----------------------------------------------------------------------------------------------------------------
+    get lineClasses() {
+        let classes = super.lineClasses;
+
+        if (this.props.line.id.includes("|headers~~"))
+            classes += ' accent_header';
+
+        if (this.props.line.move_id)
+            classes += ' accent_line';
+
+        return classes;
+    }
+
+    // -----------------------------------------------------------------------------------------------------------------
+    // Actions
+    // -----------------------------------------------------------------------------------------------------------------
+    async openTaxJournalItems(ev, name, taxType) {
+        return this.controller.reportAction(ev, "journal_report_action_open_tax_journal_items", {
+            name: name,
+            tax_type: taxType,
+            journal_id: this.props.line.journal_id,
+            journal_type: this.props.line.journal_type,
+            date_form: this.props.line.date_from,
+            date_to: this.props.line.date_to,
+        })
+    }
+}
+
+AccountReport.registerCustomComponent(JournalReportLine);
diff --git a/dev_odex30_accounting/odex30_account_reports/static/src/components/journal_report/line/line.xml b/dev_odex30_accounting/odex30_account_reports/static/src/components/journal_report/line/line.xml
new file mode 100644
index 0000000..c64fc75
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_reports/static/src/components/journal_report/line/line.xml
@@ -0,0 +1,143 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<templates>
+    <t t-name="odex30_account_reports.JournalReportLine" t-inherit="odex30_account_reports.AccountReportLineCustomizable">
+        <xpath expr="//tr[@data-id='line']" position="attributes">
+            <attribute name="t-if">!('is_tax_section_line' in props.line)</attribute>
+        </xpath>
+
+        <xpath expr="//tr[@data-id='line']" position="after">
+            <t t-else="">
+                <tr id="line" class="subtable" t-att-class="lineClasses">
+                    <td t-att-colspan="2">
+                        <t t-if="'tax_report_lines' in props.line">
+                            <t t-set="taxesByCountry" t-value="props.line.tax_report_lines"/>
+                            <t t-set="hasTaxesSeveralCountries" t-value="Object.keys(taxesByCountry).length > 1"/>
+                            <t t-set="extraColumns" t-value="props.line.extra_columns"/>
+
+                            <table class="table">
+                                <thead>
+                                    <tr>
+                                        <th t-att-colspan="(taxesByCountry.length > 1 ? 4 : 3) + extraColumns">
+                                            Taxes Applied
+                                            <t t-if="controller.groups.account_user">
+                                                <a
+                                                    class="btn btn_action"
+                                                    t-on-click="(ev) => this.openTaxJournalItems(ev, 'Taxes Applied', 'tax')"
+                                                >
+                                                    Audit
+                                                </a>
+                                            </t>
+                                        </th>
+                                    </tr>
+                                    <tr>
+                                        <t t-if="hasTaxesSeveralCountries">
+                                            <th>Country</th>
+                                        </t>
+                                        <th>Name</th>
+                                        <th class="text-end">Base Amount</th>
+                                        <th class="text-end">Tax Amount</th>
+                                        <th t-if="props.line.tax_non_deductible_column" class="text-end">Non-Deductible</th>
+                                        <th t-if="props.line.tax_deductible_column" class="text-end">Deductible</th>
+                                        <th t-if="props.line.tax_due_column" class="text-end">Due</th>
+                                    </tr>
+                                </thead>
+                                <tbody>
+                                    <t t-foreach="taxesByCountry" t-as="country" t-key="country_index">
+                                        <t t-foreach="props.line.tax_report_lines[country]" t-as="tax" t-key="tax_index">
+                                            <tr>
+                                                <t t-if="hasTaxesSeveralCountries">
+                                                    <td t-out="(tax_index == 0) ? country : ''"/>
+                                                </t>
+
+                                                <td>
+                                                    <a class="link"
+                                                        t-on-click="(ev) => controller.reportAction(ev,
+                                                            'journal_report_action_dropdown_audit_default_tax_report', {
+                                                                line_id: tax.line_id,
+                                                                date_form: props.line.date_from,
+                                                                date_to: props.line.date_to,
+                                                        })"
+                                                    >
+                                                        <t t-out="tax.name"/>
+                                                    </a>
+                                                </td>
+
+                                                <td class="text-end" t-out="tax.base_amount"/>
+                                                <td class="text-end" t-out="tax.tax_amount"/>
+                                                <td t-if="props.line.tax_non_deductible_column" class="text-end" t-out="tax.tax_non_deductible"/>
+                                                <td t-if="props.line.tax_deductible_column" class="text-end" t-out="tax.tax_deductible"/>
+                                                <td t-if="props.line.tax_due_column" class="text-end" t-out="tax.tax_due"/>
+                                            </tr>
+                                        </t>
+                                    </t>
+                                </tbody>
+                            </table>
+                        </t>
+                    </td>
+
+                    <td t-att-colspan="5">
+                        <t t-set="taxGrids" t-value="props.line.tax_grid_summary_lines"/>
+
+                        <t t-if="'tax_grid_summary_lines' in props.line and Object.keys(taxGrids).length">
+                            <t t-set="hasTaxesGridsSeveralCountries" t-value="Object.keys(taxGrids).length > 1"/>
+                            <table class="table">
+                                <thead>
+                                    <tr>
+                                        <th t-att-colspan="(hasTaxesGridsSeveralCountries) ? 5 : 4">
+                                            Impacted Tax Grids
+                                            <t t-if="controller.groups.account_user">
+                                                <a
+                                                    class="btn btn_action"
+                                                    t-on-click="(ev) => this.openTaxJournalItems(ev, 'Impacted Tax Grids', 'tag')"
+                                                >
+                                                    Audit
+                                                </a>
+                                            </t>
+                                        </th>
+                                    </tr>
+                                    <tr>
+                                        <t t-if="hasTaxesGridsSeveralCountries">
+                                            <th>Country</th>
+                                        </t>
+                                        <th>Grid</th>
+                                        <th class="text-end">+</th>
+                                        <th class="text-end">-</th>
+                                        <th class="text-end">Impact On Grid</th>
+                                    </tr>
+                                </thead>
+                                <tbody>
+                                    <t t-foreach="taxGrids" t-as="country" t-key="country_index">
+                                        <t t-foreach="taxGrids[country]" t-as="grid" t-key="grid_index">
+                                            <tr>
+                                                <t t-if="hasSeveralGrids">
+                                                    <td t-out="(grid_index == 0) ? country : ''"/>
+                                                </t>
+
+                                                <td>
+                                                    <a class="link"
+                                                        t-on-click="(ev) => controller.reportAction(ev,
+                                                            'journal_report_tax_tag_template_open_aml', {
+                                                                tag_ids: taxGrids[country][grid]['tag_ids'],
+                                                                date_form: props.line.date_from,
+                                                                date_to: props.line.date_to,
+                                                        })"
+                                                    >
+                                                        <t t-out="grid"/>
+                                                    </a>
+                                                </td>
+
+                                                <td class="text-end" t-out="taxGrids[country][grid]['+'] || 0"/>
+                                                <td class="text-end" t-out="taxGrids[country][grid]['-'] || 0"/>
+                                                <td class="text-end" t-out="taxGrids[country][grid]['impact']"/>
+                                            </tr>
+                                        </t>
+                                    </t>
+                                </tbody>
+                            </table>
+                        </t>
+                    </td>
+                </tr>
+            </t>
+        </xpath>
+    </t>
+</templates>
diff --git a/dev_odex30_accounting/odex30_account_reports/static/src/components/journal_report/line_name.xml b/dev_odex30_accounting/odex30_account_reports/static/src/components/journal_report/line_name.xml
new file mode 100644
index 0000000..8c7e598
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_reports/static/src/components/journal_report/line_name.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<templates>
+    <t t-name="odex30_account_reports.JournalReportLineName" t-inherit="odex30_account_reports.AccountReportLineNameCustomizable">
+        <xpath expr="//td[@data-id='line_name']//div[@data-id='content']" position="replace">
+            <t t-if="'journal_id' in props.line and 'account_id' in props.line">
+                <a
+                    class="link"
+                    t-on-click="
+                    (ev) => controller.reportAction(
+                        ev,
+                        'journal_report_action_open_account_move_lines_by_account',
+                        {
+                            journal_id: props.line.journal_id,
+                            account_id: props.line.account_id
+                        }
+                    )"
+                >
+                    <t t-out="props.line.name"/>
+                </a>
+            </t>
+            <t t-else="">
+                <t t-out="props.line.name"/>
+
+                <t t-if="'journal_id' in props.line">
+                    <button
+                        class="btn btn_action"
+                        t-on-click="(ev) => controller.reportAction(ev, 'journal_report_open_aml_by_move', {
+                            journal_id: props.line.journal_id,
+                            line_id: props.line.id,
+                        })"
+                    >
+                        Audit
+                    </button>
+                </t>
+            </t>
+        </xpath>
+    </t>
+</templates>
diff --git a/dev_odex30_accounting/odex30_account_reports/static/src/components/journal_report/move_line_list/move_line_list.js b/dev_odex30_accounting/odex30_account_reports/static/src/components/journal_report/move_line_list/move_line_list.js
new file mode 100644
index 0000000..5a42fc2
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_reports/static/src/components/journal_report/move_line_list/move_line_list.js
@@ -0,0 +1,23 @@
+/** @odoo-module **/
+
+import { registry } from "@web/core/registry";
+import { AccountMoveLineListRenderer, AccountMoveLineListView } from "@odex30_account_accountant/components/move_line_list/move_line_list";
+
+
+export class JournalReportAccountMoveLineReconcileListRenderer extends AccountMoveLineListRenderer {
+    setup() {
+        super.setup();
+        this.props.list.groups?.forEach(group => {
+            group.list?.groups?.forEach(innerGroup => {
+                this.toggleGroup(innerGroup);
+            });
+        });
+    }
+}
+
+export const JournalReportAccountMoveLineReconcileLineListView = {
+    ...AccountMoveLineListView,
+    Renderer: JournalReportAccountMoveLineReconcileListRenderer,
+};
+
+registry.category("views").add("account_move_line_journal_report_list", JournalReportAccountMoveLineReconcileLineListView);
diff --git a/dev_odex30_accounting/odex30_account_reports/static/src/components/multicurrency_revaluation_report/filters/filter_exchange_rate.xml b/dev_odex30_accounting/odex30_account_reports/static/src/components/multicurrency_revaluation_report/filters/filter_exchange_rate.xml
new file mode 100644
index 0000000..fce2df7
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_reports/static/src/components/multicurrency_revaluation_report/filters/filter_exchange_rate.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<templates>
+    <t t-name="odex30_account_reports.MulticurrencyRevaluationReportFilterExchangeRate">
+        <Dropdown
+            menuClass="'account_report_filter exchange_rate'"
+            onStateChanged="(isOpen) => !isOpen ? this.applyFilters('currency_rates') : null"
+        >
+            <button class="btn btn-secondary">
+                <i class="fa fa-line-chart"/> Exchange Rates
+            </button>
+
+            <t t-set-slot="content">
+                <div class="dropdown-header pe-none">
+                    1 <t t-out="controller.options.company_currency.currency_main"/>
+                </div>
+
+                <t t-foreach="Object.values(this.controller.options.currency_rates)" t-as="currencyRate" t-key="currencyRate.currency_id">
+                    <div class="dropdown-item">
+                        <div>
+                            <input
+                                type="text"
+                                inputmode="decimal"
+                                t-att-value="currencyRate.rate"
+                                t-att-name="currencyRate.currency_id"
+                                t-on-change="(ev) => this.filterExchangeRate(ev, currencyRate.currency_id)"
+                            />
+                        </div>
+                        <label class="d-flex align-items-center" t-att-for="currencyRate.currency_id">
+                            <t t-out="currencyRate.currency_name"/>
+                        </label>
+                    </div>
+                </t>
+            </t>
+        </Dropdown>
+    </t>
+</templates>
diff --git a/dev_odex30_accounting/odex30_account_reports/static/src/components/multicurrency_revaluation_report/filters/filters.js b/dev_odex30_accounting/odex30_account_reports/static/src/components/multicurrency_revaluation_report/filters/filters.js
new file mode 100644
index 0000000..8e6e472
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_reports/static/src/components/multicurrency_revaluation_report/filters/filters.js
@@ -0,0 +1,23 @@
+import { AccountReport } from "@odex30_account_reports/components/account_report/account_report";
+import { AccountReportFilters } from "@odex30_account_reports/components/account_report/filters/filters";
+import { parseFloat } from "@web/views/fields/parsers";
+import { _t } from "@web/core/l10n/translation";
+
+export class MulticurrencyRevaluationReportFilters extends AccountReportFilters {
+    static template = "odex30_account_reports.MulticurrencyRevaluationReportFilters";
+
+    //------------------------------------------------------------------------------------------------------------------
+    // Custom filters
+    //------------------------------------------------------------------------------------------------------------------
+    async filterExchangeRate(ev, currencyId) {
+        try {
+            this.controller.options.currency_rates[currencyId].rate = Math.abs(parseFloat(ev.currentTarget.value));
+        } catch {
+            this.notification.add(_t("Please enter a valid number."), {
+                type: "danger",
+            });
+        }
+    }
+}
+
+AccountReport.registerCustomComponent(MulticurrencyRevaluationReportFilters);
diff --git a/dev_odex30_accounting/odex30_account_reports/static/src/components/multicurrency_revaluation_report/filters/filters.scss b/dev_odex30_accounting/odex30_account_reports/static/src/components/multicurrency_revaluation_report/filters/filters.scss
new file mode 100644
index 0000000..dceb099
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_reports/static/src/components/multicurrency_revaluation_report/filters/filters.scss
@@ -0,0 +1,21 @@
+.account_report_filter {
+    &.exchange_rate {
+        .dropdown-item {
+            display: flex;
+            justify-content: space-between;
+
+            &.focus, &.selected:hover, &.selected:focus { background-color: inherit }
+            input {
+                display: inline;
+                width: 100px;
+                margin: 0 8px;
+                border-top: none;
+                border-left: none;
+                border-right: none;
+                border-bottom: 1px solid var(--o-input-border-color);
+                text-align: right;
+                background-color: inherit;
+            }
+        }
+    }
+}
diff --git a/dev_odex30_accounting/odex30_account_reports/static/src/components/multicurrency_revaluation_report/filters/filters.xml b/dev_odex30_accounting/odex30_account_reports/static/src/components/multicurrency_revaluation_report/filters/filters.xml
new file mode 100644
index 0000000..a7cc121
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_reports/static/src/components/multicurrency_revaluation_report/filters/filters.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<templates>
+    <t t-name="odex30_account_reports.MulticurrencyRevaluationReportFilters" t-inherit="odex30_account_reports.AccountReportFiltersCustomizable">
+        <xpath expr="//div[@id='filter_extra_options']" position="before">
+            <t t-if="'currency_rates' in this.controller.options">
+                <div id="filter_exchange_rate" class="filter_exchange_rate">
+                    <t t-call="odex30_account_reports.MulticurrencyRevaluationReportFilterExchangeRate"/>
+                </div>
+            </t>
+        </xpath>
+    </t>
+</templates>
diff --git a/dev_odex30_accounting/odex30_account_reports/static/src/components/multicurrency_revaluation_report/line_name.xml b/dev_odex30_accounting/odex30_account_reports/static/src/components/multicurrency_revaluation_report/line_name.xml
new file mode 100644
index 0000000..c9fd246
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_reports/static/src/components/multicurrency_revaluation_report/line_name.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<templates>
+    <t t-name="odex30_account_reports.MulticurrencyRevaluationReportLineName" t-inherit="odex30_account_reports.AccountReportLineNameCustomizable">
+        <xpath expr="//t[@data-id='line_buttons']" position="inside">
+            <t t-if="props.line.cur_revaluation_line_model === 'res.currency'">
+                <Dropdown position="'right-start'">
+                    <button class="btn btn_more">
+                        <i class="fa fa-ellipsis-v"/>
+                    </button>
+
+                    <t t-set-slot="content">
+                        <DropdownItem onSelected="(ev) => controller.reportAction(ev, 'action_multi_currency_revaluation_open_currency_rates', { line_id: props.line.id })">
+                            Rates
+                        </DropdownItem>
+                    </t>
+                </Dropdown>
+            </t>
+
+            <t t-if="props.line.cur_revaluation_line_model === 'account.account'">
+                <Dropdown position="'right-start'">
+                    <button class="btn btn_more">
+                        <i class="fa fa-ellipsis-v"/>
+                    </button>
+
+                    <t t-set-slot="content">
+                        <DropdownItem onSelected="(ev) => controller.reportAction(ev, 'action_multi_currency_revaluation_open_general_ledger', { line_id: props.line.id })">
+                            General Ledger
+                        </DropdownItem>
+
+                        <DropdownItem onSelected="(ev) => controller.reportAction(ev, 'action_multi_currency_revaluation_toggle_provision', { line_id: props.line.id })">
+                            <t t-esc="props.line.is_included_line ? 'Exclude' : 'Include'"/>
+                        </DropdownItem>
+                    </t>
+                </Dropdown>
+            </t>
+        </xpath>
+    </t>
+</templates>
diff --git a/dev_odex30_accounting/odex30_account_reports/static/src/components/multicurrency_revaluation_report/warnings.xml b/dev_odex30_accounting/odex30_account_reports/static/src/components/multicurrency_revaluation_report/warnings.xml
new file mode 100644
index 0000000..2f7155d
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_reports/static/src/components/multicurrency_revaluation_report/warnings.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<templates>
+    <t t-name="odex30_account_reports.multi_currency_revaluation_report_warning_custom_rate">
+        You are using custom exchange rates.
+        <button
+           class="btn btn-link p-0 align-baseline"
+           t-on-click="() => this.controller.updateOption('currency_rates', {}, true)"
+        >
+            ⇒ Reset to Odoo’s Rate
+        </button>
+    </t>
+
+    <t t-name="odex30_account_reports.multi_currency_revaluation_report_warning_multicompany">
+        This report only displays the data of the active company.
+    </t>
+</templates>
diff --git a/dev_odex30_accounting/odex30_account_reports/static/src/components/partner_ledger/filter_extra_options.xml b/dev_odex30_accounting/odex30_account_reports/static/src/components/partner_ledger/filter_extra_options.xml
new file mode 100644
index 0000000..0adeb56
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_reports/static/src/components/partner_ledger/filter_extra_options.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<templates>
+    <t t-name="odex30_account_reports.PartnerLedgerReportFilterExtraOptions" t-inherit="odex30_account_reports.AccountReportFilterExtraOptions">
+        <!-- Deprecated options, will be removed in master-->
+        <xpath expr="//DropdownItem[contains(@class, 'filter_show_all_hook')]" position="after">
+            <DropdownItem
+                t-if="'hide_account' in controller.options"
+                class="{ 'selected': controller.options.hide_account }"
+                onSelected="() => this.filterClicked({ optionKey: 'hide_account', reload: true})"
+                closingMode="'none'"
+            >
+                Hide Account
+            </DropdownItem>
+            <DropdownItem
+                t-if="'hide_debit_credit' in controller.options"
+                class="{ 'selected': controller.options.hide_debit_credit }"
+                onSelected="() => this.filterClicked({ optionKey: 'hide_debit_credit', reload: true})"
+                closingMode="'none'"
+            >
+                Hide Debit/Credit
+            </DropdownItem>
+        </xpath>
+    </t>
+</templates>
diff --git a/dev_odex30_accounting/odex30_account_reports/static/src/components/partner_ledger/filters.xml b/dev_odex30_accounting/odex30_account_reports/static/src/components/partner_ledger/filters.xml
new file mode 100644
index 0000000..c2de03b
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_reports/static/src/components/partner_ledger/filters.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<templates>
+    <t t-name="odex30_account_reports.PartnerLedgerFilters" t-inherit="odex30_account_reports.AccountReportFiltersCustomizable">
+        <xpath expr="//div[@id='filter_extra_options']" position="replace">
+            <t t-call="odex30_account_reports.PartnerLedgerReportFilterExtraOptions"/>
+        </xpath>
+    </t>
+</templates>
diff --git a/dev_odex30_accounting/odex30_account_reports/static/src/components/partner_ledger/line_cell.js b/dev_odex30_accounting/odex30_account_reports/static/src/components/partner_ledger/line_cell.js
new file mode 100644
index 0000000..24dd59b
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_reports/static/src/components/partner_ledger/line_cell.js
@@ -0,0 +1,26 @@
+
+/** @odoo-module */
+
+import { AccountReport } from "@odex30_account_reports/components/account_report/account_report";
+import { AccountReportLineCell } from "@odex30_account_reports/components/account_report/line_cell/line_cell";
+const { DateTime } = luxon;
+
+
+export class PartnerLedgerLineCell extends AccountReportLineCell {
+    static template = "odex30_account_reports.PartnerLedgerLineCell";
+    get cellClasses() {
+        let superCellClasses = super.cellClasses;
+        const cell = this.props.cell;
+        if (
+            cell.figure_type === 'date'
+            && cell.expression_label == 'date_maturity'
+            && cell.no_format
+            && DateTime.fromISO(cell.no_format).startOf('day') < DateTime.now().startOf('day')
+        ) {
+            superCellClasses += ' text-danger';
+        }
+        return superCellClasses;
+    }
+}
+
+AccountReport.registerCustomComponent(PartnerLedgerLineCell);
diff --git a/dev_odex30_accounting/odex30_account_reports/static/src/components/partner_ledger/line_cell.xml b/dev_odex30_accounting/odex30_account_reports/static/src/components/partner_ledger/line_cell.xml
new file mode 100644
index 0000000..d4fc6be
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_reports/static/src/components/partner_ledger/line_cell.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<templates>
+    <t t-name="odex30_account_reports.PartnerLedgerLineCell" t-inherit="odex30_account_reports.AccountReportLineCell"/>
+</templates>
diff --git a/dev_odex30_accounting/odex30_account_reports/static/src/components/partner_ledger/line_name.xml b/dev_odex30_accounting/odex30_account_reports/static/src/components/partner_ledger/line_name.xml
new file mode 100644
index 0000000..248a32c
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_reports/static/src/components/partner_ledger/line_name.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<templates>
+    <t t-name="odex30_account_reports.PartnerLedgerLineName" t-inherit="odex30_account_reports.AccountReportLineNameCustomizable">
+        <xpath expr="//td[@data-id='line_name']" position="attributes">
+            <t t-if="props.line.unfoldable">
+                <attribute name="class" add="more" separator=" "/>
+            </t>
+        </xpath>
+
+        <xpath expr="//t[@data-id='line_buttons']" position="inside">
+            <t t-if="props.line.unfoldable">
+                <button
+                    class="btn btn_action"
+                    t-on-click="(ev) => controller.reportAction(ev, 'action_open_partner', { id: props.line.id })"
+                >
+                    Partner
+                </button>
+
+                <button
+                    class="btn btn_action"
+                    t-on-click="(ev) => controller.reportAction(ev, 'open_journal_items', {
+                    line_id: props.line.id,
+                    view_ref: 'account.view_move_line_tree_grouped_partner',
+                })"
+                >
+                    Journal Items
+                </button>
+            </t>
+        </xpath>
+
+        <xpath expr="//button[@data-id='btn_foldable']" position="after">
+            <t t-if="props.line.trust === 'good'">
+                <i class="fa fa-circle text-success partner_trust" title="Partner is good"/>
+            </t>
+            <t t-elif="props.line.trust === 'bad'">
+                <i class="fa fa-circle text-danger partner_trust" title="Partner is bad"/>
+            </t>
+        </xpath>
+    </t>
+</templates>
diff --git a/dev_odex30_accounting/odex30_account_reports/static/src/components/partner_ledger/partner_ledger.scss b/dev_odex30_accounting/odex30_account_reports/static/src/components/partner_ledger/partner_ledger.scss
new file mode 100644
index 0000000..3f6c40a
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_reports/static/src/components/partner_ledger/partner_ledger.scss
@@ -0,0 +1,3 @@
+.account_report.partner_ledger {
+    .partner_trust { line-height: 20px }
+}
diff --git a/dev_odex30_accounting/odex30_account_reports/static/src/components/redirectAction/redirectAction.js b/dev_odex30_accounting/odex30_account_reports/static/src/components/redirectAction/redirectAction.js
new file mode 100644
index 0000000..683289d
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_reports/static/src/components/redirectAction/redirectAction.js
@@ -0,0 +1,30 @@
+/** @odoo-module */
+import { registry } from "@web/core/registry";
+import { useService } from "@web/core/utils/hooks";
+import { Component } from "@odoo/owl";
+import { standardActionServiceProps } from "@web/webclient/actions/action_service";
+import { Dialog } from "@web/core/dialog/dialog";
+
+class RedirectAction extends Component {
+    static template = "odex30_account_reports.redirectAction";
+    static components = { Dialog };
+
+    static props = {
+        ...standardActionServiceProps,
+        action: Object
+    }
+
+    setup() {
+        this.actionService = useService("action");
+    }
+
+    openClientAction() {
+        this.actionService.doAction(this.props.action.params.depending_action);
+    }
+
+    close() {
+        this.actionService.doAction({type: 'ir.actions.act_window_close'});
+    }
+}
+
+registry.category("actions").add("odex30_account_reports.redirect_action", RedirectAction);
diff --git a/dev_odex30_accounting/odex30_account_reports/static/src/components/redirectAction/redirectAction.xml b/dev_odex30_accounting/odex30_account_reports/static/src/components/redirectAction/redirectAction.xml
new file mode 100644
index 0000000..e91e46e
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_reports/static/src/components/redirectAction/redirectAction.xml
@@ -0,0 +1,13 @@
+<templates xml:space="preserve">
+    <t t-name="odex30_account_reports.redirectAction">
+        <Dialog size="'md'">
+            <div role="alert">
+                <p class="text-prewrap" t-esc="props.action.params.message"/>
+            </div>
+            <t t-set-slot="footer">
+                <button class="btn btn-primary" t-on-click="openClientAction" t-esc="props.action.params.button_text"></button>
+                <button class="btn btn-secondary" t-on-click="close">Cancel</button>
+            </t>
+        </Dialog>
+    </t>
+</templates>
diff --git a/dev_odex30_accounting/odex30_account_reports/static/src/components/sales_report/filters/filter_code.xml b/dev_odex30_accounting/odex30_account_reports/static/src/components/sales_report/filters/filter_code.xml
new file mode 100644
index 0000000..e3c23e3
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_reports/static/src/components/sales_report/filters/filter_code.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<templates>
+    <t t-name="odex30_account_reports.SalesReportFilterCode">
+        <Dropdown>
+            <button class="btn btn-secondary">
+                <i class="fa fa-filter me-1"/> Codes: <t t-esc="selectedEcTaxName"/>
+            </button>
+
+            <t t-set-slot="content">
+                <t t-foreach="controller.options.ec_tax_filter_selection" t-as="ecTax" t-key="ecTax_index">
+                    <DropdownItem
+                        class="{ 'selected':  ecTax.selected }"
+                        onSelected="() => this.filterClicked({ optionKey: 'ec_tax_filter_selection.'+ ecTax_index + '.selected', reload: true})"
+                        closingMode="'none'"
+                        t-out="ecTax.name"
+                    />
+                </t>
+            </t>
+        </Dropdown>
+    </t>
+</templates>
diff --git a/dev_odex30_accounting/odex30_account_reports/static/src/components/sales_report/filters/filters.js b/dev_odex30_accounting/odex30_account_reports/static/src/components/sales_report/filters/filters.js
new file mode 100644
index 0000000..492b893
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_reports/static/src/components/sales_report/filters/filters.js
@@ -0,0 +1,28 @@
+import { _t } from "@web/core/l10n/translation";
+
+import { AccountReport } from "@odex30_account_reports/components/account_report/account_report";
+import { AccountReportFilters } from "@odex30_account_reports/components/account_report/filters/filters";
+
+export class SalesReportFilters extends AccountReportFilters {
+    static template = "odex30_account_reports.SalesReportFilters";
+
+    //------------------------------------------------------------------------------------------------------------------
+    // Getters
+    //------------------------------------------------------------------------------------------------------------------
+    get selectedEcTaxName() {
+        const selected = this.controller.options.ec_tax_filter_selection.filter(
+            (ecTax) => ecTax.selected,
+        );
+
+        switch (selected.length) {
+            case this.controller.options.ec_tax_filter_selection.length:
+                return _t("All");
+            case 0:
+                return _t("None");
+            default:
+                return selected.map((s) => s.name.substring(0, 1)).join(", ");
+        }
+    }
+}
+
+AccountReport.registerCustomComponent(SalesReportFilters);
diff --git a/dev_odex30_accounting/odex30_account_reports/static/src/components/sales_report/filters/filters.xml b/dev_odex30_accounting/odex30_account_reports/static/src/components/sales_report/filters/filters.xml
new file mode 100644
index 0000000..c98b4f2
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_reports/static/src/components/sales_report/filters/filters.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<templates>
+    <t t-name="odex30_account_reports.SalesReportFilters" t-inherit="odex30_account_reports.AccountReportFiltersCustomizable">
+        <xpath expr="//t[@t-if='hasExtraOptionsFilter']" position="before">
+            <t t-if='hasCodesFilter' t-call="odex30_account_reports.SalesReportFilterCode"/>
+        </xpath>
+    </t>
+</templates>
diff --git a/dev_odex30_accounting/odex30_account_reports/static/src/components/sales_report/warnings.xml b/dev_odex30_accounting/odex30_account_reports/static/src/components/sales_report/warnings.xml
new file mode 100644
index 0000000..8a62176
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_reports/static/src/components/sales_report/warnings.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<templates>
+    <t t-name="odex30_account_reports.sales_report_warning_non_ec_country">
+        Intra-community taxes are applied on
+        <a t-on-click="(ev) => controller.reportAction(ev, 'get_warning_act_window', { type: 'non_ec_country', model: 'move' })">invoices</a>
+        addressed to
+        <a t-on-click="(ev) => controller.reportAction(ev, 'get_warning_act_window', { type: 'non_ec_country', model: 'partner' })">partners</a>
+        who are not established in any of the EC countries.
+    </t>
+
+    <t t-name="odex30_account_reports.sales_report_warning_missing_vat">
+        Intra-community taxes are applied on
+        <a t-on-click="(ev) => controller.reportAction(ev, 'get_warning_act_window', { type: 'no_vat', model: 'move' })">invoices</a>
+        addressed to
+        <a t-on-click="(ev) => controller.reportAction(ev, 'get_warning_act_window', { type: 'no_vat', model: 'partner' })">partners</a>
+        without a valid intra-community VAT number.
+    </t>
+
+    <t t-name="odex30_account_reports.sales_report_warning_same_country">
+        Intra-community taxes are applied on
+        <a t-on-click="(ev) => controller.reportAction(ev, 'get_warning_act_window', { type: 'same_country', model: 'move' })">invoices</a>
+        addressed to
+        <a t-on-click="(ev) => controller.reportAction(ev, 'get_warning_act_window', { type: 'same_country', model: 'partner' })">partners</a>
+        that are not established abroad.
+    </t>
+
+    <t t-name="odex30_account_reports.sales_report_warning_duplicated_vat">
+        Some lines in the report involve partners that share the same VAT number.
+
+        Please review the <a t-on-click="(ev) => controller.reportAction(ev, 'get_warning_act_window', { type: 'duplicated_vat', model: 'partner', 'duplicated_partners_vat': warningParams.duplicated_partners_vat})">affected partners</a>
+        to resolve the duplication.
+    </t>
+</templates>
diff --git a/dev_odex30_accounting/odex30_account_reports/static/src/components/tax_report/filters/filter_date.xml b/dev_odex30_accounting/odex30_account_reports/static/src/components/tax_report/filters/filter_date.xml
new file mode 100644
index 0000000..f3949fd
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_reports/static/src/components/tax_report/filters/filter_date.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<templates>
+    <t t-name="odex30_account_reports.TaxReportFilterDate" t-inherit="odex30_account_reports.AccountReportFilterDate">
+        <xpath expr="//t[last()]/t[@t-call='odex30_account_reports.AccountReportFilterDateSelection']" position="before">
+            <DropdownItem
+            t-if="this.controller.options.show_tax_period_filter"
+            class="{ 'd-flex justify-content-between date_filter': true, 'selected': (this.isPeriodSelected('tax_period')) }"
+            onSelected="() => this.selectDateFilter('tax_period', controller.options.date.period_type != 'tax_period')"
+            closingMode="'none'"
+            >
+                <div class="filter_name pe-3">
+                    Tax Period
+                </div>
+                
+                <div class="d-flex justify-content-between">
+                    <button
+                        class="btn_previous_date fa fa-caret-left"
+                        t-on-click="() => this.selectPreviousPeriod('tax_period')"
+                    />
+                    <time class="d-flex justify-content-center" style="min-width: 120px;">
+                        <t t-out="this.displayPeriod('tax_period')"/>
+                    </time>
+                    <button
+                    class="btn_next_date fa fa-caret-right"
+                    t-on-click="() => this.selectNextPeriod('tax_period')"
+                    />
+                </div>
+            </DropdownItem>
+            <div id="filter_date_divider_range_period" class="dropdown-divider"/>
+        </xpath>
+    </t>
+</templates>
diff --git a/dev_odex30_accounting/odex30_account_reports/static/src/components/tax_report/filters/filters.xml b/dev_odex30_accounting/odex30_account_reports/static/src/components/tax_report/filters/filters.xml
new file mode 100644
index 0000000..4ee2cde
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_reports/static/src/components/tax_report/filters/filters.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<templates>
+    <t t-name="odex30_account_reports.GenericTaxReportFiltersCustomizable" t-inherit="odex30_account_reports.AccountReportFiltersCustomizable">
+        <xpath expr="//div[@id='filter_date']/t[@t-call]" position="replace">
+            <t t-call="odex30_account_reports.TaxReportFilterDate"/>
+        </xpath>
+    </t>
+</templates>
diff --git a/dev_odex30_accounting/odex30_account_reports/static/src/components/tax_report/line_name.xml b/dev_odex30_accounting/odex30_account_reports/static/src/components/tax_report/line_name.xml
new file mode 100644
index 0000000..999efc2
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_reports/static/src/components/tax_report/line_name.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<templates>
+    <t t-name="odex30_account_reports.TaxReportLineName" t-inherit="odex30_account_reports.AccountReportLineNameCustomizable">
+        <xpath expr="//div[@data-id='content']" position="before">
+            <t t-if="props.line.alert">
+                <i class="fa fa-exclamation-circle consistency_warning"/>
+            </t>
+        </xpath>
+    </t>
+</templates>
diff --git a/dev_odex30_accounting/odex30_account_reports/static/src/components/tax_report/tax_report.scss b/dev_odex30_accounting/odex30_account_reports/static/src/components/tax_report/tax_report.scss
new file mode 100644
index 0000000..1de607f
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_reports/static/src/components/tax_report/tax_report.scss
@@ -0,0 +1,8 @@
+.generic_tax_report {
+    .consistency_warning {
+        color: $o-danger;
+        width: 20px;
+        line-height: 20px;
+        text-align: center;
+    }
+}
diff --git a/dev_odex30_accounting/odex30_account_reports/static/src/components/tax_report/warnings.xml b/dev_odex30_accounting/odex30_account_reports/static/src/components/tax_report/warnings.xml
new file mode 100644
index 0000000..36a1c34
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_reports/static/src/components/tax_report/warnings.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<templates>
+    <t t-name="odex30_account_reports.tax_report_warning_inactive_tags" owl="1">
+        Some journal items appear to point to obsolete report lines.
+        <a type="button" t-on-click="(ev) => controller.reportAction(ev, 'action_open_amls_with_archived_tags')">Check them</a>
+        and correct their tax tags if necessary.
+    </t>
+
+    <t t-name="odex30_account_reports.tax_report_warning_lines_consistency" owl="1">
+        This report contains inconsistencies. The affected lines are marked with a warning.
+    </t>
+
+    <t t-name="odex30_account_reports.tax_report_warning_tax_id_selected_companies">
+        All selected companies or branches do not share the same Tax ID. Please check the Tax ID of the selected companies.
+    </t>
+</templates>
diff --git a/dev_odex30_accounting/odex30_account_reports/static/src/js/action_manager_account_report_dl.js b/dev_odex30_accounting/odex30_account_reports/static/src/js/action_manager_account_report_dl.js
new file mode 100644
index 0000000..02ca0f8
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_reports/static/src/js/action_manager_account_report_dl.js
@@ -0,0 +1,34 @@
+/** @odoo-module */
+
+import { registry } from "@web/core/registry";
+import { download } from "@web/core/network/download";
+
+async function executeAccountReportDownload({ env, action }) {
+    env.services.ui.block();
+
+    const url = "/account_reports";
+    const data = action.data;
+
+    try {
+        await download({ url, data });
+        env.services.action.doAction({type: 'ir.actions.act_window_close'});
+    } catch (e) {
+        if (e.exceptionName === 'AccountReportFileDownloadException') {
+            const reportOptions = JSON.parse(data.options);
+            const reportAction = await env.services.orm.call(
+                'account.report',
+                'open_account_report_file_download_error_wizard',
+                [reportOptions.report_id, e.data.arguments[0], e.data.arguments[1]],
+            );
+            env.services.action.doAction(reportAction);
+        } else {
+            throw e;
+        }
+    } finally {
+        env.services.ui.unblock();
+    }
+}
+
+registry
+    .category("action_handlers")
+    .add('ir_actions_account_report_download', executeAccountReportDownload);
diff --git a/dev_odex30_accounting/odex30_account_reports/static/src/js/util.js b/dev_odex30_accounting/odex30_account_reports/static/src/js/util.js
new file mode 100644
index 0000000..c3efa35
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_reports/static/src/js/util.js
@@ -0,0 +1,57 @@
+const LINE_ID_HIERARCHY_DELIMITER = "|";
+const LINE_ID_GROUP_DELIMITER = "~";
+
+export function buildLineId(current) {
+    const convertNull = (value) => {
+        if (value === null || value === undefined || value === false) {
+            return "";
+        } else if (typeof value === "object") {
+            // We're using the replaceAll to follow the python
+            // behavior where we're stringify a dict.
+            return JSON.stringify(value).replaceAll('":', '": ');
+        }
+        return value;
+    };
+
+    return current
+        .map(([markup, model, value]) => {
+            const lineValues = [convertNull(markup), convertNull(model), convertNull(value)];
+            return lineValues.join(LINE_ID_GROUP_DELIMITER);
+        })
+        .join(LINE_ID_HIERARCHY_DELIMITER);
+}
+
+export function parseLineId(lineID, markupAsString = false) {
+    const parseMarkup = (markup) => {
+        if (!markup) {
+            return markup;
+        }
+        try {
+            const result = JSON.parse(markup);
+            return typeof result === "object" ? result : markup;
+        } catch {
+            return markup;
+        }
+    };
+
+    if (!lineID) {
+        return [];
+    }
+    return lineID.split(LINE_ID_HIERARCHY_DELIMITER).map((key) => {
+        const [markup, model, value] = key.split(LINE_ID_GROUP_DELIMITER);
+        return [
+            (markupAsString ? markup : parseMarkup(markup)) || null,
+            model || null,
+            model && value ? parseInt(value) : value || null,
+        ];
+    });
+}
+
+export function removeTaxGroupingFromLineId(lineId) {
+    // Tax grouping is not relevant for annotations, so we remove it from the line id.
+    return buildLineId(
+        parseLineId(lineId, true).filter(([markup, model, value]) => {
+            return model !== "account.group";
+        })
+    );
+}
diff --git a/dev_odex30_accounting/odex30_account_reports/static/src/scss/account_financial_report.dark.scss b/dev_odex30_accounting/odex30_account_reports/static/src/scss/account_financial_report.dark.scss
new file mode 100644
index 0000000..5f6b56d
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_reports/static/src/scss/account_financial_report.dark.scss
@@ -0,0 +1,21 @@
+// = ACCOUNT FINANCIAL REPORT
+// ============================================================================
+// No CSS hacks, variables overrides only
+
+.o_account_reports_page {
+    --AccountFinancial-background-color: #{$o-gray-200};
+    --AccountFinancial-background-contrast: #{$o-gray-300};
+    --AccountFinancial-background-hover: #{$o-gray-300};
+    --AccountFinancial-background-linear: linear-gradient(#{$o-gray-200}, #{$o-gray-200}), linear-gradient(#{$o-gray-300}, #{$o-gray-300});
+    --AccountFinancial-text-color: #{$o-gray-800};
+    --AccountFinancial-red-color: #F14C23;
+    --AccountFinancial-link-color: #00DAC5;
+    --AccountFinancial-border-color: #{$o-gray-400};
+    --AccountFinancial-border-accent-color: #{$o-gray-600};
+    --AccountFinancial-subtable-color: #{$o-gray-300};
+}
+
+.account_report {
+    --AccountReport-fine-line-separator-color: #{$o-gray-300};
+    --AccountReport-muted-data-color: #{$o-gray-400};
+}
diff --git a/dev_odex30_accounting/odex30_account_reports/static/src/scss/account_pdf_export_template.scss b/dev_odex30_accounting/odex30_account_reports/static/src/scss/account_pdf_export_template.scss
new file mode 100644
index 0000000..ad455d1
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_reports/static/src/scss/account_pdf_export_template.scss
@@ -0,0 +1,145 @@
+/**************************************
+    This file contains all the css for the pdf export of the reports
+
+    NB: We only use bootstrap for the grid system to avoid having problems in the future if bootstrap is updated
+    and don't work wih wkhtmltopdf anymore
+***************************************/
+
+.o_content {
+    margin: 20px;
+
+    // Define direction attribute here so when rtlcss preprocessor run, it converts it to rtl
+    direction: ltr;
+
+    /*****************
+        HEADER OF THE REPORT
+    *****************/
+    header {
+        padding: 10px;
+        background-color: #d8dce2;
+        margin-bottom: 10px;
+
+        .o_header_font { font-size: 13px }
+    }
+    /*****************
+        TABLE
+    *****************/
+    .o_table {
+        width: 100%;
+        font-family: 'Verdana', sans-serif;
+        font-size: 0.8rem;
+        margin: 0 0 24px;
+        padding: 24px;
+
+        > :not(caption) > * > * { padding: 0.25rem 0.75rem } //!\\ Override of bootstrap, keep selector
+
+        // Override bootstrap in the account reports
+        thead, tbody, tfoot, tr, td, th { border-style: none }
+
+        &.horizontal_split_page {
+            width: 48%;
+            margin-left: 1%;
+            margin-right: 1%;
+        }
+
+        /*****************
+            Header of the main table
+        *****************/
+        > thead {
+            white-space: nowrap;
+            tr > th:first-child { width:100% }
+
+            > tr:not(:last-child) th:not(:first-child) {
+                border: 1px solid $o-gray-300;
+                text-align: center;
+            }
+        }
+        /*****************
+            Body of the main table
+        *****************/
+        > tbody {
+            white-space: nowrap; // Will be override by o_overflow if the line is too big
+
+            tr {
+                height: 20px; // So that empty tr have a height, min height don't seem to work
+                padding: 2px;
+                vertical-align: center;
+            }
+
+            td {
+                word-wrap: break-word;
+                max-width: 350px;
+            }
+
+            .o_column_percent_comparison {
+                text-align: right;
+            }
+
+            .o_line_level_0 {
+                background-color: #e7e9ed;
+                color: $o-gray-700;
+                font-weight: bold;
+
+                .o_line_name_level { padding-left: 8px }
+            }
+
+            @for $i from 1 through 3 {
+                .o_line_level_#{$i} {
+                    border-bottom: 0.5px solid $o-gray-300;
+                    .o_line_name_level { padding-left: (($i + 1) * 8px) }
+                }
+            }
+
+            @for $i from 4 through 16 {
+                .o_line_level_#{$i} {
+                    border-bottom: 0.5px solid $o-gray-200;
+                    .o_line_name_level { padding-left: (($i + 1) * 8px) }
+                }
+            }
+
+            .o_cell_td > .o_line_cell_value_number {
+                display: block;
+                text-align: right;
+            }
+        }
+    }
+}
+
+/****************
+    UTILS
+*****************/
+.o_d_none { display: none }
+.o_fw_bold { font-weight: bold }
+.o_text_end { text-align: end }
+.o_text_muted { color: #777 }
+.o_muted { color: $o-gray-300 }
+
+.o_title {
+    font-size: 20px;
+    font-weight: bold;
+    text-align: center;
+    text-transform: uppercase;
+}
+
+.o_overflow_value {
+    display: inline-block;
+    max-width: 350px;
+    white-space: normal !important;
+    overflow-wrap: break-word;
+}
+
+.o_overflow_name {
+    white-space: normal !important;
+    overflow-wrap: break-word;
+}
+
+body[dir="rtl"] {
+    .o_line_name_level {
+        white-space: normal !important;
+        overflow-wrap: break-word;
+    }
+}
+
+.o_footer_font_size { font-size: 0.7rem }
+
+.o_annotation { list-style: none }
diff --git a/dev_odex30_accounting/odex30_account_reports/static/src/scss/pdf/pdf_journal_report.scss b/dev_odex30_accounting/odex30_account_reports/static/src/scss/pdf/pdf_journal_report.scss
new file mode 100644
index 0000000..e516930
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_reports/static/src/scss/pdf/pdf_journal_report.scss
@@ -0,0 +1,121 @@
+.journal_report_pdf {
+    font-family: 'Verdana';
+    margin: 20px;
+
+    header {
+        width: 100%;
+        padding: 50px 20px;
+
+        .o_header_font {
+            font-size: 0.8rem;
+        }
+
+        .o_title {
+            font-size: 1.5rem;
+            margin-bottom: 15px;
+        }
+
+        .o_subtitle {
+            font-size: 1.2rem;
+            font-weight: medium;
+            text-align: center;
+            color: $o-gray-700;
+            margin-bottom: 15px;
+        }
+    }
+
+    .o_table {
+        width: 100%;
+        direction: ltr;
+        font-size: 0.6rem;
+        white-space: nowrap;
+
+        thead, tbody, tfoot, tr, td, th { border-style: none }
+
+        td, th {
+            padding: 6px 10px 3px;
+            vertical-align: text-top;
+        }
+
+        th {
+            text-align: left;
+        }
+
+        .o_right_alignment {
+            text-align: right;
+        }
+
+        .o_muted {
+            color: $o-gray-500;
+        }
+
+        > thead {
+            background-color: $o-gray-200;
+
+            tr > th:nth-child(3) {
+                width: 50%;
+                max-width: 50%;
+            }
+        }
+
+        > tbody {
+
+            tr > td:nth-child(3) {
+                white-space: normal;
+                overflow-wrap: break-word;
+            }
+
+            tr:last-child {
+                font-weight: bold;
+                border-top: 1px solid $o-gray-200;
+            }
+        }
+    }
+
+    .tax_summary {
+        width: 100%;
+
+        > div > div {
+            padding: 2px 15px;
+        }
+
+        .o_table > tbody > tr:last-child {
+            font-weight: normal;
+            border: 0;
+        }
+
+        .o_table > thead > tr > th:nth-child(3) {
+            width: auto;
+            max-width: fit-content;
+        }
+    }
+
+    ///////////////////////////////////////////////
+    ///     Global
+    //////////////////////////////////////////////
+
+    .o_section_title {
+        width: 100%;
+
+        font-size: 1.5rem;
+        font-weight: 500;
+        text-align: center;
+        color: $o-gray-700;
+
+        margin-bottom: 10px;
+    }
+
+    .o_section_subtitle {
+        font-size: 1rem;
+        font-weight: 300;
+        margin-top: 50px;
+    }
+
+    .o_even {
+        background-color: $o-gray-200;
+    }
+
+    .o_bold {
+        font-weight: bold;
+    }
+}
diff --git a/dev_odex30_accounting/odex30_account_reports/static/src/widgets/account_report_x2many/account_report_x2many.js b/dev_odex30_accounting/odex30_account_reports/static/src/widgets/account_report_x2many/account_report_x2many.js
new file mode 100644
index 0000000..07a6d7b
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_reports/static/src/widgets/account_report_x2many/account_report_x2many.js
@@ -0,0 +1,346 @@
+/** @odoo-module **/
+
+import { useRef, onWillRender } from "@odoo/owl";
+import { ConfirmationDialog } from "@web/core/confirmation_dialog/confirmation_dialog";
+import { WarningDialog } from "@web/core/errors/error_dialogs";
+import { _t } from "@web/core/l10n/translation";
+import { useService } from "@web/core/utils/hooks";
+import { useNestedSortable } from "@web/core/utils/nested_sortable";
+import { registry } from "@web/core/registry";
+import { ListRenderer } from "@web/views/list/list_renderer";
+import { X2ManyField, x2ManyField } from "@web/views/fields/x2many/x2many_field";
+import { useOpenX2ManyRecord, useX2ManyCrud } from "@web/views/fields/relational_utils";
+
+export class AccountReportListRenderer extends ListRenderer {
+    static template = "odex30_account_reports.AccountReportList";
+
+    setup() {
+        this.dialog = useService("dialog");
+        this.orm = useService("orm");
+
+        // From ListRenderer
+        // We can't really use `super.setup()` because it expects to be used on a html table.
+        this.allColumns = this.processAllColumn(this.props.archInfo.columns, this.props.list);
+        this.keyOptionalFields = `optional_fields,${this.createViewKey()}`;
+        this.optionalActiveFields = this.computeOptionalActiveFields();
+        this.columns = this.getActiveColumns(this.props.list);
+
+        this.env.model.config.activeFields.line_ids.defaultOrderBy = [
+            {
+                "name": "sequence",
+                "asc": true
+            },
+            {
+                "name": "id",
+                "asc": true
+            }
+        ]
+
+        useNestedSortable({
+            ref: useRef("root"),
+            elements: "li.draggable",
+            nest: true,
+            nestInterval: 10,
+            onDragStart: (ctx) => this.onDragStart(ctx),
+            onDragEnd: () => this.onDragEnd(),
+            onDrop: (ctx) => this.onDrop(ctx),
+        });
+
+        onWillRender(() => {
+            this.allColumns = this.processAllColumn(this.props.archInfo.columns, this.props.list);
+            this.columns = this.getActiveColumns(this.props.list);
+        });
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    // Records
+    //------------------------------------------------------------------------------------------------------------------
+    recordsDataDeepCopy(records) {
+        const fields = this.allColumns.map((column) => column.name);
+
+        return records.map((record) => {
+            let recordData = {};
+
+            for (const field of fields)
+                recordData[field] = record.data[field];
+
+            return recordData;
+        });
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    // Format
+    //------------------------------------------------------------------------------------------------------------------
+    formatData() {
+        let idToIndexMap = {};
+        let tree = [];
+
+        let lines = this.recordsDataDeepCopy(this.props.list.records);
+
+        for (const [index, line] of lines.entries()) {
+            line.index = index;
+            line.children = [];
+            line.descendants_count = 0;
+
+            idToIndexMap[line.id] = index;
+
+            if (line.parent_id?.[0]) {
+                let parentLine = lines[idToIndexMap[line.parent_id[0]]];
+
+                if (parentLine) {
+                    parentLine?.children.push(line);
+
+                    while (parentLine) {
+                        parentLine.descendants_count += 1;
+                        parentLine = lines[idToIndexMap[parentLine.parent_id?.[0]]];
+                    }
+                } else {
+                    // Since the parentLine doesn't exist yet. It means that this line is out of sequence.
+                    line.out_of_sequence_error = true;
+
+                    tree.push(line);
+                }
+            } else {
+                tree.push(line);
+            }
+        }
+
+        return tree;
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    // Placeholder
+    //------------------------------------------------------------------------------------------------------------------
+    onDragStart(ctx) {
+        function sanitize(element) {
+            if (element.nodeName === 'LI') {
+                ["data-record_index", "data-record_id", "data-descendants_count"].forEach((attribute) => {
+                    element.removeAttribute(attribute);
+                });
+
+                element.classList.remove("draggable");
+            }
+
+            Array.from(element.childNodes).forEach((child) => {
+                sanitize(child);
+            });
+        }
+
+        const placeholder = ctx.element.cloneNode(true);
+
+        placeholder.removeAttribute("style");
+        placeholder.classList.replace("o_dragged", "o_dragged_placeholder");
+
+        sanitize(placeholder);
+
+        document.querySelector(".o_nested_sortable_placeholder").after(placeholder);
+    }
+
+    onDragEnd() {
+        // Clear placeholder
+        document.querySelector(".o_dragged_placeholder").remove();
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    // Nested sorting
+    //------------------------------------------------------------------------------------------------------------------
+    async setRecordParent(currentElement, parentElement) {
+        const currentRecordIndex = currentElement.dataset.record_index;
+        const parentRecordIndex = parentElement?.dataset.record_index;
+
+        // Default root element
+        let parent = false;
+
+        // parentRecordIndex is a string. It should be true with '0'.
+        if (parentRecordIndex) {
+            parent = [
+                this.props.list.records[parentRecordIndex].data.id,
+                this.props.list.records[parentRecordIndex].data.name,
+            ];
+        }
+
+        await this.props.list.records[currentRecordIndex].update({'parent_id': parent});
+    }
+
+    async setRecordHierarchy(currentElement, parentElement) {
+        const currentRecordIndex = parseInt(currentElement.dataset.record_index);
+        const parentRecordIndex = parentElement?.dataset.record_index;
+        const parentRecord = (parentRecordIndex) ? this.props.list.records[parentRecordIndex].data : null;
+
+        const hierarchyLevels = {};
+
+        if (parentRecord)
+            hierarchyLevels[parentRecord.id] = parentRecord.hierarchy_level;
+
+        const ancestors = new Set();
+
+        for (let index = currentRecordIndex; index < this.props.list.records.length; index++) {
+            const record = this.props.list.records[index];
+            const parentId = (record.data.parent_id) ? record.data.parent_id[0] : false;
+
+            if (ancestors.size && !ancestors.has(parentId))
+                break;
+
+            let parentHierarchyLevel = (record.data.parent_id) ? hierarchyLevels[record.data.parent_id[0]] : null;
+
+            if (parentHierarchyLevel != null) {
+                parentHierarchyLevel = (parentHierarchyLevel === 0) ? 1 : parentHierarchyLevel;
+                await record.update({'hierarchy_level': parentHierarchyLevel + 2});
+            } else {
+                await record.update({'hierarchy_level': 1});
+            }
+
+            ancestors.add(record.data.id);
+            hierarchyLevels[record.data.id] = record.data.hierarchy_level;
+        }
+    }
+
+    async setRecordSequence(currentElement, parentElement, previousElement, previousElementDescendantCount, nextElement) {
+        const currentRecordIndex = currentElement.dataset.record_index;
+        const currentRecordDescendantsCount = parseInt(currentElement.dataset.descendants_count);
+        const lastDescendantIndex = parseInt(currentRecordIndex) + currentRecordDescendantsCount
+        const recordsToMove = this.props.list.records.slice(currentRecordIndex, lastDescendantIndex + 1);
+
+        // We remove the element(s) we are moving
+        this.props.list.records.splice(currentRecordIndex, recordsToMove.length);
+
+        const previousRecordIndex = previousElement?.dataset.record_index;
+        const nextRecordIndex = nextElement?.dataset.record_index;
+
+        let newCurrentRecordIndex;
+
+        if (previousRecordIndex) {
+            newCurrentRecordIndex = parseInt(previousRecordIndex) + 1 + parseInt(previousElementDescendantCount);
+        } else if (nextRecordIndex) {
+            // We add the element in the first position
+            newCurrentRecordIndex = parseInt(nextRecordIndex);
+        } else {
+            // We add the element as a first child
+            newCurrentRecordIndex = parseInt(parentElement?.dataset.record_index) + 1;
+        }
+
+        // If the original position of the line we want to move is before the position we want to drop it, then we need
+        // to adjust the index because all the indexes of the lines after it have changed (we removed lines).
+        if (currentRecordIndex < newCurrentRecordIndex) {
+            newCurrentRecordIndex -= (1 + currentRecordDescendantsCount);
+        }
+
+        // We add the element(s) we are moving into the new position
+        this.props.list.records.splice(newCurrentRecordIndex, 0, ...recordsToMove);
+
+        for (const [index, record] of this.props.list.records.entries())
+            await record.update({'sequence': index + 1});
+    }
+
+    async onDrop(ctx) {
+        const parentRecordIndex = ctx.parent?.dataset.record_index;
+
+        // We can't drop a line if it's parent has a 'user_groupby`
+        if (this.props.list.records[parentRecordIndex]?.data.user_groupby)
+            return this.dialog.add(WarningDialog, {
+                message: _t("A line with a 'Group By' value cannot have children."),
+            });
+
+        // We need to save it before as it's value might change during calculations below
+        const previousElementDescendantCount = ctx.previous?.dataset.descendants_count
+
+        await this.setRecordParent(ctx.element, ctx.parent);
+        await this.setRecordHierarchy(ctx.element, ctx.parent);
+        await this.setRecordSequence(ctx.element, ctx.parent, ctx.previous, previousElementDescendantCount, ctx.next);
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    // Delete
+    //------------------------------------------------------------------------------------------------------------------
+    onDeleteRecord(recordIndex) {
+        const currentRecordId = this.props.list.records[recordIndex].data.id
+        const nextRecordParentId = this.props.list.records[recordIndex + 1]?.data.parent_id[0]
+
+        // We check if the next line is a children of the current one
+        if (nextRecordParentId === currentRecordId)
+            return this.dialog.add(ConfirmationDialog, {
+                body: _t("This line and all its children will be deleted. Are you sure you want to proceed?"),
+                confirmLabel: "Delete",
+                confirm: () => { this.deleteRecord(recordIndex) },
+                cancel: () => {},
+            });
+
+        this.deleteRecord(recordIndex);
+    }
+
+    deleteRecord(recordIndex) {
+        const recordToDelete = this.props.list.records[recordIndex];
+
+        const recordsToDelete = [recordToDelete];
+        const ancestors = new Set([recordToDelete.data.id]);
+
+        // We get all the children of the line we are deleting
+        for (let index = recordIndex + 1; index < this.props.list.records.length; index++) {
+            const record = this.props.list.records[index];
+
+            if (!ancestors.has(record.data.parent_id[0]))
+                break;
+
+            recordsToDelete.push(record);
+            ancestors.add(record.data.id);
+        }
+
+        for (const record of recordsToDelete)
+            this.props.list.delete(record);
+    }
+}
+
+export class AccountReportsLinesListX2ManyField extends X2ManyField {
+    static components = {
+        ...X2ManyField.components,
+        ListRenderer: AccountReportListRenderer,
+    }
+
+    // Overrides the "openRecord" method to overload the save. This will force the record to be saved in the database.
+    setup() {
+        super.setup();
+
+        const { saveRecord, updateRecord } = useX2ManyCrud(
+            () => this.list,
+            this.isMany2Many
+        );
+
+        const openRecord = useOpenX2ManyRecord({
+            resModel: this.list.resModel,
+            activeField: this.activeField,
+            activeActions: this.activeActions,
+            getList: () => this.list,
+            saveRecord: async (record) => {
+                for (const [index, record] of this.props.record.data.line_ids.records.entries())
+                    record.update({'sequence': index + 1});
+
+                record.update({
+                    'sequence': this.props.record.data.line_ids.records.length,
+                });
+
+                await saveRecord(record);
+                await this.props.record.save();
+            },
+            updateRecord: updateRecord,
+            isMany2Many: this.isMany2Many,
+        });
+
+        this._openRecord = (params) => {
+            const activeElement = document.activeElement;
+
+            openRecord({
+                ...params,
+                onClose: () => {
+                    if (activeElement) {
+                        activeElement.focus();
+                    }
+                },
+            });
+        };
+    }
+}
+
+registry.category("fields").add("account_report_lines_list_x2many", {
+    ...x2ManyField,
+    component: AccountReportsLinesListX2ManyField,
+});
diff --git a/dev_odex30_accounting/odex30_account_reports/static/src/widgets/account_report_x2many/account_report_x2many.scss b/dev_odex30_accounting/odex30_account_reports/static/src/widgets/account_report_x2many/account_report_x2many.scss
new file mode 100644
index 0000000..083cf13
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_reports/static/src/widgets/account_report_x2many/account_report_x2many.scss
@@ -0,0 +1,54 @@
+.account_report_lines_list_x2many {
+    margin-top: - 16px; // Removes padding-top from 'tab-pane'
+
+    ul { list-style: none }
+
+    .o_row_handle {
+        width: auto;
+        padding: 14px 8px;
+    }
+
+    .column {
+        line-height: 40px;
+        padding: 0 8px;
+
+        &:hover { cursor: pointer }
+        &.fluid { flex-grow: 1 }
+        &.fixed {
+            width: 160px;
+            text-overflow: ellipsis;
+            overflow: hidden;
+        }
+
+        .form-check-input { margin-top: 14px }
+    }
+
+    .dropdown-toggle, .trash {
+        line-height: 40px;
+        background-color: inherit;
+        outline: none;
+        border: none;
+        text-align: center;
+    }
+
+    .filter {
+        font-family: 'odoo_ui_icons';
+
+        &:before { content: '\e80c' }
+    }
+
+    .overlined:after {
+        content: "";
+        position: absolute;
+        height: 1px;
+        background-color: #d8dadd;
+        left: 0;
+        right: 0;
+    }
+
+    .o_dragged_placeholder {
+        color: $o-gray-300;
+
+        .o_row_handle, .trash { color: $o-gray-300 }
+    }
+}
diff --git a/dev_odex30_accounting/odex30_account_reports/static/src/widgets/account_report_x2many/account_report_x2many.xml b/dev_odex30_accounting/odex30_account_reports/static/src/widgets/account_report_x2many/account_report_x2many.xml
new file mode 100644
index 0000000..1dd5152
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_reports/static/src/widgets/account_report_x2many/account_report_x2many.xml
@@ -0,0 +1,142 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<templates>
+    <t t-name="odex30_account_reports.AccountReportList">
+        <div class="account_report_lines_list_x2many">
+            <ul class="p-0" t-ref="root">
+                <!-- Header -->
+                <li class="d-flex justify-content-between">
+                    <!-- Columns -->
+                    <t t-foreach="columns" t-as="column" t-key="column.id">
+                        <t t-set="isNameColumn" t-value="column.name === 'name'"/>
+
+                        <span
+                            class="column fw-bold"
+                            t-att-class="{
+                                'fluid': isNameColumn,
+                                'fixed': !isNameColumn,
+                            }"
+                            t-out="column.label || column.name"
+                        />
+                    </t>
+
+                    <!-- Filter -->
+                    <t t-call="odex30_account_reports.AccountReportOptionalColumnSelector"/>
+                </li>
+
+                <!-- Lines -->
+                <t t-call="odex30_account_reports.AccountReportListTree">
+                    <t t-set="lines" t-value="this.formatData()"/>
+                </t>
+
+                <!-- Add new line -->
+                <t t-if="props.activeActions.create">
+                    <li>
+                        <a
+                            class="column overlined"
+                            href="#"
+                            role="button"
+                            t-on-click.stop.prevent="() => this.add({})"
+                        >
+                            Add a line
+                        </a>
+                    </li>
+                </t>
+
+                <!-- For the last border-bottom -->
+                <span class="overlined"/>
+            </ul>
+        </div>
+    </t>
+
+    <t t-name="odex30_account_reports.AccountReportListTree">
+        <t t-foreach="lines" t-as="line" t-key="line.id">
+            <li
+                class="draggable"
+                t-att-data-record_index="line.index"
+                t-att-data-record_id="line.id"
+                t-att-data-descendants_count="line.descendants_count"
+            >
+                <div class="d-flex justify-content-between overlined">
+                    <t t-set="record" t-value="this.props.list.records[line.index]"/>
+
+                    <!-- Handle -->
+                    <span class="oi oi-draggable o_row_handle"/>
+
+                    <!-- Columns -->
+                    <t t-foreach="columns" t-as="column" t-key="column.id">
+                        <t t-set="isNameColumn" t-value="column.name === 'name'"/>
+
+                        <span
+                            class="column"
+                            t-att-class="{
+                                'fluid': isNameColumn,
+                                'fixed': !isNameColumn,
+                            }"
+                            t-on-click="(ev) => this.onCellClicked(record, column, ev)"
+                        >
+                            <t t-out="isNameColumn ? line[column.name] : getFormattedValue(column, record)"/>
+
+                            <t t-if="line.out_of_sequence_error">
+                                <span
+                                    class="text-danger"
+                                    data-tooltip="This line is placed before its parent, which is not allowed. You can fix it by dragging it to the proper position."
+                                >
+                                    <i class="fa fa-exclamation-circle text-danger ms-2 me-1"/>
+                                    This line is out of sequence.
+                                </span>
+                            </t>
+                        </span>
+                    </t>
+
+                    <!-- Trash -->
+                    <t t-if="props.activeActions.delete">
+                        <button class="trash" t-on-click="() => this.onDeleteRecord(line.index)">
+                            <i class="fa fa-trash-o"/>
+                        </button>
+                    </t>
+                </div>
+
+                <t t-if="line.children?.length">
+                    <ul>
+                        <t t-call="odex30_account_reports.AccountReportListTree">
+                            <t t-set="lines" t-value="line.children"/>
+                        </t>
+                    </ul>
+                </t>
+            </li>
+        </t>
+    </t>
+
+    <t t-name="odex30_account_reports.AccountReportOptionalColumnSelector">
+        <Dropdown position="'bottom-end'">
+            <button>
+                <i class="filter"/>
+            </button>
+
+            <t t-set-slot="content">
+                <t t-foreach="optionalFieldGroups" t-as="group" t-key="group_index">
+                    <t t-foreach="group.optionalFields" t-as="field" t-key="field_index">
+                        <DropdownItem
+                            closingMode="'none'"
+                            onSelected="() => this.toggleOptionalField(field.name)"
+                        >
+                            <CheckBox
+                                name="field.name"
+                                value="field.value"
+                                onChange="() => this.toggleOptionalField(field.name)"
+                            >
+                                <span class="d-flex align-items-center">
+                                    <span class="text-truncate" t-out="field.label"/>
+
+                                    <t t-if="env.debug">
+                                        <span class="ps-1" t-out="' (' + field.name + ')'"/>
+                                    </t>
+                                </span>
+                            </CheckBox>
+                        </DropdownItem>
+                    </t>
+                </t>
+            </t>
+        </Dropdown>
+    </t>
+</templates>
diff --git a/dev_odex30_accounting/odex30_account_reports/static/tests/account_report/account_report.test.js b/dev_odex30_accounting/odex30_account_reports/static/tests/account_report/account_report.test.js
new file mode 100644
index 0000000..1ea9da1
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_reports/static/tests/account_report/account_report.test.js
@@ -0,0 +1,212 @@
+import { expect, test } from "@odoo/hoot";
+
+import {
+    click,
+    contains,
+    mailModels,
+} from  "@mail/../tests/mail_test_helpers";
+
+import {
+    defineModels,
+    getService,
+    mountWithCleanup,
+    onRpc,
+} from "@web/../tests/web_test_helpers";
+import { WebClient } from "@web/webclient/webclient";
+
+// Due to dependency with mail module, we have to define their models for our tests.
+defineModels(mailModels);
+
+const getOptionMockResponse = {
+    "companies": [],
+    "variants_source_id": 14,
+    "has_inactive_variants": false,
+    "available_variants": [],
+    "selected_variant_id": 14,
+    "sections_source_id": 14,
+    "sections": [],
+    "has_inactive_sections": false,
+    "report_id": 14,
+    "allow_domestic": false,
+    "fiscal_position": "all",
+    "available_vat_fiscal_positions": [],
+    "date": {
+        "string": "2025",
+        "period_type": "fiscalyear",
+        "mode": "range",
+        "date_from": "2025-01-01",
+        "date_to": "2025-12-31",
+        "filter": "this_year"
+    },
+    "available_horizontal_groups": [],
+    "selected_horizontal_group_id": null,
+    "account_type": [],
+    "all_entries": false,
+    "aml_ir_filters": [],
+    "buttons": [],
+    "export_mode": null,
+    "hide_0_lines": false,
+    "multi_currency": false,
+    "partner": false,
+    "partner_categories": [],
+    "selected_partner_ids": [],
+    "partner_ids": [],
+    "selected_partner_categories": [],
+    "unreconciled": false,
+    "rounding_unit": "decimals",
+    "rounding_unit_names": {
+        "decimals": [
+            ".$",
+            ""
+        ],
+    },
+    "search_bar": false,
+    "unfold_all": false,
+    "unfolded_lines": [],
+    "column_headers": [],
+    "columns": [
+        {
+            "name": "A column",
+            "column_group_key": "some_key",
+            "expression_label": "a_column",
+            "sortable": false,
+            "figure_type": "string",
+            "blank_if_zero": false,
+            "style": ""
+        },
+    ],
+    "column_groups": {"some_key": {"forced_options": {}, "forced_domain": []}
+    },
+}
+
+const getReportInformationMockResponse = {
+    "caret_options": {},
+    "column_headers_render_data": {"level_colspan": [1], "level_repetitions": [1], "custom_subheaders": []},
+    "column_groups_totals": {"some_key": {}},
+    "context": {},
+    "custom_display": {},
+    "filters": {},
+    "groups": {},
+    "annotations": {},
+    "lines": [
+        {
+            "id": "~account.report~14|~res.partner~1",
+            "name": "A partner",
+            "columns": [
+                {
+                    "auditable": false,
+                    "blank_if_zero": false,
+                    "column_group_key": "some_key",
+                    "currency": null,
+                    "currency_symbol": "",
+                    "digits": 1,
+                    "expression_label": "a_column",
+                    "figure_type": "string",
+                    "green_on_positive": false,
+                    "has_sublines": false,
+                    "is_zero": false,
+                    "name": "",
+                    "no_format": null,
+                    "report_line_id": null,
+                    "sortable": false
+                },
+            ],
+            "level": 1,
+            "trust": "normal",
+            "unfoldable": true,
+            "unfolded": false,
+            "expand_function": "some_expand_function"
+        },
+    ],
+    "warnings": {},
+    "report": { "company_name": "YourCompany", "company_country_code": "US", "company_currency_symbol": "$", "name": "A report", "root_report_id": "account.report()"}
+}
+
+const getExpandedLinesMockResponse = [
+    {
+        "id": "~account.report~14|~res.partner~1|0~account.move.line~1",
+        "parent_id": "~account.report~14|~res.partner~1",
+        "name": "first move line",
+        "columns": [
+            {
+                "auditable": false,
+                "blank_if_zero": false,
+                "column_group_key": "some_key",
+                "currency": null,
+                "currency_symbol": "$",
+                "digits": 1,
+                "expression_label": "a_column",
+                "figure_type": "string",
+                "green_on_positive": false,
+                "has_sublines": false,
+                "is_zero": false,
+                "name": "first value",
+                "no_format": "first value",
+                "report_line_id": null,
+                "sortable": false
+            },
+        ],
+        "level": 3
+    },
+    {
+        "id": "~account.report~14|~res.partner~1|0~account.move.line~11",
+        "parent_id": "~account.report~14|~res.partner~1",
+        "name": "second move line",
+        "columns": [
+            {
+                "auditable": false,
+                "blank_if_zero": false,
+                "column_group_key": "some_key",
+                "currency": null,
+                "currency_symbol": "$",
+                "digits": 1,
+                "expression_label": "a_column",
+                "figure_type": "string",
+                "green_on_positive": false,
+                "has_sublines": false,
+                "is_zero": false,
+                "name": "second value",
+                "no_format": "second value",
+                "report_line_id": null,
+                "sortable": false
+            },
+        ],
+        "level": 3
+    },
+]
+
+
+test("Test unfold loaded line", async() => {
+    async function mockRpcReport({ method, model }) {
+        if (model === 'account.report') {
+            if (method === 'get_options') {
+                return getOptionMockResponse;
+            }
+            if (method === 'get_report_information') {
+                return getReportInformationMockResponse;
+            }
+            if (method === 'get_expanded_lines') {
+                mockRpcReport.getExpandedLineCallCount = (mockRpcReport.getExpandedLineCallCount || 0) + 1;
+                return getExpandedLinesMockResponse;
+            }
+        }
+    };
+    onRpc(mockRpcReport);
+
+    await mountWithCleanup(WebClient);
+    await getService("action").doAction({
+        type: "ir.actions.client",
+        tag: "account_report",
+        params: {},
+    })
+
+    await click(".btn_foldable");
+    await contains(".unfolded", { count: 1 });
+    await click(".btn_foldable");
+    await contains(".unfolded", { count: 0 });
+    await click(".btn_foldable");
+    await contains(".unfolded", { count: 1 });
+
+    // Only one call to get_expanded_lines, as we unfolded/folded/unfolded the same line
+    expect(mockRpcReport.getExpandedLineCallCount).toEqual(1);
+});
diff --git a/dev_odex30_accounting/odex30_account_reports/static/tests/account_report/line_cell_editable/line_cell_editable.test.js b/dev_odex30_accounting/odex30_account_reports/static/tests/account_report/line_cell_editable/line_cell_editable.test.js
new file mode 100644
index 0000000..a0b43bd
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_reports/static/tests/account_report/line_cell_editable/line_cell_editable.test.js
@@ -0,0 +1,35 @@
+import { expect, test } from "@odoo/hoot";
+import { click, press } from "@odoo/hoot-dom";
+import { animationFrame } from "@odoo/hoot-mock";
+import { mountWithCleanup, makeMockEnv, defineModels } from "@web/../tests/web_test_helpers";
+import { mailModels } from "@mail/../tests/mail_test_helpers";
+
+import { AccountReportLineCellEditable } from "@odex30_account_reports/components/account_report/line_cell_editable/line_cell_editable";
+
+// Due to dependency with mail module, we have to define their models for our tests.
+defineModels(mailModels);
+
+test("can unformat a value when focus and format when blur", async () => {
+    const env = await makeMockEnv({
+        controller: {},
+    });
+    await mountWithCleanup(AccountReportLineCellEditable, {
+        env,
+        props: {
+            cell: {
+                name: "5,702.22",
+                no_format: 5702.22,
+                edit_popup_data: {},
+            },
+            line: {},
+        },
+    });
+
+    expect(".o_input").toHaveValue("5,702.22");
+    await click(".o_input");
+    await animationFrame();
+    expect(".o_input").toHaveValue("5702.22");
+    await press("Enter");
+    await animationFrame();
+    expect(".o_input").toHaveValue("5,702.22");
+});
diff --git a/dev_odex30_accounting/odex30_account_reports/static/tests/legacy/account_report_builder.js b/dev_odex30_accounting/odex30_account_reports/static/tests/legacy/account_report_builder.js
new file mode 100644
index 0000000..f974837
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_reports/static/tests/legacy/account_report_builder.js
@@ -0,0 +1,684 @@
+/** @odoo-module **/
+
+import { click, drag, editInput, getFixture } from "@web/../tests/helpers/utils";
+import { registerCleanup } from "@web/../tests/helpers/cleanup";
+import { makeView, setupViewRegistries } from "@web/../tests/views/helpers";
+import { sortableDrag } from "@web/../tests/core/utils/nested_sortable_tests"
+
+let arch;
+let serverData;
+let target;
+
+QUnit.module("Account Reports Builder", ({ beforeEach }) => {
+    beforeEach(async () => {
+        arch = `
+            <form>
+                <field class="w-100" name="line_ids" widget="account_report_lines_list_x2many">
+                    <list>
+                        <field name="id" column_invisible="1"/>
+                        <field name="sequence" column_invisible="1"/>
+                        <field name="parent_id" column_invisible="1"/>
+                        <field name="hierarchy_level" column_invisible="1"/>
+                        <field name="name"/>
+                        <field name="code" optional="hide"/>
+                    </list>
+                </field>
+            </form>
+        `;
+
+        serverData = {
+            models: {
+                report: {
+                    fields: {
+                        id: { string: "ID", type: "integer" },
+                        line_ids: {
+                            string: "Lines",
+                            type: "one2many",
+                            relation: "report_lines",
+                            relation_field: "report_id",
+                        },
+                    },
+                    records: [
+                        {
+                            id: 1,
+                            line_ids: [1, 2, 3, 4, 5],
+                        }
+                    ]
+                },
+                report_lines: {
+                    fields: {
+                        report_id: { string: "Report ID", type: "many2one", relation: "report" },
+                        id: { string: "ID", type: "integer" },
+                        sequence: { string: "Sequence", type: "integer" },
+                        parent_id: {
+                            string: "Parent Line",
+                            type: "many2one",
+                            relation: "report_lines",
+                            relation_field: "id",
+                        },
+                        hierarchy_level: { string: "Level", type: "integer" },
+                        name: { string: "Name", type: "char" },
+                        code: { string: "Code", type: "char" },
+                    },
+                    records: [
+                        {
+                            id: 1,
+                            sequence: null,
+                            parent_id: false,
+                            hierarchy_level: 1,
+                            name: "Root without children",
+                            code: "RWOC",
+                        },
+                        {
+                            id: 2,
+                            sequence: null,
+                            parent_id: false,
+                            hierarchy_level: 0,
+                            name: "Root with children",
+                            code: "RC",
+                        },
+                        {
+                            id: 3,
+                            sequence: null,
+                            parent_id: 2,
+                            hierarchy_level: 3,
+                            name: "Child #1",
+                            code: "C1",
+                        },
+                        {
+                            id: 4,
+                            sequence: null,
+                            parent_id: 3,
+                            hierarchy_level: 5,
+                            name: "Grandchild",
+                            code: "GC",
+                        },
+                        {
+                            id: 5,
+                            sequence: null,
+                            parent_id: 2,
+                            hierarchy_level: 3,
+                            name: "Child #2",
+                            code: "C2",
+                        },
+                    ]
+                },
+            },
+            views: {
+                "report_lines,false,form": `
+                    <form>
+                        <field name="name"/>
+                    </form>
+                `,
+            }
+        };
+
+        target = getFixture();
+
+        // Make fixture in visible range, so that document.elementFromPoint work as expected
+        target.style.position = "absolute";
+        target.style.top = "0";
+        target.style.left = "0";
+        target.style.height = "100%";
+        target.style.opacity = QUnit.config.debug ? "" : "0";
+
+        registerCleanup(async () => {
+            target.style.position = "";
+            target.style.top = "";
+            target.style.left = "";
+            target.style.height = "";
+            target.style.opacity = "";
+        });
+
+        setupViewRegistries();
+    });
+
+    //------------------------------------------------------------------------------------------------------------------
+    // Structure
+    //------------------------------------------------------------------------------------------------------------------
+    QUnit.test("have correct descendants count", async (assert) => {
+        await makeView({
+            type: "form",
+            resId: 1,
+            resModel: "report",
+            serverData,
+            arch,
+        });
+
+        assert.containsOnce(target.querySelector(".account_report_lines_list_x2many"), "li[data-descendants_count='0'] span:contains('Root without children')");
+        assert.containsOnce(target.querySelector(".account_report_lines_list_x2many"), "li[data-descendants_count='3'] span:contains('Root with children')");
+        assert.containsOnce(target.querySelector(".account_report_lines_list_x2many"), "li[data-descendants_count='1'] span:contains('Child #1')");
+        assert.containsOnce(target.querySelector(".account_report_lines_list_x2many"), "li[data-descendants_count='0'] span:contains('Grandchild')");
+        assert.containsOnce(target.querySelector(".account_report_lines_list_x2many"), "li[data-descendants_count='0'] span:contains('Child #2')");
+    });
+
+    //------------------------------------------------------------------------------------------------------------------
+    // Create
+    //------------------------------------------------------------------------------------------------------------------
+    QUnit.test("can create a line", async (assert) => {
+        await makeView({
+            type: "form",
+            resId: 1,
+            resModel: "report",
+            serverData,
+            arch,
+        });
+
+        await click(target.querySelector(".account_report_lines_list_x2many"), "li:last-of-type a");
+
+        assert.containsOnce(target, ".o_dialog");
+
+        await editInput(target.querySelector("div[name='name'] input"), null, "Created line");
+        await click(target.querySelector(".o_dialog"), ".o_form_button_save");
+
+        assert.containsOnce(target.querySelector(".account_report_lines_list_x2many"), "li span:contains('Created line')");
+    });
+
+    //------------------------------------------------------------------------------------------------------------------
+    // Edit
+    //------------------------------------------------------------------------------------------------------------------
+    QUnit.test("can edit a line", async (assert) => {
+        await makeView({
+            type: "form",
+            resId: 1,
+            resModel: "report",
+            serverData,
+            arch,
+        });
+
+        await click(target.querySelector(".account_report_lines_list_x2many"), "li[data-record_id='1'] .column");
+
+        assert.containsOnce(target, ".o_dialog");
+
+        await editInput(target.querySelector("div[name='name'] input"), null, "Line without children (edited)");
+        await click(target.querySelector(".o_dialog"), ".o_form_button_save");
+
+        assert.containsOnce(target.querySelector(".account_report_lines_list_x2many"), "li span:contains('Line without children (edited)')");
+    });
+
+    //------------------------------------------------------------------------------------------------------------------
+    // Delete
+    //------------------------------------------------------------------------------------------------------------------
+    QUnit.test("can delete a root", async (assert) => {
+        await makeView({
+            type: "form",
+            resId: 1,
+            resModel: "report",
+            serverData,
+            arch,
+        });
+
+        await click(target.querySelector(".account_report_lines_list_x2many"), "li[data-record_id='1'] > div > .trash");
+
+        assert.containsNone(target.querySelector(".account_report_lines_list_x2many"), "li span:contains('Root without children')");
+        assert.containsOnce(target.querySelector(".account_report_lines_list_x2many"), "li span:contains('Root with children')");
+        assert.containsOnce(target.querySelector(".account_report_lines_list_x2many"), "li span:contains('Child #1')");
+        assert.containsOnce(target.querySelector(".account_report_lines_list_x2many"), "li span:contains('Grandchild')");
+        assert.containsOnce(target.querySelector(".account_report_lines_list_x2many"), "li span:contains('Child #2')");
+    });
+
+    QUnit.test("can delete a root with children", async (assert) => {
+        await makeView({
+            type: "form",
+            resId: 1,
+            resModel: "report",
+            serverData,
+            arch,
+        });
+
+        await click(target.querySelector(".account_report_lines_list_x2many"), "li[data-record_id='2'] > div > .trash");
+
+        // Confirmation dialog "This line and all its children will be deleted. Are you sure you want to proceed?"
+        assert.containsOnce(target, ".o_dialog");
+
+        await click(target.querySelector(".o_dialog"), ".btn-primary");
+
+        assert.containsOnce(target.querySelector(".account_report_lines_list_x2many"), "li span:contains('Root without children')");
+        assert.containsNone(target.querySelector(".account_report_lines_list_x2many"), "li span:contains('Root with children')");
+        assert.containsNone(target.querySelector(".account_report_lines_list_x2many"), "li span:contains('Child #1')");
+        assert.containsNone(target.querySelector(".account_report_lines_list_x2many"), "li span:contains('Grandchild')");
+        assert.containsNone(target.querySelector(".account_report_lines_list_x2many"), "li span:contains('Child #2')");
+    });
+
+    QUnit.test("can delete a last child", async (assert) => {
+        await makeView({
+            type: "form",
+            resId: 1,
+            resModel: "report",
+            serverData,
+            arch,
+        });
+
+        await click(target.querySelector(".account_report_lines_list_x2many"), "li[data-record_id='4'] > div > .trash");
+
+        assert.containsOnce(target.querySelector(".account_report_lines_list_x2many"), "li span:contains('Root without children')");
+        assert.containsOnce(target.querySelector(".account_report_lines_list_x2many"), "li[data-descendants_count='2'] span:contains('Root with children')");
+        assert.containsOnce(target.querySelector(".account_report_lines_list_x2many"), "li[data-descendants_count='0'] span:contains('Child #1')");
+        assert.containsNone(target.querySelector(".account_report_lines_list_x2many"), "li span:contains('Grandchild')");
+        assert.containsOnce(target.querySelector(".account_report_lines_list_x2many"), "li span:contains('Child #2')");
+    });
+
+    //------------------------------------------------------------------------------------------------------------------
+    // Drag and drop
+    //------------------------------------------------------------------------------------------------------------------
+    QUnit.test("can move a root down", async (assert) => {
+        serverData.models.report.records[0].line_ids = [1, 2, 3, 4];
+        serverData.models.report_lines.records = [
+            {
+                id: 1,
+                sequence: null,
+                parent_id: false,
+                hierarchy_level: 1,
+                name: "dragged",
+                code: "D",
+            },
+            {
+                id: 2,
+                sequence: null,
+                parent_id: false,
+                hierarchy_level: 1,
+                name: "noChild",
+                code: "N",
+            },
+            {
+                id: 3,
+                sequence: null,
+                parent_id: false,
+                hierarchy_level: 0,
+                name: "parent",
+                code: "P",
+            },
+            {
+                id: 4,
+                sequence: null,
+                parent_id: 3,
+                hierarchy_level: 3,
+                name: "child",
+                code: "C",
+            },
+        ];
+
+        await makeView({
+            type: "form",
+            resId: 1,
+            resModel: "report",
+            serverData,
+            arch,
+            mockRPC: (route, args) => {
+                if (args.method === 'web_save') {
+                    const lineIds = args.args[1].line_ids;
+
+                    // Parents
+                    assert.equal(lineIds[0][2].parent_id, 3);
+
+                    // Hierarchy levels
+                    assert.equal(lineIds[0][2].hierarchy_level, 3);
+
+                    // Sequences
+                    assert.equal(lineIds[0][2].sequence, 4);
+                    assert.equal(lineIds[1][2].sequence, 1);
+                    assert.equal(lineIds[2][2].sequence, 2);
+                    assert.equal(lineIds[3][2].sequence, 3);
+                }
+            }
+        });
+
+        const { drop, moveUnder } = await sortableDrag("li[data-record_id='1']");
+
+        await moveUnder("li[data-record_id='2']");
+        await moveUnder("li[data-record_id='4']");
+        await drop();
+
+        await click(target.querySelector(".o_form_button_save"));
+    });
+
+    QUnit.test("can move a root up", async (assert) => {
+        serverData.models.report.records[0].line_ids = [1, 2, 3, 4];
+        serverData.models.report_lines.records = [
+            {
+                id: 1,
+                sequence: null,
+                parent_id: false,
+                hierarchy_level: 0,
+                name: "parent",
+                code: "P",
+            },
+            {
+                id: 2,
+                sequence: null,
+                parent_id: 1,
+                hierarchy_level: 3,
+                name: "child",
+                code: "C",
+            },
+            {
+                id: 3,
+                sequence: null,
+                parent_id: false,
+                hierarchy_level: 1,
+                name: "noChild",
+                code: "N",
+            },
+            {
+                id: 4,
+                sequence: null,
+                parent_id: false,
+                hierarchy_level: 1,
+                name: "dragged",
+                code: "D",
+            },
+        ];
+
+        await makeView({
+            type: "form",
+            resId: 1,
+            resModel: "report",
+            serverData,
+            arch,
+            mockRPC: (route, args) => {
+                if (args.method === 'web_save') {
+                    const lineIds = args.args[1].line_ids;
+
+                    // Parents
+                    assert.equal(lineIds[0][2].parent_id, 1);
+
+                    // Hierarchy levels
+                    assert.equal(lineIds[0][2].hierarchy_level, 3);
+
+                    // Sequences
+                    assert.equal(lineIds[0][2].sequence, 2);
+                    assert.equal(lineIds[1][2].sequence, 1);
+                    assert.equal(lineIds[2][2].sequence, 3);
+                    assert.equal(lineIds[3][2].sequence, 4);
+                }
+            }
+        });
+
+        const { drop, moveAbove } = await sortableDrag("li[data-record_id='4']");
+
+        await moveAbove("li[data-record_id='3']");
+        await moveAbove("li[data-record_id='2']");
+        await drop();
+
+        await click(target.querySelector(".o_form_button_save"));
+    });
+
+    QUnit.test("can move a child down", async (assert) => {
+        serverData.models.report.records[0].line_ids = [1, 2, 3, 4];
+        serverData.models.report_lines.records = [
+            {
+                id: 1,
+                sequence: null,
+                parent_id: false,
+                hierarchy_level: 0,
+                name: "parent",
+                code: "P",
+            },
+            {
+                id: 2,
+                sequence: null,
+                parent_id: 1,
+                hierarchy_level: 3,
+                name: "dragged",
+                code: "D",
+            },
+            {
+                id: 3,
+                sequence: null,
+                parent_id: 1,
+                hierarchy_level: 3,
+                name: "child",
+                code: "C",
+            },
+            {
+                id: 4,
+                sequence: null,
+                parent_id: false,
+                hierarchy_level: 1,
+                name: "noChild",
+                code: "N",
+            },
+        ];
+
+        await makeView({
+            type: "form",
+            resId: 1,
+            resModel: "report",
+            serverData,
+            arch,
+            mockRPC: (route, args) => {
+                if (args.method === 'web_save') {
+                    const lineIds = args.args[1].line_ids;
+
+                    // Parents
+                    assert.equal(lineIds[0][2].parent_id, false);
+
+                    // Hierarchy levels
+                    assert.equal(lineIds[0][2].hierarchy_level, 1);
+
+                    // Sequences
+                    assert.equal(lineIds[0][2].sequence, 4);
+                    assert.equal(lineIds[1][2].sequence, 1);
+                    assert.equal(lineIds[2][2].sequence, 2);
+                    assert.equal(lineIds[3][2].sequence, 3);
+                }
+            }
+        });
+
+        const { drop, moveUnder } = await sortableDrag("li[data-record_id='2']");
+
+        await moveUnder("li[data-record_id='3']");
+        await moveUnder("li[data-record_id='4']");
+        await drop();
+
+        await click(target.querySelector(".o_form_button_save"));
+    });
+
+    QUnit.test("can move a child up", async (assert) => {
+        serverData.models.report.records[0].line_ids = [1, 2, 3];
+        serverData.models.report_lines.records = [
+            {
+                id: 1,
+                sequence: null,
+                parent_id: false,
+                hierarchy_level: 0,
+                name: "parent",
+                code: "P",
+            },
+            {
+                id: 2,
+                sequence: null,
+                parent_id: 1,
+                hierarchy_level: 3,
+                name: "child",
+                code: "C",
+            },
+            {
+                id: 3,
+                sequence: null,
+                parent_id: 1,
+                hierarchy_level: 3,
+                name: "dragged",
+                code: "D",
+            },
+        ];
+
+        await makeView({
+            type: "form",
+            resId: 1,
+            resModel: "report",
+            serverData,
+            arch,
+            mockRPC: (route, args) => {
+                if (args.method === 'web_save') {
+                    const lineIds = args.args[1].line_ids;
+
+                    // Parents
+                    assert.equal(lineIds[0][2].parent_id, false);
+
+                    // Hierarchy levels
+                    assert.equal(lineIds[0][2].hierarchy_level, 1);
+
+                    // Sequences
+                    assert.equal(lineIds[0][2].sequence, 1);
+                    assert.equal(lineIds[1][2].sequence, 2);
+                    assert.equal(lineIds[2][2].sequence, 3);
+                }
+            }
+        });
+
+        const { drop, moveAbove } = await sortableDrag("li[data-record_id='3']");
+
+        await moveAbove("li[data-record_id='2']");
+        await moveAbove("li[data-record_id='1']");
+        await drop();
+
+        await click(target.querySelector(".o_form_button_save"));
+    });
+
+    QUnit.test("can move a new root into a child", async (assert) => {
+        serverData.models.report.records[0].line_ids = [1, 2, 3];
+        serverData.models.report_lines.records = [
+            {
+                id: 1,
+                sequence: null,
+                parent_id: false,
+                hierarchy_level: 0,
+                name: "parent",
+                code: "P",
+            },
+            {
+                id: 2,
+                sequence: null,
+                parent_id: 1,
+                hierarchy_level: 3,
+                name: "child",
+                code: "C",
+            },
+            {
+                id: 3,
+                sequence: null,
+                parent_id: false,
+                hierarchy_level: 1,
+                name: "noChild",
+                code: "N",
+            },
+        ];
+
+        await makeView({
+            type: "form",
+            resId: 1,
+            resModel: "report",
+            serverData,
+            arch,
+            mockRPC: (route, args) => {
+                if (args.method === 'web_save' && !target.querySelector(".o_dialog")) {
+                    const lineIds = args.args[1].line_ids;
+
+                    // Parents
+                    assert.equal(lineIds[0][2].parent_id, 1);
+
+                    // Hierarchy levels
+                    assert.equal(lineIds[0][2].hierarchy_level, 3);
+
+                    // Sequences
+                    assert.equal(lineIds[0][2].sequence, 2);
+                    assert.equal(lineIds[1][2].sequence, 1);
+                    assert.equal(lineIds[2][2].sequence, 3);
+                    assert.equal(lineIds[3][2].sequence, 4);
+                }
+            }
+        });
+
+        await click(target.querySelector(".account_report_lines_list_x2many"), "li:last-of-type a");
+        await editInput(target.querySelector("div[name='name'] input"), null, "dragged");
+        await click(target.querySelector(".o_dialog"), ".o_form_button_save");
+
+        const { drop, moveAbove } = await sortableDrag("li[data-record_id='4']");
+
+        await moveAbove("li[data-record_id='3']");
+        await moveAbove("li[data-record_id='2']");
+        await drop();
+
+        await click(target.querySelector(".o_form_button_save"));
+    });
+
+    QUnit.test("can move a child into a new root", async (assert) => {
+        serverData.models.report.records[0].line_ids = [];
+        serverData.models.report_lines.records = [];
+
+        await makeView({
+            type: "form",
+            resId: 1,
+            resModel: "report",
+            serverData,
+            arch,
+            mockRPC: (route, args) => {
+                if (args.method === 'web_save' && !target.querySelector(".o_dialog")) {
+                    const lineIds = args.args[1].line_ids;
+
+                    // Parents
+                    assert.equal(lineIds[0][2].parent_id, 1);
+
+                    // Hierarchy levels
+                    assert.equal(lineIds[0][2].hierarchy_level, 3);
+
+                    // Sequences
+                    assert.equal(lineIds[0][2].sequence, 2);
+                    assert.equal(lineIds[1][2].sequence, 1);
+                }
+            }
+        });
+
+        await click(target.querySelector(".account_report_lines_list_x2many"), "li:last-of-type a");
+        await editInput(target.querySelector("div[name='name'] input"), null, "parent");
+        await click(target.querySelector(".o_dialog"), ".o_form_button_save");
+
+        await click(target.querySelector(".account_report_lines_list_x2many"), "li:last-of-type a");
+        await editInput(target.querySelector("div[name='name'] input"), null, "dragged");
+        await click(target.querySelector(".o_dialog"), ".o_form_button_save");
+
+        const toSelector = target.querySelector("li[data-record_id='2']");
+        const { drop, moveTo } = await drag(toSelector);
+
+        await moveTo(toSelector, { x: 600 });
+        await drop();
+
+        await click(target.querySelector(".o_form_button_save"));
+    });
+
+    QUnit.test("can display and hide 'Code' column when toggled in optional fields", async (assert) => {
+        await makeView({
+            type: "form",
+            resId: 1,
+            resModel: "report",
+            serverData,
+            arch,
+        });
+        // Ensure `code` column is hidden by default
+        assert.containsNone(
+            target.querySelector(".account_report_lines_list_x2many"),
+            "span.fw-bold.fixed:contains('Code')",
+            "The 'Code' column should be hidden initially"
+        );
+
+        // simulate toggling the `code` field to make it visible
+        await click(target.querySelector(".o-dropdown.dropdown-toggle"));
+        await click(target.querySelector("input[name='code']"));
+
+        // Check that the column is now visible
+        assert.containsOnce(
+            target.querySelector(".account_report_lines_list_x2many"),
+            "span.fw-bold.fixed:contains('Code')",
+            "The 'Code' column should now be visible after toggling"
+        );
+
+        // Toggle it back to hide and verify
+        await click(target.querySelector("input[name='code']"));
+        assert.containsNone(
+            target.querySelector(".account_report_lines_list_x2many"),
+            "span.fw-bold.fixed:contains('Code')",
+            "The 'Code' column should be hidden after toggling back"
+        );
+    });
+});
diff --git a/dev_odex30_accounting/odex30_account_reports/static/tests/legacy/action_manager_account_report_dl_tests.js b/dev_odex30_accounting/odex30_account_reports/static/tests/legacy/action_manager_account_report_dl_tests.js
new file mode 100644
index 0000000..3c9f524
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_reports/static/tests/legacy/action_manager_account_report_dl_tests.js
@@ -0,0 +1,52 @@
+/** @odoo-module **/
+
+import { mockDownload } from "@web/../tests/helpers/utils";
+
+import { createWebClient, doAction } from "@web/../tests/webclient/helpers";
+
+let serverData;
+QUnit.module('Account Reports', {}, function () {
+    QUnit.test('can execute account report download actions', async function (assert) {
+        assert.expect(5);
+
+        const actions = {
+            1: {
+                id: 1,
+                data: {
+                    model: 'some_model',
+                    options: {
+                        someOption: true,
+                    },
+                    output_format: 'pdf',
+                },
+                type: 'ir_actions_account_report_download',
+            },
+        };
+        serverData = {actions};
+        mockDownload((options) => {
+            assert.step(options.url);
+            assert.deepEqual(options.data, {
+                model: 'some_model',
+                options: {
+                    someOption: true,
+                },
+                output_format: 'pdf',
+            }, "should give the correct data");
+            return Promise.resolve();
+        });
+        const webClient = await createWebClient({
+            serverData,
+            mockRPC: function (route, args) {
+                assert.step(args.method || route);
+            },
+        });
+        await doAction(webClient, 1);
+
+        assert.verifySteps([
+            '/web/webclient/load_menus',
+            '/web/action/load',
+            '/account_reports',
+        ]);
+
+    });
+});
diff --git a/dev_odex30_accounting/odex30_account_reports/static/tests/tours/account.js b/dev_odex30_accounting/odex30_account_reports/static/tests/tours/account.js
new file mode 100644
index 0000000..4bc8cdc
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_reports/static/tests/tours/account.js
@@ -0,0 +1,35 @@
+import { _t } from "@web/core/l10n/translation";
+import { patch } from "@web/core/utils/patch";
+import { accountTourSteps } from "@account/js/tours/account";
+
+patch(accountTourSteps, {
+    onboarding() {
+        return [
+            {
+                trigger: ".o_widget_account_onboarding .fa-circle",
+            },
+            {
+                trigger: "a[data-method=action_open_step_fiscal_year]",
+                content: _t("Set Periods"),
+                run: "click",
+            },
+            {
+                trigger: "button[name=action_save_onboarding_fiscal_year]",
+                content: _t("Save Fiscal Year end"),
+                run: "click",
+            },
+        ];
+    },
+    newInvoice() {
+        return [
+            {
+                trigger: ".o_widget_account_onboarding .fa-check-circle",
+            },
+            {
+                trigger: "button[name=action_create_new]",
+                content: _t("Now, we'll create your first invoice (accountant)"),
+                run: "click",
+            },
+        ];
+    },
+});
diff --git a/dev_odex30_accounting/odex30_account_reports/static/tests/tours/account_reports.js b/dev_odex30_accounting/odex30_account_reports/static/tests/tours/account_reports.js
new file mode 100644
index 0000000..3c7d41a
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_reports/static/tests/tours/account_reports.js
@@ -0,0 +1,262 @@
+/** @odoo-module **/
+
+import { Asserts } from "./asserts";
+import { registry } from "@web/core/registry";
+
+registry.category("web_tour.tours").add("account_reports", {
+    url: "/odoo/action-account_reports.action_account_report_bs",
+    steps: () => [
+        //--------------------------------------------------------------------------------------------------------------
+        // Foldable
+        //--------------------------------------------------------------------------------------------------------------
+        {
+            content: "Initial foldable",
+            trigger: ".o_content",
+            run: () => {
+                Asserts.DOMContainsNumber("tbody > tr:not(.d-none):not(.empty)", 28);
+
+                // Since the total line is not displayed (folded), the amount should be on the line
+                Asserts.isEqual(
+                    document.querySelector("tr:nth-child(4) td:nth-child(2)").textContent,
+                    "75.00"
+                );
+            },
+        },
+        {
+            content: "Click to unfold line",
+            trigger: "tr:nth-child(4) td:first()",
+            run: "click",
+        },
+        {
+            content: "Line is unfolded",
+            trigger: "tr:nth-child(5) .name:contains('101401')",
+            run: () => {
+                Asserts.DOMContainsNumber("tbody > tr:not(.d-none):not(.empty)", 30);
+
+                // Since the total line is displayed (unfolded), the amount should not be on the line
+                Asserts.isEqual(
+                    document.querySelector("tr:nth-child(4) td:nth-child(2)").textContent,
+                    ""
+                );
+            },
+        },
+        {
+            content: "Click to fold line",
+            trigger: "tr:nth-child(4) td:first()",
+            run: "click",
+        },
+        {
+            content: "Line is folded",
+            trigger: ".o_content",
+            run: () => {
+                Asserts.DOMContainsNumber("tbody > tr:not(.d-none):not(.empty)", 28);
+            },
+        },
+        //--------------------------------------------------------------------------------------------------------------
+        // Sortable
+        //--------------------------------------------------------------------------------------------------------------
+        {
+            content: "Unfold first line",
+            trigger: "tr:nth-child(4) td:first()",
+            run: "click",
+        },
+        {
+            content: "Unfold second line",
+            trigger: "tr:nth-child(7) td:first()",
+            run: "click",
+        },
+        {
+            content: "Unfold third line",
+            trigger: "tr:nth-child(10) td:first()",
+            run: "click",
+        },
+        {
+            content: "Extra Trigger step",
+            trigger: "tr:nth-child(12):not(.d-none) .name:contains('101404')",
+        },
+        {
+            content: "Initial sortable",
+            trigger: ".o_content",
+            run: () => {
+                // Bank and Cash Accounts
+                Asserts.isEqual(
+                    document.querySelector("tr:nth-child(5) td:nth-child(2)").textContent,
+                    "75.00"
+                );
+                Asserts.isEqual(
+                    document.querySelector("tr:nth-child(6) td:nth-child(2)").textContent,
+                    "75.00"
+                );
+
+                // Receivables
+                Asserts.isEqual(
+                    document.querySelector("tr:nth-child(8) td:nth-child(2)").textContent,
+                    "25.00"
+                );
+                Asserts.isEqual(
+                    document.querySelector("tr:nth-child(9) td:nth-child(2)").textContent,
+                    "25.00"
+                );
+
+                // Current Assets
+                Asserts.isEqual(
+                    document.querySelector("tr:nth-child(11) td:nth-child(2)").textContent,
+                    "100.00"
+                );
+                Asserts.isEqual(
+                    document.querySelector("tr:nth-child(12) td:nth-child(2)").textContent,
+                    "50.00"
+                );
+                Asserts.isEqual(
+                    document.querySelector("tr:nth-child(13) td:nth-child(2)").textContent,
+                    "150.00"
+                );
+            },
+        },
+        {
+            content: "Click sort",
+            trigger: "th .btn_sortable",
+            run: "click",
+        },
+        {
+            trigger: "tr:nth-child(11) td:nth-child(2):contains('50.00')",
+        },
+        {
+            content: "Unfold not previously unfolded line",
+            trigger: "tr:nth-child(22):contains('Current Liabilities') td:first()",
+            run: "click",
+        },
+        {
+            content: "Line is unfolded",
+            trigger: "tr:nth-child(23) .name:contains('251000')",
+            run: "click",
+        },
+        {
+            content: "Sortable (asc)",
+            trigger: "tr:nth-child(11) td:nth-child(2):contains('50.00')",
+            run: () => {
+                // Bank and Cash Accounts
+                Asserts.isEqual(
+                    document.querySelector("tr:nth-child(5) td:nth-child(2)").textContent,
+                    "75.00"
+                );
+                Asserts.isEqual(
+                    document.querySelector("tr:nth-child(6) td:nth-child(2)").textContent,
+                    "75.00"
+                );
+
+                // Receivables
+                Asserts.isEqual(
+                    document.querySelector("tr:nth-child(8) td:nth-child(2)").textContent,
+                    "25.00"
+                );
+                Asserts.isEqual(
+                    document.querySelector("tr:nth-child(9) td:nth-child(2)").textContent,
+                    "25.00"
+                );
+
+                // Current Assets
+                Asserts.isEqual(
+                    document.querySelector("tr:nth-child(11) td:nth-child(2)").textContent,
+                    "50.00"
+                );
+                Asserts.isEqual(
+                    document.querySelector("tr:nth-child(12) td:nth-child(2)").textContent,
+                    "100.00"
+                );
+                Asserts.isEqual(
+                    document.querySelector("tr:nth-child(13) td:nth-child(2)").textContent,
+                    "150.00"
+                );
+            },
+        },
+        {
+            content: "Click sort",
+            trigger: "th .btn_sortable",
+            run: "click",
+        },
+        {
+            content: "Sortable (desc)",
+            trigger: "tr:nth-child(11) td:nth-child(2):contains('100.00')",
+            run: () => {
+                // Bank and Cash Accounts
+                Asserts.isEqual(
+                    document.querySelector("tr:nth-child(5) td:nth-child(2)").textContent,
+                    "75.00"
+                );
+                Asserts.isEqual(
+                    document.querySelector("tr:nth-child(6) td:nth-child(2)").textContent,
+                    "75.00"
+                );
+
+                // Receivables
+                Asserts.isEqual(
+                    document.querySelector("tr:nth-child(8) td:nth-child(2)").textContent,
+                    "25.00"
+                );
+                Asserts.isEqual(
+                    document.querySelector("tr:nth-child(9) td:nth-child(2)").textContent,
+                    "25.00"
+                );
+
+                // Current Assets
+                Asserts.isEqual(
+                    document.querySelector("tr:nth-child(11) td:nth-child(2)").textContent,
+                    "100.00"
+                );
+                Asserts.isEqual(
+                    document.querySelector("tr:nth-child(12) td:nth-child(2)").textContent,
+                    "50.00"
+                );
+                Asserts.isEqual(
+                    document.querySelector("tr:nth-child(13) td:nth-child(2)").textContent,
+                    "150.00"
+                );
+            },
+        },
+        {
+            content: "Click sort",
+            trigger: "th .btn_sortable",
+            run: "click",
+        },
+        {
+            content: "Sortable (reset)",
+            trigger: "tr:nth-child(5) td:nth-child(2):contains('75.00')",
+            run: () => {
+                // Bank and Cash Accounts
+                Asserts.isEqual(
+                    document.querySelector("tr:nth-child(5) td:nth-child(2)").textContent,
+                    "75.00"
+                );
+                Asserts.isEqual(
+                    document.querySelector("tr:nth-child(6) td:nth-child(2)").textContent,
+                    "75.00"
+                );
+
+                // Receivables
+                Asserts.isEqual(
+                    document.querySelector("tr:nth-child(8) td:nth-child(2)").textContent,
+                    "25.00"
+                );
+                Asserts.isEqual(
+                    document.querySelector("tr:nth-child(9) td:nth-child(2)").textContent,
+                    "25.00"
+                );
+
+                // Current Assets
+                Asserts.isEqual(
+                    document.querySelector("tr:nth-child(11) td:nth-child(2)").textContent,
+                    "100.00"
+                );
+                Asserts.isEqual(
+                    document.querySelector("tr:nth-child(12) td:nth-child(2)").textContent,
+                    "50.00"
+                );
+                Asserts.isEqual(
+                    document.querySelector("tr:nth-child(13) td:nth-child(2)").textContent,
+                    "150.00"
+                );
+            },
+        },
+    ],
+});
diff --git a/dev_odex30_accounting/odex30_account_reports/static/tests/tours/account_reports_amount_rounding.js b/dev_odex30_accounting/odex30_account_reports/static/tests/tours/account_reports_amount_rounding.js
new file mode 100644
index 0000000..bd2e408
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_reports/static/tests/tours/account_reports_amount_rounding.js
@@ -0,0 +1,94 @@
+/** @odoo-module **/
+
+import { registry } from "@web/core/registry";
+
+registry.category("web_tour.tours").add('account_reports_rounding_unit', {
+    url: '/odoo/action-account_reports.action_account_report_bs',
+    steps: () => [
+        {
+            content: 'Test the value of `Receivables` line in decimals',
+            trigger: '.line_name:contains("Receivables") + .line_cell:contains("1,150,000.00")',
+            run: "click",
+        },
+        // Units
+        {
+            content: "Open amounts rounding dropdown",
+            trigger: "#filter_rounding_unit button",
+            run: 'click',
+        },
+        {
+            content: "Select the units filter",
+            trigger: ".dropdown-item:contains('In $')",
+            run: 'click',
+        },
+        {
+            trigger:
+                '.line_name:contains("Receivables") + .line_cell:not(:contains("1,150,000.00"))',
+        },
+        {
+            content: 'test the value of `Receivables` line in units',
+            // We wait for the value to change.
+            // We check the new value.
+            trigger: '.line_name:contains("Receivables") + .line_cell:contains("1,150,000")',
+            run: "click",
+        },
+        // Thousands
+        {
+            content: "Open amounts rounding dropdown",
+            trigger: "#filter_rounding_unit button",
+            run: 'click',
+        },
+        {
+            content: "Select the thousands filter",
+            trigger: ".dropdown-item:contains('In K$')",
+            run: 'click',
+        },
+        {
+            trigger: '.line_name:contains("Receivables") + .line_cell:not(:contains("1,150,000"))',
+        },
+        {
+            content: 'test the value of `Receivables` line in thousands',
+            // We wait for the value to change.
+            // We check the new value.
+            trigger: '.line_name:contains("Receivables") + .line_cell:contains("1,150")',
+            run: "click",
+        },
+        // Millions
+        {
+            content: "Open amounts rounding dropdown",
+            trigger: "#filter_rounding_unit button",
+            run: 'click',
+        },
+        {
+            content: "Select the millions filter",
+            trigger: ".dropdown-item:contains('In M$')",
+            run: 'click',
+        },
+        {
+            trigger: '.line_name:contains("Receivables") + .line_cell:not(:contains("1,150"))',
+        },
+        {
+            content: 'test the value of `Receivables` line in millions',
+            // We wait for the value to change.
+            // We check the new value.
+            trigger: '.line_name:contains("Receivables") + .line_cell:contains("1")',
+            run: "click",
+        },
+        // Decimals
+        {
+            content: "Open amounts rounding dropdown",
+            trigger: "#filter_rounding_unit button",
+            run: 'click',
+        },
+        {
+            content: "Select the decimals filter",
+            trigger: ".dropdown-item:contains('In .$')",
+            run: 'click',
+        },
+        {
+            content: 'test the value of `Receivables` line in millions',
+            trigger: '.line_name:contains("Receivables") + .line_cell:contains("1,150,000.00")',
+            run: () => null,
+        },
+    ]
+});
diff --git a/dev_odex30_accounting/odex30_account_reports/static/tests/tours/account_reports_analytic_filters.js b/dev_odex30_accounting/odex30_account_reports/static/tests/tours/account_reports_analytic_filters.js
new file mode 100644
index 0000000..7a060ea
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_reports/static/tests/tours/account_reports_analytic_filters.js
@@ -0,0 +1,28 @@
+/** @odoo-module **/
+
+import { registry } from "@web/core/registry";
+
+registry.category("web_tour.tours").add("account_reports_analytic_filters", {
+    url: "/odoo/action-account_reports.action_account_report_general_ledger",
+    steps: () => [
+        {
+            content: "click analytic filters",
+            trigger: ".filter_analytic button",
+            run: "click",
+        },
+        {
+            content: "insert text in the searchbar",
+            trigger: ".o_multi_record_selector input",
+            run: "edit Time",
+        },
+        {
+            content: "click on the item",
+            trigger: '.o-autocomplete--dropdown-item:contains("Time Off")',
+            run: "click",
+        },
+        {
+            content: "Check the label of the badge",
+            trigger: '.dropdown-menu .o_tag_badge_text:contains("Time Off")',
+        },
+    ],
+});
diff --git a/dev_odex30_accounting/odex30_account_reports/static/tests/tours/account_reports_annotations.js b/dev_odex30_accounting/odex30_account_reports/static/tests/tours/account_reports_annotations.js
new file mode 100644
index 0000000..55de235
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_reports/static/tests/tours/account_reports_annotations.js
@@ -0,0 +1,298 @@
+/** @odoo-module **/
+
+import { Asserts } from "./asserts";
+import { registry } from "@web/core/registry";
+
+registry.category("web_tour.tours").add("account_reports_annotations", {
+    url: "/odoo/action-account_reports.action_account_report_bs",
+    steps: () => [
+        //--------------------------------------------------------------------------------------------------------------
+        // Annotations
+        //--------------------------------------------------------------------------------------------------------------
+        // Test the initial status of annotations - There are 2 annotations to display
+        {
+            content: "Initial annotations",
+            trigger: ".o_content",
+            run: () => {
+                Asserts.DOMContainsNone(".annotations");
+            },
+        },
+        {
+            content: "Unfold first line",
+            trigger: "tr:nth-child(4) td:first()",
+            run: "click",
+        },
+        {
+            content: "Unfold second line",
+            trigger: "tr:nth-child(7) td:first()",
+            run: "click",
+        },
+        {
+            content: "Unfold third line",
+            trigger: "tr:nth-child(10) td:first()",
+            run: "click",
+        },
+        {
+            content: "Extra Trigger step",
+            trigger: "tr:nth-child(12):not(.d-none) .name:contains('101404')",
+        },
+        {
+            content: "Check there are two lines annotated initially",
+            trigger: ".o_content",
+            run: () => {
+                const annotations = document.querySelectorAll(".btn_annotation .fa-commenting");
+
+                // Check the number of annotated lines
+                Asserts.isEqual(annotations.length, 2);
+
+                // Check the annotations buttons are on the right lines
+                Asserts.isTrue(
+                    annotations[0] ===
+                        document.querySelector("tr:nth-child(5)").querySelector(".fa-commenting")
+                );
+                Asserts.isTrue(
+                    annotations[1] ===
+                        document.querySelector("tr:nth-child(12)").querySelector(".fa-commenting")
+                );
+            },
+        },
+        // Test that we can add a new annotation
+        {
+            content: "Click to show caret option",
+            trigger: "tr:nth-child(8) .dropdown-toggle",
+            run: "click",
+        },
+        {
+            content: "Caret option is displayed",
+            trigger: "tr:nth-child(8)",
+            run: () => {
+                Asserts.hasClass("tr:nth-child(8) .o-dropdown", "show");
+            },
+        },
+        {
+            content: "Click on annotate",
+            trigger: ".o-dropdown--menu .dropdown-item:last-of-type:contains('Annotate')",
+            run: "click",
+        },
+        {
+            content: "Add text to annotate",
+            trigger: "textarea",
+            run: "edit Annotation 121000",
+        },
+        {
+            content: "Submit annotation by blurring",
+            trigger: "textarea",
+            run: function () {
+                const annotation = this.anchor;
+                annotation.dispatchEvent(new InputEvent("input"));
+                annotation.dispatchEvent(new Event("change"));
+            },
+        },
+        {
+            content: "Wait for annotation created",
+            trigger: "tr:nth-child(8) .btn_annotation .fa-commenting",
+        },
+        {
+            content: "Close annotation",
+            trigger: ".o_content",
+            run: "click",
+        },
+        {
+            content: "Check there are now three lines annotated",
+            trigger: ".o_content",
+            run: () => {
+                const annotations = document.querySelectorAll(".btn_annotation .fa-commenting");
+
+                // Check the number of annotated lines
+                Asserts.isEqual(annotations.length, 3);
+
+                // Check the annotations buttons are on the right lines
+                Asserts.isTrue(
+                    annotations[0] ===
+                        document.querySelector("tr:nth-child(5)").querySelector(".fa-commenting")
+                );
+                Asserts.isTrue(
+                    annotations[1] ===
+                        document.querySelector("tr:nth-child(8)").querySelector(".fa-commenting")
+                );
+                Asserts.isTrue(
+                    annotations[2] ===
+                        document.querySelector("tr:nth-child(12)").querySelector(".fa-commenting")
+                );
+            },
+        },
+        // Test that we can edit an annotation
+        {
+            content: "Open second annotated line annotation popover",
+            trigger: "tr:nth-child(8) .btn_annotation",
+            run: "click",
+        },
+        {
+            content: "Annotate contains previous text value",
+            trigger: "textarea",
+            run: () => {
+                Asserts.isEqual(document.querySelector("textarea").value, "Annotation 121000");
+            },
+        },
+        {
+            content: "Add text to annotate",
+            trigger: "textarea",
+            run: "edit Annotation 121000 edited",
+        },
+        {
+            content: "Annotation is edited",
+            trigger: "tr:nth-child(8) .btn_annotation",
+            run: () => {
+                Asserts.isEqual(
+                    document.querySelector(".annotation_popover_autoresize_textarea").value,
+                    "Annotation 121000 edited"
+                );
+            },
+        },
+        // Test that we can delete an annotation by clicking the trash icon
+        {
+            content: "Click on trash can",
+            trigger: ".btn_annotation_delete",
+            run: "click",
+        },
+        {
+            content: "Check there are now only two lines annotated",
+            trigger: "tr:nth-child(8):not(:has(.fa-commenting))",
+            run: () => {
+                const annotations = document.querySelectorAll(".btn_annotation .fa-commenting");
+
+                // Check the number of annotated lines
+                Asserts.isEqual(annotations.length, 2);
+
+                // Check the annotations buttons are on the right lines
+                Asserts.isTrue(
+                    annotations[0] ===
+                        document.querySelector("tr:nth-child(5)").querySelector(".fa-commenting")
+                );
+                Asserts.isTrue(
+                    annotations[1] ===
+                        document.querySelector("tr:nth-child(12)").querySelector(".fa-commenting")
+                );
+            },
+        },
+        // Test that we can add an annotation by clicking on the "New" button inside the popover
+        {
+            content: "Open an annotated line annotation popover",
+            trigger: "tr:nth-child(12) .btn_annotation",
+            run: "click",
+        },
+        {
+            content: "Click on the 'New' button",
+            trigger: ".annotation_popover_line .oe_link",
+            run: "click",
+        },
+        {
+            content: "Add text to annotate",
+            trigger: "textarea:last()",
+            run: "edit Annotation 101404 bis",
+        },
+        {
+            content: "Submit annotation by blurring",
+            trigger: "textarea:last()",
+            run: function () {
+                const annotation = this.anchor;
+                annotation.dispatchEvent(new InputEvent("input"));
+                annotation.dispatchEvent(new Event("change"));
+            },
+        },
+        // Check the current state of the annotations
+        {
+            content: "Check there are two annotated lines to end the test",
+            trigger: ".o_content",
+            run: () => {
+                const annotations = document.querySelectorAll(".btn_annotation .fa-commenting");
+
+                // Check there is only one annotated line
+                Asserts.isEqual(annotations.length, 2);
+
+                // Check the annotation buttons are on the right lines
+                Asserts.isTrue(
+                    annotations[0] ===
+                        document.querySelector("tr:nth-child(5)").querySelector(".fa-commenting")
+                );
+                Asserts.isTrue(
+                    annotations[1] ===
+                        document.querySelector("tr:nth-child(12)").querySelector(".fa-commenting")
+                );
+            },
+        },
+        //--------------------------------------------------------------------------------------------------------------
+        // Annotations dates
+        //--------------------------------------------------------------------------------------------------------------
+        {
+            content:
+                "Remove first annotation to only have one annotation on line 12 (required setup step)",
+            trigger: ".annotation_popover tr:nth-child(2) .btn_annotation_delete",
+            run: "click",
+        },
+        {
+            content: "Verify that we still have one element",
+            trigger: ".annotation_popover tr:nth-child(3):contains('Add a line')",
+        },
+        {
+            content: "Modify the date of an annotation to a further period",
+            trigger: ".annotation_popover tr:nth-child(2) input",
+            run: "edit 01/01/2100",
+        },
+        {
+            content: "Modify the date of an annotation to a further period",
+            trigger: ".annotation_popover tr:nth-child(2) input",
+            run: function () {
+                // Since the t-on-change of the input is not triggered by the run: "edit" action,
+                // we need to dispatch the event manually requiring a function.
+                const input = this.anchor;
+                input.dispatchEvent(new InputEvent("input"));
+                input.dispatchEvent(new Event("change", { bubbles: true }));
+            },
+        },
+        {
+            content: "Check that there is no annotation anymore on line 12",
+            trigger: "tr:nth-child(12):not(:has(.fa-commenting))",
+        },
+        {
+            content: "change date filter",
+            trigger: "#filter_date button",
+            run: "click",
+        },
+        {
+            content: "Open specific date button",
+            trigger: ".dropdown-menu div.dropdown-item",
+            run: "click",
+        },
+        {
+            content: "Go to 15 January 2100",
+            trigger: ".o_datetime_input",
+            run: "edit 01/15/2100",
+        },
+        {
+            content: "Apply filter by closing the dropdown",
+            trigger: "#filter_date .btn:first()",
+            run: "click",
+        },
+        {
+            content: "wait refresh",
+            trigger: `#filter_date button:not(:contains(${new Date().getFullYear()}))`,
+        },
+        {
+            content: "Check there is one annotation on line 12",
+            trigger: "tr:nth-child(12):has(.fa-commenting)",
+            run: () => {
+                const annotations = document.querySelectorAll(".btn_annotation .fa-commenting");
+
+                // Check there is only one annotated line
+                Asserts.isEqual(annotations.length, 1);
+
+                // Check the annotation buttons are on the right lines
+                Asserts.isTrue(
+                    annotations[0] ===
+                        document.querySelector("tr:nth-child(12)").querySelector(".fa-commenting")
+                );
+            }
+        },
+    ]
+});
diff --git a/dev_odex30_accounting/odex30_account_reports/static/tests/tours/account_reports_hide_0_lines.js b/dev_odex30_accounting/odex30_account_reports/static/tests/tours/account_reports_hide_0_lines.js
new file mode 100644
index 0000000..f6bb6f6
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_reports/static/tests/tours/account_reports_hide_0_lines.js
@@ -0,0 +1,107 @@
+/** @odoo-module **/
+
+import { registry } from "@web/core/registry";
+
+registry.category("web_tour.tours").add('account_reports_hide_0_lines', {
+    url: '/odoo/action-account_reports.action_account_report_bs',
+    steps: () => [
+        {
+            content: 'test if the Bank and Cash line is present (but the value is 0)',
+            trigger: '.line_name:contains("Bank and Cash Accounts")',
+            run: "click",
+        },
+        {
+            content: 'test if the Current Year Unallocated Earnings line is present (but the value is 0)',
+            trigger: '.line_name:contains("Current Year Unallocated Earnings")',
+            run: "click",
+        },
+        {
+            content: 'test if the Unallocated Earnings line is present (but value is different from 0 and so should be there after the hide_0_lines',
+            trigger: '.line_name:contains("Unallocated Earnings")',
+            run: "click",
+        },
+        {
+            content: "Open options selector",
+            trigger: "#filter_extra_options button",
+            run: 'click',
+        },
+        {
+            content: "Select the hide line at 0 option",
+            trigger: ".dropdown-item:contains('Hide lines at 0')",
+            run: 'click',
+        },
+        {
+            content: 'test if the Unallocated Earnings line is still present',
+            trigger: '.line_name:contains("Unallocated Earnings")',
+            run: "click",
+        },
+        {
+            content: 'test if the Bank and Cash line is not present',
+            trigger: '.line_name:not(:contains("Bank and Cash Accounts"))',
+            run: "click",
+        },
+        {
+            content: 'test if the Current Year Unallocated Earnings line is not present',
+            trigger: '.line_name:not(:contains("Current Year Unallocated Earnings"))',
+            run: "click",
+        },
+        {
+            content: "Click again to open the options selector",
+            trigger: "#filter_extra_options button",
+            run: 'click',
+        },
+        {
+            content: "Select the hide lines at 0 option again",
+            trigger: ".dropdown-item:contains('Hide lines at 0')",
+            run: 'click',
+        },
+        {
+            content: 'test again if the Bank and Cash line is present (but the value is 0)',
+            trigger: '.line_name:contains("Bank and Cash Accounts")',
+            run: () => null,
+        },
+    ]
+});
+
+registry.category("web_tour.tours").add('account_reports_hide_0_lines_with_string_columns', {
+    url: '/odoo/action-account_reports.action_account_report_general_ledger',
+    steps: () => [
+        {
+            content: "Check if the 211000 Account Payable line is present (but the value is 0)",
+            trigger: ".name:contains('211000 Account Payable')",
+            run: "click",
+        },
+        {
+            content: "Check if the MISC item line is present with string values set up, but all amounts are at 0",
+            trigger: ".name:contains('Coucou les biloutes')",
+        },
+        {
+            content: "Open options selector",
+            trigger: "#filter_extra_options button",
+            run: 'click',
+        },
+        {
+            content: "Select the hide line at 0 option",
+            trigger: ".dropdown-item:contains('Hide lines at 0')",
+            run: 'click',
+        },
+        {
+            content: "Check if the MISC item line is hidden",
+            trigger: ":not(:visible):contains('Coucou les biloutes')",
+        },
+        {
+            content: "Click again to open the options selector",
+            trigger: "#filter_extra_options button",
+            run: 'click',
+        },
+        {
+            content: "Select the hide lines at 0 option again",
+            trigger: ".dropdown-item:contains('Hide lines at 0')",
+            run: 'click',
+        },
+        {
+            content: "Check again if the MISC item line is present (but the value is 0)",
+            trigger: ".name:contains('Coucou les biloutes')",
+        },
+    ]
+});
diff --git a/dev_odex30_accounting/odex30_account_reports/static/tests/tours/account_reports_search.js b/dev_odex30_accounting/odex30_account_reports/static/tests/tours/account_reports_search.js
new file mode 100644
index 0000000..a0df3aa
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_reports/static/tests/tours/account_reports_search.js
@@ -0,0 +1,43 @@
+/** @odoo-module **/
+
+import { registry } from "@web/core/registry";
+
+registry.category("web_tour.tours").add('account_reports_search', {
+    url: '/odoo/action-account_reports.action_account_report_general_ledger',
+    steps: () => [
+        {
+            content: "click search",
+            trigger: '.o_searchview_input',
+            run: 'click',
+        },
+        {
+            content: 'insert text in the searchbar',
+            trigger: '.o_searchview_input',
+            run: "edit 40",
+        },
+        {
+            content: 'test if the product sale line is present',
+            trigger: '.line_name:contains("400000 Product Sales")',
+            run: "click",
+        },
+        {
+            content: "click search",
+            trigger: '.o_searchview_input',
+            run: 'click',
+        },
+        {
+            content: 'insert text in the search bar',
+            trigger: '.o_searchview_input',
+            run: "edit Account",
+        },
+        {
+            content: 'test if the receivable line is present',
+            trigger: '.line_name:contains("121000 Account Receivable")',
+            run: 'click',
+        },
+        {
+            content: 'check that the product sale line is not present',
+            trigger: '.line_name:not(:contains("400000 Product Sales"))',
+        },
+    ]
+});
diff --git a/dev_odex30_accounting/odex30_account_reports/static/tests/tours/account_reports_sections.js b/dev_odex30_accounting/odex30_account_reports/static/tests/tours/account_reports_sections.js
new file mode 100644
index 0000000..b12984c
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_reports/static/tests/tours/account_reports_sections.js
@@ -0,0 +1,129 @@
+/** @odoo-module **/
+
+const { DateTime } = luxon;
+
+import { Asserts } from "./asserts";
+import { registry } from "@web/core/registry";
+
+registry.category("web_tour.tours").add('account_reports_sections', {
+    url: "/odoo/action-account_reports.action_account_report_gt",
+    steps: () => [
+        {
+            content: "Open variant selector",
+            trigger: "#filter_variant button",
+            run: 'click',
+        },
+        {
+            content: "Select the test variant using sections",
+            trigger: ".dropdown-item:contains('Test Sections')",
+            run: 'click',
+        },
+        {
+            content: "Check the lines of section 1 are displayed",
+            trigger: ".line_name:contains('Section 1 line')",
+        },
+        {
+            content: "Check the columns of section 1 are displayed",
+            trigger: "#table_header th:last():contains('Column 1')",
+        },
+        {
+            content: "Check the export buttons belong to the composite report",
+            trigger: ".btn:contains('composite_report_custom_button')",
+        },
+        {
+            content: "Check the filters displayed belong to section 1 (journals filter is not enabled on section 2, nor the composite report)",
+            trigger: "#filter_journal",
+        },
+        {
+            content: "Check the date chosen by default",
+            trigger: "#filter_date",
+            run: (actionHelper) => {
+                // Generic tax report opens on the previous period and in this case the period is one month.
+                // And since we are using the generic tax report, we need to go back one month.
+                const previousMonth = DateTime.now().minus({months: 1});
+
+                Asserts.isTrue(actionHelper.anchor.getElementsByTagName('button')[0].innerText.includes(previousMonth.year));
+            },
+        },
+        {
+            content: "Switch to section 2",
+            trigger: "#section_selector .btn:contains('Section 2')",
+            run: 'click',
+        },
+        {
+            content: "Check the lines of section 2 are displayed",
+            trigger: ".line_name:contains('Section 2 line')",
+        },
+        {
+            content: "Check the columns of section 2 are displayed",
+            trigger: "#table_header th:last():contains('Column 2')",
+        },
+        {
+            content: "Check the export buttons belong to the composite report",
+            trigger: ".btn:contains('composite_report_custom_button')",
+        },
+        {
+            content: "Check the filters displayed belong to section 2 (comparison filter is not enabled on section 1, nor the composite report)",
+            trigger: "#filter_comparison",
+        },
+        {
+            content: "Open date switcher",
+            trigger: "#filter_date button",
+            run: 'click',
+        },
+        {
+            content: "Select another date in the future",
+            trigger: ".dropdown-menu span.dropdown-item:nth-child(3) .btn_next_date",
+            run: 'click'
+        },
+        {
+            content: "Apply filter by closing the dropdown for the future date",
+            trigger: "#filter_date .btn:first()",
+            run: "click",
+        },
+        {
+            content: "Check that the date has changed",
+            trigger: `#filter_date button:not(:contains(${ DateTime.now().minus({months: 1}).year }))`, // We need to remove one month for the case where we are in january. It will impact the year.
+            run: (actionHelper) => {
+                const nextYear = DateTime.now().plus({years: 1}).year;
+
+                Asserts.isTrue(actionHelper.anchor.innerText.includes(nextYear));
+            },
+        },
+        {
+            content: "Open date switcher",
+            trigger: "#filter_date button",
+            run: 'click',
+        },
+        {
+            content: "Select another date first time",
+            trigger: ".dropdown-menu span.dropdown-item:nth-child(3) .btn_previous_date",
+            run: 'click'
+        },
+        {
+            trigger: `.dropdown-menu span.dropdown-item:nth-child(3) time:contains(${ DateTime.now().year})`,
+        },
+        {
+            content: "Select another date second time",
+            trigger: ".dropdown-menu span.dropdown-item:nth-child(3) .btn_previous_date",
+            run: 'click'
+        },
+        {
+            trigger: `.dropdown-menu span.dropdown-item:nth-child(3) time:contains(${ DateTime.now().minus({years: 1}).year })`,
+        },
+        {
+            content: "Apply filter by closing the dropdown",
+            trigger: "#filter_date .btn:first()",
+            run: "click",
+        },
+        {
+            content: "Check that the date has changed",
+            trigger: `#filter_date button:contains(${ DateTime.now().minus({years: 1}).year })`,
+        },
+        {
+            content: "Switch back to section 1",
+            trigger: "#section_selector .btn:contains('Section 1')",
+            run: 'click',
+        },
+    ]
+});
diff --git a/dev_odex30_accounting/odex30_account_reports/static/tests/tours/account_reports_widgets.js b/dev_odex30_accounting/odex30_account_reports/static/tests/tours/account_reports_widgets.js
new file mode 100644
index 0000000..24d3ffa
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_reports/static/tests/tours/account_reports_widgets.js
@@ -0,0 +1,82 @@
+import { registry } from "@web/core/registry";
+
+registry.category("web_tour.tours").add("account_reports_widgets", {
+    url: "/odoo/action-account_reports.action_account_report_pl",
+    steps: () => [
+        {
+            content: "change date filter",
+            trigger: "#filter_date button",
+            run: "click",
+        },
+        {
+            content: "Select another date in the future",
+            trigger: ".dropdown-menu span.dropdown-item:nth-child(3) .btn_next_date",
+            run: 'click'
+        },
+        {
+            content: "Apply filter by closing the dropdown",
+            trigger: "#filter_date .btn:first()",
+            run: "click",
+        },
+        {
+            content: "wait refresh",
+            trigger: `#filter_date button:not(:contains(${ new Date().getFullYear() }))`,
+        },
+        {
+            content: "change date filter for the second time",
+            trigger: "#filter_date button",
+            run: "click",
+        },
+        {
+            content: "Select another date in the past first time",
+            trigger: ".dropdown-menu span.dropdown-item:nth-child(3) .btn_previous_date",
+            run: 'click'
+        },
+        {
+            trigger: `.dropdown-menu span.dropdown-item:nth-child(3) time:contains(${new Date().getFullYear()})`,
+        },
+        {
+            content: "Select another date in the past second time",
+            trigger: ".dropdown-menu span.dropdown-item:nth-child(3) .btn_previous_date",
+            run: 'click'
+        },
+        {
+            trigger: `.dropdown-menu span.dropdown-item:nth-child(3) time:contains(${
+                new Date().getFullYear() - 1
+            })`,
+        },
+        {
+            content: "Apply filter by closing the dropdown",
+            trigger: "#filter_date .btn:first()",
+            run: "click",
+        },
+        {
+            content: "wait refresh",
+            trigger: `#filter_date button:contains(${ new Date().getFullYear() - 1 })`,
+        },
+        {
+            content: "change comparison filter",
+            trigger: "#filter_comparison .btn:first()",
+            run: "click",
+        },
+        {
+            content: "change comparison filter",
+            trigger: ".dropdown-item.period:first()",
+            run: "click",
+        },
+        {
+            content: "Apply filter by closing the dropdown",
+            trigger: "#filter_comparison .btn:first()",
+            run: "click",
+        },
+        {
+            content: "wait refresh, report should have 4 columns",
+            trigger: "th + th + th + th",
+        },
+        {
+            content: "export xlsx",
+            trigger: "button:contains('XLSX')",
+            run: "click",
+        },
+    ],
+});
diff --git a/dev_odex30_accounting/odex30_account_reports/static/tests/tours/asserts.js b/dev_odex30_accounting/odex30_account_reports/static/tests/tours/asserts.js
new file mode 100644
index 0000000..a9371bc
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_reports/static/tests/tours/asserts.js
@@ -0,0 +1,115 @@
+/** @odoo-module **/
+
+//----------------------------------------------------------------------------------------------------------------------
+// This class provides some helpers function to do assertions on tours
+//----------------------------------------------------------------------------------------------------------------------
+export class Asserts {
+    //------------------------------------------------------------------------------------------------------------------
+    // Helpers
+    //------------------------------------------------------------------------------------------------------------------
+    // Gets the number of 'selector' element inside 'target' element
+    static getCount(target, selector) {
+        return document.querySelector(target).querySelectorAll(selector).length;
+    }
+    // Gets the number of 'selector' element inside DOM
+    static getDOMCount(selector) {
+        return document.querySelectorAll(selector).length;
+    }
+    static check(condition, success, error) {
+        condition ? Asserts.success(success) : Asserts.error(error);
+    }
+    static success(message) {
+        return console.info(`SUCCESS: ${message}`);
+    }
+    static error(message) {
+        throw new Error(`FAIL: ${message}`);
+    }
+
+    //------------------------------------------------------------------------------------------------------------------
+    // Asserts
+    //------------------------------------------------------------------------------------------------------------------
+    static isTrue(actual) {
+        Asserts.check(actual, `${actual} is true`, `${actual} is not true`);
+    }
+    static isFalse(actual) {
+        Asserts.check(!actual, `${actual} is false`, `${actual} is not false`);
+    }
+    // Assert that 'actual' and 'expected' are equal
+    static isEqual(actual, expected) {
+        Asserts.check(
+            (actual == expected),
+            `${actual} is equal to expected ${expected}`,
+            `${actual} is not equal to expected ${expected}`
+        );
+    }
+    // Asserts that 'actual' and 'expected' are strictly equal
+    static isStrictEqual(actual, expected) {
+        Asserts.check(
+            (actual === expected),
+            `${actual} is strictly equal to expected ${expected}`,
+            `${actual} is not strictly equal to expected ${expected}`
+        );
+    }
+    // Assert that 'target' element contains at least one 'selector' element
+    static contains(target, selector) {
+        const count = Asserts.getCount(target, selector);
+        Asserts.check(
+            (count > 0),
+            `There is at least one ${selector} in ${target}`,
+            `There should be at least one ${selector} in ${target} but there is ${count}`
+        );
+    }
+    // Asserts there is no 'selector' element in 'target' element
+    static containsNone(target, selector) {
+        const count = Asserts.getCount(target, selector);
+        Asserts.check(
+            (count === 0),
+            `There is no ${selector} in ${target}`,
+            `There should be no ${selector} in ${target} but there is ${count}`
+        );
+    }
+    // Asserts that 'target' element contains 'number' of 'selector' elements
+    static containsNumber(target, selector, number) {
+        const count = Asserts.getCount(target, selector);
+        Asserts.check(
+            (count === number),
+            `There is the correct number (${number}) of ${selector} in ${target}`,
+            `There should be at ${number} ${selector} in ${target} but there is ${count}`
+        );
+    }
+    // Asserts that DOM contains at least one 'selector' element
+    static DOMContains(selector) {
+        const count = Asserts.getDOMCount(selector);
+        Asserts.check(
+            (count > 0),
+            `There is at least one ${selector} in the DOM`,
+            `There should be at least one ${selector} in the DOM but there is ${count}`
+        );
+    }
+    // Asserts there is no 'selector' element in the DOM
+    static DOMContainsNone(selector) {
+        const count = Asserts.getDOMCount(selector);
+        Asserts.check(
+            (count === 0),
+            `There is no ${selector} in the DOM`,
+            `There should be 0 ${selector} in the DOM but there is ${count}`
+        );
+    }
+    // Asserts that DOM contains 'number' of 'selector' element
+    static DOMContainsNumber(selector, number) {
+        const count = Asserts.getDOMCount(selector);
+        Asserts.check(
+            (Asserts.getDOMCount(selector) === number),
+            `There is the correct number (${number}) of ${selector} in the DOM`,
+            `There should be ${number} ${selector} in the DOM but there is ${count}`
+        );
+    }
+    // Asserts that 'selector' element has class 'classname'
+    static hasClass(selector, classname) {
+        Asserts.check(
+            document.querySelector(selector).classList.contains(classname),
+            `${selector} has class ${classname}`,
+            `${selector} should have class ${classname} but hasn't`
+        );
+    }
+}
diff --git a/dev_odex30_accounting/odex30_account_reports/static/tests/tours/test_tour_bank_rec_ui.js b/dev_odex30_accounting/odex30_account_reports/static/tests/tours/test_tour_bank_rec_ui.js
new file mode 100644
index 0000000..a84d265
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_reports/static/tests/tours/test_tour_bank_rec_ui.js
@@ -0,0 +1,25 @@
+import { patch } from "@web/core/utils/patch";
+import { accountTourSteps } from "@account/js/tours/account";
+
+patch(accountTourSteps, {
+    bankRecUiReportSteps() {
+        return [
+            {
+                trigger: ".o_bank_rec_selected_st_line:contains('line1')",
+            },
+            {
+                content: "balance is 2100",
+                trigger: ".btn-link:contains('$ 2,100.00')",
+                run: "click",
+            },
+            {
+                trigger: "span:contains('General Ledger')",
+            },
+            {
+                content: "Breadcrumb back to Bank Reconciliation from the report",
+                trigger: ".breadcrumb-item a:contains('Bank Reconciliation')",
+                run: "click",
+            },
+        ];
+    },
+});
diff --git a/dev_odex30_accounting/odex30_account_reports/static/tests/util.test.js b/dev_odex30_accounting/odex30_account_reports/static/tests/util.test.js
new file mode 100644
index 0000000..d98fdf3
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_reports/static/tests/util.test.js
@@ -0,0 +1,56 @@
+import { expect, test } from "@odoo/hoot";
+
+import { buildLineId, parseLineId, removeTaxGroupingFromLineId } from "@odex30_account_reports/js/util";
+
+test("can build a line id from a list of [markup, res_model, res_id]", () => {
+    const values = [
+        [false, "account.account", 72],
+        [null, "account.move", "10"],
+        [undefined, "account.move.line", "22"],
+        ["name", false, null],
+        ['{"groupby": "account"}', false, null],
+    ];
+    expect(buildLineId(values)).toBe(
+        '~account.account~72|~account.move~10|~account.move.line~22|name~~|{"groupby": "account"}~~'
+    );
+});
+
+test("can parse a line id from a generic id with a markup as object", () => {
+    const genericId =
+        '~account.account~72|~account.move~10|~account.move.line~22|name~~|{"groupby": "account"}~~';
+    expect(parseLineId(genericId)).toEqual([
+        [null, "account.account", 72],
+        [null, "account.move", 10],
+        [null, "account.move.line", 22],
+        ["name", null, null],
+        [{ groupby: "account" }, null, null],
+    ]);
+});
+
+test("can parse a line id from a generic id with a markup as string", () => {
+    const genericId =
+        '~account.account~72|~account.move~10|~account.move.line~22|name~~|{"groupby": "account"}~~';
+    expect(parseLineId(genericId, true)).toEqual([
+        [null, "account.account", 72],
+        [null, "account.move", 10],
+        [null, "account.move.line", 22],
+        ["name", null, null],
+        ['{"groupby": "account"}', null, null],
+    ]);
+});
+
+test("can parse and rebuild a line id to have the same one", () => {
+    const genericId =
+        '~account.account~72|~account.move~10|~account.move.line~22|name~~|{"groupby": "account"}~~';
+    const parsedLineId = parseLineId(genericId);
+    const buildedGenericId = buildLineId(parsedLineId);
+    expect(buildedGenericId).toBe(genericId);
+});
+
+test("can remove tax grouping by account group", () => {
+    const genericId =
+        '{"groupby": "account_group_id"}~account.group~22|~account.account~21|~account.move.line~20';
+    expect(removeTaxGroupingFromLineId(genericId)).toBe(
+        "~account.account~21|~account.move.line~20"
+    );
+});
diff --git a/dev_odex30_accounting/odex30_account_reports/tests/__init__.py b/dev_odex30_accounting/odex30_account_reports/tests/__init__.py
new file mode 100644
index 0000000..4d3e550
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_reports/tests/__init__.py
@@ -0,0 +1,35 @@
+# -*- coding: utf-8 -*-
+
+from . import common
+from . import account_sales_report_common
+from . import test_account_reports_annotations_export
+from . import test_account_reports_filters
+from . import test_account_reports_journal_filter
+from . import test_account_reports_tax_reminder
+from . import test_account_reports_tours
+from . import test_account_sales_report_generic
+from . import test_general_ledger_report
+from . import test_trial_balance_report
+from . import test_partner_ledger_report
+from . import test_reconciliation_report
+from . import test_aged_receivable_report
+from . import test_aged_payable_report
+from . import test_tax_report
+from . import test_tax_report_default_part
+from . import test_cash_flow_report
+from . import test_financial_report
+from . import test_multicurrencies_revaluation_report
+from . import test_tour_account_reports
+from . import test_tour_analytic_filters
+from . import test_tax_report_carryover
+from . import test_balance_sheet_report
+from . import test_balance_sheet_balanced
+from . import test_journal_report
+from . import test_report_engines
+from . import test_all_reports_generation
+from . import test_analytic_reports
+from . import test_deferred_reports
+from . import test_report_sections
+from . import test_budget
+from . import test_currency_table
+from . import test_followup_report
diff --git a/dev_odex30_accounting/odex30_account_reports/tests/account_sales_report_common.py b/dev_odex30_accounting/odex30_account_reports/tests/account_sales_report_common.py
new file mode 100644
index 0000000..d5ba556
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_reports/tests/account_sales_report_common.py
@@ -0,0 +1,43 @@
+# -*- coding: utf-8 -*-
+from odoo import fields
+from odoo.addons.odex30_account_reports.tests.common import TestAccountReportsCommon
+
+
+class AccountSalesReportCommon(TestAccountReportsCommon):
+    @classmethod
+    def setUpClass(cls):
+        super().setUpClass()
+        cls.partner_a.write({
+            'name': 'Partner A',
+            'country_id': cls.env.ref('base.fr').id,
+            "vat": "FR23334175221",
+        })
+        cls.partner_b = cls.env['res.partner'].create({
+            'name': 'Partner B',
+            'country_id': cls.env.ref('base.be').id,
+            "vat": "BE0477472701",
+        })
+        cls.company.partner_id.update({
+            'email': 'jsmith@mail.com',
+            'phone': '+32475123456',
+        })
+
+    def _create_invoices(self, data, is_refund=False):
+        move_vals_list = []
+        for partner, tax, price_unit in data:
+            move_vals_list.append({
+                'move_type': 'out_refund' if is_refund else 'out_invoice',
+                'partner_id': partner.id,
+                'invoice_date': fields.Date.from_string('2019-12-01'),
+                'invoice_line_ids': [
+                    (0, 0, {
+                        'name': 'line_1',
+                        'price_unit': price_unit,
+                        'quantity': 1.0,
+                        'account_id': self.company_data['default_account_revenue'].id,
+                        'tax_ids': [(6, 0, tax.ids)],
+                    }),
+                ],
+            })
+        moves = self.env['account.move'].create(move_vals_list)
+        moves.action_post()
diff --git a/dev_odex30_accounting/odex30_account_reports/tests/common.py b/dev_odex30_accounting/odex30_account_reports/tests/common.py
new file mode 100644
index 0000000..9477ce4
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_reports/tests/common.py
@@ -0,0 +1,399 @@
+
+import copy
+import io
+import unittest
+from collections import Counter
+from datetime import datetime, date
+
+try:
+    from openpyxl import load_workbook
+except ImportError:
+    load_workbook = None
+
+from odoo.addons.account.tests.common import AccountTestInvoicingCommon
+
+from odoo import Command, fields
+from odoo.exceptions import UserError
+from odoo.tools import DEFAULT_SERVER_DATE_FORMAT
+from odoo.tools.misc import formatLang, file_open
+
+class TestAccountReportsCommon(AccountTestInvoicingCommon):
+
+    @classmethod
+    def setUpClass(cls):
+        super().setUpClass()
+        cls.other_currency = cls.setup_other_currency('CAD')
+        cls.company_data_2 = cls.setup_other_company()
+        cls.company_data_2['company'].currency_id = cls.other_currency
+        cls.company_data_2['currency'] = cls.other_currency
+
+    @classmethod
+    def _generate_options(cls, report, date_from, date_to, default_options=None):
+        ''' Create new options at a certain date.
+        :param report:          The report.
+        :param date_from:       A datetime object, str representation of a date or False.
+        :param date_to:         A datetime object or str representation of a date.
+        :return:                The newly created options.
+        '''
+        if isinstance(date_from, datetime):
+            date_from_str = fields.Date.to_string(date_from)
+        else:
+            date_from_str = date_from
+
+        if isinstance(date_to, datetime):
+            date_to_str = fields.Date.to_string(date_to)
+        else:
+            date_to_str = date_to
+
+        if not default_options:
+            default_options = {}
+
+        return report.get_options({
+            'selected_variant_id': report.id,
+            'date': {
+                'date_from': date_from_str,
+                'date_to': date_to_str,
+                'mode': 'range',
+                'filter': 'custom',
+            },
+            'show_account': True,
+            'show_currency': True,
+            **default_options,
+        })
+
+    def _update_comparison_filter(self, options, report, comparison_type, number_period, date_from=None, date_to=None):
+        ''' Modify the existing options to set a new filter_comparison.
+        :param options:         The report options.
+        :param report:          The report.
+        :param comparison_type: One of the following values: ('no_comparison', 'custom', 'previous_period', 'previous_year').
+        :param number_period:   The number of period to compare.
+        :param date_from:       A datetime object for the 'custom' comparison_type.
+        :param date_to:         A datetime object the 'custom' comparison_type.
+        :return:                The newly created options.
+        '''
+        previous_options = {**options, 'comparison': {
+            **options['comparison'],
+            'date_from': date_from and date_from.strftime(DEFAULT_SERVER_DATE_FORMAT),
+            'date_to': date_to and date_to.strftime(DEFAULT_SERVER_DATE_FORMAT),
+            'filter': comparison_type,
+            'number_period': number_period,
+        }}
+        return report.get_options(previous_options)
+
+    def _update_multi_selector_filter(self, options, option_key, selected_ids):
+        ''' Modify a selector in the options to select .
+        :param options:         The report options.
+        :param option_key:      The key to the option.
+        :param selected_ids:    The ids to be selected.
+        :return:                The newly created options.
+        '''
+        new_options = copy.deepcopy(options)
+        for c in new_options[option_key]:
+            c['selected'] = c['id'] in selected_ids
+        return new_options
+
+    def assertColumnPercentComparisonValues(self, lines, expected_values):
+        filtered_lines = self._filter_folded_lines(lines)
+
+        # Check number of lines.
+        self.assertEqual(len(filtered_lines), len(expected_values))
+
+        for value, expected_value in zip(filtered_lines, expected_values):
+            # Check number of columns.
+            key = 'column_percent_comparison_data'
+            self.assertEqual(len(value[key]) + 1, len(expected_value))
+            # Check name, value and class.
+            self.assertEqual((value['name'], value[key]['name'], value[key]['mode']), expected_value)
+
+    def assertHorizontalGroupTotal(self, lines, expected_values):
+        filtered_lines = self._filter_folded_lines(lines)
+
+        # Check number of lines.
+        self.assertEqual(len(filtered_lines), len(expected_values))
+        for line_dict_list, expected_values in zip(filtered_lines, expected_values):
+            column_values = [column['no_format'] for column in line_dict_list['columns']]
+            # Compare the Total column, Total column is there only under certain condition
+            if line_dict_list.get('horizontal_group_total_data'):
+                self.assertEqual(len(line_dict_list['columns']) + 1, len(expected_values[1:]))
+                # Compare the numbers column except the total
+                self.assertEqual(column_values, list(expected_values[1:-1]))
+                # Compare the total column
+                self.assertEqual(line_dict_list['horizontal_group_total_data']['no_format'], expected_values[-1])
+            else:
+                # No total column
+                self.assertEqual(len(line_dict_list['columns']), len(expected_values[1:]))
+                self.assertEqual(column_values, list(expected_values[1:]))
+
+    def assertHeadersValues(self, headers, expected_headers):
+        ''' Helper to compare the headers returned by the _get_table method
+        with some expected results.
+        An header is a row of columns. Then, headers is a list of list of dictionary.
+        :param headers:             The headers to compare.
+        :param expected_headers:    The expected headers.
+        :return:
+        '''
+        # Check number of header lines.
+        self.assertEqual(len(headers), len(expected_headers))
+
+        for header, expected_header in zip(headers, expected_headers):
+            # Check number of columns.
+            self.assertEqual(len(header), len(expected_header))
+
+            for i, column in enumerate(header):
+                # Check name.
+                self.assertEqual(column['name'], self._convert_str_to_date(column['name'], expected_header[i]))
+
+    def assertIdenticalLines(self, reports):
+        """Helper to compare report lines with the same `code` across multiple reports.
+        The helper checks the lines for similarity on:
+        - number of expressions
+        - expression label
+        - expression engine
+        - expression formula
+        - expression subformula
+        - expression date_scope
+
+        :param reports: (recordset of account.report) The reports to check
+        """
+        def expression_to_comparable_values(expr):
+            return (
+                expr.label,
+                expr.engine,
+                expr.formula,
+                expr.subformula,
+                expr.date_scope
+            )
+
+        if not reports:
+            raise UserError('There are no reports to compare.')
+        visited_line_codes = set()
+        for line in reports.line_ids:
+            if not line.code or line.code in visited_line_codes:
+                continue
+            identical_lines = reports.line_ids.filtered(lambda l: l != line and l.code == line.code)
+            if not identical_lines:
+                continue
+            with self.subTest(line_code=line.code):
+                for tested_line in identical_lines:
+                    self.assertCountEqual(
+                        line.expression_ids.mapped(expression_to_comparable_values),
+                        tested_line.expression_ids.mapped(expression_to_comparable_values),
+                        (
+                            f'The line with code {line.code} from reports "{line.report_id.name}" and '
+                            f'"{tested_line.report_id.name}" has different expression values in both reports.'
+                        )
+                    )
+            visited_line_codes.add(line.code)
+
+    def assertLinesValues(self, lines, columns, expected_values, options, currency_map=None, ignore_folded=True):
+        ''' Helper to compare the lines returned by the _get_lines method
+        with some expected results and ensuring the 'id' key of each line holds a unique value.
+        :param lines:               See _get_lines.
+        :param columns:             The columns index.
+        :param expected_values:     A list of iterables.
+        :param options:             The options from the current report.
+        :param currency_map:        A map mapping each column_index to some extra options to test the lines:
+            - currency:             The currency to be applied on the column.
+            - currency_code_index:  The index of the column containing the currency code.
+        :param ignore_folded:       Will not filter folded lines when True.
+        '''
+        if currency_map is None:
+            currency_map = {}
+
+        filtered_lines = self._filter_folded_lines(lines) if ignore_folded else lines
+
+        # Compare the table length to see if any line is missing
+        self.assertEqual(len(filtered_lines), len(expected_values))
+
+        # Compare cell by cell the current value with the expected one.
+        to_compare_list = []
+        for i, line in enumerate(filtered_lines):
+            compared_values = [[], []]
+            for j, index in enumerate(columns):
+                if index == 0:
+                    current_value = line['name']
+                else:
+                    # Some lines may not have columns, like title lines. In such case, no values should be provided for these.
+                    # Note that the function expect a tuple, so the line still need a comma after the name value.
+                    if j > len(expected_values[i]) - 1:
+                        break
+                    current_value = line['columns'][index-1].get('name', '')
+                    current_figure_type = line['columns'][index - 1].get('figure_type', '')
+
+                expected_value = expected_values[i][j]
+                currency_data = currency_map.get(index, {})
+                used_currency = None
+                if 'currency' in currency_data:
+                    used_currency = currency_data['currency']
+                elif 'currency_code_index' in currency_data:
+                    currency_code = line['columns'][currency_data['currency_code_index'] - 1].get('name', '')
+                    if currency_code:
+                        used_currency = self.env['res.currency'].search([('name', '=', currency_code)], limit=1)
+                        assert used_currency, "Currency having name=%s not found." % currency_code
+                if not used_currency:
+                    used_currency = self.env.company.currency_id
+
+                if type(expected_value) in (int, float) and type(current_value) == str:
+                    if current_figure_type and current_figure_type != 'monetary':
+                        expected_value = str(expected_value)
+                    elif options.get('multi_currency'):
+                        expected_value = formatLang(self.env, expected_value, currency_obj=used_currency)
+                    else:
+                        expected_value = formatLang(self.env, expected_value, digits=used_currency.decimal_places)
+
+                compared_values[0].append(current_value)
+                compared_values[1].append(expected_value)
+
+            to_compare_list.append(compared_values)
+
+        errors = []
+        for i, to_compare in enumerate(to_compare_list):
+            if to_compare[0] != to_compare[1]:
+                errors += [
+                    "\n==== Differences at index %s ====" % str(i),
+                    "Current Values:  %s" % str(to_compare[0]),
+                    "Expected Values: %s" % str(to_compare[1]),
+                ]
+
+        id_counts = Counter(line['id'] for line in lines)
+        duplicate_ids = {k: v for k, v in id_counts.items() if v > 1}
+        if duplicate_ids:
+            index_to_id = [
+                f"index={index:<6} name={line.get('name', 'no line name?!')} \tline_id={line.get('id', 'no line id?!')}"
+                for index, line in enumerate(lines)
+                if line.get('id', 'no line id?!') in duplicate_ids
+            ]
+            errors += [
+                "\n==== There are lines sharing the same id ====",
+                "\n".join(index_to_id)
+            ]
+
+        if errors:
+            self.fail('\n'.join(errors))
+
+    def _filter_folded_lines(self, lines):
+        """ Children lines returned for folded lines (for example, totals below sections) should be ignored when comparing the results
+        in assertLinesValues (their parents are folded, so they are not shown anyway). This function returns a filtered version of lines
+        list, without the chilren of folded lines.
+        """
+        filtered_lines = []
+        folded_lines = set()
+        for line in lines:
+            if line.get('parent_id') in folded_lines:
+                folded_lines.add(line['id'])
+            else:
+                if line.get('unfoldable') and not line.get('unfolded'):
+                    folded_lines.add(line['id'])
+                filtered_lines.append(line)
+        return filtered_lines
+
+    def _convert_str_to_date(self, ref, val):
+        if isinstance(ref, date) and isinstance(val, str):
+            return datetime.strptime(val, '%Y-%m-%d').date()
+        return val
+
+    @classmethod
+    def _create_tax_report_line(cls, name, report, tag_name=None, parent_line=None, sequence=None, code=None, formula=None):
+        """ Creates a tax report line
+        """
+        create_vals = {
+            'name': name,
+            'code': code,
+            'report_id': report.id,
+            'sequence': sequence,
+            'expression_ids': [],
+        }
+        if tag_name and formula:
+            raise UserError("Can't use this helper to create a line with both tags and formula")
+        if tag_name:
+            create_vals['expression_ids'].append(Command.create({
+                "label": "balance",
+                "engine": "tax_tags",
+                "formula": tag_name,
+            }))
+        if parent_line:
+            create_vals['parent_id'] = parent_line.id
+        if formula:
+            create_vals['expression_ids'].append(Command.create({
+                "label": "balance",
+                "engine": "aggregation",
+                "formula": formula,
+            }))
+
+        return cls.env['account.report.line'].create(create_vals)
+
+    @classmethod
+    def _get_tag_ids(cls, sign, expressions, company=False):
+        """ Helper function to define tag ids for taxes """
+        return [(6, 0, cls.env['account.account.tag'].search([
+            ('applicability', '=', 'taxes'),
+            ('country_id.code', '=', (company or cls.env.company).account_fiscal_country_id.code),
+            ('name', 'in', [f"{sign}{f}" for f in expressions.mapped('formula')]),
+        ]).ids)]
+
+    @classmethod
+    def _get_basic_line_dict_id_from_report_line(cls, report_line):
+        """ Computes a full generic id for the provided report line (hence including the one of its parent as prefix), using no markup.
+        """
+        report = report_line.report_id
+        if report_line.parent_id:
+            parent_line_id = cls._get_basic_line_dict_id_from_report_line(report_line.parent_id)
+            return report._get_generic_line_id(report_line._name, report_line.id, parent_line_id=parent_line_id)
+
+        return report._get_generic_line_id(report_line._name, report_line.id)
+
+    @classmethod
+    def _get_basic_line_dict_id_from_report_line_ref(cls, report_line_xmlid):
+        """ Same as _get_basic_line_dict_id_from_report_line, but from the line's xmlid, for convenience in the tests.
+        """
+        return cls._get_basic_line_dict_id_from_report_line(cls.env.ref(report_line_xmlid))
+
+    @classmethod
+    def _get_audit_params_from_report_line(cls, options, report_line, report_line_dict, **kwargs):
+        return {
+            'report_line_id': report_line.id,
+            'calling_line_dict_id': report_line_dict['id'],
+            'expression_label': 'balance',
+            'column_group_key': next(iter(options['column_groups'])),
+            **kwargs,
+        }
+
+    def _report_compare_with_test_file(self, report, xml_file=None, test_xml=None):
+        report_xml = self.get_xml_tree_from_string(report['file_content'])
+        if xml_file and not test_xml:
+            with file_open(f"{self.test_module}/tests/expected_xmls/{xml_file}", 'rb') as fp:
+                test_xml = fp.read()
+        test_xml_tree = self.get_xml_tree_from_string(test_xml)
+        self.assertXmlTreeEqual(report_xml, test_xml_tree)
+
+    @classmethod
+    def _fill_tax_report_line_external_value(cls, target, amount, date):
+        cls.env['account.report.external.value'].create({
+            'company_id': cls.company_data['company'].id,
+            'target_report_expression_id': cls.env.ref(target).id,
+            'name': 'Manual value',
+            'date': fields.Date.from_string(date),
+            'value': amount,
+        })
+
+    def _test_xlsx_file(self, file_content, expected_values):
+        """ Takes in the binary content of a xlsx file and a dict of expected values.
+        It will then parse the file in order to compare the values with the expected ones.
+        The expected values dict format is:
+        'row_number': ['cell_1_val', 'cell_2_val', ...]
+
+        :param file_content: The binary content of the xlsx file
+        :param expected_values: The dict of expected values
+        """
+        if load_workbook is None:
+            raise unittest.SkipTest("openpyxl not available")
+
+        report_file = io.BytesIO(file_content)
+        xlsx = load_workbook(filename=report_file, data_only=True)
+        sheet = xlsx.worksheets[0]
+        sheet_values = list(sheet.values)
+
+        for row, values in expected_values.items():
+            row_values = [v if v is not None else '' for v in sheet_values[row]]
+            for row_value, expected_value in zip(row_values, values):
+                self.assertEqual(row_value, expected_value)
diff --git a/dev_odex30_accounting/odex30_account_reports/tests/test_account_reports_annotations_export.py b/dev_odex30_accounting/odex30_account_reports/tests/test_account_reports_annotations_export.py
new file mode 100644
index 0000000..80f6106
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_reports/tests/test_account_reports_annotations_export.py
@@ -0,0 +1,136 @@
+import datetime
+import io
+import unittest
+
+from odoo import Command
+from odoo.tests import tagged
+from odoo.addons.odex30_account_reports.tests.common import TestAccountReportsCommon
+
+try:
+    from openpyxl import load_workbook
+except ImportError:
+    load_workbook = None
+
+
+@tagged('post_install', '-at_install')
+class TestAccountReportAnnotationsExport(TestAccountReportsCommon):
+    @classmethod
+    def setUpClass(cls):
+        if load_workbook is None:
+            raise unittest.SkipTest("openpyxl not available")
+
+        super().setUpClass()
+
+        cls.report = cls.env.ref('odex30_account_reports.balance_sheet')
+        cls.report.column_ids.sortable = True
+
+        # Get accounts
+        bank_default_account = cls.company_data["default_journal_bank"].default_account_id
+        tax_sale_default_account = cls.company_data["default_account_tax_sale"]
+        # Create move
+        move = cls.env['account.move'].create({
+            'move_type': 'entry',
+            'date': '2024-06-10',
+            'journal_id': cls.company_data['default_journal_cash'].id,
+            'line_ids': [
+                (0, 0, {'debit':  250.0,     'credit':   0.0,    'account_id': bank_default_account.id}),
+                (0, 0, {'debit':   0.0,     'credit': 250.0,    'account_id': tax_sale_default_account.id}),
+            ],
+        })
+        move.action_post()
+        # Get line_ids
+        line_id_ta = cls.report._get_generic_line_id('account.report.line', cls.env.ref('odex30_account_reports.account_financial_report_total_assets0').id)
+        line_id_ca = cls.report._get_generic_line_id('account.report.line', cls.env.ref('odex30_account_reports.account_financial_report_current_assets_view0').id, parent_line_id=line_id_ta)
+        line_id_ba = cls.report._get_generic_line_id('account.report.line', cls.env.ref('odex30_account_reports.account_financial_report_bank_view0').id, parent_line_id=line_id_ca)
+        line_id_bank = cls.report._get_generic_line_id('account.account', bank_default_account.id, markup={'groupby': 'account_id'}, parent_line_id=line_id_ba)
+        # Create annotation
+        date = datetime.datetime.strptime('2024-06-20', '%Y-%m-%d').date()
+        cls.report.write({
+            'annotations_ids': [
+                Command.create({
+                    'line_id': cls.env['account.report.annotation']._remove_tax_grouping_from_line_id(line_id_bank),
+                    'text': 'Papa a vu le fifi de lolo',
+                    'date': date,
+                }),
+            ]
+        })
+
+    def read_xlsx_data(self, report_data):
+        report_file = io.BytesIO(report_data)
+        xlsx = load_workbook(filename=report_file, data_only=True)
+        sheet = xlsx.worksheets[0]
+        return list(sheet.values)
+
+    def test_annotations_export_no_comparison(self):
+        options = self._generate_options(self.report, '2024-06-01', '2024-06-30', default_options={'unfold_all': True})
+        report_data = self.report.export_to_xlsx(options)
+        export_content = self.read_xlsx_data(report_data['file_content'])
+
+        # When there is no comparison, there are two columns for the accounts (number, name), one column for the data and
+        # finally one column for the annotations. Hence the index 3 for the annotation column.
+        self.assertEqual(export_content[0][3], "Annotations")
+        self.assertEqual(export_content[7][3], "1 - Papa a vu le fifi de lolo")
+
+    def test_annotations_export_same_period_last_year_comparison(self):
+        default_comparison = {
+            'filter': 'same_last_year',
+            'number_period': 1,
+            'date_from': '2023-06-01',
+            'date_to': '2023-06-30',
+            'periods': [{
+                'string': 'As of 06/30/2023',
+                'period_type': 'month', 'mode':
+                'single', 'date_from': '2023-06-01',
+                'date_to': '2023-06-30'
+            }],
+            'period_order':
+            'descending',
+            'string': 'As of 06/30/2023',
+            'period_type': 'month',
+            'mode': 'single'
+        }
+        options = self._generate_options(self.report, '2024-06-01', '2024-06-30', default_options={'unfold_all': True, 'comparison': default_comparison})
+        report_data = self.report.export_to_xlsx(options)
+        export_content = self.read_xlsx_data(report_data['file_content'])
+
+        # When comparing with the same period last year, there are two columns for the accounts (number, name), two columns for the
+        # date (one per period), one column for the growth comparison percentage and finally one column for the annotations.
+        # Hence the index 5 for the annotation column.
+        self.assertEqual(export_content[0][5], "Annotations")
+        self.assertEqual(export_content[7][5], "1 - Papa a vu le fifi de lolo")
+
+    def test_annotations_export_two_last_periods_comparison(self):
+        default_comparison = {
+            'filter': 'previous_period',
+            'number_period': 2,
+            'date_from': '2024-05-01',
+            'date_to': '2024-05-31',
+            'periods': [
+                {
+                    'string': 'As of 05/31/2024',
+                    'period_type': 'month',
+                    'mode': 'single',
+                    'date_from': '2024-05-01',
+                    'date_to': '2024-05-31'
+                },
+                {
+                    'string': 'As of 04/30/2024',
+                    'period_type': 'month',
+                    'mode': 'single',
+                    'date_from': '2024-04-01',
+                    'date_to': '2024-04-30'
+                }
+            ],
+            'period_order': 'descending',
+            'string': 'As of 05/31/2024',
+            'period_type': 'month',
+            'mode': 'single'
+        }
+        options = self._generate_options(self.report, '2024-06-01', '2024-06-30', default_options={'unfold_all': True, 'comparison': default_comparison})
+        report_data = self.report.export_to_xlsx(options)
+        export_content = self.read_xlsx_data(report_data['file_content'])
+
+        # When comparing with the two last periods, there are two columns for the accounts (number, name), three columns for the
+        # data (one per period) and finally one column for the annotations. Hence the index 5 for the annotation column.
+        self.assertEqual(export_content[0][5], "Annotations")
+        self.assertEqual(export_content[7][5], "1 - Papa a vu le fifi de lolo")
diff --git a/dev_odex30_accounting/odex30_account_reports/tests/test_account_reports_filters.py b/dev_odex30_accounting/odex30_account_reports/tests/test_account_reports_filters.py
new file mode 100644
index 0000000..65f1196
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_reports/tests/test_account_reports_filters.py
@@ -0,0 +1,1617 @@
+# -*- coding: utf-8 -*-
+# pylint: disable=C0326
+import odoo.tests
+
+from odoo.tests import tagged
+from odoo import Command, fields
+from .common import TestAccountReportsCommon
+from odoo.tools import date_utils
+from odoo.tools.misc import formatLang, format_date
+
+from dateutil.relativedelta import relativedelta
+from unittest.mock import patch
+from freezegun import freeze_time
+
+
+@tagged('post_install', '-at_install')
+class TestAccountReportsFilters(TestAccountReportsCommon, odoo.tests.HttpCase):
+
+    def _assert_filter_date(self, report, previous_options, expected_date_values):
+        """ Initializes and checks the 'date' option computed for the provided report and previous_options
+        """
+        options = report.get_options(previous_options)
+        self.assertDictEqual(options['date'], expected_date_values)
+
+    def _assert_filter_comparison(self, report, previous_options, expected_period_values):
+        """ Initializes and checks the 'comparison' option computed for the provided report and previous_options
+        """
+        options = report.get_options(previous_options)
+
+        self.assertEqual(len(options['comparison']['periods']), len(expected_period_values))
+
+        for i, expected_values in enumerate(expected_period_values):
+            self.assertDictEqual(options['comparison']['periods'][i], expected_values)
+
+    @classmethod
+    def setUpClass(cls):
+        super().setUpClass()
+
+        cls.single_date_report = cls.env['account.report'].create({
+            'name': "Single Date Report",
+            'filter_period_comparison': True,
+            'filter_date_range': False,
+        })
+
+        cls.date_range_report = cls.env['account.report'].create({
+            'name': "Date Range Report",
+            'filter_period_comparison': True,
+        })
+
+    ####################################################
+    # DATES RANGE
+    ####################################################
+
+    @freeze_time('2017-12-31')
+    def test_filter_date_month_range(self):
+        ''' Test the filter_date with 'this_month'/'last_month' in 'range' mode.'''
+        self._assert_filter_date(
+            self.date_range_report,
+            {'date': {'filter': 'this_month', 'mode': 'range'}},
+            {
+                'string': 'Dec 2017',
+                'period_type': 'month',
+                'mode': 'range',
+                'filter': 'this_month',
+                'date_from': '2017-12-01',
+                'date_to': '2017-12-31',
+                'currency_table_period_key': '2017-12-01_2017-12-31',
+            },
+        )
+
+        self._assert_filter_date(
+            self.date_range_report,
+            {'date': {'filter': 'previous_month', 'mode': 'range'}},
+            {
+                'string': 'Nov 2017',
+                'period_type': 'month',
+                'mode': 'range',
+                'filter': 'previous_month',
+                'period': -1,
+                'date_from': '2017-11-01',
+                'date_to': '2017-11-30',
+                'currency_table_period_key': '2017-11-01_2017-11-30',
+            },
+        )
+
+        self._assert_filter_date(
+            self.date_range_report,
+            {'date': {'filter': 'next_month', 'mode': 'range'}},
+            {
+                'string': 'Jan 2018',
+                'period_type': 'month',
+                'mode': 'range',
+                'filter': 'next_month',
+                'period': 1,
+                'date_from': '2018-01-01',
+                'date_to': '2018-01-31',
+                'currency_table_period_key': '2018-01-01_2018-01-31',
+            },
+        )
+
+        self._assert_filter_comparison(
+            self.date_range_report,
+            {'date': {'filter': 'this_month', 'mode': 'range'}, 'comparison': {'filter': 'previous_period', 'number_period': 2}},
+            [
+                {
+                    'string': 'Nov 2017',
+                    'period_type': 'month',
+                    'mode': 'range',
+                    'date_from': '2017-11-01',
+                    'date_to': '2017-11-30',
+                    'currency_table_period_key': '2017-11-01_2017-11-30',
+                },
+                {
+                    'string': 'Oct 2017',
+                    'period_type': 'month',
+                    'mode': 'range',
+                    'date_from': '2017-10-01',
+                    'date_to': '2017-10-31',
+                    'currency_table_period_key': '2017-10-01_2017-10-31',
+                },
+            ],
+        )
+
+        self._assert_filter_comparison(
+            self.date_range_report,
+            {'date': {'filter': 'this_month', 'mode': 'range'}, 'comparison': {'filter': 'same_last_year', 'number_period': 2}},
+            [
+                {
+                    'string': 'Dec 2016',
+                    'period_type': 'month',
+                    'mode': 'range',
+                    'date_from': '2016-12-01',
+                    'date_to': '2016-12-31',
+                    'currency_table_period_key': '2016-12-01_2016-12-31',
+                },
+                {
+                    'string': 'Dec 2015',
+                    'period_type': 'month',
+                    'mode': 'range',
+                    'date_from': '2015-12-01',
+                    'date_to': '2015-12-31',
+                    'currency_table_period_key': '2015-12-01_2015-12-31',
+                },
+            ],
+        )
+
+        self._assert_filter_comparison(
+            self.date_range_report,
+            {'date': {'filter': 'this_month', 'mode': 'range'}, 'comparison':{'filter': 'custom', 'date_from': '2016-12-01', 'date_to': '2016-12-31'}},
+            [
+                {
+                    'string': 'Dec 2016',
+                    'period_type': 'month',
+                    'mode': 'range',
+                    'date_from': '2016-12-01',
+                    'date_to': '2016-12-31',
+                    'currency_table_period_key': '2016-12-01_2016-12-31',
+                },
+            ],
+        )
+
+    @freeze_time('2017-12-31')
+    def test_filter_date_quarter_range(self):
+        ''' Test the filter_date with 'this_quarter'/'last_quarter' in 'range' mode.'''
+        self._assert_filter_date(
+            self.date_range_report,
+            {'date': {'filter': 'this_quarter', 'mode': 'range'}},
+            {
+                'string': 'Oct - Dec 2017',
+                'period_type': 'quarter',
+                'mode': 'range',
+                'filter': 'this_quarter',
+                'date_from': '2017-10-01',
+                'date_to': '2017-12-31',
+                'currency_table_period_key': '2017-10-01_2017-12-31',
+            },
+        )
+
+        self._assert_filter_date(
+            self.date_range_report,
+            {'date': {'filter': 'previous_quarter', 'mode': 'range'}},
+            {
+                'string': 'Jul - Sep 2017',
+                'period_type': 'quarter',
+                'mode': 'range',
+                'filter': 'previous_quarter',
+                'period': -1,
+                'date_from': '2017-07-01',
+                'date_to': '2017-09-30',
+                'currency_table_period_key': '2017-07-01_2017-09-30',
+            },
+        )
+
+        self._assert_filter_date(
+            self.date_range_report,
+            {'date': {'filter': 'next_quarter', 'mode': 'range'}},
+            {
+                'string': 'Jan - Mar 2018',
+                'period_type': 'quarter',
+                'mode': 'range',
+                'filter': 'next_quarter',
+                'period': 1,
+                'date_from': '2018-01-01',
+                'date_to': '2018-03-31',
+                'currency_table_period_key': '2018-01-01_2018-03-31',
+            },
+        )
+
+        self._assert_filter_comparison(
+            self.date_range_report,
+            {'date': {'filter': 'this_quarter', 'mode': 'range'}, 'comparison': {'filter': 'previous_period', 'number_period': 2}},
+            [
+                {
+                    'string': 'Jul - Sep 2017',
+                    'period_type': 'quarter',
+                    'mode': 'range',
+                    'date_from': '2017-07-01',
+                    'date_to': '2017-09-30',
+                    'currency_table_period_key': '2017-07-01_2017-09-30',
+                },
+                {
+                    'string': 'Apr - Jun 2017',
+                    'period_type': 'quarter',
+                    'mode': 'range',
+                    'date_from': '2017-04-01',
+                    'date_to': '2017-06-30',
+                    'currency_table_period_key': '2017-04-01_2017-06-30',
+                },
+            ],
+        )
+
+        self._assert_filter_comparison(
+            self.date_range_report,
+            {'date': {'filter': 'this_quarter', 'mode': 'range'}, 'comparison': {'filter': 'same_last_year', 'number_period': 2}},
+            [
+                {
+                    'string': 'Oct - Dec 2016',
+                    'period_type': 'quarter',
+                    'mode': 'range',
+                    'date_from': '2016-10-01',
+                    'date_to': '2016-12-31',
+                    'currency_table_period_key': '2016-10-01_2016-12-31',
+                },
+                {
+                    'string': 'Oct - Dec 2015',
+                    'period_type': 'quarter',
+                    'mode': 'range',
+                    'date_from': '2015-10-01',
+                    'date_to': '2015-12-31',
+                    'currency_table_period_key': '2015-10-01_2015-12-31',
+                },
+            ],
+        )
+
+        self._assert_filter_comparison(
+            self.date_range_report,
+            {'date': {'filter': 'this_quarter', 'mode': 'range'}, 'comparison': {'filter': 'custom', 'date_from': '2016-10-01', 'date_to': '2016-12-31'}},
+            [
+                {
+                    'string': 'Oct - Dec 2016',
+                    'period_type': 'quarter',
+                    'mode': 'range',
+                    'date_from': '2016-10-01',
+                    'date_to': '2016-12-31',
+                    'currency_table_period_key': '2016-10-01_2016-12-31',
+                },
+            ],
+        )
+
+    @freeze_time('2017-12-31')
+    def test_filter_date_fiscalyear_range_full_year(self):
+        ''' Test the filter_date with 'this_year'/'last_year' in 'range' mode when the fiscal year ends the 12-31.'''
+        self._assert_filter_date(
+            self.date_range_report,
+            {'date': {'filter': 'this_year', 'mode': 'range'}},
+            {
+                'string': '2017',
+                'period_type': 'fiscalyear',
+                'mode': 'range',
+                'filter': 'this_year',
+                'date_from': '2017-01-01',
+                'date_to': '2017-12-31',
+                'currency_table_period_key': '2017-01-01_2017-12-31',
+            },
+        )
+
+        self._assert_filter_date(
+            self.date_range_report,
+            {'date': {'filter': 'previous_year', 'mode': 'range'}},
+            {
+                'string': '2016',
+                'period_type': 'fiscalyear',
+                'mode': 'range',
+                'filter': 'previous_year',
+                'period': -1,
+                'date_from': '2016-01-01',
+                'date_to': '2016-12-31',
+                'currency_table_period_key': '2016-01-01_2016-12-31',
+            },
+        )
+
+        self._assert_filter_date(
+            self.date_range_report,
+            {'date': {'filter': 'next_year', 'mode': 'range'}},
+            {
+                'string': '2018',
+                'period_type': 'fiscalyear',
+                'mode': 'range',
+                'filter': 'next_year',
+                'period': 1,
+                'date_from': '2018-01-01',
+                'date_to': '2018-12-31',
+                'currency_table_period_key': '2018-01-01_2018-12-31',
+            },
+        )
+
+        self._assert_filter_comparison(
+            self.date_range_report,
+            {'date': {'filter': 'this_year', 'mode': 'range'}, 'comparison': {'filter': 'previous_period', 'number_period': 2}},
+            [
+                {
+                    'string': '2016',
+                    'period_type': 'fiscalyear',
+                    'mode': 'range',
+                    'date_from': '2016-01-01',
+                    'date_to': '2016-12-31',
+                    'currency_table_period_key': '2016-01-01_2016-12-31',
+                },
+                {
+                    'string': '2015',
+                    'period_type': 'fiscalyear',
+                    'mode': 'range',
+                    'date_from': '2015-01-01',
+                    'date_to': '2015-12-31',
+                    'currency_table_period_key': '2015-01-01_2015-12-31',
+                },
+            ],
+        )
+
+        self._assert_filter_comparison(
+            self.date_range_report,
+            {'date': {'filter': 'this_year', 'mode': 'range'}, 'comparison': {'filter': 'same_last_year', 'number_period': 2}},
+            [
+                {
+                    'string': '2016',
+                    'period_type': 'fiscalyear',
+                    'mode': 'range',
+                    'date_from': '2016-01-01',
+                    'date_to': '2016-12-31',
+                    'currency_table_period_key': '2016-01-01_2016-12-31',
+                },
+                {
+                    'string': '2015',
+                    'period_type': 'fiscalyear',
+                    'mode': 'range',
+                    'date_from': '2015-01-01',
+                    'date_to': '2015-12-31',
+                    'currency_table_period_key': '2015-01-01_2015-12-31',
+                },
+            ],
+        )
+
+        self._assert_filter_comparison(
+            self.date_range_report,
+            {'date': {'filter': 'this_year', 'mode': 'range'}, 'comparison': {'filter': 'custom', 'date_from': '2016-01-01', 'date_to': '2016-12-31'}},
+            [
+                {
+                    'string': '2016',
+                    'period_type': 'fiscalyear',
+                    'mode': 'range',
+                    'date_from': '2016-01-01',
+                    'date_to': '2016-12-31',
+                    'currency_table_period_key': '2016-01-01_2016-12-31',
+                },
+            ],
+        )
+
+    @freeze_time('2017-12-31')
+    def test_filter_date_fiscalyear_range_overlap_years(self):
+        ''' Test the filter_date with 'this_year'/'last_year' in 'range' mode when the fiscal year overlaps 2 years.'''
+        self.env.company.fiscalyear_last_day = 30
+        self.env.company.fiscalyear_last_month = '6'
+
+        self._assert_filter_date(
+            self.date_range_report,
+            {'date': {'filter': 'this_year', 'mode': 'range'}},
+            {
+                'string': '2017 - 2018',
+                'period_type': 'fiscalyear',
+                'mode': 'range',
+                'filter': 'this_year',
+                'date_from': '2017-07-01',
+                'date_to': '2018-06-30',
+                'currency_table_period_key': '2017-07-01_2018-06-30',
+            },
+        )
+
+        self._assert_filter_date(
+            self.date_range_report,
+            {'date': {'filter': 'previous_year', 'mode': 'range'}},
+            {
+                'string': '2016 - 2017',
+                'period_type': 'fiscalyear',
+                'mode': 'range',
+                'filter': 'previous_year',
+                'period': -1,
+                'date_from': '2016-07-01',
+                'date_to': '2017-06-30',
+                'currency_table_period_key': '2016-07-01_2017-06-30',
+            },
+        )
+
+        self._assert_filter_date(
+            self.date_range_report,
+            {'date': {'filter': 'next_year', 'mode': 'range'}},
+            {
+                'string': '2018 - 2019',
+                'period_type': 'fiscalyear',
+                'mode': 'range',
+                'filter': 'next_year',
+                'period': 1,
+                'date_from': '2018-07-01',
+                'date_to': '2019-06-30',
+                'currency_table_period_key': '2018-07-01_2019-06-30',
+            },
+        )
+
+        self._assert_filter_comparison(
+            self.date_range_report,
+            {'date': {'filter': 'this_year', 'mode': 'range'}, 'comparison': {'filter': 'previous_period', 'number_period': 2}},
+            [
+                {
+                    'string': '2016 - 2017',
+                    'period_type': 'fiscalyear',
+                    'mode': 'range',
+                    'date_from': '2016-07-01',
+                    'date_to': '2017-06-30',
+                    'currency_table_period_key': '2016-07-01_2017-06-30',
+                },
+                {
+                    'string': '2015 - 2016',
+                    'period_type': 'fiscalyear',
+                    'mode': 'range',
+                    'date_from': '2015-07-01',
+                    'date_to': '2016-06-30',
+                    'currency_table_period_key': '2015-07-01_2016-06-30',
+                },
+            ],
+        )
+
+        self._assert_filter_comparison(
+            self.date_range_report,
+            {'date': {'filter': 'this_year', 'mode': 'range'}, 'comparison': {'filter': 'same_last_year', 'number_period': 2}},
+            [
+                {
+                    'string': '2016 - 2017',
+                    'period_type': 'fiscalyear',
+                    'mode': 'range',
+                    'date_from': '2016-07-01',
+                    'date_to': '2017-06-30',
+                    'currency_table_period_key': '2016-07-01_2017-06-30',
+                },
+                {
+                    'string': '2015 - 2016',
+                    'period_type': 'fiscalyear',
+                    'mode': 'range',
+                    'date_from': '2015-07-01',
+                    'date_to': '2016-06-30',
+                    'currency_table_period_key': '2015-07-01_2016-06-30',
+                },
+            ],
+        )
+
+        self._assert_filter_comparison(
+            self.date_range_report,
+            {'date': {'filter': 'this_year', 'mode': 'range'}, 'comparison': {'filter': 'custom', 'date_from': '2016-07-01', 'date_to': '2017-06-30'}},
+            [
+                {
+                    'string': '2016 - 2017',
+                    'period_type': 'fiscalyear',
+                    'mode': 'range',
+                    'date_from': '2016-07-01',
+                    'date_to': '2017-06-30',
+                    'currency_table_period_key': '2016-07-01_2017-06-30',
+                },
+            ],
+        )
+
+    @freeze_time('2017-12-31')
+    def test_filter_date_fiscalyear_range_custom_years(self):
+        ''' Test the filter_date with 'this_year'/'last_year' in 'range' mode with custom account.fiscal.year records.'''
+        # Create a custom fiscal year for the nine previous quarters.
+        today = fields.Date.from_string('2017-12-31')
+        for i in range(9):
+            quarter_df, quarter_dt = date_utils.get_quarter(today - relativedelta(months=i * 3))
+            self.env['account.fiscal.year'].create({
+                'name': 'custom %s' % i,
+                'date_from': fields.Date.to_string(quarter_df),
+                'date_to': fields.Date.to_string(quarter_dt),
+                'company_id': self.env.company.id,
+            })
+        quarter_df, quarter_dt = date_utils.get_quarter(today + relativedelta(months=3))
+        # Adding a next quarter
+        self.env['account.fiscal.year'].create({
+            'name': 'custom next quarter',
+            'date_from': fields.Date.to_string(quarter_df),
+            'date_to': fields.Date.to_string(quarter_dt),
+            'company_id': self.env.company.id,
+        })
+
+        self._assert_filter_date(
+            self.date_range_report,
+            {'date': {'filter': 'next_year', 'mode': 'range'}},
+            {
+                'string': 'custom next quarter',
+                'period_type': 'fiscalyear',
+                'mode': 'range',
+                'filter': 'next_year',
+                'period': 1,
+                'date_from': '2018-01-01',
+                'date_to': '2018-03-31',
+                'currency_table_period_key': '2018-01-01_2018-03-31',
+            },
+        )
+
+        self._assert_filter_date(
+            self.date_range_report,
+            {'date': {'filter': 'this_year', 'mode': 'range'}},
+            {
+                'string': 'custom 0',
+                'period_type': 'fiscalyear',
+                'mode': 'range',
+                'filter': 'this_year',
+                'date_from': '2017-10-01',
+                'date_to': '2017-12-31',
+                'currency_table_period_key': '2017-10-01_2017-12-31',
+            },
+        )
+
+        self._assert_filter_date(
+            self.date_range_report,
+            {'date': {'filter': 'previous_year', 'mode': 'range'}},
+            {
+                'string': 'custom 1',
+                'period_type': 'fiscalyear',
+                'mode': 'range',
+                'filter': 'previous_year',
+                'period': -1,
+                'date_from': '2017-07-01',
+                'date_to': '2017-09-30',
+                'currency_table_period_key': '2017-07-01_2017-09-30',
+            },
+        )
+
+        self._assert_filter_comparison(
+            self.date_range_report,
+            {'date': {'filter': 'this_year', 'mode': 'range'}, 'comparison': {'filter': 'previous_period', 'number_period': 2}},
+            [
+                {
+                    'string': 'custom 1',
+                    'period_type': 'fiscalyear',
+                    'mode': 'range',
+                    'date_from': '2017-07-01',
+                    'date_to': '2017-09-30',
+                    'currency_table_period_key': '2017-07-01_2017-09-30',
+                },
+                {
+                    'string': 'custom 2',
+                    'period_type': 'fiscalyear',
+                    'mode': 'range',
+                    'date_from': '2017-04-01',
+                    'date_to': '2017-06-30',
+                    'currency_table_period_key': '2017-04-01_2017-06-30',
+                },
+            ],
+        )
+
+        self._assert_filter_comparison(
+            self.date_range_report,
+            {'date': {'filter': 'this_year', 'mode': 'range'}, 'comparison': {'filter': 'same_last_year', 'number_period': 2}},
+            [
+                {
+                    'string': 'custom 4',
+                    'period_type': 'fiscalyear',
+                    'mode': 'range',
+                    'date_from': '2016-10-01',
+                    'date_to': '2016-12-31',
+                    'currency_table_period_key': '2016-10-01_2016-12-31',
+                },
+                {
+                    'string': 'custom 8',
+                    'period_type': 'fiscalyear',
+                    'mode': 'range',
+                    'date_from': '2015-10-01',
+                    'date_to': '2015-12-31',
+                    'currency_table_period_key': '2015-10-01_2015-12-31',
+                },
+            ],
+        )
+
+        self._assert_filter_comparison(
+        self.date_range_report,
+            {'date': {'filter': 'this_year', 'mode': 'range'}, 'comparison': {'filter': 'custom', 'date_from': '2017-07-01', 'date_to': '2017-09-30'}},
+            [
+                {
+                    'string': 'custom 1',
+                    'period_type': 'fiscalyear',
+                    'mode': 'range',
+                    'date_from': '2017-07-01',
+                    'date_to': '2017-09-30',
+                    'currency_table_period_key': '2017-07-01_2017-09-30',
+                },
+            ],
+        )
+
+    @freeze_time('2017-12-31')
+    def test_filter_date_custom_range(self):
+        ''' Test the filter_date with a custom dates range.'''
+        self._assert_filter_date(
+            self.date_range_report,
+            {'date': {'filter': 'custom', 'mode': 'range', 'date_from': '2017-01-01', 'date_to': '2017-01-15'}},
+            {
+                'string': 'From %s\nto  %s' % (format_date(self.env, '2017-01-01'), format_date(self.env, '2017-01-15')),
+                'period_type': 'custom',
+                'mode': 'range',
+                'filter': 'custom',
+                'date_from': '2017-01-01',
+                'date_to': '2017-01-15',
+                'currency_table_period_key': '2017-01-01_2017-01-15',
+            },
+        )
+
+        self._assert_filter_comparison(
+            self.date_range_report,
+            {
+                'date': {'filter': 'custom', 'mode': 'range', 'date_from': '2017-01-01', 'date_to': '2017-01-15'},
+                'comparison': {'filter': 'previous_period', 'number_period': 2},
+            },
+            [
+                {
+                    'string': 'Dec 2016',
+                    'period_type': 'month',
+                    'mode': 'range',
+                    'date_from': '2016-12-01',
+                    'date_to': '2016-12-31',
+                    'currency_table_period_key': '2016-12-01_2016-12-31',
+                },
+                {
+                    'string': 'Nov 2016',
+                    'period_type': 'month',
+                    'mode': 'range',
+                    'date_from': '2016-11-01',
+                    'date_to': '2016-11-30',
+                    'currency_table_period_key': '2016-11-01_2016-11-30',
+                },
+            ],
+        )
+
+        self._assert_filter_comparison(
+            self.date_range_report,
+            {
+                'date': {'filter': 'custom', 'mode': 'range', 'date_from': '2017-01-01', 'date_to': '2017-01-15'},
+                'comparison': {'filter': 'same_last_year', 'number_period': 2},
+            },
+            [
+                {
+                    'string': 'From %s\nto  %s' % (format_date(self.env, '2016-01-01'), format_date(self.env, '2016-01-15')),
+                    'period_type': 'custom',
+                    'mode': 'range',
+                    'date_from': '2016-01-01',
+                    'date_to': '2016-01-15',
+                    'currency_table_period_key': '2016-01-01_2016-01-15',
+                },
+                {
+                    'string': 'From %s\nto  %s' % (format_date(self.env, '2015-01-01'), format_date(self.env, '2015-01-15')),
+                    'period_type': 'custom',
+                    'mode': 'range',
+                    'date_from': '2015-01-01',
+                    'date_to': '2015-01-15',
+                    'currency_table_period_key': '2015-01-01_2015-01-15',
+                },
+            ],
+        )
+
+    @freeze_time('2017-12-31')
+    def test_filter_date_custom_range_recognition(self):
+        ''' Test the period is well recognized when dealing with custom dates range.
+        It means date_from = '2018-01-01', date_to = '2018-12-31' must be considered as a full year.
+        '''
+        self._assert_filter_date(
+            self.date_range_report,
+            {'date': {'filter': 'custom', 'mode': 'range', 'date_from': '2017-12-01', 'date_to': '2017-12-31'}},
+            {
+                'string': 'Dec 2017',
+                'period_type': 'month',
+                'mode': 'range',
+                'filter': 'custom',
+                'date_from': '2017-12-01',
+                'date_to': '2017-12-31',
+                'currency_table_period_key': '2017-12-01_2017-12-31',
+            },
+        )
+
+        self._assert_filter_date(
+            self.date_range_report,
+            {'date': {'filter': 'custom', 'mode': 'range', 'date_from': '2017-10-01', 'date_to': '2017-12-31'}},
+            {
+                'string': 'Oct - Dec 2017',
+                'period_type': 'quarter',
+                'mode': 'range',
+                'filter': 'custom',
+                'date_from': '2017-10-01',
+                'date_to': '2017-12-31',
+                'currency_table_period_key': '2017-10-01_2017-12-31',
+            },
+        )
+
+        self._assert_filter_date(
+            self.date_range_report,
+            {'date': {'filter': 'custom', 'mode': 'range', 'date_from': '2017-01-01', 'date_to': '2017-12-31'}},
+            {
+                'string': '2017',
+                'period_type': 'fiscalyear',
+                'mode': 'range',
+                'filter': 'custom',
+                'date_from': '2017-01-01',
+                'date_to': '2017-12-31',
+                'currency_table_period_key': '2017-01-01_2017-12-31',
+            },
+        )
+
+        self.env.company.fiscalyear_last_day = 30
+        self.env.company.fiscalyear_last_month = '6'
+        self._assert_filter_date(
+            self.date_range_report,
+            {'date': {'filter': 'custom', 'mode': 'range', 'date_from': '2016-07-01', 'date_to': '2017-06-30'}},
+            {
+                'string': '2016 - 2017',
+                'period_type': 'fiscalyear',
+                'mode': 'range',
+                'filter': 'custom',
+                'date_from': '2016-07-01',
+                'date_to': '2017-06-30',
+                'currency_table_period_key': '2016-07-01_2017-06-30',
+            },
+        )
+
+        self.env['account.fiscal.year'].create({
+            'name': 'custom 0',
+            'date_from': '2017-10-01',
+            'date_to': '2017-12-31',
+            'company_id': self.env.company.id,
+        })
+        self._assert_filter_date(
+            self.date_range_report,
+            {'date': {'filter': 'custom', 'mode': 'range', 'date_from': '2017-10-01', 'date_to': '2017-12-31'}},
+            {
+                'string': 'custom 0',
+                'period_type': 'fiscalyear',
+                'mode': 'range',
+                'filter': 'custom',
+                'date_from': '2017-10-01',
+                'date_to': '2017-12-31',
+                'currency_table_period_key': '2017-10-01_2017-12-31',
+            },
+        )
+
+    ####################################################
+    # SINGLE DATE
+    ####################################################
+
+    @freeze_time('2017-12-30')
+    def test_filter_date_today_single(self):
+        ''' Test the filter_date with 'today' in 'single' mode.'''
+        self._assert_filter_date(
+            self.single_date_report,
+            {'date': {'filter': 'today', 'mode': 'single'}},
+            {
+                'string': 'As of %s' % format_date(self.env, '2017-12-30'),
+                'period_type': 'today',
+                'mode': 'single',
+                'filter': 'today',
+                'date_from': '2017-01-01',
+                'date_to': '2017-12-30',
+                'currency_table_period_key': 'None_2017-12-30',
+            },
+        )
+
+        self._assert_filter_comparison(
+            self.single_date_report,
+            {'date': {'filter': 'today', 'mode': 'single'}, 'comparison': {'filter': 'previous_period', 'number_period': 2}},
+            [
+                {
+                    'string': 'As of %s' % format_date(self.env, '2016-12-31'),
+                    'period_type': 'fiscalyear',
+                    'mode': 'single',
+                    'date_from': '2016-01-01',
+                    'date_to': '2016-12-31',
+                    'currency_table_period_key': 'None_2016-12-31',
+                },
+                {
+                    'string': 'As of %s' % format_date(self.env, '2015-12-31'),
+                    'period_type': 'fiscalyear',
+                    'mode': 'single',
+                    'date_from': '2015-01-01',
+                    'date_to': '2015-12-31',
+                    'currency_table_period_key': 'None_2015-12-31',
+                },
+            ],
+        )
+
+        self._assert_filter_comparison(
+            self.single_date_report,
+            {'date': {'filter': 'today', 'mode': 'single'}, 'comparison': {'filter': 'same_last_year', 'number_period': 2}},
+            [
+                {
+                    'string': 'As of %s' % format_date(self.env, '2016-12-30'),
+                    'period_type': 'today',
+                    'mode': 'single',
+                    'date_from': '2016-01-01',
+                    'date_to': '2016-12-30',
+                    'currency_table_period_key': 'None_2016-12-30',
+                },
+                {
+                    'string': 'As of %s' % format_date(self.env, '2015-12-30'),
+                    'period_type': 'today',
+                    'mode': 'single',
+                    'date_from': '2015-01-01',
+                    'date_to': '2015-12-30',
+                    'currency_table_period_key': 'None_2015-12-30',
+                },
+            ],
+        )
+
+        self._assert_filter_comparison(
+            self.single_date_report,
+            {'date': {'filter': 'today', 'mode': 'single'}, 'comparison': {'filter': 'custom', 'date_to': '2016-12-31'}},
+            [
+                {
+                    'string': 'As of %s' % format_date(self.env, '2016-12-31'),
+                    'period_type': 'custom',
+                    'mode': 'single',
+                    'date_from': False,
+                    'date_to': '2016-12-31',
+                    'currency_table_period_key': 'None_2016-12-31',
+                },
+            ],
+        )
+
+    @freeze_time('2017-12-31')
+    def test_filter_date_month_single(self):
+        ''' Test the filter_date with 'this_month'/'last_month' in 'single' mode.'''
+        self._assert_filter_date(
+            self.single_date_report,
+            {'date': {'filter': 'this_month', 'mode': 'single'}},
+            {
+                'string': 'As of %s' % format_date(self.env, '2017-12-31'),
+                'period_type': 'month',
+                'mode': 'single',
+                'filter': 'this_month',
+                'date_from': '2017-12-01',
+                'date_to': '2017-12-31',
+                'currency_table_period_key': 'None_2017-12-31',
+            },
+        )
+
+        self._assert_filter_comparison(
+            self.single_date_report,
+            {'date': {'filter': 'this_month', 'mode': 'single'}, 'comparison': {'filter': 'previous_period', 'number_period': 2}},
+            [
+                {
+                    'string': 'As of %s' % format_date(self.env, '2017-11-30'),
+                    'period_type': 'month',
+                    'mode': 'single',
+                    'date_from': '2017-11-01',
+                    'date_to': '2017-11-30',
+                    'currency_table_period_key': 'None_2017-11-30',
+                },
+                {
+                    'string': 'As of %s' % format_date(self.env, '2017-10-31'),
+                    'period_type': 'month',
+                    'mode': 'single',
+                    'date_from': '2017-10-01',
+                    'date_to': '2017-10-31',
+                    'currency_table_period_key': 'None_2017-10-31',
+                },
+            ],
+        )
+
+        self._assert_filter_comparison(
+            self.single_date_report,
+            {'date': {'filter': 'this_month', 'mode': 'single'}, 'comparison': {'filter': 'same_last_year', 'number_period': 2}},
+            [
+                {
+                    'string': 'As of %s' % format_date(self.env, '2016-12-31'),
+                    'period_type': 'month',
+                    'mode': 'single',
+                    'date_from': '2016-12-01',
+                    'date_to': '2016-12-31',
+                    'currency_table_period_key': 'None_2016-12-31',
+                },
+                {
+                    'string': 'As of %s' % format_date(self.env, '2015-12-31'),
+                    'period_type': 'month',
+                    'mode': 'single',
+                    'date_from': '2015-12-01',
+                    'date_to': '2015-12-31',
+                    'currency_table_period_key': 'None_2015-12-31',
+                },
+            ],
+        )
+
+    @freeze_time('2017-12-31')
+    def test_filter_date_quarter_single(self):
+        ''' Test the filter_date with 'this_quarter'/'last_quarter' in 'single' mode.'''
+        self._assert_filter_date(
+            self.single_date_report,
+            {'date': {'filter': 'this_quarter', 'mode': 'single'}},
+            {
+                'string': 'As of %s' % format_date(self.env, '2017-12-31'),
+                'period_type': 'quarter',
+                'mode': 'single',
+                'filter': 'this_quarter',
+                'date_from': '2017-10-01',
+                'date_to': '2017-12-31',
+                'currency_table_period_key': 'None_2017-12-31',
+            },
+        )
+
+        self._assert_filter_comparison(
+            self.single_date_report,
+            {'date': {'filter': 'this_quarter', 'mode': 'single'}, 'comparison': {'filter': 'previous_period', 'number_period': 2}},
+            [
+                {
+                    'string': 'As of %s' % format_date(self.env, '2017-09-30'),
+                    'period_type': 'quarter',
+                    'mode': 'single',
+                    'date_from': '2017-07-01',
+                    'date_to': '2017-09-30',
+                    'currency_table_period_key': 'None_2017-09-30',
+                },
+                {
+                    'string': 'As of %s' % format_date(self.env, '2017-06-30'),
+                    'period_type': 'quarter',
+                    'mode': 'single',
+                    'date_from': '2017-04-01',
+                    'date_to': '2017-06-30',
+                    'currency_table_period_key': 'None_2017-06-30',
+                },
+            ],
+        )
+
+        self._assert_filter_comparison(
+            self.single_date_report,
+            {'date': {'filter': 'this_quarter', 'mode': 'single'}, 'comparison': {'filter': 'same_last_year', 'number_period': 2}},
+            [
+                {
+                    'string': 'As of %s' % format_date(self.env, '2016-12-31'),
+                    'period_type': 'quarter',
+                    'mode': 'single',
+                    'date_from': '2016-10-01',
+                    'date_to': '2016-12-31',
+                    'currency_table_period_key': 'None_2016-12-31',
+                },
+                {
+                    'string': 'As of %s' % format_date(self.env, '2015-12-31'),
+                    'period_type': 'quarter',
+                    'mode': 'single',
+                    'date_from': '2015-10-01',
+                    'date_to': '2015-12-31',
+                    'currency_table_period_key': 'None_2015-12-31',
+                },
+            ],
+        )
+
+    @freeze_time('2017-12-31')
+    def test_filter_date_fiscalyear_single_full_year(self):
+        ''' Test the filter_date with 'this_year'/'last_year' in 'single' mode when the fiscal year ends the 12-31.'''
+        self._assert_filter_date(
+            self.single_date_report,
+            {'date': {'filter': 'this_year', 'mode': 'single'}},
+            {
+                'string': 'As of %s' % format_date(self.env, '2017-12-31'),
+                'period_type': 'fiscalyear',
+                'mode': 'single',
+                'filter': 'this_year',
+                'date_from': '2017-01-01',
+                'date_to': '2017-12-31',
+                'currency_table_period_key': 'None_2017-12-31',
+            },
+        )
+
+        self._assert_filter_comparison(
+            self.single_date_report,
+            {'date': {'filter': 'this_year', 'mode': 'single'}, 'comparison': {'filter': 'previous_period', 'number_period': 2}},
+            [
+                {
+                    'string': 'As of %s' % format_date(self.env, '2016-12-31'),
+                    'period_type': 'fiscalyear',
+                    'mode': 'single',
+                    'date_from': '2016-01-01',
+                    'date_to': '2016-12-31',
+                    'currency_table_period_key': 'None_2016-12-31',
+                },
+                {
+                    'string': 'As of %s' % format_date(self.env, '2015-12-31'),
+                    'period_type': 'fiscalyear',
+                    'mode': 'single',
+                    'date_from': '2015-01-01',
+                    'date_to': '2015-12-31',
+                    'currency_table_period_key': 'None_2015-12-31',
+                },
+            ],
+        )
+
+        self._assert_filter_comparison(
+            self.single_date_report,
+            {'date': {'filter': 'this_year', 'mode': 'single'}, 'comparison': {'filter': 'same_last_year', 'number_period': 2}},
+            [
+                {
+                    'string': 'As of %s' % format_date(self.env, '2016-12-31'),
+                    'period_type': 'fiscalyear',
+                    'mode': 'single',
+                    'date_from': '2016-01-01',
+                    'date_to': '2016-12-31',
+                    'currency_table_period_key': 'None_2016-12-31',
+                },
+                {
+                    'string': 'As of %s' % format_date(self.env, '2015-12-31'),
+                    'period_type': 'fiscalyear',
+                    'mode': 'single',
+                    'date_from': '2015-01-01',
+                    'date_to': '2015-12-31',
+                    'currency_table_period_key': 'None_2015-12-31',
+                },
+            ],
+        )
+
+    @freeze_time('2017-12-31')
+    def test_filter_date_fiscalyear_single_overlap_years(self):
+        ''' Test the filter_date with 'this_year'/'last_year' in 'single' mode when the fiscal year overlaps 2 years.'''
+        self.env.company.fiscalyear_last_day = 30
+        self.env.company.fiscalyear_last_month = '6'
+
+        self._assert_filter_date(
+            self.single_date_report,
+            {'date': {'filter': 'this_year', 'mode': 'single'}},
+            {
+                'string': 'As of %s' % format_date(self.env, '2018-06-30'),
+                'period_type': 'fiscalyear',
+                'mode': 'single',
+                'filter': 'this_year',
+                'date_from': '2017-07-01',
+                'date_to': '2018-06-30',
+                'currency_table_period_key': 'None_2018-06-30',
+            },
+        )
+
+        self._assert_filter_comparison(
+            self.single_date_report,
+            {'date': {'filter': 'this_year', 'mode': 'single'}, 'comparison': {'filter': 'previous_period', 'number_period': 2}},
+            [
+                {
+                    'string': 'As of %s' % format_date(self.env, '2017-06-30'),
+                    'period_type': 'fiscalyear',
+                    'mode': 'single',
+                    'date_from': '2016-07-01',
+                    'date_to': '2017-06-30',
+                    'currency_table_period_key': 'None_2017-06-30',
+                },
+                {
+                    'string': 'As of %s' % format_date(self.env, '2016-06-30'),
+                    'period_type': 'fiscalyear',
+                    'mode': 'single',
+                    'date_from': '2015-07-01',
+                    'date_to': '2016-06-30',
+                    'currency_table_period_key': 'None_2016-06-30',
+                },
+            ],
+        )
+
+        self._assert_filter_comparison(
+            self.single_date_report,
+            {'date': {'filter': 'this_year', 'mode': 'single'}, 'comparison': {'filter': 'same_last_year', 'number_period': 2}},
+            [
+                {
+                    'string': 'As of %s' % format_date(self.env, '2017-06-30'),
+                    'period_type': 'fiscalyear',
+                    'mode': 'single',
+                    'date_from': '2016-07-01',
+                    'date_to': '2017-06-30',
+                    'currency_table_period_key': 'None_2017-06-30',
+                },
+                {
+                    'string': 'As of %s' % format_date(self.env, '2016-06-30'),
+                    'period_type': 'fiscalyear',
+                    'mode': 'single',
+                    'date_from': '2015-07-01',
+                    'date_to': '2016-06-30',
+                    'currency_table_period_key': 'None_2016-06-30',
+                },
+            ],
+        )
+
+    @freeze_time('2017-12-31')
+    def test_filter_date_fiscalyear_single_custom_years(self):
+        ''' Test the filter_date with 'this_year'/'last_year' in 'single' mode with custom account.fiscal.year records.'''
+        # Create a custom fiscal year for the nine previous quarters.
+        today = fields.Date.from_string('2017-12-31')
+        for i in range(9):
+            quarter_df, quarter_dt = date_utils.get_quarter(today - relativedelta(months=i * 3))
+            self.env['account.fiscal.year'].create({
+                'name': 'custom %s' % i,
+                'date_from': fields.Date.to_string(quarter_df),
+                'date_to': fields.Date.to_string(quarter_dt),
+                'company_id': self.env.company.id,
+            })
+
+        self._assert_filter_date(
+            self.single_date_report,
+            {'date': {'filter': 'this_year', 'mode': 'single'}},
+            {
+                'string': 'custom 0',
+                'period_type': 'fiscalyear',
+                'mode': 'single',
+                'filter': 'this_year',
+                'date_from': '2017-10-01',
+                'date_to': '2017-12-31',
+                'currency_table_period_key': 'None_2017-12-31',
+            },
+        )
+
+        self._assert_filter_comparison(
+            self.single_date_report,
+            {'date': {'filter': 'this_year', 'mode': 'single'}, 'comparison': {'filter': 'previous_period', 'number_period': 2}},
+            [
+                {
+                    'string': 'custom 1',
+                    'period_type': 'fiscalyear',
+                    'mode': 'single',
+                    'date_from': '2017-07-01',
+                    'date_to': '2017-09-30',
+                    'currency_table_period_key': 'None_2017-09-30',
+                },
+                {
+                    'string': 'custom 2',
+                    'period_type': 'fiscalyear',
+                    'mode': 'single',
+                    'date_from': '2017-04-01',
+                    'date_to': '2017-06-30',
+                    'currency_table_period_key': 'None_2017-06-30',
+                },
+            ],
+        )
+
+        self._assert_filter_comparison(
+            self.single_date_report,
+            {'date': {'filter': 'this_year', 'mode': 'single'}, 'comparison': {'filter': 'same_last_year', 'number_period': 2}},
+            [
+                {
+                    'string': 'custom 4',
+                    'period_type': 'fiscalyear',
+                    'mode': 'single',
+                    'date_from': '2016-10-01',
+                    'date_to': '2016-12-31',
+                    'currency_table_period_key': 'None_2016-12-31',
+                },
+                {
+                    'string': 'custom 8',
+                    'period_type': 'fiscalyear',
+                    'mode': 'single',
+                    'date_from': '2015-10-01',
+                    'date_to': '2015-12-31',
+                    'currency_table_period_key': 'None_2015-12-31',
+                },
+            ],
+        )
+
+    @freeze_time('2017-12-31')
+    def test_filter_date_custom_single(self):
+        ''' Test the filter_date with a custom date in 'single' mode.'''
+        self._assert_filter_date(
+            self.single_date_report,
+            {'date': {'filter': 'custom', 'mode': 'single', 'date_to': '2018-01-15'}},
+            {
+                'string': 'As of %s' % format_date(self.env, '2018-01-15'),
+                'period_type': 'custom',
+                'mode': 'single',
+                'filter': 'custom',
+                'date_from': '2018-01-01',
+                'date_to': '2018-01-15',
+                'currency_table_period_key': 'None_2018-01-15',
+            },
+        )
+
+        self._assert_filter_comparison(
+            self.single_date_report,
+            {'date': {'filter': 'custom', 'mode': 'single', 'date_to': '2018-01-15'}, 'comparison': {'filter': 'previous_period', 'number_period': 2}},
+            [
+                {
+                    'string': 'As of %s' % format_date(self.env, '2017-12-31'),
+                    'period_type': 'month',
+                    'mode': 'single',
+                    'date_from': '2017-12-01',
+                    'date_to': '2017-12-31',
+                    'currency_table_period_key': 'None_2017-12-31',
+                },
+                {
+                    'string': 'As of %s' % format_date(self.env, '2017-11-30'),
+                    'period_type': 'month',
+                    'mode': 'single',
+                    'date_from': '2017-11-01',
+                    'date_to': '2017-11-30',
+                    'currency_table_period_key': 'None_2017-11-30',
+                },
+            ],
+        )
+
+        self._assert_filter_comparison(
+            self.single_date_report,
+            {'date': {'filter': 'custom', 'mode': 'single', 'date_to': '2018-01-15'}, 'comparison': {'filter': 'same_last_year', 'number_period': 2}},
+            [
+                {
+                    'string': 'As of %s' % format_date(self.env, '2017-01-15'),
+                    'period_type': 'custom',
+                    'mode': 'single',
+                    'date_from': '2017-01-01',
+                    'date_to': '2017-01-15',
+                    'currency_table_period_key': 'None_2017-01-15',
+                },
+                {
+                    'string': 'As of %s' % format_date(self.env, '2016-01-15'),
+                    'period_type': 'custom',
+                    'mode': 'single',
+                    'date_from': '2016-01-01',
+                    'date_to': '2016-01-15',
+                    'currency_table_period_key': 'None_2016-01-15',
+                },
+            ],
+        )
+
+    @freeze_time('2021-09-01')
+    def test_filter_date_custom_single_period_type_month(self):
+        ''' Test the filter_date with a custom date in 'single' mode.'''
+        self._assert_filter_date(
+            self.single_date_report,
+            {
+                'date': {
+                    'period_type': 'today',
+                    'mode': 'single',
+                    'date_from': '2021-09-01',
+                    'date_to': '2019-07-18',
+                    'filter': 'custom',
+                    'currency_table_period_key': 'None_2019-07-18',
+                }
+            },
+            {
+                'string': 'As of %s' % format_date(self.env, '2019-07-18'),
+                'period_type': 'custom',
+                'mode': 'single',
+                'filter': 'custom',
+                'date_from': '2019-07-01',
+                'date_to': '2019-07-18',
+                'currency_table_period_key': 'None_2019-07-18',
+            },
+        )
+
+        self._assert_filter_comparison(
+            self.single_date_report,
+            {'date': {'filter': 'custom', 'mode': 'single', 'date_to': '2019-07-18'}, 'comparison': {'filter': 'previous_period', 'number_period': 2}},
+            [
+                {
+                    'string': 'As of %s' % format_date(self.env, '2019-06-30'),
+                    'period_type': 'month',
+                    'mode': 'single',
+                    'date_from': '2019-06-01',
+                    'date_to': '2019-06-30',
+                    'currency_table_period_key': 'None_2019-06-30',
+                },
+                {
+                    'string': 'As of %s' % format_date(self.env, '2019-05-31'),
+                    'period_type': 'month',
+                    'mode': 'single',
+                    'date_from': '2019-05-01',
+                    'date_to': '2019-05-31',
+                    'currency_table_period_key': 'None_2019-05-31',
+                },
+            ],
+        )
+
+    ####################################################
+    # User Defined Filters on Journal Items
+    ####################################################
+
+    @freeze_time('2023-09-01')
+    def test_filter_aml_ir_filters(self):
+        # Test user-defined filter set on journal items used as report options
+
+        filter_record = self.env['ir.filters'].create({
+            'model_id': 'account.move.line',
+            'user_id': self.uid,
+            'name': 'To Check',
+            'domain': '[("move_id.checked", "=", False)]',
+        })
+
+        report = self.env['account.report'].create({
+            'name': 'Test ir filters',
+            'filter_aml_ir_filters': True,
+            'root_report_id': self.env.ref("odex30_account_reports.profit_and_loss").id,
+            'column_ids': [
+                Command.create({
+                    'name': 'Balance',
+                    'expression_label': 'balance',
+                }),
+            ],
+            'line_ids': [
+                Command.create({
+                    'name': 'Line 1',
+                    'expression_ids': [
+                        Command.create({
+                            'label': 'balance',
+                            'engine': 'domain',
+                            'formula': '[("account_id.account_type", "=", "income")]',
+                            'subformula': '-sum',
+                        }),
+                    ],
+                }),
+            ],
+        })
+
+        moves = (
+                self.init_invoice("out_invoice", self.partner_a, "2023-09-01", amounts=[1000])
+                + self.init_invoice("out_invoice", self.partner_a, "2023-09-01", amounts=[1000])
+        )
+        moves.action_post()
+        moves[0].checked = False
+
+        options = self._generate_options(report, '2023-01-01', '2023-12-31')
+
+        for opt in options['aml_ir_filters']:
+            if opt['id'] == filter_record.id:
+                opt['selected'] = True
+                break
+
+        # Ensure that only the move with the 'checked' at false attribute is included in the report
+        self.assertLinesValues(
+            report._get_lines(options),
+            #      Name   Balance
+            [       0,      1],
+            [
+                ('Line 1', 1000)
+            ],
+            options
+        )
+
+    def test_hide_line_at_0_tour(self):
+        report = self.env.ref('odex30_account_reports.balance_sheet')
+        report.filter_hide_0_lines = 'optional'
+        self.env['account.move'].create([{
+            'move_type': 'out_invoice',
+            'partner_id': self.partner_a.id,
+            'date': '2020-0%s-15' % i,
+            'invoice_date': '2020-0%s-15' % i,
+            'invoice_line_ids': [(0, 0, {
+                'product_id': self.product_a.id,
+                'price_unit': 1000.0,
+                'tax_ids': [(6, 0, self.tax_sale_a.ids)],
+            })],
+        } for i in range(1, 4)]).action_post()
+
+        self.start_tour("/odoo", 'account_reports_hide_0_lines', login=self.env.user.login)
+
+    @freeze_time('2020-01-16')
+    def test_hide_line_at_0_tour_with_string_columns(self):
+        report = self.env.ref('odex30_account_reports.general_ledger_report')
+        report.filter_hide_0_lines = 'optional'
+        self.env['account.move'].create({
+            'move_type': 'entry',
+            'date': '2020-01-15',
+            'line_ids': [Command.create({
+                'partner_id': self.partner_a.id,
+                'debit': 0.0,
+                'credit': 0.0,
+                'name': "Coucou les biloutes",
+                'account_id': self.company_data['default_account_payable'].id,
+                'journal_id': self.company_data['default_journal_misc'].id,
+            })],
+        }).action_post()
+
+        self.start_tour("/odoo", 'account_reports_hide_0_lines_with_string_columns', login=self.env.user.login)
+
+    def test_rounding_unit_tour(self):
+        self.env['account.move'].create({
+            'move_type': 'out_invoice',
+            'partner_id': self.partner_a.id,
+            'date': '2023-01-01',
+            'invoice_date': '2023-01-01',
+            'invoice_line_ids': [Command.create({
+                'product_id': self.product_a.id,
+                'price_unit': 1000000.0,
+                'tax_ids': [Command.set(self.tax_sale_a.ids)],
+            })],
+        }).action_post()
+
+        self.start_tour("/odoo", 'account_reports_rounding_unit', login=self.env.user.login)
+
+    def test_filter_multi_company(self):
+        def _check_company_filter(allowed_companies, expected_companies, message=None, match_active=True):
+            options = self.single_date_report.with_context(allowed_company_ids=allowed_companies.ids).get_options({})
+            computed_company_ids = self.env['account.report'].get_report_company_ids(options)
+            if match_active:
+                # Active company should match
+                self.assertEqual(computed_company_ids[0], expected_companies[0].id, message)
+            # Selected companies should match, whatever their order
+            self.assertEqual(set(computed_company_ids), set(expected_companies.ids), message)
+
+        main_company = self.company_data['company']
+        main_company.vat = '123'
+        branch_1 = self.env['res.company'].create({'name': "Branch 1", 'parent_id': main_company.id, 'vat': '123'})
+        branch_1_1 = self.env['res.company'].create({'name': "Branch 1 sub-branch 1", 'parent_id': branch_1.id})
+        branch_1_2 = self.env['res.company'].create({'name': "Branch 1 sub-branch 2", 'parent_id': branch_1.id, 'vat': '123'})
+        branch_2 = self.env['res.company'].create({'name': "Branch 2", 'parent_id': main_company.id})
+        branch_2_1 = self.env['res.company'].create({'name': "Branch 2 sub-branch 1", 'parent_id': branch_2.id})
+        other_company = self.env['res.company'].create({'name': "Other company"})
+
+        # Test 'disabled' filter, as well as 'tax_units' when no tax unit is defined and VAT is shared (they should behave in the same way)
+        for company_filter in ('disabled', 'tax_units'):
+            self.single_date_report.filter_multi_company = company_filter
+
+            _check_company_filter(
+                main_company + branch_1 + branch_1_1 + branch_1_2 + branch_2 + branch_2_1 + other_company,
+                main_company + branch_1 + branch_1_1 + branch_1_2 + branch_2 + branch_2_1,
+                "The main company and all of its sub-branches should be selected",
+            )
+            _check_company_filter(
+                branch_1 + main_company + branch_1_1 + branch_1_2 + branch_2 + branch_2_1 + other_company,
+                branch_1 + branch_1_1 + branch_1_2,
+                "When the active company is a branch of another active company, it should only be selected with its sub-branches.",
+            )
+            _check_company_filter(
+                main_company + branch_1 + branch_1_2 + branch_2_1 + other_company,
+                main_company + branch_1 + branch_1_2 + branch_2_1,
+                "Choosing a subset of branches in the company selector should keep that selection in the report.",
+            )
+
+        # Test 'selector' filter
+        self.single_date_report.filter_multi_company = 'selector'
+
+        _check_company_filter(
+            branch_1,
+            branch_1,
+        )
+        _check_company_filter(
+            main_company + branch_1 + branch_1_1 + branch_1_2 + branch_2 + branch_2_1 + other_company,
+            main_company + branch_1 + branch_1_1 + branch_1_2 + branch_2 + branch_2_1 + other_company,
+        )
+        _check_company_filter(
+            branch_1 + main_company + branch_1_1 + branch_1_2 + branch_2 + branch_2_1 + other_company,
+            branch_1 + main_company + branch_1_1 + branch_1_2 + branch_2 + branch_2_1 + other_company,
+        )
+        _check_company_filter(
+            main_company + branch_1_1 + branch_1_2 + branch_2 + other_company,
+            main_company + branch_1_1 + branch_1_2 + branch_2 + other_company,
+        )
+
+        # Test 'tax_units' filter, with no tax unit, and non-shared VAT numbers
+        self.single_date_report.filter_multi_company = 'tax_units'
+        branch_1_1.vat = '456'
+        branch_2.vat = '789'
+
+        _check_company_filter(
+            main_company + branch_1_1 + branch_1_2 + branch_2 + branch_2_1 + other_company,
+            main_company + branch_1_2,
+            "Only the current company and its sub-branches sharing its vat number should be selected.",
+        )
+
+        _check_company_filter(
+            branch_2 + main_company + branch_1_1 + branch_1_2  + branch_2_1 + other_company,
+            branch_2 + branch_2_1,
+            "Only the current company and its sub-branches sharing its vat number should be selected.",
+        )
+
+        # Test 'tax_units' filter, with an existing tax unit object
+        self.single_date_report.country_id = self.env.ref('base.be')
+        self.single_date_report.availability_condition = 'country'
+
+        tax_unit = self.env['account.tax.unit'].create({
+            'name': "Test Tax Unit",
+            'country_id': self.single_date_report.country_id.id,
+            'vat': 'BE0477472701',
+            'company_ids': (main_company + branch_1_1 + branch_1_2 + branch_2 + other_company).ids,
+            'main_company_id': main_company.id,
+        })
+
+        _check_company_filter(
+            other_company + main_company + branch_1_1 + branch_1_2 + branch_2,
+            other_company + main_company + branch_1_1 + branch_1_2 + branch_2,
+            "Opening the report with a company selector matching the content of the tax unit should select this tax unit, keeping the companies.",
+            match_active=False,
+        )
+
+        _check_company_filter(
+            tax_unit.company_ids + branch_2_1,
+            main_company + branch_1_2,
+            "Opening the report with a company selector matching more than the content of the tax unit should not select the tax unit, "
+            "but take the accessible branches with the same VAT number as the active company.",
+        )
+
+        _check_company_filter(
+            main_company + branch_1_1 + branch_1_2 + branch_2,
+            main_company + branch_1_2,
+            "Opening the report with a company selector matching less than the content of the tax unit should select the active sub-branches "
+            "with the same VAT as the active company.",
+        )
+
+        # Test 'tax_units' filter, with no tax unit, and no VAT number on branches (only one on main company)
+        branch_1.vat = None
+        branch_1_1.vat = None
+        branch_1_2.vat = None
+        branch_2.vat = None
+
+        _check_company_filter(
+            branch_2 + branch_2_1,
+            branch_2 + branch_2_1,
+            "When no VAT exists in the hierarchy; all companies should be considered as sharing the same VAT, and active companies should be kept.",
+        )
+
+        _check_company_filter(
+            branch_2_1 + branch_2,
+            branch_2_1 + branch_2,
+            "When no VAT exists in the hierarchy; all companies should be considered as sharing the same VAT, and active companies should be kept.",
+        )
+
+    @freeze_time('2017-12-31')
+    def test_period_order(self):
+        report = self.date_range_report
+        previous_options = {'date': {'filter': 'this_year', 'mode': 'range'}, 'comparison': {'filter': 'same_last_year', 'number_period': 1, 'period_order': 'descending'}}
+        options = report.get_options(previous_options)
+
+        expected_values = [
+            {
+                'name': '2017',
+                 'forced_options': {
+                    'date': {'string': '2017', 'period_type': 'fiscalyear', 'mode': 'range', 'date_from': '2017-01-01', 'date_to': '2017-12-31', 'filter': 'this_year', 'currency_table_period_key': '2017-01-01_2017-12-31'}
+                 }
+            },
+            {
+                'name': '2016',
+                'forced_options': {
+                    'date': {'string': '2016', 'period_type': 'fiscalyear', 'mode': 'range', 'date_from': '2016-01-01', 'date_to': '2016-12-31', 'currency_table_period_key': '2016-01-01_2016-12-31'}
+                }
+            },
+        ]
+
+        for i, val in enumerate(expected_values):
+            self.assertDictEqual(options['column_headers'][0][i], val)
+
+        previous_options['comparison']['period_order'] = 'ascending'
+        new_options = report.get_options(previous_options)
+        new_expected_values = expected_values[::-1]
+
+        for i, val in enumerate(new_expected_values):
+            self.assertDictEqual(new_options['column_headers'][0][i], val)
+
+    ####################################################
+    # DATES RANGE
+    ####################################################
+
+    @freeze_time('2024-09-01')
+    def test_tax_period_filter(self):
+        generic_tax_report = self.env.ref('account.generic_tax_report')
+        self._assert_filter_date(
+            generic_tax_report,
+            {},
+            {
+                'string': 'Aug 2024',
+                'period_type': 'month',
+                'mode': 'range',
+                'filter': 'previous_month',
+                'period': -1,
+                'date_from': '2024-08-01',
+                'date_to': '2024-08-31',
+                'currency_table_period_key': '2024-08-01_2024-08-31',
+            },
+        )
+
+        self._assert_filter_date(
+            generic_tax_report,
+            {'date': {'period': -8, 'filter': 'previous_tax_period'}},
+            {
+                'string': 'Jan 2024',
+                'period_type': 'month',
+                'mode': 'range',
+                'filter': 'previous_month',
+                'period': -8,
+                'date_from': '2024-01-01',
+                'date_to': '2024-01-31',
+                'currency_table_period_key': '2024-01-01_2024-01-31',
+            },
+        )
+
+        self.env.company.account_tax_periodicity = 'year'
+
+        self._assert_filter_date(
+            generic_tax_report,
+            {'date': {'period': -1, 'filter': 'previous_tax_period'}},
+            {
+                'string': '2023',
+                'period_type': 'year',
+                'mode': 'range',
+                'filter': 'previous_year',
+                'period': -1,
+                'date_from': '2023-01-01',
+                'date_to': '2023-12-31',
+                'currency_table_period_key': '2023-01-01_2023-12-31',
+            },
+        )
diff --git a/dev_odex30_accounting/odex30_account_reports/tests/test_account_reports_journal_filter.py b/dev_odex30_accounting/odex30_account_reports/tests/test_account_reports_journal_filter.py
new file mode 100644
index 0000000..bb297a1
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_reports/tests/test_account_reports_journal_filter.py
@@ -0,0 +1,731 @@
+# -*- coding: utf-8 -*-
+from odoo import Command
+from odoo.tests import tagged
+from odoo.addons.account.tests.common import AccountTestInvoicingCommon
+
+
+@tagged('post_install', '-at_install')
+class TestAccountReportsJournalFilter(AccountTestInvoicingCommon):
+
+    @classmethod
+    def setUpClass(cls):
+        super().setUpClass()
+
+        cls.vanilla_company1 = cls.env['res.company'].create({'name': "Vanilla1"})
+        cls.vanilla_company2 = cls.env['res.company'].create({'name': "Vanilla2"})
+
+        # Force the test user to only access the vanilla companies
+        cls.env.user.write({
+            'company_ids': [Command.set((cls.vanilla_company1 + cls.vanilla_company2).ids)],
+            'company_id': cls.vanilla_company1.id,
+        })
+
+        cls.report = cls.env.ref('odex30_account_reports.balance_sheet')
+
+    def _assert_filter_journal(self, options, display_name, expected_values_list):
+        journal_options = options['journals']
+        self.assertEqual(options['name_journal_group'], display_name)
+        self.assertEqual(len(journal_options), len(expected_values_list))
+        for journal_option, expected_values in zip(journal_options, expected_values_list):
+            if isinstance(expected_values, dict):
+                self.assertDictEqual(expected_values, {k: journal_option.get(k) for k in expected_values})
+            elif len(expected_values) == 2:
+                record, selected = expected_values
+                self.assertDictEqual(
+                    {
+                        'id': journal_option.get('id'),
+                        'model': journal_option.get('model'),
+                        'selected': journal_option.get('selected'),
+                    },
+                    {
+                        'id': record.id,
+                        'model': record._name,
+                        'selected': selected,
+                    },
+                )
+
+    def _assert_filter_journal_visible_unfolded(self, options, expected_values):
+        self.assertEqual(len(options['journals']), len(expected_values))
+        for journal, results in zip(options['journals'], expected_values):
+            self.assertTupleEqual((journal.get('visible', None), journal.get('unfolded', None)), results)
+
+    def _quick_create_journal(self, name, company, journal_type='sale'):
+        return self.env['account.journal'].create([{
+            'name': name,
+            'code': name,
+            'type': journal_type,
+            'company_id': company.id,
+        }])
+
+    def _quick_create_journal_group(self, name, company, excluded_journals):
+        return self.env['account.journal.group'].create([{
+            'name': name,
+            'excluded_journal_ids': [Command.set(excluded_journals.ids)],
+            'company_id': company.id if company else False,
+        }])
+
+    def _press_journal_filter(self, options, journals):
+        for option_journal in options['journals']:
+            if option_journal.get('model') == 'account.journal' and option_journal.get('id') in journals.ids:
+                option_journal['selected'] = not option_journal['selected']
+
+    def test_journal_filter_single_company(self):
+        j1 = self._quick_create_journal("j1", self.vanilla_company1)
+        j2 = self._quick_create_journal("j2", self.vanilla_company1)
+        j3 = self._quick_create_journal("j3", self.vanilla_company1)
+        j4 = self._quick_create_journal("j4", self.vanilla_company1)
+        j5 = self._quick_create_journal("j5", self.vanilla_company1)
+        j6 = self._quick_create_journal("j6", self.vanilla_company1)
+        j7 = self._quick_create_journal("j7", self.vanilla_company1)
+        j8 = self._quick_create_journal("j8", self.vanilla_company1)
+
+        options = self.report.get_options({})
+        self._assert_filter_journal(options, "All Journals", [
+            (j1, False),
+            (j2, False),
+            (j3, False),
+            (j4, False),
+            (j5, False),
+            (j6, False),
+            (j7, False),
+            (j8, False),
+        ])
+
+        self._press_journal_filter(options, (j1 + j2 + j3))
+        options = self.report.get_options(previous_options=options)
+        self._assert_filter_journal(options, "j1, j2, j3", [
+            (j1, True),
+            (j2, True),
+            (j3, True),
+            (j4, False),
+            (j5, False),
+            (j6, False),
+            (j7, False),
+            (j8, False),
+        ])
+
+        self._press_journal_filter(options, (j4 + j5 + j6))
+        options = self.report.get_options(previous_options=options)
+        self._assert_filter_journal(options, "j1, j2, j3, j4, j5 and one other", [
+            (j1, True),
+            (j2, True),
+            (j3, True),
+            (j4, True),
+            (j5, True),
+            (j6, True),
+            (j7, False),
+            (j8, False),
+        ])
+
+        self._press_journal_filter(options, j7)
+        options = self.report.get_options(previous_options=options)
+        self._assert_filter_journal(options, "j1, j2, j3, j4, j5 and 2 others", [
+            (j1, True),
+            (j2, True),
+            (j3, True),
+            (j4, True),
+            (j5, True),
+            (j6, True),
+            (j7, True),
+            (j8, False),
+        ])
+
+        self._press_journal_filter(options, j8)
+        options = self.report.get_options(previous_options=options)
+        self._assert_filter_journal(options, "All Journals", [
+            (j1, False),
+            (j2, False),
+            (j3, False),
+            (j4, False),
+            (j5, False),
+            (j6, False),
+            (j7, False),
+            (j8, False),
+        ])
+
+    def test_journal_filter_multi_company(self):
+        j1 = self._quick_create_journal("j1", self.vanilla_company1)
+        j2 = self._quick_create_journal("j2", self.vanilla_company1)
+        j3 = self._quick_create_journal("j3", self.vanilla_company2)
+        j4 = self._quick_create_journal("j4", self.vanilla_company2)
+        j5 = self._quick_create_journal("j5", self.vanilla_company1)
+        j6 = self._quick_create_journal("j6", self.vanilla_company1)
+        j7 = self._quick_create_journal("j7", self.vanilla_company2)
+        j8 = self._quick_create_journal("j8", self.vanilla_company2)
+
+        options = self.report.get_options({'is_opening_report': True})
+        self._assert_filter_journal(options, "All Journals", [
+            {'id': 'divider'},
+            (j1, False),
+            (j2, False),
+            (j5, False),
+            (j6, False),
+            {'id': 'divider'},
+            (j3, False),
+            (j4, False),
+            (j7, False),
+            (j8, False),
+        ])
+
+        self._press_journal_filter(options, (j1 + j3 + j5 + j7))
+        options = self.report.get_options(previous_options=options)
+        self._assert_filter_journal(options, "j1, j5, j3, j7", [
+            {'id': 'divider'},
+            (j1, True),
+            (j2, False),
+            (j5, True),
+            (j6, False),
+            {'id': 'divider'},
+            (j3, True),
+            (j4, False),
+            (j7, True),
+            (j8, False),
+        ])
+
+    def test_journal_filter_with_groups_single_company(self):
+        j1 = self._quick_create_journal("j1", self.vanilla_company1)
+        j2 = self._quick_create_journal("j2", self.vanilla_company1)
+        j3 = self._quick_create_journal("j3", self.vanilla_company1)
+        j4 = self._quick_create_journal("j4", self.vanilla_company1)
+        j5 = self._quick_create_journal("j5", self.vanilla_company1)
+        j6 = self._quick_create_journal("j6", self.vanilla_company1)
+
+        g1 = self._quick_create_journal_group("g1", self.vanilla_company1, j2 + j4)
+        g2 = self._quick_create_journal_group("g2", self.vanilla_company1, j2 + j5)
+
+        options = self.report.get_options({'is_opening_report': True})
+        self._assert_filter_journal(options, "g1", [
+            {'id': 'divider'},
+            (g1, True),
+            (g2, False),
+            {'id': 'divider'},
+            (j1, True),
+            (j2, False),
+            (j3, True),
+            (j4, False),
+            (j5, True),
+            (j6, True),
+        ])
+
+        # Check g2.
+        options['__journal_group_action'] = {'action': 'add', 'id': g2.id}
+        options = self.report.get_options(previous_options=options)
+        self._assert_filter_journal(options, "g2", [
+            {'id': 'divider'},
+            (g1, False),
+            (g2, True),
+            {'id': 'divider'},
+            (j1, True),
+            (j2, False),
+            (j3, True),
+            (j4, True),
+            (j5, False),
+            (j6, True),
+        ])
+
+        # Uncheck g2.
+        options['__journal_group_action'] = {'action': 'remove', 'id': g2.id}
+        options = self.report.get_options(previous_options=options)
+        self._assert_filter_journal(options, "All Journals", [
+            {'id': 'divider'},
+            (g1, False),
+            (g2, False),
+            {'id': 'divider'},
+            (j1, False),
+            (j2, False),
+            (j3, False),
+            (j4, False),
+            (j5, False),
+            (j6, False),
+        ])
+
+    def test_journal_filter_with_groups_multi_company(self):
+        j1 = self._quick_create_journal("j1", self.vanilla_company1)
+        j2 = self._quick_create_journal("j2", self.vanilla_company1)
+        j3 = self._quick_create_journal("j3", self.vanilla_company1)
+        j4 = self._quick_create_journal("j4", self.vanilla_company1)
+        j5 = self._quick_create_journal("j5", self.vanilla_company2)
+        j6 = self._quick_create_journal("j6", self.vanilla_company2)
+
+        g1 = self._quick_create_journal_group("g1", self.vanilla_company1, j2 + j3)
+        g2 = self._quick_create_journal_group("g2", self.vanilla_company2, j6)
+
+        options = self.report.get_options({'is_opening_report': True})
+        self._assert_filter_journal(options, "g1", [
+            {'id': 'divider'},
+            (g1, True),
+            (g2, False),
+            {'id': 'divider'},
+            (j1, True),
+            (j2, False),
+            (j3, False),
+            (j4, True),
+            {'id': 'divider'},
+            (j5, True),
+            (j6, True),
+        ])
+
+        # Check g2.
+        options['__journal_group_action'] = {'action': 'add', 'id': g2.id}
+        options = self.report.get_options(previous_options=options)
+        self._assert_filter_journal(options, "g2", [
+            {'id': 'divider'},
+            (g1, False),
+            (g2, True),
+            {'id': 'divider'},
+            (j1, True),
+            (j2, True),
+            (j3, True),
+            (j4, True),
+            {'id': 'divider'},
+            (j5, True),
+            (j6, False),
+        ])
+
+        # Uncheck g2.
+        options['__journal_group_action'] = {'action': 'remove', 'id': g2.id}
+        options = self.report.get_options(previous_options=options)
+        self._assert_filter_journal(options, "All Journals", [
+            {'id': 'divider'},
+            (g1, False),
+            (g2, False),
+            {'id': 'divider'},
+            (j1, False),
+            (j2, False),
+            (j3, False),
+            (j4, False),
+            {'id': 'divider'},
+            (j5, False),
+            (j6, False),
+        ])
+
+    def test_journal_filter_with_single_group_multi_company(self):
+        j1 = self._quick_create_journal("j1", self.vanilla_company1)
+        j2 = self._quick_create_journal("j2", self.vanilla_company1)
+        j3 = self._quick_create_journal("j3", self.vanilla_company2)
+        j4 = self._quick_create_journal("j4", self.vanilla_company2)
+
+        g1 = self._quick_create_journal_group("g1", self.vanilla_company1, j2)
+
+        options = self.report.get_options({'is_opening_report': True})
+        self._assert_filter_journal(options, "g1", [
+            {'id': 'divider'},
+            (g1, True),
+            {'id': 'divider'},
+            (j1, True),
+            (j2, False),
+            {'id': 'divider'},
+            (j3, True),
+            (j4, True),
+        ])
+
+        # Remove g1.
+        options['__journal_group_action'] = {'action': 'remove', 'id': g1.id}
+        options = self.report.get_options(previous_options=options)
+        self._assert_filter_journal(options, "All Journals", [
+            {'id': 'divider'},
+            (g1, False),
+            {'id': 'divider'},
+            (j1, False),
+            (j2, False),
+            {'id': 'divider'},
+            (j3, False),
+            (j4, False),
+        ])
+
+        self._press_journal_filter(options, j3)  # check j3
+        options = self.report.get_options(previous_options=options)
+        self._assert_filter_journal(options, "j3", [
+            {'id': 'divider'},
+            (g1, False),
+            {'id': 'divider'},
+            (j1, False),
+            (j2, False),
+            {'id': 'divider'},
+            (j3, True),
+            (j4, False),
+        ])
+
+        # Check g1.
+        options['__journal_group_action'] = {'action': 'add', 'id': g1.id}
+        options = self.report.get_options(previous_options=options)
+        self._assert_filter_journal(options, "g1", [
+            {'id': 'divider'},
+            (g1, True),
+            {'id': 'divider'},
+            (j1, True),
+            (j2, False),
+            {'id': 'divider'},
+            (j3, True),
+            (j4, True),
+        ])
+
+        self._press_journal_filter(options, j3)  # Uncheck j3
+        options = self.report.get_options(previous_options=options)
+        self._assert_filter_journal(options, "j1, j4", [
+            {'id': 'divider'},
+            (g1, False),
+            {'id': 'divider'},
+            (j1, True),
+            (j2, False),
+            {'id': 'divider'},
+            (j3, False),
+            (j4, True),
+        ])
+
+        self._press_journal_filter(options, j3)  # Check j3
+        options = self.report.get_options(previous_options=options)
+        self._assert_filter_journal(options, "g1", [
+            {'id': 'divider'},
+            (g1, True),
+            {'id': 'divider'},
+            (j1, True),
+            (j2, False),
+            {'id': 'divider'},
+            (j3, True),
+            (j4, True),
+        ])
+
+    def test_journal_filter_with_groups_cash_flow_statement(self):
+        """
+        Test the behaviour of the journal filter with groups in a report
+        that does not allow all journals, cash flow statement is a perfect
+        fit for this use case
+        """
+        bnk = self._quick_create_journal("BNK", self.vanilla_company1, 'bank')
+        csh = self._quick_create_journal("CSH", self.vanilla_company1, 'cash')
+        misc = self._quick_create_journal("MISC", self.vanilla_company1, 'general')
+        exch = self._quick_create_journal("EXCH", self.vanilla_company1, 'general')
+        ifrs = self._quick_create_journal("IFRS", self.vanilla_company1, 'general')
+        caba = self._quick_create_journal("CABA", self.vanilla_company1, 'general')
+        inv = self._quick_create_journal("INV", self.vanilla_company1, 'sale')  # Not accepted by the report
+        bill = self._quick_create_journal("BILL", self.vanilla_company1, 'purchase')  # Not accepted by the report
+
+        g1 = self._quick_create_journal_group("g1", self.vanilla_company1, inv + bill)
+        g2 = self._quick_create_journal_group("g2", self.vanilla_company1, misc + bill)
+
+        report = self.env.ref('odex30_account_reports.cash_flow_report')
+        options = report.get_options({'is_opening_report': True})
+        self._assert_filter_journal(options, "g1", [
+            {'id': 'divider'},
+            (g1, True),
+            (g2, False),  # g2 should be displayed because it has journals that are allowed in the report
+            {'id': 'divider'},
+            (bnk, True),
+            (caba, True),
+            (csh, True),
+            (exch, True),
+            (ifrs, True),
+            (misc, True),
+        ])
+
+        # Check g2, all journals from g2 that are allowed in report should be selected
+        options['__journal_group_action'] = {'action': 'add', 'id': g2.id}
+        options = report.get_options(previous_options=options)
+        self._assert_filter_journal(options, "g2", [
+            {'id': 'divider'},
+            (g1, False),
+            (g2, True),
+            {'id': 'divider'},
+            (bnk, True),
+            (caba, True),
+            (csh, True),
+            (exch, True),
+            (ifrs, True),
+            (misc, False),
+        ])
+
+        # Uncheck g2.
+        options['__journal_group_action'] = {'action': 'remove', 'id': g2.id}
+        options = report.get_options(previous_options=options)
+        self._assert_filter_journal(options, "All Journals", [
+            {'id': 'divider'},
+            (g1, False),
+            (g2, False),
+            {'id': 'divider'},
+            (bnk, False),
+            (caba, False),
+            (csh, False),
+            (exch, False),
+            (ifrs, False),
+            (misc, False),
+        ])
+
+    def test_journal_filter_branch_company(self):
+        """
+        The purpose of this test is to ensure that the journal filter is
+        well managed with sub companies.
+        Each journal should appear once, even when it is shared within
+        a company and its children.
+        Also, journal from parent company should be display in the filter
+        if only the child company is selected
+        """
+        self.vanilla_company1.write({'child_ids': [Command.create({'name': 'Vanilla3'})]})
+        vanilla_company3 = self.vanilla_company1.child_ids[0]
+        self.env.user.write({
+            'company_ids': [Command.set((self.vanilla_company1 + self.vanilla_company2 + vanilla_company3).ids)],
+            'company_id': self.vanilla_company1.id,
+        })
+
+        j1 = self._quick_create_journal("j1", self.vanilla_company1)
+        j2 = self._quick_create_journal("j2", self.vanilla_company1)
+        j3 = self._quick_create_journal("j3", self.vanilla_company2)
+        j4 = self._quick_create_journal("j4", self.vanilla_company2)
+        j5 = self._quick_create_journal("j5", self.vanilla_company1)
+        j6 = self._quick_create_journal("j6", self.vanilla_company1)
+        j7 = self._quick_create_journal("j7", self.vanilla_company2)
+        j8 = self._quick_create_journal("j8", self.vanilla_company2)
+        j9 = self._quick_create_journal("j9", vanilla_company3)
+        j10 = self._quick_create_journal("j10", vanilla_company3)
+
+        # With all companies selected, all journals should be displayed
+        options = self.report.get_options({'is_opening_report': True})
+        self._assert_filter_journal(options, "All Journals", [
+            {'id': 'divider'},
+            (j1, False),
+            (j2, False),
+            (j5, False),
+            (j6, False),
+            {'id': 'divider'},
+            (j3, False),
+            (j4, False),
+            (j7, False),
+            (j8, False),
+            {'id': 'divider'},
+            (j10, False),
+            (j9, False),
+        ])
+
+        self._press_journal_filter(options, (j1 + j3 + j5 + j7 + j9))
+        options = self.report.get_options(previous_options=options)
+        self._assert_filter_journal(options, "j1, j5, j3, j7, j9", [
+            {'id': 'divider'},
+            (j1, True),
+            (j2, False),
+            (j5, True),
+            (j6, False),
+            {'id': 'divider'},
+            (j3, True),
+            (j4, False),
+            (j7, True),
+            (j8, False),
+            {'id': 'divider'},
+            (j10, False),
+            (j9, True),
+        ])
+
+        # Select only the child company
+        self.env.user.write({
+            'company_ids': [Command.set((vanilla_company3).ids)],
+            'company_id': vanilla_company3.id,
+        })
+
+        # Parent company journals should be displayed too
+        options = self.report.get_options({'is_opening_report': True})
+        self._assert_filter_journal(options, "All Journals", [
+            {'id': 'divider'},
+            (j1, False),
+            (j2, False),
+            (j5, False),
+            (j6, False),
+            {'id': 'divider'},
+            (j10, False),
+            (j9, False),
+        ])
+
+        self._press_journal_filter(options, (j1 + j5 + j10))
+        options = self.report.get_options(previous_options=options)
+        self._assert_filter_journal(options, "j1, j5, j10", [
+            {'id': 'divider'},
+            (j1, True),
+            (j2, False),
+            (j5, True),
+            (j6, False),
+            {'id': 'divider'},
+            (j10, True),
+            (j9, False),
+        ])
+
+        # Select only the parent company
+        self.env.user.write({
+            'company_ids': [Command.set((self.vanilla_company1).ids)],
+            'company_id': self.vanilla_company1.id,
+        })
+
+        # Only parent company journals should be displayed
+        options = self.report.get_options({'is_opening_report': True})
+        self._assert_filter_journal(options, "All Journals", [
+            (j1, False),
+            (j2, False),
+            (j5, False),
+            (j6, False),
+        ])
+
+        self._press_journal_filter(options, (j1 + j5))
+        options = self.report.get_options(previous_options=options)
+        self._assert_filter_journal(options, "j1, j5", [
+            (j1, True),
+            (j2, False),
+            (j5, True),
+            (j6, False),
+        ])
+
+    def test_journal_filter_with_groups_no_company_multi_company(self):
+        """Test the journals filter with a group where no company is set, therefore implying that all companies can
+        visualize the filter in their accounting reports"""
+        j1 = self._quick_create_journal("j1", self.vanilla_company1)
+        j2 = self._quick_create_journal("j2", self.vanilla_company1)
+        j3 = self._quick_create_journal("j3", self.vanilla_company1)
+        j4 = self._quick_create_journal("j4", self.vanilla_company2)
+        j5 = self._quick_create_journal("j5", self.vanilla_company2)
+
+        # g1 has journals of company 1 and 2, even though visible only for company 1
+        g1 = self._quick_create_journal_group("g1", self.vanilla_company1, j1 + j4)
+
+        # g2 has no company set, therefore implying that this multi-ledger is visible for all companies
+        g2 = self._quick_create_journal_group("g2", False, j2 + j5)
+
+        # only select company 2
+        self.env.user.write({
+            'company_ids': [Command.set(self.vanilla_company2.ids)],
+            'company_id': self.vanilla_company2.id,
+        })
+
+        options = self.report.get_options({'is_opening_report': True})
+        self._assert_filter_journal(options, "g2", [
+            {'id': 'divider'},
+            (g2, True),
+            {'id': 'divider'},
+            (j4, True),
+            (j5, False),
+        ])
+
+        self.env.user.write({
+            'company_ids': [Command.set((self.vanilla_company1 + self.vanilla_company2).ids)],
+            'company_id': self.vanilla_company2.id,
+        })
+
+        # Check g1
+        options['__journal_group_action'] = {'action': 'add', 'id': g1.id}
+        options = self.report.get_options(previous_options=options)
+        self._assert_filter_journal(options, "g1", [
+            {'id': 'divider'},
+            (g1, True),
+            (g2, False),
+            {'id': 'divider'},
+            (j1, False),
+            (j2, True),
+            (j3, True),
+            {'id': 'divider'},
+            (j4, False),
+            (j5, True),
+        ])
+
+        # Check g2
+        options['__journal_group_action'] = {'action': 'add', 'id': g2.id}
+        options = self.report.get_options(previous_options=options)
+        self._assert_filter_journal(options, "g2", [
+            {'id': 'divider'},
+            (g1, False),
+            (g2, True),
+            {'id': 'divider'},
+            (j1, True),
+            (j2, False),
+            (j3, True),
+            {'id': 'divider'},
+            (j4, True),
+            (j5, False),
+        ])
+
+        # only select company 1
+        self.env.user.write({
+            'company_ids': [Command.set(self.vanilla_company1.ids)],
+            'company_id': self.vanilla_company1.id,
+        })
+
+        # The company is changed -> reset the journals filter and select the first available group
+        options = self.report.get_options({'is_opening_report': True})
+        self._assert_filter_journal(options, "g1", [
+            {'id': 'divider'},
+            (g1, True),
+            (g2, False),
+            {'id': 'divider'},
+            (j1, False),
+            (j2, True),
+            (j3, True),
+        ])
+
+        # Check g2
+        options['__journal_group_action'] = {'action': 'add', 'id': g2.id}
+        options = self.report.get_options(previous_options=options)
+        self._assert_filter_journal(options, "g2", [
+            {'id': 'divider'},
+            (g1, False),
+            (g2, True),
+            {'id': 'divider'},
+            (j1, True),
+            (j2, False),
+            (j3, True),
+        ])
+
+        # Check that changing the sequence of journal groups changes the order in the filter, and therefore the default selected group
+        g2.sequence = g1.sequence - 1
+        options = self.report.get_options({'is_opening_report': True})
+        self._assert_filter_journal(options, "g2", [
+            {'id': 'divider'},
+            (g2, True),
+            (g1, False),
+            {'id': 'divider'},
+            (j1, True),
+            (j2, False),
+            (j3, True),
+        ])
+
+    def test_filter_journal_visible_items(self):
+        """ Test the unfolded and visible attributes of the dropdown items of the journals filter """
+        j1 = self._quick_create_journal("j1", self.vanilla_company1)
+        j2 = self._quick_create_journal("j5", self.vanilla_company2)
+        g1 = self._quick_create_journal_group("g1", False, j1)
+        options = self.report.get_options({'is_opening_report': True})
+
+        self._assert_filter_journal(options, "g1", [
+            {'id': 'divider'},
+            (g1, True),
+            {'id': 'divider'},
+            (j1, False),
+            {'id': 'divider'},
+            (j2, True),
+        ])
+
+        # visible, unfolded (None means there is no value because of irrelevance)
+        expected_values_at_opening = [
+            (None, None),
+            (None, None),
+            (None, False),
+            (False, None),
+            (None, False),
+            (False, None)
+        ]
+        # Ensure that when opening the report for the first time, all companies are folded
+        self._assert_filter_journal_visible_unfolded(options, expected_values_at_opening)
+
+        # simulate unfold of 1st company
+        options['journals'][2]['unfolded'] = True
+        options['journals'][3]['visible'] = True
+
+        options = self.report.get_options(previous_options=options)
+
+        expected_values_after_unfolding = [
+            (None, None),
+            (None, None),
+            (None, True),
+            (True, None),
+            (None, False),
+            (False, None)
+        ]
+        self._assert_filter_journal_visible_unfolded(options, expected_values_after_unfolding)
+
+        # simulate the refresh of the page, should fold back the 1st company
+        options['is_opening_report'] = True
+        options = self.report.get_options(previous_options=options)
+        self._assert_filter_journal_visible_unfolded(options, expected_values_at_opening)
diff --git a/dev_odex30_accounting/odex30_account_reports/tests/test_account_reports_tax_reminder.py b/dev_odex30_accounting/odex30_account_reports/tests/test_account_reports_tax_reminder.py
new file mode 100644
index 0000000..89ffcbc
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_reports/tests/test_account_reports_tax_reminder.py
@@ -0,0 +1,135 @@
+# -*- coding: utf-8 -*-
+from dateutil.relativedelta import relativedelta
+from unittest.mock import patch
+
+from odoo.addons.odex30_account_reports.tests.common import TestAccountReportsCommon
+from odoo.tests import tagged
+from odoo import fields
+
+
+@tagged('post_install', '-at_install')
+class TestAccountReportsTaxReminder(TestAccountReportsCommon):
+
+    @classmethod
+    def setUpClass(cls):
+        super().setUpClass()
+        cls.report = cls.env.ref('account.generic_tax_report')
+        cls.pay_activity_id = cls.env.ref('odex30_account_reports.mail_activity_type_tax_report_to_pay').id
+        cls.options = cls._generate_options(cls.report, '2024-08-01', '2024-08-31')
+        action = cls.env['account.tax.report.handler'].with_context({'override_tax_closing_warning': True}).action_periodic_vat_entries(cls.options)
+        cls.tax_return_move = cls.env['account.move'].browse(action['res_id'])
+
+    def test_posting_adds_an_activity(self):
+        """Posting the tax report move should be adding the proper tax to be sent activity"""
+        act_type_tax_to_pay = self.env.ref('odex30_account_reports.mail_activity_type_tax_report_to_pay')
+        act_type_report_to_send = self.env.ref('odex30_account_reports.mail_activity_type_tax_report_to_be_sent')
+        all_report_activity_type = act_type_report_to_send + act_type_tax_to_pay
+
+        self.tax_return_move.refresh_tax_entry()
+        self.assertEqual(self.tax_return_move.state, 'draft')
+        self.assertFalse(all_report_activity_type & self.tax_return_move.activity_ids.activity_type_id,
+                         "There shouldn't be any of the closing activity on the closing move yet")
+
+        self.init_invoice(
+            'out_invoice',
+            partner=self.partner_a,
+            invoice_date=self.tax_return_move.date + relativedelta(days=-1),
+            post=True,
+            amounts=[200],
+            taxes=self.tax_sale_a
+        )
+        self.tax_return_move.refresh_tax_entry()
+        # Posting the tax entry should post a mail activity of this type
+        with patch.object(self.env.registry[self.report._name], 'export_to_pdf', autospec=True, side_effect=lambda *args, **kwargs: {'file_name': 'dummy', 'file_content': b'', 'file_type': 'pdf'}):
+            self.tax_return_move.action_post()
+
+        self.assertEqual(self.tax_return_move.state, 'posted')
+        self.assertEqual(self.tax_return_move._get_tax_to_pay_on_closing(), 30.0)
+        self.assertRecordValues(self.tax_return_move.activity_ids, [{
+            'activity_type_id': act_type_report_to_send.id,
+            'summary': f'Send tax report: {self.tax_return_move.date.strftime("%B %Y")}',
+            'date_deadline': fields.Date.context_today(self.env.user),
+        }, {
+            'activity_type_id': act_type_tax_to_pay.id,
+            'summary': f'Pay tax: {self.tax_return_move.date.strftime("%B %Y")}',
+            'date_deadline': fields.Date.context_today(self.env.user),
+        }])
+
+        # Posting tax return again should not create another activity
+        before = len(self.tax_return_move.activity_ids)
+        self.tax_return_move.button_draft()
+        self.tax_return_move.refresh_tax_entry()
+        with patch.object(self.env.registry[self.report._name], 'export_to_pdf', autospec=True, side_effect=lambda *args, **kwargs: {'file_name': 'dummy', 'file_content': b'', 'file_type': 'pdf'}):
+            self.tax_return_move.action_post()
+        after = len(self.tax_return_move.activity_ids)
+        self.assertEqual(before, after, "resetting to draft and posting again shouldn't create a new activity")
+
+        # 0.0 tax returns create a send tax report activity but shouldn't trigger the payment activity
+        options = self._generate_options(self.report, '2024-09-01', '2024-09-30')
+        action = self.env['account.tax.report.handler'].with_context({'override_tax_closing_warning': True}).action_periodic_vat_entries(options)
+        next_tax_return_move = self.env['account.move'].browse(action['res_id'])
+        next_tax_return_move.refresh_tax_entry()
+        with patch.object(self.env.registry[self.report._name], 'export_to_pdf', autospec=True, side_effect=lambda *args, **kwargs: {'file_name': 'dummy', 'file_content': b'', 'file_type': 'pdf'}):
+            next_tax_return_move.action_post()
+        self.assertEqual(next_tax_return_move._get_tax_to_pay_on_closing(), 0.0)
+
+        self.assertRecordValues(next_tax_return_move.activity_ids, [{
+            'activity_type_id': act_type_report_to_send.id,
+            'summary': f'Send tax report: {next_tax_return_move.date.strftime("%B %Y")}',
+            'date_deadline': fields.Date.context_today(self.env.user),
+        }])
+
+        next_tax_return_move.activity_ids.action_done()
+        self.assertFalse(all_report_activity_type & next_tax_return_move.activity_ids.activity_type_id,
+                         "marking the sending as done shouldn't trigger any other similar activity")
+
+    def test_posting_without_amount_and_no_pay_activity(self):
+        """
+        0.0 closing does not create a pay activity
+        """
+        with patch.object(self.env.registry[self.report._name], 'export_to_pdf', autospec=True, side_effect=lambda *args, **kwargs: {'file_name': 'dummy', 'file_content': b'', 'file_type': 'pdf'}):
+            self.tax_return_move.action_post()
+        self.assertEqual(self.tax_return_move._get_tax_to_pay_on_closing(), 0.0)
+        self.assertFalse(self.env['mail.activity'].search([
+            ('res_id', '=', self.tax_return_move.id),
+            ('activity_type_id', '=', self.pay_activity_id),
+        ]))
+
+    def test_tax_closing_activity_reminder_duplication(self):
+        """
+        Test triggering multiple times the closing action don't recreate an activity for the closing move even if the moves are cancelled
+        """
+        # Cancel the main one to be able to create new ones for this closing
+        self.tax_return_move.button_cancel()
+        for i in range(0, 2):
+            action = self.env['account.tax.report.handler'].with_context({'override_tax_closing_warning': True}).action_periodic_vat_entries(self.options)
+            move = self.env['account.move'].browse(action['res_id'])
+            move.button_cancel()
+        activity = self.env.company._get_tax_closing_reminder_activity(self.report.id, fields.Date.from_string(self.options['date']['date_to']))
+        self.assertEqual(len(activity), 1, "You cannot have duplicate tax closing reminder for the same report on the same period")
+
+    def test_tax_closing_activity_reminder_post(self):
+        """
+        Test that when posting a closing move, the next one is created
+        """
+        activity = self.env.company._get_tax_closing_reminder_activity(self.report.id, fields.Date.from_string(self.options['date']['date_to']))
+        self.assertTrue(activity, "There has been no activity created for the current period closing")
+        with patch.object(self.env.registry[self.report._name], 'export_to_pdf', autospec=True, side_effect=lambda *args, **kwargs: {'file_name': 'dummy', 'file_content': b'', 'file_type': 'pdf'}):
+            self.tax_return_move.action_post()
+
+        _dummy, period_end = self.env.company._get_tax_closing_period_boundaries(fields.Date.from_string(self.options['date']['date_to']) + relativedelta(days=1), self.report)
+        activity = self.env.company._get_tax_closing_reminder_activity(self.report.id, period_end)
+        self.assertTrue(activity, "There has been no activity created for the next period closing")
+
+    def test_tax_closing_activity_reminder_reset_on_periodicity_change(self):
+        """
+        Test that when changing the periodicity, the old activities got replaced by new ones
+        """
+        old_activity = self.env.company._get_tax_closing_reminder_activity(self.report.id, fields.Date.from_string(self.options['date']['date_to']))
+
+        self.env.company.account_tax_periodicity = 'year'
+        _dummy, period_end = self.env.company._get_tax_closing_period_boundaries(fields.Date.today(), self.report)
+        new_activity = self.env.company._get_tax_closing_reminder_activity(self.report.id, period_end)
+
+        self.assertNotEqual(old_activity.id, new_activity.id)
+        self.assertEqual(fields.Date.from_string(new_activity.account_tax_closing_params['tax_closing_end_date']), period_end)
diff --git a/dev_odex30_accounting/odex30_account_reports/tests/test_account_reports_tours.py b/dev_odex30_accounting/odex30_account_reports/tests/test_account_reports_tours.py
new file mode 100644
index 0000000..28c9dcf
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_reports/tests/test_account_reports_tours.py
@@ -0,0 +1,87 @@
+# -*- coding: utf-8 -*-
+
+
+from odoo import Command, fields
+
+from odoo.tests import tagged
+from odoo.addons.account.tests.common import AccountTestInvoicingHttpCommon
+
+@tagged('post_install', '-at_install')
+class TestAccountReportsTours(AccountTestInvoicingHttpCommon):
+    @classmethod
+    def setUpClass(cls):
+        super().setUpClass()
+
+        cls.report = cls.env.ref('odex30_account_reports.balance_sheet')
+        cls.report.column_ids.sortable = True
+
+        # Create moves
+        cls.account_101401 = cls.env['account.account'].search([
+            ('company_ids', '=', cls.company_data['company'].id),
+            ('code', '=', 101401)
+        ])
+
+        cls.account_101402 = cls.env['account.account'].search([
+            ('company_ids', '=', cls.company_data['company'].id),
+            ('code', '=', 101402)
+        ])
+
+        cls.account_101404 = cls.env['account.account'].search([
+            ('company_ids', '=', cls.company_data['company'].id),
+            ('code', '=', '101404')
+        ])
+
+        cls.account_121000 = cls.env['account.account'].search([
+            ('company_ids', '=', cls.company_data['company'].id),
+            ('code', '=', 121000)
+        ])
+
+        cls.account_251000 = cls.env['account.account'].search([
+            ('company_ids', '=', cls.company_data['company'].id),
+            ('code', '=', 251000)
+        ])
+
+        move = cls.env['account.move'].create({
+            'move_type': 'entry',
+            'date': '2022-06-01',
+            'journal_id': cls.company_data['default_journal_cash'].id,
+            'line_ids': [
+                (0, 0, {'debit':  75.0,     'credit':   0.0,    'account_id': cls.account_101401.id}),
+                (0, 0, {'debit': 100.0,     'credit':   0.0,    'account_id': cls.account_101402.id}),
+                (0, 0, {'debit':  50.0,     'credit':   0.0,    'account_id': cls.account_101404.id}),
+                (0, 0, {'debit':  25.0,     'credit':   0.0,    'account_id': cls.account_121000.id}),
+                (0, 0, {'debit':   0.0,     'credit': 250.0,    'account_id': cls.account_251000.id}),
+            ],
+        })
+
+        move.action_post()
+
+    def test_account_reports_tours(self):
+        self.start_tour("/odoo", 'odex30_account_reports', login=self.env.user.login)
+
+    def test_account_reports_annotations_tours(self):
+        # Line ids
+        line_id_ta = self.report._get_generic_line_id('account.report.line', self.env.ref('odex30_account_reports.account_financial_report_total_assets0').id)
+        line_id_ca = self.report._get_generic_line_id('account.report.line', self.env.ref('odex30_account_reports.account_financial_report_current_assets_view0').id, parent_line_id=line_id_ta)
+        line_id_ba = self.report._get_generic_line_id('account.report.line', self.env.ref('odex30_account_reports.account_financial_report_bank_view0').id, parent_line_id=line_id_ca)
+        line_id_101401 = self.report._get_generic_line_id('account.account', self.account_101401.id, markup={'groupby': 'account_id'}, parent_line_id=line_id_ba)
+        line_id_cas = self.report._get_generic_line_id('account.report.line', self.env.ref('odex30_account_reports.account_financial_report_current_assets0').id, parent_line_id=line_id_ca)
+        line_id_101404 = self.report._get_generic_line_id('account.account', self.account_101404.id, markup={'groupby': 'account_id'}, parent_line_id=line_id_cas)
+        # Create annotations
+        date = fields.Date.today().strftime('%Y-%m-%d')
+        self.report.write({
+            'annotations_ids': [
+                Command.create({
+                    'line_id': line_id_101401,
+                    'text': 'Annotation 101401',
+                    'date': date,
+                }),
+                Command.create({
+                    'line_id': line_id_101404,
+                    'text': 'Annotation 101404',
+                    'date': date,
+                }),
+            ]
+        })
+
+        self.start_tour("/odoo", 'account_reports_annotations', login=self.env.user.login)
diff --git a/dev_odex30_accounting/odex30_account_reports/tests/test_account_sales_report_generic.py b/dev_odex30_accounting/odex30_account_reports/tests/test_account_sales_report_generic.py
new file mode 100644
index 0000000..95bf8bf
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_reports/tests/test_account_sales_report_generic.py
@@ -0,0 +1,177 @@
+# -*- coding: utf-8 -*-
+
+from odoo.addons.odex30_account_reports.tests.account_sales_report_common import AccountSalesReportCommon
+from odoo.tests import tagged
+from odoo.tools.misc import NON_BREAKING_SPACE
+from freezegun import freeze_time
+
+from odoo import Command
+
+
+@tagged('post_install', '-at_install')
+class AccountSalesReportTest(AccountSalesReportCommon):
+
+    @classmethod
+    def collect_company_accounting_data(cls, company):
+        res = super().collect_company_accounting_data(company)
+        res['company'].update({
+            'country_id': cls.env.ref('base.us').id,
+            'vat': 'US123456789047',
+            #  Country outside of EU to avoid local reports being chosen over this one (wanted behaviour)
+        })
+        return res
+
+    @freeze_time('2019-12-31')
+    def test_ec_sales_report(self):
+        l_tax = self.env['account.tax'].create({
+            'name': 'goods',
+            'amount_type': 'percent',
+            'amount': 0,
+            'type_tax_use': 'sale',
+            'price_include_override': 'tax_excluded',
+            'include_base_amount': False,
+        })
+        t_tax = self.env['account.tax'].create({
+            'name': 'triangular',
+            'amount_type': 'percent',
+            'amount': 0,
+            'type_tax_use': 'purchase',
+            'price_include_override': 'tax_excluded',
+            'include_base_amount': False,
+        })
+        s_tax = self.env['account.tax'].create({
+            'name': 'services',
+            'amount_type': 'percent',
+            'amount': 0,
+            'type_tax_use': 'sale',
+            'price_include_override': 'tax_excluded',
+            'include_base_amount': False,
+        })
+        bad_tax_1 = self.env['account.tax'].create({
+            'name': 'bad_1',
+            'amount_type': 'fixed',
+            'amount': 0,
+            'type_tax_use': 'sale',
+            'price_include_override': 'tax_excluded',
+            'include_base_amount': False,
+        })
+        bad_tax_2 = self.env['account.tax'].create({
+            'name': 'bad_2',
+            'amount_type': 'percent',
+            'amount': 10,
+            'type_tax_use': 'sale',
+            'price_include_override': 'tax_excluded',
+            'include_base_amount': False,
+        })
+        self._create_invoices([
+            (self.partner_a, l_tax[:1], 100),
+            (self.partner_a, l_tax[:1], 200),
+            (self.partner_a, t_tax[:1], 300),  # Should be ignored due to purchase tax
+            (self.partner_b, t_tax[:1], 100),  # Should be ignored due to purchase tax
+            (self.partner_a, s_tax[:1], 400),
+            (self.partner_b, s_tax[:1], 500),
+            (self.partner_b, bad_tax_1[:1], 700),  # Should be ignored due to fixed amount
+            (self.partner_b, bad_tax_2[:1], 700),  # Should be ignored due to non-null amount
+        ])
+        report = self.env.ref('odex30_account_reports.generic_ec_sales_report')
+        options = self._generate_options(report, '2019-12-01', '2019-12-31')
+
+        self.assertLinesValues(
+            report._get_lines(options),
+            # pylint: disable=C0326
+            #   Partner,                country code,             VAT Number,               Amount
+            [   0,                      1,                        2,                        3],
+            [
+                (self.partner_a.name,   self.partner_a.vat[:2],   self.partner_a.vat[2:],   f'${NON_BREAKING_SPACE}700.00'),
+                (self.partner_b.name,   self.partner_b.vat[:2],   self.partner_b.vat[2:],   f'${NON_BREAKING_SPACE}500.00'),
+                ('Total',               '',                       '',                       f'${NON_BREAKING_SPACE}1,200.00'),
+            ],
+            options,
+        )
+
+    @freeze_time('2019-12-31')
+    def test_ec_sales_report_with_northern_irish_customer(self):
+        """
+        Ensure that Northern Irish companies are included in the EC sales report.
+        """
+        northern_ireland = self.env.ref('account_intrastat.xi', raise_if_not_found=False)
+
+        if not northern_ireland:
+            self.skipTest("`account_intrastat` module not installed")
+
+        self.partner_a.write({
+            'country_id': northern_ireland.id,
+            'vat': 'IE1234567FA',
+        })
+        self.tax_sale_a.amount = 0
+
+        self._create_invoices([
+            (self.partner_a, self.tax_sale_a, 100),
+        ])
+        report = self.env.ref('odex30_account_reports.generic_ec_sales_report')
+        options = self._generate_options(report, '2019-12-01', '2019-12-31')
+
+        self.assertLinesValues(
+            report._get_lines(options),
+            #   Partner,                country code,             VAT Number,               Amount
+            [   0,                      1,                        2,                        3],
+            [
+                (self.partner_a.name,   self.partner_a.vat[:2],   self.partner_a.vat[2:],   f'${NON_BREAKING_SPACE}100.00'),
+                ('Total',               '',                       '',                       f'${NON_BREAKING_SPACE}100.00'),
+            ],
+            options,
+        )
+
+    def test_ec_sales_set_as_main(self):
+        """Test setting a partner as the main in EC Sales Report when two partners share the same VAT.
+
+        Scenario:
+        - Two partners have the same VAT.
+        - Set one partner as the main partner.
+        - Validate that the second partner is linked correctly as a child and that moves are updated.
+        """
+        # Prepare partners
+        partner_main = self.partner_a
+        partner_duplicate = self.partner_b
+        partner_duplicate.vat = partner_main.vat
+
+        move_vals = {
+            'move_type': 'out_invoice',
+            'invoice_date': '2025-04-29',
+            'invoice_line_ids': [Command.create({
+                'quantity': 1,
+                'price_unit': 500.0,
+                'tax_ids': [],
+            })],
+        }
+        # Create and post invoice for the main partner
+        move_main = self.env['account.move'].create({**move_vals, 'partner_id': partner_main.id})
+        move_main.action_post()
+        # Create and post invoice for the duplicate partner
+        move_duplicate = self.env['account.move'].create({**move_vals, 'partner_id': partner_duplicate.id})
+        move_duplicate.action_post()
+
+        # Call with context
+        partner_main.with_context(duplicated_partners_vat=[partner_main.vat, partner_duplicate.vat]).set_commercial_partner_main()
+
+        # Assertions: partner relationships
+        self.assertEqual(
+            partner_duplicate.commercial_partner_id, partner_main,
+            "Duplicate partner's commercial partner should be the main partner."
+        )
+        self.assertEqual(
+            partner_duplicate.parent_id, partner_main,
+            "Duplicate partner's parent should be set to the main partner."
+        )
+
+        # Assertions: accounting move reassignment
+        self.assertEqual(
+            move_duplicate.commercial_partner_id, partner_main,
+            "The move's commercial partner should also be reassigned."
+        )
+
+        # Assertions: journal items (move lines)
+        self.assertEqual(
+            move_duplicate.line_ids.partner_id, partner_main,
+            "Each move line should now be assigned to the main partner."
+        )
diff --git a/dev_odex30_accounting/odex30_account_reports/tests/test_aged_payable_report.py b/dev_odex30_accounting/odex30_account_reports/tests/test_aged_payable_report.py
new file mode 100644
index 0000000..a2ac028
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_reports/tests/test_aged_payable_report.py
@@ -0,0 +1,798 @@
+# -*- coding: utf-8 -*-
+# pylint: disable=C0326
+from .common import TestAccountReportsCommon
+
+from odoo import fields, Command
+from odoo.tests import tagged
+
+
+@tagged('post_install', '-at_install')
+class TestAgedPayableReport(TestAccountReportsCommon):
+
+    @classmethod
+    def setUpClass(cls):
+        super().setUpClass()
+
+        cls.partner_category_a = cls.env['res.partner.category'].create({'name': 'partner_categ_a'})
+        cls.partner_category_b = cls.env['res.partner.category'].create({'name': 'partner_categ_b'})
+
+        cls.partner_a.write({'category_id': [Command.set([cls.partner_category_a.id, cls.partner_category_b.id])]})
+        cls.partner_b.write({'category_id': [Command.set([cls.partner_category_a.id])]})
+
+        payable_1 = cls.company_data['default_account_payable']
+        payable_2 = cls.company_data['default_account_payable'].copy()
+        payable_3 = cls.company_data['default_account_payable'].copy()
+        payable_4 = cls.company_data_2['default_account_payable']
+        payable_5 = cls.company_data_2['default_account_payable'].copy()
+        payable_6 = cls.company_data_2['default_account_payable'].copy()
+        misc_1 = cls.company_data['default_account_expense']
+        misc_2 = cls.company_data_2['default_account_expense']
+
+        # Test will use the following dates:
+        # As of                  2017-02-01
+        # 1 - 30:   2017-01-31 - 2017-01-02
+        # 31 - 60:  2017-01-01 - 2016-12-03
+        # 61 - 90:  2016-12-02 - 2016-11-03
+        # 91 - 120: 2016-11-02 - 2016-10-04
+        # Older:    2016-10-03
+
+        # ==== Journal entries in company_1 for partner_a ====
+
+        move_1 = cls.env['account.move'].create({
+            'move_type': 'entry',
+            'date': fields.Date.from_string('2016-11-03'),
+            'journal_id': cls.company_data['default_journal_purchase'].id,
+            'line_ids': [
+                # 1000.0 in 61 - 90.
+                Command.create({'debit': 0.0,       'credit': 1000.0,   'date_maturity': False,         'account_id': payable_1.id,      'partner_id': cls.partner_a.id}),
+                # -800.0 in 31 - 60
+                Command.create({'debit': 800.0,     'credit': 0.0,      'date_maturity': '2017-01-01',  'account_id': payable_2.id,      'partner_id': cls.partner_a.id}),
+                # Ignored line.
+                Command.create({'debit': 200.0,     'credit': 0.0,      'date_maturity': False,         'account_id': misc_1.id,         'partner_id': cls.partner_a.id}),
+            ],
+        })
+
+        move_2 = cls.env['account.move'].create({
+            'move_type': 'entry',
+            'date': fields.Date.from_string('2016-10-05'),
+            'journal_id': cls.company_data['default_journal_purchase'].id,
+            'line_ids': [
+                # -200.0 in 61 - 90
+                Command.create({'debit': 200.0,    'credit': 0.0,        'date_maturity': '2016-12-02',  'account_id': payable_1.id,      'partner_id': cls.partner_a.id}),
+                # -300.0 in 31 - 60
+                Command.create({'debit': 300.0,    'credit': 0.0,        'date_maturity': '2016-12-03',  'account_id': payable_1.id,      'partner_id': cls.partner_a.id}),
+                # 1000.0 in 91 - 120
+                Command.create({'debit': 0.0,      'credit': 1000.0,     'date_maturity': False,         'account_id': payable_2.id,      'partner_id': cls.partner_a.id}),
+                # 100.0 in all dates
+                Command.create({'debit': 0.0,      'credit': 100.0,      'date_maturity': '2017-02-01',  'account_id': payable_3.id,      'partner_id': cls.partner_a.id}),
+                Command.create({'debit': 0.0,      'credit': 100.0,      'date_maturity': '2017-01-02',  'account_id': payable_3.id,      'partner_id': cls.partner_a.id}),
+                Command.create({'debit': 0.0,      'credit': 100.0,      'date_maturity': '2016-12-03',  'account_id': payable_3.id,      'partner_id': cls.partner_a.id}),
+                Command.create({'debit': 0.0,      'credit': 100.0,      'date_maturity': '2016-11-03',  'account_id': payable_3.id,      'partner_id': cls.partner_a.id}),
+                Command.create({'debit': 0.0,      'credit': 100.0,      'date_maturity': '2016-10-04',  'account_id': payable_3.id,      'partner_id': cls.partner_a.id}),
+                Command.create({'debit': 0.0,      'credit': 100.0,      'date_maturity': '2016-01-01',  'account_id': payable_3.id,      'partner_id': cls.partner_a.id}),
+                # Ignored line.
+                Command.create({'debit': 1100.0,   'credit': 0.0,        'date_maturity': '2016-10-05',  'account_id': misc_1.id,         'partner_id': cls.partner_a.id}),
+            ],
+        })
+        (move_1 + move_2).action_post()
+        (move_1 + move_2).line_ids.filtered(lambda line: line.account_id == payable_1).reconcile()
+        (move_1 + move_2).line_ids.filtered(lambda line: line.account_id == payable_2).reconcile()
+
+        # ==== Journal entries in company_2 for partner_b ====
+
+        move_3 = cls.env['account.move'].create({
+            'move_type': 'entry',
+            'date': fields.Date.from_string('2016-11-03'),
+            'journal_id': cls.company_data_2['default_journal_purchase'].id,
+            'line_ids': [
+                # 1000.0 in 61 - 90.
+                Command.create({'debit': 0.0,       'credit': 1000.0,   'date_maturity': False,         'account_id': payable_4.id,      'partner_id': cls.partner_b.id}),
+                # -800.0 in 31 - 60
+                Command.create({'debit': 800.0,     'credit': 0.0,      'date_maturity': '2017-01-01',  'account_id': payable_5.id,      'partner_id': cls.partner_b.id}),
+                # Ignored line.
+                Command.create({'debit': 200.0,     'credit': 0.0,      'date_maturity': False,         'account_id': misc_2.id,         'partner_id': cls.partner_b.id}),
+            ],
+        })
+
+        move_4 = cls.env['account.move'].create({
+            'move_type': 'entry',
+            'date': fields.Date.from_string('2016-10-05'),
+            'journal_id': cls.company_data_2['default_journal_purchase'].id,
+            'line_ids': [
+                # -200.0 in 61 - 90
+                Command.create({'debit': 200.0,    'credit': 0.0,        'date_maturity': '2016-12-02',  'account_id': payable_4.id,      'partner_id': cls.partner_b.id}),
+                # -300.0 in 31 - 60
+                Command.create({'debit': 300.0,    'credit': 0.0,        'date_maturity': '2016-12-03',  'account_id': payable_4.id,      'partner_id': cls.partner_b.id}),
+                # 1000.0 in 91 - 120
+                Command.create({'debit': 0.0,      'credit': 1000.0,     'date_maturity': False,         'account_id': payable_5.id,      'partner_id': cls.partner_b.id}),
+                # 100.0 in all dates
+                Command.create({'debit': 0.0,      'credit': 100.0,      'date_maturity': '2017-02-01',  'account_id': payable_6.id,      'partner_id': cls.partner_b.id}),
+                Command.create({'debit': 0.0,      'credit': 100.0,      'date_maturity': '2017-01-02',  'account_id': payable_6.id,      'partner_id': cls.partner_b.id}),
+                Command.create({'debit': 0.0,      'credit': 100.0,      'date_maturity': '2016-12-03',  'account_id': payable_6.id,      'partner_id': cls.partner_b.id}),
+                Command.create({'debit': 0.0,      'credit': 100.0,      'date_maturity': '2016-11-03',  'account_id': payable_6.id,      'partner_id': cls.partner_b.id}),
+                Command.create({'debit': 0.0,      'credit': 100.0,      'date_maturity': '2016-10-04',  'account_id': payable_6.id,      'partner_id': cls.partner_b.id}),
+                Command.create({'debit': 0.0,      'credit': 100.0,      'date_maturity': '2016-01-01',  'account_id': payable_6.id,      'partner_id': cls.partner_b.id}),
+                # Ignored line.
+                Command.create({'debit': 1100.0,   'credit': 0.0,        'date_maturity': '2016-10-05',  'account_id': misc_2.id,         'partner_id': cls.partner_b.id}),
+            ],
+        })
+        (move_3 + move_4).action_post()
+        (move_3 + move_4).line_ids.filtered(lambda line: line.account_id == payable_4).reconcile()
+        (move_3 + move_4).line_ids.filtered(lambda line: line.account_id == payable_5).reconcile()
+        cls.env['res.currency'].search([('name', '!=', 'USD')]).with_context(force_deactivate=True).active = False
+        cls.env.companies = cls.company_data['company'] + cls.company_data_2['company']
+        cls.report = cls.env.ref('odex30_account_reports.aged_payable_report')
+        cls.parent_line_id = cls._get_basic_line_dict_id_from_report_line_ref("odex30_account_reports.aged_payable_line")
+
+    def test_aged_payable_unfold_1_whole_report(self):
+        """ Test unfolding a line when rendering the whole report. """
+        options = self._generate_options(self.report, fields.Date.from_string('2017-02-01'), fields.Date.from_string('2017-02-01'))
+        partner_a_line_id = self.report._get_generic_line_id('res.partner', self.partner_a.id, parent_line_id=self.parent_line_id, markup={'groupby': 'partner_id'})
+        options['unfolded_lines'] = [partner_a_line_id]
+
+        report_lines = self.report._get_lines(options)
+
+        # Sort by Invoice Date
+        options['order_column'] = {
+            'expression_label': 'invoice_date',
+            'direction': 'ASC',
+        }
+
+        sorted_report_lines = self.report.sort_lines(report_lines, options)
+        self.assertLinesValues(
+            # pylint: disable=C0326
+            sorted_report_lines,
+            #   Name                   Not Due On      1 - 30     31 - 60     61 - 90    91 - 120       Older        Total
+            [   0,                              3,          4,          5,          6,          7,          8,           9],
+            [
+                ('Aged Payable',            150.0,      150.0,      150.0,      900.0,      450.0,      150.0,      1950.0),
+                ('partner_a',               100.0,      100.0,      100.0,      600.0,      300.0,      100.0,      1300.0),
+                ('BILL/2016/11/0001',         0.0,        0.0,        0.0,      500.0,        0.0,        0.0,          ''),
+                ('BILL/2016/10/0001',         0.0,        0.0,        0.0,        0.0,      200.0,        0.0,          ''),
+                ('BILL/2016/10/0001',       100.0,        0.0,        0.0,        0.0,        0.0,        0.0,          ''),
+                ('BILL/2016/10/0001',         0.0,      100.0,        0.0,        0.0,        0.0,        0.0,          ''),
+                ('BILL/2016/10/0001',         0.0,        0.0,      100.0,        0.0,        0.0,        0.0,          ''),
+                ('BILL/2016/10/0001',         0.0,        0.0,        0.0,      100.0,        0.0,        0.0,          ''),
+                ('BILL/2016/10/0001',         0.0,        0.0,        0.0,        0.0,      100.0,        0.0,          ''),
+                ('BILL/2016/10/0001',         0.0,        0.0,        0.0,        0.0,        0.0,      100.0,          ''),
+                ('Total partner_a',         100.0,      100.0,      100.0,       600.0,     300.0,      100.0,      1300.0),
+                ('partner_b',                50.0,      50.0,        50.0,       300.0,     150.0,       50.0,       650.0),
+                ('Total Aged Payable',      150.0,      150.0,      150.0,      900.0,      450.0,      150.0,      1950.0),
+            ],
+            options,
+        )
+
+        # Sort 61 - 90 decreasing.
+        options['order_column'] = {
+            'expression_label': 'period3',
+            'direction': 'DESC',
+        }
+
+        self.assertLinesValues(
+            # pylint: disable=C0326
+            self.report.sort_lines(sorted_report_lines, options),
+            #   Name                   Not Due On      1 - 30     31 - 60     61 - 90    91 - 120       Older        Total
+            [   0,                              3,          4,          5,          6,          7,          8,           9],
+            [
+                ('Aged Payable',            150.0,      150.0,      150.0,      900.0,      450.0,      150.0,      1950.0),
+                ('partner_a',               100.0,      100.0,      100.0,      600.0,      300.0,      100.0,      1300.0),
+                ('BILL/2016/11/0001',         0.0,        0.0,        0.0,      500.0,        0.0,        0.0,          ''),
+                ('BILL/2016/10/0001',         0.0,        0.0,        0.0,      100.0,        0.0,        0.0,          ''),
+                ('BILL/2016/10/0001',         0.0,        0.0,        0.0,        0.0,      200.0,        0.0,          ''),
+                ('BILL/2016/10/0001',       100.0,        0.0,        0.0,        0.0,        0.0,        0.0,          ''),
+                ('BILL/2016/10/0001',         0.0,      100.0,        0.0,        0.0,        0.0,        0.0,          ''),
+                ('BILL/2016/10/0001',         0.0,        0.0,      100.0,        0.0,        0.0,        0.0,          ''),
+                ('BILL/2016/10/0001',         0.0,        0.0,        0.0,        0.0,      100.0,        0.0,          ''),
+                ('BILL/2016/10/0001',         0.0,        0.0,        0.0,        0.0,        0.0,      100.0,          ''),
+                ('Total partner_a',         100.0,      100.0,      100.0,      600.0,      300.0,      100.0,      1300.0),
+                ('partner_b',                50.0,       50.0,       50.0,      300.0,      150.0,       50.0,       650.0),
+                ('Total Aged Payable',      150.0,      150.0,      150.0,      900.0,      450.0,      150.0,      1950.0),
+            ],
+            options,
+        )
+
+        # Sort 61 - 90 increasing.
+        options['order_column'] = {
+            'expression_label': 'period3',
+            'direction': 'ASC',
+        }
+
+        self.assertLinesValues(
+            # pylint: disable=C0326
+            self.report.sort_lines(sorted_report_lines, options),
+            #   Name                   Not Due On      1 - 30     31 - 60     61 - 90    91 - 120       Older        Total
+            [   0,                              3,          4,          5,          6,          7,          8,           9],
+            [
+                ('Aged Payable',            150.0,      150.0,      150.0,       900.0,      450.0,      150.0,      1950.0),
+                ('partner_b',                50.0,       50.0,       50.0,       300.0,      150.0,       50.0,       650.0),
+                ('partner_a',               100.0,      100.0,      100.0,       600.0,      300.0,      100.0,      1300.0),
+                ('BILL/2016/10/0001',         0.0,        0.0,        0.0,         0.0,      200.0,        0.0,          ''),
+                ('BILL/2016/10/0001',       100.0,        0.0,        0.0,         0.0,        0.0,        0.0,          ''),
+                ('BILL/2016/10/0001',         0.0,      100.0,        0.0,         0.0,        0.0,        0.0,          ''),
+                ('BILL/2016/10/0001',         0.0,        0.0,      100.0,         0.0,        0.0,        0.0,          ''),
+                ('BILL/2016/10/0001',         0.0,        0.0,        0.0,         0.0,      100.0,        0.0,          ''),
+                ('BILL/2016/10/0001',         0.0,        0.0,        0.0,         0.0,        0.0,      100.0,          ''),
+                ('BILL/2016/10/0001',         0.0,        0.0,        0.0,       100.0,        0.0,        0.0,          ''),
+                ('BILL/2016/11/0001',         0.0,        0.0,        0.0,       500.0,        0.0,        0.0,          ''),
+                ('Total partner_a',         100.0,      100.0,      100.0,       600.0,      300.0,      100.0,      1300.0),
+                ('Total Aged Payable',      150.0,      150.0,      150.0,       900.0,      450.0,      150.0,      1950.0),
+            ],
+            options,
+        )
+
+    def test_aged_payable_unfold_all(self):
+        default_options = {
+            'unfold_all': True,
+            'order_column': {
+                'expression_label': 'invoice_date',
+                'direction': 'ASC',
+            }
+        }
+        options = self._generate_options(self.report, '2017-02-01', '2017-02-01', default_options=default_options)
+
+        report_lines = self.report._get_lines(options)
+        self.assertLinesValues(
+            # pylint: disable=C0326
+            self.report.sort_lines(report_lines, options),
+            #   Name                  Not Due On      1 - 30     31 - 60     61 - 90    91 - 120       Older       Total
+            [   0,                             3,          4,          5,          6,          7,          8,          9],
+            [
+                ('Aged Payable',           150.0,      150.0,      150.0,      900.0,      450.0,      150.0,      1950.0),
+                ('partner_a',              100.0,      100.0,      100.0,      600.0,      300.0,      100.0,      1300.0),
+                ('BILL/2016/11/0001',        0.0,        0.0,        0.0,      500.0,        0.0,        0.0,          ''),
+                ('BILL/2016/10/0001',        0.0,        0.0,        0.0,        0.0,      200.0,        0.0,          ''),
+                ('BILL/2016/10/0001',      100.0,        0.0,        0.0,        0.0,        0.0,        0.0,          ''),
+                ('BILL/2016/10/0001',        0.0,      100.0,        0.0,        0.0,        0.0,        0.0,          ''),
+                ('BILL/2016/10/0001',        0.0,        0.0,      100.0,        0.0,        0.0,        0.0,          ''),
+                ('BILL/2016/10/0001',        0.0,        0.0,        0.0,      100.0,        0.0,        0.0,          ''),
+                ('BILL/2016/10/0001',        0.0,        0.0,        0.0,        0.0,      100.0,        0.0,          ''),
+                ('BILL/2016/10/0001',        0.0,        0.0,        0.0,        0.0,        0.0,      100.0,          ''),
+                ('Total partner_a',        100.0,      100.0,      100.0,       600.0,     300.0,      100.0,      1300.0),
+                ('partner_b',               50.0,       50.0,       50.0,       300.0,     150.0,       50.0,       650.0),
+                ('BILL/2016/11/0001',        0.0,        0.0,        0.0,       250.0,       0.0,        0.0,          ''),
+                ('BILL/2016/10/0001',        0.0,        0.0,        0.0,         0.0,     100.0,        0.0,          ''),
+                ('BILL/2016/10/0001',       50.0,        0.0,        0.0,         0.0,       0.0,        0.0,          ''),
+                ('BILL/2016/10/0001',        0.0,       50.0,        0.0,         0.0,       0.0,        0.0,          ''),
+                ('BILL/2016/10/0001',        0.0,        0.0,       50.0,         0.0,       0.0,        0.0,          ''),
+                ('BILL/2016/10/0001',        0.0,        0.0,        0.0,        50.0,       0.0,        0.0,          ''),
+                ('BILL/2016/10/0001',        0.0,        0.0,        0.0,         0.0,      50.0,        0.0,          ''),
+                ('BILL/2016/10/0001',        0.0,        0.0,        0.0,         0.0,       0.0,       50.0,          ''),
+                ('Total partner_b',         50.0,       50.0,       50.0,       300.0,     150.0,       50.0,       650.0),
+                ('Total Aged Payable',     150.0,      150.0,      150.0,      900.0,      450.0,      150.0,      1950.0),
+            ],
+            options
+        )
+
+    def test_aged_payable_unknown_partner(self):
+        """ Test that journal items without a partner in the payable account appear as unknown partner. """
+
+        misc_move = self.env['account.move'].create({
+            'date': '2017-03-31',
+            'line_ids': [
+                Command.create({'debit': 0.0, 'credit': 1000.0, 'account_id': self.company_data['default_account_expense'].id}),
+                Command.create({'debit': 1000.0, 'credit': 0.0, 'account_id': self.company_data['default_account_payable'].id}),
+            ],
+        })
+        misc_move.action_post()
+
+        options = self._generate_options(self.report, fields.Date.from_string('2017-03-01'), fields.Date.from_string('2017-04-01'))
+        self.env.company.totals_below_sections = False
+
+        self.assertLinesValues(
+            # pylint: disable=C0326
+            self.report._get_lines(options),
+            #   Name           Not Due On      1 - 30     31 - 60     61 - 90    91 - 120       Older        Total
+            [   0,                      3,          4,          5,          6,          7,          8,           9],
+            [
+                ('Aged Payable',      0.0,    -1000.0,      150.0,      150.0,      150.0,     1500.0,       950.0),
+                ('partner_a',         0.0,        0.0,      100.0,      100.0,      100.0,     1000.0,      1300.0),
+                ('partner_b',         0.0,        0.0,       50.0,       50.0,       50.0,      500.0,       650.0),
+                ('Unknown',           0.0,    -1000.0,        0.0,        0.0,        0.0,        0.0,     -1000.0),
+            ],
+            options,
+        )
+
+    def test_aged_payable_filter_partners(self):
+        """ Test the filter on top allowing to filter on res.partner. """
+        options = self._generate_options(self.report, fields.Date.from_string('2017-02-01'), fields.Date.from_string('2017-02-01'))
+        options['partner_ids'] = self.partner_a.ids
+        self.env.company.totals_below_sections = False
+
+        self.assertLinesValues(
+            # pylint: disable=C0326
+            self.report._get_lines(options),
+            #   Name          Invoice Date   Not Due On      1 - 30     31 - 60     61 - 90    91 - 120       Older        Total
+            [   0,                       1,           3,          4,          5,          6,          7,          8,           9],
+            [
+                ('Aged Payable',        '',       100.0,      100.0,      100.0,      600.0,      300.0,      100.0,      1300.0),
+                ('partner_a',           '',       100.0,      100.0,      100.0,      600.0,      300.0,      100.0,      1300.0),
+            ],
+            options,
+        )
+
+    def test_aged_payable_filter_partner_categories(self):
+        """ Test the filter on top allowing to filter on res.partner.category. """
+        options = self._generate_options(self.report, fields.Date.from_string('2017-02-01'), fields.Date.from_string('2017-02-01'))
+        options['partner_categories'] = self.partner_category_a.ids
+        self.env.company.totals_below_sections = False
+
+        self.assertLinesValues(
+            # pylint: disable=C0326
+            self.report._get_lines(options),
+            #   Name            Not Due On      1 - 30     31 - 60     61 - 90    91 - 120       Older        Total
+            [   0,                       3,          4,          5,          6,          7,          8,           9],
+            [
+                ('Aged Payable',     150.0,      150.0,      150.0,      900.0,      450.0,      150.0,      1950.0),
+                ('partner_a',        100.0,      100.0,      100.0,      600.0,      300.0,      100.0,      1300.0),
+                ('partner_b',         50.0,       50.0,       50.0,      300.0,      150.0,       50.0,       650.0),
+            ],
+            options,
+        )
+
+    def test_aged_payable_reconciliation_date(self):
+        """ Check the values at a date before some reconciliations are done. """
+        options = self._generate_options(self.report, fields.Date.from_string('2016-10-31'), fields.Date.from_string('2016-10-31'))
+        self.env.company.totals_below_sections = False
+
+        self.assertLinesValues(
+            # pylint: disable=C0326
+            self.report._get_lines(options),
+            #   Name             Not Due On      1 - 30     31 - 60     61 - 90    91 - 120       Older        Total
+            [   0,                        3,          4,          5,          6,          7,          8,           9],
+            [
+                ('Aged Payable',    -133.33,    1466.67,        0.0,        0.0,        0.0,     133.33,     1466.67),
+                ('partner_a',       -100.00,    1100.00,        0.0,        0.0,        0.0,     100.00,     1100.00),
+                ('partner_b',        -33.33,     366.67,        0.0,        0.0,        0.0,      33.33,      366.67),
+            ],
+            options,
+        )
+
+    def test_aged_payablesort_lines_by_date(self):
+        """ Test the sort_lines function using date as sort key. """
+        options = self._generate_options(self.report, fields.Date.from_string('2017-02-01'), fields.Date.from_string('2017-02-01'))
+        partner_a_line_id = self.report._get_generic_line_id('res.partner', self.partner_a.id, parent_line_id=self.parent_line_id, markup={'groupby': 'partner_id'})
+        partner_b_line_id = self.report._get_generic_line_id('res.partner', self.partner_b.id, parent_line_id=self.parent_line_id, markup={'groupby': 'partner_id'})
+        options['unfolded_lines'] = [partner_a_line_id, partner_b_line_id]
+
+        # Sort by Invoice Date increasing
+        options['order_column'] = {
+            'expression_label': 'invoice_date',
+            'direction': 'ASC',
+        }
+
+        report_lines = self.report._get_lines(options)
+
+        self.assertLinesValues(
+            # pylint: disable=C0326
+            self.report.sort_lines(report_lines, options),
+            #   Name                  Not Due On      1 - 30     31 - 60     61 - 90    91 - 120       Older        Total
+            [   0,                             3,          4,          5,          6,          7,          8,           9],
+            [
+                ('Aged Payable',           150.0,      150.0,      150.0,      900.0,      450.0,      150.0,      1950.0),
+                ('partner_a',              100.0,      100.0,      100.0,      600.0,      300.0,      100.0,      1300.0),
+                ('BILL/2016/11/0001',        0.0,        0.0,        0.0,      500.0,        0.0,        0.0,          ''),
+                ('BILL/2016/10/0001',        0.0,        0.0,        0.0,        0.0,      200.0,        0.0,          ''),
+                ('BILL/2016/10/0001',      100.0,        0.0,        0.0,        0.0,        0.0,        0.0,          ''),
+                ('BILL/2016/10/0001',        0.0,      100.0,        0.0,        0.0,        0.0,        0.0,          ''),
+                ('BILL/2016/10/0001',        0.0,        0.0,      100.0,        0.0,        0.0,        0.0,          ''),
+                ('BILL/2016/10/0001',        0.0,        0.0,        0.0,      100.0,        0.0,        0.0,          ''),
+                ('BILL/2016/10/0001',        0.0,        0.0,        0.0,        0.0,      100.0,        0.0,          ''),
+                ('BILL/2016/10/0001',        0.0,        0.0,        0.0,        0.0,        0.0,      100.0,          ''),
+                ('Total partner_a',        100.0,      100.0,      100.0,       600.0,     300.0,      100.0,      1300.0),
+                ('partner_b',               50.0,       50.0,       50.0,       300.0,     150.0,       50.0,       650.0),
+                ('BILL/2016/11/0001',        0.0,        0.0,        0.0,       250.0,       0.0,        0.0,          ''),
+                ('BILL/2016/10/0001',        0.0,        0.0,        0.0,         0.0,     100.0,        0.0,          ''),
+                ('BILL/2016/10/0001',       50.0,        0.0,        0.0,         0.0,       0.0,        0.0,          ''),
+                ('BILL/2016/10/0001',        0.0,       50.0,        0.0,         0.0,       0.0,        0.0,          ''),
+                ('BILL/2016/10/0001',        0.0,        0.0,       50.0,         0.0,       0.0,        0.0,          ''),
+                ('BILL/2016/10/0001',        0.0,        0.0,        0.0,        50.0,       0.0,        0.0,          ''),
+                ('BILL/2016/10/0001',        0.0,        0.0,        0.0,         0.0,      50.0,        0.0,          ''),
+                ('BILL/2016/10/0001',        0.0,        0.0,        0.0,         0.0,       0.0,       50.0,          ''),
+                ('Total partner_b',         50.0,       50.0,       50.0,       300.0,     150.0,       50.0,       650.0),
+                ('Total Aged Payable',     150.0,      150.0,      150.0,      900.0,      450.0,      150.0,      1950.0),
+            ],
+            options,
+        )
+
+        # Sort by Invoice Date increasing
+        options['order_column'] = {
+            'expression_label': 'invoice_date',
+            'direction': 'DESC',
+        }
+
+        self.assertLinesValues(
+            # pylint: disable=C0326
+            self.report.sort_lines(report_lines, options),
+            #   Name                     Not Due On      1 - 30     31 - 60     61 - 90    91 - 120       Older        Total
+            [   0,                                3,          4,          5,          6,          7,          8,           9],
+            [
+                ('Aged Payable',              150.0,      150.0,      150.0,      900.0,      450.0,      150.0,      1950.0),
+                ('partner_a',                 100.0,      100.0,      100.0,      600.0,      300.0,      100.0,      1300.0),
+                ('BILL/2016/11/0001',           0.0,        0.0,        0.0,      500.0,        0.0,        0.0,          ''),
+                ('BILL/2016/10/0001',           0.0,        0.0,        0.0,        0.0,      200.0,        0.0,          ''),
+                ('BILL/2016/10/0001',         100.0,        0.0,        0.0,        0.0,        0.0,        0.0,          ''),
+                ('BILL/2016/10/0001',           0.0,      100.0,        0.0,        0.0,        0.0,        0.0,          ''),
+                ('BILL/2016/10/0001',           0.0,        0.0,      100.0,        0.0,        0.0,        0.0,          ''),
+                ('BILL/2016/10/0001',           0.0,        0.0,        0.0,      100.0,        0.0,        0.0,          ''),
+                ('BILL/2016/10/0001',           0.0,        0.0,        0.0,        0.0,      100.0,        0.0,          ''),
+                ('BILL/2016/10/0001',           0.0,        0.0,        0.0,        0.0,        0.0,      100.0,          ''),
+                ('Total partner_a',           100.0,      100.0,      100.0,       600.0,     300.0,      100.0,      1300.0),
+                ('partner_b',                  50.0,       50.0,       50.0,       300.0,     150.0,       50.0,       650.0),
+                ('BILL/2016/11/0001',           0.0,        0.0,        0.0,       250.0,       0.0,        0.0,          ''),
+                ('BILL/2016/10/0001',           0.0,        0.0,        0.0,         0.0,     100.0,        0.0,          ''),
+                ('BILL/2016/10/0001',          50.0,        0.0,        0.0,         0.0,       0.0,        0.0,          ''),
+                ('BILL/2016/10/0001',           0.0,       50.0,        0.0,         0.0,       0.0,        0.0,          ''),
+                ('BILL/2016/10/0001',           0.0,        0.0,       50.0,         0.0,       0.0,        0.0,          ''),
+                ('BILL/2016/10/0001',           0.0,        0.0,        0.0,        50.0,       0.0,        0.0,          ''),
+                ('BILL/2016/10/0001',           0.0,        0.0,        0.0,         0.0,      50.0,        0.0,          ''),
+                ('BILL/2016/10/0001',           0.0,        0.0,        0.0,         0.0,       0.0,       50.0,          ''),
+                ('Total partner_b',            50.0,       50.0,       50.0,       300.0,     150.0,       50.0,       650.0),
+                ('Total Aged Payable',        150.0,      150.0,      150.0,      900.0,      450.0,      150.0,      1950.0),
+            ],
+            options,
+        )
+
+    def test_aged_payablesort_lines_by_numeric_value(self):
+        """ Test the sort_lines function using float as sort key. """
+        options = self._generate_options(self.report, fields.Date.from_string('2017-02-01'), fields.Date.from_string('2017-02-01'))
+        partner_a_line_id = self.report._get_generic_line_id('res.partner', self.partner_a.id, parent_line_id=self.parent_line_id, markup={'groupby': 'partner_id'})
+        partner_b_line_id = self.report._get_generic_line_id('res.partner', self.partner_b.id, parent_line_id=self.parent_line_id, markup={'groupby': 'partner_id'})
+        options['unfolded_lines'] = [partner_a_line_id, partner_b_line_id]
+
+        report_lines = self.report._get_lines(options)
+
+        # Sort by Not Due On increasing
+        options['order_column'] = {
+            'expression_label': 'period0',
+            'direction': 'ASC',
+        }
+
+        self.assertLinesValues(
+            # pylint: disable=C0326
+            self.report.sort_lines(report_lines, options),
+            #   Name                   Not Due On      1 - 30     31 - 60     61 - 90    91 - 120       Older         Total
+            [   0,                              3,          4,          5,          6,          7,          8,           9],
+            [
+                ('Aged Payable',            150.0,      150.0,      150.0,      900.0,      450.0,      150.0,      1950.0),
+                ('partner_b',                50.0,       50.0,       50.0,      300.0,      150.0,       50.0,       650.0),
+                ('BILL/2016/11/0001',         0.0,        0.0,        0.0,      250.0,        0.0,        0.0,          ''),
+                ('BILL/2016/10/0001',         0.0,        0.0,        0.0,        0.0,      100.0,        0.0,          ''),
+                ('BILL/2016/10/0001',         0.0,       50.0,        0.0,        0.0,        0.0,        0.0,          ''),
+                ('BILL/2016/10/0001',         0.0,        0.0,       50.0,        0.0,        0.0,        0.0,          ''),
+                ('BILL/2016/10/0001',         0.0,        0.0,        0.0,       50.0,        0.0,        0.0,          ''),
+                ('BILL/2016/10/0001',         0.0,        0.0,        0.0,        0.0,       50.0,        0.0,          ''),
+                ('BILL/2016/10/0001',         0.0,        0.0,        0.0,        0.0,        0.0,       50.0,          ''),
+                ('BILL/2016/10/0001',        50.0,        0.0,        0.0,        0.0,        0.0,        0.0,          ''),
+                ('Total partner_b',          50.0,       50.0,       50.0,      300.0,      150.0,       50.0,       650.0),
+                ('partner_a',               100.0,      100.0,      100.0,      600.0,      300.0,      100.0,      1300.0),
+                ('BILL/2016/11/0001',         0.0,        0.0,        0.0,      500.0,        0.0,        0.0,          ''),
+                ('BILL/2016/10/0001',         0.0,        0.0,        0.0,        0.0,      200.0,        0.0,          ''),
+                ('BILL/2016/10/0001',         0.0,      100.0,        0.0,        0.0,        0.0,        0.0,          ''),
+                ('BILL/2016/10/0001',         0.0,        0.0,      100.0,        0.0,        0.0,        0.0,          ''),
+                ('BILL/2016/10/0001',         0.0,        0.0,        0.0,      100.0,        0.0,        0.0,          ''),
+                ('BILL/2016/10/0001',         0.0,        0.0,        0.0,        0.0,      100.0,        0.0,          ''),
+                ('BILL/2016/10/0001',         0.0,        0.0,        0.0,        0.0,        0.0,      100.0,          ''),
+                ('BILL/2016/10/0001',       100.0,        0.0,        0.0,        0.0,        0.0,        0.0,          ''),
+                ('Total partner_a',         100.0,      100.0,      100.0,       600.0,     300.0,      100.0,      1300.0),
+                ('Total Aged Payable',      150.0,      150.0,      150.0,      900.0,      450.0,      150.0,      1950.0),
+            ],
+            options,
+        )
+
+        # Sort by Not Due On decreasing
+        options['order_column'] = {
+            'expression_label': 'period0',
+            'direction': 'DESC',
+        }
+
+        self.assertLinesValues(
+            # pylint: disable=C0326
+            self.report.sort_lines(report_lines, options),
+            #   Name                 Not Due On      1 - 30     31 - 60     61 - 90    91 - 120       Older         Total
+            [   0,                            3,          4,          5,          6,          7,          8,           9],
+            [
+                ('Aged Payable',          150.0,      150.0,      150.0,      900.0,      450.0,      150.0,      1950.0),
+                ('partner_a',             100.0,      100.0,      100.0,      600.0,      300.0,      100.0,      1300.0),
+                ('BILL/2016/10/0001',     100.0,        0.0,        0.0,        0.0,        0.0,        0.0,          ''),
+                ('BILL/2016/11/0001',       0.0,        0.0,        0.0,      500.0,        0.0,        0.0,          ''),
+                ('BILL/2016/10/0001',       0.0,        0.0,        0.0,        0.0,      200.0,        0.0,          ''),
+                ('BILL/2016/10/0001',       0.0,      100.0,        0.0,        0.0,        0.0,        0.0,          ''),
+                ('BILL/2016/10/0001',       0.0,        0.0,      100.0,        0.0,        0.0,        0.0,          ''),
+                ('BILL/2016/10/0001',       0.0,        0.0,        0.0,      100.0,        0.0,        0.0,          ''),
+                ('BILL/2016/10/0001',       0.0,        0.0,        0.0,        0.0,      100.0,        0.0,          ''),
+                ('BILL/2016/10/0001',       0.0,        0.0,        0.0,        0.0,        0.0,      100.0,          ''),
+                ('Total partner_a',       100.0,      100.0,      100.0,       600.0,     300.0,      100.0,      1300.0),
+                ('partner_b',              50.0,       50.0,       50.0,      300.0,      150.0,       50.0,       650.0),
+                ('BILL/2016/10/0001',      50.0,        0.0,        0.0,        0.0,        0.0,        0.0,          ''),
+                ('BILL/2016/11/0001',       0.0,        0.0,        0.0,      250.0,        0.0,        0.0,          ''),
+                ('BILL/2016/10/0001',       0.0,        0.0,        0.0,        0.0,      100.0,        0.0,          ''),
+                ('BILL/2016/10/0001',       0.0,       50.0,        0.0,        0.0,        0.0,        0.0,          ''),
+                ('BILL/2016/10/0001',       0.0,        0.0,       50.0,        0.0,        0.0,        0.0,          ''),
+                ('BILL/2016/10/0001',       0.0,        0.0,        0.0,       50.0,        0.0,        0.0,          ''),
+                ('BILL/2016/10/0001',       0.0,        0.0,        0.0,        0.0,       50.0,        0.0,          ''),
+                ('BILL/2016/10/0001',       0.0,        0.0,        0.0,        0.0,        0.0,       50.0,          ''),
+                ('Total partner_b',        50.0,       50.0,       50.0,      300.0,      150.0,       50.0,       650.0),
+                ('Total Aged Payable',    150.0,      150.0,      150.0,      900.0,      450.0,      150.0,      1950.0),
+            ],
+            options,
+        )
+
+    def test_aged_payable_zero_balanced_without_reconciliation(self):
+        options = self._generate_options(self.report, '2010-01-01', '2010-01-01', default_options={'unfold_all': True})
+        invoice = self.env['account.move'].create({
+            'move_type': 'in_invoice',
+            'partner_id': self.partner_a.id,
+            'invoice_date': '2010-01-01',
+            'date': '2010-01-01',
+            'invoice_date_due': '2010-01-01',
+            'payment_reference': 'I',
+            'invoice_line_ids': [Command.create({
+                'name': 'test invoice',
+                'price_unit': 100,
+                'tax_ids': [],
+            })]
+        })
+        invoice.action_post()
+
+        refund = self.env['account.move'].create({
+            'move_type': 'in_refund',
+            'partner_id': self.partner_a.id,
+            'invoice_date': '2010-01-01',
+            'date': '2010-01-01',
+            'invoice_date_due': '2010-01-01',
+            'payment_reference': 'R',
+            'invoice_line_ids': [Command.create({
+                'name': 'test refund',
+                'price_unit': 100,
+                'tax_ids': [],
+            })]
+        })
+        refund.action_post()
+
+        self.assertLinesValues(
+            # pylint: disable=C0326
+            self.report._get_lines(options),
+            #   Name                  Not Due On      1 - 30     31 - 60     61 - 90    91 - 120       Older        Total
+            [   0,                             3,          4,          5,          6,          7,          8,           9],
+            [
+                ('Aged Payable',             0.0,        0.0,        0.0,        0.0,        0.0,        0.0,         0.0),
+                ('partner_a',                0.0,        0.0,        0.0,        0.0,        0.0,        0.0,         0.0),
+                (f"{refund.name} R",      -100.0,        0.0,        0.0,        0.0,        0.0,        0.0,          ''),
+                (f"{invoice.name} I",      100.0,        0.0,        0.0,        0.0,        0.0,        0.0,          ''),
+                ('Total partner_a',          0.0,        0.0,        0.0,        0.0,        0.0,        0.0,         0.0),
+                ('Total Aged Payable',       0.0,        0.0,        0.0,        0.0,        0.0,        0.0,         0.0),
+            ],
+            options,
+        )
+
+        # It should still work if both  invoice and refund are partially reconciled with the same amount
+        self.env['account.payment.register'].with_context(active_ids=invoice.ids, active_model='account.move').create({
+            'amount': 42,
+            'payment_date': '2010-01-01',
+            'payment_method_line_id': self.inbound_payment_method_line.id,
+        })._create_payments()
+
+        self.env['account.payment.register'].with_context(active_ids=refund.ids, active_model='account.move').create({
+            'amount': 42,
+            'payment_date': '2010-01-01',
+            'payment_method_line_id': self.inbound_payment_method_line.id,
+        })._create_payments()
+
+        self.assertLinesValues(
+            # pylint: disable=C0326
+            self.report._get_lines(options),
+            #   Name                 Not Due On     1 - 30     31 - 60     61 - 90    91 - 120       Older        Total
+            [   0,                           3,          4,          5,          6,          7,          8,           9],
+            [
+                ('Aged Payable',           0.0,        0.0,        0.0,        0.0,        0.0,        0.0,         0.0),
+                ('partner_a',              0.0,        0.0,        0.0,        0.0,        0.0,        0.0,         0.0),
+                (f"{refund.name} R",     -58.0,        0.0,        0.0,        0.0,        0.0,        0.0,          ''),
+                (f"{invoice.name} I",     58.0,        0.0,        0.0,        0.0,        0.0,        0.0,          ''),
+                ('Total partner_a',        0.0,        0.0,        0.0,        0.0,        0.0,        0.0,         0.0),
+                ('Total Aged Payable',     0.0,        0.0,        0.0,        0.0,        0.0,        0.0,         0.0),
+            ],
+            options,
+        )
+
+        # It should still work if both  invoice and refund are fully reconciled in the future
+        self.env['account.payment.register'].with_context(active_ids=invoice.ids, active_model='account.move').create({
+            'amount': 58,
+            'payment_date': '2020-01-01',
+            'payment_method_line_id': self.inbound_payment_method_line.id,
+        })._create_payments()
+
+        self.env['account.payment.register'].with_context(active_ids=refund.ids, active_model='account.move').create({
+            'amount': 58,
+            'payment_date': '2020-01-01',
+            'payment_method_line_id': self.inbound_payment_method_line.id,
+        })._create_payments()
+
+        self.assertLinesValues(
+            # pylint: disable=C0326
+            self.report._get_lines(options),
+            #   Name                  Not Due On      1 - 30     31 - 60     61 - 90    91 - 120       Older        Total
+            [   0,                             3,          4,          5,          6,          7,          8,           9],
+            [
+                ('Aged Payable',             0.0,        0.0,        0.0,        0.0,        0.0,        0.0,         0.0),
+                ('partner_a',                0.0,        0.0,        0.0,        0.0,        0.0,        0.0,         0.0),
+                (f"{refund.name} R",       -58.0,        0.0,        0.0,        0.0,        0.0,        0.0,          ''),
+                (f"{invoice.name} I",       58.0,        0.0,        0.0,        0.0,        0.0,        0.0,          ''),
+                ('Total partner_a',          0.0,        0.0,        0.0,        0.0,        0.0,        0.0,         0.0),
+                ('Total Aged Payable',       0.0,        0.0,        0.0,        0.0,        0.0,        0.0,         0.0),
+            ],
+            options,
+        )
+
+    def test_aged_payable_prefix_groups(self):
+        partner_names = [
+            'A',
+            'A partner',
+            'A nice partner',
+            'A new partner',
+            'An original partner',
+            'Another partner',
+            'Anonymous partner',
+            'Annoyed partner',
+            'Brave partner',
+        ]
+
+        test_date = '2010-12-13'
+        invoices_map = {}
+        for name in partner_names:
+            partner = self.env['res.partner'].create({'name': name})
+            invoice = self.init_invoice('in_invoice', partner=partner, invoice_date=test_date, amounts=[42.0], taxes=[], post=True)
+            invoices_map[name] = invoice.name
+
+        # Without prefix groups
+        options = self._generate_options(self.report, test_date, test_date)
+
+        self.assertLinesValues(
+            self.report._get_lines(options),
+            #   Name                Not Due On      1 - 30     31 - 60     61 - 90    91 - 120       Older        Total
+            [   0,                           3,          4,          5,          6,          7,          8,           9],
+            [
+                ('Aged Payable',         378.0,        0.0,        0.0,        0.0,        0.0,        0.0,       378.0),
+                ('A',                     42.0,        0.0,        0.0,        0.0,        0.0,        0.0,        42.0),
+                ('A new partner',         42.0,        0.0,        0.0,        0.0,        0.0,        0.0,        42.0),
+                ('A nice partner',        42.0,        0.0,        0.0,        0.0,        0.0,        0.0,        42.0),
+                ('A partner',             42.0,        0.0,        0.0,        0.0,        0.0,        0.0,        42.0),
+                ('An original partner',   42.0,        0.0,        0.0,        0.0,        0.0,        0.0,        42.0),
+                ('Annoyed partner',       42.0,        0.0,        0.0,        0.0,        0.0,        0.0,        42.0),
+                ('Anonymous partner',     42.0,        0.0,        0.0,        0.0,        0.0,        0.0,        42.0),
+                ('Another partner',       42.0,        0.0,        0.0,        0.0,        0.0,        0.0,        42.0),
+                ('Brave partner',         42.0,        0.0,        0.0,        0.0,        0.0,        0.0,        42.0),
+                ('Total Aged Payable',   378.0,        0.0,        0.0,        0.0,        0.0,        0.0,       378.0),
+            ],
+            options,
+        )
+
+        # With prefix groups
+        self.report.prefix_groups_threshold = 3
+        options = self._generate_options(self.report, test_date, test_date, default_options={'unfold_all': True})
+
+        self.assertLinesValues(
+            self.report._get_lines(options),
+            #   Name                            Not Due On    1 - 30     31 - 60     61 - 90    91 - 120       Older        Total
+            [   0,                                       3,        4,          5,          6,          7,          8,           9],
+            [
+                ('Aged Payable',                     378.0,      0.0,        0.0,        0.0,        0.0,        0.0,       378.0),
+                ('A (8 lines)',                      336.0,      0.0,        0.0,        0.0,        0.0,        0.0,       336.0),
+                ('A',                                 42.0,      0.0,        0.0,        0.0,        0.0,        0.0,        42.0),
+                (invoices_map['A'],                   42.0,      0.0,        0.0,        0.0,        0.0,        0.0,          ''),
+                ('Total A',                           42.0,      0.0,        0.0,        0.0,        0.0,        0.0,        42.0),
+                ('A[ ] (3 lines)',                   126.0,      0.0,        0.0,        0.0,        0.0,        0.0,       126.0),
+                ('A N (2 lines)',                     84.0,      0.0,        0.0,        0.0,        0.0,        0.0,        84.0),
+                ('A new partner',                     42.0,      0.0,        0.0,        0.0,        0.0,        0.0,        42.0),
+                (invoices_map['A new partner'],       42.0,      0.0,        0.0,        0.0,        0.0,        0.0,          ''),
+                ('Total A new partner',               42.0,      0.0,        0.0,        0.0,        0.0,        0.0,        42.0),
+                ('A nice partner',                    42.0,      0.0,        0.0,        0.0,        0.0,        0.0,        42.0),
+                (invoices_map['A nice partner'],      42.0,      0.0,        0.0,        0.0,        0.0,        0.0,          ''),
+                ('Total A nice partner',              42.0,      0.0,        0.0,        0.0,        0.0,        0.0,        42.0),
+                ('Total A N (2 lines)',               84.0,      0.0,        0.0,        0.0,        0.0,        0.0,        84.0),
+                ('A P (1 line)',                      42.0,      0.0,        0.0,        0.0,        0.0,        0.0,        42.0),
+                ('A partner',                         42.0,      0.0,        0.0,        0.0,        0.0,        0.0,        42.0),
+                (invoices_map['A partner'],           42.0,      0.0,        0.0,        0.0,        0.0,        0.0,          ''),
+                ('Total A partner',                   42.0,      0.0,        0.0,        0.0,        0.0,        0.0,        42.0),
+                ('Total A P (1 line)',                42.0,      0.0,        0.0,        0.0,        0.0,        0.0,        42.0),
+                ('Total A[ ] (3 lines)',             126.0,      0.0,        0.0,        0.0,        0.0,        0.0,       126.0),
+                ('AN (4 lines)',                     168.0,      0.0,        0.0,        0.0,        0.0,        0.0,       168.0),
+                ('AN[ ] (1 line)',                    42.0,      0.0,        0.0,        0.0,        0.0,        0.0,        42.0),
+                ('An original partner',               42.0,      0.0,        0.0,        0.0,        0.0,        0.0,        42.0),
+                (invoices_map['An original partner'], 42.0,      0.0,        0.0,        0.0,        0.0,        0.0,          ''),
+                ('Total An original partner',         42.0,      0.0,        0.0,        0.0,        0.0,        0.0,        42.0),
+                ('Total AN[ ] (1 line)',              42.0,      0.0,        0.0,        0.0,        0.0,        0.0,        42.0),
+                ('ANN (1 line)',                      42.0,      0.0,        0.0,        0.0,        0.0,        0.0,        42.0),
+                ('Annoyed partner',                   42.0,      0.0,        0.0,        0.0,        0.0,        0.0,        42.0),
+                (invoices_map['Annoyed partner'],     42.0,      0.0,        0.0,        0.0,        0.0,        0.0,          ''),
+                ('Total Annoyed partner',             42.0,      0.0,        0.0,        0.0,        0.0,        0.0,        42.0),
+                ('Total ANN (1 line)',                42.0,      0.0,        0.0,        0.0,        0.0,        0.0,        42.0),
+                ('ANO (2 lines)',                     84.0,      0.0,        0.0,        0.0,        0.0,        0.0,        84.0),
+                ('Anonymous partner',                 42.0,      0.0,        0.0,        0.0,        0.0,        0.0,        42.0),
+                (invoices_map['Anonymous partner'],   42.0,      0.0,        0.0,        0.0,        0.0,        0.0,          ''),
+                ('Total Anonymous partner',           42.0,      0.0,        0.0,        0.0,        0.0,        0.0,        42.0),
+                ('Another partner',                   42.0,      0.0,        0.0,        0.0,        0.0,        0.0,        42.0),
+                (invoices_map['Another partner'],     42.0,      0.0,        0.0,        0.0,        0.0,        0.0,          ''),
+                ('Total Another partner',             42.0,      0.0,        0.0,        0.0,        0.0,        0.0,        42.0),
+                ('Total ANO (2 lines)',               84.0,      0.0,        0.0,        0.0,        0.0,        0.0,        84.0),
+                ('Total AN (4 lines)',               168.0,      0.0,        0.0,        0.0,        0.0,        0.0,       168.0),
+                ('Total A (8 lines)',                336.0,      0.0,        0.0,        0.0,        0.0,        0.0,       336.0),
+                ('B (1 line)',                        42.0,      0.0,        0.0,        0.0,        0.0,        0.0,        42.0),
+                ('Brave partner',                     42.0,      0.0,        0.0,        0.0,        0.0,        0.0,        42.0),
+                (invoices_map['Brave partner'],       42.0,      0.0,        0.0,        0.0,        0.0,        0.0,          ''),
+                ('Total Brave partner',               42.0,      0.0,        0.0,        0.0,        0.0,        0.0,        42.0),
+                ('Total B (1 line)',                  42.0,      0.0,        0.0,        0.0,        0.0,        0.0,        42.0),
+                ('Total Aged Payable',               378.0,      0.0,        0.0,        0.0,        0.0,        0.0,       378.0),
+            ],
+            options,
+        )
+
+    def test_aged_payable_aging_interval(self):
+        options = self._generate_options(self.report, '2017-02-01', '2017-02-01')
+        initial_report_lines = self.report._get_lines(options)
+
+        # With default interval of 30
+        self.assertLinesValues(
+            self.report.sort_lines(initial_report_lines, options),
+            #   Name               Not Due On      1 - 30     31 - 60     61 - 90    91 - 120       Older        Total
+            [   0,                          3,          4,          5,          6,          7,          8,           9],
+            [
+                ('Aged Payable',        150.0,      150.0,      150.0,      900.0,      450.0,      150.0,      1950.0),
+                ('partner_a',           100.0,      100.0,      100.0,      600.0,      300.0,      100.0,      1300.0),
+                ('partner_b',            50.0,       50.0,       50.0,      300.0,      150.0,       50.0,       650.0),
+                ('Total Aged Payable',  150.0,      150.0,      150.0,      900.0,      450.0,      150.0,      1950.0),
+            ],
+            options
+        )
+
+        options['aging_interval'] = 60
+        report_lines = self.report._get_lines(options)
+
+        # With interval of 60
+        self.assertLinesValues(
+            self.report.sort_lines(report_lines, options),
+            #   Name               Not Due On      1 - 60     61 - 120   121 - 180   181 - 240       Older        Total
+            [   0,                          3,          4,           5,          6,          7,          8,           9],
+            [
+                ('Aged Payable',        150.0,      300.0,      1350.0,        0.0,        0.0,      150.0,      1950.0),
+                ('partner_a',           100.0,      200.0,       900.0,        0.0,        0.0,      100.0,      1300.0),
+                ('partner_b',            50.0,      100.0,       450.0,        0.0,        0.0,       50.0,       650.0),
+                ('Total Aged Payable',  150.0,      300.0,      1350.0,        0.0,        0.0,      150.0,      1950.0),
+            ],
+            options
+        )
+
+    def test_storno_refund_account_payable(self):
+        self.env.company.account_storno = True
+
+        great_partner = self.env['res.partner'].create({'name': 'Great Partner'})
+        refund = self.env['account.move'].create({
+            'move_type': 'in_refund',
+            'partner_id': great_partner.id,
+            'invoice_date': '2010-02-01',
+            'date': '2010-02-01',
+            'invoice_date_due': '2010-02-01',
+            'invoice_line_ids': [Command.create({
+                'name': 'Great Product',
+                'price_unit': 100,
+                'tax_ids': [],
+            })]
+        })
+        refund.action_post()
+        self.env['account.payment.register'].with_context(active_model='account.move', active_ids=refund.ids).create({
+            'payment_date': '2010-02-01',
+            'amount': 100.0,
+        })._create_payments()
+
+        options = self._generate_options(self.report, '2010-02-01', '2010-02-01')
+        self.env.company.totals_below_sections = False
+
+        self.assertLinesValues(
+            # pylint: disable=C0326
+            self.report._get_lines(options),
+            #   Name               Due Date     Not Due On      1 - 30     31 - 60     61 - 90    91 - 120       Older        Total
+            [   0,                       1,             3,          4,          5,          6,          7,          8,           9],
+            [
+                ('Aged Payable',        '',           0.0,        0.0,        0.0,        0.0,        0.0,        0.0,         0.0),
+            ],
+            options,
+        )
diff --git a/dev_odex30_accounting/odex30_account_reports/tests/test_aged_receivable_report.py b/dev_odex30_accounting/odex30_account_reports/tests/test_aged_receivable_report.py
new file mode 100644
index 0000000..ad14c7c
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_reports/tests/test_aged_receivable_report.py
@@ -0,0 +1,835 @@
+# -*- coding: utf-8 -*-
+# pylint: disable=C0326
+from .common import TestAccountReportsCommon
+
+from odoo import fields, Command
+from odoo.tests import tagged
+
+
+@tagged('post_install', '-at_install')
+class TestAgedReceivableReport(TestAccountReportsCommon):
+
+    @classmethod
+    def setUpClass(cls):
+        super().setUpClass()
+
+        cls.partner_category_a = cls.env['res.partner.category'].create({'name': 'partner_categ_a'})
+        cls.partner_category_b = cls.env['res.partner.category'].create({'name': 'partner_categ_b'})
+
+        cls.partner_a.write({'category_id': [Command.set([cls.partner_category_a.id, cls.partner_category_b.id])]})
+        cls.partner_b.write({'category_id': [Command.set([cls.partner_category_a.id])]})
+
+        receivable_1 = cls.company_data['default_account_receivable']
+        receivable_2 = cls.copy_account(cls.company_data['default_account_receivable'])
+        receivable_3 = cls.copy_account(cls.company_data['default_account_receivable'])
+        receivable_4 = cls.company_data_2['default_account_receivable']
+        receivable_5 = cls.copy_account(cls.company_data_2['default_account_receivable'])
+        receivable_6 = cls.copy_account(cls.company_data_2['default_account_receivable'])
+        misc_1 = cls.company_data['default_account_revenue']
+        misc_2 = cls.company_data_2['default_account_revenue']
+
+        # Test will use the following dates:
+        # As of                  2017-02-01
+        # 1 - 30:   2017-01-31 - 2017-01-02
+        # 31 - 60:  2017-01-01 - 2016-12-03
+        # 61 - 90:  2016-12-02 - 2016-11-03
+        # 91 - 120: 2016-11-02 - 2016-10-04
+        # Older:    2016-10-03
+
+        # ==== Journal entries in company_1 for partner_a ====
+
+        move_1 = cls.env['account.move'].create({
+            'move_type': 'entry',
+            'date': fields.Date.from_string('2016-11-03'),
+            'invoice_date': fields.Date.from_string('2016-11-03'),
+            'journal_id': cls.company_data['default_journal_sale'].id,
+            'line_ids': [
+                # 1000.0 in 61 - 90.
+                Command.create({'debit': 1000.0,    'credit': 0.0,      'date_maturity': False,         'account_id': receivable_1.id,      'partner_id': cls.partner_a.id}),
+                # -800.0 in 31 - 60
+                Command.create({'debit': 0.0,       'credit': 800.0,    'date_maturity': '2017-01-01',  'account_id': receivable_2.id,      'partner_id': cls.partner_a.id}),
+                # Ignored line.
+                Command.create({'debit': 0.0,       'credit': 200.0,    'date_maturity': False,         'account_id': misc_1.id,            'partner_id': cls.partner_a.id}),
+            ],
+        })
+
+        move_2 = cls.env['account.move'].create({
+            'move_type': 'entry',
+            'date': fields.Date.from_string('2016-10-05'),
+            'invoice_date': fields.Date.from_string('2016-10-05'),
+            'journal_id': cls.company_data['default_journal_sale'].id,
+            'line_ids': [
+                # -200.0 in 61 - 90
+                Command.create({'debit': 0.0,       'credit': 200.0,    'date_maturity': '2016-12-02',  'account_id': receivable_1.id,      'partner_id': cls.partner_a.id}),
+                # -300.0 in 31 - 60
+                Command.create({'debit': 0.0,       'credit': 300.0,    'date_maturity': '2016-12-03',  'account_id': receivable_1.id,      'partner_id': cls.partner_a.id}),
+                # 1000.0 in 91 - 120
+                Command.create({'debit': 1000.0,    'credit': 0.0,      'date_maturity': False,         'account_id': receivable_2.id,      'partner_id': cls.partner_a.id}),
+                # 100.0 in all dates
+                Command.create({'debit': 100.0,     'credit': 0.0,      'date_maturity': '2017-02-01',  'account_id': receivable_3.id,      'partner_id': cls.partner_a.id}),
+                Command.create({'debit': 100.0,     'credit': 0.0,      'date_maturity': '2017-01-02',  'account_id': receivable_3.id,      'partner_id': cls.partner_a.id}),
+                Command.create({'debit': 100.0,     'credit': 0.0,      'date_maturity': '2016-12-03',  'account_id': receivable_3.id,      'partner_id': cls.partner_a.id}),
+                Command.create({'debit': 100.0,     'credit': 0.0,      'date_maturity': '2016-11-03',  'account_id': receivable_3.id,      'partner_id': cls.partner_a.id}),
+                Command.create({'debit': 100.0,     'credit': 0.0,      'date_maturity': '2016-10-04',  'account_id': receivable_3.id,      'partner_id': cls.partner_a.id}),
+                Command.create({'debit': 100.0,     'credit': 0.0,      'date_maturity': '2016-01-01',  'account_id': receivable_3.id,      'partner_id': cls.partner_a.id}),
+                # Ignored line.
+                Command.create({'debit': 0.0,       'credit': 1100.0,   'date_maturity': '2016-10-05',  'account_id': misc_1.id,            'partner_id': cls.partner_a.id}),
+            ],
+        })
+        (move_1 + move_2).action_post()
+        (move_1 + move_2).line_ids.filtered(lambda line: line.account_id == receivable_1).reconcile()
+        (move_1 + move_2).line_ids.filtered(lambda line: line.account_id == receivable_2).reconcile()
+
+        # ==== Journal entries in company_2 for partner_b ====
+
+        move_3 = cls.env['account.move'].create({
+            'move_type': 'entry',
+            'date': fields.Date.from_string('2016-11-03'),
+            'invoice_date': fields.Date.from_string('2016-11-03'),
+            'journal_id': cls.company_data_2['default_journal_sale'].id,
+            'line_ids': [
+                # 1000.0 in 61 - 90.
+                Command.create({'debit': 1000.0,    'credit': 0.0,      'date_maturity': False,         'account_id': receivable_4.id,      'partner_id': cls.partner_b.id}),
+                # -200.0 in 31 - 60
+                Command.create({'debit': 0.0,       'credit': 800.0,    'date_maturity': '2017-01-01',  'account_id': receivable_5.id,      'partner_id': cls.partner_b.id}),
+                # Ignored line.
+                Command.create({'debit': 0.0,       'credit': 200.0,    'date_maturity': False,         'account_id': misc_2.id,            'partner_id': cls.partner_b.id}),
+            ],
+        })
+
+        move_4 = cls.env['account.move'].create({
+            'move_type': 'entry',
+            'date': fields.Date.from_string('2016-10-05'),
+            'invoice_date': fields.Date.from_string('2016-10-05'),
+            'journal_id': cls.company_data_2['default_journal_sale'].id,
+            'line_ids': [
+                # -200.0 in 61 - 90
+                Command.create({'debit': 0.0,       'credit': 200.0,    'date_maturity': '2016-12-02',  'account_id': receivable_4.id,      'partner_id': cls.partner_b.id}),
+                # -300.0 in 31 - 60
+                Command.create({'debit': 0.0,       'credit': 300.0,    'date_maturity': '2016-12-03',  'account_id': receivable_4.id,      'partner_id': cls.partner_b.id}),
+                # 1000.0 in 91 - 120
+                Command.create({'debit': 1000.0,    'credit': 0.0,      'date_maturity': False,         'account_id': receivable_5.id,      'partner_id': cls.partner_b.id}),
+                # 100.0 in all dates
+                Command.create({'debit': 100.0,     'credit': 0.0,      'date_maturity': '2017-02-01',  'account_id': receivable_6.id,      'partner_id': cls.partner_b.id}),
+                Command.create({'debit': 100.0,     'credit': 0.0,      'date_maturity': '2017-01-02',  'account_id': receivable_6.id,      'partner_id': cls.partner_b.id}),
+                Command.create({'debit': 100.0,     'credit': 0.0,      'date_maturity': '2016-12-03',  'account_id': receivable_6.id,      'partner_id': cls.partner_b.id}),
+                Command.create({'debit': 100.0,     'credit': 0.0,      'date_maturity': '2016-11-03',  'account_id': receivable_6.id,      'partner_id': cls.partner_b.id}),
+                Command.create({'debit': 100.0,     'credit': 0.0,      'date_maturity': '2016-10-04',  'account_id': receivable_6.id,      'partner_id': cls.partner_b.id}),
+                Command.create({'debit': 100.0,     'credit': 0.0,      'date_maturity': '2016-01-01',  'account_id': receivable_6.id,      'partner_id': cls.partner_b.id}),
+                # Ignored line.
+                Command.create({'debit': 0.0,       'credit': 1100.0,   'date_maturity': False,         'account_id': misc_2.id,            'partner_id': cls.partner_b.id}),
+            ],
+        })
+        (move_3 + move_4).action_post()
+        (move_3 + move_4).line_ids.filtered(lambda line: line.account_id == receivable_4).reconcile()
+        (move_3 + move_4).line_ids.filtered(lambda line: line.account_id == receivable_5).reconcile()
+        cls.env['res.currency'].search([('name', '!=', 'USD')]).with_context(force_deactivate=True).active = False
+        cls.env.companies = cls.company_data['company'] + cls.company_data_2['company']
+        cls.report = cls.env.ref('odex30_account_reports.aged_receivable_report')
+        cls.parent_line_id = cls._get_basic_line_dict_id_from_report_line_ref("odex30_account_reports.aged_receivable_line")
+
+    def test_aged_receivable_unfold_1_whole_report(self):
+        """ Test unfolding a line when rendering the whole report. """
+        options = self._generate_options(self.report, fields.Date.from_string('2017-02-01'), fields.Date.from_string('2017-02-01'))
+        partner_a_line_id = self.report._get_generic_line_id('res.partner', self.partner_a.id, parent_line_id=self.parent_line_id, markup={'groupby': 'partner_id'})
+        options['unfolded_lines'] = [partner_a_line_id]
+
+        # Sort by Invoice Date
+        options['order_column'] = {
+            'expression_label': 'invoice_date',
+            'direction': 'ASC',
+        }
+
+        report_lines = self.report._get_lines(options)
+
+        sorted_report_lines = self.report.sort_lines(report_lines, options)
+        self.assertLinesValues(
+            # pylint: disable=C0326
+            sorted_report_lines,
+            #   Name                    Not Due On      1 - 30     31 - 60     61 - 90    91 - 120      Older         Total
+            [   0,                               3,          4,          5,          6,          7,         8,            9],
+            [
+                ('Aged Receivable',          150.0,      150.0,      150.0,      900.0,      450.0,      150.0,      1950.0),
+                ('partner_a',                100.0,      100.0,      100.0,      600.0,      300.0,      100.0,      1300.0),
+                ('INV/2016/00001',             0.0,        0.0,        0.0,        0.0,      200.0,        0.0,          ''),
+                ('INV/2016/00001',           100.0,        0.0,        0.0,        0.0,        0.0,        0.0,          ''),
+                ('INV/2016/00001',             0.0,      100.0,        0.0,        0.0,        0.0,        0.0,          ''),
+                ('INV/2016/00001',             0.0,        0.0,      100.0,        0.0,        0.0,        0.0,          ''),
+                ('INV/2016/00001',             0.0,        0.0,        0.0,      100.0,        0.0,        0.0,          ''),
+                ('INV/2016/00001',             0.0,        0.0,        0.0,        0.0,      100.0,        0.0,          ''),
+                ('INV/2016/00001',             0.0,        0.0,        0.0,        0.0,        0.0,      100.0,          ''),
+                ('INV/2016/00002',             0.0,        0.0,        0.0,      500.0,        0.0,        0.0,          ''),
+                ('Total partner_a',          100.0,      100.0,      100.0,       600.0,     300.0,      100.0,      1300.0),
+                ('partner_b',                 50.0,      50.0,        50.0,       300.0,     150.0,       50.0,       650.0),
+                ('Total Aged Receivable',    150.0,      150.0,      150.0,      900.0,      450.0,      150.0,      1950.0),
+            ],
+            options,
+        )
+
+        # Sort 61 - 90 decreasing.
+        options['order_column'] = {
+            'expression_label': 'period3',
+            'direction': 'DESC',
+        }
+
+        self.assertLinesValues(
+            # pylint: disable=C0326
+            self.report.sort_lines(sorted_report_lines, options),
+            #   Name                    Not Due On      1 - 30     31 - 60     61 - 90    91 - 120       Older       Total
+            [   0,                               3,          4,          5,          6,          7,          8,          9],
+            [
+                ('Aged Receivable',          150.0,      150.0,      150.0,      900.0,      450.0,      150.0,      1950.0),
+                ('partner_a',                100.0,      100.0,      100.0,      600.0,      300.0,      100.0,      1300.0),
+                ('INV/2016/00002',             0.0,        0.0,        0.0,      500.0,        0.0,        0.0,          ''),
+                ('INV/2016/00001',             0.0,        0.0,        0.0,      100.0,        0.0,        0.0,          ''),
+                ('INV/2016/00001',             0.0,        0.0,        0.0,        0.0,      200.0,        0.0,          ''),
+                ('INV/2016/00001',           100.0,        0.0,        0.0,        0.0,        0.0,        0.0,          ''),
+                ('INV/2016/00001',             0.0,      100.0,        0.0,        0.0,        0.0,        0.0,          ''),
+                ('INV/2016/00001',             0.0,        0.0,      100.0,        0.0,        0.0,        0.0,          ''),
+                ('INV/2016/00001',             0.0,        0.0,        0.0,        0.0,      100.0,        0.0,          ''),
+                ('INV/2016/00001',             0.0,        0.0,        0.0,        0.0,        0.0,      100.0,          ''),
+                ('Total partner_a',          100.0,      100.0,      100.0,      600.0,      300.0,      100.0,      1300.0),
+                ('partner_b',                 50.0,       50.0,       50.0,      300.0,      150.0,       50.0,       650.0),
+                ('Total Aged Receivable',    150.0,      150.0,      150.0,      900.0,      450.0,      150.0,      1950.0),
+            ],
+            options,
+        )
+
+        # Sort 61 - 90 increasing.
+        options['order_column'] = {
+            'expression_label': 'period3',
+            'direction': 'ASC',
+        }
+
+        self.assertLinesValues(
+            # pylint: disable=C0326
+            self.report.sort_lines(sorted_report_lines, options),
+            #   Name                    Not Due On      1 - 30     31 - 60      61 - 90    91 - 120       Older       Total
+            [   0,                               3,          4,          5,           6,          7,          8,          9],
+            [
+                ('Aged Receivable',          150.0,      150.0,      150.0,       900.0,      450.0,      150.0,      1950.0),
+                ('partner_b',                 50.0,       50.0,       50.0,       300.0,      150.0,       50.0,       650.0),
+                ('partner_a',                100.0,      100.0,      100.0,       600.0,      300.0,      100.0,      1300.0),
+                ('INV/2016/00001',             0.0,        0.0,        0.0,         0.0,      200.0,        0.0,          ''),
+                ('INV/2016/00001',           100.0,        0.0,        0.0,         0.0,        0.0,        0.0,          ''),
+                ('INV/2016/00001',             0.0,      100.0,        0.0,         0.0,        0.0,        0.0,          ''),
+                ('INV/2016/00001',             0.0,        0.0,      100.0,         0.0,        0.0,        0.0,          ''),
+                ('INV/2016/00001',             0.0,        0.0,        0.0,         0.0,      100.0,        0.0,          ''),
+                ('INV/2016/00001',             0.0,        0.0,        0.0,         0.0,        0.0,      100.0,          ''),
+                ('INV/2016/00001',             0.0,        0.0,        0.0,       100.0,        0.0,        0.0,          ''),
+                ('INV/2016/00002',             0.0,        0.0,        0.0,       500.0,        0.0,        0.0,          ''),
+                ('Total partner_a',          100.0,      100.0,      100.0,       600.0,      300.0,      100.0,      1300.0),
+                ('Total Aged Receivable',    150.0,      150.0,      150.0,       900.0,      450.0,      150.0,      1950.0),
+            ],
+            options,
+        )
+
+    def test_aged_receivable_unfold_all(self):
+        default_options = {
+            'unfold_all': True,
+            'order_column': {
+                'expression_label': 'invoice_date',
+                'direction': 'ASC',
+            }
+        }
+        options = self._generate_options(self.report, '2017-02-01', '2017-02-01', default_options=default_options)
+
+        report_lines = self.report._get_lines(options)
+
+        self.assertLinesValues(
+            # pylint: disable=C0326
+            self.report.sort_lines(report_lines, options),
+            #   Name                   Not Due On      1 - 30     31 - 60     61 - 90    91 - 120       Older        Total
+            [   0,                              3,          4,          5,          6,          7,          8,           9],
+            [
+                ('Aged Receivable',         150.0,      150.0,      150.0,       900.0,     450.0,      150.0,      1950.0),
+                ('partner_a',               100.0,      100.0,      100.0,       600.0,     300.0,      100.0,      1300.0),
+                ('INV/2016/00001',            0.0,        0.0,        0.0,        0.0,      200.0,        0.0,          ''),
+                ('INV/2016/00001',          100.0,        0.0,        0.0,        0.0,        0.0,        0.0,          ''),
+                ('INV/2016/00001',            0.0,      100.0,        0.0,        0.0,        0.0,        0.0,          ''),
+                ('INV/2016/00001',            0.0,        0.0,      100.0,        0.0,        0.0,        0.0,          ''),
+                ('INV/2016/00001',            0.0,        0.0,        0.0,      100.0,        0.0,        0.0,          ''),
+                ('INV/2016/00001',            0.0,        0.0,        0.0,        0.0,      100.0,        0.0,          ''),
+                ('INV/2016/00001',            0.0,        0.0,        0.0,        0.0,        0.0,      100.0,          ''),
+                ('INV/2016/00002',            0.0,        0.0,        0.0,      500.0,        0.0,        0.0,          ''),
+                ('Total partner_a',         100.0,      100.0,      100.0,       600.0,     300.0,      100.0,      1300.0),
+                ('partner_b',                50.0,       50.0,       50.0,       300.0,     150.0,       50.0,       650.0),
+                ('INV/2016/00001',            0.0,        0.0,        0.0,         0.0,     100.0,        0.0,          ''),
+                ('INV/2016/00001',           50.0,        0.0,        0.0,         0.0,       0.0,        0.0,          ''),
+                ('INV/2016/00001',            0.0,       50.0,        0.0,         0.0,       0.0,        0.0,          ''),
+                ('INV/2016/00001',            0.0,        0.0,       50.0,         0.0,       0.0,        0.0,          ''),
+                ('INV/2016/00001',            0.0,        0.0,        0.0,        50.0,       0.0,        0.0,          ''),
+                ('INV/2016/00001',            0.0,        0.0,        0.0,         0.0,      50.0,        0.0,          ''),
+                ('INV/2016/00001',            0.0,        0.0,        0.0,         0.0,       0.0,       50.0,          ''),
+                ('INV/2016/00002',            0.0,        0.0,        0.0,       250.0,       0.0,        0.0,          ''),
+                ('Total partner_b',          50.0,       50.0,       50.0,       300.0,     150.0,       50.0,       650.0),
+                ('Total Aged Receivable',   150.0,      150.0,      150.0,      900.0,      450.0,      150.0,      1950.0),
+            ],
+            options
+        )
+
+    def test_aged_receivable_unknown_partner(self):
+        """ Test that journal items without a partner in the receivable account appear as unknown partner. """
+
+        misc_move = self.env['account.move'].create({
+            'date': '2017-03-31',
+            'line_ids': [
+                Command.create({'debit': 1000.0, 'credit': 0.0, 'account_id': self.company_data['default_account_revenue'].id}),
+                Command.create({'debit': 0.0, 'credit': 1000.0, 'account_id': self.company_data['default_account_receivable'].id}),
+            ],
+        })
+        misc_move.action_post()
+
+        options = self._generate_options(self.report, fields.Date.from_string('2017-03-01'), fields.Date.from_string('2017-04-01'))
+        self.env.company.totals_below_sections = False
+
+        self.assertLinesValues(
+            # pylint: disable=C0326
+            self.report._get_lines(options),
+            #   Name              Not Due On      1 - 30     31 - 60     61 - 90    91 - 120       Older        Total
+            [   0,                         3,          4,          5,          6,          7,          8,           9],
+            [
+                ('Aged Receivable',      0.0,    -1000.0,      150.0,      150.0,      150.0,     1500.0,       950.0),
+                ('partner_a',            0.0,        0.0,      100.0,      100.0,      100.0,     1000.0,      1300.0),
+                ('partner_b',            0.0,        0.0,       50.0,       50.0,       50.0,      500.0,       650.0),
+                ('Unknown',              0.0,    -1000.0,        0.0,        0.0,        0.0,        0.0,     -1000.0),
+            ],
+            options,
+        )
+
+    def test_aged_receivable_filter_partners(self):
+        """ Test the filter on top allowing to filter on res.partner. """
+        options = self._generate_options(self.report, fields.Date.from_string('2017-02-01'), fields.Date.from_string('2017-02-01'))
+        options['partner_ids'] = self.partner_a.ids
+        self.env.company.totals_below_sections = False
+
+        self.assertLinesValues(
+            # pylint: disable=C0326
+            self.report._get_lines(options),
+            #   Name             Not Due On      1 - 30     31 - 60     61 - 90    91 - 120       Older        Total
+            [   0,                        3,          4,          5,          6,          7,          8,           9],
+            [
+                ('Aged Receivable',   100.0,      100.0,      100.0,      600.0,      300.0,      100.0,      1300.0),
+                ('partner_a',         100.0,      100.0,      100.0,      600.0,      300.0,      100.0,      1300.0),
+            ],
+            options,
+        )
+
+    def test_aged_receivable_filter_partner_categories(self):
+        """ Test the filter on top allowing to filter on res.partner.category. """
+        options = self._generate_options(self.report, fields.Date.from_string('2017-02-01'), fields.Date.from_string('2017-02-01'))
+        options['partner_categories'] = self.partner_category_a.ids
+        self.env.company.totals_below_sections = False
+
+        self.assertLinesValues(
+            # pylint: disable=C0326
+            self.report._get_lines(options),
+            #   Name              Not Due On      1 - 30     31 - 60     61 - 90    91 - 120       Older        Total
+            [   0,                         3,          4,          5,          6,          7,          8,           9],
+            [
+                ('Aged Receivable',    150.0,      150.0,      150.0,      900.0,      450.0,      150.0,      1950.0),
+                ('partner_a',          100.0,      100.0,      100.0,      600.0,      300.0,      100.0,      1300.0),
+                ('partner_b',           50.0,       50.0,       50.0,      300.0,      150.0,       50.0,       650.0),
+            ],
+            options,
+        )
+
+    def test_aged_receivable_reconciliation_date(self):
+        """ Check the values at a date before some reconciliations are done. """
+        options = self._generate_options(self.report, fields.Date.from_string('2016-10-31'), fields.Date.from_string('2016-10-31'))
+        self.env.company.totals_below_sections = False
+
+        self.assertLinesValues(
+            # pylint: disable=C0326
+            self.report._get_lines(options),
+            #   Name             Not Due On      1 - 30     31 - 60     61 - 90    91 - 120       Older        Total
+            [   0,                        3,          4,          5,          6,          7,          8,           9],
+            [
+                ('Aged Receivable', -133.33,    1466.67,        0.0,        0.0,        0.0,     133.33,     1466.67),
+                ('partner_a',       -100.00,    1100.00,        0.0,        0.0,        0.0,     100.00,     1100.00),
+                ('partner_b',        -33.33,     366.67,        0.0,        0.0,        0.0,      33.33,      366.67),
+            ],
+            options,
+        )
+
+    # TODO: move these tests into a generic report test class
+    def test_aged_receivable_sort_lines_by_date(self):
+        """ Test the sort_lines function using date as sort key. """
+        options = self._generate_options(self.report, fields.Date.from_string('2017-02-01'), fields.Date.from_string('2017-02-01'))
+        partner_a_line_id = self.report._get_generic_line_id('res.partner', self.partner_a.id, parent_line_id=self.parent_line_id, markup={'groupby': 'partner_id'})
+        partner_b_line_id = self.report._get_generic_line_id('res.partner', self.partner_b.id, parent_line_id=self.parent_line_id, markup={'groupby': 'partner_id'})
+        options['unfolded_lines'] = [partner_a_line_id, partner_b_line_id]
+
+        # Sort by Invoice Date increasing
+        options['order_column'] = {
+            'expression_label': 'invoice_date',
+            'direction': 'ASC',
+        }
+
+        report_lines = self.report._get_lines(options)
+
+        self.assertLinesValues(
+            # pylint: disable=C0326
+            self.report.sort_lines(report_lines, options),
+            #   Name                    Invoice Date  Not Due On      1 - 30     31 - 60     61 - 90    91 - 120       Older        Total
+            [   0,                                 1,          3,          4,          5,          6,          7,          8,           9],
+            [
+                ('Aged Receivable',              '',       150.0,      150.0,      150.0,      900.0,      450.0,      150.0,      1950.0),
+                ('partner_a',                    '',       100.0,      100.0,      100.0,      600.0,      300.0,      100.0,      1300.0),
+                ('INV/2016/00001',      '10/05/2016',        0.0,        0.0,        0.0,        0.0,      200.0,        0.0,          ''),
+                ('INV/2016/00001',      '10/05/2016',      100.0,        0.0,        0.0,        0.0,        0.0,        0.0,          ''),
+                ('INV/2016/00001',      '10/05/2016',        0.0,      100.0,        0.0,        0.0,        0.0,        0.0,          ''),
+                ('INV/2016/00001',      '10/05/2016',        0.0,        0.0,      100.0,        0.0,        0.0,        0.0,          ''),
+                ('INV/2016/00001',      '10/05/2016',        0.0,        0.0,        0.0,      100.0,        0.0,        0.0,          ''),
+                ('INV/2016/00001',      '10/05/2016',        0.0,        0.0,        0.0,        0.0,      100.0,        0.0,          ''),
+                ('INV/2016/00001',      '10/05/2016',        0.0,        0.0,        0.0,        0.0,        0.0,      100.0,          ''),
+                ('INV/2016/00002',      '11/03/2016',        0.0,        0.0,        0.0,      500.0,        0.0,        0.0,          ''),
+                ('Total partner_a',               '',      100.0,      100.0,      100.0,       600.0,     300.0,      100.0,      1300.0),
+                ('partner_b',                     '',       50.0,       50.0,       50.0,       300.0,     150.0,       50.0,       650.0),
+                ('INV/2016/00001',      '10/05/2016',        0.0,        0.0,        0.0,         0.0,     100.0,        0.0,          ''),
+                ('INV/2016/00001',      '10/05/2016',       50.0,        0.0,        0.0,         0.0,       0.0,        0.0,          ''),
+                ('INV/2016/00001',      '10/05/2016',        0.0,       50.0,        0.0,         0.0,       0.0,        0.0,          ''),
+                ('INV/2016/00001',      '10/05/2016',        0.0,        0.0,       50.0,         0.0,       0.0,        0.0,          ''),
+                ('INV/2016/00001',      '10/05/2016',        0.0,        0.0,        0.0,        50.0,       0.0,        0.0,          ''),
+                ('INV/2016/00001',      '10/05/2016',        0.0,        0.0,        0.0,         0.0,      50.0,        0.0,          ''),
+                ('INV/2016/00001',      '10/05/2016',        0.0,        0.0,        0.0,         0.0,       0.0,       50.0,          ''),
+                ('INV/2016/00002',      '11/03/2016',        0.0,        0.0,        0.0,       250.0,       0.0,        0.0,          ''),
+                ('Total partner_b',               '',       50.0,       50.0,       50.0,       300.0,     150.0,       50.0,       650.0),
+                ('Total Aged Receivable',         '',      150.0,      150.0,      150.0,      900.0,      450.0,      150.0,      1950.0),
+            ],
+            options,
+        )
+
+        # Sort by Invoice Date decreasing
+        options['order_column'] = {
+            'expression_label': 'invoice_date',
+            'direction': 'DESC',
+        }
+
+        self.assertLinesValues(
+            # pylint: disable=C0326
+            self.report.sort_lines(report_lines, options),
+            #   Name                     Not Due On      1 - 30     31 - 60     61 - 90    91 - 120       Older        Total
+            [   0,                                3,          4,          5,          6,          7,          8,           9],
+            [
+                ('Aged Receivable',           150.0,      150.0,      150.0,      900.0,      450.0,      150.0,      1950.0),
+                ('partner_a',                 100.0,      100.0,      100.0,      600.0,      300.0,      100.0,      1300.0),
+                ('INV/2016/00002',              0.0,        0.0,        0.0,      500.0,        0.0,        0.0,          ''),
+                ('INV/2016/00001',              0.0,        0.0,        0.0,        0.0,      200.0,        0.0,          ''),
+                ('INV/2016/00001',            100.0,        0.0,        0.0,        0.0,        0.0,        0.0,          ''),
+                ('INV/2016/00001',              0.0,      100.0,        0.0,        0.0,        0.0,        0.0,          ''),
+                ('INV/2016/00001',              0.0,        0.0,      100.0,        0.0,        0.0,        0.0,          ''),
+                ('INV/2016/00001',              0.0,        0.0,        0.0,      100.0,        0.0,        0.0,          ''),
+                ('INV/2016/00001',              0.0,        0.0,        0.0,        0.0,      100.0,        0.0,          ''),
+                ('INV/2016/00001',              0.0,        0.0,        0.0,        0.0,        0.0,      100.0,          ''),
+                ('Total partner_a',           100.0,      100.0,      100.0,       600.0,     300.0,      100.0,      1300.0),
+                ('partner_b',                  50.0,       50.0,       50.0,       300.0,     150.0,       50.0,       650.0),
+                ('INV/2016/00002',              0.0,        0.0,        0.0,       250.0,       0.0,        0.0,          ''),
+                ('INV/2016/00001',              0.0,        0.0,        0.0,         0.0,     100.0,        0.0,          ''),
+                ('INV/2016/00001',             50.0,        0.0,        0.0,         0.0,       0.0,        0.0,          ''),
+                ('INV/2016/00001',              0.0,       50.0,        0.0,         0.0,       0.0,        0.0,          ''),
+                ('INV/2016/00001',              0.0,        0.0,       50.0,         0.0,       0.0,        0.0,          ''),
+                ('INV/2016/00001',              0.0,        0.0,        0.0,        50.0,       0.0,        0.0,          ''),
+                ('INV/2016/00001',              0.0,        0.0,        0.0,         0.0,      50.0,        0.0,          ''),
+                ('INV/2016/00001',              0.0,        0.0,        0.0,         0.0,       0.0,       50.0,          ''),
+                ('Total partner_b',            50.0,       50.0,       50.0,       300.0,     150.0,       50.0,       650.0),
+                ('Total Aged Receivable',     150.0,      150.0,      150.0,      900.0,      450.0,      150.0,      1950.0),
+            ],
+            options,
+        )
+
+    def test_aged_receivable_sort_lines_by_numeric_value(self):
+        """ Test the sort_lines function using float as sort key. """
+        options = self._generate_options(self.report, fields.Date.from_string('2017-02-01'), fields.Date.from_string('2017-02-01'))
+        partner_a_line_id = self.report._get_generic_line_id('res.partner', self.partner_a.id, parent_line_id=self.parent_line_id, markup={'groupby': 'partner_id'})
+        partner_b_line_id = self.report._get_generic_line_id('res.partner', self.partner_b.id, parent_line_id=self.parent_line_id, markup={'groupby': 'partner_id'})
+        options['unfolded_lines'] = [partner_a_line_id, partner_b_line_id]
+
+        # Sort by Not Due On increasing
+        options['order_column'] = {
+            'expression_label': 'period0',
+            'direction': 'ASC',
+        }
+
+        report_lines = self.report._get_lines(options)
+
+        self.assertLinesValues(
+            # pylint: disable=C0326
+            self.report.sort_lines(report_lines, options),
+            #   Name                    Not Due On      1 - 30     31 - 60     61 - 90    91 - 120       Older        Total
+            [   0,                               3,          4,          5,          6,          7,          8,           9],
+            [
+                ('Aged Receivable',          150.0,      150.0,      150.0,      900.0,      450.0,      150.0,      1950.0),
+                ('partner_b',                 50.0,       50.0,       50.0,      300.0,      150.0,       50.0,       650.0),
+                ('INV/2016/00002',             0.0,        0.0,        0.0,      250.0,        0.0,        0.0,          ''),
+                ('INV/2016/00001',             0.0,        0.0,        0.0,        0.0,      100.0,        0.0,          ''),
+                ('INV/2016/00001',             0.0,       50.0,        0.0,        0.0,        0.0,        0.0,          ''),
+                ('INV/2016/00001',             0.0,        0.0,       50.0,        0.0,        0.0,        0.0,          ''),
+                ('INV/2016/00001',             0.0,        0.0,        0.0,       50.0,        0.0,        0.0,          ''),
+                ('INV/2016/00001',             0.0,        0.0,        0.0,        0.0,       50.0,        0.0,          ''),
+                ('INV/2016/00001',             0.0,        0.0,        0.0,        0.0,        0.0,       50.0,          ''),
+                ('INV/2016/00001',            50.0,        0.0,        0.0,        0.0,        0.0,        0.0,          ''),
+                ('Total partner_b',           50.0,       50.0,       50.0,      300.0,      150.0,       50.0,       650.0),
+                ('partner_a',                100.0,      100.0,      100.0,      600.0,      300.0,      100.0,      1300.0),
+                ('INV/2016/00002',             0.0,        0.0,        0.0,      500.0,        0.0,        0.0,          ''),
+                ('INV/2016/00001',             0.0,        0.0,        0.0,        0.0,      200.0,        0.0,          ''),
+                ('INV/2016/00001',             0.0,      100.0,        0.0,        0.0,        0.0,        0.0,          ''),
+                ('INV/2016/00001',             0.0,        0.0,      100.0,        0.0,        0.0,        0.0,          ''),
+                ('INV/2016/00001',             0.0,        0.0,        0.0,      100.0,        0.0,        0.0,          ''),
+                ('INV/2016/00001',             0.0,        0.0,        0.0,        0.0,      100.0,        0.0,          ''),
+                ('INV/2016/00001',             0.0,        0.0,        0.0,        0.0,        0.0,      100.0,          ''),
+                ('INV/2016/00001',           100.0,        0.0,        0.0,        0.0,        0.0,        0.0,          ''),
+                ('Total partner_a',          100.0,      100.0,      100.0,       600.0,     300.0,      100.0,      1300.0),
+                ('Total Aged Receivable',    150.0,      150.0,      150.0,      900.0,      450.0,      150.0,      1950.0),
+            ],
+            options,
+        )
+
+        # Sort by Not Due On decreasing
+        options['order_column'] = {
+            'expression_label': 'period0',
+            'direction': 'DESC',
+        }
+
+        self.assertLinesValues(
+            # pylint: disable=C0326
+            self.report.sort_lines(report_lines, options),
+            #   Name                 Not Due On      1 - 30     31 - 60     61 - 90    91 - 120       Older       Total
+            [   0,                            3,          4,          5,          6,          7,          8,          9],
+            [
+                ('Aged Receivable',       150.0,      150.0,      150.0,      900.0,      450.0,      150.0,      1950.0),
+                ('partner_a',             100.0,      100.0,      100.0,      600.0,      300.0,      100.0,      1300.0),
+                ('INV/2016/00001',        100.0,        0.0,        0.0,        0.0,        0.0,        0.0,          ''),
+                ('INV/2016/00002',          0.0,        0.0,        0.0,      500.0,        0.0,        0.0,          ''),
+                ('INV/2016/00001',          0.0,        0.0,        0.0,        0.0,      200.0,        0.0,          ''),
+                ('INV/2016/00001',          0.0,      100.0,        0.0,        0.0,        0.0,        0.0,          ''),
+                ('INV/2016/00001',          0.0,        0.0,      100.0,        0.0,        0.0,        0.0,          ''),
+                ('INV/2016/00001',          0.0,        0.0,        0.0,      100.0,        0.0,        0.0,          ''),
+                ('INV/2016/00001',          0.0,        0.0,        0.0,        0.0,      100.0,        0.0,          ''),
+                ('INV/2016/00001',          0.0,        0.0,        0.0,        0.0,        0.0,      100.0,          ''),
+                ('Total partner_a',       100.0,      100.0,      100.0,       600.0,     300.0,      100.0,      1300.0),
+                ('partner_b',              50.0,       50.0,       50.0,      300.0,      150.0,       50.0,       650.0),
+                ('INV/2016/00001',         50.0,        0.0,        0.0,        0.0,        0.0,        0.0,          ''),
+                ('INV/2016/00002',          0.0,        0.0,        0.0,      250.0,        0.0,        0.0,          ''),
+                ('INV/2016/00001',          0.0,        0.0,        0.0,        0.0,      100.0,        0.0,          ''),
+                ('INV/2016/00001',          0.0,       50.0,        0.0,        0.0,        0.0,        0.0,          ''),
+                ('INV/2016/00001',          0.0,        0.0,       50.0,        0.0,        0.0,        0.0,          ''),
+                ('INV/2016/00001',          0.0,        0.0,        0.0,       50.0,        0.0,        0.0,          ''),
+                ('INV/2016/00001',          0.0,        0.0,        0.0,        0.0,       50.0,        0.0,          ''),
+                ('INV/2016/00001',          0.0,        0.0,        0.0,        0.0,        0.0,       50.0,          ''),
+                ('Total partner_b',        50.0,       50.0,       50.0,      300.0,      150.0,       50.0,       650.0),
+                ('Total Aged Receivable', 150.0,      150.0,      150.0,      900.0,      450.0,      150.0,      1950.0),
+            ],
+            options,
+        )
+
+    def test_aged_receivable_zero_balanced_without_reconciliation(self):
+        options = self._generate_options(self.report, '2010-01-01', '2010-01-01', default_options={'unfold_all': True})
+        invoice = self.env['account.move'].create({
+            'move_type': 'out_invoice',
+            'partner_id': self.partner_a.id,
+            'invoice_date': '2010-01-01',
+            'invoice_date_due': '2010-01-01',
+            'payment_reference': 'I',
+            'invoice_line_ids': [Command.create({
+                'name': 'test invoice',
+                'price_unit': 100,
+                'tax_ids': [],
+            })]
+        })
+        invoice.action_post()
+
+        refund = self.env['account.move'].create({
+            'move_type': 'out_refund',
+            'partner_id': self.partner_a.id,
+            'invoice_date': '2010-01-01',
+            'invoice_date_due': '2010-01-01',
+            'payment_reference': 'R',
+            'invoice_line_ids': [Command.create({
+                'name': 'test refund',
+                'price_unit': 100,
+                'tax_ids': [],
+            })]
+        })
+        refund.action_post()
+
+        self.assertLinesValues(
+            # pylint: disable=C0326
+            self.report._get_lines(options),
+            #   Name                  Not Due On      1 - 30     31 - 60     61 - 90    91 - 120       Older        Total
+            [   0,                             3,          4,          5,          6,          7,          8,           9],
+            [
+                ('Aged Receivable',          0.0,        0.0,        0.0,        0.0,        0.0,        0.0,         0.0),
+                ('partner_a',                0.0,        0.0,        0.0,        0.0,        0.0,        0.0,         0.0),
+                (f"{refund.name} R",      -100.0,        0.0,        0.0,        0.0,        0.0,        0.0,          ''),
+                (f"{invoice.name} I",      100.0,        0.0,        0.0,        0.0,        0.0,        0.0,          ''),
+                ('Total partner_a',          0.0,        0.0,        0.0,        0.0,        0.0,        0.0,         0.0),
+                ('Total Aged Receivable',    0.0,        0.0,        0.0,        0.0,        0.0,        0.0,         0.0),
+            ],
+            options,
+        )
+
+        # It should still work if both  invoice and refund are partially reconciled with the same amount
+        self.env['account.payment.register'].with_context(active_ids=invoice.ids, active_model='account.move').create({
+            'amount': 42,
+            'payment_date': '2010-01-01',
+            'payment_method_line_id': self.outbound_payment_method_line.id,
+        })._create_payments()
+
+        self.env['account.payment.register'].with_context(active_ids=refund.ids, active_model='account.move').create({
+            'amount': 42,
+            'payment_date': '2010-01-01',
+            'payment_method_line_id': self.outbound_payment_method_line.id,
+        })._create_payments()
+
+        self.assertLinesValues(
+            # pylint: disable=C0326
+            self.report._get_lines(options),
+            #   Name                  Not Due On      1 - 30     31 - 60     61 - 90    91 - 120       Older        Total
+            [   0,                             3,          4,          5,          6,          7,          8,           9],
+            [
+                ('Aged Receivable',          0.0,        0.0,        0.0,        0.0,        0.0,        0.0,         0.0),
+                ('partner_a',                0.0,        0.0,        0.0,        0.0,        0.0,        0.0,         0.0),
+                (f"{refund.name} R",       -58.0,        0.0,        0.0,        0.0,        0.0,        0.0,          ''),
+                (f"{invoice.name} I",       58.0,        0.0,        0.0,        0.0,        0.0,        0.0,          ''),
+                ('Total partner_a',          0.0,        0.0,        0.0,        0.0,        0.0,        0.0,         0.0),
+                ('Total Aged Receivable',    0.0,        0.0,        0.0,        0.0,        0.0,        0.0,         0.0),
+            ],
+            options,
+        )
+
+        # It should still work if both  invoice and refund are fully reconciled in the future
+        self.env['account.payment.register'].with_context(active_ids=invoice.ids, active_model='account.move').create({
+            'amount': 58,
+            'payment_date': '2020-01-01',
+            'payment_method_line_id': self.outbound_payment_method_line.id,
+        })._create_payments()
+
+        self.env['account.payment.register'].with_context(active_ids=refund.ids, active_model='account.move').create({
+            'amount': 58,
+            'payment_date': '2020-01-01',
+            'payment_method_line_id': self.outbound_payment_method_line.id,
+        })._create_payments()
+
+        self.assertLinesValues(
+            # pylint: disable=C0326
+            self.report._get_lines(options),
+            #   Name                  Not Due On      1 - 30     31 - 60     61 - 90    91 - 120       Older        Total
+            [   0,                             3,          4,          5,          6,          7,          8,           9],
+            [
+                ('Aged Receivable',          0.0,        0.0,        0.0,        0.0,        0.0,        0.0,         0.0),
+                ('partner_a',                0.0,        0.0,        0.0,        0.0,        0.0,        0.0,         0.0),
+                (f"{refund.name} R",       -58.0,        0.0,        0.0,        0.0,        0.0,        0.0,          ''),
+                (f"{invoice.name} I",       58.0,        0.0,        0.0,        0.0,        0.0,        0.0,          ''),
+                ('Total partner_a',          0.0,        0.0,        0.0,        0.0,        0.0,        0.0,         0.0),
+                ('Total Aged Receivable',    0.0,        0.0,        0.0,        0.0,        0.0,        0.0,         0.0),
+            ],
+            options,
+        )
+
+    def test_aged_receivable_prefix_groups(self):
+        partner_names = [
+            'A',
+            'A partner',
+            'A nice partner',
+            'A new partner',
+            'An original partner',
+            'Another partner',
+            'Anonymous partner',
+            'Annoyed partner',
+            'Brave partner',
+        ]
+
+        test_date = '2010-12-13'
+        invoices_map = {}
+        for name in partner_names:
+            partner = self.env['res.partner'].create({'name': name})
+            invoice = self.init_invoice('out_invoice', partner=partner, invoice_date=test_date, amounts=[42.0], taxes=[], post=True)
+            invoices_map[name] = self.env['account.move.line']._format_aml_name(invoice.payment_reference, False, invoice.name)
+
+        # Without prefix groups
+        options = self._generate_options(self.report, test_date, test_date)
+
+        self.assertLinesValues(
+            self.report._get_lines(options),
+            #   Name                 Not Due On      1 - 30     31 - 60     61 - 90    91 - 120       Older        Total
+            [   0,                            3,          4,          5,          6,          7,          8,           9],
+            [
+                ('Aged Receivable',       378.0,        0.0,        0.0,        0.0,        0.0,        0.0,       378.0),
+                ('A',                      42.0,        0.0,        0.0,        0.0,        0.0,        0.0,        42.0),
+                ('A new partner',          42.0,        0.0,        0.0,        0.0,        0.0,        0.0,        42.0),
+                ('A nice partner',         42.0,        0.0,        0.0,        0.0,        0.0,        0.0,        42.0),
+                ('A partner',              42.0,        0.0,        0.0,        0.0,        0.0,        0.0,        42.0),
+                ('An original partner',    42.0,        0.0,        0.0,        0.0,        0.0,        0.0,        42.0),
+                ('Annoyed partner',        42.0,        0.0,        0.0,        0.0,        0.0,        0.0,        42.0),
+                ('Anonymous partner',      42.0,        0.0,        0.0,        0.0,        0.0,        0.0,        42.0),
+                ('Another partner',        42.0,        0.0,        0.0,        0.0,        0.0,        0.0,        42.0),
+                ('Brave partner',          42.0,        0.0,        0.0,        0.0,        0.0,        0.0,        42.0),
+                ('Total Aged Receivable', 378.0,        0.0,        0.0,        0.0,        0.0,        0.0,       378.0),
+            ],
+            options,
+        )
+
+        # With prefix groups
+        self.report.prefix_groups_threshold = 3
+        options = self._generate_options(self.report, test_date, test_date, default_options={'unfold_all': True})
+
+        self.assertLinesValues(
+            self.report._get_lines(options),
+            #   Name                            Not Due On    1 - 30     31 - 60     61 - 90    91 - 120       Older        Total
+            [   0,                                       3,        4,          5,          6,          7,          8,           9],
+            [
+                ('Aged Receivable',                  378.0,      0.0,        0.0,        0.0,        0.0,        0.0,       378.0),
+                ('A (8 lines)',                      336.0,      0.0,        0.0,        0.0,        0.0,        0.0,       336.0),
+                ('A',                                 42.0,      0.0,        0.0,        0.0,        0.0,        0.0,        42.0),
+                (invoices_map['A'],                   42.0,      0.0,        0.0,        0.0,        0.0,        0.0,          ''),
+                ('Total A',                           42.0,      0.0,        0.0,        0.0,        0.0,        0.0,        42.0),
+                ('A[ ] (3 lines)',                   126.0,      0.0,        0.0,        0.0,        0.0,        0.0,       126.0),
+                ('A N (2 lines)',                     84.0,      0.0,        0.0,        0.0,        0.0,        0.0,        84.0),
+                ('A new partner',                     42.0,      0.0,        0.0,        0.0,        0.0,        0.0,        42.0),
+                (invoices_map['A new partner'],       42.0,      0.0,        0.0,        0.0,        0.0,        0.0,          ''),
+                ('Total A new partner',               42.0,      0.0,        0.0,        0.0,        0.0,        0.0,        42.0),
+                ('A nice partner',                    42.0,      0.0,        0.0,        0.0,        0.0,        0.0,        42.0),
+                (invoices_map['A nice partner'],      42.0,      0.0,        0.0,        0.0,        0.0,        0.0,          ''),
+                ('Total A nice partner',              42.0,      0.0,        0.0,        0.0,        0.0,        0.0,        42.0),
+                ('Total A N (2 lines)',               84.0,      0.0,        0.0,        0.0,        0.0,        0.0,        84.0),
+                ('A P (1 line)',                      42.0,      0.0,        0.0,        0.0,        0.0,        0.0,        42.0),
+                ('A partner',                         42.0,      0.0,        0.0,        0.0,        0.0,        0.0,        42.0),
+                (invoices_map['A partner'],           42.0,      0.0,        0.0,        0.0,        0.0,        0.0,          ''),
+                ('Total A partner',                   42.0,      0.0,        0.0,        0.0,        0.0,        0.0,        42.0),
+                ('Total A P (1 line)',                42.0,      0.0,        0.0,        0.0,        0.0,        0.0,        42.0),
+                ('Total A[ ] (3 lines)',             126.0,      0.0,        0.0,        0.0,        0.0,        0.0,       126.0),
+                ('AN (4 lines)',                     168.0,      0.0,        0.0,        0.0,        0.0,        0.0,       168.0),
+                ('AN[ ] (1 line)',                    42.0,      0.0,        0.0,        0.0,        0.0,        0.0,        42.0),
+                ('An original partner',               42.0,      0.0,        0.0,        0.0,        0.0,        0.0,        42.0),
+                (invoices_map['An original partner'], 42.0,      0.0,        0.0,        0.0,        0.0,        0.0,          ''),
+                ('Total An original partner',         42.0,      0.0,        0.0,        0.0,        0.0,        0.0,        42.0),
+                ('Total AN[ ] (1 line)',              42.0,      0.0,        0.0,        0.0,        0.0,        0.0,        42.0),
+                ('ANN (1 line)',                      42.0,      0.0,        0.0,        0.0,        0.0,        0.0,        42.0),
+                ('Annoyed partner',                   42.0,      0.0,        0.0,        0.0,        0.0,        0.0,        42.0),
+                (invoices_map['Annoyed partner'],     42.0,      0.0,        0.0,        0.0,        0.0,        0.0,          ''),
+                ('Total Annoyed partner',             42.0,      0.0,        0.0,        0.0,        0.0,        0.0,        42.0),
+                ('Total ANN (1 line)',                42.0,      0.0,        0.0,        0.0,        0.0,        0.0,        42.0),
+                ('ANO (2 lines)',                     84.0,      0.0,        0.0,        0.0,        0.0,        0.0,        84.0),
+                ('Anonymous partner',                 42.0,      0.0,        0.0,        0.0,        0.0,        0.0,        42.0),
+                (invoices_map['Anonymous partner'],   42.0,      0.0,        0.0,        0.0,        0.0,        0.0,          ''),
+                ('Total Anonymous partner',           42.0,      0.0,        0.0,        0.0,        0.0,        0.0,        42.0),
+                ('Another partner',                   42.0,      0.0,        0.0,        0.0,        0.0,        0.0,        42.0),
+                (invoices_map['Another partner'],     42.0,      0.0,        0.0,        0.0,        0.0,        0.0,          ''),
+                ('Total Another partner',             42.0,      0.0,        0.0,        0.0,        0.0,        0.0,        42.0),
+                ('Total ANO (2 lines)',               84.0,      0.0,        0.0,        0.0,        0.0,        0.0,        84.0),
+                ('Total AN (4 lines)',               168.0,      0.0,        0.0,        0.0,        0.0,        0.0,       168.0),
+                ('Total A (8 lines)',                336.0,      0.0,        0.0,        0.0,        0.0,        0.0,       336.0),
+                ('B (1 line)',                        42.0,      0.0,        0.0,        0.0,        0.0,        0.0,        42.0),
+                ('Brave partner',                     42.0,      0.0,        0.0,        0.0,        0.0,        0.0,        42.0),
+                (invoices_map['Brave partner'],       42.0,      0.0,        0.0,        0.0,        0.0,        0.0,          ''),
+                ('Total Brave partner',               42.0,      0.0,        0.0,        0.0,        0.0,        0.0,        42.0),
+                ('Total B (1 line)',                  42.0,      0.0,        0.0,        0.0,        0.0,        0.0,        42.0),
+                ('Total Aged Receivable',            378.0,      0.0,        0.0,        0.0,        0.0,        0.0,       378.0),
+            ],
+            options,
+        )
+
+    def test_aged_receivable_partial_reconcile_currency(self):
+        """ Check that 'Amount Currency' column values are displayed and computed correctly. """
+        foreign_partner = self.env['res.partner'].create({'name': 'foreign_partner'})
+        currency = self.other_currency
+        currency.active = True
+        self.env.company.totals_below_sections = False
+
+        invoice = self.env['account.move'].create({
+            'move_type': 'out_invoice',
+            'invoice_date': '2023-05-01',
+            'invoice_date_due': '2023-05-01',
+            'partner_id': foreign_partner.id,
+            'currency_id': currency.id,
+            'invoice_line_ids': [Command.create({
+                'name': 'test',
+                'quantity': 1,
+                'price_unit': 100.0,
+                'tax_ids': [],
+            })],
+        })
+        invoice.action_post()
+
+        self.env['account.payment.register'].with_context(
+            active_model='account.move',
+            active_ids=invoice.ids,
+        ).create({
+            'amount': 10.0,
+            'currency_id': currency.id,
+            'payment_date': '2023-05-05',
+            'partner_id': foreign_partner.id,
+        })._create_payments()
+
+        line_id = self.report._get_generic_line_id('res.partner', foreign_partner.id, markup={'groupby': 'partner_id'}, parent_line_id=self.parent_line_id)
+        options = self._generate_options(self.report, '2023-01-01', '2023-05-01')
+        options['unfolded_lines'] = [line_id]
+
+        self.assertLinesValues(
+            # pylint: disable=C0326
+            self.report._get_unfolded_lines(self.report._get_lines(options), line_id),
+            #   Name                                      Due Date     Amount Currency     Currency     As Of     Total
+            [   0,                                               1,                  2,           3,        5,       11],
+            [
+                ('foreign_partner',                             '',                 '',          '',     50.0,     50.0),
+                ('INV/2023/00001',                    '05/01/2023',              100.0,       'CAD',     50.0,       ''),
+            ],
+			options,
+            currency_map={
+                2: {'currency': currency},
+            },
+        )
+
+        new_options = self._generate_options(self.report, '2023-01-01', '2023-05-05')
+        new_options['unfolded_lines'] = [line_id]
+
+        self.assertLinesValues(
+            # pylint: disable=C0326
+            self.report._get_unfolded_lines(self.report._get_lines(new_options), line_id),
+            #   Name                                      Due Date     Amount Currency     Currency     As Of     1-30     Total
+            [   0,                                               1,                  2,           3,        5,       6,       11],
+            [
+                ('foreign_partner',                             '',                 '',          '',      0.0,    45.0,     45.0),
+                ('INV/2023/00001',                    '05/01/2023',               90.0,       'CAD',      0.0,    45.0,       ''),
+            ],
+			options,
+            currency_map={
+                2: {'currency': currency},
+            },
+        )
+
+    def test_aged_receivable_aging_interval(self):
+        options = self._generate_options(self.report, '2017-02-01', '2017-02-01')
+        initial_report_lines = self.report._get_lines(options)
+
+        # With the default interval of 30
+        self.assertLinesValues(
+            self.report.sort_lines(initial_report_lines, options),
+            #   Name                  Not Due On      1 - 30      31 - 60      62 - 90    91 - 120       Older      Total
+            [   0,                             3,          4,           5,           6,          7,          8,         9],
+            [
+                ('Aged Receivable',        150.0,      150.0,       150.0,       900.0,      450.0,      150.0,    1950.0),
+                ('partner_a',              100.0,      100.0,       100.0,       600.0,      300.0,      100.0,    1300.0),
+                ('partner_b',               50.0,       50.0,        50.0,       300.0,      150.0,       50.0,     650.0),
+                ('Total Aged Receivable',  150.0,      150.0,       150.0,       900.0,      450.0,      150.0,    1950.0),
+            ],
+            options
+        )
+
+        options['aging_interval'] = 60
+        report_lines = self.report._get_lines(options)
+
+        # With the interval of 60
+        self.assertLinesValues(
+            self.report.sort_lines(report_lines, options),
+            #   Name                  Not Due On      1 - 60    61 - 120   121 - 180   181 - 240       Older        Total
+            [   0,                             3,          4,          5,          6,          7,          8,           9],
+            [
+                ('Aged Receivable',        150.0,      300.0,     1350.0,         0.0,       0.0,      150.0,      1950.0),
+                ('partner_a',              100.0,      200.0,      900.0,         0.0,       0.0,      100.0,      1300.0),
+                ('partner_b',               50.0,      100.0,      450.0,         0.0,       0.0,       50.0,       650.0),
+                ('Total Aged Receivable',  150.0,      300.0,     1350.0,         0.0,       0.0,      150.0,      1950.0),
+            ],
+            options
+        )
diff --git a/dev_odex30_accounting/odex30_account_reports/tests/test_all_reports_generation.py b/dev_odex30_accounting/odex30_account_reports/tests/test_all_reports_generation.py
new file mode 100644
index 0000000..f1d783f
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_reports/tests/test_all_reports_generation.py
@@ -0,0 +1,171 @@
+# -*- coding: utf-8 -*-
+
+import json
+
+from collections import defaultdict
+from unittest.mock import patch
+
+from odoo.addons.account.tests.common import AccountTestInvoicingCommon
+from odoo.tests.common import tagged
+
+@tagged('post_install_l10n', 'post_install', '-at_install')
+class TestAllReportsGeneration(AccountTestInvoicingCommon):
+
+    @classmethod
+    def setUpClass(cls):
+        super().setUpClass()
+
+        # do not disable buttons because of multiple companies selected
+        cls.env = cls.env(context={'allowed_company_ids': cls.env.company.ids})
+        cls.setup_other_currency('EUR')
+
+        cls.reports = cls.env['account.report'].with_context(active_test=False).search([])
+
+        # Make the reports always available, so that they don't clash with the comany's country
+        cls.reports.availability_condition = 'always'
+        # We keep the country set on each of these reports, so that we can load the proper test data when testing exports
+
+    def test_open_all_reports(self):
+        # 'unfold_all' is forced on all reports (even if they don't support it), so that we really open it entirely
+        self.reports.filter_unfold_all = True
+
+        for report in self.reports:
+            with self.subTest(report=report.name, country=report.country_id.name):
+                # 'report_id' key is forced so that we don't open a variant when calling a root report
+                options = report.get_options({'selected_variant_id': report.id, 'unfold_all': True})
+
+                if report.use_sections:
+                    self.assertNotEqual(options['report_id'], report.id, "Composite reports should always reroute.")
+                    self.env['account.report'].browse(options['report_id']).get_report_information(options)
+                else:
+                    report.get_report_information(options)
+
+    def test_generate_all_export_files(self):
+        # Test values for the fields that become mandatory when doing exports on the reports, depending on the country
+        l10n_pl_reports_tax_office = self.env.ref('l10n_pl.pl_tax_office_0215', raise_if_not_found=False)
+        l10n_bd_corporate_tax_liability = self.env['account.account'].search([('account_type', '=', 'liability_current')], limit=1)
+        l10n_ae_liability_account = self.env['account.account'].search([('account_type', '=', 'liability_current')], limit=1)
+        l10n_cz_reports_tax_office = self.env.ref('l10n_cz_reports_2025.tax_office_1', raise_if_not_found=False)
+        company_test_values = {
+            'LU': {'vat': 'LU12345613'},
+            'BR': {'vat': '01234567891251'},
+            'AR': {'vat': '30714295698'},
+            'AU': {'vat': '11225459588', 'street': 'Arrow Street', 'zip': '1348', 'city': 'Starling City', 'state_id': self.env.ref('base.state_au_1').id},
+            'DE': {'vat': 'DE123456788', 'l10n_de_stnr': '151/815/08156', 'state_id': self.env.ref('base.state_de_th').id},
+            'NO': {'vat': 'NO123456785', 'l10n_no_bronnoysund_number': '987654325'},
+            'PL': {'l10n_pl_reports_tax_office_id': l10n_pl_reports_tax_office and l10n_pl_reports_tax_office.id},
+            'BD': {'l10n_bd_corporate_tax_liability': l10n_bd_corporate_tax_liability, 'l10n_bd_corporate_tax_expense': l10n_bd_corporate_tax_liability},
+            'AE': {'l10n_ae_tax_report_liabilities_account': l10n_ae_liability_account, 'l10n_ae_tax_report_counterpart_account': l10n_ae_liability_account},
+            'CZ': {'l10n_cz_tax_office_id': l10n_cz_reports_tax_office and l10n_cz_reports_tax_office.id}
+        }
+
+        if self.env['ir.module.module']._get('l10n_lu_reports').state == 'installed':
+            company_test_values['LU'].update({
+                'ecdf_prefix': '1234AB',
+                'matr_number': '1111111111111',
+            })
+
+        partner_test_values = {
+            'AR': {'l10n_latam_identification_type_id': (self.env.ref('l10n_ar.it_cuit', raise_if_not_found=False) or {'id': None})['id']},
+        }
+
+        # Some root reports are made for just one country and require test fields to be set the right way to generate their exports properly.
+        # Since they are root reports and are always available, they normally have no country set; we assign one here (only for the ones requiring it)
+        reports_forced_countries = [
+            ('AU', 'l10n_au_reports.tpar_report'),
+        ]
+        for country_code, report_ref in reports_forced_countries:
+            country = self.env['res.country'].search([('code', '=', country_code)], limit=1)
+            report = self.env.ref(report_ref, raise_if_not_found=False)
+            if report:
+                report.country_id = country
+
+        # Check buttons of every report
+        for report in self.reports:
+            with self.subTest(report=report.name, country=report.country_id.name):
+                # Setup some generic data on the company that could be needed for some file export
+                self.env.company.write({
+                    'vat': "VAT123456789",
+                    'email': "dummy@email.com",
+                    'phone': "01234567890",
+                    'company_registry': '42',
+                    **company_test_values.get(report.country_id.code, {}),
+                })
+
+                self.env.company.partner_id.write(partner_test_values.get(report.country_id.code, {}))
+
+                options = report.get_options({'selected_variant_id': report.id, '_running_export_test': True})
+
+                if report.use_sections:
+                    self.assertNotEqual(options['report_id'], report.id, "Composite reports should always reroute.")
+
+                for option_button in options['buttons']:
+                    if option_button['name'] in ('PDF', 'Download Excel'):  # keep "Copy to Documents" and other actions
+                        # TODO remove me
+                        # This test seems to have some trouble on runbot. It is running for way longer than
+                        # locally. Freeze is coming, explanation are missing... Sorry 😟
+                        continue
+                    if report.custom_handler_model_name == 'l10n_fr.report.handler' and option_button['name'] == 'EDI VAT':
+                        # This button requires a tax closing entry to be called. It doesn't make sense to test this button
+                        # without a tax closing entry, so we will exclude it from testing here.
+                        continue
+                    with self.subTest(button=option_button['name']):
+                        with patch.object(type(self.env['ir.actions.report']), '_run_wkhtmltopdf', lambda *args, **kwargs: b"This is a pdf"):
+                            if not option_button.get('client_tag'):
+                                action_dict = report.dispatch_report_action(
+                                    options,
+                                    option_button['action'],
+                                    action_param=option_button.get('action_param'),
+                                    on_sections_source=True,
+                                )
+
+                                if action_dict['type'] == 'ir_actions_account_report_download':
+                                    file_gen_res = report.dispatch_report_action(
+                                        json.loads(action_dict['data']['options']),
+                                        action_dict['data']['file_generator'],
+                                        on_sections_source=True,
+                                    )
+                                    self.assertEqual(
+                                        set(file_gen_res.keys()), {'file_name', 'file_content', 'file_type'},
+                                        "File generator's result should always contain the same 3 keys."
+                                    )
+
+            # Unset the test values, in case they are used in conditions to define custom behaviors
+            self.env.company.write({
+                field_name: None
+                for field_name in company_test_values.get(report.country_id.code, {}).keys()
+            })
+
+            self.env.company.partner_id.write({
+                field_name: None
+                for field_name in partner_test_values.get(report.country_id.code, {}).keys()
+            })
+
+    def test_custom_engines_related_groupby(self):
+        blacklist_xmlids = [
+            'odex30_account_reports.account_financial_report_executivesummary_avdebt0_ndays',
+            'odex30_account_reports.account_financial_report_executivesummary_avgcre0_ndays',
+            'odex30_account_reports.last_statement_balance_amount',
+            'odex30_account_reports.last_statement_balance_forced_currency_amount',
+        ]
+
+        custom_engine_expressions = self.env['account.report.expression'].search([
+            ('engine', '=', 'custom'),
+            ('id', 'not in', tuple(self.env['ir.model.data']._xmlid_to_res_id(xmlid) for xmlid in blacklist_xmlids)),
+        ])
+
+        expressions_per_engine = defaultdict(lambda: self.env['account.report.expression'])
+        for expression in custom_engine_expressions:
+            expressions_per_engine[(expression.report_line_id.report_id, expression.formula)] += expression
+
+        for (report, _formula), expressions in expressions_per_engine.items():
+            with self.subTest(report=report.name):
+                options = report.get_options({})
+
+                # Remove aggregations and external value expressions from those report lines, so that we always can set a groupby on the line
+                (expressions.report_line_id.expression_ids.filtered(lambda x: x.engine in ('aggregation', 'external'))).unlink()
+
+                expressions.report_line_id.user_groupby = 'account_code' # account_code is a  non-stored related field on aml
+                self.env.flush_all()
+                report._compute_expression_totals_for_each_column_group(expressions, options, groupby_to_expand='account_code')
+                # This computation fill fail if the custom engine forgot to handle such groupby, typically via a call to _field_to_sql
diff --git a/dev_odex30_accounting/odex30_account_reports/tests/test_analytic_reports.py b/dev_odex30_accounting/odex30_account_reports/tests/test_analytic_reports.py
new file mode 100644
index 0000000..ca9011b
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_reports/tests/test_analytic_reports.py
@@ -0,0 +1,708 @@
+from odoo import Command
+from odoo.tests import tagged
+
+from .common import TestAccountReportsCommon
+
+
+@tagged('post_install', '-at_install')
+class TestAnalyticReport(TestAccountReportsCommon):
+
+    @classmethod
+    def setUpClass(cls):
+        super().setUpClass()
+
+        cls.env.user.groups_id += cls.env.ref(
+            'analytic.group_analytic_accounting')
+        cls.report = cls.env.ref('odex30_account_reports.profit_and_loss')
+        cls.report.write({'filter_analytic': True})
+
+        cls.analytic_plan_parent = cls.env['account.analytic.plan'].create({
+            'name': 'Plan Parent',
+        })
+        cls.analytic_plan_child = cls.env['account.analytic.plan'].create({
+            'name': 'Plan Child',
+            'parent_id': cls.analytic_plan_parent.id,
+        })
+
+        cls.analytic_account_parent = cls.env['account.analytic.account'].create({
+            'name': 'Account 1',
+            'plan_id': cls.analytic_plan_parent.id
+        })
+        cls.analytic_account_parent_2 = cls.env['account.analytic.account'].create({
+            'name': 'Account 2',
+            'plan_id': cls.analytic_plan_parent.id
+        })
+        cls.analytic_account_child = cls.env['account.analytic.account'].create({
+            'name': 'Account 3',
+            'plan_id': cls.analytic_plan_child.id
+        })
+        cls.analytic_account_parent_3 = cls.env['account.analytic.account'].create({
+            'name': 'Account 4',
+            'plan_id': cls.analytic_plan_parent.id
+        })
+
+    def test_report_group_by_analytic_plan(self):
+
+        out_invoice = self.env['account.move'].create([{
+            'move_type': 'out_invoice',
+            'partner_id': self.partner_a.id,
+            'date': '2019-05-01',
+            'invoice_date': '2019-05-01',
+            'invoice_line_ids': [
+                Command.create({
+                    'product_id': self.product_a.id,
+                    'price_unit': 200.0,
+                    'analytic_distribution': {
+                        self.analytic_account_parent.id: 100,
+                    },
+                }),
+                Command.create({
+                    'product_id': self.product_b.id,
+                    'price_unit': 200.0,
+                    'analytic_distribution': {
+                        self.analytic_account_child.id: 100,
+                    },
+                }),
+            ]
+        }])
+        out_invoice.action_post()
+
+        options = self._generate_options(
+            self.report,
+            '2019-01-01',
+            '2019-12-31',
+            default_options={
+                'analytic_plans_groupby': [self.analytic_plan_parent.id, self.analytic_plan_child.id],
+            }
+        )
+
+        lines = self.report._get_lines(options)
+
+        self.assertLinesValues(
+            # pylint: disable=bad-whitespace
+            lines,
+            [   0,                                   1,          2],
+            [
+              ['Revenue',                       400.00,     200.00],
+              ['Less Costs of Revenue',           0.00,       0.00],
+              ['Gross Profit',                  400.00,     200.00],
+              ['Less Operating Expenses',         0.00,       0.00],
+              ['Operating Income (or Loss)',    400.00,     200.00],
+              ['Plus Other Income',               0.00,       0.00],
+              ['Less Other Expenses',             0.00,       0.00],
+              ['Net Profit',                    400.00,     200.00],
+            ],
+            options,
+            currency_map={
+                1: {'currency': self.env.company.currency_id},
+                2: {'currency': self.env.company.currency_id},
+            },
+        )
+
+    def test_report_analytic_filter(self):
+
+        out_invoice = self.env['account.move'].create([{
+            'move_type': 'out_invoice',
+            'partner_id': self.partner_a.id,
+            'date': '2023-02-01',
+            'invoice_date': '2023-02-01',
+            'invoice_line_ids': [
+                Command.create({
+                    'product_id': self.product_a.id,
+                    'price_unit': 1000.0,
+                    'analytic_distribution': {
+                        self.analytic_account_parent.id: 100,
+                    },
+                })
+            ]
+        }])
+        out_invoice.action_post()
+
+        options = self._generate_options(
+            self.report,
+            '2023-01-01',
+            '2023-12-31',
+            default_options={
+                'analytic_accounts': [self.analytic_account_parent.id],
+            }
+        )
+
+        self.assertLinesValues(
+            # pylint: disable=C0326
+            # pylint: disable=bad-whitespace
+            self.report._get_lines(options),
+            [   0,                                 1],
+            [
+              ['Revenue',                    1000.00],
+              ['Less Costs of Revenue',         0.00],
+              ['Gross Profit',               1000.00],
+              ['Less Operating Expenses',       0.00],
+              ['Operating Income (or Loss)', 1000.00],
+              ['Plus Other Income',             0.00],
+              ['Less Other Expenses',           0.00],
+              ['Net Profit',                 1000.00],
+            ],
+            options,
+            currency_map={
+                1: {'currency': self.env.company.currency_id},
+                2: {'currency': self.env.company.currency_id},
+            },
+        )
+
+        # Set the unused analytic account in filter, as no move is
+        # using this account, the column should be empty
+        options['analytic_accounts'] = [self.analytic_account_child.id]
+
+        self.assertLinesValues(
+            # pylint: disable=C0326
+            # pylint: disable=bad-whitespace
+            self.report._get_lines(options),
+            [   0,                                 1],
+            [
+              ['Revenue',                       0.00],
+              ['Less Costs of Revenue',         0.00],
+              ['Gross Profit',                  0.00],
+              ['Less Operating Expenses',       0.00],
+              ['Operating Income (or Loss)',    0.00],
+              ['Plus Other Income',             0.00],
+              ['Less Other Expenses',           0.00],
+              ['Net Profit',                    0.00],
+            ],
+            options,
+            currency_map={
+                1: {'currency': self.env.company.currency_id},
+                2: {'currency': self.env.company.currency_id},
+            },
+        )
+
+    def test_report_audit_analytic_filter(self):
+        out_invoice = self.env['account.move'].create([{
+            'move_type': 'out_invoice',
+            'partner_id': self.partner_a.id,
+            'date': '2023-02-01',
+            'invoice_date': '2023-02-01',
+            'invoice_line_ids': [
+                Command.create({
+                    'product_id': self.product_a.id,
+                    'price_unit': 1000.0,
+                    'analytic_distribution': {
+                        self.analytic_account_parent.id: 100,
+                    },
+                }),
+                Command.create({
+                    'product_id': self.product_a.id,
+                    'price_unit': 500.0,
+                    'analytic_distribution': {
+                        self.analytic_account_child.id: 100,
+                    },
+                }),
+            ],
+        }])
+        out_invoice.action_post()
+
+        options = self._generate_options(
+            self.report,
+            '2023-01-01',
+            '2023-12-31',
+            default_options={
+                'analytic_accounts': [self.analytic_account_parent.id],
+            }
+        )
+
+        lines = self.report._get_lines(options)
+
+        report_line = self.report.line_ids[0]
+        report_line_dict = next(x for x in lines if x['name'] == report_line.name)
+
+        action_dict = self.report.action_audit_cell(
+            options,
+            self._get_audit_params_from_report_line(options, report_line, report_line_dict),
+        )
+
+        audited_lines = self.env['account.move.line'].search(action_dict['domain'])
+        self.assertEqual(audited_lines, out_invoice.invoice_line_ids[0], "Only the line with the parent account should be shown")
+
+    def test_report_analytic_groupby_and_filter(self):
+        """
+        Test that the analytic filter is applied on the groupby columns
+        """
+
+        out_invoice = self.env['account.move'].create([{
+            'move_type': 'out_invoice',
+            'partner_id': self.partner_a.id,
+            'date': '2023-02-01',
+            'invoice_date': '2023-02-01',
+            'invoice_line_ids': [
+                Command.create({
+                    'product_id': self.product_a.id,
+                    'price_unit': 1000.0,
+                    'analytic_distribution': {
+                        self.analytic_account_parent.id: 40,
+                        self.analytic_account_child.id: 60,
+                    },
+                })
+            ]
+        }])
+        out_invoice.action_post()
+
+        # Test with only groupby
+        options = self._generate_options(
+            self.report,
+            '2023-01-01',
+            '2023-12-31',
+            default_options={
+                'analytic_accounts_groupby': [self.analytic_account_parent.id, self.analytic_account_child.id],
+            }
+        )
+
+        self.assertLinesValues(
+            # pylint: disable=C0326
+            # pylint: disable=bad-whitespace
+            self.report._get_lines(options),
+            [   0,                                 1,        2,         3],
+            [
+              ['Revenue',                     400.00,   600.00,   1000.00],
+              ['Less Costs of Revenue',         0.00,     0.00,      0.00],
+              ['Gross Profit',                400.00,   600.00,   1000.00],
+              ['Less Operating Expenses',       0.00,     0.00,      0.00],
+              ['Operating Income (or Loss)',  400.00,   600.00,   1000.00],
+              ['Plus Other Income',             0.00,     0.00,      0.00],
+              ['Less Other Expenses',           0.00,     0.00,      0.00],
+              ['Net Profit',                  400.00,   600.00,   1000.00],
+            ],
+            options,
+            currency_map={
+                1: {'currency': self.env.company.currency_id},
+                2: {'currency': self.env.company.currency_id},
+            },
+        )
+
+        # Adding analytic filter for the two analytic accounts used on the invoice line
+        # The two groupby columns should still be filled
+        options['analytic_accounts'] = [self.analytic_account_parent.id, self.analytic_account_child.id]
+
+        self.assertLinesValues(
+            # pylint: disable=C0326
+            # pylint: disable=bad-whitespace
+            self.report._get_lines(options),
+            [   0,                                 1,        2,         3],
+            [
+              ['Revenue',                     400.00,   600.00,   1000.00],
+              ['Less Costs of Revenue',         0.00,     0.00,      0.00],
+              ['Gross Profit',                400.00,   600.00,   1000.00],
+              ['Less Operating Expenses',       0.00,     0.00,      0.00],
+              ['Operating Income (or Loss)',  400.00,   600.00,   1000.00],
+              ['Plus Other Income',             0.00,     0.00,      0.00],
+              ['Less Other Expenses',           0.00,     0.00,      0.00],
+              ['Net Profit',                  400.00,   600.00,   1000.00],
+            ],
+            options,
+            currency_map={
+                1: {'currency': self.env.company.currency_id},
+                2: {'currency': self.env.company.currency_id},
+            },
+        )
+        # Keep only first analytic account on filter, the groupby column
+        # for this account should still be filled, unlike the other
+        options['analytic_accounts'] = [self.analytic_account_parent.id]
+
+        self.assertLinesValues(
+            # pylint: disable=C0326
+            # pylint: disable=bad-whitespace
+            self.report._get_lines(options),
+            [   0,                                 1,        2,         3],
+            [
+              ['Revenue',                     400.00,     0.00,   1000.00],
+              ['Less Costs of Revenue',         0.00,     0.00,      0.00],
+              ['Gross Profit',                400.00,     0.00,   1000.00],
+              ['Less Operating Expenses',       0.00,     0.00,      0.00],
+              ['Operating Income (or Loss)',  400.00,     0.00,   1000.00],
+              ['Plus Other Income',             0.00,     0.00,      0.00],
+              ['Less Other Expenses',           0.00,     0.00,      0.00],
+              ['Net Profit',                  400.00,     0.00,   1000.00],
+            ],
+            options,
+            currency_map={
+                1: {'currency': self.env.company.currency_id},
+                2: {'currency': self.env.company.currency_id},
+            },
+        )
+
+        # Keep only first analytic account on filter, the groupby column
+        # for this account should still be filled, unlike the other
+        options['analytic_accounts'] = [self.analytic_account_child.id]
+
+        self.assertLinesValues(
+            # pylint: disable=C0326
+            # pylint: disable=bad-whitespace
+            self.report._get_lines(options),
+            [   0,                                 1,        2,         3],
+            [
+              ['Revenue',                       0.00,   600.00,   1000.00],
+              ['Less Costs of Revenue',         0.00,     0.00,      0.00],
+              ['Gross Profit',                  0.00,   600.00,   1000.00],
+              ['Less Operating Expenses',       0.00,     0.00,      0.00],
+              ['Operating Income (or Loss)',    0.00,   600.00,   1000.00],
+              ['Plus Other Income',             0.00,     0.00,      0.00],
+              ['Less Other Expenses',           0.00,     0.00,      0.00],
+              ['Net Profit',                    0.00,   600.00,   1000.00],
+            ],
+            options,
+            currency_map={
+                1: {'currency': self.env.company.currency_id},
+                2: {'currency': self.env.company.currency_id},
+            },
+        )
+
+        # Set an unused analytic account in filter, all the columns
+        # should be empty, as no move is using this account
+        options['analytic_accounts'] = [self.analytic_account_parent_2.id]
+
+        self.assertLinesValues(
+            # pylint: disable=C0326
+            # pylint: disable=bad-whitespace
+            self.report._get_lines(options),
+            [   0,                                 1,      2,      3],
+            [
+              ['Revenue',                       0.00,   0.00,   0.00],
+              ['Less Costs of Revenue',         0.00,   0.00,   0.00],
+              ['Gross Profit',                  0.00,   0.00,   0.00],
+              ['Less Operating Expenses',       0.00,   0.00,   0.00],
+              ['Operating Income (or Loss)',    0.00,   0.00,   0.00],
+              ['Plus Other Income',             0.00,   0.00,   0.00],
+              ['Less Other Expenses',           0.00,   0.00,   0.00],
+              ['Net Profit',                    0.00,   0.00,   0.00],
+            ],
+            options,
+            currency_map={
+                1: {'currency': self.env.company.currency_id},
+                2: {'currency': self.env.company.currency_id},
+            },
+        )
+
+    def test_audit_cell_analytic_groupby_and_filter(self):
+        """
+        Test that the analytic filters are applied on the auditing of the cells
+        """
+        def _get_action_dict(options, column_index):
+            lines = self.report._get_lines(options)
+            report_line = self.report.line_ids[0]
+            report_line_dict = next(x for x in lines if x['name'] == report_line.name)
+            audit_param = self._get_audit_params_from_report_line(options, report_line, report_line_dict, column_group_key=list(options['column_groups'])[column_index])
+            return self.report.action_audit_cell(options, audit_param)
+
+        other_plan = self.env['account.analytic.plan'].create({'name': "Other Plan"})
+        other_account = self.env['account.analytic.account'].create({'name': "Other Account", 'plan_id': other_plan.id, 'active': True})
+
+        out_invoices = self.env['account.move'].create([
+            {
+                'move_type': 'out_invoice',
+                'partner_id': self.partner_a.id,
+                'date': '2023-02-01',
+                'invoice_date': '2023-02-01',
+                'invoice_line_ids': [
+                    Command.create({
+                        'product_id': self.product_a.id,
+                        'price_unit': 1000.0,
+                        'analytic_distribution': {
+                            self.analytic_account_parent.id: 40,
+                            self.analytic_account_child.id: 60,
+                        }
+                    }),
+                ]
+            },
+            {
+                'move_type': 'out_invoice',
+                'partner_id': self.partner_a.id,
+                'date': '2023-02-01',
+                'invoice_date': '2023-02-01',
+                'invoice_line_ids': [
+                    Command.create({
+                        'product_id': self.product_a.id,
+                        'price_unit': 2000.0,
+                        'analytic_distribution': {
+                            f'{self.analytic_account_parent.id},{other_account.id}': 100,
+                        },
+                    }),
+                ]
+            }
+        ])
+        out_invoices.action_post()
+        out_invoices = out_invoices.with_context(analytic_plan_id=self.analytic_plan_parent.id)
+        analytic_lines_parent = out_invoices.invoice_line_ids.analytic_line_ids.filtered(lambda line: line.auto_account_id == self.analytic_account_parent)
+        analytic_lines_other = out_invoices.with_context(analytic_plan_id=other_plan.id).invoice_line_ids.analytic_line_ids.filtered(lambda line: line.auto_account_id == other_account)
+
+        # Test with only groupby
+        options = self._generate_options(
+            self.report,
+            '2023-01-01',
+            '2023-12-31',
+            default_options={
+                'analytic_accounts_groupby': [self.analytic_account_parent.id, other_account.id],
+            }
+        )
+        action_dict = _get_action_dict(options, 0)  # First Column => Parent
+        self.assertEqual(
+            self.env['account.analytic.line'].search(action_dict['domain']),
+            analytic_lines_parent,
+            "Only the Analytic Line related to the Parent should be shown",
+        )
+        action_dict = _get_action_dict(options, 1)  # Second Column => Other
+        self.assertEqual(
+            self.env['account.analytic.line'].search(action_dict['domain']),
+            analytic_lines_other,
+            "Only the Analytic Line related to the Parent should be shown",
+        )
+
+        action_dict = _get_action_dict(options, 2)  # Third Column => AMLs
+        self.assertEqual(
+            out_invoices.line_ids.filtered_domain(action_dict['domain']),
+            out_invoices.invoice_line_ids,
+            "Both amls should be shown",
+        )
+
+        # Adding analytic filter for the two analytic accounts used on the invoice line
+        options['analytic_accounts'] = [self.analytic_account_parent.id, other_account.id]
+        action_dict = _get_action_dict(options, 0)  # First Column => Parent
+        self.assertEqual(
+            self.env['account.analytic.line'].search(action_dict['domain']),
+            analytic_lines_parent,
+            "Still only the Analytic Line related to the Parent should be shown",
+        )
+        action_dict = _get_action_dict(options, 1)  # Second Column => Other
+        self.assertEqual(
+            self.env['account.analytic.line'].search(action_dict['domain']),
+            analytic_lines_other,
+            "Still only the Analytic Line related to the Parent should be shown",
+        )
+
+        action_dict = _get_action_dict(options, 2)  # Third Column => AMLs
+        self.assertEqual(
+            out_invoices.line_ids.search(action_dict['domain']),
+            out_invoices.invoice_line_ids,
+            "Both amls should be shown",
+        )
+
+    def test_general_ledger_analytic_filter(self):
+        analytic_plan = self.env["account.analytic.plan"].create({
+            "name": "Default Plan",
+        })
+        analytic_account = self.env["account.analytic.account"].create({
+            "name": "Test Account",
+            "plan_id": analytic_plan.id,
+        })
+
+        invoice = self.init_invoice(
+            "out_invoice",
+            amounts=[100, 200],
+            invoice_date="2023-01-01",
+        )
+        invoice.action_post()
+        invoice.invoice_line_ids[0].analytic_distribution = {analytic_account.id: 100}
+
+        general_ledger_report = self.env.ref("odex30_account_reports.general_ledger_report")
+        options = self._generate_options(
+            general_ledger_report,
+            "2023-01-01",
+            "2023-01-01",
+            default_options={
+                'analytic_accounts': [analytic_account.id],
+                'unfold_all': True,
+            }
+        )
+
+        self.assertLinesValues(
+            general_ledger_report._get_lines(options),
+            #   Name                                    Debit           Credit          Balance
+            [   0,                                      5,              6,              7],
+            [
+                ['400000 Product Sales',                0.00,           100.00,         -100.00],
+                ['INV/2023/00001',                      0.00,           100.00,         -100.00],
+                ['Total 400000 Product Sales',          0.00,           100.00,         -100.00],
+                ['Total',                               0.00,           100.00,         -100.00],
+            ],
+            options,
+        )
+
+    def test_analytic_groupby_with_horizontal_groupby(self):
+
+        out_invoice_1 = self.env['account.move'].create([{
+            'move_type': 'out_invoice',
+            'partner_id': self.partner_a.id,
+            'date': '2024-07-01',
+            'invoice_date': '2024-07-01',
+            'invoice_line_ids': [
+                Command.create({
+                    'product_id': self.product_b.id,
+                    'price_unit': 500.0,
+                    'analytic_distribution': {
+                        self.analytic_account_parent_2.id: 80,
+                        self.analytic_account_parent_3.id: -10,
+                    },
+                }),
+            ]
+        }])
+        out_invoice_1.action_post()
+
+        out_invoice_2 = self.env['account.move'].create([{
+            'move_type': 'out_invoice',
+            'partner_id': self.partner_a.id,
+            'date': '2024-07-01',
+            'invoice_date': '2024-07-01',
+            'invoice_line_ids': [
+                Command.create({
+                    'product_id': self.product_a.id,
+                    'price_unit': 100.0,
+                    'analytic_distribution': {
+                        self.analytic_account_parent.id: 100,
+                    },
+                }),
+            ]
+        }])
+        out_invoice_2.action_post()
+
+        horizontal_group = self.env['account.report.horizontal.group'].create({
+            'name': 'Horizontal Group Journal Entries',
+            'report_ids': [self.report.id],
+            'rule_ids': [
+                Command.create({
+                    'field_name': 'move_id',  # this field is specific to account.move.line and not in account.analytic.line
+                    'domain': f"[('id', 'in', {(out_invoice_1 + out_invoice_2).ids})]",
+                }),
+            ],
+        })
+
+        options = self._generate_options(
+            self.report,
+            '2024-01-01',
+            '2024-12-31',
+            default_options={
+                'analytic_accounts_groupby': [self.analytic_account_parent.id, self.analytic_account_parent_2.id, self.analytic_account_parent_3.id],
+                'selected_horizontal_group_id': horizontal_group.id,
+            }
+        )
+
+        self.assertLinesValues(
+            self.report._get_lines(options),
+            #   Horizontal groupby               [             Move 2              ]     [               Move 1                ]
+            #   Analytic groupby                    A1          A2      A3      Balance     A1          A2       A3         Balance
+            [   0,                                  1,          2,      3,      4,          5,          6,      7,          8],
+            [
+              ['Revenue',                       100.00,     0.00,   0.00,   100.00,     0.00,    400.00,    -50.00,     500.00],
+              ['Less Costs of Revenue',           0.00,     0.00,   0.00,     0.00,     0.00,      0.00,      0.00,       0.00],
+              ['Gross Profit',                  100.00,     0.00,   0.00,   100.00,     0.00,    400.00,    -50.00,     500.00],
+              ['Less Operating Expenses',         0.00,     0.00,   0.00,     0.00,     0.00,      0.00,      0.00,       0.00],
+              ['Operating Income (or Loss)',    100.00,     0.00,   0.00,   100.00,     0.00,    400.00,    -50.00,     500.00],
+              ['Plus Other Income',               0.00,     0.00,   0.00,     0.00,     0.00,      0.00,      0.00,       0.00],
+              ['Less Other Expenses',             0.00,     0.00,   0.00,     0.00,     0.00,      0.00,      0.00,       0.00],
+              ['Net Profit',                    100.00,     0.00,   0.00,   100.00,     0.00,    400.00,    -50.00,     500.00],
+            ],
+            options,
+        )
+
+    def test_analytic_groupby_with_analytic_simulations(self):
+        """
+        Create an analytic simulation (analytic line without a move line)
+        and check that it is taken into account in the report
+        """
+
+        self.env['account.analytic.line'].create({
+            'name': 'Simulation',
+            'date': '2019-05-01',
+            'amount': 100.0,
+            'unit_amount': 1.0,
+            'company_id': self.env.company.id,
+            self.analytic_plan_parent._column_name(): self.analytic_account_parent.id,
+            'general_account_id': self.company_data['default_account_revenue'].id,
+        })
+
+        options = self._generate_options(
+            self.report,
+            '2019-01-01',
+            '2019-12-31',
+            default_options={
+                'analytic_plans_groupby': [self.analytic_plan_parent.id, self.analytic_plan_child.id],
+                'include_analytic_without_aml': True,
+            }
+        )
+
+        self.assertLinesValues(
+            self.report._get_lines(options),
+            [   0,                                     1,          2],
+            [
+                ('Revenue',                       100.00,       0.00),
+                ('Less Costs of Revenue',           0.00,       0.00),
+                ('Gross Profit',                  100.00,       0.00),
+                ('Less Operating Expenses',         0.00,       0.00),
+                ('Operating Income (or Loss)',    100.00,       0.00),
+                ('Plus Other Income',               0.00,       0.00),
+                ('Less Other Expenses',             0.00,       0.00),
+                ('Net Profit',                    100.00,       0.00),
+            ],
+            options,
+        )
+
+    def test_analytic_groupby_plans_without_analytic_accounts(self):
+        """
+        Ensure that grouping on several analytic plans without any analytic accounts works as expected
+        """
+        analytic_plans_without_accounts = self.env['account.analytic.plan'].create([
+            {'name': 'Plan 1'},
+            {'name': 'Plan 2'},
+        ])
+
+        options = self._generate_options(
+            self.report, '2019-01-01', '2019-12-31',
+            default_options={'analytic_plans_groupby': analytic_plans_without_accounts.ids}
+        )
+
+        self.assertEqual(
+            len(options['column_groups']), 3,
+            "the number of column groups should be 3, despite the 2 analytic plans having the exact same analytic accounts list"
+        )
+
+        self.assertLinesValues(
+            self.report._get_lines(options),
+            #                                     Plan 1        Plan 2         Total
+            [   0,                                     1,          2,             3],
+            [
+                ('Revenue',                         0.00,       0.00,          0.00),
+                ('Less Costs of Revenue',           0.00,       0.00,          0.00),
+                ('Gross Profit',                    0.00,       0.00,          0.00),
+                ('Less Operating Expenses',         0.00,       0.00,          0.00),
+                ('Operating Income (or Loss)',      0.00,       0.00,          0.00),
+                ('Plus Other Income',               0.00,       0.00,          0.00),
+                ('Less Other Expenses',             0.00,       0.00,          0.00),
+                ('Net Profit',                      0.00,       0.00,          0.00),
+            ],
+            options,
+        )
+
+    def test_profit_and_loss_multicompany_access_rights(self):
+        branch = self.env['res.company'].create([{
+            'name': "My Test Branch",
+            'parent_id': self.env.company.id,
+        }])
+        other_currency = self.setup_other_currency('EUR', rounding=0.001)
+        test_journal = self.env['account.journal'].create({
+            'name': 'Test Journal',
+            'code': 'TEST',
+            'type': 'sale',
+            'company_id': self.env.company.id,
+            'currency_id': other_currency.id,
+        })
+        test_user = self.env['res.users'].create({
+            'login': 'test',
+            'name': 'The King',
+            'email': 'noop@example.com',
+            'groups_id': [Command.link(self.env.ref('account.group_account_manager').id)],
+            'company_ids': [Command.link(self.env.company.id), Command.link(branch.id)],
+        })
+        self.env.invalidate_all()
+
+        options = self._generate_options(
+            self.report.with_user(test_user).with_company(branch), '2019-01-01', '2019-12-31',
+        )
+        lines = self.report._get_lines(options)
+        self.assertTrue(lines)
+        self.assertEqual(test_journal.display_name, "Test Journal (EUR)")
diff --git a/dev_odex30_accounting/odex30_account_reports/tests/test_balance_sheet_balanced.py b/dev_odex30_accounting/odex30_account_reports/tests/test_balance_sheet_balanced.py
new file mode 100644
index 0000000..ff962de
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_reports/tests/test_balance_sheet_balanced.py
@@ -0,0 +1,813 @@
+# pylint: disable=C0326
+import logging
+import itertools
+import contextlib
+
+from odoo.addons.odex30_account_reports.tests.common import TestAccountReportsCommon
+from odoo.addons.account.models.chart_template import SYSCOHADA_LIST
+
+from odoo.tests import tagged, new_test_user
+from odoo import fields, Command
+
+
+_logger = logging.getLogger(__name__)
+syscohada_coas = [country_code.lower() for country_code in SYSCOHADA_LIST]
+syscebnl_coas = [f'{country_code.lower}_syscebnl' for country_code in SYSCOHADA_LIST]
+
+
+# === Set this variable to something truthy if you want the test to identify any incorrectly-referenced accounts for you. === #
+IDENTIFY_INCORRECT_ACCOUNTS = False
+# === Set this to True (if the above is set to True) if you want the test to show you journal entries for reproducing the imbalance === #
+EXTRA_DETAIL = False
+
+# === When creating a new Balance Sheet, please add its config here. === #
+''' Example config:
+REPORT_CONFIG = {
+    <Balance Sheet report xmlid> : {
+        'asset_line_ref': <Total Assets line xmlid>
+        'liability_line_ref': <Total Liabilities line xmlid>
+        'equity_line_ref': (optional) <Total Equity line xmlid> (if not included in Liabilities)
+        'balance_col_label': (optional) <expression_label of the report column containing the totals> (if different from 'balance')
+        'chart_template_refs': (optional) <list of CoAs for which the report should be tested (by default any CoA on which the report is available)>
+    },
+} '''
+
+REPORT_CONFIG = {
+    'odex30_account_reports.balance_sheet': {
+        'asset_line_ref': 'odex30_account_reports.account_financial_report_total_assets0',
+        'liability_line_ref': 'odex30_account_reports.account_financial_report_liabilities_and_equity_view0',
+    },
+    'l10n_at_reports.account_financial_report_l10n_at_paragraph_224_ugb': {
+        'asset_line_ref': 'l10n_at_reports.account_financial_report_l10n_at_paragraph_224_ugb_line_activa',
+        'liability_line_ref': 'l10n_at_reports.account_financial_report_l10n_at_paragraph_224_ugb_line_passiva',
+    },
+    'l10n_be_reports.account_financial_report_bs_asso_a': {
+        'asset_line_ref': 'l10n_be_reports.account_financial_report_bs_asso_a_a_tot',
+        'liability_line_ref': 'l10n_be_reports.account_financial_report_bs_asso_a_el_tot',
+    },
+    'l10n_be_reports.account_financial_report_bs_asso_f': {
+        'asset_line_ref': 'l10n_be_reports.account_financial_report_bs_asso_f_a_tot',
+        'liability_line_ref': 'l10n_be_reports.account_financial_report_bs_asso_f_el_tot',
+    },
+    'l10n_be_reports.account_financial_report_bs_comp_acap': {
+        'asset_line_ref': 'l10n_be_reports.account_financial_report_bs_comp_acap_a_tot',
+        'liability_line_ref': 'l10n_be_reports.account_financial_report_bs_comp_acap_el_tot',
+    },
+    'l10n_be_reports.account_financial_report_bs_comp_acon': {
+        'asset_line_ref': 'l10n_be_reports.account_financial_report_bs_comp_acon_a_tot',
+        'liability_line_ref': 'l10n_be_reports.account_financial_report_bs_comp_acon_el_tot',
+    },
+    'l10n_be_reports.account_financial_report_bs_comp_fcap': {
+        'asset_line_ref': 'l10n_be_reports.account_financial_report_bs_comp_fcap_a_tot',
+        'liability_line_ref': 'l10n_be_reports.account_financial_report_bs_comp_fcap_el_tot',
+    },
+    'l10n_be_reports.account_financial_report_bs_comp_fcon': {
+        'asset_line_ref': 'l10n_be_reports.account_financial_report_bs_comp_fcon_a_tot',
+        'liability_line_ref': 'l10n_be_reports.account_financial_report_bs_comp_fcon_el_tot',
+    },
+    'l10n_bg_reports.l10n_bg_bs': {
+        'asset_line_ref': 'l10n_bg_reports.l10n_bg_bs_assets',
+        'liability_line_ref': 'l10n_bg_reports.l10n_bg_bs_liabilities',
+    },
+    'l10n_bo_reports.l10n_bo_bs': {
+        'asset_line_ref': 'l10n_bo_reports.l10n_bo_bs_assets',
+        'liability_line_ref': 'l10n_bo_reports.l10n_bo_bs_liabilities_plus_equity',
+    },
+    'l10n_br_reports.account_financial_report_br_balancesheet0': {
+        'asset_line_ref': 'l10n_br_reports.account_financial_report_total_assets0',
+        'liability_line_ref': 'l10n_br_reports.account_financial_report_liabilities_view0',
+    },
+    'l10n_ca_reports.l10n_ca_balance_sheet': {
+        'asset_line_ref': 'l10n_ca_reports.l10n_ca_bs_assets',
+        'liability_line_ref': 'l10n_ca_reports.l10n_ca_bs_equity_liability',
+    },
+    'l10n_ch_reports.account_financial_report_l10n_ch_bilan': {
+        'asset_line_ref': 'l10n_ch_reports.account_financial_report_line_ch_1',
+        'liability_line_ref': 'l10n_ch_reports.account_financial_report_line_ch_2',
+    },
+    'l10n_cl_reports.cl_eightcolumns_report': {
+        'chart_template_refs': [],
+    },
+    'l10n_co_reports.l10n_co_bs_report': {
+        'asset_line_ref': 'l10n_co_reports.l10n_co_bs_report_assets',
+        'liability_line_ref': 'l10n_co_reports.l10n_co_bs_report_liabilities_equity',
+    },
+    'l10n_co_reports.l10n_co_reports_libro_inv_blc': {
+        'asset_line_ref': 'l10n_co_reports.l10n_co_inv_blc_assets_expenses',
+        'liability_line_ref': 'l10n_co_reports.l10n_co_inv_blc_equity_liability',
+    },
+    'l10n_cy_reports.l10n_cy_balance_sheet': {
+        'asset_line_ref': 'l10n_cy_reports.account_financial_report_cy_active_line',
+        'liability_line_ref': 'l10n_cy_reports.account_financial_report_cy_passive_line',
+    },
+    'l10n_cz_reports.balance_sheet_l10n_cz_reports': {
+        'asset_line_ref': 'l10n_cz_reports.l10n_cz_reports_bs_aktiva',
+        'liability_line_ref': 'l10n_cz_reports.l10n_cz_reports_bs_pasiva',
+        'balance_col_label': 'net',
+    },
+    'l10n_de_reports.balance_sheet_l10n_de': {
+        'asset_line_ref': 'l10n_de_reports.skr_asset_total',
+        'liability_line_ref': 'l10n_de_reports.skr_liabilities_total',
+    },
+    'l10n_dk_reports.account_balance_report_l10n_dk_balance': {
+        'asset_line_ref': 'l10n_dk_reports.account_balance_report_l10n_dk_active',
+        'liability_line_ref': 'l10n_dk_reports.account_balance_report_l10n_dk_passiv',
+    },
+    'l10n_dk_reports.account_balance_report_l10n_dk_balance_minimal': {
+        'asset_line_ref': 'l10n_dk_reports.account_balance_report_minimal_l10n_dk_active',
+        'liability_line_ref': 'l10n_dk_reports.account_balance_report_minimal_l10n_dk_passive',
+    },
+    'l10n_do_reports.l10n_do_bs': {
+        'asset_line_ref': 'l10n_do_reports.l10n_do_bs_assets',
+        'liability_line_ref': 'l10n_do_reports.l10n_do_bs_liabilities_plus_equity',
+    },
+    'l10n_dz_reports.l10n_dz_bs': {
+        'asset_line_ref': 'l10n_dz_reports.l10n_dz_bs_assets',
+        'liability_line_ref': 'l10n_dz_reports.l10n_dz_bs_liabilities',
+        'balance_col_label': 'net',
+    },
+    'l10n_ec_reports.l10n_ec_balance_sheet': {
+        'asset_line_ref': 'l10n_ec_reports.l10n_ec_balance_sheet_assets',
+        'liability_line_ref': 'l10n_ec_reports.l10n_ec_balance_sheet_liabilities_and_equity',
+    },
+    'l10n_ee_reports.account_financial_report_bs': {
+        'asset_line_ref': 'l10n_ee_reports.account_financial_report_bs_assets',
+        'liability_line_ref': 'l10n_ee_reports.account_financial_report_bs_liabilities_equity',
+    },
+    'l10n_es_reports.financial_report_balance_sheet_assoc': {
+        'asset_line_ref': 'l10n_es_reports.balance_assoc_line_10000',
+        'liability_line_ref': 'l10n_es_reports.balance_assoc_line_30000',
+    },
+    'l10n_es_reports.financial_report_balance_sheet_full': {
+        'asset_line_ref': 'l10n_es_reports.balance_full_line_10000',
+        'liability_line_ref': 'l10n_es_reports.balance_full_line_30000',
+    },
+    'l10n_es_reports.financial_report_balance_sheet_pymes': {
+        'asset_line_ref': 'l10n_es_reports.balance_pymes_line_10000',
+        'liability_line_ref': 'l10n_es_reports.balance_pymes_line_30000',
+    },
+    'l10n_fi_reports.account_financial_report_l10n_fi_bs': {
+        'asset_line_ref': 'l10n_fi_reports.account_financial_report_l10n_fi_bs_line_1',
+        'liability_line_ref': 'l10n_fi_reports.account_financial_report_l10n_fi_bs_line_2',
+    },
+    'l10n_fr_reports.account_financial_report_l10n_fr_bilan': {
+        'asset_line_ref': 'l10n_fr_reports.account_financial_report_fr_bilan_actif_total',
+        'liability_line_ref': 'l10n_fr_reports.account_financial_report_fr_bilan_passif_total',
+        'balance_col_label': 'net',
+    },
+    'l10n_fr_reports.account_financial_report_l10n_fr_bilan_2024': {
+        'asset_line_ref': 'l10n_fr_reports.account_financial_report_fr_bilan_actif_total_2024',
+        'liability_line_ref': 'l10n_fr_reports.account_financial_report_fr_bilan_passif_total_2024',
+        'balance_col_label': 'net',
+    },
+    'l10n_gr_reports.l10n_gr_bs_accounting_report': {
+        'asset_line_ref': 'l10n_gr_reports.l10n_gr_bs_assets',
+        'liability_line_ref': 'l10n_gr_reports.l10n_gr_bs_equity_provisions_liabilities',
+    },
+    'l10n_hr_reports.l10n_hr_balance_sheet': {
+        'asset_line_ref': 'l10n_hr_reports.account_financial_report_hr_active_title0',
+        'liability_line_ref': 'l10n_hr_reports.account_financial_report_hr_passif_title0',
+        'chart_template_refs': ['hr'],  # don't test the hr_kuna CoA anymore (obsolete)
+    },
+    'l10n_hu_reports.l10n_hu_balance_sheet': {
+        'asset_line_ref': 'l10n_hu_reports.l10n_hu_balance_sheet_assets',
+        'liability_line_ref': 'l10n_hu_reports.l10n_hu_balance_sheet_liabilities',
+    },
+    'l10n_ie_reports.l10n_ie_bs': {
+        'asset_line_ref': 'l10n_ie_reports.l10n_ie_bs_assets_total',
+        'liability_line_ref': 'l10n_ie_reports.l10n_ie_bs_liabilities_total',
+    },
+    'l10n_it_reports.account_financial_report_it_sp': {
+        'asset_line_ref': 'l10n_it_reports.account_financial_report_line_it_sp_assets_total',
+        'liability_line_ref': 'l10n_it_reports.account_financial_report_line_it_sp_passif_total',
+    },
+    'l10n_it_reports.account_financial_report_it_sp_reduce': {
+        'asset_line_ref': 'l10n_it_reports.account_financial_report_line_it_sp_reduce_assets_total',
+        'liability_line_ref': 'l10n_it_reports.account_financial_report_line_it_sp_reduce_passif_total',
+    },
+    'l10n_ke_reports.account_financial_report_ke_bs': {
+        'asset_line_ref': 'l10n_ke_reports.account_financial_report_ke_bs_A',
+        'liability_line_ref': 'l10n_ke_reports.account_financial_report_ke_bs_B',
+    },
+    'l10n_kh_reports.l10n_kh_balance_sheet': {
+        'asset_line_ref': 'l10n_kh_reports.l10n_kh_balance_sheet_kh_bs_a',
+        'liability_line_ref': 'l10n_kh_reports.l10n_kh_balance_sheet_kh_bs_el',
+    },
+    'l10n_kz_reports.l10n_kz_bl_report': {
+        'asset_line_ref': 'l10n_kz_reports.l10n_kz_bl_assets',
+        'liability_line_ref': 'l10n_kz_reports.l10n_kz_bl_equity_liabilities',
+    },
+    'l10n_lt_reports.account_financial_report_balancesheet_lt': {
+        'asset_line_ref': 'l10n_lt_reports.account_financial_html_report_line_bs_lt_debit',
+        'liability_line_ref': 'l10n_lt_reports.account_financial_html_report_line_bs_lt_credit',
+    },
+    'l10n_lu_reports.account_financial_report_l10n_lu_bs_abr': {
+        'asset_line_ref': 'l10n_lu_reports.account_financial_report_l10n_lu_bs_abr_line_1_6',
+        'liability_line_ref': 'l10n_lu_reports.account_financial_report_l10n_lu_bs_abr_line_2_5',
+    },
+    'l10n_lu_reports.account_financial_report_l10n_lu_bs': {
+        'asset_line_ref': 'l10n_lu_reports.account_financial_report_l10n_lu_bs_line_1_6',
+        'liability_line_ref': 'l10n_lu_reports.account_financial_report_l10n_lu_bs_line_2_5',
+    },
+    'l10n_lv_reports.l10n_lv_balance_sheet': {
+        'asset_line_ref': 'l10n_lv_reports.account_financial_report_lv_active_title',
+        'liability_line_ref': 'l10n_lv_reports.account_financial_report_lv_passif_title',
+    },
+    'l10n_ma_reports.account_financial_report_bs': {
+        'asset_line_ref': 'l10n_ma_reports.account_financial_report_bs_a_total',
+        'liability_line_ref': 'l10n_ma_reports.account_financial_report_bs_p_total',
+        'balance_col_label': 'net',
+    },
+    'l10n_mn_reports.account_report_balancesheet': {
+        'asset_line_ref': 'l10n_mn_reports.report_line_balanceta',
+        'liability_line_ref': 'l10n_mn_reports.report_line_balancele',
+    },
+    'l10n_mr_reports.l10n_mr_balance_sheet': {
+        'asset_line_ref': 'l10n_mr_reports.account_financial_report_mr_active_title',
+        'liability_line_ref': 'l10n_mr_reports.account_financial_report_mr_passive_title',
+    },
+    'l10n_mt_reports.l10n_mt_balance_sheet': {
+        'asset_line_ref': 'l10n_mt_reports.account_financial_report_mt_active_title',
+        'liability_line_ref': 'l10n_mt_reports.account_financial_report_mt_passif_title',
+    },
+    'l10n_mz_reports.l10_mz_bs': {
+        'asset_line_ref': 'l10n_mz_reports.l10n_mz_bs_line_1',
+        'liability_line_ref': 'l10n_mz_reports.l10n_mz_bs_line_2',
+    },
+    'l10n_nl_reports.account_financial_report_bs': {
+        'asset_line_ref': 'l10n_nl_reports.account_financial_report_bs_assets',
+        'liability_line_ref': 'l10n_nl_reports.account_financial_report_bs_leq',
+    },
+    'l10n_nl_reports.account_financial_report_bs_tags': {
+        'asset_line_ref': 'l10n_nl_reports.account_financial_report_bs_tags_assets',
+        'liability_line_ref': 'l10n_nl_reports.account_financial_report_bs_tags_leq',
+    },
+    'l10n_no_reports.account_financial_report_NO_balancesheet': {
+        'asset_line_ref': 'l10n_no_reports.account_financial_report_NO_active',
+        'liability_line_ref': 'l10n_no_reports.account_financial_report_NO_passive',
+    },
+    'l10n_pe_reports.account_financial_report_bs': {
+        'asset_line_ref': 'l10n_pe_reports.account_financial_report_bs_A_TOTAL',
+        'liability_line_ref': 'l10n_pe_reports.account_financial_report_bs_EL',
+    },
+    'l10n_pk_reports.account_financial_report_pk_balancesheet0': {
+        'asset_line_ref': 'l10n_pk_reports.account_balance_report_pk_asset',
+        'liability_line_ref': 'l10n_pk_reports.account_balance_report_pk_equity_plus_liabilities',
+    },
+    'l10n_pl_reports.l10n_pl_micro_bs': {
+        'asset_line_ref': 'l10n_pl_reports.l10n_pl_micro_bs_assets',
+        'liability_line_ref': 'l10n_pl_reports.l10n_pl_micro_bs_passives',
+    },
+    'l10n_pl_reports.l10n_pl_small_bs': {
+        'asset_line_ref': 'l10n_pl_reports.l10n_pl_small_bs_assets',
+        'liability_line_ref': 'l10n_pl_reports.l10n_pl_small_bs_passives',
+    },
+    'l10n_pt_reports.account_financial_report_line_pt_balanco': {
+        'asset_line_ref': 'l10n_pt_reports.account_financial_report_line_pt_balanco_total_do_ativo',
+        'liability_line_ref': 'l10n_pt_reports.account_financial_report_line_pt_balanco_total_do_capital_proprio_e_do_passivo',
+    },
+    'l10n_ro_reports.account_financial_report_ro_bs_smle': {
+        'asset_line_ref': 'l10n_ro_reports.account_financial_report_ro_bs_smle_total_assets',
+        'liability_line_ref': 'l10n_ro_reports.account_financial_report_ro_bs_smle_total_liabilities',
+    },
+    'l10n_ro_reports.account_financial_report_ro_bs_large': {
+        'asset_line_ref': 'l10n_ro_reports.account_financial_report_ro_bs_large_total_assets',
+        'liability_line_ref': 'l10n_ro_reports.account_financial_report_ro_bs_large_total_liabilities',
+    },
+    'l10n_rs_reports.account_financial_report_rs_BS': {
+        'asset_line_ref': 'l10n_rs_reports.account_financial_report_rs_BS_assets',
+        'liability_line_ref': 'l10n_rs_reports.account_financial_report_rs_BS_equity_liabilities',
+    },
+    'l10n_rw_reports.l10n_rw_balance_sheet': {
+        'asset_line_ref': 'l10n_rw_reports.account_financial_report_rw_active',
+        'liability_line_ref': 'l10n_rw_reports.account_financial_report_rw_passive',
+    },
+    'l10n_se_reports.account_financial_report_bs': {
+        'asset_line_ref': 'l10n_se_reports.account_financial_report_bs_A_TOTAL',
+        'liability_line_ref': 'l10n_se_reports.account_financial_report_bs_EL_TOTAL',
+    },
+    'l10n_si_reports.l10n_si_balance_sheet': {
+        'asset_line_ref': 'l10n_si_reports.l10n_si_balance_sheet_resources',
+        'liability_line_ref': 'l10n_si_reports.l10n_si_balance_sheet_liabilities',
+    },
+    'l10n_syscohada_reports.account_financial_report_syscohada_bilan': {
+        'asset_line_ref': 'l10n_syscohada_reports.account_financial_report_line_03_3_11_syscohada_bilan_actif',
+        'liability_line_ref': 'l10n_syscohada_reports.account_financial_report_line_03_3_11_syscohada_bilan_passif',
+        'chart_template_refs': syscohada_coas,
+    },
+    'l10n_syscohada_reports.account_financial_report_syscebnl_bilan_assoc': {
+        'asset_line_ref': 'l10n_syscohada_reports.account_financial_report_syscohada_bilan_actif_total',
+        'liability_line_ref': 'l10n_syscohada_reports.account_financial_report_syscohada_bilan_passif_total',
+        'chart_template_refs': syscebnl_coas,
+    },
+    'l10n_tn_reports.l10n_tn_bs_account_report': {
+        'asset_line_ref': 'l10n_tn_reports.l10n_tn_bs_assets',
+        'liability_line_ref': 'l10n_tn_reports.l10n_tn_bs_liabilities_equity',
+    },
+    'l10n_tr_reports.account_report_l10n_tr_balance_sheet': {
+        'asset_line_ref': 'l10n_tr_reports.account_report_line_trbs_active',
+        'liability_line_ref': 'l10n_tr_reports.account_report_line_trbs_pasive',
+    },
+    'l10n_tw_reports.balance_sheet_l10n_tw': {
+        'asset_line_ref': 'l10n_tw_reports.account_financial_report_total_assets0_l10n_tw',
+        'liability_line_ref': 'l10n_tw_reports.account_financial_report_libailities_and_equity',
+    },
+    'l10n_tz_reports.l10n_tz_balance_sheet': {
+        'asset_line_ref': 'l10n_tz_reports.account_financial_report_tz_active',
+        'liability_line_ref': 'l10n_tz_reports.account_financial_report_tz_passive',
+    },
+    'l10n_vn_reports.balance_sheet_l10n_vn': {
+        'asset_line_ref': 'l10n_vn_reports.account_financial_report_l10n_vn_bs_ta',
+        'liability_line_ref': 'l10n_vn_reports.account_financial_report_l10n_vn_bs_tos',
+    },
+    'l10n_zm_reports.balance_sheet_zm': {
+        'asset_line_ref': 'l10n_zm_reports.balance_sheet_zm_assets',
+        'liability_line_ref': 'l10n_zm_reports.balance_sheet_zm_liabilities_and_equities',
+    },
+    'l10n_kr_reports.l10_kr_bs': {
+        'asset_line_ref': 'l10n_kr_reports.l10n_kr_bs_ta',
+        'liability_line_ref': 'l10n_kr_reports.l10n_kr_bs_le',
+    },
+    'l10n_cn_reports.l10n_cn_asbe_bs': {
+        'asset_line_ref': 'l10n_cn_reports.l10n_cn_asbe_bs_cn_a',
+        'liability_line_ref': 'l10n_cn_reports.l10n_cn_asbe_bs_cn_tle',
+    },
+    'l10n_cn_reports.l10n_cn_assbe_bs': {
+        'asset_line_ref': 'l10n_cn_reports.l10n_cn_assbe_bs_cns_ta',
+        'liability_line_ref': 'l10n_cn_reports.l10n_cn_assbe_bs_cns_tle',
+    },
+}
+
+# === If some accounts should be excluded from the testing, specify them here === #
+# Accounts starting with 99 are excluded anyway: users should change their codes
+# to something sensible in order for them to be taken into account in the Balance Sheet.
+'''
+NON_TESTED_ACCOUNTS = {
+    <chart template ref>: [account_code_1, account_code_2, ...]
+}
+'''
+NON_TESTED_ACCOUNTS = {
+    'all': [
+        '99',  # 99 account codes are placeholders and should normally be changed by the user.
+        '123456'  # hr.payroll creates an account 123456 Account Payslip Houserental for demo companies; don't test it
+    ],
+    **{coa: ['13'] for coa in syscohada_coas},
+    'at': ['98'],
+    'mn': ['9301'],
+    'it': ['412', '413', '9102'],
+    'pt': ['811'],
+}
+
+
+def log_incorrect_accounts_quiet(report_setup_data, amls, totals, is_first_call):
+    if is_first_call:
+        _logger.error("""
+                The Balance Sheet %s is not balanced.
+                These accounts are incorrectly used in the Balance Sheet
+                or in the Profit & Loss, if inserted into the Balance Sheet via cross-report).
+                To show the journal entries that cause the imbalance,
+                set the EXTRA_DETAIL global to True at the top of the test file.
+            """,
+            report_setup_data['report_ref'],
+        )
+
+    _logger.error('- %s %s', amls[0].account_id.code, amls[0].account_id.name)
+
+
+def log_incorrect_accounts_detailed(report_setup_data, amls, totals, is_first_call):
+    if is_first_call:
+        _logger.error("""
+                The Balance Sheet %s is not balanced.
+                If you construct any of the following journal entries, Assets != Liabilities + Equity.
+            """,
+            report_setup_data['report_ref'],
+        )
+
+    format_params = []
+    currency = amls.currency_id
+    for aml in amls:
+        format_params += [
+            aml.date,
+            f'{aml.account_id.code} {aml.account_id.name}'[:50],
+            currency.format(aml.debit),
+            currency.format(aml.credit),
+        ]
+    format_params += [
+        report_setup_data['report_date'],
+        currency.format(totals['total_asset']),
+        currency.format(totals['total_liability']),
+    ]
+    error_msg = '''
+        +------------+----------------------------------------------------+------------------+------------------+
+        |    Date    |                        Account                     |       Debit      |      Credit      |
+        +------------+----------------------------------------------------+------------------+------------------+
+        | {:10} | {:<50} | {:<16} | {:<16} |
+        | {:10} | {:<50} | {:<16} | {:<16} |
+        +------------+----------------------------------------------------+------------------+------------------+
+        Balance Sheet on {}: Total Assets: {} ; Total Liabilities + Equity: {}
+    '''.format(*format_params)
+    _logger.error(error_msg)
+
+
+@tagged('post_install_l10n', 'post_install', '-at_install')
+class TestBalanceSheetBalanced(TestAccountReportsCommon):
+    ''' Diagnose unbalanced Balance Sheets.
+
+    We do this by creating a journal entry with two journal items in each account:
+    one debit and one credit. We then generate the Balance Sheet report, and check
+    whether the Assets line is equal to the sum of the Liabilities and Equity lines.
+
+    Some accounts are not checked:
+    - those starting with '99' (automatically created in order to enable some
+      functionalities to work, but the user is expected to change their code)
+    - those included in the NON_TESTED_ACCOUNTS dict.
+
+    The test can optionally identify guilty accounts using binary search; this can
+    be toggled on by setting IDENTIFY_INCORRECT_ACCOUNTS = True.
+    '''
+    @classmethod
+    def setup_independent_user(cls):
+        # OVERRIDE: let the user have access to all existing companies.
+        # This allows us to use demo companies for a significant speedup.
+        cls.existing_companies = cls.env['res.company'].search([])
+        return new_test_user(
+            cls.env,
+            name='Because I am accountman!',
+            login='accountman',
+            password='accountman',
+            email='accountman@test.com',
+            groups_id=cls.get_default_groups().ids,
+            company_ids=[Command.link(company.id) for company in cls.existing_companies],
+        )
+
+    @classmethod
+    def setup_independent_company(cls):
+        # OVERRIDE: Don't create an independent company by default
+        pass
+
+    def test_balance_sheet_balanced(self):
+        ''' The main test function: check whether every installed balance sheet is balanced. '''
+        installed_modules = self.env['ir.module.module'].search([('state', '=', 'installed')])
+        installed_coas = [
+            name
+            for mapping in installed_modules.mapped('account_templates')
+            for name, template in mapping.items()
+            if template['visible'] and name not in ('syscohada', 'syscebnl')  # Syscohada template is visible but deprecated since odoo#163350
+        ]
+
+        self.existing_companies = self.env['res.company'].search([])
+
+        self.env.flush_all()
+
+        for coa in installed_coas:
+            with contextlib.closing(self.env.cr.savepoint(flush=False)), self.subTest(CoA=coa):
+                # === 1. Set-up localization === #
+                available_reports, aml_pairs, accounts_by_aml = self._set_up_localization(coa)
+                self.env.cr.execute("ANALYZE account_account, account_move, account_move_line")
+
+                # Test each of the Balance Sheet reports available for the CoA.
+                for report in available_reports:
+                    report_ref = report.get_external_id()[report.id]
+                    with self.subTest(Report=report_ref):
+                        _logger.info('Testing report %s with CoA %s', report_ref, coa)
+
+                        # === 2. Set-up report === #
+                        report_setup_data = self._set_up_report(report)
+
+                        # === 3. Test that the report is balanced with both the debits journal entry and the credits journal entry. === #
+                        if not IDENTIFY_INCORRECT_ACCOUNTS:
+                            self._check_balance_sheet_balanced(report_setup_data, aml_pairs)
+                        else:
+                            bad_account_ids = set()
+                            logging_fn = log_incorrect_accounts_detailed if EXTRA_DETAIL else log_incorrect_accounts_quiet
+
+                            self._identify_incorrect_accounts(
+                                report_setup_data,
+                                aml_pairs,
+                                accounts_by_aml,
+                                bad_account_ids,
+                                logging_fn,
+                            )
+                            if bad_account_ids:
+                                self.fail('Balance Sheet not balanced.')
+
+    def _set_up_localization(self, coa):
+        ''' Set up a localization for testing.
+
+            This identifies the company to use (creating it if needed),
+            sets self.env.company to it, and generates AMLs for testing.
+
+            If a (demo) company already exists with the CoA, we'll just use it
+            rather than create a new company and load a new CoA for it.
+
+            :param account.chart.template coa: the Chart of Accounts to install
+
+            :return: (available_reports, aml_pairs, accounts_by_aml), where:
+                * available_reports are the reports that can be tested for this localization
+                * aml_pairs is a list of (aml_id, counterpart_aml_id) that were generated
+                * accounts_by_aml is a map {aml_id: account_id} for the generated AMLs
+        '''
+        # Always reset company, as the one used in the previous subtest might not exist anymore
+        self.env.company = self.existing_companies[0]
+
+        coa_setup_data = {}
+        if coa in self.existing_companies.mapped('chart_template'):
+            self.env.company = next(iter(self.existing_companies.filtered(lambda c: c.chart_template == coa)))
+
+            coa_setup_data['counterpart_account'] = self.env['account.account'].search([
+                ('company_ids', '=', self.env.company.id),
+                ('account_type', '=', 'asset_receivable'),
+            ], limit=1)
+            coa_setup_data['income_account'] = self.env['account.account'].search([
+                ('company_ids', '=', self.env.company.id),
+                ('internal_group', '=', 'income'),
+            ], limit=1)
+            coa_setup_data['journal'] = self.env['account.journal'].search([
+                ('company_id', '=', self.env.company.id),
+                ('type', '=', 'general')
+            ], limit=1)
+        else:
+            self.__class__.chart_template = coa
+            company_data = self.setup_other_company(name='company_3')  # This uses cls.chart_template to load the right CoA
+            self.env.company = company_data['company']
+
+            coa_setup_data['counterpart_account'] = company_data['default_account_receivable']
+            coa_setup_data['income_account'] = company_data['default_account_revenue']
+            coa_setup_data['journal'] = company_data['default_journal_misc']
+
+        # Find the available Balance Sheets for the current company.
+        generic_balance_sheet = self.env.ref('odex30_account_reports.balance_sheet').with_company(self.env.company)
+        generic_balance_sheet.with_context(active_test=False).variant_report_ids.write({'active': True})
+        available_report_ids = [variant['id'] for variant in generic_balance_sheet.get_options({})['available_variants']]
+        available_reports = self.env['account.report'].browse(available_report_ids)
+
+        # Don't test Balance Sheets for which the REPORT_CONFIG specifies a chart_template_refs that differs from this CoA.
+        available_report_refs = available_reports.get_external_id()
+        report_ids_to_skip = [id_ for id_, report_ref in available_report_refs.items()
+                              if coa not in REPORT_CONFIG.get(report_ref, {}).get('chart_template_refs', [coa])]
+        available_reports -= self.env['account.report'].browse(report_ids_to_skip)
+        available_reports = available_reports.with_company(self.env.company)
+
+        # Choose an account to be a counterpart account. Every AML we generate will have a counterpart in this account.
+        # We use the Accounts Receivable account (which in general should be well-configured.)
+        # However, if the Balance Sheet is incorrect for the counterpart account, the test will give weird results.
+        tested_accounts_domain = [
+            ('company_ids', '=', self.env.company.id),
+            ('internal_group', '!=', 'off_balance'),
+        ]
+        for code in NON_TESTED_ACCOUNTS['all'] + NON_TESTED_ACCOUNTS.get(coa, []):
+            tested_accounts_domain += ['!', ('code', '=like', f'{code}%')]
+        tested_accounts = self.env['account.account'].search(tested_accounts_domain)
+        coa_setup_data['tested_accounts'] = tested_accounts - coa_setup_data['counterpart_account']
+
+        # Create two test journal entries: one with debits in each account (other than the counterpart account), the other with credits.
+        debit_move_aml_pairs, debit_accounts_by_aml = self._create_balance_sheet_test_move(coa_setup_data)
+        credit_move_aml_pairs, credit_accounts_by_aml = self._create_balance_sheet_test_move(coa_setup_data, create_credits=True)
+
+        aml_pairs = debit_move_aml_pairs + credit_move_aml_pairs
+        accounts_by_aml = {**debit_accounts_by_aml, **credit_accounts_by_aml}
+
+        return available_reports, aml_pairs, accounts_by_aml
+
+    def _set_up_report(self, report):
+        ''' Set-up a Balance Sheet report for testing.
+
+            :param account.report report: the Balance Sheet report to set-up
+
+            The method sets the following keys of coa_setup_data:
+                report_ref: the XMLID of the report currently being tested
+                report: the report currently being tested
+                report_options: the report options for the test
+                report_column_balance_idx: the index of the column containing the balance
+                asset_line: the Total Assets report line
+                liability_line: the Total Liabilities report line
+                equity_line: the Total Equity report line (if separate from Liabilities)
+        '''
+        report_setup_data = {'report': report}
+
+        report_ref = report.get_external_id()[report.id]
+        if report_ref not in REPORT_CONFIG:
+            self.fail(f'''
+                The following Balance Sheet report is installed but is not configured to be tested:
+                {report_ref}
+                Please add it to the REPORT_CONFIG global at the beginning of this file.''')
+        report_config = REPORT_CONFIG[report_ref]
+
+        report_setup_data['report_ref'] = report_ref
+
+        report_setup_data['report_date'] = '2022-12-31'
+        report_setup_data['report_options'] = self._generate_options(report, False, fields.Date.to_date(report_setup_data['report_date']))
+
+        # Find the report column containing the total figures.
+        for idx, col in enumerate(report_setup_data['report_options']['columns']):
+            if col['expression_label'] in report_config.get('balance_col_label', 'balance'):
+                report_setup_data['report_column_balance_idx'] = idx
+                break
+        else:
+            self.fail(f'Could not identify totals column for report {report_ref} '
+                      '- please add its expression_label in the REPORT_CONFIG global at the top of this file.')
+
+        report_setup_data['asset_line'] = self.env.ref(report_config['asset_line_ref'])
+        report_setup_data['liability_line'] = self.env.ref(report_config['liability_line_ref'])
+        report_setup_data['equity_line'] = self.env.ref(report_config['equity_line_ref']) if 'equity_line_ref' in report_config else None
+
+        return report_setup_data
+
+    def _create_balance_sheet_test_move(self, coa_setup_data, create_credits=False):
+        ''' Create a journal entry that will be the basis for testing the Balance Sheet.
+            The created journal entry will have one AML in each account in coa_setup_data['tested_accounts'],
+            and corresponding counterpart AMLs in coa_setup_data['counterpart_account'].
+            We create it in SQL to improve performance (since this gets run a lot on runbot).
+
+            :param bool create_credits: If true, the AMLs will be created with credits (instead of debits)
+                                        and the counterpart AMLs will be created with debits.
+
+            :return: (aml_pairs, accounts_by_aml), where:
+               - aml_pairs is a list of tuples (aml_id, counterpart_aml_id) containing the AMLs of the journal entry that was created.
+               - accounts_by_aml is a map of AML id to account id.
+        '''
+
+        def get_move_line_sql_create_vals(move, account, balance):
+            debit, credit = (balance, 0.0) if balance > 0.0 else (0.0, -balance)
+            return {
+                'account_id': account.id,
+                'balance': balance,
+                'debit': debit,
+                'credit': credit,
+                'company_id': move.company_id.id,
+                'currency_id': move.company_id.currency_id.id,
+                'date': move.date,
+                'display_type': 'product',
+                'journal_id': move.journal_id.id,
+                'move_id': move.id,
+            }
+
+        move = self.env['account.move'].create({
+            'name': False,
+            'date': '2022-06-01',
+            'move_type': 'entry',
+            'journal_id': coa_setup_data['journal'].id,
+        })
+
+        # For each account, we create 2 AMLs:
+        # - one AML in that account (either a debit or a credit, depending on the create_credits param)
+        # - one counterpart AML in the counterpart account
+        amls_vals = []
+        for i, account in enumerate(coa_setup_data['tested_accounts']):
+            balance = self.env.company.currency_id.round(i + 1)
+            if not create_credits:
+                balance = -balance
+            amls_vals += [
+                get_move_line_sql_create_vals(move, account, balance),
+                get_move_line_sql_create_vals(move, coa_setup_data['counterpart_account'], -balance),
+            ]
+
+        move_previous_year = self.env['account.move'].create({
+            'name': False,
+            'date': '2021-12-31',
+            'move_type': 'entry',
+            'journal_id': coa_setup_data['journal'].id,
+        })
+
+        # Additionally, in one Income/Expense account, create an AML in the previous fiscal year
+        # in order to test the unaffected earnings
+        amls_vals += [
+            get_move_line_sql_create_vals(move_previous_year, coa_setup_data['income_account'], balance),
+            get_move_line_sql_create_vals(move_previous_year, coa_setup_data['counterpart_account'], -balance),
+        ]
+
+        # Create the AMLs
+        query_columns = ', '.join(amls_vals[0].keys())
+        query_placeholder = ', '.join("%s" for d in amls_vals)
+        query_params = [tuple(d.values()) for d in amls_vals]
+
+        self.env['account.move.line'].invalidate_model()
+        self.env.cr.execute(
+            f'INSERT INTO "account_move_line" ({query_columns}) VALUES {query_placeholder} RETURNING "id"',
+            query_params,
+        )
+        aml_ids = [aml_id for aml_id, in self.env.cr.fetchall()]
+
+        # Create a map of AMLs to accounts, to avoid having to fetch this info from the DB
+        accounts_by_aml = {aml_ids[i]: aml_vals['account_id'] for i, aml_vals in enumerate(amls_vals)}
+
+        # Group AMLs in account/counterpart pairs
+        aml_pairs = []
+        for i, account in enumerate(coa_setup_data['tested_accounts']):
+            aml_id = aml_ids[2 * i]
+            counterpart_aml_id = aml_ids[2 * i + 1]
+            aml_pairs.append((aml_id, counterpart_aml_id))
+
+        return aml_pairs, accounts_by_aml
+
+    def _check_balance_sheet_balanced(self, report_setup_data, aml_pairs):
+        ''' Check whether the Balance Sheet is balanced. '''
+        # Set 'parent_state' to 'posted' on the AMLs of the debits journal entry, and to 'draft' on all other AMLs.
+        with self._activate_lines(aml_pairs):
+            totals = self._get_report_totals(report_setup_data)
+            if not totals['is_balanced']:
+                self.fail(f'''
+                    The balance sheet {report_setup_data['report_ref']} is not balanced.
+                    Total Assets: {totals['total_asset']}; Total Liabilities + Equity: {totals['total_liability']}.
+                    This test can also find out for you which accounts are incorrectly used in the Balance Sheet.
+                    To do this, set the IDENTIFY_INCORRECT_ACCOUNTS variable at the top of this file to something truthy.
+                ''')
+
+    @contextlib.contextmanager
+    def _activate_lines(self, aml_pairs):
+        ''' On entry: set the 'parent_state' of the specified AMLs to 'posted'.
+            On exit: set the 'parent_state' of these AMLs to 'draft'.
+
+            :param aml_pairs: list of tuples (aml_id, counterpart_aml_id) whose parent_state should be set to 'posted'.
+        '''
+        aml_ids = tuple(itertools.chain(*aml_pairs))
+        self.env['account.move.line'].browse(aml_ids).invalidate_recordset()
+        self.env.cr.execute(
+            '''
+            UPDATE account_move_line
+               SET parent_state = 'posted'
+             WHERE id IN %s
+            ''',
+            [aml_ids]
+        )
+        yield
+
+        self.env.cr.execute(
+            '''
+            UPDATE account_move_line
+               SET parent_state = 'draft'
+             WHERE id IN %s
+            ''',
+            [aml_ids]
+        )
+
+    def _get_report_totals(self, report_setup_data):
+        ''' Get the Assets, Liabilities and Equity totals of the Balance Sheet report. '''
+
+        def get_line_amount(lines, report_line, balance_column_idx):
+            line = next(filter(lambda line: self.env['account.report']._get_res_id_from_line_id(line['id'], 'account.report.line') == report_line.id, lines))
+            balance = line['columns'][balance_column_idx]['no_format']
+            self.assertIsNotNone(balance, f'Report line "{report_line.name}" does not set a value in the column which should contain the balance.')
+            return balance
+
+        lines = report_setup_data['report']._get_lines(report_setup_data['report_options'])
+
+        balance_column_idx = report_setup_data['report_column_balance_idx']
+
+        total_asset = get_line_amount(lines, report_setup_data['asset_line'], balance_column_idx)
+        total_liability = (
+            get_line_amount(lines, report_setup_data['liability_line'], balance_column_idx)
+            + (get_line_amount(lines, report_setup_data['equity_line'], balance_column_idx) if report_setup_data['equity_line'] else 0.0)
+        )
+
+        return {
+            'total_asset': total_asset,
+            'total_liability': total_liability,
+            'is_balanced': self.env.company.currency_id.compare_amounts(total_asset, total_liability) == 0
+        }
+
+    def _identify_incorrect_accounts(self, report_setup_data, aml_pairs, accounts_by_aml, bad_account_ids, logging_fn):
+        ''' Identify accounts that are incorrectly used in the Balance Sheet, using a binary search.
+            This is a recursive function.
+
+            :param report_setup_data: The report configuration to test
+            :param aml_pairs: a list of tuples (aml_id, counterpart_aml_id)
+                              account.move.lines which cause the Balance Sheet to be unbalanced.
+            :param accounts_by_aml: a map {aml_id: account_id} of the AMLs to test
+            :param bad_account_ids: a set of account ids that are determined to be badly referenced,
+                                    can be used to avoid testing a bad account twice
+            :param logging_fn: a function to call when an account causing an unbalance is found. This should take
+                               as first argument a pair (aml_id, counterpart_aml_id) and
+                               as second argument a dict containing information about the report totals
+        '''
+
+        # No need to further test AMLs in accounts already determined to be badly referenced.
+        aml_pairs = [
+            (aml_id, counterpart_aml_id)
+            for aml_id, counterpart_aml_id in aml_pairs
+            if accounts_by_aml[aml_id] not in bad_account_ids
+        ]
+        if not aml_pairs:
+            return
+        with self._activate_lines(aml_pairs):
+            totals = self._get_report_totals()
+
+        if totals['is_balanced']:
+            # Valid subtree case. There are no badly-referenced accounts in the subtree, just return (no need to search deeper)
+            return
+        elif len(aml_pairs) == 1:
+            # Leaf case. This account is badly-referenced: log and return.
+            logging_fn(
+                report_setup_data,
+                amls=self.env['account.move.line'].browse(aml_pairs[0]),
+                totals=totals,
+                is_first_call=not bad_account_ids,
+            )
+            bad_account_ids.add(accounts_by_aml[aml_pairs[0][0]])
+        else:
+            # Non-leaf case. Some accounts in the subtree are badly-referenced: bisect it into two halves, and check each half.
+            middle_index = len(aml_pairs) // 2
+            aml_pairs_left = aml_pairs[:middle_index]
+            aml_pairs_right = aml_pairs[middle_index:]
+            self._identify_incorrect_accounts(report_setup_data, aml_pairs_left, accounts_by_aml, bad_account_ids, logging_fn)
+            self._identify_incorrect_accounts(report_setup_data, aml_pairs_right, accounts_by_aml, bad_account_ids, logging_fn)
diff --git a/dev_odex30_accounting/odex30_account_reports/tests/test_balance_sheet_report.py b/dev_odex30_accounting/odex30_account_reports/tests/test_balance_sheet_report.py
new file mode 100644
index 0000000..73b2910
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_reports/tests/test_balance_sheet_report.py
@@ -0,0 +1,247 @@
+
+from .common import TestAccountReportsCommon
+
+from odoo import fields, Command
+from odoo.tests import tagged
+
+
+@tagged('post_install', '-at_install')
+class TestBalanceSheetReport(TestAccountReportsCommon):
+
+    @classmethod
+    def setUpClass(cls):
+        super().setUpClass()
+        cls.report = cls.env.ref('odex30_account_reports.balance_sheet')
+
+    def test_report_lines_ordering(self):
+        """ Check that the report lines are correctly ordered with nested account groups """
+        self.env['account.group'].create([{
+            'name': 'A',
+            'code_prefix_start': '101401',
+            'code_prefix_end': '101601',
+        }, {
+            'name': 'A1',
+            'code_prefix_start': '1014010',
+            'code_prefix_end': '1015010',
+        }])
+
+        cid = self.env.company.id
+        account_bank = self.env.ref(f"account.{cid}_bank").default_account_id
+        account_cash = self.env.ref(f"account.{cid}_cash").default_account_id
+        account_a = self.env['account.account'].create([{'code': '1014010', 'name': 'A', 'account_type': 'asset_cash'}])
+        account_c = self.env['account.account'].create([{'code': '101600', 'name': 'C', 'account_type': 'asset_cash'}])
+
+        # Create a journal lines for each account
+        move = self.env['account.move'].create({
+            'date': '2020-02-02',
+            'line_ids': [
+                Command.create({
+                    'account_id': account.id,
+                    'name': 'name',
+                })
+                for account in [account_a, account_c, account_bank, account_cash]
+            ],
+        })
+        move.action_post()
+        move.line_ids.flush_recordset()
+
+        # Create the report hierarchy with the Bank and Cash Accounts lines unfolded
+        line_id = self._get_basic_line_dict_id_from_report_line_ref('odex30_account_reports.account_financial_report_bank_view0')
+        options = self._generate_options(
+            self.report,
+            fields.Date.from_string('2020-02-01'),
+            fields.Date.from_string('2020-02-28')
+        )
+        options['unfolded_lines'] = [line_id]
+        options['hierarchy'] = True
+        self.env.company.totals_below_sections = False
+        lines = self.report._get_lines(options)
+
+        # The Bank and Cash Accounts section start at index 2
+        # Since we created 4 lines + 2 groups, we keep the 6 following lines
+        unfolded_lines = self.report._get_unfolded_lines(lines, line_id)
+        unfolded_lines = [{'name': line['name'], 'level': line['level']} for line in unfolded_lines]
+
+        self.assertEqual(
+            unfolded_lines,
+            [
+                {'level': 5, 'name': 'Bank and Cash Accounts'},
+                {'level': 6, 'name': '101401-101601 A'},
+                {'level': 7, 'name': '101401 Bank'},
+                {'level': 7, 'name': '1014010-1015010 A1'},
+                {'level': 8, 'name': '1014010 A'},
+                {'level': 8, 'name': '101501 Cash'},
+                {'level': 7, 'name': '101600 C'},
+            ]
+        )
+
+    def test_balance_sheet_custom_date(self):
+        line_id = self.env.ref('odex30_account_reports.account_financial_report_bank_view0').id
+        self.report.filter_multi_company = 'disabled'
+        options = self._generate_options(self.report, fields.Date.from_string('2020-02-01'), fields.Date.from_string('2020-02-28'))
+        options['date']['filter'] = 'custom'
+        options['unfolded_lines'] = [line_id]
+
+        invoices = self.env['account.move'].create([{
+            'move_type': 'out_invoice',
+            'partner_id': self.partner_a.id,
+            'date': '2020-0%s-15' % i,
+            'invoice_date': '2020-0%s-15' % i,
+            'invoice_line_ids': [(0, 0, {
+                'product_id': self.product_a.id,
+                'price_unit': 1000.0,
+                'tax_ids': [(6, 0, self.tax_sale_a.ids)],
+            })],
+        } for i in range(1, 4)])
+        invoices.action_post()
+
+        lines = self.report._get_lines(options)
+        self.assertLinesValues(
+            lines,
+            #   Name                                            Balance
+            [   0,                                              1],
+            [
+                ('ASSETS',                                      2300.00),
+                ('Current Assets',                              2300.00),
+                ('Bank and Cash Accounts',                         0.00),
+                ('Receivables',                                 2300.00),
+                ('Current Assets',                                 0.00),
+                ('Prepayments',                                    0.00),
+                ('Total Current Assets',                        2300.00),
+                ('Plus Fixed Assets',                              0.00),
+                ('Plus Non-current Assets',                        0.00),
+                ('Total ASSETS',                                2300.00),
+
+                ('LIABILITIES',                                 300.00),
+                ('Current Liabilities',                         300.00),
+                ('Current Liabilities',                         300.00),
+                ('Payables',                                       0.00),
+                ('Total Current Liabilities',                   300.00),
+                ('Plus Non-current Liabilities',                   0.00),
+                ('Total LIABILITIES',                           300.00),
+
+                ('EQUITY',                                      2000.00),
+                ('Unallocated Earnings',                        2000.00),
+                ('Current Year Unallocated Earnings',           2000.00),
+                ('Previous Years Unallocated Earnings',            0.00),
+                ('Total Unallocated Earnings',                  2000.00),
+                ('Retained Earnings',                              0.00),
+                ('Current Year Retained Earnings',                 0.00),
+                ('Previous Years Retained Earnings',               0.00),
+                ('Total Retained Earnings',                        0.00),
+                ('Total EQUITY',                                2000.00),
+                ('LIABILITIES + EQUITY',                        2300.00),
+            ],
+            options,
+        )
+
+    def test_unfold_all_and_total_lines(self):
+        """ Check that exactly the total lines we want exist when we use the 'unfold_all' option. I.e. empty sections should not have total lines (since there are not lines to total).
+        This test only tests the function '_get_lines'. It does not test that the total lines are always handled correctly for manual unfolds in the web UI. """
+
+        self.env.company.totals_below_sections = True
+        options = self._generate_options(
+            self.report,
+            fields.Date.from_string('1990-01-01'),
+            fields.Date.from_string('1990-01-01')
+        )
+
+        bank_journal = self.company_data['default_journal_bank']
+        account_bank = bank_journal.default_account_id
+        account_other = self.env['account.account'].create({
+            'account_type': 'asset_current',
+            'name': 'account_other',
+            'code': '121040',
+            'reconcile': True,
+        })
+        self.env['account.move'].create({
+            'move_type': 'entry',
+            'date': '1990-01-01',
+            'journal_id': bank_journal.id,
+            'line_ids': [
+                (0, 0, {'debit': 200.0,     'credit':   0.0,     'account_id': account_bank.id}),
+                (0, 0, {'debit':   0.0,     'credit': 200.0,     'account_id': account_other.id}),
+            ],
+        }).action_post()
+
+        # Note that assertLinesValues filters / ignores children lines of folded lines.
+        # The total lines for the 2 visible lines with groupbys already exist in 'folded_lines' but are filtered / ignored by assertLinesValues.
+        # (Thus they do not appear in the expected result below either.)
+        self.assertLinesValues(
+            self.report._get_lines(options),
+            #   Name
+            [   0],
+            [
+                ('ASSETS',),
+                ('Current Assets',),
+                ('Bank and Cash Accounts',),
+                ('Receivables',),
+                ('Current Assets',),
+                ('Prepayments',),
+                ('Total Current Assets',),
+                ('Plus Fixed Assets',),
+                ('Plus Non-current Assets',),
+                ('Total ASSETS',),
+                ('LIABILITIES',),
+                ('Current Liabilities',),
+                ('Current Liabilities',),
+                ('Payables',),
+                ('Total Current Liabilities',),
+                ('Plus Non-current Liabilities',),
+                ('Total LIABILITIES',),
+                ('EQUITY',),
+                ('Unallocated Earnings',),
+                ('Current Year Unallocated Earnings',),
+                ('Previous Years Unallocated Earnings',),
+                ('Total Unallocated Earnings',),
+                ('Retained Earnings',),
+                ('Current Year Retained Earnings',),
+                ('Previous Years Retained Earnings',),
+                ('Total Retained Earnings',),
+                ('Total EQUITY',),
+                ('LIABILITIES + EQUITY',),
+            ],
+            options,
+        )
+
+        options['unfold_all'] = True
+        self.assertLinesValues(
+            self.report._get_lines(options),
+            #   Name
+            [   0],
+            [
+                ('ASSETS',),
+                ('Current Assets',),
+                ('Bank and Cash Accounts',),
+                (account_bank.display_name,),
+                ('Total Bank and Cash Accounts',),
+                ('Receivables',),
+                ('Current Assets',),
+                (account_other.display_name,),
+                ('Total Current Assets',),
+                ('Prepayments',),
+                ('Total Current Assets',),
+                ('Plus Fixed Assets',),
+                ('Plus Non-current Assets',),
+                ('Total ASSETS',),
+                ('LIABILITIES',),
+                ('Current Liabilities',),
+                ('Current Liabilities',),
+                ('Payables',),
+                ('Total Current Liabilities',),
+                ('Plus Non-current Liabilities',),
+                ('Total LIABILITIES',),
+                ('EQUITY',),
+                ('Unallocated Earnings',),
+                ('Current Year Unallocated Earnings',),
+                ('Previous Years Unallocated Earnings',),
+                ('Total Unallocated Earnings',),
+                ('Retained Earnings',),
+                ('Current Year Retained Earnings',),
+                ('Previous Years Retained Earnings',),
+                ('Total Retained Earnings',),
+                ('Total EQUITY',),
+                ('LIABILITIES + EQUITY',),
+            ],
+            options,
+        )
diff --git a/dev_odex30_accounting/odex30_account_reports/tests/test_budget.py b/dev_odex30_accounting/odex30_account_reports/tests/test_budget.py
new file mode 100644
index 0000000..c4c8d4d
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_reports/tests/test_budget.py
@@ -0,0 +1,716 @@
+from odoo import Command, fields
+from odoo.tests import tagged
+from odoo.tools import date_utils
+from odoo.addons.odex30_account_reports.tests.common import TestAccountReportsCommon
+
+
+@tagged('post_install', '-at_install')
+class TestBudgetReport(TestAccountReportsCommon):
+
+    @classmethod
+    def setUpClass(cls):
+        super().setUpClass()
+
+        cls.company_data['company'].totals_below_sections = False
+
+        cls.account_1 = cls.company_data['default_account_revenue']
+        cls.account_2 = cls.copy_account(cls.account_1)
+        cls.account_3 = cls.copy_account(cls.account_1)
+        cls.account_4 = cls.copy_account(cls.account_1)
+
+        # Create a test report
+        cls.report = cls.env['account.report'].create({
+            'name': "Budget Test",
+            'filter_date_range': True,
+            'filter_budgets': True,
+            'filter_period_comparison': True,
+            'column_ids': [
+                Command.create({
+                    'name': "Balance",
+                    'expression_label': 'balance',
+                }),
+            ],
+            'line_ids': [
+                Command.create({
+                    'name': 'line_domain',
+                    'groupby': 'account_id',
+                    'foldable': False,
+                    'expression_ids': [
+                        Command.create({
+                            'label': 'balance',
+                            'formula': "[('account_id.account_type', '=', 'income')]",
+                            'subformula': 'sum',
+                            'engine': 'domain',
+                        }),
+                    ],
+                }),
+                Command.create({
+                    'name': 'line_account_codes',
+                    'groupby': 'account_id',
+                    'foldable': False,
+                    'expression_ids': [
+                        Command.create({
+                            'label': 'balance',
+                            'formula': cls.account_1.code[:3],
+                            'engine': 'account_codes',
+                        }),
+                    ],
+                }),
+            ],
+        })
+
+        # Create budgets
+        cls.budget_1 = cls._create_budget(
+            {
+                cls.account_1.id: 1000,
+                cls.account_3.id: 100,
+                cls.account_4.id: 10,
+            },
+            '2020-01-01',
+            '2020-01-01',
+        )
+        cls.budget_2 = cls._create_budget(
+            {
+                cls.account_2.id: 10,
+            },
+            '2020-01-01',
+            '2020-01-01',
+        )
+
+    @classmethod
+    def _create_budget(cls, amount_per_account_ids=None, date_from=None, date_to=None):
+        date_from, date_to = fields.Date.to_date(date_from), fields.Date.to_date(date_to)
+        items = []
+        for account_id, amount in amount_per_account_ids.items():
+            for item_date in date_utils.date_range(date_from, date_to):
+                items.append(Command.create({
+                    'amount': amount,
+                    'account_id': account_id,
+                    'date': date_utils.start_of(item_date, 'month'),
+                }))
+
+        return cls.env['account.report.budget'].create({
+            'name': 'Budget',
+            'item_ids': items,
+        })
+
+    @classmethod
+    def _create_moves(cls, amount_per_account_ids=None, date_from=None, date_to=None, to_post=True):
+        date_from, date_to = fields.Date.to_date(date_from), fields.Date.to_date(date_to)
+        moves_to_create = []
+        for move_date in date_utils.date_range(date_from, date_to):
+            move_to_create = {
+                'date': move_date,
+                'journal_id': cls.company_data['default_journal_misc'].id,
+                'line_ids': [],
+            }
+            for account_id, amount in amount_per_account_ids.items():
+                move_to_create['line_ids'].extend([
+                    Command.create({
+                        'debit': amount,
+                        'account_id': account_id,
+                    }),
+                    Command.create({
+                        'credit': amount,
+                        'account_id': cls.company_data['default_account_assets'].id,
+                    })
+                ])
+            moves_to_create.append(move_to_create)
+        moves = cls.env['account.move'].create(moves_to_create)
+        if to_post:
+            moves.action_post()
+        return moves
+
+    def test_reports_single_budget(self):
+        self._create_moves(
+            {
+                self.account_1.id: 100,
+                self.account_2.id: 200,
+                self.account_3.id: 300,
+             },
+            '2020-01-01',
+            '2020-01-01',
+        )
+
+        options = self._generate_options(
+            self.report,
+            '2020-01-01',
+            '2020-12-31',
+            default_options={'budgets': [{'id': self.budget_1.id, 'selected': True}]},
+        )
+
+        lines = self.report._get_lines(options)
+        self.assertLinesValues(
+            lines,
+            [   0,                                             1,        2,          3],
+            [
+                ('line_domain',                              600,     1110,    '54.1%'),
+                (self.account_1.display_name,                100,     1000,    '10.0%'),
+                (self.account_2.display_name,                200,        0,      'n/a'),
+                (self.account_3.display_name,                300,      100,   '300.0%'),
+                (self.account_4.display_name,                  0,       10,     '0.0%'),
+                ('line_account_codes',                       600,     1110,    '54.1%'),
+                (self.account_1.display_name,                100,     1000,    '10.0%'),
+                (self.account_2.display_name,                200,        0,      'n/a'),
+                (self.account_3.display_name,                300,      100,   '300.0%'),
+                (self.account_4.display_name,                  0,       10,     '0.0%'),
+            ],
+            options,
+        )
+
+    def test_reports_multiple_budgets(self):
+        """ This test verifies the report when we have several budgets selected.
+            The report should have 2 columns per budget, the budget itself and
+            the comparison column.
+        """
+        self._create_moves(
+            {
+                self.account_1.id: 100,
+                self.account_2.id: 200,
+                self.account_3.id: 300,
+             },
+            '2020-01-01',
+            '2020-01-01',
+        )
+
+        options = self._generate_options(
+            self.report,
+            '2020-01-01',
+            '2020-12-31',
+            default_options={'budgets': [{'id': self.budget_1.id, 'selected': True}, {'id': self.budget_2.id, 'selected': True}]},
+        )
+
+        lines = self.report._get_lines(options)
+        self.assertLinesValues(
+            lines,
+            [   0,                                             1,        2,          3,        4,          5],
+            [
+                ('line_domain',                              600,     1110,    '54.1%',       10,   '6000.0%'),
+                (self.account_1.display_name,                100,     1000,    '10.0%',        0,       'n/a'),
+                (self.account_2.display_name,                200,        0,      'n/a',       10,   '2000.0%'),
+                (self.account_3.display_name,                300,      100,   '300.0%',        0,       'n/a'),
+                (self.account_4.display_name,                  0,       10,     '0.0%',        0,       'n/a'),
+                ('line_account_codes',                       600,     1110,    '54.1%',       10,   '6000.0%'),
+                (self.account_1.display_name,                100,     1000,    '10.0%',        0,       'n/a'),
+                (self.account_2.display_name,                200,        0,      'n/a',       10,   '2000.0%'),
+                (self.account_3.display_name,                300,      100,   '300.0%',        0,       'n/a'),
+                (self.account_4.display_name,                  0,       10,     '0.0%',        0,       'n/a'),
+            ],
+            options,
+        )
+
+    def test_reports_budget_with_comparison_period(self):
+        budget_2024 = self._create_budget({self.account_1.id: 200}, '2024-01-01', '2024-12-31')
+        moves = self._create_moves({self.account_1.id: 200}, '2024-01-01', '2024-12-31', to_post=False)
+        moves += self._create_moves({self.account_1.id: 600}, '2024-06-22', '2024-06-22', to_post=False)
+        moves.action_post()
+
+        options = self._generate_options(
+            self.report,
+            '2024-06-01',
+            '2024-06-30',
+            default_options={
+                'budgets': [{'id': budget_2024.id, 'selected': True}],
+                'comparison': {'filter': 'previous_period', 'number_period': 1},
+            },
+        )
+        self.assertLinesValues(
+            self.report._get_lines(options),
+            [   0,                                             1,        2,          3,        4,        5,          6],
+            [
+                ('line_domain',                              800,      200,   '400.0%',      200,      200,   '100.0%'),
+                (self.account_1.display_name,                800,      200,   '400.0%',      200,      200,   '100.0%'),
+                ('line_account_codes',                       800,      200,   '400.0%',      200,      200,   '100.0%'),
+                (self.account_1.display_name,                800,      200,   '400.0%',      200,      200,   '100.0%'),
+            ],
+            options,
+        )
+
+    def test_reports_budget_with_comparison_period_and_multiple_budgets(self):
+        budget_2024 = self._create_budget({self.account_1.id: 200}, '2024-01-01', '2024-12-31')
+        budget_2023 = self._create_budget({self.account_1.id: 400}, '2023-01-01', '2023-12-31')
+        moves = self._create_moves({self.account_1.id: 200}, '2024-01-01', '2024-12-31', to_post=False)
+        moves += self._create_moves({self.account_1.id: 400}, '2023-01-01', '2023-12-31', to_post=False)
+        moves.action_post()
+
+        options = self._generate_options(
+            self.report,
+            '2024-01-01',
+            '2024-12-31',
+            default_options={
+                'budgets': [{'id': budget_2024.id, 'selected': True}, {'id': budget_2023.id, 'selected': True}],
+                'comparison': {'filter': 'previous_period', 'number_period': 1},
+            },
+        )
+        self.assertLinesValues(
+            self.report._get_lines(options),
+            [   0,                                 1,      2,          3,   4,       5,      6,   7,      8,       9,      10],
+            #                        [ Period 2024 + Budget 2024 + % + Budget 2023 + %] [ Period 2023 + Budget 2024 + % + Budget 2023 + %]
+            [
+                ('line_domain',                 2400,   2400,   '100.0%',   0,   'n/a',   4800,   0,   'n/a',   4800,   '100.0%'),
+                (self.account_1.display_name,   2400,   2400,   '100.0%',   0,   'n/a',   4800,   0,   'n/a',   4800,   '100.0%'),
+                ('line_account_codes',          2400,   2400,   '100.0%',   0,   'n/a',   4800,   0,   'n/a',   4800,   '100.0%'),
+                (self.account_1.display_name,   2400,   2400,   '100.0%',   0,   'n/a',   4800,   0,   'n/a',   4800,   '100.0%'),
+            ],
+            options,
+        )
+
+    def test_report_budget_items_with_different_date_filters(self):
+        """ The aim of this test is checking that we get the correct budget items
+            according to the selected dates.
+        """
+        budget_2024 = self._create_budget({self.account_1.id: 300}, '2024-01-01', '2024-12-31')
+        self._create_moves({self.account_1.id: 200}, '2024-01-01', '2024-12-31')
+
+        # Case when we display a whole year in the report
+        options = self._generate_options(
+            self.report,
+            '2024-01-01',
+            '2024-12-31',
+            default_options={'budgets': [{'id': budget_2024.id, 'selected': True}]},
+        )
+        self.assertLinesValues(
+            self.report._get_lines(options),
+            [   0,                                              1,        2],
+            [
+                ('line_domain',                              2400,     3600),
+                (self.account_1.display_name,                2400,     3600),
+                ('line_account_codes',                       2400,     3600),
+                (self.account_1.display_name,                2400,     3600),
+            ],
+            options,
+        )
+
+        # Case when we display a whole quarter
+        options = self._generate_options(
+            self.report,
+            '2024-01-01',
+            '2024-03-31',
+            default_options={'budgets': [{'id': budget_2024.id, 'selected': True}]},
+        )
+        self.assertLinesValues(
+            self.report._get_lines(options),
+            [   0,                                             1,        2],
+            [
+                ('line_domain',                              600,      900),
+                (self.account_1.display_name,                600,      900),
+                ('line_account_codes',                       600,      900),
+                (self.account_1.display_name,                600,      900),
+            ],
+            options,
+        )
+
+        # Case when we display a whole month
+        options = self._generate_options(
+            self.report,
+            '2024-03-01',
+            '2024-03-31',
+            default_options={'budgets': [{'id': budget_2024.id, 'selected': True}]},
+        )
+        self.assertLinesValues(
+            self.report._get_lines(options),
+            [   0,                                             1,        2],
+            [
+                ('line_domain',                              200,      300),
+                (self.account_1.display_name,                200,      300),
+                ('line_account_codes',                       200,      300),
+                (self.account_1.display_name,                200,      300),
+            ],
+            options,
+        )
+
+    def test_report_budget_edit_items(self):
+        """ This test verifies the way we're modifying budget items.
+            The system calculates the difference between the old and new values
+            and distributes this difference proportionally over the number of
+            months in the selected period.
+
+            The test checks the following scenarios:
+            1. Adding a rounded value (1200) for an entire year (12 months).
+            2. Setting the value to 300 for 3 months (no change expected).
+            3. Setting the value to 900 for 3 months, resulting in three new values of 200 each.
+            4. Reducing the value for a whole year to a non-rounded value and checking if the
+               remainder is correctly applied to the last period.
+        """
+        def set_budget_item(value, account_id):
+            budget_2024._create_or_update_budget_items(
+                value_to_set=value,
+                account_id=account_id,
+                rounding=self.env.company.currency_id.decimal_places,
+                date_from=options['date']['date_from'],
+                date_to=options['date']['date_to'],
+            )
+
+        budget_2024 = self.env['account.report.budget'].create({'name': "Budget 2024"})
+        self._create_moves({self.account_1.id: 200}, '2024-01-01', '2024-12-31')
+
+        options = self._generate_options(
+            self.report,
+            '2024-01-01',
+            '2024-12-31',
+            default_options={'budgets': [{'id': budget_2024.id, 'selected': True}]},
+        )
+        set_budget_item(1200, self.account_1.id)
+        expected_items = [
+            {'amount': 100.0, 'date': fields.Date.to_date('2024-01-01')},
+            {'amount': 100.0, 'date': fields.Date.to_date('2024-02-01')},
+            {'amount': 100.0, 'date': fields.Date.to_date('2024-03-01')},
+            {'amount': 100.0, 'date': fields.Date.to_date('2024-04-01')},
+            {'amount': 100.0, 'date': fields.Date.to_date('2024-05-01')},
+            {'amount': 100.0, 'date': fields.Date.to_date('2024-06-01')},
+            {'amount': 100.0, 'date': fields.Date.to_date('2024-07-01')},
+            {'amount': 100.0, 'date': fields.Date.to_date('2024-08-01')},
+            {'amount': 100.0, 'date': fields.Date.to_date('2024-09-01')},
+            {'amount': 100.0, 'date': fields.Date.to_date('2024-10-01')},
+            {'amount': 100.0, 'date': fields.Date.to_date('2024-11-01')},
+            {'amount': 100.0, 'date': fields.Date.to_date('2024-12-01')},
+        ]
+
+        self.assertRecordValues(
+            budget_2024.item_ids,
+            expected_items,
+        )
+        options = self._generate_options(
+            self.report,
+            '2024-01-01',
+            '2024-03-31',
+            default_options={'budgets': [{'id': budget_2024.id, 'selected': True}]},
+        )
+        set_budget_item(300, self.account_1.id)
+        # Nothing should be added as we don't change anything
+        self.assertRecordValues(
+            budget_2024.item_ids,
+            expected_items,
+        )
+
+        set_budget_item(900, self.account_1.id)
+        expected_items = [
+            {'amount': 300.0, 'date': fields.Date.to_date('2024-01-01')},
+            {'amount': 300.0, 'date': fields.Date.to_date('2024-02-01')},
+            {'amount': 300.0, 'date': fields.Date.to_date('2024-03-01')},
+            {'amount': 100.0, 'date': fields.Date.to_date('2024-04-01')},
+            {'amount': 100.0, 'date': fields.Date.to_date('2024-05-01')},
+            {'amount': 100.0, 'date': fields.Date.to_date('2024-06-01')},
+            {'amount': 100.0, 'date': fields.Date.to_date('2024-07-01')},
+            {'amount': 100.0, 'date': fields.Date.to_date('2024-08-01')},
+            {'amount': 100.0, 'date': fields.Date.to_date('2024-09-01')},
+            {'amount': 100.0, 'date': fields.Date.to_date('2024-10-01')},
+            {'amount': 100.0, 'date': fields.Date.to_date('2024-11-01')},
+            {'amount': 100.0, 'date': fields.Date.to_date('2024-12-01')},
+        ]
+        self.assertRecordValues(
+            budget_2024.item_ids,
+            expected_items,
+        )
+
+        options = self._generate_options(
+            self.report,
+            '2024-01-01',
+            '2024-12-31',
+            default_options={'budgets': [{'id': budget_2024.id, 'selected': True}]},
+        )
+        self.assertLinesValues(
+            self.report._get_lines(options),
+            [   0,                                              1,        2],
+            [
+                ('line_domain',                              2400,     1800),
+                (self.account_1.display_name,                2400,     1800),
+                ('line_account_codes',                       2400,     1800),
+                (self.account_1.display_name,                2400,     1800),
+            ],
+            options,
+        )
+
+        # Test the case with a remainder
+        set_budget_item(1000, self.account_1.id)
+        expected_items = [
+            {'amount': 300.0 - 66.66, 'date': fields.Date.to_date('2024-01-01')},
+            {'amount': 300.0 - 66.66, 'date': fields.Date.to_date('2024-02-01')},
+            {'amount': 300.0 - 66.66, 'date': fields.Date.to_date('2024-03-01')},
+            {'amount': 100.0 - 66.66, 'date': fields.Date.to_date('2024-04-01')},
+            {'amount': 100.0 - 66.66, 'date': fields.Date.to_date('2024-05-01')},
+            {'amount': 100.0 - 66.66, 'date': fields.Date.to_date('2024-06-01')},
+            {'amount': 100.0 - 66.66, 'date': fields.Date.to_date('2024-07-01')},
+            {'amount': 100.0 - 66.66, 'date': fields.Date.to_date('2024-08-01')},
+            {'amount': 100.0 - 66.66, 'date': fields.Date.to_date('2024-09-01')},
+            {'amount': 100.0 - 66.66, 'date': fields.Date.to_date('2024-10-01')},
+            {'amount': 100.0 - 66.66, 'date': fields.Date.to_date('2024-11-01')},
+            {'amount': 100.0 - 66.74, 'date': fields.Date.to_date('2024-12-01')},
+        ]
+        self.assertRecordValues(
+            budget_2024.item_ids,
+            expected_items,
+        )
+
+    def test_report_budget_show_all_accounts_filter(self):
+        """ The aim of this test is checking that the show all accounts filter
+            is returning all the income accounts (as our test report is working with
+            income accounts only).
+        """
+        budget_2024 = self._create_budget({self.account_1.id: 300}, '2024-01-01', '2024-12-31')
+
+        options = self._generate_options(
+            self.report,
+            '2024-01-01',
+            '2024-12-31',
+            default_options={
+                'budgets': [{'id': budget_2024.id, 'selected': True}],
+                'show_all_accounts': True,
+            },
+        )
+        expected_lines = [
+            ('line_domain', 0, 3600),
+            (self.account_1.display_name, 0, 3600),
+        ]
+        expected_lines += [
+            (account['display_name'], 0, 0)
+            for account in self.env['account.account'].search_read([
+                ('id', '!=', self.account_1.id),
+                ('account_type', '=', 'income'),
+                ('company_ids', 'in', self.report.get_report_company_ids(options)),
+            ], ['display_name'], order='code')
+        ]
+        expected_lines += [
+            ('line_account_codes', 0, 3600),
+            (self.account_1.display_name, 0, 3600),
+        ]
+        expected_lines += [
+            (account['display_name'], 0, 0)
+            for account in self.env['account.account'].search_read([
+                ('id', '!=', self.account_1.id),
+                ('code', '=like', f'{self.account_1.code[:3]}%'),
+                ('company_ids', 'in', self.report.get_report_company_ids(options)),
+            ], ['display_name'], order='code')
+        ]
+
+        self.assertLinesValues(
+            self.report._get_lines(options),
+            [0, 1, 2],
+            expected_lines,
+            options,
+        )
+
+    def test_financial_budget_with_analytic_groupby(self):
+        """ Ensure that when budgets and analytics groupby filters are both active, then their headers are
+        displayed on the same level, and values in the report are properly computed"""
+
+        budget_a = self.env['account.report.budget'].create([{'name': "Budget A"}])
+        budget_b = self.env['account.report.budget'].create([{'name': "Budget B"}])
+
+        budget_a._create_or_update_budget_items(
+            value_to_set=2400,  # 100 each month
+            account_id=self.account_1.id,
+            rounding=self.env.company.currency_id.decimal_places,
+            date_from='2024-01-01',
+            date_to='2025-12-31',
+        )
+        budget_b._create_or_update_budget_items(
+            value_to_set=3000,  # 125 each month
+            account_id=self.account_1.id,
+            rounding=self.env.company.currency_id.decimal_places,
+            date_from='2024-01-01',
+            date_to='2025-12-31',
+        )
+
+        self.env.user.groups_id += self.env.ref('analytic.group_analytic_accounting')
+        self.report.write({'filter_analytic_groupby': True})
+
+        analytic_plan_a = self.env['account.analytic.plan'].create([{
+            'name': 'Plan A',
+        }])
+        analytic_account_1 = self.env['account.analytic.account'].create([{
+            'name': 'Account A1',
+            'plan_id': analytic_plan_a.id
+        }])
+        analytic_account_2 = self.env['account.analytic.account'].create([{
+            'name': 'Account A2',
+            'plan_id': analytic_plan_a.id
+        }])
+
+        moves_2024 = self._create_moves({self.account_1.id: 100}, '2024-01-01', '2024-12-31', to_post=False)
+        moves_2025 = self._create_moves({self.account_1.id: 150}, '2025-01-01', '2025-12-31', to_post=False)
+
+        for move_line in (moves_2024 + moves_2025).line_ids:
+            move_line.analytic_distribution = {str(analytic_account_1.id): 75.0, str(analytic_account_2.id): 25.0}
+
+        (moves_2024 + moves_2025).action_post()
+
+        options = self._generate_options(
+            self.report,
+            '2025-01-01',
+            '2025-12-31',
+            default_options={
+                'comparison': {'filter': 'previous_period', 'number_period': 1},
+                'analytic_accounts_groupby': [analytic_account_1.id, analytic_account_2.id],
+                'budgets': [{'id': budget_a.id, 'selected': True}, {'id': budget_b.id, 'selected': True}],
+            }
+        )
+
+        self.assertEqual(
+            [header['name'] for header in options['column_headers'][1]],
+            ['Account A1', 'Account A2', '', 'Budget A', '%', 'Budget B', '%']
+        )
+
+        self.assertLinesValues(
+            self.report._get_lines(options),
+            #                                   [                             2025                          ]    [                          2024                             ]
+            #                                   [ A1 ] [ A2 ] [ Total ] [ Budget A ] [ % ] [ Budget B ] [ % ]    [ A1 ] [ A2 ] [ Total ] [ Budget A ] [ % ] [ Budget B ] [ % ]
+            [0,                                   1,     2,      3,          4,        5,        6,       7,       8,     9,      10,         11,      12,      13,        14],
+            [
+                ('line_domain',                 1350,   450,    1800,      1200,  '150.0%',  1500,   '120.0%',   900,   300,     1200,      1200,  '100.0%',   1500,   '80.0%'),
+                (self.account_1.display_name,   1350,   450,    1800,      1200,  '150.0%',  1500,   '120.0%',   900,   300,     1200,      1200,  '100.0%',   1500,   '80.0%'),
+                ('line_account_codes',          1350,   450,    1800,      1200,  '150.0%',  1500,   '120.0%',   900,   300,     1200,      1200,  '100.0%',   1500,   '80.0%'),
+                (self.account_1.display_name,   1350,   450,    1800,      1200,  '150.0%',  1500,   '120.0%',   900,   300,     1200,      1200,  '100.0%',   1500,   '80.0%'),
+            ],
+            options,
+        )
+
+    def test_financial_budget_with_several_columns(self):
+        """ Ensure that financial budget feature works properly on reports with several columns,
+        and that percentage column of budget is hidden is the case where multiple monetary columns exist """
+        self.report.write({
+            'column_ids': [
+                Command.create({
+                    'name': "Column test",
+                    'expression_label': 'column_test',
+                }),
+            ],
+        })
+
+        self._create_moves(
+            {
+                self.account_1.id: 100,
+                self.account_2.id: 200,
+                self.account_3.id: 300,
+            },
+            '2020-01-01',
+            '2020-01-01',
+        )
+
+        options = self._generate_options(
+            self.report,
+            '2020-01-01',
+            '2020-12-31',
+            default_options={
+                'comparison': {'filter': 'previous_period', 'number_period': 1},
+                'budgets': [{'id': self.budget_1.id, 'selected': True}],
+            }
+        )
+
+        # Ensure level header colspan is 3 for top header, 2 for the columns + 1 selected budget
+        self.assertEqual(
+            self.report._get_column_headers_render_data(options),
+            {'level_colspan': [3, 2], 'level_repetitions': [1, 2], 'custom_subheaders': []}
+        )
+
+        self.assertLinesValues(
+            self.report._get_lines(options),
+            #                                   [          2020                ]  [            2019              ]
+            #                                   [ col 1 ] [ col 2 ] [ budget 1 ]  [ col 1 ] [ col 2 ] [ budget 1 ]
+            [0,                                     1,        2,         3,          4,        5,         6],
+            [
+                ('line_domain',                   600,        '',      1110,          0,       '',         0),
+                (self.account_1.display_name,     100,        '',      1000,          0,       '',         0),
+                (self.account_2.display_name,     200,        '',         0,          0,       '',         0),
+                (self.account_3.display_name,     300,        '',       100,          0,       '',         0),
+                (self.account_4.display_name,       0,        '',        10,          0,       '',         0),
+                ('line_account_codes',            600,        '',      1110,          0,       '',         0),
+                (self.account_1.display_name,     100,        '',      1000,          0,       '',         0),
+                (self.account_2.display_name,     200,        '',         0,          0,       '',         0),
+                (self.account_3.display_name,     300,        '',       100,          0,       '',         0),
+                (self.account_4.display_name,       0,        '',        10,          0,       '',         0),
+            ],
+            options,
+        )
+
+    def test_hierarchy_with_budget(self):
+        """ Check that the report lines are correct with a budget and the option "Hierarchy and subtotals" is ticked"""
+        self.env['account.group'].create({
+            'name': 'Sales',
+            'code_prefix_start': '1',
+            'code_prefix_end': '9',
+        })
+
+        move = self.env['account.move'].create({
+            'date': '2020-02-02',
+            'line_ids': [
+                Command.create({
+                    'account_id': self.company_data['default_account_revenue'].id,
+                    'name': 'name',
+                })
+            ],
+        })
+        move.action_post()
+        move.line_ids.flush_recordset()
+        profit_and_loss_report = self.env.ref('odex30_account_reports.profit_and_loss')
+        line_id = self._get_basic_line_dict_id_from_report_line_ref('odex30_account_reports.account_financial_report_revenue0')
+        options = self._generate_options(profit_and_loss_report, '2020-02-01', '2024-12-28', default_options={'budgets': [{'id': self.budget_1.id, 'selected': True}]})
+        options['unfolded_lines'] = [line_id]
+        options['hierarchy'] = True
+        options['unfold_all'] = True
+
+        lines = profit_and_loss_report._get_lines(options)
+        unfolded_lines = profit_and_loss_report._get_unfolded_lines(lines, line_id)
+        unfolded_lines = [{'name': line['name'], 'level': line['level']} for line in unfolded_lines]
+
+        self.assertEqual(
+            unfolded_lines,
+            [
+                {'level': 1, 'name': 'Revenue'},
+                {'level': 2, 'name': '1-9 Sales'},
+                {'level': 3, 'name': '400000 Product Sales'},
+            ]
+        )
+
+    def test_budget_report_edit_items_with_date(self):
+        """
+        Ensure budget items are created or updated correctly
+        when editing across varying date ranges
+        """
+        def set_budget_item(value, account_id, date_from, date_to):
+            budget._create_or_update_budget_items(
+                value_to_set=value,
+                account_id=account_id,
+                rounding=self.env.company.currency_id.decimal_places,
+                date_from=date_from,
+                date_to=date_to,
+            )
+
+        budget = self.env['account.report.budget'].create({'name': "Budget"})
+        set_budget_item(1200, self.account_1.id, '2025-01-01', '2025-12-01')
+        expected_items = [
+            {'amount': 100.0, 'date': fields.Date.to_date('2025-01-01')},
+            {'amount': 100.0, 'date': fields.Date.to_date('2025-02-01')},
+            {'amount': 100.0, 'date': fields.Date.to_date('2025-03-01')},
+            {'amount': 100.0, 'date': fields.Date.to_date('2025-04-01')},
+            {'amount': 100.0, 'date': fields.Date.to_date('2025-05-01')},
+            {'amount': 100.0, 'date': fields.Date.to_date('2025-06-01')},
+            {'amount': 100.0, 'date': fields.Date.to_date('2025-07-01')},
+            {'amount': 100.0, 'date': fields.Date.to_date('2025-08-01')},
+            {'amount': 100.0, 'date': fields.Date.to_date('2025-09-01')},
+            {'amount': 100.0, 'date': fields.Date.to_date('2025-10-01')},
+            {'amount': 100.0, 'date': fields.Date.to_date('2025-11-01')},
+            {'amount': 100.0, 'date': fields.Date.to_date('2025-12-01')},
+        ]
+        self.assertRecordValues(budget.item_ids, expected_items)
+
+        # Update the second and third months to total of 900 (450 per month)
+        set_budget_item(900, self.account_1.id, '2025-01-10', '2025-3-10')
+        # Now the second and third months each have an amount of 450
+
+        set_budget_item(1000, self.account_1.id, '2025-01-01', '2025-12-01')
+        expected_items = [
+            {'amount': 100.0 - 75.00, 'date': fields.Date.to_date('2025-01-01')},
+            {'amount': 450.0 - 75.00, 'date': fields.Date.to_date('2025-02-01')},
+            {'amount': 450.0 - 75.00, 'date': fields.Date.to_date('2025-03-01')},
+            {'amount': 100.0 - 75.00, 'date': fields.Date.to_date('2025-04-01')},
+            {'amount': 100.0 - 75.00, 'date': fields.Date.to_date('2025-05-01')},
+            {'amount': 100.0 - 75.00, 'date': fields.Date.to_date('2025-06-01')},
+            {'amount': 100.0 - 75.00, 'date': fields.Date.to_date('2025-07-01')},
+            {'amount': 100.0 - 75.00, 'date': fields.Date.to_date('2025-08-01')},
+            {'amount': 100.0 - 75.00, 'date': fields.Date.to_date('2025-09-01')},
+            {'amount': 100.0 - 75.00, 'date': fields.Date.to_date('2025-10-01')},
+            {'amount': 100.0 - 75.00, 'date': fields.Date.to_date('2025-11-01')},
+            {'amount': 100.0 - 75.00, 'date': fields.Date.to_date('2025-12-01')},
+        ]
+        self.assertRecordValues(budget.item_ids, expected_items)
diff --git a/dev_odex30_accounting/odex30_account_reports/tests/test_cash_flow_report.py b/dev_odex30_accounting/odex30_account_reports/tests/test_cash_flow_report.py
new file mode 100644
index 0000000..6ef2d08
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_reports/tests/test_cash_flow_report.py
@@ -0,0 +1,1348 @@
+# -*- coding: utf-8 -*-
+# pylint: disable=C0326
+from .common import TestAccountReportsCommon
+
+from odoo import fields
+from odoo.tests import tagged
+
+from odoo import Command
+
+@tagged('post_install', '-at_install')
+class TestCashFlowReport(TestAccountReportsCommon):
+    @classmethod
+    def setUpClass(cls):
+        super().setUpClass()
+
+        cls.report = cls.env.ref('odex30_account_reports.cash_flow_report')
+
+        cls.misc_journal = cls.company_data['default_journal_misc']
+        cls.cash_journal = cls.company_data['default_journal_cash']
+        cls.bank_journal = cls.company_data['default_journal_bank']
+
+        cls.account_cash = cls.cash_journal.default_account_id
+        cls.account_bank = cls.bank_journal.default_account_id
+        cls.account_receivable_1 = cls.company_data['default_account_receivable']
+        cls.account_receivable_2 = cls.env['account.account'].create({
+            'account_type': 'asset_receivable',
+            'name': 'Account Receivable 2',
+            'code': '121020',
+            'reconcile': True,
+        })
+        cls.account_receivable_3 = cls.env['account.account'].create({
+            'account_type': 'asset_receivable',
+            'name': 'Account Receivable 3',
+            'code': '121030',
+            'reconcile': True,
+        })
+
+        cls.account_no_tag = cls.env['account.account'].create({
+            'account_type': 'asset_current',
+            'name': 'account_no_tag',
+            'code': '121040',
+            'reconcile': True,
+        })
+        cls.account_financing = cls.env['account.account'].create({
+            'account_type': 'asset_current',
+            'name': 'account_financing',
+            'code': '121050',
+            'reconcile': True,
+            'tag_ids': cls.env.ref('account.account_tag_financing'),
+        })
+        cls.account_operating = cls.env['account.account'].create({
+            'account_type': 'asset_current',
+            'name': 'account_operating',
+            'code': '121060',
+            'reconcile': True,
+            'tag_ids': cls.env.ref('account.account_tag_operating'),
+        })
+        cls.account_investing = cls.env['account.account'].create({
+            'account_type': 'asset_current',
+            'name': 'account_investing',
+            'code': '121070',
+            'reconcile': True,
+            'tag_ids': cls.env.ref('account.account_tag_investing'),
+        })
+
+    def _reconcile_on(self, lines, account):
+        lines.filtered(lambda line: line.account_id == account and not line.reconciled).reconcile()
+
+    def test_growth_comparison(self):
+        """ Enables period comparison and tests the growth comparison column; in order to ensure this feature works on reports with dynamic lines.
+        """
+        self.report.filter_period_comparison = True
+        options = self._generate_options(self.report, fields.Date.from_string('2016-01-01'), fields.Date.from_string('2016-12-31'))
+        options = self._update_comparison_filter(options, self.report, 'previous_period', 1)
+
+        move_1 = self.env['account.move'].create({
+            'move_type': 'entry',
+            'date': '2015-01-01',
+            'journal_id': self.misc_journal.id,
+            'line_ids': [
+                (0, 0, {'debit': 100.0,     'credit': 0.0,     'account_id': self.account_bank.id}),
+                (0, 0, {'debit': 100.0,     'credit': 0.0,     'account_id': self.account_cash.id}),
+                (0, 0, {'debit':   0.0,     'credit': 200.0,   'account_id': self.account_no_tag.id}),
+            ],
+        })
+        move_1.action_post()
+
+        move_2 = self.env['account.move'].create({
+            'move_type': 'entry',
+            'date': '2016-01-01',
+            'journal_id': self.misc_journal.id,
+            'line_ids': [
+                (0, 0, {'debit': 1000.0,     'credit': 0.0,     'account_id': self.account_bank.id}),
+                (0, 0, {'debit': 1000.0,     'credit': 0.0,     'account_id': self.account_cash.id}),
+                (0, 0, {'debit':   0.0,      'credit': 2000.0,  'account_id': self.account_no_tag.id}),
+            ],
+        })
+        move_2.action_post()
+
+        self.assertColumnPercentComparisonValues(
+            self.report._get_lines(options),
+            [
+                ('Cash and cash equivalents, beginning of period',         'n/a',      'muted'),
+                ('Net increase in cash and cash equivalents',              '900.0%',   'green'),
+                ('Cash flows from operating activities',                   'n/a',      'muted'),
+                ('Advance Payments received from customers',               'n/a',      'muted'),
+                ('Cash received from operating activities',                'n/a',      'muted'),
+                ('Advance payments made to suppliers',                     'n/a',      'muted'),
+                ('Cash paid for operating activities',                     'n/a',      'muted'),
+                ('Cash flows from investing & extraordinary activities',   'n/a',      'muted'),
+                ('Cash in',                                                'n/a',      'muted'),
+                ('Cash out',                                               'n/a',      'muted'),
+                ('Cash flows from financing activities',                   'n/a',      'muted'),
+                ('Cash in',                                                'n/a',      'muted'),
+                ('Cash out',                                               'n/a',      'muted'),
+                ('Cash flows from unclassified activities',                '900.0%',   'green'),
+                ('Cash in',                                                '900.0%',   'green'),
+                ('Cash out',                                               'n/a',      'muted'),
+                ('Cash and cash equivalents, closing balance',             '1000.0%',  'green'),
+            ]
+        )
+
+    def test_cash_flow_journals(self):
+        options = self._generate_options(self.report, fields.Date.from_string('2016-01-01'), fields.Date.from_string('2017-01-01'))
+
+        misc_move = self.env['account.move'].create({
+            'move_type': 'entry',
+            'date': '2016-07-01',
+            'journal_id': self.misc_journal.id,
+            'line_ids': [
+                (0, 0, {'debit': 100.0,     'credit': 0.0,     'account_id': self.account_bank.id}),
+                (0, 0, {'debit': 100.0,     'credit': 0.0,     'account_id': self.account_cash.id}),
+                (0, 0, {'debit':   0.0,     'credit': 200.0,   'account_id': self.account_no_tag.id}),
+            ],
+        })
+        misc_move.action_post()
+
+        bank_move = self.env['account.move'].create({
+            'move_type': 'entry',
+            'date': '2016-07-01',
+            'journal_id': self.bank_journal.id,
+            'line_ids': [
+                (0, 0, {'debit': 200.0,     'credit': 0.0,     'account_id': self.account_bank.id}),
+                (0, 0, {'debit':   0.0,     'credit': 200.0,   'account_id': self.account_no_tag.id}),
+            ],
+        })
+        bank_move.action_post()
+
+        cash_move = self.env['account.move'].create({
+            'move_type': 'entry',
+            'date': '2016-07-01',
+            'journal_id': self.cash_journal.id,
+            'line_ids': [
+                (0, 0, {'debit': 200.0,     'credit': 0.0,     'account_id': self.account_cash.id}),
+                (0, 0, {'debit':   0.0,     'credit': 200.0,   'account_id': self.account_no_tag.id}),
+            ],
+        })
+        cash_move.action_post()
+
+        self.assertLinesValues(self.report._get_lines(options), [0, 1], [
+            ['Cash and cash equivalents, beginning of period',                      0.0],
+            ['Net increase in cash and cash equivalents',                         600.0],
+            ['Cash flows from operating activities',                                0.0],
+            ['Advance Payments received from customers',                            0.0],
+            ['Cash received from operating activities',                             0.0],
+            ['Advance payments made to suppliers',                                  0.0],
+            ['Cash paid for operating activities',                                  0.0],
+            ['Cash flows from investing & extraordinary activities',                0.0],
+            ['Cash in',                                                             0.0],
+            ['Cash out',                                                            0.0],
+            ['Cash flows from financing activities',                                0.0],
+            ['Cash in',                                                             0.0],
+            ['Cash out',                                                            0.0],
+            ['Cash flows from unclassified activities',                           600.0],
+            ['Cash in',                                                           600.0],
+            ['Cash out',                                                            0.0],
+            ['Cash and cash equivalents, closing balance',                        600.0],
+        ], options)
+
+        # This move should not appear since it does not use a bank or cash account
+        receivable_move = self.env['account.move'].create({
+            'move_type': 'entry',
+            'date': '2016-07-01',
+            'journal_id': self.misc_journal.id,
+            'line_ids': [
+                (0, 0, {'debit': 200.0,     'credit': 0.0,     'account_id': self.account_receivable_1.id}),
+                (0, 0, {'debit':   0.0,     'credit': 200.0,   'account_id': self.account_no_tag.id}),
+            ],
+        })
+        # Default journal account that hasn't "Bank and Cash" or "Credit Card" type should not appear
+        self.misc_journal.default_account_id = self.account_no_tag
+        receivable_move.action_post()
+
+        self.assertLinesValues(self.report._get_lines(options), [0, 1], [
+            ['Cash and cash equivalents, beginning of period',                      0.0],
+            ['Net increase in cash and cash equivalents',                         600.0],
+            ['Cash flows from operating activities',                                0.0],
+            ['Advance Payments received from customers',                            0.0],
+            ['Cash received from operating activities',                             0.0],
+            ['Advance payments made to suppliers',                                  0.0],
+            ['Cash paid for operating activities',                                  0.0],
+            ['Cash flows from investing & extraordinary activities',                0.0],
+            ['Cash in',                                                             0.0],
+            ['Cash out',                                                            0.0],
+            ['Cash flows from financing activities',                                0.0],
+            ['Cash in',                                                             0.0],
+            ['Cash out',                                                            0.0],
+            ['Cash flows from unclassified activities',                           600.0],
+            ['Cash in',                                                           600.0],
+            ['Cash out',                                                            0.0],
+            ['Cash and cash equivalents, closing balance',                        600.0],
+        ], options)
+
+    def test_cash_flow_comparison(self):
+        self.report.filter_period_comparison = True
+        self.report.default_opening_date_filter = 'this_year'
+
+        options = self._generate_options(self.report, fields.Date.from_string('2016-01-01'), fields.Date.from_string('2016-12-31'))
+        options = self._update_comparison_filter(options, self.report, comparison_type='previous_period', number_period=1)
+        options['filter_period_comparison'] = True
+
+        # Current period
+        invoice_current_period = self.env['account.move'].create({
+            'move_type': 'entry',
+            'date': '2016-01-08',
+            'journal_id': self.bank_journal.id,
+            'line_ids': [
+                (0, 0, {'debit': 230.0,  'credit': 0.0,    'account_id': self.account_receivable_1.id}),
+                (0, 0, {'debit': 0.0,    'credit': 230.0,  'account_id': self.account_no_tag.id}),
+            ],
+        })
+        invoice_current_period.action_post()
+
+        payment_current_period = self.env['account.move'].create({
+            'move_type': 'entry',
+            'date': '2016-01-16',
+            'journal_id': self.bank_journal.id,
+            'line_ids': [
+                (0, 0, {'debit': 0.0,   'credit': 230.0, 'account_id': self.account_receivable_1.id}),
+                (0, 0, {'debit': 230.0, 'credit': 0.0,   'account_id': self.account_bank.id}),
+            ],
+        })
+        payment_current_period.action_post()
+
+        self._reconcile_on((invoice_current_period + payment_current_period).line_ids, self.account_receivable_1)
+
+        # Past period
+        invoice_past_period = self.env['account.move'].create({
+            'move_type': 'entry',
+            'date': '2015-01-08',
+            'journal_id': self.bank_journal.id,
+            'line_ids': [
+                (0, 0, {'debit': 100.0,  'credit': 0.0,    'account_id': self.account_receivable_1.id}),
+                (0, 0, {'debit': 0.0,    'credit': 100.0,  'account_id': self.account_no_tag.id}),
+            ],
+        })
+        invoice_past_period.action_post()
+
+        payment_past_period = self.env['account.move'].create({
+            'move_type': 'entry',
+            'date': '2015-01-16',
+            'journal_id': self.bank_journal.id,
+            'line_ids': [
+                (0, 0, {'debit': 0.0,   'credit': 100.0, 'account_id': self.account_receivable_1.id}),
+                (0, 0, {'debit': 100.0, 'credit': 0.0,   'account_id': self.account_bank.id}),
+            ],
+        })
+        payment_past_period.action_post()
+
+        self._reconcile_on((invoice_past_period + payment_past_period).line_ids, self.account_receivable_1)
+
+        self.assertLinesValues(self.report._get_lines(options), [0, 1, 2], [
+            ['Cash and cash equivalents, beginning of period',            100.0,        0.0],
+            ['Net increase in cash and cash equivalents',                 230.0,      100.0],
+            ['Cash flows from operating activities',                        0.0,        0.0],
+            ['Advance Payments received from customers',                    0.0,        0.0],
+            ['Cash received from operating activities',                     0.0,        0.0],
+            ['Advance payments made to suppliers',                          0.0,        0.0],
+            ['Cash paid for operating activities',                          0.0,        0.0],
+            ['Cash flows from investing & extraordinary activities',        0.0,        0.0],
+            ['Cash in',                                                     0.0,        0.0],
+            ['Cash out',                                                    0.0,        0.0],
+            ['Cash flows from financing activities',                        0.0,        0.0],
+            ['Cash in',                                                     0.0,        0.0],
+            ['Cash out',                                                    0.0,        0.0],
+            ['Cash flows from unclassified activities',                   230.0,      100.0],
+            ['Cash in',                                                   230.0,      100.0],
+            ['Cash out',                                                    0.0,        0.0],
+            ['Cash and cash equivalents, closing balance',                330.0,      100.0],
+        ], options)
+
+    def test_cash_flow_column_groups(self):
+        self.report.filter_period_comparison = True
+        options = self._generate_options(self.report, fields.Date.from_string('2016-01-01'), fields.Date.from_string('2016-01-31'))
+        options = self._update_comparison_filter(options, self.report, comparison_type='previous_period', number_period=1)
+        options['filter_period_comparison'] = True
+
+        invoice_current_period = self.env['account.move'].create({
+            'move_type': 'entry',
+            'date': '2016-01-08',
+            'journal_id': self.bank_journal.id,
+            'line_ids': [
+                (0, 0, {'debit': 1150.0, 'credit': 0.0,    'account_id': self.account_receivable_1.id}),
+                (0, 0, {'debit': 0.0,    'credit': 150.0,  'account_id': self.account_no_tag.id}),
+                (0, 0, {'debit': 0.0,    'credit': 1000.0, 'account_id': self.account_operating.id}),
+            ],
+        })
+        invoice_current_period.action_post()
+
+        payment_current_period = self.env['account.move'].create({
+            'move_type': 'entry',
+            'date': '2016-01-16',
+            'journal_id': self.bank_journal.id,
+            'line_ids': [
+                (0, 0, {'debit': 0.0,   'credit': 230.0, 'account_id': self.account_receivable_1.id}),
+                (0, 0, {'debit': 230.0, 'credit': 0.0,   'account_id': self.account_bank.id}),
+            ],
+        })
+        payment_current_period.action_post()
+
+        self._reconcile_on((invoice_current_period + payment_current_period).line_ids, self.account_receivable_1)
+
+        invoice_previous_period = self.env['account.move'].create({
+            'move_type': 'entry',
+            'date': '2015-12-08',
+            'journal_id': self.bank_journal.id,
+            'line_ids': [
+                (0, 0, {'debit': 575.0, 'credit': 0.0,   'account_id': self.account_receivable_1.id}),
+                (0, 0, {'debit': 0.0,   'credit': 75.0,  'account_id': self.account_no_tag.id}),
+                (0, 0, {'debit': 0.0,   'credit': 500.0, 'account_id': self.account_operating.id}),
+            ],
+        })
+        invoice_previous_period.action_post()
+
+        payment_previous_period = self.env['account.move'].create({
+            'move_type': 'entry',
+            'date': '2015-12-16',
+            'journal_id': self.bank_journal.id,
+            'line_ids': [
+                (0, 0, {'debit': 0.0,   'credit': 115.0, 'account_id': self.account_receivable_1.id}),
+                (0, 0, {'debit': 115.0, 'credit': 0.0,   'account_id': self.account_bank.id}),
+            ],
+        })
+        payment_previous_period.action_post()
+
+        self._reconcile_on((invoice_previous_period + payment_previous_period).line_ids, self.account_receivable_1)
+
+        self.assertLinesValues(self.report._get_lines(options), [0, 1, 2], [
+            ['Cash and cash equivalents, beginning of period',            115.0,        0.0],
+            ['Net increase in cash and cash equivalents',                 230.0,      115.0],
+            ['Cash flows from operating activities',                      200.0,      100.0],
+            ['Advance Payments received from customers',                    0.0,        0.0],
+            ['Cash received from operating activities',                   200.0,      100.0],
+            ['Advance payments made to suppliers',                          0.0,        0.0],
+            ['Cash paid for operating activities',                          0.0,        0.0],
+            ['Cash flows from investing & extraordinary activities',        0.0,        0.0],
+            ['Cash in',                                                     0.0,        0.0],
+            ['Cash out',                                                    0.0,        0.0],
+            ['Cash flows from financing activities',                        0.0,        0.0],
+            ['Cash in',                                                     0.0,        0.0],
+            ['Cash out',                                                    0.0,        0.0],
+            ['Cash flows from unclassified activities',                    30.0,       15.0],
+            ['Cash in',                                                    30.0,       15.0],
+            ['Cash out',                                                    0.0,        0.0],
+            ['Cash and cash equivalents, closing balance',                345.0,      115.0],
+        ], options)
+
+    def test_cash_flow_multi_company_multi_currency_unfolding(self):
+        company_data_3 = self.setup_other_company(name="Company 3")
+        options = self._generate_options(self.report, fields.Date.from_string('2016-01-01'), fields.Date.from_string('2017-01-01'))
+        options['unfold_all'] = True
+        self.company_data_2['default_journal_bank'].default_account_id.code = '101411'
+
+        for company_data in (self.company_data, self.company_data_2, company_data_3):
+            account_operating = self.env['account.account'].with_company(company_data['company']).create({
+                'account_type': 'asset_current',
+                'name': 'Account Operating',
+                'code': '121160',
+                'reconcile': True,
+                'tag_ids': self.env.ref('account.account_tag_operating'),
+            })
+            invoice = self.env['account.move'].with_company(company_data['company']).create({
+                'move_type': 'entry',
+                'date': '2016-01-01',
+                'journal_id': company_data['default_journal_bank'].id,
+                'line_ids': [
+                    (0, 0, {'debit': 1150.0, 'credit': 0.0,    'account_id': company_data['default_account_receivable'].id}),
+                    (0, 0, {'debit': 0.0,    'credit': 1150.0, 'account_id': account_operating.id}),
+                ],
+            })
+            invoice.action_post()
+            payment = self.env['account.move'].with_company(company_data['company']).create({
+                'move_type': 'entry',
+                'date': '2017-01-01',
+                'journal_id': company_data['default_journal_bank'].id,
+                'line_ids': [
+                    (0, 0, {'debit': 0.0,   'credit': 230.0, 'account_id': company_data['default_account_receivable'].id}),
+                    (0, 0, {'debit': 230.0, 'credit': 0.0,   'account_id': company_data['default_journal_bank'].default_account_id.id}),
+                ],
+            })
+            payment.action_post()
+            self._reconcile_on((invoice + payment).line_ids, company_data['default_account_receivable'])
+
+        lines = self.report._get_lines(options)
+        self.assertLinesValues(lines, [0, 1], [
+            ['Cash and cash equivalents, beginning of period',                        0.0],
+            ['Net increase in cash and cash equivalents',                           575.0],
+            ['Cash flows from operating activities',                                575.0],
+            ['Advance Payments received from customers',                              0.0],
+            ['Cash received from operating activities',                             575.0],
+            ['121160 Account Operating',                                            230.0],  # Company 1
+            ['Account Operating',                                                   115.0],  # Company 2 (rate 2.0)
+            ['Account Operating',                                                   230.0],  # Company 3
+            ['Total Cash received from operating activities',                       575.0],
+            ['Advance payments made to suppliers',                                    0.0],
+            ['Cash paid for operating activities',                                    0.0],
+            ['Cash flows from investing & extraordinary activities',                  0.0],
+            ['Cash in',                                                               0.0],
+            ['Cash out',                                                              0.0],
+            ['Cash flows from financing activities',                                  0.0],
+            ['Cash in',                                                               0.0],
+            ['Cash out',                                                              0.0],
+            ['Cash flows from unclassified activities',                               0.0],
+            ['Cash in',                                                               0.0],
+            ['Cash out',                                                              0.0],
+            ['Cash and cash equivalents, closing balance',                          575.0],
+            ['101401 Bank',                                                         230.0],  # Company 1
+            ['101411 Bank',                                                         115.0],  # Company 2 (rate 2.0)
+            ['Bank',                                                                230.0],  # Company 3
+            ['Total Cash and cash equivalents, closing balance',                    575.0],
+        ], options)
+
+    def test_cash_flow_tricky_case_1(self):
+        ''' Test how the cash flow report is involved:
+         - when reconciling multiple payments.
+         - when dealing with multiple receivable lines.
+         - when dealing with multiple partials on the same line.
+         - When making an advance payment.
+         - when adding entries after the report date.
+        '''
+        options = self._generate_options(self.report, fields.Date.from_string('2016-01-01'), fields.Date.from_string('2017-01-01'))
+
+        # First invoice, two receivable lines on the same account.
+        invoice = self.env['account.move'].create({
+            'move_type': 'entry',
+            'date': '2016-01-01',
+            'journal_id': self.bank_journal.id,
+            'line_ids': [
+                (0, 0, {'debit': 345.0, 'credit': 0.0,    'account_id': self.account_receivable_1.id}),
+                (0, 0, {'debit': 805.0, 'credit': 0.0,    'account_id': self.account_receivable_1.id}),
+                (0, 0, {'debit': 0.0,   'credit': 150.0,  'account_id': self.account_no_tag.id}),
+                (0, 0, {'debit': 0.0,   'credit': 1000.0, 'account_id': self.account_operating.id}),
+            ],
+        })
+        invoice.action_post()
+
+        # First payment (20% of the invoice).
+        payment_1 = self.env['account.move'].create({
+            'move_type': 'entry',
+            'date': '2016-02-01',
+            'journal_id': self.bank_journal.id,
+            'line_ids': [
+                (0, 0, {'debit': 0.0,   'credit': 230.0, 'account_id': self.account_receivable_1.id}),
+                (0, 0, {'debit': 230.0, 'credit': 0.0,   'account_id': self.account_bank.id}),
+            ],
+        })
+        payment_1.action_post()
+
+        self._reconcile_on((invoice + payment_1).line_ids, self.account_receivable_1)
+
+        self.assertLinesValues(self.report._get_lines(options), [0, 1], [
+            ['Cash and cash equivalents, beginning of period',                        0.0],
+            ['Net increase in cash and cash equivalents',                           230.0],
+            ['Cash flows from operating activities',                                200.0],
+            ['Advance Payments received from customers',                              0.0],
+            ['Cash received from operating activities',                             200.0],
+            ['Advance payments made to suppliers',                                    0.0],
+            ['Cash paid for operating activities',                                    0.0],
+            ['Cash flows from investing & extraordinary activities',                  0.0],
+            ['Cash in',                                                               0.0],
+            ['Cash out',                                                              0.0],
+            ['Cash flows from financing activities',                                  0.0],
+            ['Cash in',                                                               0.0],
+            ['Cash out',                                                              0.0],
+            ['Cash flows from unclassified activities',                              30.0],
+            ['Cash in',                                                              30.0],
+            ['Cash out',                                                              0.0],
+            ['Cash and cash equivalents, closing balance',                          230.0],
+        ], options)
+
+        # Second payment (also 20% but will produce two partials, one on each receivable line).
+        payment_2 = self.env['account.move'].create({
+            'move_type': 'entry',
+            'date': '2016-03-01',
+            'journal_id': self.bank_journal.id,
+            'line_ids': [
+                (0, 0, {'debit': 0.0,   'credit': 230.0, 'account_id': self.account_receivable_1.id}),
+                (0, 0, {'debit': 230.0, 'credit': 0.0,   'account_id': self.account_bank.id}),
+            ],
+        })
+        payment_2.action_post()
+
+        self._reconcile_on((invoice + payment_2).line_ids, self.account_receivable_1)
+
+        self.assertLinesValues(self.report._get_lines(options), [0, 1], [
+            ['Cash and cash equivalents, beginning of period',                        0.0],
+            ['Net increase in cash and cash equivalents',                           460.0],
+            ['Cash flows from operating activities',                                400.0],
+            ['Advance Payments received from customers',                              0.0],
+            ['Cash received from operating activities',                             400.0],
+            ['Advance payments made to suppliers',                                    0.0],
+            ['Cash paid for operating activities',                                    0.0],
+            ['Cash flows from investing & extraordinary activities',                  0.0],
+            ['Cash in',                                                               0.0],
+            ['Cash out',                                                              0.0],
+            ['Cash flows from financing activities',                                  0.0],
+            ['Cash in',                                                               0.0],
+            ['Cash out',                                                              0.0],
+            ['Cash flows from unclassified activities',                              60.0],
+            ['Cash in',                                                              60.0],
+            ['Cash out',                                                              0.0],
+            ['Cash and cash equivalents, closing balance',                          460.0],
+        ], options)
+
+        # Third payment (residual invoice amount + 1000.0).
+        payment_3 = self.env['account.move'].create({
+            'move_type': 'entry',
+            'date': '2016-04-01',
+            'journal_id': self.bank_journal.id,
+            'line_ids': [
+                (0, 0, {'debit': 0.0,    'credit': 1690.0, 'account_id': self.account_receivable_1.id}),
+                (0, 0, {'debit': 1690.0, 'credit': 0.0,    'account_id': self.account_bank.id}),
+            ],
+        })
+        payment_3.action_post()
+
+        self._reconcile_on((invoice + payment_3).line_ids, self.account_receivable_1)
+
+        self.assertLinesValues(self.report._get_lines(options), [0, 1], [
+            ['Cash and cash equivalents, beginning of period',                        0.0],
+            ['Net increase in cash and cash equivalents',                          2150.0],
+            ['Cash flows from operating activities',                               2000.0],
+            ['Advance Payments received from customers',                           1000.0],
+            ['Cash received from operating activities',                            1000.0],
+            ['Advance payments made to suppliers',                                    0.0],
+            ['Cash paid for operating activities',                                    0.0],
+            ['Cash flows from investing & extraordinary activities',                  0.0],
+            ['Cash in',                                                               0.0],
+            ['Cash out',                                                              0.0],
+            ['Cash flows from financing activities',                                  0.0],
+            ['Cash in',                                                               0.0],
+            ['Cash out',                                                              0.0],
+            ['Cash flows from unclassified activities',                             150.0],
+            ['Cash in',                                                             150.0],
+            ['Cash out',                                                              0.0],
+            ['Cash and cash equivalents, closing balance',                         2150.0],
+        ], options)
+
+        # Second invoice.
+        invoice_2 = self.env['account.move'].create({
+            'move_type': 'entry',
+            'date': '2018-01-01',
+            'journal_id': self.bank_journal.id,
+            'line_ids': [
+                (0, 0, {'debit': 1000.0, 'credit': 0.0,    'account_id': self.account_receivable_1.id}),
+                (0, 0, {'debit': 0.0,    'credit': 1000.0, 'account_id': self.account_operating.id}),
+            ],
+        })
+        invoice_2.action_post()
+
+        self._reconcile_on((invoice_2 + payment_3).line_ids, self.account_receivable_1)
+
+        # Exceed the report date, should not affect the report.
+        self.assertLinesValues(self.report._get_lines(options), [0, 1], [
+            ['Cash and cash equivalents, beginning of period',                        0.0],
+            ['Net increase in cash and cash equivalents',                          2150.0],
+            ['Cash flows from operating activities',                               2000.0],
+            ['Advance Payments received from customers',                           1000.0],
+            ['Cash received from operating activities',                            1000.0],
+            ['Advance payments made to suppliers',                                    0.0],
+            ['Cash paid for operating activities',                                    0.0],
+            ['Cash flows from investing & extraordinary activities',                  0.0],
+            ['Cash in',                                                               0.0],
+            ['Cash out',                                                              0.0],
+            ['Cash flows from financing activities',                                  0.0],
+            ['Cash in',                                                               0.0],
+            ['Cash out',                                                              0.0],
+            ['Cash flows from unclassified activities',                             150.0],
+            ['Cash in',                                                             150.0],
+            ['Cash out',                                                              0.0],
+            ['Cash and cash equivalents, closing balance',                         2150.0],
+        ], options)
+
+        options['date']['date_to'] = '2018-01-01'
+
+        self.assertLinesValues(self.report._get_lines(options), [0, 1], [
+            ['Cash and cash equivalents, beginning of period',                        0.0],
+            ['Net increase in cash and cash equivalents',                          2150.0],
+            ['Cash flows from operating activities',                               2000.0],
+            ['Advance Payments received from customers',                              0.0],
+            ['Cash received from operating activities',                            2000.0],
+            ['Advance payments made to suppliers',                                    0.0],
+            ['Cash paid for operating activities',                                    0.0],
+            ['Cash flows from investing & extraordinary activities',                  0.0],
+            ['Cash in',                                                               0.0],
+            ['Cash out',                                                              0.0],
+            ['Cash flows from financing activities',                                  0.0],
+            ['Cash in',                                                               0.0],
+            ['Cash out',                                                              0.0],
+            ['Cash flows from unclassified activities',                             150.0],
+            ['Cash in',                                                             150.0],
+            ['Cash out',                                                              0.0],
+            ['Cash and cash equivalents, closing balance',                         2150.0],
+        ], options)
+
+    def test_cash_flow_tricky_case_2(self):
+        ''' Test how the cash flow report is involved:
+         - when dealing with multiple receivable account.
+         - when making reconciliation involving multiple liquidity moves.
+        '''
+        options = self._generate_options(self.report, fields.Date.from_string('2016-01-01'), fields.Date.from_string('2017-01-01'))
+
+        # First liquidity move.
+        liquidity_move_1 = self.env['account.move'].create({
+            'date': '2016-01-01',
+            'journal_id': self.bank_journal.id,
+            'line_ids': [
+                (0, 0, {'debit': 800.0, 'credit': 0.0,   'account_id': self.account_receivable_1.id}),
+                (0, 0, {'debit': 0.0,   'credit': 250.0, 'account_id': self.account_receivable_3.id}),
+                (0, 0, {'debit': 0.0,   'credit': 250.0, 'account_id': self.account_no_tag.id}),
+                (0, 0, {'debit': 0.0,   'credit': 300.0, 'account_id': self.account_bank.id}),
+            ],
+        })
+        liquidity_move_1.action_post()
+
+        self.assertLinesValues(self.report._get_lines(options), [0, 1], [
+            ['Cash and cash equivalents, beginning of period',                      0.0],
+            ['Net increase in cash and cash equivalents',                        -300.0],
+            ['Cash flows from operating activities',                             -550.0],
+            ['Advance Payments received from customers',                         -550.0],
+            ['Cash received from operating activities',                             0.0],
+            ['Advance payments made to suppliers',                                  0.0],
+            ['Cash paid for operating activities',                                  0.0],
+            ['Cash flows from investing & extraordinary activities',                0.0],
+            ['Cash in',                                                             0.0],
+            ['Cash out',                                                            0.0],
+            ['Cash flows from financing activities',                                0.0],
+            ['Cash in',                                                             0.0],
+            ['Cash out',                                                            0.0],
+            ['Cash flows from unclassified activities',                           250.0],
+            ['Cash in',                                                           250.0],
+            ['Cash out',                                                            0.0],
+            ['Cash and cash equivalents, closing balance',                       -300.0],
+        ], options)
+
+        # Misc. move to be reconciled at 800 / (1000 + 3000) = 20%.
+
+        misc_move = self.env['account.move'].create({
+            'date': '2016-02-01',
+            'journal_id': self.bank_journal.id,
+            'line_ids': [
+                (0, 0, {'debit': 0.0,    'credit': 1000.0, 'account_id': self.account_receivable_1.id}),
+                (0, 0, {'debit': 0.0,    'credit': 500.0,  'account_id': self.account_no_tag.id}),
+                (0, 0, {'debit': 4500.0, 'credit': 0.0,    'account_id': self.account_financing.id}),
+                (0, 0, {'debit': 0.0,    'credit': 3000.0, 'account_id': self.account_receivable_2.id}),
+            ],
+        })
+        misc_move.action_post()
+
+        self._reconcile_on((misc_move + liquidity_move_1).line_ids, self.account_receivable_1)
+
+        self.assertLinesValues(self.report._get_lines(options), [0, 1], [
+            ['Cash and cash equivalents, beginning of period',                      0.0],
+            ['Net increase in cash and cash equivalents',                        -300.0],
+            ['Cash flows from operating activities',                             2650.0],
+            ['Advance Payments received from customers',                         2650.0],
+            ['Cash received from operating activities',                             0.0],
+            ['Advance payments made to suppliers',                                  0.0],
+            ['Cash paid for operating activities',                                  0.0],
+            ['Cash flows from investing & extraordinary activities',                0.0],
+            ['Cash in',                                                             0.0],
+            ['Cash out',                                                            0.0],
+            ['Cash flows from financing activities',                            -3600.0],
+            ['Cash in',                                                             0.0],
+            ['Cash out',                                                        -3600.0],
+            ['Cash flows from unclassified activities',                           650.0],
+            ['Cash in',                                                           650.0],
+            ['Cash out',                                                            0.0],
+            ['Cash and cash equivalents, closing balance',                       -300.0],
+        ], options)
+
+        # Second liquidity move.
+
+        liquidity_move_2 = self.env['account.move'].create({
+            'date': '2016-03-01',
+            'journal_id': self.bank_journal.id,
+            'line_ids': [
+                (0, 0, {'debit': 3200.0, 'credit': 0.0,    'account_id': self.account_receivable_2.id}),
+                (0, 0, {'debit': 200.0,  'credit': 0.0,    'account_id': self.account_receivable_3.id}),
+                (0, 0, {'debit': 0.0,    'credit': 400.0,  'account_id': self.account_financing.id}),
+                (0, 0, {'debit': 0.0,    'credit': 3000.0, 'account_id': self.account_bank.id}),
+            ],
+        })
+        liquidity_move_2.action_post()
+
+        self._reconcile_on((misc_move + liquidity_move_2).line_ids, self.account_receivable_2)
+
+        self.assertLinesValues(self.report._get_lines(options), [0, 1], [
+            ['Cash and cash equivalents, beginning of period',                      0.0],
+            ['Net increase in cash and cash equivalents',                       -3300.0],
+            ['Cash flows from operating activities',                             -150.0],
+            ['Advance Payments received from customers',                         -150.0],
+            ['Cash received from operating activities',                             0.0],
+            ['Advance payments made to suppliers',                                  0.0],
+            ['Cash paid for operating activities',                                  0.0],
+            ['Cash flows from investing & extraordinary activities',                0.0],
+            ['Cash in',                                                             0.0],
+            ['Cash out',                                                            0.0],
+            ['Cash flows from financing activities',                            -3875.0],
+            ['Cash in',                                                           400.0],
+            ['Cash out',                                                        -4275.0],
+            ['Cash flows from unclassified activities',                           725.0],
+            ['Cash in',                                                           725.0],
+            ['Cash out',                                                            0.0],
+            ['Cash and cash equivalents, closing balance',                      -3300.0],
+        ], options)
+
+        # This should not change the report.
+        self._reconcile_on((liquidity_move_1 + liquidity_move_2).line_ids, self.account_receivable_3)
+
+        self.assertLinesValues(self.report._get_lines(options), [0, 1], [
+            ['Cash and cash equivalents, beginning of period',                      0.0],
+            ['Net increase in cash and cash equivalents',                       -3300.0],
+            ['Cash flows from operating activities',                             -150.0],
+            ['Advance Payments received from customers',                         -150.0],
+            ['Cash received from operating activities',                             0.0],
+            ['Advance payments made to suppliers',                                  0.0],
+            ['Cash paid for operating activities',                                  0.0],
+            ['Cash flows from investing & extraordinary activities',                0.0],
+            ['Cash in',                                                             0.0],
+            ['Cash out',                                                            0.0],
+            ['Cash flows from financing activities',                            -3875.0],
+            ['Cash in',                                                           400.0],
+            ['Cash out',                                                        -4275.0],
+            ['Cash flows from unclassified activities',                           725.0],
+            ['Cash in',                                                           725.0],
+            ['Cash out',                                                            0.0],
+            ['Cash and cash equivalents, closing balance',                      -3300.0],
+        ], options)
+
+    def test_cash_flow_tricky_case_3(self):
+        ''' Test how the cash flow report is involved:
+         - when reconciling entries on a not-receivable/payable account.
+         - when dealing with weird liquidity moves.
+        '''
+        move_1 = self.env['account.move'].create({
+            'move_type': 'entry',
+            'date': '2016-01-01',
+            'journal_id': self.bank_journal.id,
+            'line_ids': [
+                (0, 0, {'debit': 0.0,   'credit': 500.0, 'account_id': self.account_no_tag.id}),
+                (0, 0, {'debit': 500.0, 'credit': 0.0,   'account_id': self.account_financing.id}),
+            ],
+        })
+
+        move_2 = self.env['account.move'].create({
+            'move_type': 'entry',
+            'date': '2016-01-01',
+            'journal_id': self.bank_journal.id,
+            'line_ids': [
+                (0, 0, {'debit': 1000.0, 'credit': 0.0,   'account_id': self.account_bank.id}),
+                (0, 0, {'debit': 0.0,    'credit': 500.0, 'account_id': self.account_financing.id}),
+                (0, 0, {'debit': 0.0,    'credit': 500.0, 'account_id': self.account_financing.id}),
+            ],
+        })
+
+        move_3 = self.env['account.move'].create({
+            'move_type': 'entry',
+            'date': '2016-02-01',
+            'journal_id': self.bank_journal.id,
+            'line_ids': [
+                (0, 0, {'debit': 0.0,   'credit': 500.0, 'account_id': self.account_bank.id}),
+                (0, 0, {'debit': 500.0, 'credit': 0.0,   'account_id': self.account_financing.id}),
+            ],
+        })
+        (move_1 + move_2 + move_3).action_post()
+
+        # Reconcile everything on account_financing.
+        self._reconcile_on((move_1 + move_2 + move_3).line_ids, self.account_financing)
+
+        options = self._generate_options(self.report, fields.Date.from_string('2016-01-01'), fields.Date.from_string('2016-01-01'))
+
+        self.assertLinesValues(self.report._get_lines(options), [0, 1], [
+            ['Cash and cash equivalents, beginning of period',                        0.0],
+            ['Net increase in cash and cash equivalents',                          1000.0],
+            ['Cash flows from operating activities',                                  0.0],
+            ['Advance Payments received from customers',                              0.0],
+            ['Cash received from operating activities',                               0.0],
+            ['Advance payments made to suppliers',                                    0.0],
+            ['Cash paid for operating activities',                                    0.0],
+            ['Cash flows from investing & extraordinary activities',                  0.0],
+            ['Cash in',                                                               0.0],
+            ['Cash out',                                                              0.0],
+            ['Cash flows from financing activities',                                500.0],
+            ['Cash in',                                                             500.0],
+            ['Cash out',                                                              0.0],
+            ['Cash flows from unclassified activities',                             500.0],
+            ['Cash in',                                                             500.0],
+            ['Cash out',                                                              0.0],
+            ['Cash and cash equivalents, closing balance',                         1000.0],
+        ], options)
+
+        options = self._generate_options(self.report, fields.Date.from_string('2016-01-01'), fields.Date.from_string('2016-02-01'))
+
+        self.assertLinesValues(self.report._get_lines(options), [0, 1], [
+            ['Cash and cash equivalents, beginning of period',                        0.0],
+            ['Net increase in cash and cash equivalents',                           500.0],
+            ['Cash flows from operating activities',                                  0.0],
+            ['Advance Payments received from customers',                              0.0],
+            ['Cash received from operating activities',                               0.0],
+            ['Advance payments made to suppliers',                                    0.0],
+            ['Cash paid for operating activities',                                    0.0],
+            ['Cash flows from investing & extraordinary activities',                  0.0],
+            ['Cash in',                                                               0.0],
+            ['Cash out',                                                              0.0],
+            ['Cash flows from financing activities',                                  0.0],
+            ['Cash in',                                                               0.0],
+            ['Cash out',                                                              0.0],
+            ['Cash flows from unclassified activities',                             500.0],
+            ['Cash in',                                                             500.0],
+            ['Cash out',                                                              0.0],
+            ['Cash and cash equivalents, closing balance',                          500.0],
+        ], options)
+
+    def test_cash_flow_tricky_case_4(self):
+        ''' The difficulty of this case is the liquidity move will pay the misc move at 1000 / 3000 = 1/3.
+        However, you must take care of the sign because the 3000 in credit must become 1000 in debit.
+        '''
+        options = self._generate_options(self.report, fields.Date.from_string('2016-01-01'), fields.Date.from_string('2016-01-01'))
+
+        move_1 = self.env['account.move'].create({
+            'move_type': 'entry',
+            'date': '2016-01-01',
+            'journal_id': self.bank_journal.id,
+            'line_ids': [
+                (0, 0, {'debit': 0.0,    'credit': 3000.0, 'account_id': self.account_no_tag.id}),
+                (0, 0, {'debit': 5000.0, 'credit': 0.0,    'account_id': self.account_financing.id}),
+                (0, 0, {'debit': 0.0,    'credit': 1000.0, 'account_id': self.account_financing.id}),
+                (0, 0, {'debit': 0.0,    'credit': 1000.0, 'account_id': self.account_financing.id}),
+            ],
+        })
+
+        move_2 = self.env['account.move'].create({
+            'move_type': 'entry',
+            'date': '2016-01-01',
+            'journal_id': self.bank_journal.id,
+            'line_ids': [
+                (0, 0, {'debit': 0.0,    'credit': 1000.0, 'account_id': self.account_bank.id}),
+                (0, 0, {'debit': 1000.0, 'credit': 0.0,    'account_id': self.account_financing.id}),
+            ],
+        })
+
+        (move_1 + move_2).action_post()
+
+        self._reconcile_on(move_1.line_ids.filtered('credit') + move_2.line_ids, self.account_financing)
+
+        self.assertLinesValues(self.report._get_lines(options), [0, 1], [
+            ['Cash and cash equivalents, beginning of period',                        0.0],
+            ['Net increase in cash and cash equivalents',                         -1000.0],
+            ['Cash flows from operating activities',                                  0.0],
+            ['Advance Payments received from customers',                              0.0],
+            ['Cash received from operating activities',                               0.0],
+            ['Advance payments made to suppliers',                                    0.0],
+            ['Cash paid for operating activities',                                    0.0],
+            ['Cash flows from investing & extraordinary activities',                  0.0],
+            ['Cash in',                                                               0.0],
+            ['Cash out',                                                              0.0],
+            ['Cash flows from financing activities',                                  0.0],
+            ['Cash in',                                                               0.0],
+            ['Cash out',                                                              0.0],
+            ['Cash flows from unclassified activities',                           -1000.0],
+            ['Cash in',                                                               0.0],
+            ['Cash out',                                                          -1000.0],
+            ['Cash and cash equivalents, closing balance',                        -1000.0],
+        ], options)
+
+    def test_cash_flow_tricky_case_5(self):
+        ''' Same as test_cash_flow_tricky_case_4 in credit.'''
+        options = self._generate_options(self.report, fields.Date.from_string('2016-01-01'), fields.Date.from_string('2016-01-01'))
+
+        move_1 = self.env['account.move'].create({
+            'move_type': 'entry',
+            'date': '2016-01-01',
+            'journal_id': self.bank_journal.id,
+            'line_ids': [
+                (0, 0, {'debit': 3000.0, 'credit': 0.0,    'account_id': self.account_no_tag.id}),
+                (0, 0, {'debit': 0.0,    'credit': 5000.0, 'account_id': self.account_financing.id}),
+                (0, 0, {'debit': 1000.0, 'credit': 0.0,    'account_id': self.account_financing.id}),
+                (0, 0, {'debit': 1000.0, 'credit': 0.0,    'account_id': self.account_financing.id}),
+            ],
+        })
+
+        move_2 = self.env['account.move'].create({
+            'move_type': 'entry',
+            'date': '2016-01-01',
+            'journal_id': self.bank_journal.id,
+            'line_ids': [
+                (0, 0, {'debit': 1000.0, 'credit': 0.0,    'account_id': self.account_bank.id}),
+                (0, 0, {'debit': 0.0,    'credit': 1000.0, 'account_id': self.account_financing.id}),
+            ],
+        })
+
+        (move_1 + move_2).action_post()
+
+        self._reconcile_on(move_1.line_ids.filtered('debit') + move_2.line_ids, self.account_financing)
+
+        self.assertLinesValues(self.report._get_lines(options), [0, 1], [
+            ['Cash and cash equivalents, beginning of period',                        0.0],
+            ['Net increase in cash and cash equivalents',                          1000.0],
+            ['Cash flows from operating activities',                                  0.0],
+            ['Advance Payments received from customers',                              0.0],
+            ['Cash received from operating activities',                               0.0],
+            ['Advance payments made to suppliers',                                    0.0],
+            ['Cash paid for operating activities',                                    0.0],
+            ['Cash flows from investing & extraordinary activities',                  0.0],
+            ['Cash in',                                                               0.0],
+            ['Cash out',                                                              0.0],
+            ['Cash flows from financing activities',                                  0.0],
+            ['Cash in',                                                               0.0],
+            ['Cash out',                                                              0.0],
+            ['Cash flows from unclassified activities',                            1000.0],
+            ['Cash in',                                                            1000.0],
+            ['Cash out',                                                              0.0],
+            ['Cash and cash equivalents, closing balance',                         1000.0],
+        ], options)
+
+    def test_cash_flow_tricky_case_6(self):
+        ''' Test the additional lines on liquidity moves (e.g. bank fees) are well reported. '''
+        options = self._generate_options(self.report, fields.Date.from_string('2016-01-01'), fields.Date.from_string('2016-01-01'))
+
+        moves = self.env['account.move'].create([
+            {
+                'date': '2016-01-01',
+                'journal_id': self.bank_journal.id,
+                'line_ids': [
+                    (0, 0, {'debit': 3000.0, 'credit': 0.0,    'account_id': self.account_bank.id}),
+                    (0, 0, {'debit': 0.0,    'credit': 1000.0, 'account_id': self.account_investing.id}),
+                    (0, 0, {'debit': 0.0,    'credit': 2000.0, 'account_id': self.account_receivable_2.id}),
+                ],
+            },
+            {
+                'date': '2016-01-01',
+                'journal_id': self.bank_journal.id,
+                'line_ids': [
+                    (0, 0, {'debit': 0.0,    'credit': 3000.0, 'account_id': self.account_bank.id}),
+                    (0, 0, {'debit': 1000.0, 'credit': 0.0,    'account_id': self.account_no_tag.id}),
+                    (0, 0, {'debit': 2000.0, 'credit': 0.0,    'account_id': self.account_receivable_1.id}),
+                ],
+            },
+            {
+                'date': '2016-01-01',
+                'journal_id': self.bank_journal.id,
+                'line_ids': [
+                    (0, 0, {'debit': 1000.0, 'credit': 0.0,    'account_id': self.account_bank.id}),
+                    (0, 0, {'debit': 1000.0, 'credit': 0.0,    'account_id': self.account_no_tag.id}),
+                    (0, 0, {'debit': 0.0,    'credit': 2000.0, 'account_id': self.account_receivable_2.id}),
+                ],
+            },
+            {
+                'date': '2016-01-01',
+                'journal_id': self.bank_journal.id,
+                'line_ids': [
+                    (0, 0, {'debit': 0.0,    'credit': 1000.0, 'account_id': self.account_bank.id}),
+                    (0, 0, {'debit': 0.0,    'credit': 1000.0, 'account_id': self.account_investing.id}),
+                    (0, 0, {'debit': 2000.0, 'credit': 0.0,    'account_id': self.account_receivable_1.id}),
+                ],
+            },
+            {
+                'date': '2016-01-01',
+                'journal_id': self.bank_journal.id,
+                'line_ids': [
+                    (0, 0, {'debit': 0.0,    'credit': 4000.0, 'account_id': self.account_receivable_1.id}),
+                    (0, 0, {'debit': 4000.0, 'credit': 0.0,    'account_id': self.account_receivable_2.id}),
+                ],
+            },
+        ])
+
+        moves.action_post()
+
+        self._reconcile_on(moves.line_ids, self.account_receivable_1)
+        self._reconcile_on(moves.line_ids, self.account_receivable_2)
+
+        self.assertLinesValues(self.report._get_lines(options), [0, 1], [
+            ['Cash and cash equivalents, beginning of period',                        0.0],
+            ['Net increase in cash and cash equivalents',                             0.0],
+            ['Cash flows from operating activities',                                  0.0],
+            ['Advance Payments received from customers',                              0.0],
+            ['Cash received from operating activities',                               0.0],
+            ['Advance payments made to suppliers',                                    0.0],
+            ['Cash paid for operating activities',                                    0.0],
+            ['Cash flows from investing & extraordinary activities',               2000.0],
+            ['Cash in',                                                            2000.0],
+            ['Cash out',                                                              0.0],
+            ['Cash flows from financing activities',                                  0.0],
+            ['Cash in',                                                               0.0],
+            ['Cash out',                                                              0.0],
+            ['Cash flows from unclassified activities',                           -2000.0],
+            ['Cash in',                                                               0.0],
+            ['Cash out',                                                          -2000.0],
+            ['Cash and cash equivalents, closing balance',                            0.0],
+        ], options)
+
+    def test_cash_flow_tricky_case_7(self):
+        ''' Test cross reconciliation between liquidity moves with additional lines when the liquidity account
+        is reconcile.
+        '''
+        options = self._generate_options(self.report, fields.Date.from_string('2016-01-01'), fields.Date.from_string('2016-01-01'))
+
+        move_1 = self.env['account.move'].create({
+            'move_type': 'entry',
+            'date': '2016-01-01',
+            'journal_id': self.bank_journal.id,
+            'line_ids': [
+                (0, 0, {'debit': 3000.0, 'credit': 0.0,    'account_id': self.account_bank.id}),
+                (0, 0, {'debit': 0.0,    'credit': 1000.0, 'account_id': self.account_financing.id}),
+                (0, 0, {'debit': 0.0,    'credit': 2000.0, 'account_id': self.account_receivable_2.id}),
+            ],
+        })
+
+        move_2 = self.env['account.move'].create({
+            'move_type': 'entry',
+            'date': '2016-01-01',
+            'journal_id': self.bank_journal.id,
+            'line_ids': [
+                (0, 0, {'debit': 0.0,    'credit': 1500.0, 'account_id': self.account_bank.id}),
+                (0, 0, {'debit': 500.0,  'credit': 0.0,    'account_id': self.account_no_tag.id}),
+                (0, 0, {'debit': 1000.0, 'credit': 0.0,    'account_id': self.account_receivable_1.id}),
+            ],
+        })
+        (move_1 + move_2).action_post()
+
+        self.account_bank.reconcile = True
+
+        self._reconcile_on((move_1 + move_2).line_ids, self.account_bank)
+
+        self.assertLinesValues(self.report._get_lines(options), [0, 1], [
+            ['Cash and cash equivalents, beginning of period',                        0.0],
+            ['Net increase in cash and cash equivalents',                          1500.0],
+            ['Cash flows from operating activities',                               1000.0],
+            ['Advance Payments received from customers',                           1000.0],
+            ['Cash received from operating activities',                               0.0],
+            ['Advance payments made to suppliers',                                    0.0],
+            ['Cash paid for operating activities',                                    0.0],
+            ['Cash flows from investing & extraordinary activities',                  0.0],
+            ['Cash in',                                                               0.0],
+            ['Cash out',                                                              0.0],
+            ['Cash flows from financing activities',                               1000.0],
+            ['Cash in',                                                            1000.0],
+            ['Cash out',                                                              0.0],
+            ['Cash flows from unclassified activities',                            -500.0],
+            ['Cash in',                                                               0.0],
+            ['Cash out',                                                           -500.0],
+            ['Cash and cash equivalents, closing balance',                         1500.0],
+        ], options)
+
+    def test_cash_flow_tricky_case_8(self):
+        ''' Difficulties on this test are:
+        - The liquidity moves are reconciled to move having a total amount of 0.0.
+        - Double reconciliation between the liquidity and the misc moves.
+        - The reconciliations are partials.
+        - There are additional lines on the misc moves.
+        '''
+        options = self._generate_options(self.report, fields.Date.from_string('2016-01-01'), fields.Date.from_string('2016-01-01'))
+
+        move_1 = self.env['account.move'].create({
+            'move_type': 'entry',
+            'date': '2016-01-01',
+            'journal_id': self.bank_journal.id,
+            'line_ids': [
+                (0, 0, {'debit': 0.0,   'credit': 100.0, 'account_id': self.account_bank.id}),
+                (0, 0, {'debit': 900.0, 'credit': 0.0,   'account_id': self.account_receivable_2.id}),
+                (0, 0, {'debit': 0.0,   'credit': 400.0, 'account_id': self.account_no_tag.id}),
+                (0, 0, {'debit': 0.0,   'credit': 400.0, 'account_id': self.account_financing.id}),
+            ],
+        })
+
+        move_2 = self.env['account.move'].create({
+            'move_type': 'entry',
+            'date': '2016-01-01',
+            'journal_id': self.bank_journal.id,
+            'line_ids': [
+                (0, 0, {'debit': 500.0, 'credit': 0.0,   'account_id': self.account_no_tag.id}),
+                (0, 0, {'debit': 0.0,   'credit': 500.0, 'account_id': self.account_no_tag.id}),
+                (0, 0, {'debit': 500.0, 'credit': 0.0,   'account_id': self.account_financing.id}),
+                (0, 0, {'debit': 0.0,   'credit': 500.0, 'account_id': self.account_financing.id}),
+            ],
+        })
+        (move_1 + move_2).action_post()
+
+        self._reconcile_on(move_1.line_ids + move_2.line_ids.filtered('debit'), self.account_no_tag)
+        self._reconcile_on(move_1.line_ids + move_2.line_ids.filtered('debit'), self.account_financing)
+
+        self.assertLinesValues(self.report._get_lines(options), [0, 1], [
+            ['Cash and cash equivalents, beginning of period',                        0.0],
+            ['Net increase in cash and cash equivalents',                          -100.0],
+            ['Cash flows from operating activities',                               -900.0],
+            ['Advance Payments received from customers',                           -900.0],
+            ['Cash received from operating activities',                               0.0],
+            ['Advance payments made to suppliers',                                    0.0],
+            ['Cash paid for operating activities',                                    0.0],
+            ['Cash flows from investing & extraordinary activities',                  0.0],
+            ['Cash in',                                                               0.0],
+            ['Cash out',                                                              0.0],
+            ['Cash flows from financing activities',                                400.0],
+            ['Cash in',                                                             400.0],
+            ['Cash out',                                                              0.0],
+            ['Cash flows from unclassified activities',                             400.0],
+            ['Cash in',                                                             400.0],
+            ['Cash out',                                                              0.0],
+            ['Cash and cash equivalents, closing balance',                         -100.0],
+        ], options)
+
+    def test_cash_flow_tricky_case_9(self):
+        ''' Same as test_cash_flow_tricky_case_8 with reversed debit/credit.'''
+        options = self._generate_options(self.report, fields.Date.from_string('2016-01-01'), fields.Date.from_string('2016-01-01'))
+
+        move_1 = self.env['account.move'].create({
+            'move_type': 'entry',
+            'date': '2016-01-01',
+            'journal_id': self.bank_journal.id,
+            'line_ids': [
+                (0, 0, {'debit': 100.0, 'credit': 0.0,   'account_id': self.account_bank.id}),
+                (0, 0, {'debit': 0.0,   'credit': 900.0, 'account_id': self.account_receivable_2.id}),
+                (0, 0, {'debit': 400.0, 'credit': 0.0,   'account_id': self.account_no_tag.id}),
+                (0, 0, {'debit': 400.0, 'credit': 0.0,   'account_id': self.account_financing.id}),
+            ],
+        })
+
+        move_2 = self.env['account.move'].create({
+            'move_type': 'entry',
+            'date': '2016-01-01',
+            'journal_id': self.bank_journal.id,
+            'line_ids': [
+                (0, 0, {'debit': 0.0,   'credit': 500.0, 'account_id': self.account_no_tag.id}),
+                (0, 0, {'debit': 500.0, 'credit': 0.0,   'account_id': self.account_no_tag.id}),
+                (0, 0, {'debit': 0.0,   'credit': 500.0, 'account_id': self.account_financing.id}),
+                (0, 0, {'debit': 500.0, 'credit': 0.0,   'account_id': self.account_financing.id}),
+            ],
+        })
+        (move_1 + move_2).action_post()
+
+        self._reconcile_on(move_1.line_ids + move_2.line_ids.filtered('credit'), self.account_no_tag)
+        self._reconcile_on(move_1.line_ids + move_2.line_ids.filtered('credit'), self.account_financing)
+
+        self.assertLinesValues(self.report._get_lines(options), [0, 1], [
+            ['Cash and cash equivalents, beginning of period',                        0.0],
+            ['Net increase in cash and cash equivalents',                           100.0],
+            ['Cash flows from operating activities',                                900.0],
+            ['Advance Payments received from customers',                            900.0],
+            ['Cash received from operating activities',                               0.0],
+            ['Advance payments made to suppliers',                                    0.0],
+            ['Cash paid for operating activities',                                    0.0],
+            ['Cash flows from investing & extraordinary activities',                  0.0],
+            ['Cash in',                                                               0.0],
+            ['Cash out',                                                              0.0],
+            ['Cash flows from financing activities',                               -400.0],
+            ['Cash in',                                                               0.0],
+            ['Cash out',                                                           -400.0],
+            ['Cash flows from unclassified activities',                            -400.0],
+            ['Cash in',                                                               0.0],
+            ['Cash out',                                                           -400.0],
+            ['Cash and cash equivalents, closing balance',                          100.0],
+        ], options)
+
+    def test_cash_flow_handle_multiple_tags(self):
+        ''' Ensure that the balances are correct in the following situations:
+            - when several non-cash-flow-report account tags are set
+            - when a mix of several non-cash-flow-report tags and one cash-flow report tag are set.
+        '''
+
+        options = self._generate_options(self.report, fields.Date.from_string('2016-01-01'), fields.Date.from_string('2016-01-01'))
+
+        unrelated_tag_1 = self.env['account.account.tag'].create({
+            'name': 'Unrelated Tag 1',
+            'applicability': 'accounts',
+        })
+        unrelated_tag_2 = self.env['account.account.tag'].create({
+            'name': 'Unrelated Tag 2',
+            'applicability': 'accounts',
+        })
+
+        # account_no_tag will now have 2 tags unrelated to the Cash Flow Report.
+        # account_financing will now have the `account.account_tag_financing` tag, plus the two unrelated tags.
+        (self.account_no_tag + self.account_financing).write({
+            'tag_ids': [Command.link(unrelated_tag_1.id), Command.link(unrelated_tag_2.id)],
+        })
+
+        move = self.env['account.move'].create({
+            'move_type': 'entry',
+            'date': '2016-01-01',
+            'journal_id': self.bank_journal.id,
+            'line_ids': [
+                (0, 0, {'debit': 800.0, 'credit':   0.0, 'account_id': self.account_bank.id}),
+                (0, 0, {'debit':   0.0, 'credit': 300.0, 'account_id': self.account_no_tag.id}),
+                (0, 0, {'debit':   0.0, 'credit': 500.0, 'account_id': self.account_financing.id}),
+            ],
+        })
+
+        move.action_post()
+
+        self.assertLinesValues(self.report._get_lines(options), [0, 1], [
+            ['Cash and cash equivalents, beginning of period',                        0.0],
+            ['Net increase in cash and cash equivalents',                           800.0],
+            ['Cash flows from operating activities',                                  0.0],
+            ['Advance Payments received from customers',                              0.0],
+            ['Cash received from operating activities',                               0.0],
+            ['Advance payments made to suppliers',                                    0.0],
+            ['Cash paid for operating activities',                                    0.0],
+            ['Cash flows from investing & extraordinary activities',                  0.0],
+            ['Cash in',                                                               0.0],
+            ['Cash out',                                                              0.0],
+            ['Cash flows from financing activities',                                500.0],
+            ['Cash in',                                                             500.0],
+            ['Cash out',                                                              0.0],
+            ['Cash flows from unclassified activities',                             300.0],
+            ['Cash in',                                                             300.0],
+            ['Cash out',                                                              0.0],
+            ['Cash and cash equivalents, closing balance',                          800.0],
+        ], options)
+
+    def test_cash_flow_hierarchy(self):
+        """ Test the 'hierarchy' option. I.e. we want to ensure that each section of the report (e.g. "Cash and cash equivalents, beginning of period" and "Cash and cash equivalents, closing balance") has its own dedicated hierarchy and they are not mixed up together.
+        """
+        options = self._generate_options(self.report, '2016-01-01', '2016-12-31')
+        self.env.company.totals_below_sections = True
+
+        # Create the account groups for the bank and cash accounts
+        self.env['account.group'].create([
+            {'name': 'Group Bank & Cash',   'code_prefix_start': '10',   'code_prefix_end': '10'},
+            {'name': 'Group Bank',          'code_prefix_start': '1014', 'code_prefix_end': '1014'},
+            {'name': 'Group Cash',          'code_prefix_start': '1015', 'code_prefix_end': '1015'},
+        ])
+        self.account_bank.code = "10140499"
+        self.account_cash.code = "10150199"
+
+        # Create opening balance
+        self.env['account.move'].create({
+            'move_type': 'entry',
+            'date': '2015-01-01',
+            'journal_id': self.misc_journal.id,
+            'line_ids': [
+                (0, 0, {'debit': 100.0,     'credit':   0.0,   'account_id': self.account_bank.id}),
+                (0, 0, {'debit':  50.0,     'credit':   0.0,   'account_id': self.account_cash.id}),
+                (0, 0, {'debit':   0.0,     'credit': 150.0,   'account_id': self.account_no_tag.id}),
+            ],
+        }).action_post()
+
+        # Test the report with the hierarchy option disabled
+        # To make sure that the lines are in the right place we also check their 'level'
+        options['hierarchy'] = False
+        lines_wo_hierarchy = [
+            {
+                'name': line['name'],
+                'level': line['level'],
+                'book_value': line['columns'][-1]['name']
+            }
+            for line in self.report._get_lines(options)
+        ]
+        expected_values_wo_hierarchy = [
+            {'name': "Cash and cash equivalents, beginning of period",            'level': 0,    'book_value': '$\xa0150.00'},
+              {'name': "10140499 Bank",                                           'level': 1,    'book_value': '$\xa0100.00'},
+              {'name': "10150199 Cash",                                           'level': 1,    'book_value': '$\xa050.00'},
+              {'name': "Total Cash and cash equivalents, beginning of period",    'level': 1,    'book_value': '$\xa0150.00'},
+            {'name': "Net increase in cash and cash equivalents",                 'level': 0,    'book_value': '$\xa00.00'},
+                {'name': "Cash flows from operating activities",                  'level': 2,    'book_value': '$\xa00.00'},
+                  {'name': "Advance Payments received from customers",            'level': 4,    'book_value': '$\xa00.00'},
+                  {'name': "Cash received from operating activities",             'level': 4,    'book_value': '$\xa00.00'},
+                  {'name': "Advance payments made to suppliers",                  'level': 4,    'book_value': '$\xa00.00'},
+                  {'name': "Cash paid for operating activities",                  'level': 4,    'book_value': '$\xa00.00'},
+                {'name': "Cash flows from investing & extraordinary activities",  'level': 2,    'book_value': '$\xa00.00'},
+                  {'name': "Cash in",                                             'level': 4,    'book_value': '$\xa00.00'},
+                  {'name': "Cash out",                                            'level': 4,    'book_value': '$\xa00.00'},
+                {'name': "Cash flows from financing activities",                  'level': 2,    'book_value': '$\xa00.00'},
+                  {'name': "Cash in",                                             'level': 4,    'book_value': '$\xa00.00'},
+                  {'name': "Cash out",                                            'level': 4,    'book_value': '$\xa00.00'},
+                {'name': "Cash flows from unclassified activities",               'level': 2,    'book_value': '$\xa00.00'},
+                  {'name': "Cash in",                                             'level': 4,    'book_value': '$\xa00.00'},
+                  {'name': "Cash out",                                            'level': 4,    'book_value': '$\xa00.00'},
+            {'name': "Cash and cash equivalents, closing balance",                'level': 0,    'book_value': '$\xa0150.00'},
+              {'name': "10140499 Bank",                                           'level': 1,    'book_value': '$\xa0100.00'},
+              {'name': "10150199 Cash",                                           'level': 1,    'book_value': '$\xa050.00'},
+              {'name': "Total Cash and cash equivalents, closing balance",        'level': 1,    'book_value': '$\xa0150.00'}
+        ]
+        # assertEqual is used and not assertLinesValues because we want to check the 'level'
+        self.assertEqual(len(lines_wo_hierarchy), len(expected_values_wo_hierarchy))
+        self.assertEqual(lines_wo_hierarchy, expected_values_wo_hierarchy)
+
+        # Test the report with the hierarchy option enabled
+        # To make sure that the lines are in the right place we also check their 'level'
+        options['hierarchy'] = True
+        lines = [
+            {
+                'name': line['name'],
+                'level': line['level'],
+                'book_value': line['columns'][-1]['name']
+            }
+            for line in self.report._get_lines(options)
+        ]
+        expected_values = [
+            {'name': "Cash and cash equivalents, beginning of period",            'level': 0,    'book_value': '$\xa0150.00'},
+              {'name': "10 Group Bank & Cash",                                    'level': 1,    'book_value': '$\xa0150.00'},
+                {'name': "1014 Group Bank",                                       'level': 2,    'book_value': '$\xa0100.00'},
+                  {'name': "10140499 Bank",                                       'level': 3,    'book_value': '$\xa0100.00'},
+                {'name': "Total 1014 Group Bank",                                 'level': 2,    'book_value': '$\xa0100.00'},
+                {'name': "1015 Group Cash",                                       'level': 2,    'book_value': '$\xa050.00'},
+                  {'name': "10150199 Cash",                                       'level': 3,    'book_value': '$\xa050.00'},
+                {'name': "Total 1015 Group Cash",                                 'level': 2,    'book_value': '$\xa050.00'},
+              {'name': "Total 10 Group Bank & Cash",                              'level': 1,    'book_value': '$\xa0150.00'},
+            {'name': "Total Cash and cash equivalents, beginning of period",      'level': 1,    'book_value': '$\xa0150.00'},
+            {'name': "Net increase in cash and cash equivalents",                 'level': 0,    'book_value': '$\xa00.00'},
+                {'name': "Cash flows from operating activities",                  'level': 2,    'book_value': '$\xa00.00'},
+                  {'name': "Advance Payments received from customers",            'level': 4,    'book_value': '$\xa00.00'},
+                  {'name': "Cash received from operating activities",             'level': 4,    'book_value': '$\xa00.00'},
+                  {'name': "Advance payments made to suppliers",                  'level': 4,    'book_value': '$\xa00.00'},
+                  {'name': "Cash paid for operating activities",                  'level': 4,    'book_value': '$\xa00.00'},
+                {'name': "Cash flows from investing & extraordinary activities",  'level': 2,    'book_value': '$\xa00.00'},
+                  {'name': "Cash in",                                             'level': 4,    'book_value': '$\xa00.00'},
+                  {'name': "Cash out",                                            'level': 4,    'book_value': '$\xa00.00'},
+                {'name': "Cash flows from financing activities",                  'level': 2,    'book_value': '$\xa00.00'},
+                  {'name': "Cash in",                                             'level': 4,    'book_value': '$\xa00.00'},
+                  {'name': "Cash out",                                            'level': 4,    'book_value': '$\xa00.00'},
+                {'name': "Cash flows from unclassified activities",               'level': 2,    'book_value': '$\xa00.00'},
+                  {'name': "Cash in",                                             'level': 4,    'book_value': '$\xa00.00'},
+                  {'name': "Cash out",                                            'level': 4,    'book_value': '$\xa00.00'},
+            {'name': "Cash and cash equivalents, closing balance",                'level': 0,    'book_value': '$\xa0150.00'},
+              {'name': "10 Group Bank & Cash",                                    'level': 1,    'book_value': '$\xa0150.00'},
+                {'name': "1014 Group Bank",                                       'level': 2,    'book_value': '$\xa0100.00'},
+                  {'name': "10140499 Bank",                                       'level': 3,    'book_value': '$\xa0100.00'},
+                {'name': "Total 1014 Group Bank",                                 'level': 2,    'book_value': '$\xa0100.00'},
+                {'name': "1015 Group Cash",                                       'level': 2,    'book_value': '$\xa050.00'},
+                  {'name': "10150199 Cash",                                       'level': 3,    'book_value': '$\xa050.00'},
+                {'name': "Total 1015 Group Cash",                                 'level': 2,    'book_value': '$\xa050.00'},
+              {'name': "Total 10 Group Bank & Cash",                              'level': 1,    'book_value': '$\xa0150.00'},
+            {'name': "Total Cash and cash equivalents, closing balance",          'level': 1,    'book_value': '$\xa0150.00'}
+        ]
+        # assertEqual is used and not assertLinesValues because we want to check the 'level'
+        self.assertEqual(len(lines), len(expected_values))
+        self.assertEqual(lines, expected_values)
diff --git a/dev_odex30_accounting/odex30_account_reports/tests/test_currency_table.py b/dev_odex30_accounting/odex30_account_reports/tests/test_currency_table.py
new file mode 100644
index 0000000..361765a
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_reports/tests/test_currency_table.py
@@ -0,0 +1,455 @@
+from odoo import Command
+from odoo.tests import tagged
+
+from .common import TestAccountReportsCommon
+
+
+@tagged('post_install', '-at_install')
+class TestCurrencyTable(TestAccountReportsCommon):
+
+    @classmethod
+    def setUpClass(cls):
+        super().setUpClass()
+
+        cls.company_data['company'].write({'name': "USD Company 1", 'sequence': 1, 'totals_below_sections': False})
+        cls.company_usd_data = cls.company_data
+        # Create additional companies (also adding them to env.companies)
+        cls.company_usd_data_2 = cls.setup_other_company(name="USD Company 2", sequence=2, currency_id=cls.env.ref('base.USD').id)
+        cls.company_eur_data = cls.setup_other_company(name="EUR Company 1", sequence=3, currency_id=cls.env.ref('base.EUR').id)
+        cls.company_eur_data_2 = cls.setup_other_company(name="EUR Company 2", sequence=4, currency_id=cls.env.ref('base.EUR').id)
+        cls.company_chf_data = cls.setup_other_company(name="CHF Company", sequence=5, currency_id=cls.env.ref('base.CHF').id)
+        cls.company_mxn_data = cls.setup_other_company(name="MXN Company", sequence=5, currency_id=cls.env.ref('base.MXN').id)
+
+        # Add equity account to the company data
+        for company_data in (cls.company_usd_data, cls.company_usd_data_2, cls.company_eur_data, cls.company_eur_data_2, cls.company_chf_data, cls.company_mxn_data):
+            company_data['equity_account'] = cls.env['account.account'].search([
+                ('company_ids', '=', company_data['company'].id),
+                ('account_type', '=', 'equity'),
+            ], limit=1)
+
+        cls.report = cls.env['account.report'].create({
+            'name': "Currency Table Test",
+            'filter_multi_company': 'selector',
+            'currency_translation': 'cta',
+            'column_ids': [Command.create({'name': "Balance", 'expression_label': 'balance'})],
+            'line_ids': [
+                Command.create({
+                    'name': "Asset",
+                    'groupby': 'company_id',
+                    'expression_ids': [
+                        Command.create({
+                            'label': 'balance',
+                            'engine': 'domain',
+                            'formula': "[('account_id.internal_group', '=', 'asset')]",
+                            'subformula': "sum",
+                        }),
+                    ],
+                }),
+                Command.create({
+                    'name': "Income",
+                    'groupby': 'company_id',
+                    'expression_ids': [
+                        Command.create({
+                            'label': 'balance',
+                            'engine': 'domain',
+                            'formula': "[('account_id.internal_group', '=', 'income')]",
+                            'subformula': "sum",
+                        }),
+                    ],
+                }),
+                Command.create({
+                    'name': "Equity",
+                    'groupby': 'company_id',
+                    'expression_ids': [
+                        Command.create({
+                            'label': 'balance',
+                            'engine': 'domain',
+                            'formula': "[('account_id.internal_group', '=', 'equity')]",
+                            'subformula': "sum",
+                        }),
+                    ],
+                }),
+            ],
+        })
+
+    def _generate_equity_move(self, company_data, date, amount):
+        rslt = self.env['account.move'].create({
+            'company_id': company_data['company'].id,
+            'date': date,
+            'line_ids': [
+                Command.create({
+                    'debit': 0,
+                    'credit': amount,
+                    'account_id': company_data['default_account_expense'].id,
+                }),
+                Command.create({
+                    'debit': amount,
+                    'credit': 0,
+                    'account_id': company_data['equity_account'].id,
+                }),
+            ],
+        })
+        rslt.action_post()
+        return rslt
+
+    def test_currency_table_multicurrency(self):
+        # USD OPERATIONS (domestic currency)
+        self.init_invoice('out_invoice', company=self.company_usd_data['company'], invoice_date='2020-05-12', amounts=[10], post=True)
+        self.init_invoice('out_invoice', company=self.company_usd_data_2['company'], invoice_date='2020-08-23', amounts=[25], post=True)
+        self._generate_equity_move(self.company_usd_data, '2020-11-11', 42)
+        self._generate_equity_move(self.company_usd_data, '2020-12-01', 88)
+        self._generate_equity_move(self.company_usd_data_2, '2020-02-01', 11)
+
+        # EUR OPERATIONS
+        self.setup_other_currency('EUR', rates=[('2018-10-10', 7), ('2019-12-22', 11), ('2020-01-01', 2), ('2020-03-12', 5), ('2020-03-30', 20), ('2020-04-01', 4)])
+
+        self.init_invoice('out_invoice', company=self.company_eur_data['company'], invoice_date='2020-01-15', amounts=[23], post=True)
+        self.init_invoice('out_invoice', company=self.company_eur_data['company'], invoice_date='2020-02-20', amounts=[64], post=True)
+        self.init_invoice('out_invoice', company=self.company_eur_data['company'], invoice_date='2020-03-30', amounts=[100], post=True)
+        self._generate_equity_move(self.company_eur_data, '2020-03-15', 20)
+        self._generate_equity_move(self.company_eur_data, '2020-03-31', 5)
+
+        self.init_invoice('out_invoice', company=self.company_eur_data_2['company'], invoice_date='2020-03-14', amounts=[54], post=True)
+        self.init_invoice('out_invoice', company=self.company_eur_data_2['company'], invoice_date='2020-04-10', amounts=[77], post=True)
+        self._generate_equity_move(self.company_eur_data_2, '2020-05-21', 40)
+
+        # CHF OPERATIONS
+        self.setup_other_currency('CHF', rates=[('2018-03-01', 10), ('2019-01-01', 3), ('2020-03-30', 7), ('2020-05-10', 8), ('2020-12-25', 2)])
+
+        self.init_invoice('out_invoice', company=self.company_chf_data['company'], invoice_date='2020-01-16', amounts=[58], post=True)
+        self.init_invoice('out_invoice', company=self.company_chf_data['company'], invoice_date='2020-05-01', amounts=[99], post=True)
+        self.init_invoice('out_invoice', company=self.company_chf_data['company'], invoice_date='2020-12-31', amounts=[22], post=True)
+        self._generate_equity_move(self.company_chf_data, '2020-03-15', 20)
+
+        # MXN OPERATIONS
+        self.setup_other_currency('MXN', rates=[('2020-05-10', 2)])
+        self.init_invoice('out_invoice', company=self.company_mxn_data['company'], invoice_date='2020-01-01', amounts=[10], post=True)
+        self.init_invoice('out_invoice', company=self.company_mxn_data['company'], invoice_date='2020-07-01', amounts=[21], post=True)
+        self._generate_equity_move(self.company_mxn_data, '2020-03-15', 2)
+
+        # Test conversion : date range cta
+        self.report.currency_translation = 'cta'
+        cta_options_range = self._generate_options(self.report, '2019-12-22', '2020-12-31')
+        self.assertLinesValues(
+            self.report._get_lines(cta_options_range),
+            [   0,                          1],
+            [
+                ("Asset",              219.50),
+                ("USD Company 1",       10.00),
+                ("USD Company 2",       25.00),
+                # EUR current rate = 1/4
+                ("EUR Company 1",       46.75),  # (23 + 64 + 100) / 4
+                ("EUR Company 2",       32.75),  # (54 + 77) / 4
+                # CHF current rate = 1/2
+                ("CHF Company",         89.50),  # (58 + 99 + 22) / 2
+                ("MXN Company",         15.50),  # (10 + 21) / 2
+                ("Income",            -182.13),
+                ("USD Company 1",      -10.00),
+                ("USD Company 2",      -25.00),
+                # EUR average rate = (1/11 * 10 + 1/2 * 71 + 1/5 * 18 + 1/20 * 2 + 1/4 * 275) / 376 = 0.289518859
+                ("EUR Company 1",      -54.14),  # (-23 - 64 - 100) * 0.289518859
+                ("EUR Company 2",      -37.93),  # (-54 - 77) * 0.289518859
+                # CHF average rate = (1/3 * 99 + 1/7 * 41 + 1/8 * 229 + 1/2 * 7) / 376 = 0.188782295
+                ("CHF Company",        -33.79),  # (-58 - 99 -22) * 0.188782295
+                # MXN average rate = (1 * 140 + 1/2 * 236) / 376 = 0.686170213
+                ("MXN Company",        -21.27),  # (-10 - 21) * 0.686170213
+                ("Equity",             163.92),
+                ("USD Company 1",      130.00),
+                ("USD Company 2",       11.00),
+                ("EUR Company 1",        4.25),  # 20 / 5 + 5 / 20
+                ("EUR Company 2",       10.00),  # 40 / 4
+                ("CHF Company",          6.67),  # 20 / 3
+                ("MXN Company",          2.00),  # 2 / 1
+            ],
+            cta_options_range,
+        )
+
+        # Test conversion : single cta
+        self.report.currency_translation = 'cta'
+        self.report.filter_date_range = False
+        cta_options_single = self._generate_options(self.report, '2020-12-31', '2020-12-31')
+
+        self.assertLinesValues(
+            self.report._get_lines(cta_options_single),
+            [   0,                          1],
+            [
+                ("Asset",              219.50),
+                ("USD Company 1",       10.00),
+                ("USD Company 2",       25.00),
+                # EUR current rate = 1/4
+                ("EUR Company 1",       46.75),  # (23 + 64 + 100) / 4
+                ("EUR Company 2",       32.75),  # (54 + 77) / 4
+                # CHF current rate = 1/2
+                ("CHF Company",         89.50),  # (58 + 99 + 22) / 2
+                # MXN current rate = 1/2
+                ("MXN Company",         15.50),  # (10 + 21) / 2
+                ("Income",            -182.88),
+                ("USD Company 1",      -10.00),
+                ("USD Company 2",      -25.00),
+                # EUR average rate = (1/2 * 71 + 1/5 * 18 + 1/20 * 2 + 1/4 * 275) / 366 = 0.294945355
+                ("EUR Company 1",      -55.15),  # (-23 - 64 - 100) * 0.294945355
+                ("EUR Company 2",      -38.64),  # (-54 - 77) * 0.294945355
+                # CHF average rate = (1/3 * 89 + 1/7 * 41 + 1/8 * 229 + 1/2 * 7) / 366 = 0.184832813
+                ("CHF Company",        -33.09),  # (-58 - 99 -22) * 0.184832813
+                # MXN average rate = (1 * 130 + 1/2 * 236) / 366 = 0.677595628
+                ("MXN Company",        -21.01),  # (-10 - 21) * 0.677595628
+                ("Equity",             163.92),
+                ("USD Company 1",      130.00),
+                ("USD Company 2",       11.00),
+                ("EUR Company 1",        4.25),  # 20 / 5 + 5 / 20
+                ("EUR Company 2",       10.00),  # 40 / 4
+                ("CHF Company",          6.67),  # 20 / 3
+                ("MXN Company",          2.00),  # 2 / 1
+            ],
+            cta_options_single,
+        )
+
+        # Test conversion : current : date range and single
+        current_expected_lines = [
+            # EUR current rate = 1/4
+            # CHF current rate = 1/2
+            ("Asset",              219.50),
+            ("USD Company 1",       10.00),
+            ("USD Company 2",       25.00),
+            ("EUR Company 1",       46.75),  # (23 + 64 + 100) / 4
+            ("EUR Company 2",       32.75),  # (54 + 77) / 4
+            ("CHF Company",         89.50),  # (58 + 99 + 22) / 2
+            ("MXN Company",         15.50),  # (10 + 21) / 2
+            ("Income",            -219.50),
+            ("USD Company 1",      -10.00),
+            ("USD Company 2",      -25.00),
+            ("EUR Company 1",      -46.75),  # (-23 - 64 - 100) / 4
+            ("EUR Company 2",      -32.75),  # (-54 - 77) / 4
+            ("CHF Company",        -89.50),  # (-58 - 99 -22) / 2
+            ("MXN Company",        -15.50),  # (-10 - 21) / 2
+            ("Equity",             168.25),
+            ("USD Company 1",      130.00),
+            ("USD Company 2",       11.00),
+            ("EUR Company 1",        6.25),  # (20 + 5) / 4
+            ("EUR Company 2",       10.00),  # 40 / 4
+            ("CHF Company",         10.00),  # 20 / 2
+            ("MXN Company",          1.00),  # 2 / 2
+        ]
+
+        self.report.currency_translation = 'current'
+
+        current_options_range = self._generate_options(self.report, '2020-01-01', '2020-12-31')
+        self.assertLinesValues(
+            self.report._get_lines(current_options_range),
+            [0, 1],
+            current_expected_lines,
+            current_options_range,
+        )
+
+        self.report.filter_date_range = False
+        current_options_single = self._generate_options(self.report, '2020-12-31', '2020-12-31')
+        self.assertLinesValues(
+            self.report._get_lines(current_options_single),
+            [0, 1],
+            current_expected_lines,
+            current_options_single,
+        )
+
+    def test_currency_table_monocurrency(self):
+        self.init_invoice('out_invoice', company=self.company_usd_data['company'], invoice_date='2020-01-01', amounts=[63], post=True)
+        self.init_invoice('out_invoice', company=self.company_usd_data_2['company'], invoice_date='2020-01-01', amounts=[42], post=True)
+        self._generate_equity_move(self.company_usd_data, '2020-11-11', 88)
+        self._generate_equity_move(self.company_usd_data_2, '2020-11-11', 92)
+
+        self.env.companies = self.company_usd_data['company'] + self.company_usd_data_2['company']
+        options = self._generate_options(self.report, '2020-01-01', '2020-12-31')
+        self.assertLinesValues(
+            self.report._get_lines(options),
+            [   0,                          1],
+            [
+                ("Asset",              105.00),
+                ("USD Company 1",       63.00),
+                ("USD Company 2",       42.00),
+                ("Income",            -105.00),
+                ("USD Company 1",      -63.00),
+                ("USD Company 2",      -42.00),
+                ("Equity",             180.00),
+                ("USD Company 1",       88.00),
+                ("USD Company 2",       92.00),
+            ],
+            options,
+        )
+
+    def test_currency_table_comparison(self):
+        # EUR operations
+        self.setup_other_currency('EUR', rates=[('2018-01-01', 7), ('2019-01-01', 2), ('2020-03-12', 5), ('2021-03-30', 20), ('2022-04-01', 4)])
+
+        self.init_invoice('out_invoice', company=self.company_eur_data['company'], invoice_date='2019-01-01', amounts=[14], post=True)
+        self.init_invoice('out_invoice', company=self.company_eur_data['company'], invoice_date='2020-01-01', amounts=[24], post=True)
+        self._generate_equity_move(self.company_eur_data, '2019-11-11', 55)
+        self._generate_equity_move(self.company_eur_data, '2020-11-11', 99)
+
+        # CHF operations
+        self.setup_other_currency('CHF', rates=[('2018-01-01', 10), ('2019-01-01', 4), ('2019-03-12', 5), ('2021-03-30', 20), ('2022-04-01', 4)])
+
+        self.init_invoice('out_invoice', company=self.company_chf_data['company'], invoice_date='2019-01-01', amounts=[20], post=True)
+        self.init_invoice('out_invoice', company=self.company_chf_data['company'], invoice_date='2020-01-01', amounts=[66], post=True)
+        self._generate_equity_move(self.company_chf_data, '2019-11-11', 12)
+        self._generate_equity_move(self.company_chf_data, '2020-11-11', 84)
+
+        options = self._generate_options(self.report, '2020-01-01', '2020-12-31')
+        options = self._update_comparison_filter(options, self.report, 'previous_period', 1)
+
+        self.assertLinesValues(
+            self.report._get_lines(options),
+            #                            2020        2019
+            [   0,                          1,          2],
+            [
+                ("Asset",               18.00,      11.00),
+                # EUR current rate: 2020 = 1/5 ; 2019 = 1/2
+                ("EUR Company 1",        4.80,       7.00),
+                # CHF current rate: 2020 = 1/5 ; 2019 = 1/5
+                ("CHF Company",         13.20,       4.00),
+                ("Income",             -19.40,     -11.19),
+                # EUR average rate in 2020: (1/2 * 71 + 1/5 * 295) / 366 = 0.258196721
+                # EUR average rate in 2019: 1/2
+                ("EUR Company 1",       -6.20,      -7.00),
+                # CHF average rate in 2020: 1/5
+                # CHF average rate in 2019: (1/4 * 70 + 1/5 * 295) / 365 = 0.209589041
+                ("CHF Company",        -13.20,      -4.19),
+                ("Equity",              36.60,      29.90),
+                ("EUR Company 1",       19.80,      27.50),
+                ("CHF Company",         16.80,       2.40),
+            ],
+            options,
+        )
+
+    def test_currency_table_branches(self):
+        usd_branch_data = self.setup_other_company(
+            name='USD Branch',
+            parent_id=self.company_usd_data['company'].id,
+            sequence=self.company_usd_data['company'].sequence,
+        )
+
+        eur_branch_data = self.setup_other_company(
+            name='EUR Branch',
+            parent_id=self.company_eur_data['company'].id,
+            sequence=self.company_eur_data['company'].sequence,
+        )
+
+        usd_branch_data['company'].totals_below_sections = False
+
+        # Add equity accounts to branch data
+        usd_branch_data['equity_account'] = self.company_usd_data['equity_account']
+        eur_branch_data['equity_account'] = self.company_eur_data['equity_account']
+
+        # Create rates on the root USD company
+        self.setup_other_currency('EUR', rates=[('2020-01-01', 4), ('2020-03-01', 2), ('2020-12-01', 5)])
+
+        # Create some entries
+        self.init_invoice('out_invoice', company=self.company_usd_data['company'], invoice_date='2020-11-01', amounts=[10], post=True)
+        self.init_invoice('out_invoice', company=usd_branch_data['company'], invoice_date='2020-09-01', amounts=[20], post=True)
+        self.init_invoice('out_invoice', company=self.company_eur_data['company'], invoice_date='2020-06-25', amounts=[30], post=True)
+        self.init_invoice('out_invoice', company=eur_branch_data['company'], invoice_date='2020-02-23', amounts=[40], post=True)
+
+        self._generate_equity_move(self.company_usd_data, '2020-11-12', 50)
+        self._generate_equity_move(usd_branch_data, '2020-01-21', 60)
+        self._generate_equity_move(self.company_eur_data, '2020-05-12', 70)
+        self._generate_equity_move(eur_branch_data, '2020-09-09', 80)
+
+        # env.company becomes the USD branch
+        self.env.companies = usd_branch_data['company'] + eur_branch_data['company'] + self.company_usd_data['company'] + self.company_eur_data['company']
+        self.env.company = usd_branch_data['company']
+
+        options = self._generate_options(self.report, '2020-01-01', '2020-12-31')
+        self.assertLinesValues(
+            self.report._get_lines(options),
+            [   0,                          1],
+            [
+                ("Asset",               44.00),
+                ("USD Branch",          20.00),
+                ("USD Company 1",       10.00),
+                # EUR current rate = 1/5
+                ("EUR Branch",           8.00),
+                ("EUR Company 1",        6.00),
+                ("Income",             -60.35),
+                ("USD Branch",         -20.00),
+                ("USD Company 1",      -10.00),
+                # EUR average rate = (1/4 * 60 + 1/2 * 275 + 1/5 * 31) / 366 = 0.433606557
+                ("EUR Branch",         -17.34),
+                ("EUR Company 1",      -13.01),
+                ("Equity",             185.00),
+                ("USD Branch",          60.00),
+                ("USD Company 1",       50.00),
+                ("EUR Branch",          40.00),
+                ("EUR Company 1",       35.00),
+
+            ],
+            options,
+        )
+
+    def test_currency_table_no_rate(self):
+        self.init_invoice('out_invoice', company=self.company_usd_data['company'], invoice_date='2020-11-01', amounts=[10], post=True)
+        self._generate_equity_move(self.company_usd_data, '2020-11-12', 20)
+        self.init_invoice('out_invoice', company=self.company_eur_data['company'], invoice_date='2020-02-23', amounts=[30], post=True)
+        self._generate_equity_move(self.company_eur_data, '2020-05-12', 40)
+
+        options = self._generate_options(self.report, '2020-01-01', '2020-12-31')
+        self.assertLinesValues(
+            self.report._get_lines(options),
+            [   0,                          1],
+            [
+                ("Asset",               40.00),
+                ("USD Company 1",       10.00),
+                ("EUR Company 1",       30.00),
+                ("Income",             -40.00),
+                ("USD Company 1",      -10.00),
+                ("EUR Company 1",      -30.00),
+                ("Equity",              60.00),
+                ("USD Company 1",       20.00),
+                ("EUR Company 1",       40.00),
+            ],
+            options,
+        )
+
+    def test_currency_table_non_1_domestic_rate(self):
+        self.setup_other_currency('USD', rates=[('2020-01-01', 0.5)])
+        self.setup_other_currency('EUR', rates=[('2020-01-01', 4), ('2020-03-01', 2), ('2020-12-01', 5)])
+
+        self.init_invoice('out_invoice', company=self.company_usd_data['company'], invoice_date='2020-11-01', amounts=[10], post=True)
+        self._generate_equity_move(self.company_usd_data, '2020-11-12', 20)
+
+        self.init_invoice('out_invoice', company=self.company_eur_data['company'], invoice_date='2020-02-23', amounts=[30], post=True)
+        self._generate_equity_move(self.company_eur_data, '2020-05-12', 40)
+
+        options = self._generate_options(self.report, '2020-01-01', '2020-12-31')
+        self.assertLinesValues(
+            self.report._get_lines(options),
+            [   0,                          1],
+            [
+                ("Asset",               13.00),
+                ("USD Company 1",       10.00),
+                # EUR current rate = 0.5/5
+                ("EUR Company 1",        3.00),
+                ("Income",             -16.50),
+                ("USD Company 1",      -10.00),
+                # EUR average rate = (0.5/4 * 60 + 0.5/2 * 275 + 0.5/5 * 31) / 366 = 0.216803279
+                ("EUR Company 1",       -6.50),
+                ("Equity",              30.00),
+                ("USD Company 1",       20.00),
+                ("EUR Company 1",       10.00),  # rate = 0.5/2
+            ],
+            options,
+        )
+
+    def test_currency_manual_line_expansion(self):
+        self.setup_other_currency('EUR', rates=[('2020-01-01', 2)])
+        self.init_invoice('out_invoice', company=self.company_eur_data['company'], invoice_date='2020-12-22', amounts=[42], post=True)
+
+        self.report.line_ids.foldable = True
+
+        options = self._generate_options(self.report, '2020-01-01', '2020-12-31')
+        line_to_expand_id = self.report._get_generic_line_id('account.report.line', self.report.line_ids[0].id)
+        self.assertLinesValues(
+            self.report.get_expanded_lines(options, line_to_expand_id, 'company_id', '_report_expand_unfoldable_line_with_groupby', 0, 0, None),
+            [   0,                          1],
+            [
+                ("EUR Company 1",       21.00),
+            ],
+            options,
+        )
diff --git a/dev_odex30_accounting/odex30_account_reports/tests/test_deferred_reports.py b/dev_odex30_accounting/odex30_account_reports/tests/test_deferred_reports.py
new file mode 100644
index 0000000..3d7a25c
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_reports/tests/test_deferred_reports.py
@@ -0,0 +1,2040 @@
+# -*- coding: utf-8 -*-
+# pylint: disable=C0326
+from freezegun import freeze_time
+
+from odoo.addons.odex30_account_reports.tests.common import TestAccountReportsCommon
+from odoo import fields, Command
+from odoo.exceptions import UserError
+from odoo.tests import tagged, HttpCase, Form
+
+
+@tagged('post_install', '-at_install')
+class TestDeferredReports(TestAccountReportsCommon, HttpCase):
+    @classmethod
+    def setUpClass(cls):
+        super().setUpClass()
+        cls.deferred_expense_report = cls.env.ref('odex30_account_reports.deferred_expense_report')
+        cls.deferred_revenue_report = cls.env.ref('odex30_account_reports.deferred_revenue_report')
+        cls.handler = cls.env['account.deferred.expense.report.handler']
+
+        cls.expense_accounts = [cls.env['account.account'].create({
+            'name': f'Expense {i}',
+            'code': f'EXP{i}',
+            'account_type': 'expense',
+        }) for i in range(10)]
+        cls.revenue_accounts = [cls.env['account.account'].create({
+            'name': f'Revenue {i}',
+            'code': f'REV{i}',
+            'account_type': 'income',
+        }) for i in range(3)]
+
+        cls.company = cls.company_data['company']
+        cls.deferral_account = cls.company_data['default_account_deferred_expense']
+        cls.company.deferred_expense_journal_id = cls.company_data['default_journal_misc'].id
+        cls.company.deferred_revenue_journal_id = cls.company_data['default_journal_misc'].id
+        cls.company.deferred_expense_account_id = cls.company_data['default_account_deferred_expense'].id
+        cls.company.deferred_revenue_account_id = cls.company_data['default_account_deferred_revenue'].id
+
+        cls.expense_lines = [
+            [cls.expense_accounts[0], 1000, '2023-01-01', '2023-04-30'],  # 4 full months (=250/month)
+            [cls.expense_accounts[0], 1050, '2023-01-16', '2023-04-30'],  # 3 full months + 15 days (=300/month)
+            [cls.expense_accounts[1], 1225, '2023-01-01', '2023-04-15'],  # 3 full months + 15 days (=350/month)
+            [cls.expense_accounts[2], 1680, '2023-01-21', '2023-04-14'],  # 2 full months + 10 days + 14 days (=600/month)
+            [cls.expense_accounts[2],  225, '2023-04-01', '2023-04-15'],  # 15 days (=450/month)
+        ]
+        cls.revenue_lines = [
+            [cls.revenue_accounts[0], 1000, '2023-01-01', '2023-04-30'],  # 4 full months (=250/month)
+            [cls.revenue_accounts[0], 1050, '2023-01-16', '2023-04-30'],  # 3 full months + 15 days (=300/month)
+            [cls.revenue_accounts[1], 1225, '2023-01-01', '2023-04-15'],  # 3 full months + 15 days (=350/month)
+            [cls.revenue_accounts[2], 1680, '2023-01-21', '2023-04-14'],  # 2 full months + 10 days + 14 days (=600/month)
+            [cls.revenue_accounts[2],  225, '2023-04-01', '2023-04-15'],  # 15 days (=450/month)
+        ]
+
+    def create_invoice(self, invoice_lines, move_type='in_invoice', invoice_date='2023-01-01', post=True):
+        journal = self.company_data['default_journal_sale']
+        if move_type.startswith('in_'):
+            journal = self.company_data['default_journal_purchase']
+        move = self.env['account.move'].create({
+            'move_type': move_type,
+            'partner_id': self.partner_a.id,
+            'date': invoice_date,
+            'invoice_date': invoice_date,
+            'journal_id': journal.id,
+            'invoice_line_ids': [
+                Command.create({
+                    'product_id': self.product_a.id,
+                    'quantity': 1,
+                    'account_id': invoice_line[0].id,
+                    'price_unit': invoice_line[1],
+                    'deferred_start_date': invoice_line[2],
+                    'deferred_end_date': invoice_line[3],
+                }) for invoice_line in invoice_lines
+            ]
+        })
+        if post:
+            move.action_post()
+        return move
+
+    def get_options(self, from_date, to_date, report=None):
+        report = report or self.deferred_expense_report
+        return self._generate_options(report, from_date, to_date)
+
+    def get_lines(self, options, report=None):
+        report = report if report is not None else self.deferred_expense_report
+        # Clear the cache to avoid any interference with the previous test
+        # This is automatically done when clicking on a report,
+        # but it needs to be manually done here since we call the backend function directly
+        self.env.cr.cache.pop('report_deferred_lines', None)
+        return report._get_lines(options)
+
+    def generate_deferral_entries(self, options, report_handler=None):
+        report_handler = report_handler if report_handler is not None else self.handler
+        self.env.cr.cache.pop('report_deferred_lines', None)  # same as above
+        return report_handler._generate_deferral_entry(options)
+
+    def test_deferred_expense_report_months(self):
+        """
+        Test the deferred expense report with the 'month' method.
+        We use multiple report months/quarters/years to check that the computation is correct.
+        """
+        self.company.deferred_expense_amount_computation_method = 'month'
+        self.create_invoice(self.expense_lines)
+
+        # December 2022
+        options = self.get_options('2022-12-01', '2022-12-31')
+        lines = self.get_lines(options)
+        self.assertLinesValues(
+            lines,
+            #    Name   Total   Not Started   Before   Current   Later
+            [    0,     1,      2,            3,       4,        5     ],
+            [],
+            options,
+        )
+
+        # January 2023
+        options = self.get_options('2023-01-01', '2023-01-31')
+        lines = self.get_lines(options)
+        self.assertLinesValues(
+            lines,
+            #    Name                Total          Not Started   Before   Current              Later
+            [    0,                  1,             2,            3,       4,                   5                       ],
+            [
+                ('EXP0 Expense 0',   1000 + 1050,   0,            0,       250 + 150,           750 + 900               ),
+                ('EXP1 Expense 1',   1225,          0,            0,       350,                 875                     ),
+                ('EXP2 Expense 2',   1680 + 225,    225,          0,       600 * (10/30) + 0,   600 * (2 + 14/30) + 225 ),
+                ('Total',            5180,          225,          0,       950,                 4230                    ),
+            ],
+            options,
+        )
+
+        # February 2023
+        options = self.get_options('2023-02-01', '2023-02-28')
+        lines = self.get_lines(options)
+        self.assertLinesValues(
+            lines,
+            #    Name                Total          Not Started   Before               Current      Later
+            [    0,                  1,             2,            3,                   4,           5                       ],
+            [
+                ('EXP0 Expense 0',   1000 + 1050,   0,            250 + 150,           250 + 300,   500 + 600               ),
+                ('EXP1 Expense 1',   1225,          0,            350,                 350,         525                     ),
+                ('EXP2 Expense 2',   1680 + 225,    225,          600 * (10/30) + 0,   600 + 0,     600 * (1 + 14/30) + 225 ),
+                ('Total',            5180,          225,          950,                 1500,        2730                    ),
+            ],
+            options,
+        )
+
+        # April 2023
+        options = self.get_options('2023-04-01', '2023-04-30')
+        lines = self.get_lines(options)
+        self.assertLinesValues(
+            lines,
+            #    Name                Total          Not Started   Before               Current               Later
+            [    0,                  1,             2,            3,                   4,                    5     ],
+            [
+                ('EXP0 Expense 0',   1000 + 1050,   0,            750 + 750,           250 + 300,            0     ),
+                ('EXP1 Expense 1',   1225,          0,            1050,                175,                  0     ),
+                ('EXP2 Expense 2',   1680 + 225,    0,            600 * (2 + 10/30),   600 * (14/30)+ 225,   0     ),
+                ('Total',            5180,          0,            3950,                1230,                 0     ),
+            ],
+            options,
+        )
+
+        # May 2023
+        options = self.get_options('2023-05-01', '2023-05-31')
+        lines = self.get_lines(options)
+        self.assertLinesValues(
+            lines,
+            #    Name   Total   Not Started   Before   Current   Later
+            [    0,     1,      2,            3,       4,        5     ],
+            [],
+            options,
+        )
+
+        # Q1 2023
+        options = self.get_options('2023-01-01', '2023-03-31')
+        lines = self.get_lines(options)
+        self.assertLinesValues(
+            lines,
+            #    Name                Total          Not Started   Before   Current                  Later
+            [    0,                  1,             2,            3,       4,                       5         ],
+            [
+                ('EXP0 Expense 0',   1000 + 1050,   0,            0,       750 + 750,               550       ),
+                ('EXP1 Expense 1',   1225,          0,            0,       1050,                    175       ),
+                ('EXP2 Expense 2',   1680 + 225,    225,          0,       600 * (2 + 10/30) + 0,   280 + 225 ),
+                ('Total',            5180,          225,          0,       3950,                    1230      ),
+            ],
+            options,
+        )
+
+        # Q2 2023
+        options = self.get_options('2023-04-01', '2023-06-30')
+        lines = self.get_lines(options)
+        self.assertLinesValues(
+            lines,
+            #    Name                Total          Not Started   Before               Current               Later
+            [    0,                  1,             2,            3,                   4,                    5     ],
+            [
+                ('EXP0 Expense 0',   1000 + 1050,   0,            750 + 750,           250 + 300,            0     ),
+                ('EXP1 Expense 1',   1225,          0,            1050,                175,                  0     ),
+                ('EXP2 Expense 2',   1680 + 225,    0,            600 * (2 + 10/30),   600 * (14/30)+ 225,   0     ),
+                ('Total',            5180,          0,            3950,                1230,                 0     ),
+            ],
+            options,
+        )
+
+        # 2022
+        options = self.get_options('2022-01-01', '2022-12-31')
+        lines = self.get_lines(options)
+        self.assertLinesValues(
+            lines,
+            #    Name   Total   Not Started   Before   Current   Later
+            [    0,     1,      2,            3,       4,        5     ],
+            [],
+            options,
+        )
+
+        # 2023, nothing to show as all the moves have been deferred by the end of the year 2023
+        options = self.get_options('2023-01-01', '2023-12-31')
+        lines = self.get_lines(options)
+        self.assertLinesValues(
+            lines,
+            #    Name   Total   Not Started   Before   Current   Later
+            [    0,     1,      2,            3,       4,        5     ],
+            [],
+            options,
+        )
+
+    def test_deferred_revenue_report(self):
+        """
+        Test the deferred revenue report with the 'month' method.
+        We use multiple report months/quarters/years to check that the computation is correct.
+        """
+        self.company.deferred_revenue_amount_computation_method = 'month'
+        self.create_invoice(self.revenue_lines, 'out_invoice')
+
+        # December 2022
+        options = self.get_options('2022-12-01', '2022-12-31', self.deferred_revenue_report)
+        lines = self.get_lines(options, self.deferred_revenue_report)
+        self.assertLinesValues(
+            lines,
+            #    Name   Total   Not Started   Before   Current   Later
+            [    0,     1,      2,            3,       4,        5     ],
+            [],
+            options,
+        )
+
+        # January 2023
+        options = self.get_options('2023-01-01', '2023-01-31', self.deferred_revenue_report)
+        lines = self.get_lines(options, self.deferred_revenue_report)
+        self.assertLinesValues(
+            lines,
+            #    Name                Total          Not Started   Before   Current              Later
+            [    0,                  1,             2,            3,       4,                   5                       ],
+            [
+                ('REV0 Revenue 0',   1000 + 1050,   0,            0,       250 + 150,           750 + 900               ),
+                ('REV1 Revenue 1',   1225,          0,            0,       350,                 875                     ),
+                ('REV2 Revenue 2',   1680 + 225,    225,          0,       600 * (10/30) + 0,   600 * (2 + 14/30) + 225 ),
+                ('Total',            5180,          225,          0,       950,                 4230                    ),
+            ],
+            options,
+        )
+
+        # February 2023
+        options = self.get_options('2023-02-01', '2023-02-28', self.deferred_revenue_report)
+        lines = self.get_lines(options, self.deferred_revenue_report)
+        self.assertLinesValues(
+            lines,
+            #    Name                Total          Not Started   Before               Current      Later
+            [    0,                  1,             2,            3,                   4,           5                       ],
+            [
+                ('REV0 Revenue 0',   1000 + 1050,   0,            250 + 150,           250 + 300,   500 + 600               ),
+                ('REV1 Revenue 1',   1225,          0,            350,                 350,         525                     ),
+                ('REV2 Revenue 2',   1680 + 225,    225,          600 * (10/30) + 0,   600 + 0,     600 * (1 + 14/30) + 225 ),
+                ('Total',            5180,          225,          950,                 1500,        2730                    ),
+            ],
+            options,
+        )
+
+        # April 2023
+        options = self.get_options('2023-04-01', '2023-04-30', self.deferred_revenue_report)
+        lines = self.get_lines(options, self.deferred_revenue_report)
+        self.assertLinesValues(
+            lines,
+            #    Name                Total          Not Started   Before               Current               Later
+            [    0,                  1,             2,            3,                   4,                    5     ],
+            [
+                ('REV0 Revenue 0',   1000 + 1050,   0,            750 + 750,           250 + 300,            0     ),
+                ('REV1 Revenue 1',   1225,          0,            1050,                175,                  0     ),
+                ('REV2 Revenue 2',   1680 + 225,    0,            600 * (2 + 10/30),   600 * (14/30)+ 225,   0     ),
+                ('Total',            5180,          0,            3950,                1230,                 0     ),
+            ],
+            options,
+        )
+
+        # May 2023
+        options = self.get_options('2023-05-01', '2023-05-31', self.deferred_revenue_report)
+        lines = self.get_lines(options, self.deferred_revenue_report)
+        self.assertLinesValues(
+            lines,
+            #    Name   Total   Not Started   Before   Current   Later
+            [    0,     1,      2,            3,       4,        5     ],
+            [],
+            options,
+        )
+
+        # Q1 2023
+        options = self.get_options('2023-01-01', '2023-03-31', self.deferred_revenue_report)
+        lines = self.get_lines(options, self.deferred_revenue_report)
+        self.assertLinesValues(
+            lines,
+            #    Name                Total          Not Started   Before   Current                  Later
+            [    0,                  1,             2,            3,       4,                       5         ],
+            [
+                ('REV0 Revenue 0',   1000 + 1050,   0,            0,       750 + 750,               550       ),
+                ('REV1 Revenue 1',   1225,          0,            0,       1050,                    175       ),
+                ('REV2 Revenue 2',   1680 + 225,    225,          0,       600 * (2 + 10/30) + 0,   280 + 225 ),
+                ('Total',            5180,          225,          0,       3950,                    1230      ),
+            ],
+            options,
+        )
+
+        # Q2 2023
+        options = self.get_options('2023-04-01', '2023-06-30', self.deferred_revenue_report)
+        lines = self.get_lines(options, self.deferred_revenue_report)
+        self.assertLinesValues(
+            lines,
+            #    Name                Total          Not Started   Before               Current               Later
+            [    0,                  1,             2,            3,                   4,                    5     ],
+            [
+                ('REV0 Revenue 0',   1000 + 1050,   0,            750 + 750,           250 + 300,            0     ),
+                ('REV1 Revenue 1',   1225,          0,            1050,                175,                  0     ),
+                ('REV2 Revenue 2',   1680 + 225,    0,            600 * (2 + 10/30),   600 * (14/30)+ 225,   0     ),
+                ('Total',            5180,          0,            3950,                1230,                 0     ),
+            ],
+            options,
+        )
+
+        # 2022
+        options = self.get_options('2022-01-01', '2022-12-31', self.deferred_revenue_report)
+        lines = self.get_lines(options, self.deferred_revenue_report)
+        self.assertLinesValues(
+            lines,
+            #    Name   Total   Not Started   Before   Current   Later
+            [    0,     1,      2,            3,       4,        5     ],
+            [],
+            options,
+        )
+
+        # 2023: nothing to show since all the invoices are deferred
+        options = self.get_options('2023-01-01', '2023-12-31', self.deferred_revenue_report)
+        lines = self.get_lines(options, self.deferred_revenue_report)
+        self.assertLinesValues(
+            lines,
+            #    Name   Total   Not Started   Before   Current   Later
+            [    0,     1,      2,            3,       4,        5     ],
+            [],
+            options,
+        )
+
+    def test_deferred_expense_report_days(self):
+        """
+        Test the deferred expense report with the 'day' method.
+        We use multiple report months/quarters/years to check that the computation is correct.
+        """
+        self.company.deferred_expense_amount_computation_method = 'day'
+        self.create_invoice(self.expense_lines)
+
+        # December 2022
+        options = self.get_options('2022-12-01', '2022-12-31')
+        lines = self.get_lines(options)
+        self.assertLinesValues(
+            lines,
+            #    Name   Total   Not Started   Before   Current   Later
+            [    0,     1,      2,            3,       4,        5     ],
+            [],
+            options,
+        )
+
+        # January 2023
+        options = self.get_options('2023-01-01', '2023-01-31')
+        lines = self.get_lines(options)
+        self.assertLinesValues(
+            lines,
+            #    Name                Total          Not Started   Before   Current   Later
+            [    0,                  1,             2,            3,       4,        5          ],
+            [
+                ('EXP0 Expense 0',   1000 + 1050,   0,            0,       418.33,   1631.67    ),
+                ('EXP1 Expense 1',   1225,          0,            0,       361.67,   863.33     ),
+                ('EXP2 Expense 2',   1680 + 225,    225,          0,       220,      1460 + 225 ),
+                ('Total',            5180,          225,          0,       1000,     4180       ),
+            ],
+            options,
+        )
+
+        # February 2023
+        options = self.get_options('2023-02-01', '2023-02-28')
+        lines = self.get_lines(options)
+        self.assertLinesValues(
+            lines,
+            #    Name                Total          Not Started   Before    Current   Later
+            [    0,                  1,             2,            3,        4,        5         ],
+            [
+                ('EXP0 Expense 0',   1000 + 1050,   0,            418.33,   513.33,   1118.33   ),
+                ('EXP1 Expense 1',   1225,          0,            361.67,   326.67,   536.67    ),
+                ('EXP2 Expense 2',   1680 + 225,    225,          220,      560,      900 + 225 ),
+                ('Total',            5180,          225,          1000,     1400,     2780      ),
+            ],
+            options,
+        )
+
+        # April 2023
+        options = self.get_options('2023-04-01', '2023-04-30')
+        lines = self.get_lines(options)
+        self.assertLinesValues(
+
+            # ruff: noqa: E202
+
+            lines,
+            #    Name                Total          Not Started   Before    Current   Later
+            [    0,                  1,             2,            3,        4,        5         ],
+            [
+                ('EXP0 Expense 0',   1000 + 1050,   0,            1500,     550,      0         ),
+                ('EXP1 Expense 1',   1225,          0,            1050,     175,      0         ),
+                ('EXP2 Expense 2',   1680 + 225,    0,            1400,     505,      0         ),
+                ('Total',            5180,          0,            3950,     1230,     0         ),
+            ],
+            options,
+        )
+
+        # Q1 2023
+        options = self.get_options('2023-01-01', '2023-03-31')
+        lines = self.get_lines(options)
+        self.assertLinesValues(
+            lines,
+            #    Name                Total          Not Started   Before   Current   Later
+            [    0,                  1,             2,            3,       4,        5         ],
+            [
+                ('EXP0 Expense 0',   1000 + 1050,   0,            0,       1500,     550       ),
+                ('EXP1 Expense 1',   1225,          0,            0,       1050,     175       ),
+                ('EXP2 Expense 2',   1680 + 225,    225,          0,       1400,     280 + 225 ),
+                ('Total',            5180,          225,          0,       3950,     1230      ),
+            ],
+            options,
+        )
+
+    def test_deferred_expense_report_filter_all_entries(self):
+        """
+        Test the 'All entries' option on the deferred expense report.
+        """
+        self.company.deferred_expense_amount_computation_method = 'day'
+        self.create_invoice(self.expense_lines, post=True)
+        self.create_invoice(self.expense_lines, post=False)
+
+        # Only posted entries
+        options = self.get_options('2023-02-01', '2023-02-28')
+        lines = self.get_lines(options)
+        self.assertLinesValues(
+            lines,
+            #    Name                Total          Not Started   Before    Current   Later
+            [    0,                  1,             2,            3,        4,        5         ],
+            [
+                ('EXP0 Expense 0',   1000 + 1050,   0,            418.33,   513.33,   1118.33   ),
+                ('EXP1 Expense 1',   1225,          0,            361.67,   326.67,   536.67    ),
+                ('EXP2 Expense 2',   1680 + 225,    225,          220,      560,      900 + 225 ),
+                ('Total',            5180,          225,          1000,     1400,     2780      ),
+            ],
+            options,
+        )
+
+        # All non-cancelled entries
+        options = self._generate_options(self.deferred_expense_report, fields.Date.from_string('2023-02-01'), fields.Date.from_string('2023-02-28'), {
+            'all_entries': True,
+        })
+        lines = self.get_lines(options)
+        self.assertLinesValues(
+            lines,
+            #    Name                Total          Not Started   Before    Current    Later
+            [    0,                  1,             2,            3,        4,         5          ],
+            [
+                ('EXP0 Expense 0',   2000 + 2100,   0,            836.67,   1026.67,   2236.67    ),
+                ('EXP1 Expense 1',   2450,          0,            723.33,   653.33,    1073.33    ),
+                ('EXP2 Expense 2',   3360 + 450,    450,          440,      1120,      1800 + 450 ),
+                ('Total',            10360,         450,          2000,     2800,      5560       ),
+            ],
+            options,
+        )
+
+    def test_deferred_expense_report_comparison(self):
+        """
+        Test the the comparison tool on the deferred expense report.
+        For instance, we select April 2023 and compare it with the last 4 months
+        """
+        self.create_invoice(self.expense_lines)
+
+        # April 2023 + period comparison of last 4 months
+        options = self.get_options('2023-04-01', '2023-04-30')
+        options = self._update_comparison_filter(options, self.deferred_expense_report, 'previous_period', 4)
+        lines = self.get_lines(options)
+        self.assertLinesValues(
+            lines,
+            #    Name                Total   Not Started   Before   Dec 2022   Jan 2023   Feb 2023   Mar 2023   Apr 2023 (Current)   Later
+            [    0,                  1,      2,            3,       4,         5,         6,         7,         8,                   9     ],
+            [
+                ('EXP0 Expense 0',   2050,   0,            0,       0,         400,       550,       550,       550,                 0     ),
+                ('EXP1 Expense 1',   1225,   0,            0,       0,         350,       350,       350,       175,                 0     ),
+                ('EXP2 Expense 2',   1905,   0,            0,       0,         200,       600,       600,       505,                 0     ),
+                ('Total',            5180,   0,            0,       0,         950,       1500,      1500,      1230,                0     ),
+            ],
+            options,
+        )
+
+    def test_deferred_expense_report_partially_deductible_tax(self):
+        """
+        Test the deferred expense report with partially deductible tax.
+        If we have 50% deductible tax, half of the invoice line amount should also be deferred.
+        Here, for an invoice line of 1000, and a tax of 40% partially deductible (50%) on 3 months, we will have:
+        - 1400 for the total amount, tax included
+        - 1200 for the total amount to be deferred (1000 + 400/2)
+        - 400 for the deferred amount for each of the 3 months
+        """
+        partially_deductible_tax = self.env['account.tax'].create({
+            'name': 'Partially deductible Tax',
+            'amount': 40,
+            'amount_type': 'percent',
+            'type_tax_use': 'purchase',
+            'invoice_repartition_line_ids': [
+                Command.create({'repartition_type': 'base'}),
+                Command.create({
+                    'factor_percent': 50,
+                    'repartition_type': 'tax',
+                    'use_in_tax_closing': False
+                }),
+                Command.create({
+                    'factor_percent': 50,
+                    'repartition_type': 'tax',
+                    'account_id': self.company_data['default_account_tax_purchase'].id,
+                    'use_in_tax_closing': True
+                }),
+            ],
+            'refund_repartition_line_ids': [
+                Command.create({'repartition_type': 'base'}),
+                Command.create({
+                    'factor_percent': 50,
+                    'repartition_type': 'tax',
+                    'use_in_tax_closing': False
+                }),
+                Command.create({
+                    'factor_percent': 50,
+                    'repartition_type': 'tax',
+                    'account_id': self.company_data['default_account_tax_purchase'].id,
+                    'use_in_tax_closing': True
+                }),
+            ],
+        })
+
+        # Create invoice with 3 cars to be depreciated on different periods
+        # to make sure the deferred dates are correctly copied on the right lines
+        move_form = Form(self.env['account.move'].with_context(default_move_type='in_invoice'))
+        move_form.partner_id = self.partner_a
+        move_form.invoice_date = fields.Date.from_string('2022-01-01')
+        for year in (2022, 2023, 2023):
+            with move_form.invoice_line_ids.new() as line_form:
+                line_form.name = f"Car {year}"
+                line_form.quantity = 1
+                line_form.price_unit = 1000
+                line_form.deferred_start_date = f'{year}-01-01'
+                line_form.deferred_end_date = f'{year}-03-31'
+                line_form.tax_ids.add(partially_deductible_tax)
+                line_form.account_id = self.expense_accounts[0]
+        move = move_form.save()
+        move.action_post()
+
+        # Taxes for 2023 should be aggregated into one because we have the same deferred dates.
+        # Taxes for 2022 should not be aggregated with 2023 because we have different deferred dates.
+        # Therefore we have 4 lines:
+        #     - 3 for the cars
+        #     - 1 for the tax of 2022
+        #     - 1 for the aggregated taxes of 2023
+        self.assertEqual(len(move.line_ids.filtered(lambda l: l.account_id == self.expense_accounts[0])), 5)
+
+        # 2 cars (not 3) should appear with this date range
+        options = self.get_options('2023-02-01', '2023-02-28')
+        lines = self.get_lines(options)
+        self.assertLinesValues(
+            lines,
+            #    Name                Total   Not Started   Before   Current   Later
+            [    0,                  1,      2,            3,       4,        5     ],
+            [
+                ('EXP0 Expense 0',   2400,   0,            800,     800,      800   ),
+                ('Total',            2400,   0,            800,     800,      800   ),
+            ],
+            options,
+        )
+
+    def test_deferred_expense_report_credit_notes(self):
+        """
+        Test the credit notes on the deferred expense report.
+        """
+        self.company.deferred_expense_amount_computation_method = 'day'
+        self.create_invoice(self.expense_lines, move_type='in_refund')
+
+        options = self.get_options('2023-02-01', '2023-02-28')
+        lines = self.get_lines(options)
+        self.assertLinesValues(
+            lines,
+            #    Name                Total           Not Started   Before     Current    Later
+            [    0,                  1,              2,            3,         4,         5          ],
+            [
+                ('EXP0 Expense 0',   -1000 - 1050,   0,            -418.33,   -513.33,   -1118.33   ),
+                ('EXP1 Expense 1',   -1225,          0,            -361.67,   -326.67,   -536.67    ),
+                ('EXP2 Expense 2',   -1680 - 225,    -225,         -220,      -560,      -900 - 225 ),
+                ('Total',            -5180,          -225,         -1000,     -1400,     -2780      ),
+            ],
+            options,
+        )
+
+    def test_deferred_expense_report_compute_method_full_months(self):
+        """
+        Test the full_months method on the deferred expense report.
+        """
+        self.company.deferred_expense_amount_computation_method = 'full_months'
+        self.create_invoice([[self.expense_accounts[0], 1200, '2023-01-31', '2024-01-30']])
+        self.create_invoice([[self.expense_accounts[1], 1200, '2023-02-01', '2023-03-31']])
+        self.create_invoice([[self.expense_accounts[2], 1200, '2023-02-01', '2023-03-16']])
+        self.create_invoice([[self.expense_accounts[3], 1200, '2023-02-05', '2023-03-16']])
+        self.create_invoice([[self.expense_accounts[4], 1200, '2023-02-05', '2023-03-31']])
+        self.create_invoice([[self.expense_accounts[5], 1200, '2023-02-13', '2023-04-30']])
+        self.create_invoice([[self.expense_accounts[6], 1200, '2023-03-01', '2023-06-18']])
+        self.create_invoice([[self.expense_accounts[7], 1200, '2023-03-05', '2023-06-30']])
+        self.create_invoice([[self.expense_accounts[8], 1200, '2023-03-13', '2024-03-12']])
+        self.create_invoice([[self.expense_accounts[9], 1200, '2023-03-14', '2023-03-18']])
+
+        options = self.get_options('2023-03-01', '2023-03-31')
+        lines = self.get_lines(options)
+
+        for line in lines:
+            total = line['columns'][0]['no_format']
+            before = line['columns'][2]['no_format']  # 1 is "Not Started"
+            current = line['columns'][3]['no_format']
+            later = line['columns'][4]['no_format']
+            self.assertAlmostEqual(total, before + current + later, 3)
+
+        self.assertLinesValues(
+            lines,
+            #         Name          Total   Not Started   Before     Current   Later
+            [0,                         1,            2,       3,         4,      5],
+            [
+                ('EXP0 Expense 0',   1200,            0,     200,       100,    900),
+                ('EXP1 Expense 1',   1200,            0,     600,       600,      0),
+                ('EXP2 Expense 2',   1200,            0,    1200,         0,      0),
+                ('EXP3 Expense 3',   1200,            0,    1200,         0,      0),
+                ('EXP4 Expense 4',   1200,            0,     600,       600,      0),
+                ('EXP5 Expense 5',   1200,            0,     400,       400,    400),
+                ('EXP6 Expense 6',   1200,            0,       0,       400,    800),
+                ('EXP7 Expense 7',   1200,            0,       0,       300,    900),
+                ('EXP8 Expense 8',   1200,            0,       0,       100,   1100),
+                ('EXP9 Expense 9',   1200,            0,       0,      1200,      0),
+                ('Total',           12000,            0,    4200,      3700,   4100),
+            ],
+            options,
+        )
+
+    def assert_invoice_lines(self, deferred_move, expected_values):
+        for line, expected_value in zip(deferred_move.line_ids, expected_values):
+            expected_account, expected_debit, expected_credit = expected_value
+            self.assertRecordValues(line, [{
+                'account_id': expected_account.id,
+                'debit': expected_debit,
+                'credit': expected_credit,
+            }])
+
+    def test_deferred_expense_report_accounting_date(self):
+        """
+        Test that the accounting date is taken into account for the deferred expense report.
+        """
+        self.company.generate_deferred_expense_entries_method = 'manual'
+        self.create_invoice([self.expense_lines[0]], invoice_date='2023-02-15')
+
+        # In january, the move is not accounted yet (accounting date is in 15 Feb), so nothing should be displayed.
+        options = self.get_options('2023-01-01', '2023-01-31')
+        lines = self.get_lines(options)
+        self.assertLinesValues(
+            lines,
+            #    Name   Total   Not Started   Before   Current   Later
+            [    0,     1,      2,            3,       4,        5     ],
+            [],
+            options,
+        )
+        # Nothing should be generated either.
+        with self.assertRaisesRegex(UserError, 'No entry to generate.'):
+            self.generate_deferral_entries(options)
+
+        # In Feb, the move is accounted, so it should be displayed.
+        options = self.get_options('2023-02-01', '2023-02-28')
+        lines = self.get_lines(options)
+        self.assertLinesValues(
+            lines,
+            #    Name                Total   Not Started   Before   Current   Later
+            [    0,                  1,      2,            3,       4,        5     ],
+            [
+                ('EXP0 Expense 0',   1000,   0,            250,     250,      500   ),
+                ('Total',            1000,   0,            250,     250,      500   ),
+            ],
+            options,
+        )
+
+        # Same in March.
+        options = self.get_options('2023-03-01', '2023-03-31')
+        lines = self.get_lines(options)
+        self.assertLinesValues(
+            lines,
+            #    Name                Total   Not Started   Before   Current   Later
+            [    0,                  1,      2,            3,       4,        5     ],
+            [
+                ('EXP0 Expense 0',   1000,   0,            500,     250,      250   ),
+                ('Total',            1000,   0,            500,     250,      250   ),
+            ],
+            options,
+        )
+
+        # Same in April.
+        options = self.get_options('2023-04-01', '2023-04-30')
+        lines = self.get_lines(options)
+        self.assertLinesValues(
+            lines,
+            #    Name                Total   Not Started   Before   Current   Later
+            [    0,                  1,      2,            3,       4,        5     ],
+            [
+                ('EXP0 Expense 0',   1000,   0,            750,     250,      0     ),
+                ('Total',            1000,   0,            750,     250,      0     ),
+            ],
+            options,
+        )
+
+        # In May, the move is accounted and fully deferred, so it should not be displayed.
+        options = self.get_options('2023-05-01', '2023-05-31')
+        lines = self.get_lines(options)
+        self.assertLinesValues(
+            lines,
+            #    Name   Total   Not Started   Before   Current   Later
+            [    0,     1,      2,            3,       4,        5     ],
+            [],
+            options,
+        )
+
+    def test_deferred_expense_generate_grouped_entries_method(self):
+        """
+        Test the Generate entries button on the deferred expense report.
+        """
+        self.company.generate_deferred_expense_entries_method = 'manual'
+
+        options = self.get_options('2023-01-01', '2023-01-31')
+
+        with self.assertRaisesRegex(UserError, 'No entry to generate.'):
+            self.generate_deferral_entries(options)
+
+        # Create 3 different invoices (instead of one with 3 lines)
+        for expense_line in self.expense_lines[:3]:
+            self.create_invoice([expense_line])
+
+        # Check that no deferred move has been created
+        self.assertEqual(self.env['account.move.line'].search_count([('account_id', '=', self.deferral_account.id)]), 0)
+
+        # Generate the grouped deferred entries
+        generated_entries_january = self.generate_deferral_entries(options)
+
+        deferred_move_january = generated_entries_january[0]
+        self.assertRecordValues(deferred_move_january, [{
+            'state': 'posted',
+            'move_type': 'entry',
+            'date': fields.Date.to_date('2023-01-31'),
+        }])
+        expected_values_january = [
+            #        Account                         Debit                       Credit
+            [self.expense_accounts[0],                                     0, 1000 + 1050],
+            [self.expense_accounts[0],                             250 + 150,           0],
+            [self.expense_accounts[1],                                     0,        1225],
+            [self.expense_accounts[1],                                   350,           0],
+            [self.deferral_account,     1000 + 1050 + 1225 - 250 - 150 - 350,           0]
+        ]
+        self.assert_invoice_lines(deferred_move_january, expected_values_january)
+
+        deferred_inverse_january = generated_entries_january[1]
+        self.assertEqual(deferred_inverse_january.move_type, 'entry')
+        self.assertEqual(deferred_inverse_january.state, 'posted')  # Posted because the date is before today
+        self.assertEqual(deferred_inverse_january.date, fields.Date.from_string('2023-02-01'))
+
+        # Don't re-generate entries for the same period if they already exist for all move lines
+        with self.assertRaisesRegex(UserError, 'No entry to generate.'):
+            self.generate_deferral_entries(options)
+
+        # Generate the grouped deferred entries for the next period
+        generated_entries_february = self.generate_deferral_entries(self.get_options('2023-02-01', '2023-02-28'))
+        deferred_move_february = generated_entries_february[0]
+        expected_values_february = [
+            #        Account                         Debit                       Credit
+            [self.expense_accounts[0],                                     0, 1000 + 1050],
+            [self.expense_accounts[0],                             500 + 450,           0],
+            [self.expense_accounts[1],                                     0,        1225],
+            [self.expense_accounts[1],                                   700,           0],
+            [self.deferral_account,     1000 + 1050 + 1225 - 500 - 450 - 700,           0]
+        ]
+        self.assert_invoice_lines(deferred_move_february, expected_values_february)
+
+    def _test_deferred_expense_partially_generate_grouped_entries_method_common(self):
+        """
+        Test that if we generate the deferrals for a period, we don't re-generate them if they already exist.
+        and we regenerate them if necessary (e.g. a new invoice has been created for the same period).
+        """
+        self.company.generate_deferred_expense_entries_method = 'manual'
+
+        options = self.get_options('2023-01-01', '2023-01-31')
+
+        # Create 2 different invoices (instead of one with 2 lines)
+        self.create_invoice([self.expense_lines[0]])
+        self.create_invoice([self.expense_lines[1]])
+
+        # Generate the grouped deferred entries
+        generated_entries_january = self.generate_deferral_entries(options)
+
+        deferred_move_january, deferred_inverse_january = generated_entries_january
+        self.assertRecordValues(deferred_move_january, [{
+            'move_type': 'entry',
+            'date': fields.Date.to_date('2023-01-31'),
+        }])
+        expected_values_january = [
+            #        Account                    Debit               Credit
+            [self.expense_accounts[0],                        0,  1000 + 1050],
+            [self.expense_accounts[0],                250 + 150,            0],
+            [self.deferral_account,     1000 + 1050 - 250 - 150,            0]
+        ]
+        self.assert_invoice_lines(deferred_move_january, expected_values_january)
+
+        self.assertRecordValues(deferred_inverse_january, [{
+            'move_type': 'entry',
+            'date': fields.Date.to_date('2023-02-01'),
+        }])
+
+        # Don't re-generate entries for the same period if they already exist for all move lines
+        with self.assertRaisesRegex(UserError, 'No entry to generate.'):
+            self.generate_deferral_entries(options)
+
+        # Let's create a new invoice that should be shown in the January period
+        self.create_invoice([self.expense_lines[2]])
+
+        # Now, even though we have already generated the grouped deferral for January,
+        # we must re-generate it because we have a new invoice that should be included in the January period.
+        # We only generate the missing part
+        generated_entries_january2 = self.generate_deferral_entries(options)
+        deferred_move_january2 = generated_entries_january2[0]
+        self.assertRecordValues(deferred_move_january2, [{
+            'move_type': 'entry',
+            'date': fields.Date.to_date('2023-01-31'),
+        }])
+        expected_values_january2 = [
+            #        Account              Debit          Credit
+            [self.expense_accounts[1],           0,        1225],
+            [self.expense_accounts[1],         350,           0],
+            [self.deferral_account,     1225 - 350,           0]
+        ]
+        self.assert_invoice_lines(deferred_move_january2, expected_values_january2)
+        return deferred_move_january, deferred_inverse_january
+
+    def test_deferred_expense_partially_generate_grouped_entries_method_past_period(self):
+        """
+        Test that if we generate the deferrals for a period, we don't re-generate them if they already exist.
+        and we regenerate them if necessary (e.g. a new invoice has been created for the same period).
+        """
+        deferred_move_january, deferred_inverse_january = self._test_deferred_expense_partially_generate_grouped_entries_method_common()
+        self.assertEqual(deferred_move_january.state, 'posted')  # January is in the past so the move is posted
+        self.assertEqual(deferred_inverse_january.state, 'posted')
+
+    @freeze_time('2023-01-01')
+    def test_deferred_expense_partially_generate_grouped_entries_method_current_period(self):
+        """
+        Same as previous test but for an ongoing month. This test has been added after discovering
+        that if you generate the deferrals for the current month, you could generate them again
+        and again. This is because the generated deferral is only posted at then end of the month
+        (date_to of the report period). So the `filter_generated_entries` wasn't working as expected
+        The test is exactly the same as the previous one, we with a freeze_time simulating Jan 2023
+        """
+        deferred_move_january, deferred_inverse_january = self._test_deferred_expense_partially_generate_grouped_entries_method_common()
+        self.assertEqual(deferred_move_january.state, 'draft')  # January is still current so the move is not posted yet
+        self.assertEqual(deferred_inverse_january.state, 'draft')
+
+    @freeze_time('2023-01-01')
+    def test_deferred_expense_partially_generate_grouped_entries_method_later_period(self):
+        """
+        Same as previous test but for a later month (February 2023 while we simulate we are in Jan 2023)
+        """
+        self.company.generate_deferred_expense_entries_method = 'manual'
+
+        options = self.get_options('2023-02-01', '2023-02-28')
+
+        # Create 2 different invoices (instead of one with 2 lines)
+        self.create_invoice([self.expense_lines[0]])
+        self.create_invoice([self.expense_lines[1]])
+
+        # Generate the grouped deferred entries
+        generated_entries_february = self.generate_deferral_entries(options)
+
+        deferred_move_february, deferred_inverse_february = generated_entries_february
+        self.assertRecordValues(deferred_move_february, [{
+            'state': 'draft',  # Not posted yet since it's in the future
+            'move_type': 'entry',
+            'date': fields.Date.to_date('2023-02-28'),
+        }])
+        expected_values_february = [
+            #        Account                    Debit               Credit
+            [self.expense_accounts[0],                        0,  1000 + 1050],
+            [self.expense_accounts[0],                500 + 450,            0],
+            [self.deferral_account,     1000 + 1050 - 500 - 450,            0]
+        ]
+        self.assert_invoice_lines(deferred_move_february, expected_values_february)
+
+        self.assertRecordValues(deferred_inverse_february, [{
+            'state': 'draft',  # Not posted yet since it's in the future
+            'move_type': 'entry',
+            'date': fields.Date.to_date('2023-03-01'),
+        }])
+
+        # Don't re-generate entries for the same period if they already exist for all move lines
+        with self.assertRaisesRegex(UserError, 'No entry to generate.'):
+            self.generate_deferral_entries(options)
+
+        # Let's create a new invoice that should be shown in the february period
+        self.create_invoice([self.expense_lines[2]])
+
+        # Now, even though we have already generated the grouped deferral for february,
+        # we must re-generate it because we have a new invoice that should be included in the february period.
+        # We only generate the missing part
+        generated_entries_february2 = self.generate_deferral_entries(options)
+        deferred_move_february2 = generated_entries_february2[0]
+        self.assertRecordValues(deferred_move_february2, [{
+            'state': 'draft',  # Not posted yet since it's in the future
+            'move_type': 'entry',
+            'date': fields.Date.to_date('2023-02-28'),
+        }])
+        expected_values_february2 = [
+            #        Account              Debit          Credit
+            [self.expense_accounts[1],           0,        1225],
+            [self.expense_accounts[1],         700,           0],
+            [self.deferral_account,     1225 - 700,           0]
+        ]
+        self.assert_invoice_lines(deferred_move_february2, expected_values_february2)
+
+    def test_deferred_expense_generate_future_deferrals_grouped(self):
+        """
+        Test the Generate entries button when we have a deferral starting after the invoice period.
+        """
+        self.company.deferred_expense_amount_computation_method = 'month'
+        self.company.generate_deferred_expense_entries_method = 'manual'
+        self.create_invoice([[self.expense_accounts[0], 750, '2023-03-01', '2023-04-15']])
+
+        # JANUARY
+        generated_entries_january = self.generate_deferral_entries(self.get_options('2023-01-01', '2023-01-31'))
+
+        # January Deferral
+        deferred_move_january = generated_entries_january[0]
+        self.assertRecordValues(deferred_move_january, [{
+            'move_type': 'entry',
+            'date': fields.Date.to_date('2023-01-31'),
+        }])
+        expected_values_january = [
+            # Account                      Debit     Credit
+            [self.expense_accounts[0],         0,       750],
+            [self.deferral_account,          750,         0],
+        ]
+        self.assert_invoice_lines(deferred_move_january, expected_values_january)
+
+        # January Reversal
+        deferred_inverse_january = generated_entries_january[1]
+        self.assertRecordValues(deferred_inverse_january, [{
+            'move_type': 'entry',
+            'date': fields.Date.to_date('2023-02-01'),
+        }])
+        expected_values_inverse_january = [
+            # Account                      Debit     Credit
+            [self.expense_accounts[0],       750,         0],
+            [self.deferral_account,            0,       750],
+        ]
+        self.assert_invoice_lines(deferred_inverse_january, expected_values_inverse_january)
+
+        # FEBRUARY
+        generated_entries_february = self.generate_deferral_entries(self.get_options('2023-02-01', '2023-02-28'))
+
+        # February Deferral
+        deferred_move_february = generated_entries_february[0]
+        self.assertRecordValues(deferred_move_february, [{
+            'move_type': 'entry',
+            'date': fields.Date.to_date('2023-02-28'),
+        }])
+        expected_values_february = [
+            # Account                      Debit     Credit
+            [self.expense_accounts[0],         0,       750],
+            [self.deferral_account,          750,         0],
+        ]
+        self.assert_invoice_lines(deferred_move_february, expected_values_february)
+
+        # February Reversal
+        deferred_inverse_february = generated_entries_february[1]
+        self.assertRecordValues(deferred_inverse_february, [{
+            'move_type': 'entry',
+            'date': fields.Date.to_date('2023-03-01'),
+        }])
+        expected_values_inverse_february = [
+            # Account                      Debit     Credit
+            [self.expense_accounts[0],       750,         0],
+            [self.deferral_account,            0,       750],
+        ]
+        self.assert_invoice_lines(deferred_inverse_february, expected_values_inverse_february)
+
+        # MARCH
+        generated_entries_march = self.generate_deferral_entries(self.get_options('2023-03-01', '2023-03-31'))
+
+        # March Deferral
+        deferred_move_march = generated_entries_march[0]
+        self.assertRecordValues(deferred_move_march, [{
+            'move_type': 'entry',
+            'date': fields.Date.to_date('2023-03-31'),
+        }])
+        expected_values_march = [
+            # Account                      Debit     Credit
+            [self.expense_accounts[0],         0,       750],
+            [self.expense_accounts[0],       500,         0],
+            [self.deferral_account,          250,         0],
+        ]
+        self.assert_invoice_lines(deferred_move_march, expected_values_march)
+
+        # March Reversal
+        deferred_inverse_march = generated_entries_march[1]
+        self.assertRecordValues(deferred_inverse_march, [{
+            'move_type': 'entry',
+            'date': fields.Date.to_date('2023-04-01'),
+        }])
+        expected_values_inverse_march = [
+            # Account                      Debit     Credit
+            [self.expense_accounts[0],       750,         0],
+            [self.expense_accounts[0],         0,       500],
+            [self.deferral_account,            0,       250],
+        ]
+        self.assert_invoice_lines(deferred_inverse_march, expected_values_inverse_march)
+
+        # APRIL
+        with self.assertRaisesRegex(UserError, 'No entry to generate.'):
+            # No entry should be generated, since everything has been deferred.
+            self.generate_deferral_entries(self.get_options('2023-04-01', '2023-04-30'))
+
+    def test_deferred_revenue_generate_grouped_without_taxes(self):
+        """
+        Test the default taxes on accounts are ignored when generating a grouped deferral entry.
+        """
+        self.company.generate_deferred_revenue_entries_method = 'manual'
+        deferral_account = self.company_data['default_account_deferred_revenue']
+        revenue_account_with_taxes = self.env['account.account'].create({
+            'name': 'Revenue with Taxes',
+            'code': 'REVWTAXES',
+            'account_type': 'income',
+            'tax_ids': [Command.set(self.tax_sale_a.ids)]
+        })
+        options = self.get_options('2023-01-01', '2023-01-31', self.deferred_revenue_report)
+        revenue_handler = self.env['account.deferred.revenue.report.handler']
+
+        self.create_invoice([[revenue_account_with_taxes, 1000, '2023-01-01', '2023-04-30']], move_type='out_invoice')
+
+        # Check that no deferred move has been created
+        self.assertEqual(self.env['account.move.line'].search_count([('account_id', '=', deferral_account.id)]), 0)
+
+        # Generate the grouped deferred entries
+        generated_entries_january = self.generate_deferral_entries(options, revenue_handler)
+
+        deferred_move_january = generated_entries_january[0]
+        self.assertRecordValues(deferred_move_january, [{
+            'state': 'posted',
+            'move_type': 'entry',
+            'date': fields.Date.to_date('2023-01-31'),
+        }])
+        expected_values_january = [
+            # Account                         Debit       Credit
+            [revenue_account_with_taxes,       1000,           0],
+            [revenue_account_with_taxes,          0,         250],
+            [deferral_account,                    0,         750],
+        ]
+        self.assert_invoice_lines(deferred_move_january, expected_values_january)
+        # There are no extra (tax) lines besides the three lines we checked before
+        self.assertFalse(deferred_move_january.line_ids.tax_line_id)
+
+    def test_deferred_values_rounding(self):
+        """
+        When using the manually & grouped method, we might have some rounding issues
+        when aggregating multiple deferred entries. This test ensures that the rounding
+        is done correctly.
+        """
+        self.company.generate_deferred_expense_entries_method = 'manual'
+        self.company.deferred_expense_amount_computation_method = 'day'
+        self.create_invoice([[self.expense_accounts[0], 600, '2023-04-04', '2023-05-25']])
+        self.create_invoice([[self.expense_accounts[1], 600, '2023-04-05', '2023-05-16']])
+        self.create_invoice([[self.expense_accounts[0], 600, '2023-04-04', '2023-05-08']])
+
+        # This shouldn't raise an error like this 'The total of debits equals $1,800.01 and the total of credits equals $1,800.00.'
+        self.generate_deferral_entries(self.get_options('2023-04-01', '2023-04-30'))
+
+    def test_deferred_single_rounding(self):
+        """
+        When using the manually & grouped method, we might have some rounding issues
+        due to rounding in different places. This test ensures that the a balance line is created
+        automatically for the difference.
+        """
+        self.company.generate_deferred_expense_entries_method = 'manual'
+        self.company.deferred_expense_amount_computation_method = 'month'
+        self.create_invoice([[self.expense_accounts[0], 4.95, '2023-01-01', '2023-10-31']])
+
+        # This shouldn't raise an error like this 'The total of debits equals $4.96 and the total of credits equals $4.95.'
+        generated_entries = self.generate_deferral_entries(self.get_options('2023-01-01', '2023-01-31'))
+
+        deferral_move = generated_entries[0]
+        expected_values = [
+            # Account                         Debit       Credit
+            [self.expense_accounts[0],           0,         4.95],
+            [self.expense_accounts[0],        0.50,            0],
+            [self.deferral_account,           4.46,            0],
+            [self.deferral_account,              0,         0.01],
+        ]
+        # The balance line was added for the rounding error
+        self.assert_invoice_lines(deferral_move, expected_values)
+
+    def test_deferred_fully_inside_report_period(self):
+        """
+        If the invoice is fully inside the report period, nothing should be generated.
+        """
+        self.company.generate_deferred_expense_entries_method = 'manual'
+        self.company.deferred_expense_amount_computation_method = 'month'
+
+        # The report should be empty because the invoice date, and the deferred dates are all in inside the report period
+        # Nothing should be reversed, displayed or generated because the invoice is already in the correct period
+        move1 = self.create_invoice([[self.expense_accounts[0], 600, '2023-01-15', '2023-01-30']], invoice_date='2023-01-15')
+        options_january = self.get_options('2023-01-01', '2023-01-31')
+        lines = self.get_lines(options_january)
+        self.assertLinesValues(
+            lines,
+            #   Name              Total      Before    Current     Later
+            [   0,                  1,          2,        3,        4     ],
+            [],
+            options_january,
+        )
+        with self.assertRaisesRegex(UserError, 'No entry to generate.'):
+            self.generate_deferral_entries(options_january)
+
+        move1.button_cancel()
+
+        # The report should be NOT empty because the invoice date is prior the report date (even if
+        # the deferred dates are all in inside the report period) because we need to be able to
+        # reverse the invoice in january and account for it in the correct period (in february here).
+        self.create_invoice([[self.expense_accounts[0], 1000, '2023-02-10', '2023-02-28']], invoice_date='2023-01-01')
+
+        # In january, the invoice exists, and the 'To defer' (Later) column should not be empty
+        lines = self.get_lines(options_january)
+        self.assertLinesValues(
+            lines,
+            #    Name                Total   Not Started   Before   Current   Later
+            [    0,                  1,      2,            3,       4,        5     ],
+            [
+                ('EXP0 Expense 0',   1000,   1000,         0,       0,        1000  ),
+                ('Total',            1000,   1000,         0,       0,        1000  ),
+            ],
+            options_january,
+        )
+
+        # The invoice should be reversed in january so that it can be accounted for in february
+        generated_entries = self.generate_deferral_entries(options_january)
+
+        deferral_move_january = generated_entries[0]
+        self.assertEqual(deferral_move_january.date, fields.Date.to_date('2023-01-31'))
+        expected_values_january = [
+            # Account                         Debit       Credit
+            [self.expense_accounts[0],          0,        1000],
+            [self.deferral_account,          1000,           0],
+        ]
+        self.assert_invoice_lines(deferral_move_january, expected_values_january)
+
+        # In february, the invoice exists, and is being accounted for (Current column)
+        options_february = self.get_options('2023-02-01', '2023-02-28')
+        lines = self.get_lines(options_february)
+        self.assertLinesValues(
+            lines,
+            #    Name                Total   Not Started   Before   Current   Later
+            [    0,                  1,      2,            3,       4,        5     ],
+            [
+                ('EXP0 Expense 0',   1000,   0,            0,       1000,     0     ),
+                ('Total',            1000,   0,            0,       1000,     0     ),
+            ],
+            options_february,
+        )
+
+        # The invoice is now accounted for in february, so nothing should be generated
+        with self.assertRaisesRegex(UserError, 'No entry to generate.'):
+            self.generate_deferral_entries(options_february)
+
+    def test_deferred_same_date(self):
+        """
+        A bug has been found where having an invoice with a start and end date on the last day
+        of the month would cause a division by zero error. This test ensures that this bug is fixed.
+        Here, the deferred dates are not inside the report period.
+        """
+        self.company.generate_deferred_expense_entries_method = 'manual'
+        self.company.deferred_expense_amount_computation_method = 'month'
+        self.create_invoice([[self.expense_accounts[0], 1000, '2023-10-30', '2023-10-30']])
+
+        options_sept = self.get_options('2023-09-01', '2023-09-30')
+        lines = self.get_lines(options_sept)
+        self.assertLinesValues(
+            lines,
+            #    Name                Total   Not Started   Before   Current   Later
+            [    0,                  1,      2,            3,       4,        5     ],
+            [
+                ('EXP0 Expense 0',   1000,   1000,         0,       0,        1000  ),
+                ('Total',            1000,   1000,         0,       0,        1000  ),
+            ],
+            options_sept,
+        )
+
+        generated_entries = self.generate_deferral_entries(options_sept)
+
+        deferral_move = generated_entries[0]
+        self.assertEqual(deferral_move.date, fields.Date.to_date('2023-09-30'))
+        expected_values = [
+            # Account                         Debit       Credit
+            [self.expense_accounts[0],          0,        1000],
+            [self.deferral_account,          1000,           0],
+        ]
+        self.assert_invoice_lines(deferral_move, expected_values)
+
+    def test_deferred_expense_change_grouped_entries_method(self):
+        """
+        Test the change of the deferred expense method from on_validation to manual
+        """
+        self.company.generate_deferred_expense_entries_method = 'on_validation'
+
+        self.create_invoice([self.expense_lines[0]])
+        self.assertEqual(self.env['account.move.line'].search_count([('account_id', '=', self.deferral_account.id)]), 5)  # 4 months + 1 for the initial deferred invoice
+
+        # When changing the method to manual, the deferred entries should not be re-generated
+        self.company.generate_deferred_expense_entries_method = 'manual'
+        with self.assertRaisesRegex(UserError, 'No entry to generate.'):
+            self.generate_deferral_entries(self.get_options('2023-02-01', '2023-02-28'))
+
+    def test_deferred_expense_manual_generation_totally_deferred(self):
+        """
+        In manual mode generation, if the lines are totally deferred,
+        then no entry should be generated.
+        """
+        self.company.generate_deferred_expense_entries_method = 'manual'
+
+        self.create_invoice([[self.expense_accounts[0], 1000, '2023-01-01', '2023-04-30']])
+        self.generate_deferral_entries(self.get_options('2023-03-01', '2023-03-31'))
+        self.assertEqual(self.env['account.move.line'].search_count([('account_id', '=', self.deferral_account.id)]), 2)
+
+        with self.assertRaisesRegex(UserError, 'No entry to generate.'):
+            self.generate_deferral_entries(self.get_options('2023-04-01', '2023-04-30'))
+
+        move2 = self.create_invoice([[self.expense_accounts[1], 1000, '2023-01-01', '2023-05-31']])
+        generated_entry = self.generate_deferral_entries(self.get_options('2023-04-01', '2023-04-30'))[0]
+        self.assertEqual(len(generated_entry.line_ids), 3)  # 3 lines, not 6 because move1 is totally deferred
+        self.assertEqual(generated_entry.deferred_original_move_ids, move2)  # not move1
+
+    def test_deferred_expense_manual_generation_only_posted(self):
+        """
+        In manual mode generation, even if the filter shows draft moves,
+        then no entry should be generated for draft moves.
+        """
+        self.company.generate_deferred_expense_entries_method = 'manual'
+
+        self.create_invoice([self.expense_lines[0]], post=False)
+        options = self.get_options('2023-01-01', '2023-01-31')
+        options['all_entries'] = True
+        with self.assertRaisesRegex(UserError, 'No entry to generate.'):
+            self.generate_deferral_entries(options)
+
+    def test_deferred_expense_manual_generation_after_on_validation(self):
+        """
+        In manual mode, you should still be able to generate an deferral entry for a period
+        when there already exists a deferral entry from a former on_validation mode on the same date,
+        and that entry should not defer the already deferred amount from the automatic entry in that
+        same period.
+        """
+        # First post an invoice with the on_validation method, creating deferrals
+        move = self.create_invoice([self.expense_lines[0]])
+        # Check that the deferral moves have been created (1 + 4)
+        self.assertEqual(len(move.deferred_move_ids), 5)
+
+        # Switch to manual mode
+        self.company.generate_deferred_expense_entries_method = 'manual'
+        self.create_invoice([self.expense_lines[0]])
+
+        options = self.get_options('2023-01-01', '2023-01-31')
+        generated_entries_jan = self.generate_deferral_entries(options)
+
+        deferred_move_jan = generated_entries_jan[0]
+        self.assertRecordValues(deferred_move_jan, [{
+            'move_type': 'entry',
+            'date': fields.Date.to_date('2023-01-31'),
+        }])
+        expected_values_jan = [
+            # Account                      Debit     Credit
+            [self.expense_accounts[0],         0,      1000],
+            [self.expense_accounts[0],       250,         0],
+            [self.deferral_account,          750,         0],
+        ]
+        self.assert_invoice_lines(deferred_move_jan, expected_values_jan)
+
+        # Reversal
+        deferred_inverse_jan = generated_entries_jan[1]
+        self.assertRecordValues(deferred_inverse_jan, [{
+            'move_type': 'entry',
+            'date': fields.Date.to_date('2023-02-01'),
+        }])
+        expected_values_inverse_jan = [
+            # Account                      Debit     Credit
+            [self.expense_accounts[0],      1000,         0],
+            [self.expense_accounts[0],         0,       250],
+            [self.deferral_account,            0,       750],
+        ]
+        self.assert_invoice_lines(deferred_inverse_jan, expected_values_inverse_jan)
+
+    def test_deferred_expense_manual_generation_old_moves(self):
+        """Test that old moves are not taken into account when generating deferred entries."""
+        self.company.generate_deferred_expense_entries_method = 'manual'
+        self.company.deferred_expense_amount_computation_method = 'month'
+
+        self.create_invoice([(self.expense_accounts[0], 1200, '2022-01-01', '2022-12-31')])
+        self.create_invoice([(self.expense_accounts[0], 1200, '2023-01-01', '2023-12-31')])
+
+        options = self.get_options('2023-03-01', '2023-03-31')
+        lines = self.get_lines(options)
+        self.assertLinesValues(
+            lines,
+            #    Name                Total   Not Started   Before   Current   Later
+            [    0,                  1,      2,            3,       4,        5     ],
+            [
+                ('EXP0 Expense 0',   1200,   0,            200,     100,      900   ),
+                ('Total',            1200,   0,            200,     100,      900   ),
+            ],
+            options,
+        )
+
+        expected_values = (
+            #        Account           Debit    Credit
+            (self.expense_accounts[0],     0,    1200),
+            (self.expense_accounts[0],   300,       0),
+            (self.deferral_account,      900,       0),
+        )
+        deferral = self.generate_deferral_entries(options)[0]
+        self.assert_invoice_lines(deferral, expected_values)
+
+    def test_deferred_expense_manual_generation_deprecated_account(self):
+        """Test that deferred on deprecated accounts are still visible in the report, but cannot be generated."""
+        self.company.generate_deferred_expense_entries_method = 'manual'
+        self.company.deferred_expense_amount_computation_method = 'month'
+
+        self.create_invoice([self.expense_lines[0]])
+        self.expense_accounts[0].deprecated = True
+
+        options = self.get_options('2023-03-01', '2023-03-31')
+        lines = self.get_lines(options)
+        self.assertLinesValues(
+            lines,
+            #    Name                Total   Not Started   Before   Current   Later
+            [    0,                  1,      2,            3,       4,        5     ],
+            [
+                ('EXP0 Expense 0',   1000,   0,            500,     250,      250   ),
+                ('Total',            1000,   0,            500,     250,      250   ),
+            ],
+            options,
+        )
+
+        # Shouldn't raise
+        #    'The account ... is deprecated.'
+        # or 'A line of this move is using a deprecated account, you cannot post it.'
+        entries = self.generate_deferral_entries(options)
+        expected_values = [
+            # Account                      Debit     Credit
+            [self.expense_accounts[0],         0,      1000],
+            [self.expense_accounts[0],       750,         0],
+            [self.deferral_account,          250,         0],
+        ]
+        self.assert_invoice_lines(entries[0], expected_values)
+
+    def test_deferred_expense_manual_generation_go_backwards_in_time(self):
+        """
+        In manual mode generation, if we generate the deferral entries for
+        a given month, we should still be able to generate the entries for
+        the months prior to this one.
+        """
+        self.company.deferred_expense_amount_computation_method = 'month'
+        self.company.generate_deferred_expense_entries_method = 'manual'
+
+        # No entries yet for August
+        options_august = self.get_options('2023-08-01', '2023-08-31')
+        with self.assertRaisesRegex(UserError, 'No entry to generate.'):
+            self.generate_deferral_entries(options_august)
+
+        self.create_invoice([[self.expense_accounts[0], 600, '2023-07-01', '2023-09-30']])
+
+        # Check that no deferred move has been created yet
+        self.assertEqual(self.env['account.move.line'].search_count([('account_id', '=', self.deferral_account.id)]), 0)
+
+        # Generate the grouped deferred entries for August (before doing it for July)
+        generated_entries_august = self.generate_deferral_entries(options_august)
+        deferred_move_august = generated_entries_august[0]
+        expected_values_august = (
+            #        Account           Debit    Credit
+            (self.expense_accounts[0],     0,    600),
+            (self.expense_accounts[0],   400,      0),
+            (self.deferral_account,      200,      0),
+        )
+        self.assert_invoice_lines(deferred_move_august, expected_values_august)
+
+        # Don't re-generate entries for the same period if they already exist for all move lines
+        with self.assertRaisesRegex(UserError, 'No entry to generate.'):
+            self.generate_deferral_entries(options_august)
+
+        # Generate the grouped deferred entries for July
+        options_july = self.get_options('2023-07-01', '2023-07-31')
+        generated_entries_july = self.generate_deferral_entries(options_july)
+        self.assertRecordValues(generated_entries_july, [{
+            'state': 'posted',
+            'move_type': 'entry',
+            'date': fields.Date.to_date('2023-07-31'),
+        }, {
+            'state': 'posted',
+            'move_type': 'entry',
+            'date': fields.Date.to_date('2023-08-01'),
+        }])
+        deferred_move_july, reversed_deferred_move_july = generated_entries_july
+        expected_values_july = (
+            #        Account           Debit    Credit
+            (self.expense_accounts[0],     0,    600),
+            (self.expense_accounts[0],   200,      0),
+            (self.deferral_account,      400,      0),
+        )
+        expected_values_july_reversed = (
+            #        Account           Debit    Credit
+            (self.expense_accounts[0],   600,      0),
+            (self.expense_accounts[0],     0,    200),
+            (self.deferral_account,        0,    400),
+        )
+        self.assert_invoice_lines(deferred_move_july, expected_values_july)
+        self.assert_invoice_lines(reversed_deferred_move_july, expected_values_july_reversed)
+
+        # Don't re-generate entries for the same period if they already exist for all move lines
+        with self.assertRaisesRegex(UserError, 'No entry to generate.'):
+            self.generate_deferral_entries(options_july)
+
+    def test_deferred_expense_manual_generation_single_period(self):
+        """
+        If we have an invoice covering only one period, we should only avoid creating deferral entries when the invoice
+        date is the same as the period for the deferral. Otherwise we should still generate a deferral entry.
+        """
+        self.company.deferred_expense_amount_computation_method = 'month'
+        self.company.generate_deferred_expense_entries_method = 'manual'
+
+        self.create_invoice([[self.expense_accounts[0], 1000, '2023-02-01', '2023-02-28']])
+
+        self.generate_deferral_entries(self.get_options('2023-01-01', '2023-01-31'))
+        self.assertEqual(self.env['account.move.line'].search_count([('account_id', '=', self.deferral_account.id)]), 2)
+
+    def test_deferred_expense_generation_lock_date(self):
+        """
+        Test that we cannot generate entries for a period that is locked.
+        """
+        self.company.deferred_expense_amount_computation_method = 'month'
+        self.company.generate_deferred_expense_entries_method = 'manual'
+
+        move = self.create_invoice([[self.expense_accounts[0], 1000, '2023-01-01', '2023-04-30']])
+
+        move.company_id.fiscalyear_lock_date = fields.Date.to_date('2023-02-28')
+
+        with self.assertRaisesRegex(UserError, 'You cannot generate entries for a period that is locked.'):
+            self.generate_deferral_entries(self.get_options('2023-01-01', '2023-01-31'))
+
+    def test_deferred_expense_manual_generation_reset_to_draft(self):
+        """Test that the deferred entries cannot be deleted in the manual mode"""
+
+        # On validation, we can reset to draft
+        self.company.deferred_expense_amount_computation_method = 'month'
+        move = self.create_invoice([(self.expense_accounts[0], 1680, '2023-01-21', '2023-04-14')])
+        self.assertEqual(len(move.deferred_move_ids), 5)
+        move.button_draft()
+        self.assertFalse(move.deferred_move_ids)
+        move.action_post()  # Repost
+
+        # Let's switch to manual mode
+        self.company.generate_deferred_expense_entries_method = 'manual'
+
+        # We should still be able to reset to draft a move that was created with the on_validation mode
+        move.button_draft()
+        self.assertFalse(move.deferred_move_ids)
+
+        # If the grouped deferral entry is the aggregation of only one invoice, we can reset the invoice to draft
+        move3 = self.create_invoice([(self.expense_accounts[0], 1680, '2023-03-21', '2023-06-14')])
+        self.generate_deferral_entries(self.get_options('2023-03-01', '2023-03-31'))
+        move3.button_draft()
+        self.assertFalse(move.deferred_move_ids)
+
+        # If the grouped deferral entry is the aggregation of more than one invoice, we cannot reset to draft any of those to draft
+        move4 = self.create_invoice([(self.expense_accounts[0], 1680, '2023-03-21', '2023-06-14')])
+        move5 = self.create_invoice([(self.expense_accounts[0], 1680, '2023-03-21', '2023-06-14')])
+        self.generate_deferral_entries(self.get_options('2023-03-01', '2023-03-31'))
+        with self.assertRaisesRegex(UserError, 'You cannot reset to draft an invoice that is grouped in deferral entry. You can create a credit note instead.'):
+            move4.button_draft()
+        with self.assertRaisesRegex(UserError, 'You cannot reset to draft an invoice that is grouped in deferral entry. You can create a credit note instead.'):
+            move5.button_draft()
+
+    def test_deferred_expense_on_validation_generation_analytic_distribution(self):
+        """Test that the analytic distribution of the invoice is transferred the deferred entries generated on validation."""
+
+        analytic_plan_a = self.env['account.analytic.plan'].create({
+            'name': 'Plan A',
+        })
+        aa_a1 = self.env['account.analytic.account'].create({
+            'name': 'Account A1',
+            'plan_id': analytic_plan_a.id
+        })
+        aa_a2 = self.env['account.analytic.account'].create({
+            'name': 'Account A2',
+            'plan_id': analytic_plan_a.id
+        })
+        move = self.create_invoice([self.expense_lines[0]], post=False)
+        move.write({'invoice_line_ids': [
+            Command.update(move.invoice_line_ids.id, {'analytic_distribution': {str(aa_a1.id): 60.0, str(aa_a2.id): 40.0}}),
+        ]})
+        self.env['account.move.line'].flush_model()
+        move.action_post()
+        expected_analytic_distribution = {str(aa_a1.id): 60.0, str(aa_a2.id): 40.0}
+        for line in move.deferred_move_ids.line_ids:
+            self.assertEqual(line.analytic_distribution, expected_analytic_distribution)
+
+    def test_deferred_expense_manual_generation_analytic_distribution(self):
+        """
+        When using the manually & grouped method, the analytic distribution of the deferred entries
+        should be computed according to the proportion between the deferred amount of each account
+        and the total deferred amount.
+        """
+        self.company.generate_deferred_expense_entries_method = 'manual'
+
+        analytic_plan_a = self.env['account.analytic.plan'].create({
+            'name': 'Plan A',
+        })
+        analytic_plan_b = self.env['account.analytic.plan'].create({
+            'name': 'Plan B',
+        })
+        aa_a1 = self.env['account.analytic.account'].create({
+            'name': 'Account A1',
+            'plan_id': analytic_plan_a.id
+        })
+        aa_a2 = self.env['account.analytic.account'].create({
+            'name': 'Account A2',
+            'plan_id': analytic_plan_a.id
+        })
+        aa_a3 = self.env['account.analytic.account'].create({
+            'name': 'Account A3',
+            'plan_id': analytic_plan_a.id
+        })
+        aa_b1 = self.env['account.analytic.account'].create({
+            'name': 'Account B1',
+            'plan_id': analytic_plan_b.id
+        })
+        aa_b2 = self.env['account.analytic.account'].create({
+            'name': 'Account B2',
+            'plan_id': analytic_plan_b.id
+        })
+        # Test the account move lines with the following analytic distribution:
+        #
+        #    # |  Expense Account |   Amount   |        Analytic Distribution
+        #    ------------------------------------------------------------------------
+        #    1 |    Expense 0     |    1200    | {A1: 60%, A2: 40%, B1: 50%, B2: 50%}
+        #    2 |    Expense 0     |    2400    | {A1: 100%}
+        #    3 |    Expense 1     |    1200    | {A1: 50%, A3: 50%}
+        #    4 |    Expense 1     |    1200    | NULL
+
+        invoice_lines = [
+            [self.expense_accounts[0], 1200, '2023-01-01', '2023-12-31'],
+            [self.expense_accounts[0], 2400, '2023-01-01', '2023-12-31'],
+            [self.expense_accounts[1], 1200, '2023-01-01', '2023-12-31'],
+            [self.expense_accounts[1], 1200, '2023-01-01', '2023-12-31'],
+        ]
+        move = self.create_invoice(invoice_lines, post=False)
+        move.write({'invoice_line_ids': [
+            Command.update(move.invoice_line_ids[0].id,
+                {'analytic_distribution': {str(aa_a1.id): 60.0, str(aa_a2.id): 40.0, str(aa_b1.id): 50.0, str(aa_b2.id): 50.0}}
+            ),
+            Command.update(move.invoice_line_ids[1].id,{'analytic_distribution': {str(aa_a1.id): 100.0}}),
+            Command.update(move.invoice_line_ids[2].id, {'analytic_distribution': {str(aa_a1.id): 50.0, str(aa_a3.id): 50.0}}),
+        ]})
+        self.env['account.move.line'].flush_model()
+        move.action_post()
+
+        # Generate the grouped deferred entries
+        generated_entries = self.generate_deferral_entries(self.get_options('2023-01-01', '2023-08-31'))
+
+        # Details of the computation:
+        #    Total Amount (Deferral Account): 1200 + 2400 + 1200 + 1200 = 6000
+        #    Amount for Expense 0: 1200 + 2400 = 3600
+        #    Amount for Expense 1: 1200 + 1200 = 2400
+        #    ___________________________________________________________________________________________________________________
+        #      |        |                    |                   |  Distribution by expense (*)   |  Deferral distribution (**)
+        #    # | Amount |   Expense ratio    |    Total ratio    | (distribution / expense ratio) | (distribution / total ratio)
+        #    -------------------------------------------------------------------------------------------------------------------
+        #    1 |  1200  | 1200 / 3600 = 0.33 | 1200 / 6000 = 0.2 | A1 = 60% * 0.33 = 20%          | A1 = 60% * 0.2 = 12%
+        #      |        | (0.33333333333...) |                   | A2 = 40% * 0.33 = 13.33%       | A2 = 40% * 0.2 = 8%
+        #      |        |                    |                   | B1, B2 = 50% * 0.33 = 16.67%   | B1, B2 = 50% * 0.2 = 10%
+        #    -------------------------------------------------------------------------------------------------------------------
+        #    2 |  1200  | 2400 / 3600 = 0.67 | 2400 / 6000 = 0.4 | A1 = 100% * 0.67 = 66.67%      | A1 = 100% * 0.4 = 40%
+        #    -------------------------------------------------------------------------------------------------------------------
+        #    3 |  1200  | 1200 / 2400 = 0.5  | 1200 / 6000 = 0.2 | A1, A3 = 50% * 0.5 = 25%       | A1, A3 = 50% * 0.2 = 10%
+        #    -------------------------------------------------------------------------------------------------------------------
+        #    4 |  1200  | 1200 / 2400 = 0.5  | 1200 / 6000 = 0.2 |              NULL              |             NULL
+        #
+        # The analytic distribution of the deferred entries should be:
+        # - Expense 0: {A1: 86.67%, A2: 13.33%, B1: 16.67%, B2: 16.67%}    [Sum of column (*) of line #1 and #2]
+        # - Expense 1: {A1: 25%, A3: 25%}                                  [Sum of column (*) of line #3 and #4]
+        # - Deferral Account: {A1: 62%, A2: 8%, B1: 10%, B2: 10%, A3: 10%} [Sum of column (**) of all 4 lines]
+        #
+        # The 2 generated entries should be the "Grouped Deferral Entry of Aug 2023" and its reversal.
+        #
+        #    "Grouped Deferral Entry of Aug 2023":
+        #
+        #         Account     |              Analytic Distribution               | Debit | Credit
+        #    -------------------------------------------------------------------------------------
+        #       Expense 0     | {A1: 86.67%, A2: 13.33%, B1: 16.67%, B2: 16.67%} | 3600  |   0
+        #       Expense 0     | {A1: 86.67%, A2: 13.33%, B1: 16.67%, B2: 16.67%} |   0   |  2400
+        #       Expense 1     | {A1: 25%, A3: 25%}                               | 2400  |   0
+        #       Expense 1     | {A1: 25%, A3: 25%}                               |   0   |  1600
+        #    Deferral Account | {A1: 62%, A2: 8%, B1: 10%, B2: 10%, A3: 10%}     |   0   |  2000
+        #    -------------------------------------------------------------------------------------
+        #                                                                        | 6000  |  6000
+        expected_analytic_distribution = {
+            self.expense_accounts[0].id: {str(aa_a1.id): 86.67, str(aa_a2.id): 13.33, str(aa_b1.id): 16.67, str(aa_b2.id): 16.67},
+            self.expense_accounts[1].id: {str(aa_a1.id): 25.0, str(aa_a3.id): 25.0},
+            self.deferral_account.id: {str(aa_a1.id): 62.0, str(aa_a2.id): 8.0, str(aa_b1.id): 10.0, str(aa_b2.id): 10.0, str(aa_a3.id): 10.0},
+        }
+        expected_analytic_amount = [{
+            aa_a1.id: (3120.12,     0.00),   # 3600 * 86.67%
+            aa_a2.id: ( 479.88,     0.00),   # 3600 * 13.33%
+            aa_b1.id: (   0.00,   600.12),   # 3600 * 16.67%
+            aa_b2.id: (   0.00,   600.12),   # 3600 * 16.67%
+        }, {
+            aa_a1.id: (-2080.08,    0.00),   # -2400 * 86.67%
+            aa_a2.id: ( -319.92,    0.00),   # -2400 * 13.33%
+            aa_b1.id: (    0.00, -400.08),   # -2400 * 16.67%
+            aa_b2.id: (    0.00, -400.08),   # -2400 * 16.67%
+        },{
+            aa_a1.id: (  600.00,    0.00),   # 2400 * 25%
+            aa_a3.id: (  600.00,    0.00),   # 2400 * 25%
+        },{
+            aa_a1.id: ( -400.00,    0.00),   # -1600 * 25%
+            aa_a3.id: ( -400.00,    0.00),   # -1600 * 25%
+        }, {
+            aa_a1.id: (-1240.00,    0.00),   # -2000 * 62%
+            aa_a2.id: ( -160.00,    0.00),   # -2000 * 8%
+            aa_a3.id: ( -200.00,    0.00),   # -2000 * 10%
+            aa_b1.id: (    0.00, -200.00),   # -2000 * 10%
+            aa_b2.id: (    0.00, -200.00),   # -2000 * 10%
+        }]
+        # testing the amount of the analytic lines for the "Grouped Deferral Entry of Aug 2023"
+        for index, line in enumerate(generated_entries[0].line_ids):
+            self.assertEqual(line.analytic_distribution, expected_analytic_distribution[line.account_id.id])
+            for al in line.analytic_line_ids:
+                fname_a = analytic_plan_a._column_name()
+                fname_b = analytic_plan_b._column_name()
+                fname, idx = (fname_a, 0) if al[fname_a] else (fname_b, 1)
+                self.assertAlmostEqual(al.amount, expected_analytic_amount[index][al[fname].id][idx])
+        # testing the amount of the analytic lines for the "Reversal of Grouped Deferral Entry of Aug 2023"
+        # the values should be the opposite of the "Grouped Deferral Entry of Aug 2023"
+        for index, line in enumerate(generated_entries[1].line_ids):
+            self.assertEqual(line.analytic_distribution, expected_analytic_distribution[line.account_id.id])
+            for al in line.analytic_line_ids:
+                fname_a = analytic_plan_a._column_name()
+                fname_b = analytic_plan_b._column_name()
+                fname, idx = (fname_a, 0) if al[fname_a] else (fname_b, 1)
+                self.assertAlmostEqual(al.amount, -expected_analytic_amount[index][al[fname].id][idx])
+
+    def test_deferred_revenue_manual_generation_analytic_distribution(self):
+        """
+        Test if deferred revenues have the right analytic distribution when manually generated.
+        """
+        self.company.generate_deferred_expense_entries_method = 'manual'
+        move = self.create_invoice(self.revenue_lines)
+        analytic_plan = self.env['account.analytic.plan'].create({'name': 'Plan'})
+        analytic_account = self.env['account.analytic.account'].create({
+            'name': 'Account',
+            'plan_id': analytic_plan.id,
+        })
+        move.invoice_line_ids[0]['analytic_distribution'] = {analytic_account.id: 100}
+        options = self.get_options('2023-02-01', '2023-02-28', report=self.deferred_revenue_report)
+        options['analytic_accounts'] = [analytic_account.id]
+        revenue_handler = self.env['account.deferred.revenue.report.handler']
+        deferral_move = self.generate_deferral_entries(options, report_handler=revenue_handler)[0]
+        analytic_distributions = deferral_move.line_ids.mapped('analytic_distribution')
+        expected_distributions = [{str(analytic_account.id): 100}] * 3
+        self.assertEqual(analytic_distributions, expected_distributions)
+
+    def test_deferred_expense_report_invalid_period(self):
+        """
+        Only periods that start on the first day of a month and end on the last day of a month are allowed.
+        """
+        self.company.generate_deferred_expense_entries_method = 'manual'
+        self.create_invoice([self.expense_lines[0]])
+
+        options = self.get_options('2023-03-01', '2023-03-15')
+        lines = self.get_lines(options)
+        self.assertLinesValues(
+            lines,
+            #    Name                Total   Not Started   Before   Current   Later
+            [    0,                  1,      2,            3,       4,        5     ],
+            [
+                ('EXP0 Expense 0',   1000,   0,            500,     125,      375   ),
+                ('Total',            1000,   0,            500,     125,      375   ),
+            ],
+            options,
+        )
+
+        with self.assertRaisesRegex(UserError, 'You cannot generate entries for a period that does not end at the end of the month.'):
+            self.generate_deferral_entries(options)
+
+    def audit_cell(self, options, line, column_name):
+        audit_cell_res = self.handler.action_audit_cell(options, {
+            'report_line_id': line['id'],
+            'calling_line_dict_id': line['id'],
+            'expression_label': column_name,
+            'column_group_key': next(iter(options['column_groups'])),
+        })
+        __, account_id = self.deferred_expense_report._get_model_info_from_id(line['id'])
+        return self.env['account.move.line']\
+                   .search(audit_cell_res['domain'])\
+                   .filtered(lambda l: l.account_id.id == account_id)\
+                   .sorted(lambda l: (l.date, not l.deferred_start_date, l.id))  # Order by date then Original lines first (False comes before True, so we negate it)
+
+    def get_audited_line_to_assert(self, date, balance):
+        return {'date': fields.Date.to_date(date), 'balance': balance}
+
+    def test_deferred_expense_report_audit_cell_on_validation_mode(self):
+        """
+        Test that the audit correctly works (when clicking on a cell) in the on_validation mode
+        Amounts should always correspond between the report and the list view of the audited cell
+        """
+        self.company.generate_deferred_expense_entries_method = 'on_validation'
+
+        inv1 = self.create_invoice([[self.expense_accounts[0],  1000, '2023-01-01', '2023-04-30']])  # Basic example, 4 full months, in period
+        inv2 = self.create_invoice([[self.expense_accounts[0],   100, '2023-04-01', '2023-05-31']])  # 2 full months, Not Started yet
+        inv3 = self.create_invoice([
+            [self.expense_accounts[0],  10, '2023-01-01', '2023-02-28'],  # 2 full months, fully deferred so shouldn't appear at all
+            [self.expense_accounts[0],   1, '2023-01-01', '2023-05-31'],  # 5 full months
+        ])
+        inv4 = self.create_invoice([
+            [self.expense_accounts[0], 10000, '2023-03-01', '2023-04-30'],  # 2 full months
+            [self.expense_accounts[0],  1998, '2023-03-01', '2023-03-31'],  # fully inside period -> nothing to defer/show/audit
+        ], invoice_date='2023-03-01')
+        options = self.get_options('2023-03-01', '2023-03-31')
+        lines = self.get_lines(options)
+
+        # Total column
+        audit_lines = self.audit_cell(options, lines[0], 'total')
+        self.assertEqual(audit_lines, inv1.invoice_line_ids + inv2.invoice_line_ids + inv3.invoice_line_ids.sorted('id')[1] + inv4.invoice_line_ids.sorted('id')[0])
+
+        # Not Started column
+        audit_lines = self.audit_cell(options, lines[0], 'not_started')
+        self.assertEqual(audit_lines, inv2.invoice_line_ids)
+
+        # Before March 2023
+        audit_lines = self.audit_cell(options, lines[0], 'before').sorted('id')
+        self.assertRecordValues(audit_lines, [
+        # INV 1
+            self.get_audited_line_to_assert('2023-01-01',  1000),    # Original line
+            self.get_audited_line_to_assert('2023-01-01', -1000),    # Cancel out original line
+            self.get_audited_line_to_assert('2023-01-31',   250),    # Jan 23
+            self.get_audited_line_to_assert('2023-02-28',   250),    # Feb 23
+
+        # INV 2: although not started, the original and cancel out should still appear in the "before" column
+            self.get_audited_line_to_assert('2023-01-01',   100),    # Original line
+            self.get_audited_line_to_assert('2023-01-01',  -100),    # Cancel out original line
+
+        # INV 3, lines are ordred by id, so first the original lines, then the generated lines
+        #   self.get_audited_line_to_assert('2023-01-01',    10),   # Original line 1: shouldn't appear because the original line is fully in the past in March
+            self.get_audited_line_to_assert('2023-01-01',     1),   # Original line 2
+        # However the reversal of line 1 should appear so that it can cancel out with the deferrals created for Jan & Feb 23
+            self.get_audited_line_to_assert('2023-01-01',   -10),   # Reversal Original line 1
+            self.get_audited_line_to_assert('2023-01-01',    -1),   # Cancel out original line 2
+            self.get_audited_line_to_assert('2023-01-31',     5),   # Jan 23 for line 1
+            self.get_audited_line_to_assert('2023-02-28',     5),   # Feb 23 for line 1
+            self.get_audited_line_to_assert('2023-01-31',     0.2),  # Jan 23 for line 2
+            self.get_audited_line_to_assert('2023-02-28',     0.2),  # Feb 23 for line 2
+        ])
+        # Total = 1000 - 1000 + 250 + 250 + 100 - 100 + 1 - 10 + 5 + 5 - 1 + 0.2 + 0.2 = 500.4 = (2 * 250) + (2 * 0.2) for Jan+Feb 23
+
+        # March 2023
+        audit_lines = self.audit_cell(options, lines[0], 'current')
+        self.assertRecordValues(audit_lines, [
+            self.get_audited_line_to_assert('2023-03-01',  10000),    # inv4 line 1 original
+            self.get_audited_line_to_assert('2023-03-01', -10000),    # inv4 line 1 reversal
+            self.get_audited_line_to_assert('2023-03-31',    250),    # Amount for inv1
+            self.get_audited_line_to_assert('2023-03-31',      0.2),  # Amount for inv3 line 2
+            self.get_audited_line_to_assert('2023-03-31',   5000),    # Amount for inv4 line 1
+        ])
+        # Total = 10000 - 10000 + 5000 + 250 + 0.2 = 5250.2 for March 23
+
+        # Later than March 2023
+        audit_lines = self.audit_cell(options, lines[0], 'later')
+        self.assertRecordValues(audit_lines, [
+            self.get_audited_line_to_assert('2023-04-30',  250),     # Amount for April 23 of Inv 1
+            self.get_audited_line_to_assert('2023-04-30',   50),     # Amount for April 23 of Inv 2
+            self.get_audited_line_to_assert('2023-04-30',    0.2),   # Amount for April 23 of Inv 3 line 2
+            self.get_audited_line_to_assert('2023-04-30', 5000),     # Amount for April 23 of Inv 4 line 1
+            self.get_audited_line_to_assert('2023-05-31',   50),     # Amount for May 23 of Inv 2
+            self.get_audited_line_to_assert('2023-05-31',    0.2),   # Amount for May 23 of Inv 3 line 2
+        ])
+        # Total = 250 + 50 + 50 + 0.2 + 0.2 + 5000 = 5350.4 = (1 * 250) + (2 * 50) + (2 * 0.2) + (1 * 5000) for April+May 23
+
+    def test_deferred_expense_report_audit_cell_grouped_mode(self):
+        """
+        Test that the audit correctly works (when clicking on a cell) in the grouped mode
+        If the deferrals haven't been generated yet, the report shows the expected amounts
+        which will probably differ from the list view of the audited cell which shows the
+        "candidates" lines that are going to be different upon Generating the Entries.
+        """
+
+        self.company.generate_deferred_expense_entries_method = 'manual'
+
+        inv1 = self.create_invoice([[self.expense_accounts[0],  1000, '2023-01-01', '2023-04-30']])  # Basic example, 4 full months, in period
+        inv2 = self.create_invoice([[self.expense_accounts[0],   100, '2023-04-01', '2023-05-31']])  # 2 full months, Not Started yet
+        inv3 = self.create_invoice([
+            [self.expense_accounts[0],  10, '2023-01-01', '2023-02-28'],  # 2 full months, fully deferred so shouldn't appear at all
+            [self.expense_accounts[0],   1, '2023-01-01', '2023-05-31'],  # 5 full months
+        ])
+        inv4 = self.create_invoice([
+            [self.expense_accounts[0], 10000, '2023-03-01', '2023-04-30'],  # 2 full months
+            [self.expense_accounts[0],  1998, '2023-03-01', '2023-03-31'],  # fully inside period -> nothing to defer/show/audit
+        ], invoice_date='2023-03-01')
+        options = self.get_options('2023-03-01', '2023-03-31')
+        lines = self.get_lines(options)
+
+        # At this point, we haven't generated the entries yet, so we show the candidates lines
+        # that will be deferred upon generating the entries (i.e. amounts shown on the reports
+        # will be different from the total amounts shown in the list view of the audited cell)
+
+        # Total column
+        audit_lines = self.audit_cell(options, lines[0], 'total')
+        self.assertEqual(audit_lines, inv1.invoice_line_ids + inv2.invoice_line_ids + inv3.invoice_line_ids.sorted('id')[1] + inv4.invoice_line_ids.sorted('id')[0])
+
+        # Not Started column
+        audit_lines = self.audit_cell(options, lines[0], 'not_started')
+        self.assertEqual(audit_lines, inv2.invoice_line_ids)
+
+        # Before March 2023 (Jan + Feb)
+        audit_lines = self.audit_cell(options, lines[0], 'before')
+        self.assertRecordValues(audit_lines, [
+            {'id': inv1.invoice_line_ids[0].id},
+            {'id': inv3.invoice_line_ids[1].id},
+        ])
+
+        # March 2023
+        audit_lines = self.audit_cell(options, lines[0], 'current')
+        self.assertRecordValues(audit_lines, [
+            {'id': inv1.invoice_line_ids[0].id},
+            {'id': inv3.invoice_line_ids[1].id},
+            {'id': inv4.invoice_line_ids[0].id},
+        ])
+
+        # Later than March 2023 (April + May)
+        audit_lines = self.audit_cell(options, lines[0], 'later')
+        self.assertRecordValues(audit_lines, [
+            {'id': inv1.invoice_line_ids.id},
+            {'id': inv2.invoice_line_ids.id},
+            {'id': inv3.invoice_line_ids.sorted('id')[1].id},
+            {'id': inv4.invoice_line_ids.sorted('id')[0].id},
+        ])
+
+        # Now, let's generate the entries so that the amounts shown in the report match the
+        # totals of the list view of the audited cell. We should generate the entries for the
+        # previous periods too to have the correct amounts in the "Before" column.
+        for report_date_from, report_date_to in (('2023-01-01', '2023-01-31'), ('2023-02-01', '2023-02-28'), ('2023-03-01', '2023-03-31')):
+            self.generate_deferral_entries(self.get_options(report_date_from, report_date_to))
+        lines = self.get_lines(options)
+
+        # Total column
+        audit_lines = self.audit_cell(options, lines[0], 'total')
+        self.assertEqual(audit_lines, inv1.invoice_line_ids + inv2.invoice_line_ids + inv3.invoice_line_ids.sorted('id')[1] + inv4.invoice_line_ids.sorted('id')[0])
+
+        # Not Started column
+        audit_lines = self.audit_cell(options, lines[0], 'not_started')
+        self.assertEqual(audit_lines, inv2.invoice_line_ids)
+
+        # Before March 2023 (Jan + Feb)
+        audit_lines = self.audit_cell(options, lines[0], 'before')
+        self.assertRecordValues(audit_lines[:3], [  # Original lines
+            {'id': inv1.invoice_line_ids.id},
+            {'id': inv2.invoice_line_ids.id},
+            {'id': inv3.invoice_line_ids[1].id},
+        ])
+        self.assertRecordValues(audit_lines[3:], [  # Generated grouping lines
+        # Grouped of Jan 23
+            self.get_audited_line_to_assert('2023-01-31',  -1111),      # = 1000 + 100 + 10 + 1 for Jan 23  (deferral of 10 is used to compute the grouped deferral of Jan 23)
+            self.get_audited_line_to_assert('2023-01-31',    255.2),    # = (1 * 250) + (1 * 5) + (1 * 0.2) for Jan 23
+        # Reversal of Jan 23 (on the next day)
+            self.get_audited_line_to_assert('2023-02-01',   1111),
+            self.get_audited_line_to_assert('2023-02-01',  - 255.2),
+        # Grouped of Feb 23
+            self.get_audited_line_to_assert('2023-02-28',  -1111),      # same as above
+            self.get_audited_line_to_assert('2023-02-28',    510.4),    # = (2 * 250) + (2 * 5) + (2 * 0.2) for Jan + Feb 23
+        # Reversal of Feb 23 does not exist in the before period as it is only created on the 1st March
+        ])
+        # Total = 1000 + 100 + 1 - 1111 + 255.2 + 1111 - 255.2 - 1111 + 510.4 = 500.4 for Jan + Feb 23 = (2 * 250) + (2 * 0.2)
+
+        # March 2023
+        audit_lines = self.audit_cell(options, lines[0], 'current')
+        self.assertRecordValues(audit_lines, [
+            self.get_audited_line_to_assert('2023-03-01',  10000),   # Inv4 line 1 original
+        # Reversal of grouped of February
+            self.get_audited_line_to_assert('2023-03-01',   1111),   # = 1000 + 100 + 10 + 1 for Feb 23  (deferral of 10 is used to compute the grouped deferral of Feb 23)
+            self.get_audited_line_to_assert('2023-03-01', -  510.4),  # = - (2 * 250) - (2 * 5) - (2 * 0.2) for Jan + Feb 23
+        # Grouped of current month (March 23)
+            self.get_audited_line_to_assert('2023-03-31', -11101),  # Deferral of 10 not included anymore in March
+            self.get_audited_line_to_assert('2023-03-31',   5750.6),  # = (3 * 250) + (3 * 0.2)+ (1 * 5000) for Jan + Feb + March 23
+        ])
+        # Total = 10000 + 1111 - 510.4 - 11101 + 5750.6 = 5250.2 for March 23 = 250 + 0.2 + 5000 OK
+
+        # Later than March 2023 (April + May)
+        audit_lines = self.audit_cell(options, lines[0], 'later')
+        self.assertRecordValues(audit_lines, [
+        # Only the Reversal of previous period exist as we've only generated entries up to March and not after
+            self.get_audited_line_to_assert('2023-04-01',  11101),
+            self.get_audited_line_to_assert('2023-04-01', - 5750.6),
+        ])
+        # Total = 11101 - 5750.6 = 5350.2 for April/May = (1 * 250) + (2 * 50) + (2 * 0.2) + (1 * 5000) OK
+
+        # Let's generate for April too (not May as everything is totally deferred in May)
+        # Now we'll have to include inv2 too
+        self.generate_deferral_entries(self.get_options('2023-04-01', '2023-04-30'))
+        audit_lines = self.audit_cell(options, lines[0], 'later')
+        self.assertRecordValues(audit_lines, [
+        # Reversal of grouped of March
+            self.get_audited_line_to_assert('2023-04-01',  11101),
+            self.get_audited_line_to_assert('2023-04-01', - 5750.6),
+        # Grouped of April
+            self.get_audited_line_to_assert('2023-04-30', -11101),
+            self.get_audited_line_to_assert('2023-04-30',  11050.8),  # = (4 * 250) + (4 * 0.2) + (1 * 50) + (2 * 5000) for Jan -> April 23
+        # Reversal of April
+            self.get_audited_line_to_assert('2023-05-01',  11101),
+            self.get_audited_line_to_assert('2023-05-01', -11050.8),
+        ])
+        # Total = Just reversal of grouped of March, so same as previous
+
+        # Now, let's create a new bill such that we have a mix of generated deferrals and candidates
+        inv5 = self.create_invoice([[self.expense_accounts[0],  100000, '2023-01-01', '2023-05-31']])
+
+        # Generate deferrals for previous months, but not March 23 yet.
+        for report_date_from, report_date_to in (('2023-01-01', '2023-01-31'), ('2023-02-01', '2023-02-28')):
+            self.generate_deferral_entries(self.get_options(report_date_from, report_date_to))
+
+        options = self.get_options('2023-03-01', '2023-03-31')
+        lines = self.get_lines(options)
+
+        # Total column
+        audit_lines = self.audit_cell(options, lines[0], 'total')
+        self.assertEqual(audit_lines, inv1.invoice_line_ids + inv2.invoice_line_ids
+                         + inv3.invoice_line_ids.sorted('id')[1] + inv4.invoice_line_ids.sorted('id')[0]
+                         + inv5.invoice_line_ids)
+
+        # Not Started column
+        audit_lines = self.audit_cell(options, lines[0], 'not_started')
+        self.assertEqual(audit_lines, inv2.invoice_line_ids)
+
+        # Before March 2023 (Jan + Feb)
+        audit_lines = self.audit_cell(options, lines[0], 'before')
+        self.assertRecordValues(audit_lines[:4], [  # Original lines
+            {'id': inv1.invoice_line_ids.id},
+            {'id': inv2.invoice_line_ids.id},
+            {'id': inv3.invoice_line_ids[1].id},
+            {'id': inv5.invoice_line_ids.id},  # new
+        ])
+        self.assertRecordValues(audit_lines[4:], [  # Generated grouping lines
+        # Grouped of Jan 23
+            self.get_audited_line_to_assert('2023-01-31', -   1111),      # inv1,2,3,4 = 1000 + 100 + 10 + 1 for Jan 23  (deferral of 10 is used to compute the grouped deferral of Jan 23)
+            self.get_audited_line_to_assert('2023-01-31',      255.2),    # = (1 * 250) + (1 * 5) + (1 * 0.2) for Jan 23
+            self.get_audited_line_to_assert('2023-01-31', - 100000),    # just inv5
+            self.get_audited_line_to_assert('2023-01-31',    20000),
+        # Reversal of Jan 23 (on the next day)
+            self.get_audited_line_to_assert('2023-02-01',     1111),
+            self.get_audited_line_to_assert('2023-02-01', -    255.2),
+            self.get_audited_line_to_assert('2023-02-01',   100000),
+            self.get_audited_line_to_assert('2023-02-01', -  20000),
+        # Grouped of Feb 23
+            self.get_audited_line_to_assert('2023-02-28', -   1111),      # same as above
+            self.get_audited_line_to_assert('2023-02-28',      510.4),    # = (2 * 250) + (2 * 5) + (2 * 0.2) for Jan + Feb 23
+            self.get_audited_line_to_assert('2023-02-28', - 100000),
+            self.get_audited_line_to_assert('2023-02-28',    40000),    # inv5: 2 * 20000 for Jan + Feb 23
+        # Reversal of Feb 23 does not exist in the before period as it is only created on the 1st March
+        ])
+        # Subtotal inv1,2,3 = 1000 + 100 + 1 (originals) - 1111 + 255.2 + 1111 - 255.2 - 1111 + 510.4 = 500.4 for Jan + Feb 23 = (2 * 250) + (2 * 0.2)
+        # Subtotal inv4 = 0 as it does not exist yet
+        # Subtotal inv5 = 10000 (original) -10000 + 2000 + 10000 - 2000 - 10000 + 4000 = 4000
+        # Total = 4000 + 500.4 = 4500.4
+
+        # March 2023
+        audit_lines = self.audit_cell(options, lines[0], 'current')
+        self.assertRecordValues(audit_lines, [
+            self.get_audited_line_to_assert('2023-03-01',   10000),       # Inv4 line 1 original
+        # Reversal of grouped of February
+            self.get_audited_line_to_assert('2023-03-01',    1111),    # inv1,2,3
+            self.get_audited_line_to_assert('2023-03-01', -   510.4),
+            self.get_audited_line_to_assert('2023-03-01',  100000),  # inv5
+            self.get_audited_line_to_assert('2023-03-01', - 40000),
+        # Grouped of current month (March 23)
+            self.get_audited_line_to_assert('2023-03-31', - 11101),   # inv1,2,3 + 4
+            self.get_audited_line_to_assert('2023-03-31',    5750.6),
+            # Nothing for inv5 as we've not yet generated for March since its creation
+        ])
+        # Total = 10000 + 1111 - 510.4 + 100000 - 40000 - 11101 + 5750.6 = 65 250.2
+        # The total of the list view is different from the cell (25 250.2 = inv1 + inv3.1 + inv4 + inv5) so we directly see that
+        # there is a problem and the deferrals are not completely generated.
+        # The difference is 40 000, so we know that inv5 is not yet generated
+
+        # Generate for March 23
+        self.generate_deferral_entries(self.get_options('2023-03-01', '2023-03-31'))
+
+        audit_lines = self.audit_cell(options, lines[0], 'current')
+        self.assertRecordValues(audit_lines, [
+            self.get_audited_line_to_assert('2023-03-01',    10000),   # Inv4 line 1 original
+            # Reversal of grouped of February
+            self.get_audited_line_to_assert('2023-03-01',     1111),    # inv1,2,3
+            self.get_audited_line_to_assert('2023-03-01', -    510.4),
+            self.get_audited_line_to_assert('2023-03-01',   100000),  # inv5
+            self.get_audited_line_to_assert('2023-03-01', -  40000),
+            # Grouped of current month (March 23)
+            self.get_audited_line_to_assert('2023-03-31', -  11101),   # inv1,2,3 + 4
+            self.get_audited_line_to_assert('2023-03-31',     5750.6),
+            self.get_audited_line_to_assert('2023-03-31', - 100000),  # inv5
+            self.get_audited_line_to_assert('2023-03-31',    60000),
+        ])
+        # Total = 10000 + 1111 - 510.4 + 100000 - 40000 - 11101 + 5750.6 - 100000 + 60000 = 25250.2
+        # The total of the list view is now the same as from the cell (25 250.2 = inv1 + inv3.1 + inv4 + inv5)
diff --git a/dev_odex30_accounting/odex30_account_reports/tests/test_financial_report.py b/dev_odex30_accounting/odex30_account_reports/tests/test_financial_report.py
new file mode 100644
index 0000000..e48e32c
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_reports/tests/test_financial_report.py
@@ -0,0 +1,919 @@
+# -*- coding: utf-8 -*-
+# pylint: disable=C0326
+
+from .common import TestAccountReportsCommon
+
+from odoo import fields, Command
+from odoo.tests import tagged
+
+from freezegun import freeze_time
+
+
+@tagged('post_install', '-at_install')
+class TestFinancialReport(TestAccountReportsCommon):
+
+    @classmethod
+    def setUpClass(cls):
+        super().setUpClass()
+
+        # ==== Partners ====
+        cls.partner_c = cls._create_partner(name='partner_c')
+
+        # ==== Accounts ====
+
+        # Cleanup existing "Current year earnings" accounts since we can only have one by company.
+        cls.env['account.account'].search([
+            ('company_ids', 'in', (cls.company_data['company'] + cls.company_data_2['company']).ids),
+            ('account_type', '=', 'equity_unaffected'),
+        ]).unlink()
+
+        account_type_data = [
+            ('asset_receivable',    {'reconcile': True}),
+            ('liability_payable',   {'reconcile': True}),
+            ('asset_cash',          {}),
+            ('asset_current',       {}),
+            ('asset_prepayments',   {}),
+            ('asset_fixed',         {}),
+            ('asset_non_current',   {}),
+            ('equity',              {}),
+            ('equity_unaffected',   {}),
+            ('income',              {}),
+        ]
+
+        accounts = cls.env['account.account'].create([{
+            **data[1],
+            'name': 'account%s' % i,
+            'code': 'code%s' % i,
+            'account_type': data[0],
+        } for i, data in enumerate(account_type_data)])
+
+        accounts_2 = cls.env['account.account'].create([{
+            **data[1],
+            'name': 'account%s' % (i + 100),
+            'code': 'code%s' % (i + 100),
+            'account_type': data[0],
+            'company_ids': [Command.link(cls.company_data_2['company'].id)]
+        } for i, data in enumerate(account_type_data)])
+
+        for account in accounts_2:
+            account.code = account.with_company(cls.company_data_2['company']).code
+
+        # ==== Custom filters ====
+
+        cls.horizontal_group = cls.env['account.report.horizontal.group'].create({
+            'name': 'Horizontal Group',
+            'rule_ids': [
+                Command.create({
+                    'field_name': 'partner_id',
+                    'domain': f"[('id', 'in', {(cls.partner_a + cls.partner_b).ids})]",
+                }),
+                Command.create({
+                    'field_name': 'account_id',
+                    'domain': f"[('id', 'in', {accounts[:2].ids})]",
+                }),
+            ],
+        })
+
+        # ==== Journal entries ====
+
+        cls.move_2019 = cls.env['account.move'].create({
+            'move_type': 'entry',
+            'date': fields.Date.from_string('2019-01-01'),
+            'line_ids': [
+                (0, 0, {'debit': 25.0,      'credit': 0.0,      'account_id': accounts[0].id,   'partner_id': cls.partner_a.id}),
+                (0, 0, {'debit': 25.0,      'credit': 0.0,      'account_id': accounts[0].id,   'partner_id': cls.partner_b.id}),
+                (0, 0, {'debit': 25.0,      'credit': 0.0,      'account_id': accounts[0].id,   'partner_id': cls.partner_c.id}),
+                (0, 0, {'debit': 25.0,      'credit': 0.0,      'account_id': accounts[0].id,   'partner_id': cls.partner_a.id}),
+                (0, 0, {'debit': 200.0,     'credit': 0.0,      'account_id': accounts[1].id,   'partner_id': cls.partner_b.id}),
+                (0, 0, {'debit': 0.0,       'credit': 300.0,    'account_id': accounts[2].id,   'partner_id': cls.partner_c.id}),
+                (0, 0, {'debit': 400.0,     'credit': 0.0,      'account_id': accounts[3].id,   'partner_id': cls.partner_a.id}),
+                (0, 0, {'debit': 0.0,       'credit': 1100.0,   'account_id': accounts[4].id,   'partner_id': cls.partner_b.id}),
+                (0, 0, {'debit': 700.0,     'credit': 0.0,      'account_id': accounts[6].id,   'partner_id': cls.partner_a.id}),
+                (0, 0, {'debit': 0.0,       'credit': 800.0,    'account_id': accounts[7].id,   'partner_id': cls.partner_b.id}),
+                (0, 0, {'debit': 800.0,     'credit': 0.0,      'account_id': accounts[8].id,   'partner_id': cls.partner_c.id}),
+            ],
+        })
+        cls.move_2019.action_post()
+
+        cls.move_2018 = cls.env['account.move'].create({
+            'move_type': 'entry',
+            'date': fields.Date.from_string('2018-01-01'),
+            'line_ids': [
+                (0, 0, {'debit': 1000.0,    'credit': 0.0,      'account_id': accounts[0].id,   'partner_id': cls.partner_a.id}),
+                (0, 0, {'debit': 0.0,       'credit': 1000.0,   'account_id': accounts[2].id,   'partner_id': cls.partner_b.id}),
+                (0, 0, {'debit': 250.0,     'credit': 0.0,      'account_id': accounts[0].id,   'partner_id': cls.partner_a.id}),
+                (0, 0, {'debit': 0.0,       'credit': 250.0,    'account_id': accounts[9].id,   'partner_id': cls.partner_a.id}),
+            ],
+        })
+        cls.move_2018.action_post()
+
+        cls.move_2017 = cls.env['account.move'].with_company(cls.company_data_2['company']).create({
+            'move_type': 'entry',
+            'date': fields.Date.from_string('2017-01-01'),
+            'line_ids': [
+                (0, 0, {'debit': 2000.0,    'credit': 0.0,      'account_id': accounts_2[0].id, 'partner_id': cls.partner_a.id}),
+                (0, 0, {'debit': 0.0,       'credit': 4000.0,   'account_id': accounts_2[2].id, 'partner_id': cls.partner_b.id}),
+                (0, 0, {'debit': 0.0,       'credit': 5000.0,   'account_id': accounts_2[4].id, 'partner_id': cls.partner_c.id}),
+                (0, 0, {'debit': 7000.0,    'credit': 0.0,      'account_id': accounts_2[6].id, 'partner_id': cls.partner_a.id}),
+            ],
+        })
+        cls.move_2017.action_post()
+
+        cls.report = cls.env.ref('odex30_account_reports.balance_sheet')
+
+        cls.report_no_parent_id = cls.env["account.report"].create({
+            'name': "Test report",
+
+            'column_ids': [
+                Command.create({
+                    'name': 'Balance',
+                    'expression_label': 'balance',
+                    'sequence': 1
+                })
+            ],
+
+            'line_ids': [
+                Command.create({
+                    'name': "Invisible Partner A line",
+                    'code': "INVA",
+                    'sequence': 1,
+                    'hierarchy_level': 0,
+                    'groupby': "account_id",
+                    'foldable': True,
+                    'expression_ids': [Command.clear(), Command.create({
+                        'label': 'balance',
+                        'engine': 'domain',
+                        'formula': [("partner_id", "=", cls.partner_a.id)],
+                        'subformula': 'sum',
+                    })],
+                }),
+                Command.create({
+                    'name': "Invisible Partner B line",
+                    'code': "INVB",
+                    'sequence': 2,
+                    'hierarchy_level': 0,
+                    'groupby': "account_id",
+                    'foldable': True,
+                    'expression_ids': [Command.clear(), Command.create({
+                        'label': 'balance',
+                        'engine': 'domain',
+                        'formula': [("partner_id", "=", cls.partner_b.id)],
+                        'subformula': 'sum',
+                    })],
+                }),
+                Command.create({
+                    'name': "Total of Invisible lines",
+                    'code': "INVT",
+                    'sequence': 3,
+                    'hierarchy_level': 0,
+                    'expression_ids': [Command.clear(), Command.create({
+                        'label': 'balance',
+                        'engine': 'aggregation',
+                        'formula': 'INVA.balance + INVB.balance',
+                    })],
+                }),
+            ],
+        })
+
+    def _build_generic_id_from_financial_line(self, financial_rep_ln_xmlid):
+        report_line = self.env.ref(financial_rep_ln_xmlid)
+        return '-account.financial.html.report.line-%s' % report_line.id
+
+    def _get_line_id_from_generic_id(self, generic_id):
+        return int(generic_id.split('-')[-1])
+
+    def test_financial_report_strict_range_on_report_lines_with_no_parent_id(self):
+        """ Tests that lines with no parent can be correctly filtered by date range """
+        self.report_no_parent_id.filter_multi_company = 'disabled'
+        options = self._generate_options(self.report_no_parent_id, fields.Date.from_string('2019-01-01'), fields.Date.from_string('2019-12-31'))
+
+        lines = self.report_no_parent_id._get_lines(options)
+        self.assertLinesValues(
+            lines,
+            #   Name                         Balance
+            [   0,                           1],
+            [
+                ('Invisible Partner A line', 1150.0),
+                ('Invisible Partner B line', -1675.0),
+                ('Total of Invisible lines', -525.0),
+
+            ],
+            options,
+        )
+
+    def test_financial_report_strict_empty_range_on_report_lines_with_no_parent_id(self):
+        """ Tests that lines with no parent can be correctly filtered by date range with no invoices"""
+        self.report_no_parent_id.filter_multi_company = 'disabled'
+        options = self._generate_options(self.report_no_parent_id, fields.Date.from_string('2019-03-01'), fields.Date.from_string('2019-03-31'))
+
+        lines = self.report_no_parent_id._get_lines(options)
+        self.assertLinesValues(
+            lines,
+            #   Name                          Balance
+            [   0,                            1],
+            [
+                ('Invisible Partner A line',  0.0),
+                ('Invisible Partner B line',  0.0),
+                ('Total of Invisible lines',  0.0),
+            ],
+            options,
+        )
+
+    @freeze_time("2016-06-06")
+    def test_balance_sheet_today_current_year_earnings(self):
+        invoice = self.env['account.move'].create({
+            'move_type': 'out_invoice',
+            'partner_id': self.partner_a.id,
+            'date': '2016-02-02',
+            'invoice_line_ids': [Command.create({
+                'product_id': self.product_a.id,
+                'price_unit': 110,
+                'tax_ids': [],
+            })]
+        })
+        invoice.action_post()
+
+        self.report.filter_multi_company = 'disabled'
+        options = self._generate_options(self.report, fields.Date.from_string('2016-06-01'), fields.Date.from_string('2016-06-06'))
+        options['date']['filter'] = 'today'
+
+        lines = self.report._get_lines(options)
+        self.assertLinesValues(
+            lines,
+            #   Name                                            Balance
+            [   0,                                              1],
+            [
+                ('ASSETS',                                      110.0),
+                ('Current Assets',                              110.0),
+                ('Bank and Cash Accounts',                        0.0),
+                ('Receivables',                                 110.0),
+                ('Current Assets',                                0.0),
+                ('Prepayments',                                   0.0),
+                ('Total Current Assets',                        110.0),
+                ('Plus Fixed Assets',                             0.0),
+                ('Plus Non-current Assets',                       0.0),
+                ('Total ASSETS',                                110.0),
+
+                ('LIABILITIES',                                   0.0),
+                ('Current Liabilities',                           0.0),
+                ('Current Liabilities',                           0.0),
+                ('Payables',                                      0.0),
+                ('Total Current Liabilities',                     0.0),
+                ('Plus Non-current Liabilities',                  0.0),
+                ('Total LIABILITIES',                             0.0),
+
+                ('EQUITY',                                      110.0),
+                ('Unallocated Earnings',                        110.0),
+                ('Current Year Unallocated Earnings',           110.0),
+                ('Previous Years Unallocated Earnings',           0.0),
+                ('Total Unallocated Earnings',                  110.0),
+                ('Retained Earnings',                             0.0),
+                ('Current Year Retained Earnings',                0.0),
+                ('Previous Years Retained Earnings',              0.0),
+                ('Total Retained Earnings',                       0.0),
+                ('Total EQUITY',                                110.0),
+
+                ('LIABILITIES + EQUITY',                        110.0),
+            ],
+            options,
+        )
+
+    @freeze_time("2016-05-05")
+    def test_balance_sheet_last_month_vs_custom_current_year_earnings(self):
+        """
+        Checks the balance sheet calls the right period of the P&L when using last_month date filter, or an equivalent custom filter
+        (this used to fail due to options regeneration made by the P&L's get_options())"
+        """
+        to_invoice = [('15', '11'), ('15', '12'), ('16', '01'), ('16', '02'), ('16', '03'), ('16', '04')]
+        for year, month in to_invoice:
+            invoice = self.env['account.move'].create({
+                'move_type': 'out_invoice',
+                'partner_id': self.partner_a.id,
+                'invoice_date': f'20{year}-{month}-01',
+                'invoice_line_ids': [Command.create({
+                    'product_id': self.product_a.id,
+                    'price_unit': 1000,
+                    'tax_ids': [],
+                })]
+            })
+            invoice.action_post()
+        expected_result =[
+                ('ASSETS',                                      6000.0),
+                ('Current Assets',                              6000.0),
+                ('Bank and Cash Accounts',                         0.0),
+                ('Receivables',                                 6000.0),
+                ('Current Assets',                                 0.0),
+                ('Prepayments',                                    0.0),
+                ('Total Current Assets',                        6000.0),
+                ('Plus Fixed Assets',                              0.0),
+                ('Plus Non-current Assets',                        0.0),
+                ('Total ASSETS',                                6000.0),
+
+                ('LIABILITIES',                                    0.0),
+                ('Current Liabilities',                            0.0),
+                ('Current Liabilities',                            0.0),
+                ('Payables',                                       0.0),
+                ('Total Current Liabilities',                      0.0),
+                ('Plus Non-current Liabilities',                   0.0),
+                ('Total LIABILITIES',                              0.0),
+
+                ('EQUITY',                                      6000.0),
+                ('Unallocated Earnings',                        6000.0),
+                ('Current Year Unallocated Earnings',           4000.0),
+                ('Previous Years Unallocated Earnings',         2000.0),
+                ('Total Unallocated Earnings',                  6000.0),
+                ('Retained Earnings',                              0.0),
+                ('Current Year Retained Earnings',                 0.0),
+                ('Previous Years Retained Earnings',               0.0),
+                ('Total Retained Earnings',                        0.0),
+                ('Total EQUITY',                                6000.0),
+                ('LIABILITIES + EQUITY',                        6000.0),
+
+            ]
+        self.report.filter_multi_company = 'disabled'
+        options = self._generate_options(self.report, fields.Date.from_string('2016-05-05'), fields.Date.from_string('2016-05-05'))
+
+        # End of Last Month
+        options['date']['filter'] = 'last_month'
+        lines = self.report._get_lines(options)
+        self.assertLinesValues(
+            lines,
+            #   Name                                            Balance
+            [   0,                                              1],
+            expected_result,
+            options,
+        )
+        # Custom
+        options['date']['filter'] = 'custom'
+        lines = self.report._get_lines(options)
+        self.assertLinesValues(
+            lines,
+            #   Name                                            Balance
+            [   0,                                              1],
+            expected_result,
+            options,
+        )
+
+    def test_financial_report_single_company(self):
+        line_id = self._get_basic_line_dict_id_from_report_line_ref('odex30_account_reports.account_financial_report_bank_view0')
+        self.report.filter_multi_company = 'disabled'
+        options = self._generate_options(self.report, fields.Date.from_string('2019-01-01'), fields.Date.from_string('2019-12-31'))
+        options['unfolded_lines'] = [line_id]
+
+        lines = self.report._get_lines(options)
+        self.assertLinesValues(
+            lines,
+            #   Name                                            Balance
+            [   0,                                              1],
+            [
+                ('ASSETS',                                        50.0),
+                ('Current Assets',                              -650.0),
+                ('Bank and Cash Accounts',                     -1300.0),
+                ('code2 account2',                             -1300.0),
+                ('Total Bank and Cash Accounts',               -1300.0),
+                ('Receivables',                                 1350.0),
+                ('Current Assets',                               400.0),
+                ('Prepayments',                                -1100.0),
+                ('Total Current Assets',                        -650.0),
+                ('Plus Fixed Assets',                              0.0),
+                ('Plus Non-current Assets',                      700.0),
+                ('Total ASSETS',                                  50.0),
+
+                ('LIABILITIES',                                 -200.0),
+                ('Current Liabilities',                         -200.0),
+                ('Current Liabilities',                            0.0),
+                ('Payables',                                    -200.0),
+                ('Total Current Liabilities',                   -200.0),
+                ('Plus Non-current Liabilities',                   0.0),
+                ('Total LIABILITIES',                           -200.0),
+
+                ('EQUITY',                                       250.0),
+                ('Unallocated Earnings',                        -550.0),
+                ('Current Year Unallocated Earnings',           -800.0),
+                ('Previous Years Unallocated Earnings',          250.0),
+                ('Total Unallocated Earnings',                  -550.0),
+                ('Retained Earnings',                            800.0),
+                ('Current Year Retained Earnings',               800.0),
+                ('Previous Years Retained Earnings',               0.0),
+                ('Total Retained Earnings',                      800.0),
+                ('Total EQUITY',                                 250.0),
+
+                ('LIABILITIES + EQUITY',                          50.0),
+            ],
+            options,
+        )
+
+        unfolded_lines = self.report._get_unfolded_lines(lines, line_id)
+        self.assertLinesValues(
+            unfolded_lines,
+            #   Name                                            Balance
+            [   0,                                              1],
+            [
+                ('Bank and Cash Accounts',                      -1300.0),
+                ('code2 account2',                              -1300.0),
+                ('Total Bank and Cash Accounts',                -1300.0),
+            ],
+            options,
+        )
+
+    def test_financial_report_multi_company_currency(self):
+        line_id = self._get_basic_line_dict_id_from_report_line_ref('odex30_account_reports.account_financial_report_bank_view0')
+        options = self._generate_options(self.report, fields.Date.from_string('2019-01-01'), fields.Date.from_string('2019-12-31'))
+        options['unfolded_lines'] = [line_id]
+
+        lines = self.report._get_lines(options)
+        self.assertLinesValues(
+            lines,
+            #   Name                                            Balance
+            [   0,                                              1],
+            [
+                ('ASSETS',                                        50.0),
+                ('Current Assets',                             -4150.0),
+                ('Bank and Cash Accounts',                     -3300.0),
+                ('code102 account102',                         -2000.0),
+                ('code2 account2',                             -1300.0),
+                ('Total Bank and Cash Accounts',               -3300.0),
+                ('Receivables',                                 2350.0),
+                ('Current Assets',                               400.0),
+                ('Prepayments',                                -3600.0),
+                ('Total Current Assets',                       -4150.0),
+                ('Plus Fixed Assets',                              0.0),
+                ('Plus Non-current Assets',                     4200.0),
+                ('Total ASSETS',                                  50.0),
+
+                ('LIABILITIES',                                 -200.0),
+                ('Current Liabilities',                         -200.0),
+                ('Current Liabilities',                            0.0),
+                ('Payables',                                    -200.0),
+                ('Total Current Liabilities',                   -200.0),
+                ('Plus Non-current Liabilities',                   0.0),
+                ('Total LIABILITIES',                           -200.0),
+
+                ('EQUITY',                                       250.0),
+                ('Unallocated Earnings',                        -550.0),
+                ('Current Year Unallocated Earnings',           -800.0),
+                ('Previous Years Unallocated Earnings',          250.0),
+                ('Total Unallocated Earnings',                  -550.0),
+                ('Retained Earnings',                            800.0),
+                ('Current Year Retained Earnings',               800.0),
+                ('Previous Years Retained Earnings',               0.0),
+                ('Total Retained Earnings',                      800.0),
+                ('Total EQUITY',                                 250.0),
+
+                ('LIABILITIES + EQUITY',                          50.0),
+            ],
+            options,
+        )
+
+        unfolded_lines = self.report._get_unfolded_lines(lines, line_id)
+        self.assertLinesValues(
+            unfolded_lines,
+            #   Name                                            Balance
+            [   0,                                              1],
+            [
+                ('Bank and Cash Accounts',                     -3300.0),
+                ('code102 account102',                         -2000.0),
+                ('code2 account2',                             -1300.0),
+                ('Total Bank and Cash Accounts',               -3300.0),
+            ],
+            options,
+        )
+
+    def test_financial_report_comparison(self):
+        line_id = self._get_basic_line_dict_id_from_report_line_ref('odex30_account_reports.account_financial_report_bank_view0')
+        options = self._generate_options(self.report, fields.Date.from_string('2019-01-01'), fields.Date.from_string('2019-12-31'))
+        options = self._update_comparison_filter(options, self.report, 'custom', 1, date_to=fields.Date.from_string('2018-12-31'))
+        options['unfolded_lines'] = [line_id]
+
+        lines = self.report._get_lines(options)
+
+        self.assertColumnPercentComparisonValues(
+            lines,
+            [
+                ('ASSETS',                                      '-80.0%',       'red'),
+                ('Current Assets',                              '27.7%',        'red'),
+                ('Bank and Cash Accounts',                      '10.0%',        'red'),
+                ('code102 account102',                          '0.0%',       'muted'),
+                ('code2 account2',                              '30.0%',        'red'),
+                ('Total Bank and Cash Accounts',                '10.0%',        'red'),
+                ('Receivables',                                 '4.4%',       'green'),
+                ('Current Assets',                              'n/a',        'muted'),
+                ('Prepayments',                                 '44.0%',        'red'),
+                ('Total Current Assets',                        '27.7%',        'red'),
+                ('Plus Fixed Assets',                           'n/a',        'muted'),
+                ('Plus Non-current Assets',                     '20.0%',      'green'),
+                ('Total ASSETS',                                '-80.0%',       'red'),
+
+                ('LIABILITIES',                                 'n/a',        'muted'),
+                ('Current Liabilities',                         'n/a',        'muted'),
+                ('Current Liabilities',                         'n/a',        'muted'),
+                ('Payables',                                    'n/a',        'muted'),
+                ('Total Current Liabilities',                   'n/a',        'muted'),
+                ('Plus Non-current Liabilities',                'n/a',        'muted'),
+                ('Total LIABILITIES',                           'n/a',        'muted'),
+
+                ('EQUITY',                                      '0.0%',       'muted'),
+                ('Unallocated Earnings',                        '-320.0%',      'red'),
+                ('Current Year Unallocated Earnings',           '-420.0%',      'red'),
+                ('Previous Years Unallocated Earnings',         'n/a',        'muted'),
+                ('Total Unallocated Earnings',                  '-320.0%',      'red'),
+                ('Retained Earnings',                           'n/a',        'muted'),
+                ('Current Year Retained Earnings',              'n/a',        'muted'),
+                ('Previous Years Retained Earnings',            'n/a',        'muted'),
+                ('Total Retained Earnings',                     'n/a',        'muted'),
+                ('Total EQUITY',                                '0.0%',       'muted'),
+
+
+                ('LIABILITIES + EQUITY',                        '-80.0%',     'green'),
+            ]
+        )
+
+    def test_financial_report_horizontal_group(self):
+        line_id = self._get_basic_line_dict_id_from_report_line_ref('odex30_account_reports.account_financial_report_receivable0')
+        self.report.horizontal_group_ids |= self.horizontal_group
+
+        options = self._generate_options(
+            self.report,
+            fields.Date.from_string('2019-01-01'),
+            fields.Date.from_string('2019-12-31'),
+            default_options={
+                'unfolded_lines': [line_id],
+                'selected_horizontal_group_id': self.horizontal_group.id,
+            }
+        )
+        options = self._update_comparison_filter(options, self.report, 'custom', 1, date_to=fields.Date.from_string('2018-12-31'))
+
+        lines = self.report._get_lines(options)
+        self.assertHeadersValues(
+            options['column_headers'],
+            [
+                ['As of 12/31/2019', 'As of 12/31/2018'],
+                ['partner_a', 'partner_b'],
+                ['code0 account0', 'code1 account1'],
+            ]
+        )
+        self.assertLinesValues(
+            lines,
+            [   0,                                          1,                   2,                  3,                  4,                  5,                  6,                  7,                  8],
+            [
+                ('ASSETS',                                  1300.0,             0.0,                 25.0,              0.0,                 1250.0,            0.0,                0.0,                0.0),
+                ('Current Assets',                          1300.0,             0.0,                 25.0,              0.0,                 1250.0,            0.0,                0.0,                0.0),
+                ('Bank and Cash Accounts',                 0.0,                 0.0,                0.0,                0.0,                0.0,                0.0,                0.0,                0.0),
+                ('Receivables',                             1300.0,             0.0,                 25.0,              0.0,                 1250.0,            0.0,                0.0,                0.0),
+                ('code0 account0',                          1300.0,             0.0,                 25.0,              0.0,                 1250.0,            0.0,                0.0,                0.0),
+                ('Total Receivables',                       1300.0,             0.0,                 25.0,              0.0,                 1250.0,            0.0,                0.0,                0.0),
+                ('Current Assets',                         0.0,                 0.0,                0.0,                0.0,                0.0,                0.0,                0.0,                0.0),
+                ('Prepayments',                            0.0,                 0.0,                0.0,                0.0,                0.0,                0.0,                0.0,                0.0),
+                ('Total Current Assets',                    1300.0,             0.0,                 25.0,              0.0,                 1250.0,            0.0,                0.0,                0.0),
+                ('Plus Fixed Assets',                      0.0,                 0.0,                0.0,                0.0,                0.0,                0.0,                0.0,                0.0),
+                ('Plus Non-current Assets',                0.0,                 0.0,                0.0,                0.0,                0.0,                0.0,                0.0,                0.0),
+                ('Total ASSETS',                            1300.0,             0.0,                 25.0,              0.0,                 1250.0,            0.0,                0.0,                0.0),
+
+                ('LIABILITIES',                            0.0,                 0.0,                0.0,                -200.0,             0.0,                0.0,                0.0,                0.0),
+                ('Current Liabilities',                    0.0,                 0.0,                0.0,                -200.0,             0.0,                0.0,                0.0,                0.0),
+                ('Current Liabilities',                    0.0,                 0.0,                0.0,                0.0,                0.0,                0.0,                0.0,                0.0),
+                ('Payables',                               0.0,                 0.0,                0.0,                -200.0,             0.0,                0.0,                0.0,                0.0),
+                ('Total Current Liabilities',              0.0,                 0.0,                0.0,                -200.0,             0.0,                0.0,                0.0,                0.0),
+                ('Plus Non-current Liabilities',           0.0,                 0.0,                0.0,                0.0,                0.0,                0.0,                0.0,                0.0),
+                ('Total LIABILITIES',                      0.0,                 0.0,                0.0,                -200.0,             0.0,                0.0,                0.0,                0.0),
+
+                ('EQUITY',                                 0.0,                 0.0,                0.0,                0.0,                0.0,                0.0,                0.0,                0.0),
+                ('Unallocated Earnings',                   0.0,                 0.0,                0.0,                0.0,                0.0,                0.0,                0.0,                0.0),
+                ('Current Year Unallocated Earnings',      0.0,                 0.0,                0.0,                0.0,                0.0,                0.0,                0.0,                0.0),
+                ('Previous Years Unallocated Earnings',    0.0,                 0.0,                0.0,                0.0,                0.0,                0.0,                0.0,                0.0),
+                ('Total Unallocated Earnings',             0.0,                 0.0,                0.0,                0.0,                0.0,                0.0,                0.0,                0.0),
+                ('Retained Earnings',                      0.0,                 0.0,                0.0,                0.0,                0.0,                0.0,                0.0,                0.0),
+                ('Current Year Retained Earnings',         0.0,                 0.0,                0.0,                0.0,                0.0,                0.0,                0.0,                0.0),
+                ('Previous Years Retained Earnings',       0.0,                 0.0,                0.0,                0.0,                0.0,                0.0,                0.0,                0.0),
+                ('Total Retained Earnings',                0.0,                 0.0,                0.0,                0.0,                0.0,                0.0,                0.0,                0.0),
+                ('Total EQUITY',                           0.0,                 0.0,                0.0,                0.0,                0.0,                0.0,                0.0,                0.0),
+
+                ('LIABILITIES + EQUITY',                   0.0,                 0.0,                0.0,                -200.0,             0.0,                0.0,                0.0,                0.0),
+            ],
+            options,
+        )
+
+    def test_financial_report_horizontal_group_total(self):
+        """
+        In case we don't have comparison, just one column and one level of groupby a new column is added which is the total
+        of the horizontal group
+        """
+        horizontal_group = self.env['account.report.horizontal.group'].create({
+            'name': 'Horizontal Group total',
+            'rule_ids': [
+                Command.create({
+                    'field_name': 'partner_id',
+                    'domain': f"[('id', 'in', {(self.partner_a + self.partner_b).ids})]",
+                }),
+            ],
+        })
+        self.report.horizontal_group_ids |= horizontal_group
+        options = self._generate_options(self.report, '2019-01-01', '2019-12-31', default_options={'selected_horizontal_group_id': horizontal_group.id})
+        self.assertHeadersValues(
+            options['column_headers'],
+            [
+                ['As of 12/31/2019'],
+                ['partner_a', 'partner_b'],
+            ]
+        )
+
+        self.assertTrue(options['show_horizontal_group_total'])
+        # Since we don't calculate the value when totals below section is activated, we disable it
+        self.env.company.totals_below_sections = False
+        self.assertHorizontalGroupTotal(
+            self.report._get_lines(options),
+            [
+                ('ASSETS',                                      6900.0,          -4075.0,        2825.0),
+                ('Current Assets',                              2700.0,          -4075.0,       -1375.0),
+                ('Bank and Cash Accounts',                         0.0,          -3000.0,       -3000.0),
+                ('Receivables',                                 2300.0,             25.0,        2325.0),
+                ('Current Assets',                               400.0,              0.0,         400.0),
+                ('Prepayments',                                    0.0,          -1100.0,       -1100.0),
+                ('Plus Fixed Assets',                              0.0,              0.0,           0.0),
+                ('Plus Non-current Assets',                     4200.0,              0.0,        4200.0),
+                ('LIABILITIES',                                    0.0,           -200.0,        -200.0),
+                ('Current Liabilities',                            0.0,           -200.0,        -200.0),
+                ('Current Liabilities',                            0.0,              0.0,           0.0),
+                ('Payables',                                       0.0,           -200.0,        -200.0),
+                ('Plus Non-current Liabilities',                   0.0,              0.0,           0.0),
+                ('EQUITY',                                       250.0,            800.0,        1050.0),
+                ('Unallocated Earnings',                         250.0,              0.0,         250.0),
+                ('Current Year Unallocated Earnings',              0.0,              0.0,           0.0),
+                ('Previous Years Unallocated Earnings',          250.0,              0.0,         250.0),
+                ('Retained Earnings',                              0.0,            800.0,         800.0),
+                ('Current Year Retained Earnings',                 0.0,            800.0,         800.0),
+                ('Previous Years Retained Earnings',               0.0,              0.0,           0.0),
+                ('LIABILITIES + EQUITY',                         250.0,            600.0,         850.0),
+            ],
+        )
+
+        options = self._generate_options(self.report, '2019-01-01', '2019-12-31', default_options={'selected_horizontal_group_id': horizontal_group.id})
+        options = self._update_comparison_filter(options, self.report, 'custom', 1, date_to=fields.Date.from_string('2018-12-31'))
+        self.assertHeadersValues(
+            options['column_headers'],
+            [
+                ['As of 12/31/2019', 'As of 12/31/2018'],
+                ['partner_a', 'partner_b'],
+            ]
+        )
+
+        self.assertFalse(options['show_horizontal_group_total'])
+
+        self.assertHorizontalGroupTotal(
+            self.report._get_lines(options),
+            [
+                ('ASSETS',                                      6900.0,             -4075.0,     5750.0,     -3000.0),
+                ('Current Assets',                              2700.0,             -4075.0,     2250.0,     -3000.0),
+                ('Bank and Cash Accounts',                         0.0,             -3000.0,        0.0,     -3000.0),
+                ('Receivables',                                 2300.0,                25.0,     2250.0,         0.0),
+                ('Current Assets',                               400.0,                 0.0,        0.0,         0.0),
+                ('Prepayments',                                    0.0,             -1100.0,        0.0,         0.0),
+                ('Plus Fixed Assets',                              0.0,                 0.0,        0.0,         0.0),
+                ('Plus Non-current Assets',                     4200.0,                 0.0,     3500.0,         0.0),
+                ('LIABILITIES',                                    0.0,              -200.0,        0.0,         0.0),
+                ('Current Liabilities',                            0.0,              -200.0,        0.0,         0.0),
+                ('Current Liabilities',                            0.0,                 0.0,        0.0,         0.0),
+                ('Payables',                                       0.0,              -200.0,        0.0,         0.0),
+                ('Plus Non-current Liabilities',                   0.0,                 0.0,        0.0,         0.0),
+                ('EQUITY',                                       250.0,               800.0,      250.0,         0.0),
+                ('Unallocated Earnings',                         250.0,                 0.0,      250.0,         0.0),
+                ('Current Year Unallocated Earnings',              0.0,                 0.0,      250.0,         0.0),
+                ('Previous Years Unallocated Earnings',          250.0,                 0.0,        0.0,         0.0),
+                ('Retained Earnings',                              0.0,               800.0,        0.0,         0.0),
+                ('Current Year Retained Earnings',                 0.0,               800.0,        0.0,         0.0),
+                ('Previous Years Retained Earnings',               0.0,                 0.0,        0.0,         0.0),
+                ('LIABILITIES + EQUITY',                         250.0,               600.0,      250.0,         0.0),
+            ],
+        )
+
+    def test_hide_if_zero_with_no_formulas(self):
+        """
+        Check if a report line stays displayed when hide_if_zero is True and no formulas
+        is set on the line but has some child which have balance != 0
+        We check also if the line is hidden when all its children have balance == 0
+        """
+        account1, account2 = self.env['account.account'].create([{
+            'name': "test_financial_report_1",
+            'code': "42241",
+            'account_type': "asset_fixed",
+        }, {
+            'name': "test_financial_report_2",
+            'code': "42242",
+            'account_type': "asset_fixed",
+        }])
+
+        moves = self.env['account.move'].create([
+            {
+                'move_type': 'entry',
+                'date': '2019-04-01',
+                'line_ids': [
+                    (0, 0, {'debit': 3.0, 'credit': 0.0, 'account_id': account1.id}),
+                    (0, 0, {'debit': 0.0, 'credit': 3.0, 'account_id': self.company_data['default_account_revenue'].id}),
+                ],
+            },
+            {
+                'move_type': 'entry',
+                'date': '2019-05-01',
+                'line_ids': [
+                    (0, 0, {'debit': 0.0, 'credit': 1.0, 'account_id': account2.id}),
+                    (0, 0, {'debit': 1.0, 'credit': 0.0, 'account_id': self.company_data['default_account_revenue'].id}),
+                ],
+            },
+            {
+                'move_type': 'entry',
+                'date': '2019-04-01',
+                'line_ids': [
+                    (0, 0, {'debit': 0.0, 'credit': 3.0, 'account_id': account2.id}),
+                    (0, 0, {'debit': 3.0, 'credit': 0.0, 'account_id': self.company_data['default_account_revenue'].id}),
+                ],
+            },
+        ])
+        moves.action_post()
+        moves.line_ids.flush_recordset()
+
+        report = self.env["account.report"].create({
+            'name': "test_financial_report_sum",
+            'column_ids': [
+                Command.create({
+                    'name': "Balance",
+                    'expression_label': 'balance',
+                    'sequence': 1,
+                }),
+            ],
+            'line_ids': [
+                Command.create({
+                    'name': "Title",
+                    'code': 'TT',
+                    'hide_if_zero': True,
+                    'sequence': 0,
+                    'children_ids': [
+                        Command.create({
+                            'name': "report_line_1",
+                            'code': 'TEST_L1',
+                            'sequence': 1,
+                            'expression_ids': [
+                                Command.create({
+                                    'label': 'balance',
+                                    'engine': 'domain',
+                                    'formula': f"[('account_id', '=', {account1.id})]",
+                                    'subformula': 'sum',
+                                    'date_scope': 'from_beginning',
+                                }),
+                            ],
+                        }),
+                        Command.create({
+                            'name': "report_line_2",
+                            'code': 'TEST_L2',
+                            'sequence': 2,
+                            'expression_ids': [
+                                Command.create({
+                                    'label': 'balance',
+                                    'engine': 'domain',
+                                    'formula': f"[('account_id', '=', {account2.id})]",
+                                    'subformula': 'sum',
+                                    'date_scope': 'from_beginning',
+                                }),
+                            ],
+                        }),
+                    ]
+                }),
+            ],
+        })
+
+        # TODO without this, the create() puts newIds in the sublines, and flushing doesn't help. Seems to be an ORM bug.
+        self.env.invalidate_all()
+
+        options = self._generate_options(report, fields.Date.from_string('2019-05-01'), fields.Date.from_string('2019-05-01'))
+        options = self._update_comparison_filter(options, report, 'previous_period', 2)
+
+        self.assertLinesValues(
+            report._get_lines(options),
+            [   0,                                   1,       2,       3],
+            [
+                ("Title",                           '',      '',      ''),
+                ("report_line_1",                  3.0,     3.0,     0.0),
+                ("report_line_2",                 -4.0,    -3.0,     0.0),
+            ],
+            options,
+        )
+
+        move = self.env['account.move'].create({
+            'move_type': 'entry',
+            'date': '2019-05-01',
+            'line_ids': [
+                (0, 0, {'debit': 0.0, 'credit': 3.0, 'account_id': account1.id}),
+                (0, 0, {'debit': 4.0, 'credit': 0.0, 'account_id': account2.id}),
+                (0, 0, {'debit': 0.0, 'credit': 1.0, 'account_id': self.company_data['default_account_revenue'].id}),
+            ],
+        })
+
+        move.action_post()
+        move.line_ids.flush_recordset()
+
+        # With the comparison still on, the lines shouldn't be hidden
+        self.assertLinesValues(
+            report._get_lines(options),
+            [   0,                                   1,       2,       3],
+            [
+                ("Title",                           '',      '',      ''),
+                ("report_line_1",                  0.0,     3.0,     0.0),
+                ("report_line_2",                  0.0,    -3.0,     0.0),
+            ],
+            options,
+        )
+
+        # Removing the comparison should hide the lines, as they will be 0 in every considered period (the current one)
+        options = self._update_comparison_filter(options, report, 'previous_period', 0)
+        self.assertLinesValues(report._get_lines(options), [0, 1, 2, 3], [], options)
+
+    def test_option_hierarchy(self):
+        """ Check that the report lines are correct when the option "Hierarchy and subtotals is ticked"""
+        self.env['account.group'].create({
+            'name': 'Sales',
+            'code_prefix_start': '40',
+            'code_prefix_end': '49',
+        })
+
+        move = self.env['account.move'].create({
+            'date': '2020-02-02',
+            'line_ids': [
+                Command.create({
+                    'account_id': self.company_data['default_account_revenue'].id,
+                    'name': 'name',
+                })
+            ],
+        })
+        move.action_post()
+        move.line_ids.flush_recordset()
+        profit_and_loss_report = self.env.ref('odex30_account_reports.profit_and_loss')
+        line_id = self._get_basic_line_dict_id_from_report_line_ref('odex30_account_reports.account_financial_report_revenue0')
+        options = self._generate_options(profit_and_loss_report, '2020-02-01', '2020-02-28')
+        options['unfolded_lines'] = [line_id]
+        options['hierarchy'] = True
+        self.env.company.totals_below_sections = False
+        lines = profit_and_loss_report._get_lines(options)
+
+        unfolded_lines = profit_and_loss_report._get_unfolded_lines(lines, line_id)
+        unfolded_lines = [{'name': line['name'], 'level': line['level']} for line in unfolded_lines]
+
+        self.assertEqual(
+            unfolded_lines,
+            [
+                {'level': 1, 'name': 'Revenue'},
+                {'level': 2, 'name': '40-49 Sales'},
+                {'level': 3, 'name': '400000 Product Sales'},
+            ]
+        )
+
+    def test_option_hierarchy_with_no_group_lines(self):
+        """ Check that the report lines of 'No Group' have correct ids with the option 'Hierarchy and subtotals' """
+        self.env['account.group'].create({
+            'name': 'Sales',
+            'code_prefix_start': '45',
+            'code_prefix_end': '49',
+        })
+
+        move = self.env['account.move'].create({
+            'date': '2020-02-02',
+            'line_ids': [
+                Command.create({
+                    'account_id': self.company_data['default_account_revenue'].id,
+                    'name': 'name',
+                })
+            ],
+        })
+        move.action_post()
+        move.line_ids.flush_recordset()
+        profit_and_loss_report = self.env.ref('odex30_account_reports.profit_and_loss')
+        line_id = self._get_basic_line_dict_id_from_report_line_ref('odex30_account_reports.account_financial_report_revenue0')
+        options = self._generate_options(profit_and_loss_report, '2020-02-01', '2020-02-28')
+        options['unfolded_lines'] = [line_id]
+        options['hierarchy'] = True
+        self.env.company.totals_below_sections = False
+        lines = profit_and_loss_report._get_lines(options)
+        lines_array = [{'name': line['name'], 'level': line['level']} for line in lines]
+
+        self.assertEqual(
+            lines_array,
+            [
+                {'name': 'Revenue', 'level': 1},
+                {'name': '(No Group)', 'level': 2},
+                {'name': '400000 Product Sales', 'level': 3},
+                {'name': 'Less Costs of Revenue', 'level': 1},
+                {'name': 'Gross Profit', 'level': 0},
+                {'name': 'Less Operating Expenses', 'level': 1},
+                {'name': 'Operating Income (or Loss)', 'level': 0},
+                {'name': 'Plus Other Income', 'level': 1},
+                {'name': 'Less Other Expenses', 'level': 1},
+                {'name': 'Net Profit', 'level': 0},
+            ]
+        )
+
+        self.assertEqual(lines[1]['id'], lines[0]['id'] + '|' + '~account.group~')
+
+    def test_parse_line_id(self):
+        line_id_1 = self.env['account.report']._parse_line_id('markup1~account.account~5|markup2~res.partner~8|markup3~~')
+        line_id_2 = self.env['account.report']._parse_line_id('~account.report~14|{"groupby_prefix_group": "~"}~account.report~21')
+
+        self.assertEqual(line_id_1, [('markup1', 'account.account', 5), ('markup2', 'res.partner', 8), ('markup3', None, None)])
+        self.assertEqual(line_id_2, [('', 'account.report', 14), ({"groupby_prefix_group": "~"}, 'account.report', 21)])
diff --git a/dev_odex30_accounting/odex30_account_reports/tests/test_followup_report.py b/dev_odex30_accounting/odex30_account_reports/tests/test_followup_report.py
new file mode 100644
index 0000000..a6ac0a1
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_reports/tests/test_followup_report.py
@@ -0,0 +1,170 @@
+from .common import TestAccountReportsCommon
+
+from odoo import Command, fields
+from freezegun import freeze_time
+from odoo.tools import format_date
+from odoo.tests import tagged
+
+
+@tagged('post_install', '-at_install')
+class TestFollowupReport(TestAccountReportsCommon):
+
+    @classmethod
+    def setUpClass(cls):
+        super().setUpClass()
+
+        cls.report = cls.env.ref('odex30_account_reports.followup_report')
+        # Initiate Invoices
+        with freeze_time('2025-10-08'):
+            cls.today = fields.Date.today()
+        invoices_data = [
+            # Partner A invoices
+            {'partner': cls.partner_a, 'amount': 100.0, 'due_date': '2025-01-01'},
+            {'partner': cls.partner_a, 'amount': 100.0, 'due_date': cls.today},
+            {'partner': cls.partner_a, 'amount': 100.0, 'due_date': '2025-01-01', 'move_type': 'out_refund'},
+            # Partner B invoices
+            {'partner': cls.partner_b, 'amount': 100.0, 'due_date': '2025-01-01'},
+            {'partner': cls.partner_b, 'amount': 100.0, 'due_date': cls.today},
+            {'partner': cls.partner_b, 'amount': 400.0, 'due_date': '2025-01-01', 'move_type': 'out_refund'},
+        ]
+        for invoice_data in invoices_data:
+            cls.init_invoice(
+                move_type=invoice_data.get('move_type', 'out_invoice'),
+                partner=invoice_data['partner'],
+                amounts=[invoice_data['amount']],
+                invoice_date_due=invoice_data['due_date'],
+                invoice_date=invoice_data.get('invoice_date', '2025-01-01'),
+            )
+        cls.formatted_today = format_date(cls.env, cls.today, date_format='MM/dd/YYY')
+
+    @classmethod
+    def init_invoice(cls, move_type, partner=None, invoice_date=None, post=False, products=None, amounts=None, taxes=None, company=False, currency=None, journal=None, invoice_date_due=None):
+        move = super().init_invoice(move_type, partner, invoice_date, False, products, amounts, taxes, company, currency, journal)
+        if invoice_date_due:
+            move.invoice_payment_term_id = False
+            move.invoice_date_due = invoice_date_due
+        move.action_post()
+        return move
+
+    @freeze_time('2025-10-08')
+    def test_followup_report_unfold(self):
+        ''' Test unfolding a line when rendering the whole report, having overdue and due sections '''
+        options = self._generate_options(self.report, fields.Date.from_string('2025-01-01'), fields.Date.from_string('2025-01-31'))
+        self.assertLinesValues(
+            self.report._get_lines(options),
+            #   Name                                  Amount          Balance
+            [   0,                                      3,              5],
+            [
+                ('partner_a',                       100.0,          100.0),
+                ('partner_b',                      -200.0,         -200.0),
+                ('Total',                          -100.0,         -100.0),
+            ],
+            options
+        )
+
+        options['unfolded_lines'] = [self.report._get_generic_line_id('res.partner', self.partner_a.id)]
+        self.assertLinesValues(
+            self.report._get_lines(options),
+            #   Name                                    Due Date        Amount        Balance
+            [   0,                                            2,            3,              5],
+            [
+                ('partner_a',                                '',        100.0,          100.0),
+                ('Overdue',                                  '',           '',             ''),
+                ('INV/2025/00001',                 '01/01/2025',        100.0,          100.0),
+                ('RINV/2025/00001',                '01/01/2025',       -100.0,            0.0),
+                ('Due',                                      '',           '',             ''),
+                ('INV/2025/00002',         self.formatted_today,        100.0,          100.0),
+                ('Total partner_a',                          '',        100.0,          100.0),
+                ('partner_b',                                '',       -200.0,         -200.0),
+                ('Total',                                    '',       -100.0,         -100.0),
+            ],
+            options
+        )
+
+    @freeze_time('2025-10-08')
+    def test_followup_report_load_more(self):
+        ''' Test loading more lines when reaching the limit '''
+        self.report.load_more_limit = 2
+
+        invoices_data = [
+            {'amount': 100.0, 'due_date': '2024-12-03'},
+            {'amount': 100.0, 'due_date': self.today}
+        ]
+
+        for invoice_data in invoices_data:
+            self.init_invoice(
+                move_type='out_invoice',
+                partner=self.partner_a,
+                amounts=[invoice_data['amount']],
+                invoice_date_due=invoice_data['due_date'],
+                invoice_date='2025-01-01',
+            )
+
+        options = self._generate_options(self.report, fields.Date.from_string('2025-01-01'), fields.Date.from_string('2025-01-31'))
+        options['unfolded_lines'] = [self.report._get_generic_line_id('res.partner', self.partner_a.id)]
+
+        report_lines = self.report._get_lines(options)
+
+        self.assertLinesValues(
+            report_lines,
+            #   Name                                    Due Date        Amount       Balance
+            [   0,                                            2,            3,             5],
+            [
+                ('partner_a',                                '',        300.0,         300.0),
+                ('Overdue',                                  '',           '',            ''),
+                ('INV/2025/00005',                 '12/03/2024',        100.0,         100.0),
+                ('INV/2025/00001',                 '01/01/2025',        100.0,         200.0),
+                ('Load more...',                             '',           '',            ''),
+                ('Total partner_a',                          '',        300.0,         300.0),
+                ('partner_b',                                '',       -200.0,        -200.0),
+                ('Total',                                    '',        100.0,         100.0),
+            ],
+            options
+        )
+
+        options['unfolded_lines'] = [line['id'] for line in report_lines if line.get('unfolded')]
+
+        load_more_1 = self.report.get_expanded_lines(
+            options,
+            report_lines[0]['id'],
+            report_lines[4]['groupby'],
+            '_report_expand_unfoldable_line_partner_ledger',
+            report_lines[4]['progress'],
+            report_lines[4]['offset'],
+            None,
+        )
+
+        self.assertLinesValues(
+            load_more_1,
+            #   Name                                    Due Date        Amount          Balance
+            [   0,                                            2,            3,             5],
+            [
+                ('RINV/2025/00001',                '01/01/2025',       -100.0,         100.0),
+                ('Due',                                      '',           '',            ''),
+                ('INV/2025/00002',         self.formatted_today,        100.0,         200.0),
+                ('Load more...',                             '',           '',            ''),
+            ],
+            options
+        )
+
+        options['unfolded_lines'] = options['unfolded_lines'] + [line['id'] for line in load_more_1 if line.get('unfolded')]
+
+        load_more_2 = self.report.get_expanded_lines(
+            options,
+            report_lines[0]['id'],
+            load_more_1[3]['groupby'],
+            '_report_expand_unfoldable_line_partner_ledger',
+            load_more_1[3]['progress'],
+            load_more_1[3]['offset'],
+            None,
+        )
+
+        self.assertLinesValues(
+            load_more_2,
+            #   Name                                    Due Date        Amount          Balance
+            [   0,                                            2,            3,             5],
+            [
+                ('INV/2025/00006',         self.formatted_today,        100.0,          300.0),
+            ],
+            options
+        )
diff --git a/dev_odex30_accounting/odex30_account_reports/tests/test_general_ledger_report.py b/dev_odex30_accounting/odex30_account_reports/tests/test_general_ledger_report.py
new file mode 100644
index 0000000..3252a4d
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_reports/tests/test_general_ledger_report.py
@@ -0,0 +1,686 @@
+# -*- coding: utf-8 -*-
+# pylint: disable=C0326
+from .common import TestAccountReportsCommon
+import odoo.tests
+
+from odoo import fields, Command
+from odoo.tests import tagged
+from freezegun import freeze_time
+
+import json
+
+@tagged('post_install', '-at_install')
+class TestGeneralLedgerReport(TestAccountReportsCommon, odoo.tests.HttpCase):
+    @classmethod
+    def setUpClass(cls):
+        super().setUpClass()
+
+        # Give codes in company_1 to the accounts in company_2.
+        context = {'allowed_company_ids': [cls.company_data['company'].id, cls.company_data_2['company'].id]}
+        cls.company_data_2['default_account_payable'].with_context(context).code = '211010'
+        cls.company_data_2['default_account_revenue'].with_context(context).code = '400010'
+        cls.company_data_2['default_account_expense'].with_context(context).code = '600010'
+        cls.env['account.account'].search([
+            ('company_ids', '=', cls.company_data_2['company'].id),
+            ('account_type', '=', 'equity_unaffected')
+        ]).with_context(context).code = '999989'
+
+        # Entries in 2016 for company_1 to test the initial balance.
+        cls.move_2016_1 = cls.env['account.move'].create({
+            'move_type': 'entry',
+            'date': fields.Date.from_string('2016-01-01'),
+            'journal_id': cls.company_data['default_journal_misc'].id,
+            'line_ids': [
+                (0, 0, {'debit': 100.0,     'credit': 0.0,      'name': '2016_1_1',     'account_id': cls.company_data['default_account_payable'].id}),
+                (0, 0, {'debit': 200.0,     'credit': 0.0,      'name': '2016_1_2',     'account_id': cls.company_data['default_account_expense'].id}),
+                (0, 0, {'debit': 0.0,       'credit': 300.0,    'name': '2016_1_3',     'account_id': cls.company_data['default_account_revenue'].id}),
+            ],
+        })
+        cls.move_2016_1.action_post()
+
+        # Entries in 2016 for company_2 to test the initial balance in multi-companies/multi-currencies.
+        cls.move_2016_2 = cls.env['account.move'].create({
+            'move_type': 'entry',
+            'date': fields.Date.from_string('2016-06-01'),
+            'journal_id': cls.company_data_2['default_journal_misc'].id,
+            'line_ids': [
+                (0, 0, {'debit': 100.0,     'credit': 0.0,      'name': '2016_2_1',     'account_id': cls.company_data_2['default_account_payable'].id}),
+                (0, 0, {'debit': 0.0,       'credit': 100.0,    'name': '2016_2_2',     'account_id': cls.company_data_2['default_account_revenue'].id}),
+            ],
+        })
+        cls.move_2016_2.action_post()
+
+        # Entry in 2017 for company_1 to test the report at current date.
+        cls.move_2017_1 = cls.env['account.move'].create({
+            'move_type': 'entry',
+            'date': fields.Date.from_string('2017-01-01'),
+            'journal_id': cls.company_data['default_journal_sale'].id,
+            'line_ids': [
+                (0, 0, {'debit': 1000.0,    'credit': 0.0,      'name': '2017_1_1',     'account_id': cls.company_data['default_account_receivable'].id}),
+                (0, 0, {'debit': 2000.0,    'credit': 0.0,      'name': '2017_1_2',     'account_id': cls.company_data['default_account_revenue'].id}),
+                (0, 0, {'debit': 3000.0,    'credit': 0.0,      'name': '2017_1_3',     'account_id': cls.company_data['default_account_revenue'].id}),
+                (0, 0, {'debit': 4000.0,    'credit': 0.0,      'name': '2017_1_4',     'account_id': cls.company_data['default_account_revenue'].id}),
+                (0, 0, {'debit': 5000.0,    'credit': 0.0,      'name': '2017_1_5',     'account_id': cls.company_data['default_account_revenue'].id}),
+                (0, 0, {'debit': 6000.0,    'credit': 0.0,      'name': '2017_1_6',     'account_id': cls.company_data['default_account_revenue'].id}),
+                (0, 0, {'debit': 0.0,       'credit': 6000.0,   'name': '2017_1_7',     'account_id': cls.company_data['default_account_expense'].id}),
+                (0, 0, {'debit': 0.0,       'credit': 7000.0,   'name': '2017_1_8',     'account_id': cls.company_data['default_account_expense'].id}),
+                (0, 0, {'debit': 0.0,       'credit': 8000.0,   'name': '2017_1_9',     'account_id': cls.company_data['default_account_expense'].id}),
+            ],
+        })
+        cls.move_2017_1.action_post()
+
+        # Entry in 2017 for company_2 to test the current period in multi-companies/multi-currencies.
+        cls.move_2017_2 = cls.env['account.move'].create({
+            'move_type': 'entry',
+            'date': fields.Date.from_string('2017-06-01'),
+            'journal_id': cls.company_data_2['default_journal_bank'].id,
+            'line_ids': [
+                (0, 0, {'debit': 400.0,     'credit': 0.0,      'name': '2017_2_1',     'account_id': cls.company_data_2['default_account_expense'].id}),
+                (0, 0, {'debit': 0.0,       'credit': 400.0,    'name': '2017_2_2',     'account_id': cls.company_data_2['default_account_revenue'].id}),
+            ],
+        })
+        cls.move_2017_2.action_post()
+
+        # Archive 'default_journal_bank' to ensure archived entries are not filtered out.
+        cls.company_data_2['default_journal_bank'].active = False
+
+        # Deactive all currencies to ensure group_multi_currency is disabled.
+        cls.env['res.currency'].search([('name', '!=', 'USD')]).with_context(force_deactivate=True).active = False
+
+        cls.report = cls.env.ref('odex30_account_reports.general_ledger_report')
+
+    # -------------------------------------------------------------------------
+    # TESTS: General Ledger
+    # -------------------------------------------------------------------------
+    def test_general_ledger_unaffected_earnings_current_fiscal_year(self):
+        def invoice_move(date):
+            return self.env['account.move'].create({
+                'move_type': 'entry',
+                'date': fields.Date.from_string(date),
+                'journal_id': self.company_data['default_journal_misc'].id,
+                'line_ids': [
+                    (0, 0, {'debit': 1000.0, 'credit': 0.0,    'name': 'payable', 'account_id': self.company_data['default_account_payable'].id}),
+                    (0, 0, {'debit': 2000.0, 'credit': 0.0,    'name': 'expense', 'account_id': self.company_data['default_account_expense'].id}),
+                    (0, 0, {'debit': 0.0,    'credit': 3000.0, 'name': 'revenue', 'account_id': self.company_data['default_account_revenue'].id}),
+                ],
+            })
+
+        move_2009_12 = invoice_move('2009-12-31')
+        move_2009_12.action_post()
+
+        move_2010_01 = invoice_move('2010-01-31')
+        move_2010_01.action_post()
+
+        move_2010_02 = self.env['account.move'].create({
+            'move_type': 'entry',
+            'date': fields.Date.from_string('2010-02-01'),
+            'journal_id': self.company_data['default_journal_misc'].id,
+            'line_ids': [
+                (0, 0, {'debit': 100.0, 'credit': 0.0,    'name': 'payable', 'account_id': self.company_data['default_account_payable'].id}),
+                (0, 0, {'debit': 200.0, 'credit': 0.0,    'name': 'expense', 'account_id': self.company_data['default_account_expense'].id}),
+                (0, 0, {'debit': 0.0,    'credit': 300.0, 'name': 'revenue', 'account_id': self.company_data['default_account_revenue'].id}),
+            ],
+        })
+        move_2010_02.action_post()
+
+        move_2010_03 = invoice_move('2010-03-01')
+        move_2010_03.action_post()
+
+        options = self._generate_options(self.report, fields.Date.from_string('2010-02-01'), fields.Date.from_string('2010-02-28'))
+
+        self.assertLinesValues(
+            self.report._get_lines(options),
+            #   Name                                    Debit           Credit          Balance
+            [   0,                                      4,              5,              6],
+            [
+                ('211000 Account Payable',              2100.0,         0.0,            2100.0),
+                ('400000 Product Sales',                0.0,            3300.0,         -3300.0),
+                ('600000 Expenses',                     2200.0,         0.0,            2200.0),
+                ('999999 Undistributed Profits/Losses', 2000.0,         3000.0,         -1000.0),
+                ('Total',                               6300.0,         6300.0,         0.0),
+            ],
+            options,
+        )
+
+    def test_general_ledger_unaffected_earnings_previous_fiscal_year(self):
+        def invoice_move(date):
+            return self.env['account.move'].create({
+                'move_type': 'entry',
+                'date': fields.Date.from_string(date),
+                'journal_id': self.company_data['default_journal_misc'].id,
+                'line_ids': [
+                    (0, 0, {'debit': 1000.0, 'credit': 0.0,    'name': 'payable', 'account_id': self.company_data['default_account_payable'].id}),
+                    (0, 0, {'debit': 2000.0, 'credit': 0.0,    'name': 'expense', 'account_id': self.company_data['default_account_expense'].id}),
+                    (0, 0, {'debit': 0.0,    'credit': 3000.0, 'name': 'revenue', 'account_id': self.company_data['default_account_revenue'].id}),
+                ],
+            })
+
+        move_2009_12 = invoice_move('2009-12-31')
+        move_2009_12.action_post()
+
+        move_2010_01 = invoice_move('2010-01-31')
+        move_2010_01.action_post()
+
+        move_2010_02 = self.env['account.move'].create({
+            'move_type': 'entry',
+            'date': fields.Date.from_string('2010-02-01'),
+            'journal_id': self.company_data['default_journal_misc'].id,
+            'line_ids': [
+                (0, 0, {'debit': 100.0, 'credit': 0.0,    'name': 'payable', 'account_id': self.company_data['default_account_payable'].id}),
+                (0, 0, {'debit': 200.0, 'credit': 0.0,    'name': 'expense', 'account_id': self.company_data['default_account_expense'].id}),
+                (0, 0, {'debit': 0.0,    'credit': 300.0, 'name': 'revenue', 'account_id': self.company_data['default_account_revenue'].id}),
+            ],
+        })
+        move_2010_02.action_post()
+
+        move_2010_03 = invoice_move('2010-03-01')
+        move_2010_03.action_post()
+
+        options = self._generate_options(self.report, fields.Date.from_string('2010-01-01'), fields.Date.from_string('2010-02-28'))
+
+        self.assertLinesValues(
+            self.report._get_lines(options),
+            #   Name                                    Debit           Credit          Balance
+            [   0,                                      4,              5,              6],
+            [
+                ('211000 Account Payable',              2100.0,         0.0,             2100.0),
+                ('400000 Product Sales',                0.0,            3300.0,         -3300.0),
+                ('600000 Expenses',                     2200.0,         0.0,             2200.0),
+                ('999999 Undistributed Profits/Losses', 2000.0,         3000.0,         -1000.0),
+                ('Total',                               6300.0,         6300.0,         0.0),
+            ],
+            options,
+        )
+
+    def test_general_ledger_fold_unfold_multicompany_multicurrency(self):
+        ''' Test unfolding a line when rendering the whole report. '''
+        options = self._generate_options(self.report, fields.Date.from_string('2017-01-01'), fields.Date.from_string('2017-12-31'))
+
+        self.assertLinesValues(
+            self.report._get_lines(options),
+            #   Name                                    Debit           Credit          Balance
+            [   0,                                      4,              5,              6],
+            [
+                ('121000 Account Receivable',           1000.0,         0.0,            1000.0),
+                ('211000 Account Payable',              100.0,          0.0,            100.0),
+                ('211010 Account Payable',              50.0,           0.0,            50.0),
+                ('400000 Product Sales',                20000.0,        0.0,            20000.0),
+                ('400010 Product Sales',                0.0,            200.0,          -200.0),
+                ('600000 Expenses',                     0.0,            21000.0,        -21000.0),
+                ('600010 Expenses',                     200.0,          0.0,            200.0),
+                ('999989 Undistributed Profits/Losses', 0.0,            50.0,           -50.0),
+                ('999999 Undistributed Profits/Losses', 200.0,          300.0,          -100.0),
+                ('Total',                               21550.0,        21550.0,        0.0),
+            ],
+            options,
+        )
+
+        options['unfold_all'] = True
+
+        self.assertLinesValues(
+            self.report._get_lines(options),
+            #   Name                                    Debit           Credit          Balance
+            [   0,                                      4,              5,              6],
+            [
+                ('121000 Account Receivable',           1000.0,         0.0,            1000.0),
+                ('INV/2017/00001',                      1000.0,         0.0,            1000.0),
+                ('Total 121000 Account Receivable',     1000.0,         0.0,            1000.0),
+                ('211000 Account Payable',              100.0,          0.0,            100.0),
+                ('211010 Account Payable',              50.0,           0.0,            50.0),
+                ('400000 Product Sales',                20000.0,        0.0,            20000.0),
+                ('INV/2017/00001',                      2000.0,         0.0,            2000.0),
+                ('INV/2017/00001',                      3000.0,         0.0,            5000.0),
+                ('INV/2017/00001',                      4000.0,         0.0,            9000.0),
+                ('INV/2017/00001',                      5000.0,         0.0,            14000.0),
+                ('INV/2017/00001',                      6000.0,         0.0,            20000.0),
+                ('Total 400000 Product Sales',          20000.0,        0.0,            20000.0),
+                ('400010 Product Sales',                0.0,            200.0,          -200.0),
+                ('BNK1/2017/00001',                     0.0,            200.0,          -200.0),
+                ('Total 400010 Product Sales',          0.0,            200.0,          -200.0),
+                ('600000 Expenses',                     0.0,            21000.0,        -21000.0),
+                ('INV/2017/00001',                      0.0,            6000.0,         -6000.0),
+                ('INV/2017/00001',                      0.0,            7000.0,         -13000.0),
+                ('INV/2017/00001',                      0.0,            8000.0,         -21000.0),
+                ('Total 600000 Expenses',               0.0,            21000.0,        -21000.0),
+                ('600010 Expenses',                     200.0,          0.0,            200.0),
+                ('BNK1/2017/00001',                     200.0,          0.0,            200.0),
+                ('Total 600010 Expenses',               200.0,          0.0,            200.0),
+                ('999989 Undistributed Profits/Losses', 0.0,            50.0,           -50.0),
+                ('999999 Undistributed Profits/Losses', 200.0,          300.0,          -100.0),
+                ('Total',                               21550.0,        21550.0,        0.0),
+            ],
+            options,
+        )
+
+    def test_general_ledger_multiple_years_initial_balance(self):
+        # Entries in 2015 for company_1 to test the initial balance.
+        move_2015_1 = self.env['account.move'].create({
+            'move_type': 'entry',
+            'date': fields.Date.from_string('2015-01-01'),
+            'journal_id': self.company_data['default_journal_misc'].id,
+            'line_ids': [
+                (0, 0, {'debit': 100.0,     'credit': 0.0,      'name': '2015_1_1',     'account_id': self.company_data['default_account_payable'].id}),
+                (0, 0, {'debit': 200.0,     'credit': 0.0,      'name': '2015_1_2',     'account_id': self.company_data['default_account_expense'].id}),
+                (0, 0, {'debit': 0.0,       'credit': 300.0,    'name': '2015_1_3',     'account_id': self.company_data['default_account_revenue'].id}),
+            ],
+        })
+        move_2015_1.action_post()
+
+        options = self._generate_options(self.report, fields.Date.from_string('2017-01-01'), fields.Date.from_string('2017-12-31'))
+
+        self.assertLinesValues(
+            self.report._get_lines(options),
+            #   Name                                    Debit           Credit          Balance
+            [   0,                                      4,              5,              6],
+            [
+                ('121000 Account Receivable',           1000.0,         0.0,            1000.0),
+                ('211000 Account Payable',              200.0,          0.0,            200.0),
+                ('211010 Account Payable',              50.0,           0.0,            50.0),
+                ('400000 Product Sales',                20000.0,        0.0,            20000.0),
+                ('400010 Product Sales',                0.0,            200.0,          -200.0),
+                ('600000 Expenses',                     0.0,            21000.0,        -21000.0),
+                ('600010 Expenses',                     200.0,          0.0,            200.0),
+                ('999989 Undistributed Profits/Losses', 0.0,            50.0,           -50.0),
+                ('999999 Undistributed Profits/Losses', 400.0,          600.0,          -200.0),
+                ('Total',                               21850.0,        21850.0,        0.0),
+            ],
+            options,
+        )
+
+        options['unfold_all'] = True
+
+        self.assertLinesValues(
+            self.report._get_lines(options),
+            #   Name                                    Debit           Credit          Balance
+            [   0,                                      4,              5,              6],
+            [
+                ('121000 Account Receivable',           1000.0,         0.0,            1000.0),
+                ('INV/2017/00001',                      1000.0,         0.0,            1000.0),
+                ('Total 121000 Account Receivable',     1000.0,         0.0,            1000.0),
+                ('211000 Account Payable',              200.0,          0.0,            200.0),
+                ('211010 Account Payable',              50.0,           0.0,            50.0),
+                ('400000 Product Sales',                20000.0,        0.0,            20000.0),
+                ('INV/2017/00001',                      2000.0,         0.0,            2000.0),
+                ('INV/2017/00001',                      3000.0,         0.0,            5000.0),
+                ('INV/2017/00001',                      4000.0,         0.0,            9000.0),
+                ('INV/2017/00001',                      5000.0,         0.0,            14000.0),
+                ('INV/2017/00001',                      6000.0,         0.0,            20000.0),
+                ('Total 400000 Product Sales',          20000.0,        0.0,            20000.0),
+                ('400010 Product Sales',                0.0,            200.0,          -200.0),
+                ('BNK1/2017/00001',                     0.0,            200.0,          -200.0),
+                ('Total 400010 Product Sales',          0.0,            200.0,          -200.0),
+                ('600000 Expenses',                     0.0,            21000.0,        -21000.0),
+                ('INV/2017/00001',                      0.0,            6000.0,         -6000.0),
+                ('INV/2017/00001',                      0.0,            7000.0,         -13000.0),
+                ('INV/2017/00001',                      0.0,            8000.0,         -21000.0),
+                ('Total 600000 Expenses',               0.0,            21000.0,        -21000.0),
+                ('600010 Expenses',                     200.0,          0.0,            200.0),
+                ('BNK1/2017/00001',                     200.0,          0.0,            200.0),
+                ('Total 600010 Expenses',               200.0,          0.0,            200.0),
+                ('999989 Undistributed Profits/Losses', 0.0,            50.0,           -50.0),
+                ('999999 Undistributed Profits/Losses', 400.0,          600.0,          -200.0),
+                ('Total',                               21850.0,        21850.0,        0.0),
+            ],
+            options,
+        )
+
+    def test_general_ledger_load_more(self):
+        ''' Test unfolding a line to use the load more. '''
+        self.env.companies = self.env.company
+        self.report.load_more_limit = 2
+
+        options = self._generate_options(self.report, fields.Date.from_string('2017-01-01'), fields.Date.from_string('2017-12-31'))
+        options['unfolded_lines'] = [self.report._get_generic_line_id('account.account', self.company_data["default_account_revenue"].id)]
+
+        report_lines = self.report._get_lines(options)
+
+        self.assertLinesValues(
+            report_lines,
+            #   Name                                    Debit           Credit          Balance
+            [   0,                                      4,              5,              6],
+            [
+                ('121000 Account Receivable',           1000.0,         0.0,            1000.0),
+                ('211000 Account Payable',              100.0,          0.0,            100.0),
+                ('400000 Product Sales',                20000.0,        0.0,            20000.0),
+                ('INV/2017/00001',                      2000.0,         0.0,            2000.0),
+                ('INV/2017/00001',                      3000.0,         0.0,            5000.0),
+                ('Load more...',                        '',             '',             ''),
+                ('Total 400000 Product Sales',          20000.0,        0.0,            20000.0),
+                ('600000 Expenses',                     0.0,            21000.0,        -21000.0),
+                ('999999 Undistributed Profits/Losses', 200.0,          300.0,          -100.0),
+                ('Total',                               21300.0,        21300.0,        0.0),
+            ],
+            options,
+        )
+
+        load_more_1 = self.report.get_expanded_lines(
+            options,
+            report_lines[3]['id'],
+            report_lines[6]['groupby'],
+            '_report_expand_unfoldable_line_general_ledger',
+            report_lines[6]['progress'],
+            report_lines[6]['offset'],
+            None,
+        )
+
+        self.assertLinesValues(
+            load_more_1,
+            #   Name                                    Debit           Credit          Balance
+            [   0,                                      4,              5,              6],
+            [
+                ('INV/2017/00001',                      4000.0,         0.0,            9000.0),
+                ('INV/2017/00001',                      5000.0,         0.0,            14000.0),
+                ('Load more...',                        '',             '',             ''),
+            ],
+            options,
+        )
+
+        load_more_2 = self.report.get_expanded_lines(
+            options,
+            report_lines[3]['id'],
+            load_more_1[2]['groupby'],
+            '_report_expand_unfoldable_line_general_ledger',
+            load_more_1[2]['progress'],
+            load_more_1[2]['offset'],
+            None,
+        )
+
+        self.assertLinesValues(
+            load_more_2,
+            #   Name                                    Debit           Credit          Balance
+            [   0,                                      4,              5,              6],
+            [
+                ('INV/2017/00001',                      6000.0,         0.0,            20000.0),
+            ],
+            options,
+        )
+
+    def test_general_ledger_foreign_currency_account(self):
+        ''' Ensure the total in foreign currency of an account is displayed only if all journal items are sharing the
+        same currency.
+        '''
+        self.env.user.groups_id |= self.env.ref('base.group_multi_currency')
+
+        foreign_curr_account = self.env['account.account'].create({
+            'name': 'foreign_curr_account',
+            'code': 'test',
+            'account_type': 'liability_current',
+            'currency_id': self.other_currency.id,
+        })
+
+        move_2016 = self.env['account.move'].create({
+            'move_type': 'entry',
+            'date': '2016-01-01',
+            'journal_id': self.company_data['default_journal_sale'].id,
+            'line_ids': [
+                (0, 0, {
+                    'name': 'curr_1',
+                    'debit': 100.0,
+                    'credit': 0.0,
+                    'amount_currency': 100.0,
+                    'currency_id': self.company_data['currency'].id,
+                    'account_id': self.company_data['default_account_receivable'].id,
+                }),
+                (0, 0, {
+                    'name': 'curr_2',
+                    'debit': 0.0,
+                    'credit': 100.0,
+                    'amount_currency': -300.0,
+                    'currency_id': self.other_currency.id,
+                    'account_id': foreign_curr_account.id,
+                }),
+            ],
+        })
+        move_2016.action_post()
+
+        move_2017 = self.env['account.move'].create({
+            'move_type': 'entry',
+            'date': '2017-01-01',
+            'journal_id': self.company_data['default_journal_sale'].id,
+            'line_ids': [
+                (0, 0, {
+                    'name': 'curr_1',
+                    'debit': 1000.0,
+                    'credit': 0.0,
+                    'amount_currency': 1000.0,
+                    'currency_id': self.company_data['currency'].id,
+                    'account_id': self.company_data['default_account_receivable'].id,
+                }),
+                (0, 0, {
+                    'name': 'curr_2',
+                    'debit': 0.0,
+                    'credit': 1000.0,
+                    'amount_currency': -2000.0,
+                    'currency_id': self.other_currency.id,
+                    'account_id': foreign_curr_account.id,
+                }),
+            ],
+        })
+        move_2017.action_post()
+        move_2017.line_ids.flush_recordset()
+
+        # Init options.
+        options = self._generate_options(self.report, fields.Date.from_string('2017-01-01'), fields.Date.from_string('2017-12-31'))
+        options['unfolded_lines'] = [self.report._get_generic_line_id('account.account', foreign_curr_account.id)]
+
+        self.assertLinesValues(
+            self.report._get_lines(options),
+            #   Name                                    Amount_currency Debit           Credit          Balance
+            [   0,                                      4,              5,              6,              7],
+            [
+                ('121000 Account Receivable',           '',             2100.0,         0.0,            2100.0),
+                ('211000 Account Payable',              '',             100.0,          0.0,            100.0),
+                ('211010 Account Payable',              '',             50.0,           0.0,            50.0),
+                ('400000 Product Sales',                '',             20000.0,        0.0,            20000.0),
+                ('400010 Product Sales',                '',             0.0,            200.0,          -200.0),
+                ('600000 Expenses',                     '',             0.0,            21000.0,        -21000.0),
+                ('600010 Expenses',                     '',             200.0,          0.0,            200.0),
+                ('999989 Undistributed Profits/Losses', '',             0.0,            50.0,           -50.0),
+                ('999999 Undistributed Profits/Losses', '',             200.0,          300.0,          -100.0),
+                ('test foreign_curr_account',           -2300.0,        0.0,            1100.0,         -1100.0),
+                ('Initial Balance',                     -300.0,         0.0,            100.0,          -100.0),
+                ('INV/2017/00002',                      -2000.0,        0.0,            1000.0,         -1100.0),
+                ('Total test foreign_curr_account',     -2300.0,        0.0,            1100.0,         -1100.0),
+                ('Total',                               '',             22650.0,        22650.0,        0.0),
+            ],
+            options,
+            currency_map={4: {'currency': self.other_currency}},
+        )
+
+    def test_general_ledger_filter_search_bar_print(self):
+        """ Test the lines generated when a user filters on the search bar and prints the report """
+        options = self._generate_options(self.report, '2017-01-01', '2017-12-31', default_options={'export_mode': 'print'})
+        options['filter_search_bar'] = '400'
+        options['unfold_all'] = True
+
+        self.assertLinesValues(
+            self.report._get_lines(options),
+            #   Name                                    Debit           Credit          Balance
+            [   0,                                      4,              5,              6],
+            [
+                ('400000 Product Sales',                20000.0,          0.0,          20000.0),
+                ('INV/2017/00001',                       2000.0,          0.0,           2000.0),
+                ('INV/2017/00001',                       3000.0,          0.0,           5000.0),
+                ('INV/2017/00001',                       4000.0,          0.0,           9000.0),
+                ('INV/2017/00001',                       5000.0,          0.0,           14000.0),
+                ('INV/2017/00001',                       6000.0,          0.0,           20000.0),
+                ('Total 400000 Product Sales',          20000.0,          0.0,          20000.0),
+                ('400010 Product Sales',                    0.0,        200.0,           -200.0),
+                ('BNK1/2017/00001',                         0.0,        200.0,           -200.0),
+                ('Total 400010 Product Sales',              0.0,        200.0,           -200.0),
+                ('Total',                               20000.0,        200.0,          19800.0),
+            ],
+            options,
+        )
+
+        options['filter_search_bar'] = '999'
+
+        self.assertLinesValues(
+            self.report._get_lines(options),
+            #   Name                                          Debit           Credit          Balance
+            [   0,                                            4,              5,              6],
+            [
+                ('999989 Undistributed Profits/Losses',         0.0,           50.0,           -50.0),
+                ('999999 Undistributed Profits/Losses',       200.0,          300.0,          -100.0),
+                ('Total',                                     200.0,          350.0,          -150.0),
+            ],
+            options,
+        )
+
+    def test_general_ledger_communication(self):
+        invoice_1 = self.env['account.move'].create({
+            'move_type': 'out_invoice',
+            'partner_id': self.partner_a.id,
+            'invoice_date': '2010-01-01',
+            'payment_reference': 'payment_ref1',
+            'ref': 'ref1',
+            'invoice_line_ids': [(0, 0, {
+                'name': 'test1',
+                'tax_ids': [],
+                'quantity': 1,
+                'price_unit': 1,
+            })]
+        })
+        invoice_1.action_post()
+
+        invoice_2 = self.env['account.move'].create({
+            'move_type': 'out_invoice',
+            'partner_id': self.partner_a.id,
+            'invoice_date': '2010-01-01',
+            'payment_reference': 'payment_ref2',
+            'invoice_line_ids': [(0, 0, {
+                'name': 'test2',
+                'tax_ids': [],
+                'quantity': 1,
+                'price_unit': 2,
+            })]
+        })
+        invoice_2.action_post()
+
+        self.env.company.totals_below_sections = False
+        options = self._generate_options(self.report, '2010-01-01', '2010-01-01', default_options={'unfold_all': True})
+        self.assertLinesValues(
+            self.report._get_lines(options),
+            #   Name                                    Communication
+            [   0,                                      2],
+            [
+                ('121000 Account Receivable',           ''),
+                (invoice_1.name,                        'ref1 - payment_ref1'),
+                (invoice_2.name,                        'payment_ref2'),
+                ('400000 Product Sales',                ''),
+                (invoice_1.name,                        'ref1 - test1'),
+                (invoice_2.name,                        'test2'),
+                ('Total',                               ''),
+            ],
+            options,
+        )
+
+    def test_general_ledger_income_expense_initial_balance(self):
+        ''' Test that when the report period does not start at the beginning of the FY,
+            any AMLs prior to the report period but after the beginning of the FY are
+            displayed in the initial balance for Income and Expense accounts. '''
+
+        self.env.companies = self.env.company
+
+        move_2017 = self.env['account.move'].create({
+            'move_type': 'entry',
+            'date': fields.Date.from_string('2017-02-01'),
+            'journal_id': self.company_data['default_journal_sale'].id,
+            'line_ids': [
+                Command.create({'debit': 1000.0, 'credit':    0.0, 'name': '2017_3_1', 'account_id': self.company_data['default_account_receivable'].id}),
+                Command.create({'debit':    0.0, 'credit': 1000.0, 'name': '2017_3_2', 'account_id': self.company_data['default_account_revenue'].id}),
+            ],
+        })
+        move_2017.action_post()
+
+        # Init options.
+        options = self._generate_options(self.report, '2017-02-01', '2017-03-01')
+        options['unfolded_lines'] = [self.report._get_generic_line_id('account.account', self.company_data['default_account_revenue'].id)]
+
+        self.assertLinesValues(
+            self.report._get_lines(options),
+            #   Name                                    Debit           Credit          Balance
+            [   0,                                            4,             5,                6],
+            [
+                ('121000 Account Receivable',            2000.0,           0.0,           2000.0),
+                ('211000 Account Payable',                100.0,           0.0,            100.0),
+                ('400000 Product Sales',                20000.0,        1000.0,          19000.0),
+                ('Initial Balance',                     20000.0,           0.0,          20000.0),
+                ('INV/2017/00002',                          0.0,        1000.0,          19000.0),
+                ('Total 400000 Product Sales',          20000.0,        1000.0,          19000.0),
+                ('600000 Expenses',                         0.0,       21000.0,         -21000.0),
+                ('999999 Undistributed Profits/Losses',   200.0,         300.0,           -100.0),
+                ('Total',                               22300.0,       22300.0,              0.0),
+            ],
+            options,
+        )
+
+    @freeze_time('2017-07-11')
+    def test_tour_account_reports_search(self):
+        move_07_2017 = self.env['account.move'].create({
+            'move_type': 'entry',
+            'date': fields.Date.from_string('2017-07-10'),
+            'journal_id': self.company_data['default_journal_sale'].id,
+            'line_ids': [
+                (0, 0, {'debit': 1000.0, 'credit': 0.0, 'name': '2017_1_1',
+                        'account_id': self.company_data['default_account_receivable'].id}),
+                (0, 0, {'debit': 0.0, 'credit': 1000.0, 'name': '2017_1_2',
+                        'account_id': self.company_data['default_account_revenue'].id}),
+            ],
+        })
+        move_07_2017.action_post()
+
+        self.start_tour("/odoo", 'account_reports_search', login=self.env.user.login)
+
+    def test_general_ledger_hierarchy_non_numerical_column_value(self):
+        """
+            This test will check the value of the different (non-numerical) columns of the general ledger in case the
+            hierarchy options is enabled
+        """
+        options = self._generate_options(self.report, '2017-01-01', '2017-12-31')
+        options['hierarchy'] = True
+
+        # String and Date figure type should be empty when using hierarchy.
+        self.assertLinesValues(
+            self.report._get_lines(options),
+            #   Name                     Date           Communication          Partner
+            [0,                             1,                     2,                3],
+            [
+                ('(No Group)',             '',                    '',               ''),
+                ('Total',                  '',                    '',               ''),
+            ],
+            options,
+        )
+
+    def test_general_ledger_same_date_ordering(self):
+        self.env.company.account_sale_tax_id = None
+        self.env.company.totals_below_sections = False
+
+        report = self.env.ref('odex30_account_reports.general_ledger_report')
+        options = self._generate_options(report, fields.Date.from_string('2010-01-01'), fields.Date.from_string('2010-01-01'), default_options={'unfold_all': True})
+
+        move_1 = self.init_invoice('out_invoice', invoice_date='2010-01-01', amounts=[100])
+        move_2 = self.init_invoice('out_invoice', invoice_date='2010-01-01', amounts=[200])
+
+        # Make sure no sequence is set on them by default, so that move_2 can receive a lower sequence when posting
+        (move_1 + move_2).write({'name': ''})
+
+        # Post the moves in reverse order than the one they were created in, so that their line ids' respective order does not match their sequences'
+        move_2.action_post()
+        move_1.action_post()
+
+        self.assertLinesValues(
+            report._get_lines(options),
+            #   Name                                      Debit       Credit      Balance
+            [   0,                                           4,           5,          6],
+            [
+                ('121000 Account Receivable',            300.0,         0.0,      300.0),
+                (move_2.name,                            200.0,         0.0,      200.0),
+                (move_1.name,                            100.0,         0.0,      300.0),
+                ('400000 Product Sales',                   0.0,       300.0,     -300.0),
+                (move_2.name,                              0.0,       200.0,     -200.0),
+                (move_1.name,                              0.0,       100.0,     -300.0),
+                ('Total',                                300.0,       300.0,        0.0),
+            ],
+            options
+        )
diff --git a/dev_odex30_accounting/odex30_account_reports/tests/test_journal_report.py b/dev_odex30_accounting/odex30_account_reports/tests/test_journal_report.py
new file mode 100644
index 0000000..affbf59
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_reports/tests/test_journal_report.py
@@ -0,0 +1,513 @@
+# pylint: disable=C0326
+from .common import TestAccountReportsCommon
+
+from odoo import Command, fields
+from odoo.tests import tagged
+
+
+@tagged('post_install', '-at_install')
+class TestJournalReport(TestAccountReportsCommon):
+
+    @classmethod
+    def setUpClass(cls):
+        super().setUpClass()
+
+        cls.report = cls.env.ref('odex30_account_reports.journal_report')
+
+        ##############
+        # Bank entries
+        ##############
+
+        cls.default_bank_journal = cls.company_data['default_journal_bank']
+        cls.default_sale_journal = cls.company_data['default_journal_sale']
+
+        # Entries in 2016 for company_1 to test the starting balance of bank journals.
+        cls.liquidity_account = cls.default_bank_journal.default_account_id
+        cls.move_bank_0 = cls.env['account.move'].create({
+            'move_type': 'entry',
+            'date': '2016-01-01',
+            'journal_id': cls.company_data['default_journal_bank'].id,
+            'line_ids': [
+                Command.create({'debit': 100.0,     'credit': 0.0,      'name': '2016_1_1',     'account_id': cls.liquidity_account.id}),
+                Command.create({'debit': 0.0,       'credit': 100.0,    'name': '2016_1_2',     'account_id': cls.company_data['default_account_revenue'].id}),
+            ],
+        })
+        cls.move_bank_0.action_post()
+
+        # Entries in 2017 for company_1 to test the bank journal at current date.
+        cls.move_bank_1 = cls.env['account.move'].create({
+            'move_type': 'entry',
+            'date': '2017-01-01',
+            'journal_id': cls.company_data['default_journal_bank'].id,
+            'line_ids': [
+                Command.create({'debit': 200.0,     'credit': 0.0,      'name': '2017_1_1',     'account_id': cls.liquidity_account.id}),
+                Command.create({'debit': 0.0,       'credit': 200.0,    'name': '2017_1_2',     'account_id': cls.company_data['default_account_revenue'].id}),
+            ],
+        })
+        cls.move_bank_1.action_post()
+
+        ##############
+        # Sales entries
+        ##############
+
+        # Invoice in 2017 for company_1 to test a sale journal at current date.
+        cls.move_sales_0 = cls.env['account.move'].create({
+            'move_type': 'out_invoice',
+            'partner_id': cls.partner_a.id,
+            'invoice_date': '2017-01-01',
+            'journal_id': cls.company_data['default_journal_sale'].id,
+            'payment_reference': 'ref123',
+            'invoice_line_ids': [Command.create({
+                'quantity': 1,
+                'price_unit': 3000.0,
+                'account_id': cls.company_data['default_account_revenue'].id,
+                'tax_ids': [],
+            })],
+        })
+        cls.move_sales_0.action_post()
+
+        # Invoice in 2017 for company_1, with foreign currency to test a sale journal at current date.
+        cls.other_currency = cls.setup_other_currency('EUR', rounding=0.001, rates=[('2016-01-01', 2.0), ('2017-01-01', 2.0)])
+
+        cls.move_sales_1 = cls.env['account.move'].create({
+            'move_type': 'out_invoice',
+            'partner_id': cls.partner_a.id,
+            'invoice_date': '2017-01-01',
+            'journal_id': cls.company_data['default_journal_sale'].id,
+            'currency_id': cls.other_currency.id,
+            'payment_reference': 'ref234',
+            'invoice_line_ids': [Command.create({
+                'quantity': 1,
+                'price_unit': 3000.0,
+                'account_id': cls.company_data['default_account_revenue'].id,
+                'tax_ids': [],
+            })],
+        })
+        cls.move_sales_1.action_post()
+
+        # Invoice in 2017 for company_1, with foreign currency but no ref.
+        cls.move_sales_2 = cls.env['account.move'].create({
+            'move_type': 'out_invoice',
+            'partner_id': cls.partner_a.id,
+            'invoice_date': '2017-01-01',
+            'journal_id': cls.company_data['default_journal_sale'].id,
+            'currency_id': cls.other_currency.id,
+            'invoice_line_ids': [Command.create({
+                'quantity': 1,
+                'price_unit': 2000.0,
+                'account_id': cls.company_data['default_account_revenue'].id,
+                'tax_ids': [],
+            })],
+        })
+        cls.move_sales_2.action_post()
+        cls.move_sales_2.payment_reference = ''
+
+        # Set up a tax report, tax report line, and all needed to get a tax with a grid.
+        cls.company_data['company'].country_id = cls.env.ref('base.us')
+        cls.tax_report = cls.env['account.report'].create({
+            'name': 'Tax report',
+            'root_report_id': cls.env.ref('account.generic_tax_report').id,
+            'country_id': cls.company_data['company'].country_id.id,
+            'filter_fiscal_position': True,
+            'availability_condition': 'country',
+            'column_ids': [Command.create({
+                'name': 'Balance',
+                'expression_label': 'balance',
+                'sequence': 1,
+            })],
+            'line_ids': [Command.create({
+                'name': '10%',
+                'code': 'c10',
+                'sequence': 1,
+                'expression_ids': [Command.create({
+                    'label': 'balance',
+                    'engine': 'tax_tags',
+                    'formula': 'c10',
+                })]
+            })]
+        })
+        cls.test_tax = cls.env['account.tax'].create({
+            'name': 'Tax 10%',
+            'amount': 10.0,
+            'amount_type': 'percent',
+            'type_tax_use': 'sale',
+            'invoice_repartition_line_ids': [
+                Command.create({'repartition_type': 'base'}),
+                Command.create({
+                    'repartition_type': 'tax',
+                    'tag_ids': [Command.link(cls.tax_report.line_ids.expression_ids._get_matching_tags("+").id)],
+                })]
+        })
+        # Invoice in 2017 for company_1, with taxes
+        cls.move_sales_3 = cls.env['account.move'].create({
+            'move_type': 'out_invoice',
+            'partner_id': cls.partner_a.id,
+            'invoice_date': '2017-01-01',
+            'payment_reference': 'ref345',
+            'journal_id': cls.company_data['default_journal_sale'].id,
+            'invoice_line_ids': [Command.create({
+                'quantity': 1,
+                'price_unit': 1500.0,
+                'account_id': cls.company_data['default_account_revenue'].id,
+                'tax_ids': [cls.test_tax.id],
+            })],
+        })
+        cls.move_sales_3.action_post()
+
+        cls.move_payment_0 = cls.env['account.payment'].create({
+            'amount': 370,
+            'partner_id': cls.partner_a.id,
+            'payment_reference': 'PBNK1/2017/00000001',
+            'payment_type': 'inbound',
+            'destination_account_id': cls.company_data['default_account_revenue'].id,
+            'date': '2017-01-01'
+        })
+        cls.move_payment_0.action_post()
+
+    def _filter_tax_section_lines(self, lines, exclude):
+        def filter_condition(line):
+            markup = self.report._get_markup(line['id'])
+            return exclude ^ (isinstance(markup, str) and markup.startswith('tax_report_section'))
+
+        return list(filter(filter_condition, lines))
+
+    def assert_journal_vals_for_export(self, report, options, actual_journal_vals, expected_journals_data):
+        self.assertEqual(len(actual_journal_vals), len(expected_journals_data))
+        for actual_item, expected_item in zip(actual_journal_vals, expected_journals_data):
+            # Check the columns
+            if 'columns' in expected_item:
+                self.assertEqual(expected_item['columns'], [col['label'] for col in actual_item['columns']])
+
+            # Check the lines
+            if 'lines' in expected_item:
+                self.assertEqual(len(expected_item['lines']), len(actual_item['lines']))
+                for expected_line, actual_line in zip(expected_item['lines'], actual_item['lines']):
+                    self.assertDictEqual(expected_line, {expected_key: actual_line.get(expected_key, {}).get('data') for expected_key in expected_line})
+
+    def test_journal_lines(self):
+        """
+        Check the journal report lines for the journal of type sale within the first month of 2017
+        """
+        options_2016 = self._generate_options(self.report, '2016-01-01', '2016-01-31', default_options={'unfold_all': True, 'show_payment_lines': False})
+        lines_2016 = self.report._get_lines(options_2016)
+        self.assertLinesValues(
+            self._filter_tax_section_lines(lines_2016, True),
+            [   1,                 2,          3,          4],
+            [
+                ('',              '',         '',         ''),
+                ('BNK1',         100,        100,         ''),
+                ('101401',       100,          0,        100),
+                ('400000',         0,        100,       -100),
+            ],
+            options_2016,
+        )
+        tax_summary_lines_2016 = self._filter_tax_section_lines(lines_2016, False)
+        self.assertFalse(tax_summary_lines_2016)
+
+        options_2017 = self._generate_options(self.report, '2017-01-01', '2017-01-31', default_options={'unfold_all': True, 'show_payment_lines': False})
+        lines_2017 = self.report._get_lines(options_2017)
+        self.assertLinesValues(
+            self._filter_tax_section_lines(lines_2017, True),
+            [   1,                 2,          3,          4],
+            [
+                ('',              '',         '',         ''),
+                ('INV',         7150,       7150,         ''),
+                ('121000',      7150,          0,       7150),
+                ('400000',         0,       7150,      -7150),
+                ('BNK1',         200,        200,         ''),
+                ('101401',       200,          0,        200),
+                ('400000',         0,        200,       -200),
+            ],
+            options_2017,
+        )
+        tax_summary_lines_2017 = self._filter_tax_section_lines(lines_2017, False)
+        tax_tag = self.tax_report.line_ids.expression_ids._get_matching_tags("+")
+        self.assertDictEqual(
+            tax_summary_lines_2017[0]['tax_grid_summary_lines'],
+            {'United States': {'c10': {'tag_ids': tax_tag.ids, '+': '$\xa0150.00', '-': '$\xa00.00', '+_no_format': 150.0, 'impact': '$\xa0150.00'}}}
+        )
+        self.assertEqual(tax_summary_lines_2017[1]['name'], "Global Tax Summary")
+        self.assertDictEqual(
+            tax_summary_lines_2017[2]['tax_grid_summary_lines'],
+            {'United States': {'c10': {'tag_ids': tax_tag.ids, '+': '$\xa0150.00', '-': '$\xa00.00', '+_no_format': 150.0, 'impact': '$\xa0150.00'}}}
+        )
+
+        options_global = self._generate_options(self.report, '2016-01-01', '2017-01-31', default_options={'unfold_all': True, 'show_payment_lines': False})
+        lines_global = self.report._get_lines(options_global)
+        self.assertLinesValues(
+            self._filter_tax_section_lines(lines_global, True),
+            [   1,                 2,          3,          4],
+            [
+                ('',              '',         '',         ''),
+                ('INV',         7150,       7150,         ''),
+                ('121000',      7150,          0,       7150),
+                ('400000',         0,       7150,      -7150),
+                ('BNK1',         300,        300,         ''),
+                ('101401',       300,          0,        300),
+                ('400000',         0,        300,       -300),
+            ],
+            options_global,
+        )
+        tax_summary_lines_global = self._filter_tax_section_lines(lines_global, False)
+        self.assertDictEqual(
+            tax_summary_lines_global[0]['tax_grid_summary_lines'],
+            {'United States': {'c10': {'tag_ids': tax_tag.ids, '+': '$\xa0150.00', '-': '$\xa00.00', '+_no_format': 150.0, 'impact': '$\xa0150.00'}}}
+        )
+        self.assertEqual(tax_summary_lines_global[1]['name'], "Global Tax Summary")
+        self.assertDictEqual(
+            tax_summary_lines_global[2]['tax_grid_summary_lines'],
+            {'United States': {'c10': {'tag_ids': tax_tag.ids, '+': '$\xa0150.00', '-': '$\xa00.00', '+_no_format': 150.0, 'impact': '$\xa0150.00'}}}
+        )
+
+    def test_show_payment_lines_option(self):
+        """
+        Check the journal report lines of the default bank journal with payments included
+        """
+        options_no_payment = self._generate_options(self.report, '2017-01-01', '2017-01-31', default_options={'unfold_all': True, 'show_payment_lines': False})
+
+        self.assertLinesValues(
+            self._filter_tax_section_lines(self.report._get_lines(options_no_payment), True),
+            [   1,                 2,          3,          4],
+            [
+                ('',              '',         '',         ''),
+                ('INV',         7150,       7150,         ''),
+                ('121000',      7150,          0,       7150),
+                ('400000',         0,       7150,      -7150),
+                ('BNK1',         200,        200,         ''),
+                ('101401',       200,          0,        200),
+                ('400000',         0,        200,       -200),
+            ],
+            options_no_payment,
+        )
+
+        options_show_payment = self._generate_options(self.report, '2017-01-01', '2017-01-31', default_options={'unfold_all': True, 'show_payment_lines': True})
+        self.assertLinesValues(
+            self._filter_tax_section_lines(self.report._get_lines(options_show_payment), True),
+            [   1,                 2,          3,          4],
+            [
+                ('',              '',         '',         ''),
+                ('INV',         7150,       7150,         ''),
+                ('121000',      7150,          0,       7150),
+                ('400000',         0,       7150,      -7150),
+                ('BNK1',         570,        570,         ''),
+                ('101401',       200,          0,        200),
+                ('101403',       370,          0,        370),
+                ('400000',         0,        570,       -570),
+            ],
+            options_show_payment,
+        )
+
+    def test_document_data_basic(self):
+        """
+        Check that the data generated by the document data generator is valid
+        """
+        options = self._generate_options(self.report, '2017-01-01', '2017-01-31', default_options={'show_payment_lines': False})
+
+        journal_report_handler = self.env[self.report.custom_handler_model_name]
+        move_2_pref = self.move_sales_2.payment_reference
+        self.assert_journal_vals_for_export(
+            self.report,
+            options,
+            journal_report_handler._generate_document_data_for_export(self.report, options, 'pdf')['journals_vals'],
+            [
+                {
+                    'id': self.default_sale_journal.id,
+                    'columns': ['document', 'account_label', 'name', 'debit', 'credit', 'taxes', 'tax_grids'],
+                    'lines': [
+                        {'name': 'partner_a ref123',          'debit': '$\xa03,000.00',             'credit': '$\xa00.00'},
+                        {'name': 'ref123',          'debit': '$\xa00.00',                 'credit': '$\xa03,000.00'},
+
+                        {'name': 'partner_a ref234',          'debit': '$\xa01,500.00',             'credit': '$\xa00.00'},
+                        {'name': 'ref234',          'debit': '$\xa00.00',                 'credit': '$\xa01,500.00'},
+
+                        {'currency_id': self.other_currency.id, 'amount': 3000},  # Special line for multicurrency
+
+                        {'name': f'partner_a {move_2_pref}',  'debit': '$\xa01,000.00',             'credit': '$\xa00.00'},
+                        {'name': move_2_pref,       'debit': '$\xa00.00',                 'credit': '$\xa01,000.00'},
+
+                        {'currency_id': self.other_currency.id, 'amount': 2000},  # Special line for multicurrency
+
+                        {'name': 'partner_a ref345',          'debit': '$\xa01,650.00',             'credit': '$\xa00.00'},
+                        {'name': 'ref345',          'debit': '$\xa00.00',                 'credit': '$\xa01,500.00',    'taxes': 'T: Tax 10%'},
+                        {'name': 'Tax 10%',         'debit': '$\xa00.00',                 'credit': '$\xa0150.00',      'taxes': 'B: $\xa01,500.00'},
+
+                        {},  # Empty line
+
+                        {'name': 'Total',           'debit': '$\xa07,150.00',             'credit': '$\xa07,150.00'},
+                    ],
+                },
+                {
+                    'id': self.default_bank_journal.id,
+                    'columns': ['document', 'account_label', 'name', 'debit', 'credit', 'balance'],
+                    'lines': [
+                        {'name': 'Starting Balance',    'balance': '$\xa0100.00'},
+                        {'name': '2017_1_2',            'debit': '$\xa00.00',    'credit': '$\xa0200.00',      'balance': '$\xa0300.00'},
+
+                        {},  # Empty line
+
+                        {'name': 'Total',               'debit': None,           'credit': None,               'balance': '$\xa0300.00'},
+                    ],
+                },
+            ],
+        )
+
+    def test_document_data_for_bank_journal_with_show_payment_option(self):
+        """
+        Check that show payment affect the result of the bank journal data when this filter is changed
+        """
+        options = self._generate_options(self.report, '2017-01-01', '2017-01-31', default_options={'show_payment_lines': True})
+        journal_report_handler = self.env[self.report.custom_handler_model_name]
+        move_2_pref = self.move_sales_2.payment_reference
+        self.assert_journal_vals_for_export(
+            self.report,
+            options,
+            journal_report_handler._generate_document_data_for_export(self.report, options, 'pdf')['journals_vals'],
+            [
+                {
+                    'id': self.default_sale_journal.id,
+                    'columns': ['document', 'account_label', 'name', 'debit', 'credit', 'taxes', 'tax_grids'],
+                    'lines': [
+                        {'name': 'partner_a ref123',          'debit': '$\xa03,000.00',             'credit': '$\xa00.00'},
+                        {'name': 'ref123',          'debit': '$\xa00.00',                 'credit': '$\xa03,000.00'},
+
+                        {'name': 'partner_a ref234',          'debit': '$\xa01,500.00',             'credit': '$\xa00.00'},
+                        {'name': 'ref234',          'debit': '$\xa00.00',                 'credit': '$\xa01,500.00'},
+
+                        {'currency_id': self.other_currency.id, 'amount': 3000},  # Special line for multicurrency
+
+                        {'name': f'partner_a {move_2_pref}',  'debit': '$\xa01,000.00',             'credit': '$\xa00.00'},
+                        {'name': move_2_pref,       'debit': '$\xa00.00',                 'credit': '$\xa01,000.00'},
+
+                        {'currency_id': self.other_currency.id, 'amount': 2000},  # Special line for multicurrency
+
+                        {'name': 'partner_a ref345',          'debit': '$\xa01,650.00',             'credit': '$\xa00.00'},
+                        {'name': 'ref345',          'debit': '$\xa00.00',                 'credit': '$\xa01,500.00',    'taxes': 'T: Tax 10%'},
+                        {'name': 'Tax 10%',         'debit': '$\xa00.00',                 'credit': '$\xa0150.00',      'taxes': 'B: $\xa01,500.00'},
+
+                        {},  # Empty line
+
+                        {'name': 'Total',           'debit': '$\xa07,150.00',             'credit': '$\xa07,150.00'},
+                    ],
+                },
+                {
+                    'id': self.default_bank_journal.id,
+                    'columns': ['document', 'account_label', 'name', 'debit', 'credit', 'balance'],
+                    'lines': [
+                        {'name': 'Starting Balance', 'balance': '$\xa0100.00'},
+
+                        {'name': '2017_1_2',            'debit': '$\xa00.00',     'credit': '$\xa0200.00',  'balance': '$\xa0300.00'},
+
+                        # Payment
+                        {'name': 'Manual Payment',      'debit': '$\xa0370.00',   'credit': '$\xa00.00',    'balance': None},
+                        {'name': 'Manual Payment',      'debit': '$\xa00.00',     'credit': '$\xa0370.00',  'balance': None},
+
+                        {},  # Empty line
+
+                        {'name': 'Total',               'debit': None,            'credit': None,           'balance': '$\xa0300.00'},
+                    ],
+                },
+            ],
+        )
+
+    def test_document_data_for_bank_multicurrency(self):
+        """
+        Test that data from bank journal can support multi currency bank moves
+        """
+        options = self._generate_options(self.report, '2017-01-01', '2017-01-31', default_options={'show_payment_lines': True})
+        journal_report_handler = self.env[self.report.custom_handler_model_name]
+        self.assert_journal_vals_for_export(
+            self.report,
+            options,
+            list(filter(lambda x: x['id'] == self.default_bank_journal.id, journal_report_handler._generate_document_data_for_export(self.report, options, 'pdf')['journals_vals'])),
+            [
+                {
+                    'id': self.default_bank_journal.id,
+                    'columns': ['document', 'account_label', 'name', 'debit', 'credit', 'balance'],
+                    'lines': [
+                        {'name': 'Starting Balance', 'balance': '$\xa0100.00'},
+
+                        {'name': '2017_1_2',            'debit': '$\xa00.00',    'credit': '$\xa0200.00',  'balance': '$\xa0300.00'},
+
+                        # Payment
+                        {'name': 'Manual Payment',      'debit': '$\xa0370.00',  'credit': '$\xa00.00',    'balance': None},
+                        {'name': 'Manual Payment',      'debit': '$\xa00.00',    'credit': '$\xa0370.00',  'balance': None},
+
+                        {},  # Empty line
+
+                        {'name': 'Total',               'debit': None,           'credit': None,           'balance': '$\xa0300.00'},
+                    ]
+                }
+            ]
+        )
+
+        new_bank_move = self.env['account.move'].create({
+            'move_type': 'entry',
+            'date': '2017-01-01',
+            'journal_id': self.company_data['default_journal_bank'].id,
+            'currency_id': self.other_currency.id,
+            'line_ids': [
+                Command.create({
+                    'debit': 100.0,
+                    'credit': 0.0,
+                    'name': '2017_1_3',
+                    'account_id': self.liquidity_account.id,
+                    'currency_id': self.other_currency.id,
+                    'amount_currency': 200
+                }),
+                Command.create({
+                    'debit': 0.0,
+                    'credit': 100.0,
+                    'name': '2017_1_4',
+                    'account_id': self.company_data['default_account_revenue'].id,
+                    'currency_id': self.other_currency.id,
+                    'amount_currency': -200
+                }),
+            ],
+        })
+        new_bank_move.action_post()
+
+        self.assert_journal_vals_for_export(
+            self.report,
+            options,
+            list(filter(lambda x: x['id'] == self.default_bank_journal.id, journal_report_handler._generate_document_data_for_export(self.report, options, 'pdf')['journals_vals'])),
+            [
+                {
+                    'id': self.default_bank_journal.id,
+                    'columns': ['document', 'account_label', 'name', 'debit', 'credit', 'balance', 'amount_currency'],
+                    'lines': [
+                        {'name': 'Starting Balance', 'balance': '$\xa0100.00'},
+
+                        {'name': '2017_1_2',            'debit': '$\xa00.00',   'credit': '$\xa0200.00',   'balance': '$\xa0300.00'},
+                        {'name': '2017_1_4',            'debit': '$\xa00.00',   'credit': '$\xa0100.00',   'balance': '$\xa0400.00', 'amount_currency': '200.000\xa0€'},
+
+                        # Payment --
+                        {'name': 'Manual Payment',      'debit': '$\xa0370.00',  'credit': '$\xa00.00',    'balance': None},
+                        {'name': 'Manual Payment',      'debit': '$\xa00.00',    'credit': '$\xa0370.00',  'balance': None},
+
+                        {},  # Empty line
+
+                        {'name': 'Total',               'debit': None,           'credit': None,           'balance': '$\xa0400.00'}
+                    ],
+                },
+            ],
+        )
+
+    def test_global_tax_summary_rounding_unit(self):
+        """ Test that Global Tax Summary applies rounding filter correctly. """
+        report = self.env.ref('odex30_account_reports.journal_report')
+        options = self._generate_options(report, '2017-01-01', '2017-01-31')
+        options['unfold_all'] = True
+
+        # Get tax summary lines with default formatting
+        lines = report._get_lines(options)
+        tax_lines = list(filter(lambda line: line.get('is_tax_section_line'), lines))
+
+        default_balance = tax_lines[0]['tax_grid_summary_lines']['United States']['c10']['+']
+        self.assertEqual(default_balance, '$\xa0150.00')  # Default: $150.00
+
+        # Test with thousands rounding unit, call via dispatch_report_action like the frontend does
+        options['rounding_unit'] = 'thousands'
+        report.dispatch_report_action(options, 'format_column_values_from_client', lines)
+
+        thousands_balance = tax_lines[0]['tax_grid_summary_lines']['United States']['c10']['+']
+        self.assertEqual(thousands_balance, '$\xa00')  # Thousands: $0 (150/1000 = 0.15 rounded to 0)
diff --git a/dev_odex30_accounting/odex30_account_reports/tests/test_multicurrencies_revaluation_report.py b/dev_odex30_accounting/odex30_account_reports/tests/test_multicurrencies_revaluation_report.py
new file mode 100644
index 0000000..51ba6d8
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_reports/tests/test_multicurrencies_revaluation_report.py
@@ -0,0 +1,1219 @@
+# -*- coding: utf-8 -*-
+from freezegun import freeze_time
+from .common import TestAccountReportsCommon
+
+from odoo import fields, Command
+from odoo.tests import tagged
+from odoo.exceptions import UserError
+
+
+@tagged('post_install', '-at_install')
+class TestMultiCurrenciesRevaluationReport(TestAccountReportsCommon):
+
+    @classmethod
+    def setUpClass(cls):
+        super().setUpClass()
+
+        cls.other_currency_2 = cls.setup_other_currency('XAF', rates=[('2016-01-01', 10.0), ('2017-01-01', 20.0)])
+
+        cls.expense_account_1 = cls.company_data['default_account_expense']
+        cls.expense_account_2 = cls.copy_account(cls.company_data['default_account_expense'])
+
+        cls.env['res.currency.rate'].create({
+            'name': '2023-01-20',
+            'rate': 1,
+            'currency_id': cls.other_currency.id,
+            'company_id': cls.company_data['company'].id,
+        })
+
+        cls.env['res.currency.rate'].create({
+            'name': '2023-01-25',
+            'rate': 2,
+            'currency_id': cls.other_currency.id,
+            'company_id': cls.company_data['company'].id,
+        })
+
+        cls.env['res.currency.rate'].create({
+            'name': '2023-01-30',
+            'rate': 4,
+            'currency_id': cls.other_currency.id,
+            'company_id': cls.company_data['company'].id,
+        })
+
+        cls.env['res.currency.rate'].create({
+            'name': '2023-01-20',
+            'rate': 1,
+            'currency_id': cls.other_currency_2.id,
+            'company_id': cls.company_data['company'].id,
+        })
+
+
+        cls.report = cls.env.ref('odex30_account_reports.multicurrency_revaluation_report')
+
+    @classmethod
+    def pay_move(cls, move, amount, date, account_type='liability_payable', currency=None, partner_type=None):
+        if not currency:
+            currency = move.currency_id
+
+        assert amount
+        if amount > 0:
+            payment_type = 'outbound'
+            payment_method = 'account.account_payment_method_manual_out'
+            partner_type = 'supplier' if not partner_type else partner_type
+        else:
+            payment_type = 'inbound'
+            payment_method = 'account.account_payment_method_manual_in'
+            partner_type = 'customer' if not partner_type else partner_type
+
+        payment = cls.env['account.payment'].create({
+            'payment_type': payment_type,
+            'amount': abs(amount),
+            'currency_id': currency.id,
+            'journal_id': cls.company_data['default_journal_bank'].id,
+            'date': fields.Date.from_string(date),
+            'partner_id': move.partner_id.id,
+            'payment_method_id': cls.env.ref(payment_method).id,
+            'partner_type': partner_type,
+        })
+        payment.action_post()
+        lines_to_reconcile = move.line_ids.filtered(lambda x: x.account_type == account_type)
+        lines_to_reconcile += payment.move_id.line_ids.filtered(lambda x: x.account_type == account_type)
+        lines_to_reconcile.reconcile()
+
+    @classmethod
+    def create_move_one_line(cls, move_type, journal_id, partner_id, date, invoice_date, currency_id, account_id, quantity, price_unit, payment_term_id=None):
+        move = cls.env['account.move'].create({
+            'move_type': move_type,
+            'partner_id': partner_id,
+            'date': date,
+            'invoice_date': invoice_date,
+            'journal_id': journal_id,
+            'currency_id': currency_id,
+            'invoice_payment_term_id': payment_term_id,
+            'invoice_line_ids': [
+                Command.create({
+                    'name': 'My Super Product',
+                    'account_id': account_id,
+                    'quantity': quantity,
+                    'price_unit': price_unit,
+                    'tax_ids': [Command.clear()],
+                    'currency_id': cls.other_currency.id,
+                }),
+            ],
+        })
+        move.action_post()
+        return move
+
+    def test_multi_currencies(self):
+        """ In this test we will do two moves with same currency (CAD) and 3 payments for the first move with
+            3 different currencies (CAD, Dar, USD)
+        """
+        first_bill = self.create_move_one_line(
+            partner_id=self.partner_a.id,
+            move_type='in_invoice',
+            journal_id=self.company_data['default_journal_purchase'].id,
+            date='2023-01-21',
+            invoice_date='2023-01-21',
+            currency_id=self.other_currency.id,
+            account_id=self.company_data['default_account_expense'].id,
+            quantity=1,
+            price_unit=800.0
+        )
+
+        self.create_move_one_line(
+            partner_id=self.partner_a.id,
+            move_type='in_invoice',
+            journal_id=self.company_data['default_journal_purchase'].id,
+            date='2023-01-21',
+            invoice_date='2023-01-21',
+            currency_id=self.other_currency.id,
+            account_id=self.company_data['default_account_expense'].id,
+            quantity=1,
+            price_unit=200.0
+        )
+
+        self.pay_move(
+            first_bill,
+            400,
+            '2023-01-21',
+            account_type=self.company_data['default_account_payable'].account_type,
+            currency=self.other_currency
+        )
+
+        self.pay_move(
+            first_bill,
+            250,
+            '2023-01-21',
+            account_type=self.company_data['default_account_payable'].account_type,
+            currency=self.other_currency_2
+        )
+
+        self.pay_move(
+            first_bill,
+            150,
+            '2023-01-21',
+            account_type=self.company_data['default_account_payable'].account_type,
+            currency=self.company_data['currency']
+        )
+
+        # Test the report in 2023.
+        options = self._generate_options(self.report, '2023-01-01', '2023-12-31')
+        options['unfold_all'] = True
+
+        self.assertLinesValues(
+            # pylint: disable=C0326
+            self.report._get_lines(options),
+            #   Name                       Balance in foreign currency     Balance at op. rate     Balance at curr rate     Adjustment
+            [   0,                                                  1,                      2,                       3,              4],
+            [
+                ('Accounts To Adjust',                             '',                     '',                      '',             ''),
+                ('CAD (1 USD = 4.0 CAD)',                      -200.0,                 -200.0,                   -50.0,          150.0),
+                ('211000 Account Payable',                     -200.0,                 -200.0,                   -50.0,          150.0),
+                ('BILL/2023/01/0002',                          -200.0,                 -200.0,                   -50.0,          150.0),
+                ('Total 211000 Account Payable',               -200.0,                 -200.0,                   -50.0,          150.0),
+                ('Total CAD',                                  -200.0,                 -200.0,                   -50.0,          150.0),
+            ],
+            options,
+            currency_map={
+                1: {'currency': self.other_currency},
+            },
+        )
+
+    def test_same_currency(self):
+        """ In this test we will do two moves with same currency and a bank statement line to reconcile the first payment.
+            The payment and the move have the same currency (CAD)
+        """
+        first_bill = self.create_move_one_line(
+            partner_id=self.partner_a.id,
+            move_type='in_invoice',
+            journal_id=self.company_data['default_journal_purchase'].id,
+            date='2023-01-21',
+            invoice_date='2023-01-21',
+            currency_id=self.other_currency.id,
+            account_id=self.company_data['default_account_expense'].id,
+            quantity=1,
+            price_unit=800.0
+        )
+
+        self.create_move_one_line(
+            partner_id=self.partner_a.id,
+            move_type='in_invoice',
+            journal_id=self.company_data['default_journal_purchase'].id,
+            date='2023-01-21',
+            invoice_date='2023-01-21',
+            currency_id=self.other_currency.id,
+            account_id=self.company_data['default_account_expense'].id,
+            quantity=1,
+            price_unit=200.0
+        )
+
+        bank_statement = self.env['account.bank.statement.line'].create({
+            'journal_id': self.company_data['default_journal_bank'].id,
+            'payment_ref': 'payment_move_line',
+            'partner_id': self.partner_a.id,
+            'foreign_currency_id': self.other_currency.id,
+            'amount': -400,
+            'amount_currency': -800,
+            'date': '2023-01-01',
+        })
+
+        wizard = self.env['bank.rec.widget'].with_context(default_st_line_id=bank_statement.id).new({})
+        wizard._action_add_new_amls(first_bill.line_ids.filtered(lambda account: account.account_type == 'liability_payable'))
+        wizard._action_validate()
+
+        # Test the report in 2023.
+        options = self._generate_options(self.report, '2023-01-01', '2023-12-31')
+        options['unfold_all'] = True
+
+        self.assertLinesValues(
+            # pylint: disable=C0326
+            self.report._get_lines(options),
+            #   Name                       Balance in foreign currency     Balance at op. rate     Balance at curr rate     Adjustment
+            [   0,                                                  1,                      2,                       3,              4],
+            [
+                ('Accounts To Adjust',                             '',                    '',                       '',             ''),
+                ('CAD (1 USD = 4.0 CAD)',                      -200.0,                -200.0,                    -50.0,          150.0),
+                ('211000 Account Payable',                     -200.0,                -200.0,                    -50.0,          150.0),
+                ('BILL/2023/01/0002',                          -200.0,                -200.0,                    -50.0,          150.0),
+                ('Total 211000 Account Payable',               -200.0,                -200.0,                    -50.0,          150.0),
+                ('Total CAD',                                  -200.0,                -200.0,                    -50.0,          150.0),
+            ],
+            options,
+            currency_map={
+                1: {'currency': self.other_currency},
+            },
+        )
+
+    def test_exclude_account_for_adjustment_entry(self):
+        """ In this test we will check if the exclude functionality of the report works as intended. We will do a bill
+            and an invoice. Then we will do a bank statement line to reconcile a part of the bill.
+            So the bill has a partial payment and should still be there in the report, and the invoice has no payment.
+            We then exclude the rest of the bill.
+        """
+
+        first_bill = self.create_move_one_line(
+            partner_id=self.partner_a.id,
+            move_type='in_invoice',
+            journal_id=self.company_data['default_journal_purchase'].id,
+            date='2023-01-01',
+            invoice_date='2023-01-01',
+            currency_id=self.other_currency.id,
+            account_id=self.company_data['default_account_expense'].id,
+            quantity=1,
+            price_unit=800.0
+        )
+
+        # Invoice
+        self.create_move_one_line(
+            partner_id=self.partner_a.id,
+            move_type='out_invoice',
+            journal_id=self.company_data['default_journal_sale'].id,
+            date='2023-01-01',
+            invoice_date='2023-01-01',
+            currency_id=self.other_currency.id,
+            account_id=self.copy_account(self.company_data['default_account_revenue']).id,
+            quantity=1,
+            price_unit=100.0
+        )
+
+        bank_statement = self.env['account.bank.statement.line'].create({
+            'journal_id': self.company_data['default_journal_bank'].id,
+            'payment_ref': 'payment_move_line',
+            'partner_id': self.partner_a.id,
+            'foreign_currency_id': self.other_currency.id,
+            'amount': -300,
+            'amount_currency': -600,
+            'date': '2023-01-01',
+        })
+
+        wizard = self.env['bank.rec.widget'].with_context(default_st_line_id=bank_statement.id).new({})
+        wizard._action_add_new_amls(first_bill.line_ids.filtered(lambda account: account.account_type == 'liability_payable'))
+        wizard._action_validate()
+
+        # Test the report in 2023.
+        options = self._generate_options(self.report, '2023-01-01', '2023-12-31')
+        options['unfold_all'] = True
+        self.assertLinesValues(
+            # pylint: disable=C0326
+            self.report._get_lines(options),
+            #   Name                       Balance in foreign currency     Balance at op. rate     Balance at curr rate     Adjustment
+            [   0,                                                  1,                      2,                       3,              4],
+            [
+                ('Accounts To Adjust',                             '',                     '',                      '',             ''),
+                ('CAD (1 USD = 4.0 CAD)',                      -100.0,                  -50.0,                   -25.0,           25.0),
+                ('121000 Account Receivable',                   100.0,                   50.0,                    25.0,          -25.0),
+                ('INV/2023/00001',                              100.0,                   50.0,                    25.0,          -25.0),
+                ('Total 121000 Account Receivable',             100.0,                   50.0,                    25.0,          -25.0),
+                ('211000 Account Payable',                     -200.0,                 -100.0,                   -50.0,           50.0),
+                ('BILL/2023/01/0001',                          -200.0,                 -100.0,                   -50.0,           50.0),
+                ('Total 211000 Account Payable',               -200.0,                 -100.0,                   -50.0,           50.0),
+                ('Total CAD',                                  -100.0,                  -50.0,                   -25.0,           25.0),
+            ],
+            options,
+            currency_map={
+                1: {'currency': self.other_currency},
+            },
+        )
+
+        oldest_line_id = self.report._get_generic_line_id('account.report.line', self.env.ref('odex30_account_reports.multicurrency_revaluation_to_adjust').id)
+        old_line_id = self.report._get_generic_line_id('res.currency', self.other_currency.id, markup={'groupby': 'currency_id'}, parent_line_id=oldest_line_id)
+        line_id = self.report._get_generic_line_id('account.account', first_bill.line_ids.account_id.filtered(lambda account: account.account_type == 'liability_payable').id, markup={'groupby': 'account_id'}, parent_line_id=old_line_id)
+
+        self.env['account.multicurrency.revaluation.report.handler'].action_multi_currency_revaluation_toggle_provision(options, {'line_id': line_id})
+        options['unfold_all'] = True
+
+        self.assertLinesValues(
+            # pylint: disable=C0326
+            self.report._get_lines(options),
+            #   Name                       Balance in foreign currency     Balance at op. rate     Balance at curr rate     Adjustment
+            [   0,                                                  1,                      2,                       3,              4],
+            [
+                ('Accounts To Adjust',                             '',                     '',                      '',             ''),
+                ('CAD (1 USD = 4.0 CAD)',                       100.0,                   50.0,                    25.0,          -25.0),
+                ('121000 Account Receivable',                   100.0,                   50.0,                    25.0,          -25.0),
+                ('INV/2023/00001',               100.0,                   50.0,                    25.0,          -25.0),
+                ('Total 121000 Account Receivable',             100.0,                   50.0,                    25.0,          -25.0),
+                ('Total CAD',                                   100.0,                   50.0,                    25.0,          -25.0),
+
+                ('Excluded Accounts',                              '',                     '',                      '',             ''),
+                ('CAD (1 USD = 4.0 CAD)',                      -200.0,                 -100.0,                   -50.0,           50.0),
+                ('211000 Account Payable',                     -200.0,                 -100.0,                   -50.0,           50.0),
+                ('BILL/2023/01/0001',                          -200.0,                 -100.0,                   -50.0,           50.0),
+                ('Total 211000 Account Payable',               -200.0,                 -100.0,                   -50.0,           50.0),
+                ('Total CAD',                                  -200.0,                 -100.0,                   -50.0,           50.0),
+            ],
+            options,
+            currency_map={
+                1: {'currency': self.other_currency},
+            },
+        )
+
+    def test_same_rate(self):
+        """ Make sure no adjustment lines are generated if the rate is unchanged
+           (i.e. do not create 0 balance adjustment lines)
+        """
+        self.create_move_one_line(
+            partner_id=self.partner_a.id,
+            move_type='in_invoice',
+            journal_id=self.company_data['default_journal_purchase'].id,
+            date='2023-01-21',
+            invoice_date='2023-01-21',
+            currency_id=self.other_currency.id,
+            account_id=self.company_data['default_account_expense'].id,
+            quantity=1,
+            price_unit=1000.0,
+        )
+
+        options = self._generate_options(self.report, '2023-01-21', '2023-01-21')
+        options['unfold_all'] = True
+
+        # Check the gold currency.
+        self.assertLinesValues(
+            # pylint: disable = C0326
+            self.report._get_lines(options),
+            #   Name                       Balance in foreign currency     Balance at op. rate     Balance at curr rate     Adjustment
+            [   0,                                                  1,                      2,                       3,              4],
+            [
+                ('Accounts To Adjust',                             '',                     '',                      '',             ''),
+                ('CAD (1 USD = 1.0 CAD)',                     -1000.0,                -1000.0,                 -1000.0,            0.0),
+                ('211000 Account Payable',                    -1000.0,                -1000.0,                 -1000.0,            0.0),
+                ('BILL/2023/01/0001',                         -1000.0,                -1000.0,                 -1000.0,            0.0),
+                ('Total 211000 Account Payable',              -1000.0,                -1000.0,                 -1000.0,            0.0),
+                ('Total CAD',                                 -1000.0,                -1000.0,                 -1000.0,            0.0),
+            ],
+            options,
+            currency_map={
+                1: {'currency': self.other_currency},
+            },
+        )
+
+        with self.assertRaises(UserError, msg="No adjustment should be needed"):
+            self.env.context = {**self.env.context, 'multicurrency_revaluation_report_options': {**options, 'unfold_all': False}}
+            self.env['account.multicurrency.revaluation.wizard'].create({
+                'journal_id': self.company_data['default_journal_misc'].id,
+                'expense_provision_account_id': self.company_data['default_account_expense'].id,
+                'income_provision_account_id': self.company_data['default_account_revenue'].id,
+            })
+
+    def test_changing_rate_between_move_and_payment(self):
+        """ In this test, we will do a use case where a move is created and before the payment is done, the rate of the
+            currency changes. We deal with the possibility to have multiple payment for a move with different dates and rates
+        """
+        bill = self.create_move_one_line(
+            partner_id=self.partner_a.id,
+            move_type='in_invoice',
+            journal_id=self.company_data['default_journal_purchase'].id,
+            date='2023-01-21',
+            invoice_date='2023-01-21',
+            currency_id=self.other_currency.id,
+            account_id=self.company_data['default_account_expense'].id,
+            quantity=1,
+            price_unit=1000.0,
+        )
+
+        options = self._generate_options(self.report, '2023-01-01', '2023-01-26')
+        options['unfold_all'] = True
+        self.assertLinesValues(
+            # pylint: disable=C0326
+            self.report._get_lines(options),
+            #   Name                       Balance in foreign currency     Balance at op. rate     Balance at curr rate     Adjustment
+            [   0,                                                  1,                      2,                       3,              4],
+            [
+                ('Accounts To Adjust',                              '',                    '',                      '',             ''),
+                ('CAD (1 USD = 2.0 CAD)',                      -1000.0,               -1000.0,                  -500.0,          500.0),
+                ('211000 Account Payable',                     -1000.0,               -1000.0,                  -500.0,          500.0),
+                ('BILL/2023/01/0001',                          -1000.0,               -1000.0,                  -500.0,          500.0),
+                ('Total 211000 Account Payable',               -1000.0,               -1000.0,                  -500.0,          500.0),
+                ('Total CAD',                                  -1000.0,               -1000.0,                  -500.0,          500.0),
+            ],
+            options,
+            currency_map={
+                1: {'currency': self.other_currency},
+            },
+        )
+
+        # First payment for the bill at the given date to check if it appears in the report when changing the date_to
+        self.pay_move(
+            bill,
+            500,
+            '2023-01-26',
+            account_type=self.company_data['default_account_payable'].account_type,
+            currency=self.other_currency
+        )
+
+        # Second payment at a later date to fully paid the bill
+        self.pay_move(
+            bill,
+            500,
+            '2023-02-01',
+            account_type=self.company_data['default_account_payable'].account_type,
+            currency=self.other_currency
+        )
+
+        options = self._generate_options(self.report, '2023-01-01', '2023-01-31')
+        options['unfold_all'] = True
+        self.assertLinesValues(
+            # pylint: disable=C0326
+            self.report._get_lines(options),
+            #   Name                       Balance in foreign currency     Balance at op. rate     Balance at curr rate     Adjustment
+            [   0,                                                  1,                      2,                       3,              4],
+            [
+                ('Accounts To Adjust',                             '',                     '',                      '',             ''),
+                ('CAD (1 USD = 4.0 CAD)',                      -500.0,                 -500.0,                  -125.0,          375.0),
+                ('211000 Account Payable',                     -500.0,                 -500.0,                  -125.0,          375.0),
+                ('BILL/2023/01/0001',                          -500.0,                 -500.0,                  -125.0,          375.0),
+                ('Total 211000 Account Payable',               -500.0,                 -500.0,                  -125.0,          375.0),
+                ('Total CAD',                                  -500.0,                 -500.0,                  -125.0,          375.0),
+            ],
+            options,
+            currency_map={
+                1: {'currency': self.other_currency},
+            },
+        )
+
+    @freeze_time('2023-01-26')
+    def test_payment_in_company_currency_invoice_in_foreign_currency_fully_reconcile(self):
+        """ In this test, we will create a move with a foreign currency and do a payment in the company currency,
+            but thanks to the changing of rates, the move is fully reconcile
+        """
+        bill = self.create_move_one_line(
+            partner_id=self.partner_a.id,
+            move_type='in_invoice',
+            journal_id=self.company_data['default_journal_purchase'].id,
+            date='2023-01-21',
+            invoice_date='2023-01-21',
+            currency_id=self.other_currency.id,
+            account_id=self.company_data['default_account_expense'].id,
+            quantity=1,
+            price_unit=1000.0,
+        )
+
+        # We pay the bill for 500 but thanks to the changing of the rate (1 --> 2), 500 become 1000 and the move is
+        # fully reconciled, so we don't need to display anything on the report
+        self.pay_move(
+            bill,
+            500,
+            '2023-01-26',
+            account_type=self.company_data['default_account_payable'].account_type,
+            currency=self.company_data['currency'],
+        )
+
+        options = self._generate_options(self.report, '2023-01-01', '2023-02-20')
+        self.assertEqual(len(self.report._get_lines(options)), 0)
+
+    @freeze_time('2023-01-26')
+    def test_payment_in_company_currency_invoice_in_foreign_currency_not_fully_reconcile(self):
+        """ In this test, we will create a move with a foreign currency and do a payment in the company currency """
+        bill = self.create_move_one_line(
+            partner_id=self.partner_a.id,
+            move_type='in_invoice',
+            journal_id=self.company_data['default_journal_purchase'].id,
+            date='2023-01-21',
+            invoice_date='2023-01-21',
+            currency_id=self.other_currency.id,
+            account_id=self.company_data['default_account_expense'].id,
+            quantity=1,
+            price_unit=1000.0,
+        )
+
+        # We pay the first part of the bill, thanks to the changing of rates we have paid 600
+        self.pay_move(
+            bill,
+            300,
+            '2023-01-26',
+            account_type=self.company_data['default_account_payable'].account_type,
+            currency=self.company_data['currency'],
+        )
+
+        options = self._generate_options(self.report, '2023-01-01', '2023-01-26')
+        options['unfold_all'] = True
+        self.assertLinesValues(
+            # pylint: disable=C0326
+            self.report._get_lines(options),
+            #   Name                       Balance in foreign currency     Balance at op. rate     Balance at curr rate     Adjustment
+            [   0,                                                  1,                      2,                       3,              4],
+            [
+                ('Accounts To Adjust',                             '',                     '',                      '',             ''),
+                ('CAD (1 USD = 2.0 CAD)',                      -400.0,                 -400.0,                  -200.0,          200.0),
+                ('211000 Account Payable',                     -400.0,                 -400.0,                  -200.0,          200.0),
+                ('BILL/2023/01/0001',                          -400.0,                 -400.0,                  -200.0,          200.0),
+                ('Total 211000 Account Payable',               -400.0,                 -400.0,                  -200.0,          200.0),
+                ('Total CAD',                                  -400.0,                 -400.0,                  -200.0,          200.0),
+            ],
+            options,
+            currency_map={
+                1: {'currency': self.other_currency},
+            },
+        )
+
+        # We check the report again with other date to witness the new changing of rates
+        options = self._generate_options(self.report, '2023-01-01', '2023-02-01')
+        options['unfold_all'] = True
+        self.assertLinesValues(
+            # pylint: disable=C0326
+            self.report._get_lines(options),
+            #   Name                       Balance in foreign currency     Balance at op. rate     Balance at curr rate     Adjustment
+            [   0,                                                  1,                      2,                       3,              4],
+            [
+                ('Accounts To Adjust',                             '',                     '',                      '',             ''),
+                ('CAD (1 USD = 4.0 CAD)',                      -400.0,                 -400.0,                  -100.0,          300.0),
+                ('211000 Account Payable',                     -400.0,                 -400.0,                  -100.0,          300.0),
+                ('BILL/2023/01/0001',                          -400.0,                 -400.0,                  -100.0,          300.0),
+                ('Total 211000 Account Payable',               -400.0,                 -400.0,                  -100.0,          300.0),
+                ('Total CAD',                                  -400.0,                 -400.0,                  -100.0,          300.0),
+            ],
+            options,
+            currency_map={
+                1: {'currency': self.other_currency},
+            },
+        )
+
+    @freeze_time('2023-01-28')
+    def test_pay_all_move_check_before_full_payment(self):
+        """ In this test we pay all the move, and then we check when coming back before the payment if the report display
+            the lines.
+        """
+        bill = self.create_move_one_line(
+            partner_id=self.partner_a.id,
+            move_type='in_invoice',
+            journal_id=self.company_data['default_journal_purchase'].id,
+            date='2023-01-21',
+            invoice_date='2023-01-21',
+            currency_id=self.other_currency.id,
+            account_id=self.company_data['default_account_expense'].id,
+            quantity=1,
+            price_unit=1000.0,
+        )
+
+        # We pay the first part of the bill, thanks to the changing of rates we have paid 600
+        self.pay_move(
+            bill,
+            1000,
+            '2023-01-28',
+            account_type=self.company_data['default_account_payable'].account_type,
+            currency=self.company_data['currency'],
+        )
+
+        # The report shouldn't display anything after the full payment.
+        options = self._generate_options(self.report, '2023-01-01', '2023-01-29')
+        options['unfold_all'] = True
+        self.assertEqual(len(self.report._get_lines(options)), 0)
+
+        # The report should display the bill before the full payment.
+        options = self._generate_options(self.report, '2023-01-01', '2023-01-26')
+        options['unfold_all'] = True
+        self.assertLinesValues(
+            # pylint: disable=C0326
+            self.report._get_lines(options),
+            #   Name                       Balance in foreign currency     Balance at op. rate     Balance at curr rate     Adjustment
+            [   0,                                                  1,                      2,                       3,              4],
+            [
+                ('Accounts To Adjust',                             '',                     '',                      '',             ''),
+                ('CAD (1 USD = 2.0 CAD)',                     -1000.0,                -1000.0,                  -500.0,          500.0),
+                ('211000 Account Payable',                    -1000.0,                -1000.0,                  -500.0,          500.0),
+                ('BILL/2023/01/0001',                         -1000.0,                -1000.0,                  -500.0,          500.0),
+                ('Total 211000 Account Payable',              -1000.0,                -1000.0,                  -500.0,          500.0),
+                ('Total CAD',                                 -1000.0,                -1000.0,                  -500.0,          500.0),
+            ],
+            options,
+            currency_map={
+                1: {'currency': self.other_currency},
+            },
+        )
+
+    @freeze_time('2023-01-26')
+    def test_move_credit_note(self):
+        """ Create a credit note, change the currency rate and then the payment. Check if the report gives the correct
+            values before and after the payment
+        """
+        bill = self.create_move_one_line(
+            partner_id=self.partner_a.id,
+            move_type='in_invoice',
+            journal_id=self.company_data['default_journal_purchase'].id,
+            date='2023-01-21',
+            invoice_date='2023-01-21',
+            currency_id=self.other_currency.id,
+            account_id=self.company_data['default_account_expense'].id,
+            quantity=1,
+            price_unit=1000.0,
+        )
+
+        options = self._generate_options(self.report, '2023-01-01', '2023-01-30')
+        options['unfold_all'] = True
+        self.assertEqual(len(self.report._get_lines(options)), 6)
+
+        self.pay_move(
+            bill,
+            1000,
+            '2023-01-26',
+            account_type=self.company_data['default_account_payable'].account_type,
+            currency=self.company_data['currency'],
+        )
+
+        options = self._generate_options(self.report, '2023-01-01', '2023-01-30')
+        options['unfold_all'] = True
+
+        self.assertEqual(len(self.report._get_lines(options)), 0)
+
+        move_reversal = self.env['account.move.reversal'].with_context(active_model='account.move', active_ids=bill.ids).create({
+            'journal_id': bill.journal_id.id,
+            'date': '2023-01-26'
+        })
+        reversal = move_reversal.reverse_moves()
+        self.env['account.move'].browse(reversal['res_id']).action_post()
+
+        self.assertLinesValues(
+            # pylint: disable=C0326
+            self.report._get_lines(options),
+            #   Name                                               Balance in foreign currency     Balance at op. rate     Balance at curr rate     Adjustment
+            [   0,                                                                          1,                      2,                       3,              4],
+            [
+                ('Accounts To Adjust',                                                     '',                     '',                      '',             ''),
+                ('CAD (1 USD = 4.0 CAD)',                                              1000.0,                  500.0,                   250.0,         -250.0),
+                ('211000 Account Payable',                                             1000.0,                  500.0,                   250.0,         -250.0),
+                ('RBILL/2023/01/0001 (Reversal of: BILL/2023/01/0001)',                1000.0,                  500.0,                   250.0,         -250.0),
+                ('Total 211000 Account Payable',                                       1000.0,                  500.0,                   250.0,         -250.0),
+                ('Total CAD',                                                          1000.0,                  500.0,                   250.0,         -250.0),
+            ],
+            options,
+            currency_map={
+                1: {'currency': self.other_currency},
+            },
+        )
+
+    @freeze_time('2023-01-26')
+    def test_with_payment_term(self):
+        """ In this test, we will create a new payment term where you need to pay 30% of the amount directly, and then
+            you have 60 days for the rest. We will check the report before and after the payment to make sure it's working
+            correctly.
+        """
+        account_payment_term_advance_60days = self.env['account.payment.term'].create({
+            'name': "account_payment_term_advance_60days",
+            'company_id': self.company_data['company'].id,
+            'line_ids': [
+                Command.create({
+                    'value_amount': 30,
+                    'value': 'percent',
+                    'nb_days': 0,
+                }),
+                Command.create({
+                    'value_amount': 70,
+                    'value': 'percent',
+                    'nb_days': 60,
+                }),
+            ]
+        })
+
+        bill = self.create_move_one_line(
+            partner_id=self.partner_a.id,
+            move_type='in_invoice',
+            journal_id=self.company_data['default_journal_purchase'].id,
+            date='2023-01-21',
+            invoice_date='2023-01-21',
+            currency_id=self.other_currency.id,
+            account_id=self.company_data['default_account_expense'].id,
+            quantity=1,
+            price_unit=1000.0,
+            payment_term_id=account_payment_term_advance_60days.id,
+        )
+
+        options = self._generate_options(self.report, '2023-01-01', '2023-01-30')
+        options['unfold_all'] = True
+        self.assertLinesValues(
+            # pylint: disable=C0326
+            self.report._get_lines(options),
+            #   Name                       Balance in foreign currency     Balance at op. rate     Balance at curr rate     Adjustment
+            [   0,                                                  1,                      2,                       3,              4],
+            [
+                ('Accounts To Adjust',                             '',                     '',                      '',             ''),
+                ('CAD (1 USD = 4.0 CAD)',                     -1000.0,                -1000.0,                  -250.0,          750.0),
+                ('211000 Account Payable',                    -1000.0,                -1000.0,                  -250.0,          750.0),
+                ('BILL/2023/01/0001 installment #1',           -300.0,                 -300.0,                   -75.0,          225.0),
+                ('BILL/2023/01/0001 installment #2',           -700.0,                 -700.0,                  -175.0,          525.0),
+                ('Total 211000 Account Payable',              -1000.0,                -1000.0,                  -250.0,          750.0),
+                ('Total CAD',                                 -1000.0,                -1000.0,                  -250.0,          750.0),
+            ],
+            options,
+            currency_map={
+                1: {'currency': self.other_currency},
+            },
+        )
+
+        # The price is double since the rate is x2 So the amount of the payment is 300
+        self.pay_move(
+            bill,
+            150,
+            '2023-01-26',
+            account_type=self.company_data['default_account_payable'].account_type,
+            currency=self.company_data['currency'],
+        )
+
+        self.assertLinesValues(
+            # pylint: disable=C0326
+            self.report._get_lines(options),
+            #   Name                       Balance in foreign currency     Balance at op. rate     Balance at curr rate     Adjustment
+            [   0,                                                  1,                      2,                       3,              4],
+            [
+                ('Accounts To Adjust',                             '',                     '',                      '',             ''),
+                ('CAD (1 USD = 4.0 CAD)',                      -700.0,                 -700.0,                  -175.0,          525.0),
+                ('211000 Account Payable',                     -700.0,                 -700.0,                  -175.0,          525.0),
+                ('BILL/2023/01/0001 installment #2',           -700.0,                 -700.0,                  -175.0,          525.0),
+                ('Total 211000 Account Payable',               -700.0,                 -700.0,                  -175.0,          525.0),
+                ('Total CAD',                                  -700.0,                 -700.0,                  -175.0,          525.0),
+            ],
+            options,
+            currency_map={
+                1: {'currency': self.other_currency},
+            },
+        )
+
+        # We check when coming back before the payment the lines are ok
+        options = self._generate_options(self.report, '2023-01-01', '2023-01-25')
+        options['unfold_all'] = True
+        self.assertLinesValues(
+            # pylint: disable=C0326
+            self.report._get_lines(options),
+            #   Name                       Balance in foreign currency     Balance at op. rate     Balance at curr rate     Adjustment
+            [   0,                                                  1,                      2,                       3,              4],
+            [
+                ('Accounts To Adjust',                             '',                     '',                      '',             ''),
+                ('CAD (1 USD = 2.0 CAD)',                     -1000.0,                -1000.0,                  -500.0,          500.0),
+                ('211000 Account Payable',                    -1000.0,                -1000.0,                  -500.0,          500.0),
+                ('BILL/2023/01/0001 installment #1',           -300.0,                 -300.0,                  -150.0,          150.0),
+                ('BILL/2023/01/0001 installment #2',           -700.0,                 -700.0,                  -350.0,          350.0),
+                ('Total 211000 Account Payable',              -1000.0,                -1000.0,                  -500.0,          500.0),
+                ('Total CAD',                                 -1000.0,                -1000.0,                  -500.0,          500.0),
+            ],
+            options,
+            currency_map={
+                1: {'currency': self.other_currency},
+            },
+        )
+
+    def test_transfer_invoice_to_another_partner(self):
+        """ This test verifies that we still find the bill amount in the report when payable is move
+            to another partner.
+        """
+        bill = self.create_move_one_line(
+            partner_id=self.partner_a.id,
+            move_type='in_invoice',
+            journal_id=self.company_data['default_journal_purchase'].id,
+            date='2023-01-21',
+            invoice_date='2023-01-21',
+            currency_id=self.other_currency.id,
+            account_id=self.company_data['default_account_expense'].id,
+            quantity=1,
+            price_unit=1000.0
+        )
+
+        entry = self.env['account.move'].create({
+            'move_type': 'entry',
+            'journal_id': self.company_data['default_journal_misc'].id,
+            'date': '2023-01-22',
+            'line_ids': [
+                Command.create({
+                    'partner_id': self.partner_a.id,
+                    'currency_id': self.other_currency.id,
+                    'amount_currency': 1000.0,
+                    'account_id': self.company_data['default_account_payable'].id,
+                }),
+                Command.create({
+                    'partner_id': self.partner_b.id,
+                    'currency_id': self.other_currency.id,
+                    'amount_currency': -1000.0,
+                    'account_id': self.company_data['default_account_payable'].id,
+                }),
+            ]
+        })
+        entry.action_post()
+
+        lines_to_reconcile = entry.line_ids.filtered(lambda line: line.partner_id == self.partner_a and line.account_type == self.company_data['default_account_payable'].account_type)
+        lines_to_reconcile += bill.line_ids.filtered(lambda line: line.account_type == self.company_data['default_account_payable'].account_type)
+        lines_to_reconcile.reconcile()
+
+        options = self._generate_options(self.report, '2023-01-01', '2023-01-31')
+        options['unfold_all'] = True
+        self.assertLinesValues(
+            # pylint: disable=C0326
+            self.report._get_lines(options),
+            #   Name                       Balance in foreign currency     Balance at op. rate     Balance at curr rate     Adjustment
+            [   0,                                                  1,                      2,                       3,              4],
+            [
+                ('Accounts To Adjust',                             '',                     '',                      '',             ''),
+                ('CAD (1 USD = 4.0 CAD)',                     -1000.0,                -1000.0,                  -250.0,          750.0),
+                ('211000 Account Payable',                    -1000.0,                -1000.0,                  -250.0,          750.0),
+                ('MISC/2023/01/0001',                         -1000.0,                -1000.0,                  -250.0,          750.0),
+                ('Total 211000 Account Payable',              -1000.0,                -1000.0,                  -250.0,          750.0),
+                ('Total CAD',                                 -1000.0,                -1000.0,                  -250.0,          750.0),
+            ],
+            options,
+            currency_map={
+                1: {'currency': self.other_currency},
+            },
+        )
+
+    @freeze_time('2023-01-26')
+    def test_refund_invoice_keep_exchange_diff_line(self):
+        """ Create an invoice, cancel it with a credit note.
+            Check the report, unreconcile the credit note and
+            check the report again.
+        """
+        # Create a customer invoice with a rate of 1 USD = 1 CAD
+        invoice = self.create_move_one_line(
+            partner_id=self.partner_a.id,
+            move_type='out_invoice',
+            journal_id=self.company_data['default_journal_sale'].id,
+            date='2023-01-21',
+            invoice_date='2023-01-21',
+            currency_id=self.other_currency.id,
+            account_id=self.company_data['default_account_revenue'].id,
+            quantity=1,
+            price_unit=1000.0,
+        )
+
+        # Reverse the customer invoice with a rate of 1 USD = 2 CAD to create a partial credit note
+        move_reversal = self.env['account.move.reversal'].with_context(active_model='account.move', active_ids=invoice.ids).create({
+            'journal_id': invoice.journal_id.id,
+            'date': '2023-01-26',
+        })
+        reversal = move_reversal.reverse_moves()
+        credit_note = self.env['account.move'].browse(reversal['res_id'])
+        credit_note.invoice_line_ids[0].price_unit = 300  # Only reverse for 300
+        credit_note.action_post()
+        line_to_reconciles = (invoice + credit_note).line_ids.filtered(lambda l: l.account_type == self.company_data['default_account_receivable'].account_type)
+
+        #  Checking the report after reconciliation between the invoice and the credit note (Rate 1 USD = 4 CAD)
+        options = self._generate_options(self.report, '2023-01-01', '2023-01-30')
+        options['unfold_all'] = True
+        self.assertLinesValues(
+            # pylint: disable=C0326
+            self.report._get_lines(options),
+            #   Name                       Balance in foreign currency     Balance at op. rate     Balance at curr rate     Adjustment
+            [   0,                                                  1,                      2,                       3,              4],
+            [
+                ('Accounts To Adjust',                             '',                     '',                      '',             ''),
+                ('CAD (1 USD = 4.0 CAD)',                       700.0,                  700.0,                   175.0,         -525.0),
+                ('121000 Account Receivable',                   700.0,                  700.0,                   175.0,         -525.0),
+                ('INV/2023/00001',                              700.0,                  700.0,                   175.0,         -525.0),
+                ('Total 121000 Account Receivable',             700.0,                  700.0,                   175.0,         -525.0),
+                ('Total CAD',                                   700.0,                  700.0,                   175.0,         -525.0),
+            ],
+            options,
+            currency_map={
+                1: {'currency': self.other_currency},
+            },
+        )
+
+        # Delete the reconciliation
+        partial = self.env['account.partial.reconcile'].search([
+            ('debit_move_id', '=', line_to_reconciles[0].id),
+            ('credit_move_id', '=', line_to_reconciles[1].id),
+        ])
+        partial.unlink()
+
+        # Check the report in february, the exchange diff should disappear as it was computed in january (Rate 1 USD = 4 CAD)
+        options = self._generate_options(self.report, '2023-01-01', '2023-02-15')
+        options['unfold_all'] = True
+        self.assertLinesValues(
+            # pylint: disable=C0326
+            self.report._get_lines(options),
+            #   Name                                           Balance in foreign currency     Balance at op. rate     Balance at curr rate     Adjustment
+            [   0,                                                                      1,                      2,                       3,              4],
+            [
+                ('Accounts To Adjust',                                                 '',                     '',                      '',             ''),
+                ('CAD (1 USD = 4.0 CAD)',                                           700.0,                  850.0,                   175.0,         -675.0),
+                ('121000 Account Receivable',                                       700.0,                  850.0,                   175.0,         -675.0),
+                ('RINV/2023/00001 (Reversal of: INV/2023/00001)',                  -300.0,                 -150.0,                   -75.0,           75.0),
+                ('INV/2023/00001',                                                 1000.0,                 1000.0,                   250.0,         -750.0),
+                ('Total 121000 Account Receivable',                                 700.0,                  850.0,                   175.0,         -675.0),
+                ('Total CAD',                                                       700.0,                  850.0,                   175.0,         -675.0),
+            ],
+            options,
+            currency_map={
+                1: {'currency': self.other_currency},
+            },
+        )
+
+    def test_invoice_with_different_rate_than_the_existing_one(self):
+        """ This test has for purpose to check that the customized rate on an entry
+            is well-kept. If a user creates an entry in multi currency and creates a
+            rate for this entry specifically (by changing the debit/credit and amount_currency).
+            The report should use this rate for the balance in foreign currency and the balance
+            at operation rate.
+        """
+        # Special rate of 3
+        entry = self.env['account.move'].create({
+            'move_type': 'entry',
+            'date': '2023-01-21',
+            'journal_id': self.company_data['default_journal_misc'].id,
+            'line_ids': [
+                Command.create({
+                    'name': 'expense line',
+                    'debit': 300.0,
+                    'credit': 0.0,
+                    'currency_id': self.other_currency.id,
+                    'amount_currency': 900,
+                    'account_id': self.company_data['default_account_expense'].id,
+                }),
+                Command.create({
+                    'name': 'payable line',
+                    'partner_id': self.partner_a.id,
+                    'currency_id': self.other_currency.id,
+                    'debit': 0.0,
+                    'credit': 300.0,
+                    'amount_currency': -900.0,
+                    'account_id': self.company_data['default_account_payable'].id,
+                }),
+            ],
+        })
+        entry.action_post()
+
+        # Opening the report for a rate at 4 instead of 3
+        options = self._generate_options(self.report, '2023-01-01', '2023-01-31')
+        options['unfold_all'] = True
+        self.assertLinesValues(
+            # pylint: disable=C0326
+            self.report._get_lines(options),
+            #   Name                       Balance in foreign currency     Balance at op. rate     Balance at curr rate     Adjustment
+            [   0,                                                  1,                      2,                       3,              4],
+            [
+                ('Accounts To Adjust',                             '',                     '',                      '',             ''),
+                ('CAD (1 USD = 4.0 CAD)',                      -900.0,                 -300.0,                  -225.0,           75.0),
+                ('211000 Account Payable',                     -900.0,                 -300.0,                  -225.0,           75.0),
+                ('MISC/2023/01/0001 payable line',             -900.0,                 -300.0,                  -225.0,           75.0),
+                ('Total 211000 Account Payable',               -900.0,                 -300.0,                  -225.0,           75.0),
+                ('Total CAD',                                  -900.0,                 -300.0,                  -225.0,           75.0),
+            ],
+            options,
+            currency_map={
+                1: {'currency': self.other_currency},
+            },
+        )
+
+    def test_current_liability_reco_bank_journal_aml(self):
+        """ This test creates a reconcilable current liability account with a foreign currency,
+            creates an entry with this account and reconciles it with a bank journal aml.
+            Before reconciliation, the bank journal aml shouldn't impact the report
+            because the amount is already realized.
+            Once this aml is reconciled with the current liability aml, the report should be impacted.
+        """
+        special_liability_current_account = self.env['account.account'].create({
+            'name': '201 GOL',
+            'code': '201',
+            'account_type': 'liability_current',
+            'reconcile': True,
+            'currency_id': self.other_currency.id
+        })
+        self.company_data['default_journal_bank'].currency_id = self.other_currency.id
+
+        entry = self.env['account.move'].create({
+            'move_type': 'entry',
+            'date': '2023-01-21',
+            'journal_id': self.company_data['default_journal_misc'].id,
+            'line_ids': [
+                Command.create({
+                    'name': 'liability line',
+                    'debit': 50.0,
+                    'credit': 0.0,
+                    'currency_id': self.other_currency.id,
+                    'amount_currency': 100.0,
+                    'account_id': special_liability_current_account.id,
+                }),
+                Command.create({
+                    'name': 'revenue line',
+                    'currency_id': self.other_currency.id,
+                    'debit': 0.0,
+                    'credit': 50.0,
+                    'amount_currency': -100.0,
+                    'account_id': self.company_data['default_account_revenue'].id,
+                }),
+            ],
+        })
+        entry.action_post()
+
+        self.env['account.bank.statement.line'].create({
+            'journal_id': self.company_data['default_journal_bank'].id,
+            'payment_ref': 'payment_move_line',
+            'foreign_currency_id': self.other_currency.id,
+            'amount': -10.0,
+            'amount_currency': -30.0,
+            'date': '2023-01-23',
+        })
+
+        bank_entry = self.env['account.move'].create({
+            'move_type': 'entry',
+            'date': '2023-01-23',
+            'journal_id': self.company_data['default_journal_bank'].id,
+            'line_ids': [
+                Command.create({
+                    'name': 'liability line',
+                    'debit': 0.0,
+                    'credit': 10.0,
+                    'currency_id': self.other_currency.id,
+                    'amount_currency': -30.0,
+                    'account_id': special_liability_current_account.id,
+                }),
+                Command.create({
+                    'name': 'revenue line',
+                    'currency_id': self.other_currency.id,
+                    'debit': 10.0,
+                    'credit': 0.0,
+                    'amount_currency': 30.0,
+                    'account_id': self.company_data['default_journal_bank'].default_account_id.id,
+                }),
+            ],
+        })
+        bank_entry.action_post()
+
+        # Checking the report before reconciliation
+        options = self._generate_options(self.report, '2023-01-01', '2023-01-31')
+        options['unfold_all'] = True
+        self.assertLinesValues(
+            # pylint: disable=C0326
+            self.report._get_lines(options),
+            #   Name                       Balance in foreign currency     Balance at op. rate     Balance at curr rate     Adjustment
+            [   0,                                                  1,                      2,                       3,              4],
+            [
+                ('Accounts To Adjust',                             '',                     '',                      '',             ''),
+                ('CAD (1 USD = 4.0 CAD)',                        90.0,                   40.0,                    22.5,          -17.5),
+                ('101401 Bank',                                  20.0,                    0.0,                     5.0,            5.0),
+                ('BNK1/2023/00002 revenue line',                 30.0,                   10.0,                     7.5,           -2.5),
+                ('BNK1/2023/00001 payment_move_line',           -10.0,                  -10.0,                    -2.5,            7.5),
+                ('Total 101401 Bank',                            20.0,                    0.0,                     5.0,            5.0),
+                ('201 201 GOL',                                  70.0,                   40.0,                    17.5,          -22.5),
+                ('BNK1/2023/00002 liability line',              -30.0,                  -10.0,                    -7.5,            2.5),
+                ('MISC/2023/01/0001 liability line',            100.0,                   50.0,                    25.0,          -25.0),
+                ('Total 201 201 GOL',                            70.0,                   40.0,                    17.5,          -22.5),
+                ('Total CAD',                                    90.0,                   40.0,                    22.5,          -17.5),
+            ],
+            options,
+            currency_map={
+                1: {'currency': self.other_currency},
+            },
+        )
+
+        line_to_reconciles = (entry + bank_entry).line_ids.filtered(lambda l: l.account_type == special_liability_current_account.account_type)
+        line_to_reconciles.reconcile()
+
+        # After reconciliation, the bank journal aml should impact the report
+        options = self._generate_options(self.report, '2023-01-01', '2023-01-31')
+        options['unfold_all'] = True
+        self.assertLinesValues(
+            # pylint: disable=C0326
+            self.report._get_lines(options),
+            #   Name                       Balance in foreign currency     Balance at op. rate     Balance at curr rate     Adjustment
+            [   0,                                                  1,                      2,                       3,              4],
+            [
+                ('Accounts To Adjust',                             '',                     '',                      '',             ''),
+                ('CAD (1 USD = 4.0 CAD)',                        90.0,                   35.0,                    22.5,          -12.5),
+                ('101401 Bank',                                  20.0,                    0.0,                     5.0,            5.0),
+                ('BNK1/2023/00002 revenue line',                 30.0,                   10.0,                     7.5,           -2.5),
+                ('BNK1/2023/00001 payment_move_line',           -10.0,                  -10.0,                    -2.5,            7.5),
+                ('Total 101401 Bank',                            20.0,                    0.0,                     5.0,            5.0),
+                ('201 201 GOL',                                  70.0,                   35.0,                    17.5,          -17.5),
+                ('MISC/2023/01/0001 liability line',             70.0,                   35.0,                    17.5,          -17.5),
+                ('Total 201 201 GOL',                            70.0,                   35.0,                    17.5,          -17.5),
+                ('Total CAD',                                    90.0,                   35.0,                    22.5,          -12.5),
+            ],
+            options,
+            currency_map={
+                1: {'currency': self.other_currency},
+            },
+        )
+
+    def test_no_pl_account_present(self):
+        """
+            When putting a currency on a p&l account, the account should NOT be present in the report.
+            This test will check that the exclusion of the account_type present in a p&l are not displayed.
+        """
+
+        self.company_data['default_account_expense'].currency_id = self.other_currency.id
+        self.create_move_one_line(
+            partner_id=self.partner_a.id,
+            move_type='in_invoice',
+            journal_id=self.company_data['default_journal_purchase'].id,
+            date='2023-01-21',
+            invoice_date='2023-01-21',
+            currency_id=self.other_currency.id,
+            account_id=self.company_data['default_account_expense'].id,
+            quantity=1,
+            price_unit=1000.0
+        )
+
+        options = self._generate_options(self.report, '2023-01-01', '2023-01-26')
+        options['unfold_all'] = True
+        self.assertLinesValues(
+            # pylint: disable=C0326
+            self.report._get_lines(options),
+            #   Name                       Balance in foreign currency     Balance at op. rate     Balance at curr rate     Adjustment
+            [0,                                                     1,                       2,                       3,             4],
+            [
+                ('Accounts To Adjust',                             '',                      '',                      '',            ''),
+                ('CAD (1 USD = 2.0 CAD)',                     -1000.0,                 -1000.0,                  -500.0,         500.0),
+                ('211000 Account Payable',                    -1000.0,                 -1000.0,                  -500.0,         500.0),
+                ('BILL/2023/01/0001',                         -1000.0,                 -1000.0,                  -500.0,         500.0),
+                ('Total 211000 Account Payable',              -1000.0,                 -1000.0,                  -500.0,         500.0),
+                ('Total CAD',                                 -1000.0,                 -1000.0,                  -500.0,         500.0),
+            ],
+            options,
+            currency_map={
+                1: {'currency': self.other_currency},
+            },
+        )
+
+    def test_adjustment_entry_with_tax_on_expense_account(self):
+        """ Make sure the adjustment entry is correctly generated even when
+            the expense account has default taxes.
+        """
+        self.create_move_one_line(
+            partner_id=self.partner_a.id,
+            move_type='out_invoice',
+            journal_id=self.company_data['default_journal_sale'].id,
+            date='2023-01-21',
+            invoice_date='2023-01-21',
+            currency_id=self.other_currency.id,
+            account_id=self.company_data['default_account_revenue'].id,
+            quantity=1,
+            price_unit=1000.0,
+        )
+
+        options = self._generate_options(self.report, '2023-01-01', '2023-01-26')
+        options['unfold_all'] = True
+        self.assertLinesValues(
+            # pylint: disable=C0326
+            self.report._get_lines(options),
+            #   Name                       Balance in foreign currency     Balance at op. rate     Balance at curr rate     Adjustment
+            [   0,                                                  1,                      2,                       3,              4],
+            [
+                ('Accounts To Adjust',                              '',                    '',                      '',             ''),
+                ('CAD (1 USD = 2.0 CAD)',                       1000.0,                1000.0,                   500.0,         -500.0),
+                ('121000 Account Receivable',                   1000.0,                1000.0,                   500.0,         -500.0),
+                ('INV/2023/00001',                              1000.0,                1000.0,                   500.0,         -500.0),
+                ('Total 121000 Account Receivable',             1000.0,                1000.0,                   500.0,         -500.0),
+                ('Total CAD',                                   1000.0,                1000.0,                   500.0,         -500.0),
+            ],
+            options,
+            currency_map={
+                1: {'currency': self.other_currency},
+            },
+        )
+        expense_account = self.company_data['default_account_expense']
+        expense_account.tax_ids = [self.company_data['default_tax_purchase'].id]
+        self.env.context = {**self.env.context, 'multicurrency_revaluation_report_options': {**options, 'unfold_all': False}}
+        wizard = self.env['account.multicurrency.revaluation.wizard'].create({
+            'journal_id': self.company_data['default_journal_misc'].id,
+            'expense_provision_account_id': expense_account.id,
+            'income_provision_account_id': self.company_data['default_account_revenue'].id,
+        })
+        entry_data = wizard.create_entries()
+        entry = self.env['account.move'].browse(entry_data['res_id'])
+
+        self.assertRecordValues(entry.invoice_line_ids, [{
+            'name': 'Provision for CAD (1 USD = 2.0 CAD)',
+            'debit': 0.00,
+            'credit': 500.0,
+        }, {
+            'name': 'Expense Provision for CAD',
+            'debit': 500.00,
+            'credit': 0.0,
+        }])
diff --git a/dev_odex30_accounting/odex30_account_reports/tests/test_partner_ledger_report.py b/dev_odex30_accounting/odex30_account_reports/tests/test_partner_ledger_report.py
new file mode 100644
index 0000000..4e3556c
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_reports/tests/test_partner_ledger_report.py
@@ -0,0 +1,714 @@
+# pylint: disable=C0326
+from .common import TestAccountReportsCommon
+
+from odoo import Command, fields
+from odoo.tests import tagged
+
+import json
+
+
+@tagged('post_install', '-at_install')
+class TestPartnerLedgerReport(TestAccountReportsCommon):
+    @classmethod
+    def setUpClass(cls):
+        super().setUpClass()
+
+        cls.partner_category_a = cls.env['res.partner.category'].create({'name': 'partner_categ_a'})
+        cls.partner_category_b = cls.env['res.partner.category'].create({'name': 'partner_categ_b'})
+
+        cls.partner_a.write({'category_id': [Command.set([cls.partner_category_a.id, cls.partner_category_b.id])]})
+        cls.partner_b.write({'category_id': [Command.set([cls.partner_category_a.id])]})
+        cls.partner_c = cls._create_partner(name='partner_c', category_id=[Command.set([cls.partner_category_b.id])])
+
+        # Entries in 2016 for company_1 to test the initial balance.
+        cls.move_2016_1 = cls.env['account.move'].create({
+            'move_type': 'entry',
+            'date': fields.Date.from_string('2016-01-01'),
+            'journal_id': cls.company_data['default_journal_misc'].id,
+            'line_ids': [
+                (0, 0, {'debit': 100.0,     'credit': 0.0,      'name': '2016_1_1',     'account_id': cls.company_data['default_account_payable'].id,       'partner_id': cls.partner_a.id}),
+                (0, 0, {'debit': 200.0,     'credit': 0.0,      'name': '2016_1_1',     'account_id': cls.company_data['default_account_payable'].id,       'partner_id': cls.partner_b.id}),
+                (0, 0, {'debit': 0.0,       'credit': 300.0,    'name': '2016_1_2',     'account_id': cls.company_data['default_account_receivable'].id,    'partner_id': cls.partner_c.id}),
+            ],
+        })
+        cls.move_2016_1.action_post()
+
+        # Entries in 2016 for company_2 to test the initial balance in multi-companies/multi-currencies.
+        cls.move_2016_2 = cls.env['account.move'].create({
+            'move_type': 'entry',
+            'date': fields.Date.from_string('2016-06-01'),
+            'journal_id': cls.company_data_2['default_journal_misc'].id,
+            'line_ids': [
+                (0, 0, {'debit': 100.0,     'credit': 0.0,      'name': '2016_2_1',     'account_id': cls.company_data_2['default_account_payable'].id,     'partner_id': cls.partner_a.id}),
+                (0, 0, {'debit': 0.0,       'credit': 100.0,    'name': '2016_2_2',     'account_id': cls.company_data_2['default_account_receivable'].id,  'partner_id': cls.partner_c.id}),
+            ],
+        })
+        cls.move_2016_2.action_post()
+
+        # Entry in 2017 for company_1 to test the report at current date.
+        cls.move_2017_1 = cls.env['account.move'].create({
+            'move_type': 'entry',
+            'date': fields.Date.from_string('2017-01-01'),
+            'journal_id': cls.company_data['default_journal_misc'].id,
+            'line_ids': [
+                (0, 0, {'debit': 1000.0,    'credit': 0.0,      'name': '2017_1_1',     'account_id': cls.company_data['default_account_payable'].id,       'partner_id': cls.partner_b.id}),
+                (0, 0, {'debit': 2000.0,    'credit': 0.0,      'name': '2017_1_2',     'account_id': cls.company_data['default_account_payable'].id,       'partner_id': cls.partner_a.id}),
+                (0, 0, {'debit': 3000.0,    'credit': 0.0,      'name': '2017_1_3',     'account_id': cls.company_data['default_account_payable'].id,       'partner_id': cls.partner_a.id}),
+                (0, 0, {'debit': 4000.0,    'credit': 0.0,      'name': '2017_1_4',     'account_id': cls.company_data['default_account_receivable'].id,    'partner_id': cls.partner_a.id}),
+                (0, 0, {'debit': 5000.0,    'credit': 0.0,      'name': '2017_1_5',     'account_id': cls.company_data['default_account_receivable'].id,    'partner_id': cls.partner_a.id}),
+                (0, 0, {'debit': 6000.0,    'credit': 0.0,      'name': '2017_1_6',     'account_id': cls.company_data['default_account_receivable'].id,    'partner_id': cls.partner_a.id}),
+                (0, 0, {'debit': 0.0,       'credit': 6000.0,   'name': '2017_1_7',     'account_id': cls.company_data['default_account_receivable'].id,    'partner_id': cls.partner_c.id}),
+                (0, 0, {'debit': 0.0,       'credit': 7000.0,   'name': '2017_1_8',     'account_id': cls.company_data['default_account_receivable'].id,    'partner_id': cls.partner_c.id}),
+                (0, 0, {'debit': 0.0,       'credit': 8000.0,   'name': '2017_1_9',     'account_id': cls.company_data['default_account_receivable'].id,    'partner_id': cls.partner_c.id}),
+            ],
+        })
+        cls.move_2017_1.action_post()
+
+        # Entry in 2017 for company_2 to test the current period in multi-companies/multi-currencies.
+        cls.move_2017_2 = cls.env['account.move'].create({
+            'move_type': 'entry',
+            'date': fields.Date.from_string('2017-06-01'),
+            'journal_id': cls.company_data_2['default_journal_misc'].id,
+            'line_ids': [
+                (0, 0, {'debit': 400.0,     'credit': 0.0,      'name': '2017_2_1',     'account_id': cls.company_data_2['default_account_receivable'].id}),
+                (0, 0, {'debit': 0.0,       'credit': 400.0,    'name': '2017_2_2',     'account_id': cls.company_data_2['default_account_receivable'].id}),
+            ],
+        })
+        cls.move_2017_2.action_post()
+
+        cls.report = cls.env.ref('odex30_account_reports.partner_ledger_report')
+
+    def test_partner_ledger_unfold(self):
+        ''' Test unfolding a line when rendering the whole report. '''
+        options = self._generate_options(self.report, fields.Date.from_string('2017-01-01'), fields.Date.from_string('2017-12-31'))
+
+        self.assertLinesValues(
+            self.report._get_lines(options),
+            #   Name                                    Debit           Credit          Balance
+            [   0,                                      6,              7,              9],
+            [
+                ('partner_a',                           20150.0,        0.0,            20150.0),
+                ('partner_b',                           1200.0,         0.0,            1200.0),
+                ('partner_c',                           0.0,            21350.0,        -21350.0),
+                ('Unknown Partner',                     200.0,          200.0,          0.0),
+                ('Total',                               21550.0,        21550.0,        0.0),
+            ],
+            options,
+        )
+
+        options['unfolded_lines'] = [self.report._get_generic_line_id('res.partner', self.partner_a.id)]
+
+        self.assertLinesValues(
+            self.report._get_lines(options),
+            #   Name                                    Debit           Credit          Balance
+            [   0,                                      6,              7,              9],
+            [
+                ('partner_a',                           20150.0,        0.0,            20150.0),
+                ('Initial Balance',                     150.0,          0.0,            150.0),
+                ('MISC/2017/01/0001 2017_1_2',        2000.0,         0.0,            2150.0),
+                ('MISC/2017/01/0001 2017_1_3',        3000.0,         0.0,            5150.0),
+                ('MISC/2017/01/0001 2017_1_4',        4000.0,         0.0,            9150.0),
+                ('MISC/2017/01/0001 2017_1_5',        5000.0,         0.0,            14150.0),
+                ('MISC/2017/01/0001 2017_1_6',        6000.0,         0.0,            20150.0),
+                ('Total partner_a',                     20150.0,        0.0,            20150.0),
+                ('partner_b',                           1200.0,         0.0,            1200.0),
+                ('partner_c',                           0.0,            21350.0,        -21350.0),
+                ('Unknown Partner',                     200.0,          200.0,          0.0),
+                ('Total',                               21550.0,        21550.0,        0.0),
+            ],
+            options,
+        )
+
+    def test_partner_ledger_load_more(self):
+        ''' Test unfolding a line to use the load more. '''
+        self.report.load_more_limit = 2
+
+        options = self._generate_options(self.report, fields.Date.from_string('2017-01-01'), fields.Date.from_string('2017-12-31'))
+        options['unfolded_lines'] = [self.report._get_generic_line_id('res.partner', self.partner_a.id)]
+
+        report_lines = self.report._get_lines(options)
+
+        self.assertLinesValues(
+            report_lines,
+            #   Name                                    Debit           Credit          Balance
+            [   0,                                      6,              7,              9],
+            [
+                ('partner_a',                           20150.0,        0.0,            20150.0),
+                ('Initial Balance',                     150.0,          0.0,            150.0),
+                ('MISC/2017/01/0001 2017_1_2',        2000.0,         0.0,            2150.0),
+                ('MISC/2017/01/0001 2017_1_3',        3000.0,         0.0,            5150.0),
+                ('Load more...',                        '',             '',             ''),
+                ('Total partner_a',                     20150.0,        0.0,            20150.0),
+                ('partner_b',                           1200.0,         0.0,            1200.0),
+                ('partner_c',                           0.0,            21350.0,        -21350.0),
+                ('Unknown Partner',                     200.0,          200.0,          0.0),
+                ('Total',                               21550.0,        21550.0,        0.0),
+            ],
+            options,
+        )
+
+        load_more_1 = self.report.get_expanded_lines(
+            options,
+            report_lines[0]['id'],
+            report_lines[4]['groupby'],
+            '_report_expand_unfoldable_line_partner_ledger',
+            report_lines[4]['progress'],
+            report_lines[4]['offset'],
+            None,
+        )
+
+        self.assertLinesValues(
+            load_more_1,
+            #   Name                                    Debit           Credit          Balance
+            [   0,                                      6,              7,              9],
+            [
+                ('MISC/2017/01/0001 2017_1_4',          4000.0,         0.0,            9150.0),
+                ('MISC/2017/01/0001 2017_1_5',          5000.0,         0.0,            14150.0),
+                ('Load more...',                        '',             '',             ''),
+            ],
+            options,
+        )
+
+        load_more_2 = self.report.get_expanded_lines(
+            options,
+            report_lines[0]['id'],
+            load_more_1[2]['groupby'],
+            '_report_expand_unfoldable_line_partner_ledger',
+            load_more_1[2]['progress'],
+            load_more_1[2]['offset'],
+            None,
+        )
+
+        self.assertLinesValues(
+            load_more_2,
+            #   Name                                    Debit           Credit          Balance
+            [   0,                                      6,              7,              9],
+            [
+                ('MISC/2017/01/0001 2017_1_6',          6000.0,         0.0,            20150.0),
+            ],
+            options,
+        )
+
+    def test_partner_ledger_filter_account_types(self):
+        ''' Test building the report with a filter on account types.
+        When filtering on receivable accounts (i.e. trade_receivable and/or non_trade_receivable), partner_b should disappear from the report.
+        '''
+        options = self._generate_options(self.report, fields.Date.from_string('2017-01-01'), fields.Date.from_string('2017-12-31'))
+        options['unfolded_lines'] = [self.report._get_generic_line_id('res.partner', self.partner_a.id)]
+        options = self._update_multi_selector_filter(options, 'account_type', ['non_trade_receivable', 'trade_receivable'])
+
+        self.assertLinesValues(
+            self.report._get_lines(options),
+            #   Name                                    Debit           Credit          Balance
+            [   0,                                      6,              7,              9],
+            [
+                ('partner_a',                           15000.0,        0.0,            15000.0),
+                ('MISC/2017/01/0001 2017_1_4',          4000.0,         0.0,            4000.0),
+                ('MISC/2017/01/0001 2017_1_5',          5000.0,         0.0,            9000.0),
+                ('MISC/2017/01/0001 2017_1_6',          6000.0,         0.0,            15000.0),
+                ('Total partner_a',                     15000.0,        0.0,            15000.0),
+                ('partner_c',                           0.0,            21350.0,        -21350.0),
+                ('Unknown Partner',                     200.0,          200.0,          0.0),
+                ('Total',                               15200.0,        21550.0,        -6350.0),
+            ],
+            options,
+        )
+
+    def test_partner_ledger_filter_partners(self):
+        ''' Test the filter on top allowing to filter on res.partner.'''
+        options = self._generate_options(self.report, fields.Date.from_string('2017-01-01'), fields.Date.from_string('2017-12-31'))
+        options['partner_ids'] = (self.partner_a + self.partner_c).ids
+
+        self.assertLinesValues(
+            self.report._get_lines(options),
+            #   Name                                    Debit           Credit          Balance
+            [   0,                                      6,              7,              9],
+            [
+                ('partner_a',                           20150.0,        0.0,            20150.0),
+                ('partner_c',                           0.0,            21350.0,        -21350.0),
+                ('Total',                               20150.0,        21350.0,        -1200.0),
+            ],
+            options,
+        )
+
+    def test_partner_ledger_filter_partner_categories(self):
+        ''' Test the filter on top allowing to filter on res.partner.category.'''
+        options = self._generate_options(self.report, fields.Date.from_string('2017-01-01'), fields.Date.from_string('2017-12-31'))
+        options['partner_categories'] = self.partner_category_a.ids
+
+        self.assertLinesValues(
+            self.report._get_lines(options),
+            #   Name                                    Debit           Credit          Balance
+            [   0,                                      6,              7,              9],
+            [
+                ('partner_a',                           20150.0,        0.0,            20150.0),
+                ('partner_b',                           1200.0,         0.0,            1200.0),
+                ('Total',                               21350.0,        0.0,            21350.0),
+            ],
+            options,
+        )
+
+    def test_partner_ledger_unknown_partner(self):
+        ''' Test the partner ledger for whenever a line appearing in it has no partner assigned.
+        Check that reconciling this line with an invoice/bill of a partner does affect his balance.
+        '''
+        options = self._generate_options(self.report, fields.Date.from_string('2017-01-01'), fields.Date.from_string('2017-12-31'))
+
+        misc_move = self.env['account.move'].create({
+            'date': '2017-03-31',
+            'line_ids': [
+                (0, 0, {'debit': 1000.0, 'credit': 0.0,    'account_id': self.company_data['default_account_revenue'].id}),
+                (0, 0, {'debit': 0.0,    'credit': 1000.0, 'account_id': self.company_data['default_account_receivable'].id}),
+            ],
+        })
+        misc_move.action_post()
+
+        self.assertLinesValues(
+            self.report._get_lines(options),
+            #   Name                                    Debit           Credit          Balance
+            [   0,                                      6,              7,              9],
+            [
+                ('partner_a',                           20150.0,        0.0,            20150.0),
+                ('partner_b',                           1200.0,         0.0,            1200.0),
+                ('partner_c',                           0.0,            21350.0,        -21350.0),
+                ('Unknown Partner',                     200.0,          1200.0,         -1000.0),
+                ('Total',                               21550.0,        22550.0,        -1000.0),
+            ],
+            options,
+        )
+
+        debit_line = self.move_2017_1.line_ids.filtered(lambda line: line.debit == 4000.0)
+        credit_line = misc_move.line_ids.filtered(lambda line: line.credit == 1000.0)
+        (debit_line + credit_line).reconcile()
+
+        self.assertLinesValues(
+            self.report._get_lines(options),
+            #   Name                                    Debit           Credit          Balance
+            [   0,                                      6,              7,              9],
+            [
+                ('partner_a',                           20150.0,        1000.0,         19150.0),
+                ('partner_b',                           1200.0,         0.0,            1200.0),
+                ('partner_c',                           0.0,            21350.0,        -21350.0),
+                ('Unknown Partner',                     1200.0,         1200.0,         0.0),
+                ('Total',                               22550.0,        23550.0,        -1000.0),
+            ],
+            options,
+        )
+
+        # Unfold 'partner_a'
+        options['unfolded_lines'] = [self.report._get_generic_line_id('res.partner', self.partner_a.id)]
+
+        self.assertLinesValues(
+            self.report._get_lines(options),
+            #   Name                                    Debit           Credit          Balance
+            [   0,                                      6,              7,              9],
+            [
+                ('partner_a',                           20150.0,        1000.0,         19150.0),
+                ('Initial Balance',                     150.0,          0.0,            150.0),
+                ('MISC/2017/01/0001 2017_1_2',        2000.0,         0.0,            2150.0),
+                ('MISC/2017/01/0001 2017_1_3',        3000.0,         0.0,            5150.0),
+                ('MISC/2017/01/0001 2017_1_4',        4000.0,         0.0,            9150.0),
+                ('MISC/2017/01/0001 2017_1_5',        5000.0,         0.0,            14150.0),
+                ('MISC/2017/01/0001 2017_1_6',        6000.0,         0.0,            20150.0),
+                ('MISC/2017/03/0001',                   0.0,            1000.0,         19150.0),
+                ('Total partner_a',                     20150.0,        1000.0,         19150.0),
+                ('partner_b',                           1200.0,         0.0,            1200.0),
+                ('partner_c',                           0.0,            21350.0,        -21350.0),
+                ('Unknown Partner',                     1200.0,         1200.0,         0.0),
+                ('Total',                               22550.0,        23550.0,        -1000.0),
+            ],
+            options,
+        )
+
+        # Unfold 'Unknown Partner'
+        options['unfolded_lines'] = [self.report._get_generic_line_id('res.partner', None, markup='no_partner')]
+
+        self.assertLinesValues(
+            self.report._get_lines(options),
+            #   Name                                    Debit           Credit          Balance
+            [   0,                                      6,              7,              9],
+            [
+                ('partner_a',                           20150.0,        1000.0,         19150.0),
+                ('partner_b',                           1200.0,         0.0,            1200.0),
+                ('partner_c',                           0.0,            21350.0,        -21350.0),
+                ('Unknown Partner',                     1200.0,         1200.0,         0.0),
+                ('MISC/2017/03/0001',                   0.0,            1000.0,         -1000.0),
+                ('MISC/2017/06/0001 2017_2_1',        200.0,          0.0,            -800.0),
+                ('MISC/2017/06/0001 2017_2_2',        0.0,            200.0,          -1000.0),
+                ('MISC/2017/03/0001',                   1000.0,         0.0,            0.0),
+                ('Total Unknown Partner',               1200.0,         1200.0,         0.0),
+                ('Total',                               22550.0,        23550.0,        -1000.0),
+            ],
+            options,
+        )
+
+        # Change the dates to exclude the reconciliation max date: situation is back to the beginning
+        options = self._generate_options(self.report, fields.Date.from_string('2017-01-01'), fields.Date.from_string('2017-03-30'))
+
+        self.assertLinesValues(
+            self.report._get_lines(options),
+            #   Name                                    Debit           Credit          Balance
+            [   0,                                      6,              7,              9],
+            [
+                ('partner_a',                           20150.0,        0.0,            20150.0),
+                ('partner_b',                           1200.0,         0.0,            1200.0),
+                ('partner_c',                           0.0,            21350.0,        -21350.0),
+                ('Total',                               21350.0,        21350.0,        0.0),
+            ],
+            options,
+        )
+
+        # Change the dates to have a date_from > to the reconciliation max date and check the initial balances are correct
+        options = self._generate_options(self.report, fields.Date.from_string('2017-04-01'), fields.Date.from_string('2017-04-01'))
+
+        self.assertLinesValues(
+            self.report._get_lines(options),
+            #   Name                                    Debit           Credit          Balance
+            [   0,                                      6,              7,              9],
+            [
+                ('partner_a',                           20150.0,        1000.0,         19150.0),
+                ('partner_b',                           1200.0,         0.0,            1200.0),
+                ('partner_c',                           0.0,            21350.0,        -21350.0),
+                ('Unknown Partner',                     1000.0,         1000.0,         0.0),
+                ('Total',                               22350.0,        23350.0,        -1000.0),
+            ],
+            options,
+        )
+
+        # Unfold 'partner_a' to check the initial balance line is correct
+        options['unfolded_lines'] = [self.report._get_generic_line_id('res.partner', self.partner_a.id)]
+
+        self.assertLinesValues(
+            self.report._get_lines(options),
+            #   Name                                    Debit           Credit          Balance
+            [   0,                                      6,              7,              9],
+            [
+                ('partner_a',                           20150.00,       1000.0,         19150.00),
+                ('Initial Balance',                     20150.00,       1000.0,         19150.00),
+                ('Total partner_a',                     20150.00,       1000.0,         19150.00),
+                ('partner_b',                           1200.0,         0.0,            1200.0),
+                ('partner_c',                           0.0,            21350.00,       -21350.00),
+                ('Unknown Partner',                     1000.0,         1000.0,         0.0),
+                ('Total',                               22350.00,       23350.00,       -1000.0),
+            ],
+            options,
+        )
+
+    def test_partner_ledger_prefix_groups(self):
+        partner_names = [
+            'A',
+            'A partner',
+            'A nice partner',
+            'A new partner',
+            'An original partner',
+            'Another partner',
+            'Anonymous partner',
+            'Annoyed partner',
+            'Brave partner',
+        ]
+
+        test_date = '2010-12-13'
+        test_partners = self.env['res.partner']
+        for name in partner_names:
+            partner = self.env['res.partner'].create({'name': name})
+            test_partners += partner
+            invoice = self.init_invoice('out_invoice', partner=partner, invoice_date=test_date, amounts=[42.0], taxes=[], post=True)
+
+        # Without prefix groups
+        options = self._generate_options(self.report, test_date, test_date)
+
+        self.assertLinesValues(
+            self.report._get_lines(options),
+            #   Name                               Journal           Debit          Credit            Balance
+            [   0,                                      1,              6,              7,                9],
+            [
+                ('A',                                  '',           42.0,            0.0,             42.0),
+                ('A new partner',                      '',           42.0,            0.0,             42.0),
+                ('A nice partner',                     '',           42.0,            0.0,             42.0),
+                ('A partner',                          '',           42.0,            0.0,             42.0),
+                ('An original partner',                '',           42.0,            0.0,             42.0),
+                ('Annoyed partner',                    '',           42.0,            0.0,             42.0),
+                ('Anonymous partner',                  '',           42.0,            0.0,             42.0),
+                ('Another partner',                    '',           42.0,            0.0,             42.0),
+                ('Brave partner',                      '',           42.0,            0.0,             42.0),
+                ('Total',                              '',          378.0,            0.0,            378.0),
+            ],
+            options,
+        )
+
+        # With prefix groups
+        self.report.prefix_groups_threshold = 3
+        options = self._generate_options(self.report, test_date, test_date, default_options={'unfold_all': True})
+
+        self.assertLinesValues(
+            self.report._get_lines(options),
+            #   Name                                   Journal           Debit          Credit            Balance
+            [   0,                                        1,                6,              7,                9],
+            [
+                ('A (8 lines)',                          '',            336.0,            0.0,            336.0),
+                ('A',                                    '',             42.0,            0.0,             42.0),
+                ('INV/2010/00001',                    'INV',             42.0,            0.0,             42.0),
+                ('Total A',                              '',             42.0,            0.0,             42.0),
+                ('A[ ] (3 lines)',                       '',            126.0,            0.0,            126.0),
+                ('A N (2 lines)',                        '',             84.0,            0.0,             84.0),
+                ('A new partner',                        '',             42.0,            0.0,             42.0),
+                ('INV/2010/00004',                    'INV',             42.0,            0.0,             42.0),
+                ('Total A new partner',                  '',             42.0,            0.0,             42.0),
+                ('A nice partner',                       '',             42.0,            0.0,             42.0),
+                ('INV/2010/00003',                    'INV',             42.0,            0.0,             42.0),
+                ('Total A nice partner',                 '',             42.0,            0.0,             42.0),
+                ('Total A N (2 lines)',                  '',             84.0,            0.0,             84.0),
+                ('A P (1 line)',                         '',             42.0,            0.0,             42.0),
+                ('A partner',                            '',             42.0,            0.0,             42.0),
+                ('INV/2010/00002',                    'INV',             42.0,            0.0,             42.0),
+                ('Total A partner',                      '',             42.0,            0.0,             42.0),
+                ('Total A P (1 line)',                   '',             42.0,            0.0,             42.0),
+                ('Total A[ ] (3 lines)',                 '',            126.0,            0.0,            126.0),
+                ('AN (4 lines)',                         '',            168.0,            0.0,            168.0),
+                ('AN[ ] (1 line)',                       '',             42.0,            0.0,             42.0),
+                ('An original partner',                  '',             42.0,            0.0,             42.0),
+                ('INV/2010/00005',                    'INV',             42.0,            0.0,             42.0),
+                ('Total An original partner',            '',             42.0,            0.0,             42.0),
+                ('Total AN[ ] (1 line)',                 '',             42.0,            0.0,             42.0),
+                ('ANN (1 line)',                         '',             42.0,            0.0,             42.0),
+                ('Annoyed partner',                      '',             42.0,            0.0,             42.0),
+                ('INV/2010/00008',                    'INV',             42.0,            0.0,             42.0),
+                ('Total Annoyed partner',                '',             42.0,            0.0,             42.0),
+                ('Total ANN (1 line)',                   '',             42.0,            0.0,             42.0),
+                ('ANO (2 lines)',                        '',             84.0,            0.0,             84.0),
+                ('Anonymous partner',                    '',             42.0,            0.0,             42.0),
+                ('INV/2010/00007',                    'INV',             42.0,            0.0,             42.0),
+                ('Total Anonymous partner',              '',             42.0,            0.0,             42.0),
+                ('Another partner',                      '',             42.0,            0.0,             42.0),
+                ('INV/2010/00006',                    'INV',             42.0,            0.0,             42.0),
+                ('Total Another partner',                '',             42.0,            0.0,             42.0),
+                ('Total ANO (2 lines)',                  '',             84.0,            0.0,             84.0),
+                ('Total AN (4 lines)',                   '',            168.0,            0.0,            168.0),
+                ('Total A (8 lines)',                    '',            336.0,            0.0,            336.0),
+                ('B (1 line)',                           '',             42.0,            0.0,             42.0),
+                ('Brave partner',                        '',             42.0,            0.0,             42.0),
+                ('INV/2010/00009',                    'INV',             42.0,            0.0,             42.0),
+                ('Total Brave partner',                  '',             42.0,            0.0,             42.0),
+                ('Total B (1 line)',                     '',             42.0,            0.0,             42.0),
+                ('Total',                                '',            378.0,            0.0,            378.0),
+            ],
+            options,
+        )
+
+    def test_filter_unreconciled_entries_only(self):
+        new_partner = self.env['res.partner'].create({'name': 'Obiwan Kenobi'})
+        move_1 = self.init_invoice('out_invoice', partner=new_partner, invoice_date='2019-01-01', amounts=[1000.0], taxes=[], post=True)
+        move_2 = self.init_invoice('out_invoice', partner=new_partner, invoice_date='2019-01-01', amounts=[5000.0], taxes=[], post=True)
+
+        self.env['account.payment.register'].create({
+            'payment_date': '2019-01-01',
+            'line_ids': move_1.line_ids.filtered(lambda l: l.display_type == 'payment_term'),
+            'amount': 700.0,
+        })._create_payments()
+        self.env['account.payment.register'].create({
+            'payment_date': '2019-01-01',
+            'line_ids': move_2.line_ids.filtered(lambda l: l.display_type == 'payment_term'),
+        })._create_payments()
+
+        self.assertEqual(move_1.payment_state, 'partial')
+        self.assertEqual(move_2.payment_state, 'in_payment')
+
+        options = self._generate_options(self.report, '2019-01-01', '2019-12-31', default_options={'partner_ids': new_partner.ids})
+        self.assertLinesValues(
+            self.report._get_lines(options),
+            #   Name                                      Debit              Credit            Balance
+            [   0,                                            6,                  7,                9],
+            [
+                ('Obiwan Kenobi',                        6000.0,             5700.0,             300.0),
+                ('Total',                                6000.0,             5700.0,             300.0),
+            ],
+            options
+        )
+
+        options['unreconciled'] = True
+        self.assertLinesValues(
+            self.report._get_lines(options),
+            #   Name                                      Debit              Credit            Balance
+            [   0,                                            6,                  7,                9],
+            [
+                ('Obiwan Kenobi',                        1000.0,             700.0,             300.0),
+                ('Total',                                1000.0,             700.0,             300.0),
+            ],
+            options
+        )
+
+    def test_print_pdf_exclude_partner_with_name_similar_to_another_partner_email(self):
+        """
+        This test verifies that when printing a PDF report, the report accurately reflects the data displayed on the view
+        by excluding partners whose email addresses are similar to other partners' names if the search bar is used to filter out partners.
+        """
+        partner = self.env['res.partner'].create({'name': 'Great Customer', 'email': 'partner_a@test.com'})
+        self.init_invoice('out_invoice', partner=partner, invoice_date='2019-02-14', amounts=[1000.0], taxes=[], post=True)
+        options = self._generate_options(self.report, '2019-02-01', '2019-02-28', default_options={
+                'filter_search_bar': 'partner_a',
+                'export_mode': 'print',
+            })
+        lines = self.report._get_lines(options)
+        self.assertFalse(partner.name in [line['name'] for line in lines])
+
+    def test_partner_ledger_search_with_unknown_partner(self):
+        ''' Test that the lines with no partners are included in the report when searching for "Unknown Partner" '''
+        options = self._generate_options(self.report, '2019-02-01', '2019-02-28', default_options={
+                'filter_search_bar': 'un',
+                'export_mode': 'print',
+            })
+
+        self.assertLinesValues(
+            self.report._get_lines(options),
+            #   Name                                    Debit           Credit          Balance
+            [   0,                                      6,              7,              9],
+            [
+                ('Unknown Partner',                     200.0,          200.0,          0.0),
+                ('Total',                               200.0,          200.0,          0.0),
+            ],
+            options,
+        )
+
+        partner = self.env['res.partner'].create({'name': 'Unexpected Customer'})
+        self.init_invoice('out_invoice', partner=partner, invoice_date='2019-02-14', amounts=[1000.0], taxes=[], post=True)
+
+        self.assertLinesValues(
+            self.report._get_lines(options),
+            #   Name                                    Debit           Credit          Balance
+            [   0,                                      6,              7,              9],
+            [
+                ('Unexpected Customer',                 1000.0,         0.0,            1000.0),
+                ('Unknown Partner',                     200.0,          200.0,          0.0),
+                ('Total',                               1200.0,         200.0,          1000.0),
+            ],
+            options,
+        )
+
+    def test_no_amount_currency_col_in_single_currency(self):
+        # In multi-currency, we get the amount_currency column
+        self.assertGreater(len(self.env['res.currency'].search([])), 1)
+        options = self._generate_options(self.report, fields.Date.from_string('2023-01-01'), fields.Date.from_string('2023-12-31'))
+        self.assertTrue(any(col['expression_label'] == 'amount_currency' for col in options['columns']))
+
+        # Not in single-currency
+        self.env['res.currency'].search([('name', '!=', 'USD')]).with_context(force_deactivate=True).active = False
+        self.assertEqual(len(self.env['res.currency'].search([])), 1)
+        options = self._generate_options(self.report, fields.Date.from_string('2023-01-01'), fields.Date.from_string('2023-12-31'))
+        self.assertFalse(any(col['expression_label'] == 'amount_currency' for col in options['columns']))
+
+    def test_partner_ledger_fully_reconcile_previous_year(self):
+        """
+        Verify the report's behavior when a partner is fully reconciled and has a zero balance.
+        If the partner's balance is zero:
+            If the partner has any unreconciled items, display the partner's information in the report.
+            If the partner has no unreconciled items but has an initial balance > 0, show the partner.
+            If the partner has no unreconciled items and has an initial balance = 0, hide the partner.
+        """
+        new_partner = self.env['res.partner'].create({'name': 'Anakin Skywalker'})
+        move = self.env['account.move'].create({
+            'move_type': 'out_invoice',
+            'invoice_date': '2019-01-01',
+            'partner_id': new_partner.id,
+            'invoice_line_ids': [Command.create({
+                'quantity': 1,
+                'price_unit': 500.0,
+                'tax_ids': [],
+            })]
+        })
+        move.action_post()
+
+        payment_1 = self.env['account.move'].create({
+            'move_type': 'entry',
+            'date': '2019-01-01',
+            'journal_id': self.company_data['default_journal_misc'].id,
+            'partner_id': new_partner.id,
+            'line_ids': [
+                Command.create({'debit': 0.0,       'credit': 500.0,    'account_id': self.company_data['default_account_receivable'].id}),
+                Command.create({'debit': 500.0,     'credit': 0.0,      'account_id': self.company_data['default_journal_bank'].default_account_id.id}),
+            ],
+        })
+        payment_1.action_post()
+
+        options = self._generate_options(self.report, '2020-01-01', '2020-12-31', default_options={'partner_ids': new_partner.ids})
+        # Balance is 0 but there are unreconciled entries, so we show the line
+        self.assertLinesValues(
+            self.report._get_lines(options),
+            #                   Name                          Debit              Credit           Balance
+            [                     0,                             6,                  7,                9],
+            [
+                ('Anakin Skywalker',                         500.0,              500.0,              0.0),
+                ('Total',                                    500.0,              500.0,              0.0),
+            ],
+            options,
+        )
+
+        (payment_1 + move).line_ids.filtered(
+            lambda line: line.account_id == self.company_data['default_account_receivable']
+        ).reconcile()
+
+        # Balance is still 0 and there is no more unreconciled entries, the partner is hide from the report
+        self.assertLinesValues(
+            self.report._get_lines(options),
+            #        Name                                     Debit              Credit           Balance
+            [          0,                                        6,                  7,                9],
+            [
+                ('Total',                                      0.0,                0.0,              0.0),
+            ],
+            options,
+        )
+
+    def test_partner_ledger_fully_reconcile_current_year(self):
+        new_partner = self.env['res.partner'].create({'name': 'Darth Vader'})
+        move = self.env['account.move'].create({
+            'move_type': 'out_invoice',
+            'invoice_date': '2019-01-01',
+            'partner_id': new_partner.id,
+            'invoice_line_ids': [Command.create({
+                'quantity': 1,
+                'price_unit': 500.0,
+                'tax_ids': [],
+            })]
+        })
+        move.action_post()
+
+        payment_1 = self.env['account.move'].create({
+            'move_type': 'entry',
+            'date': '2019-01-01',
+            'journal_id': self.company_data['default_journal_misc'].id,
+            'partner_id': new_partner.id,
+            'line_ids': [
+                Command.create({'debit': 0.0,       'credit': 500.0,    'account_id': self.company_data['default_account_receivable'].id}),
+                Command.create({'debit': 500.0,     'credit': 0.0,      'account_id': self.company_data['default_journal_bank'].default_account_id.id}),
+            ],
+        })
+        payment_1.action_post()
+
+        options = self._generate_options(self.report, '2019-01-01', '2019-12-31', default_options={'partner_ids': new_partner.ids})
+        # Balance is 0 but there are unreconciled entries, so we show the line
+        self.assertLinesValues(
+            self.report._get_lines(options),
+            #              Name                              Debit              Credit            Balance
+            [                0,                                  6,                  7,                9],
+            [
+                ('Darth Vader',                              500.0,              500.0,              0.0),
+                ('Total',                                    500.0,              500.0,              0.0),
+            ],
+            options,
+        )
+
+        (payment_1 + move).line_ids.filtered(
+            lambda line: line.account_id == self.company_data['default_account_receivable']
+        ).reconcile()
+
+        # Balance is still 0 and there is no more unreconciled entries, but the moves is in the current report period,
+        # so we still show the partner in the report
+        self.assertLinesValues(
+            self.report._get_lines(options),
+            #             Name                               Debit              Credit            Balance
+            [                0,                                  6,                  7,                9],
+            [
+                ('Darth Vader',                              500.0,              500.0,              0.0),
+                ('Total',                                    500.0,              500.0,              0.0),
+            ],
+            options,
+        )
diff --git a/dev_odex30_accounting/odex30_account_reports/tests/test_reconciliation_report.py b/dev_odex30_accounting/odex30_account_reports/tests/test_reconciliation_report.py
new file mode 100644
index 0000000..b1a1f0e
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_reports/tests/test_reconciliation_report.py
@@ -0,0 +1,859 @@
+# pylint: disable=C0326
+from .common import TestAccountReportsCommon
+from odoo import fields, Command
+from odoo.tests import tagged
+
+
+@tagged('post_install', '-at_install')
+class TestReconciliationReport(TestAccountReportsCommon):
+
+    @classmethod
+    def setUpClass(cls):
+        super().setUpClass()
+
+        cls.other_currency = cls.setup_other_currency('EUR')
+        cls.other_currency_2 = cls.setup_other_currency('GBP', rates=[('2016-01-01', 10.0), ('2017-01-01', 20.0)])
+
+    def test_reconciliation_report_single_currency(self):
+        """
+            Tests the impact of positive/negative payments/statements on the reconciliation report in a single-currency
+            environment.
+        """
+        bank_journal = self.env['account.journal'].create({
+            'name': 'Bank',
+            'code': 'BNKKK',
+            'type': 'bank',
+            'company_id': self.company_data['company'].id,
+        })
+
+        # ==== Statements ====
+
+        self.env['account.bank.statement'].create({
+            'name': 'statement_1',
+            'date': '2014-12-31',
+            'balance_start': 0.0,
+            'balance_end_real': 100.0,
+            'line_ids': [
+                Command.create({'payment_ref': 'line_1', 'amount': 600.0, 'date': '2014-12-31', 'journal_id': bank_journal.id}),
+                Command.create({'payment_ref': 'line_2', 'amount': -500.0, 'date': '2014-12-31', 'journal_id': bank_journal.id}),
+            ],
+        })
+
+        statement_2 = self.env['account.bank.statement'].create({
+            'name': 'statement_2',
+            'date': '2015-01-05',
+            'balance_start': 200.0,  # create an unexplained difference of 100.0.
+            'balance_end_real': - 200.0,
+            'journal_id': bank_journal.id,
+            'line_ids': [
+                Command.create({'payment_ref': 'line_1',    'amount': 100.0,    'date': '2015-01-01',    'partner_id': self.partner_a.id, 'journal_id': bank_journal.id}),
+                Command.create({'payment_ref': 'line_2',    'amount': 200.0,    'date': '2015-01-02',                                    'journal_id': bank_journal.id}),
+                Command.create({'payment_ref': 'line_3',    'amount': -300.0,    'date': '2015-01-03',    'partner_id': self.partner_a.id, 'journal_id': bank_journal.id}),
+                Command.create({'payment_ref': 'line_4',    'amount': -400.0,    'date': '2015-01-04',                                    'journal_id': bank_journal.id}),
+            ],
+        })
+
+        # ==== Payments ====
+        self.inbound_payment_method_line.journal_id = bank_journal.id
+        self.outbound_payment_method_line.journal_id = bank_journal.id
+        payment_1 = self.env['account.payment'].create({
+            'amount': 150.0,
+            'payment_type': 'inbound',
+            'partner_type': 'customer',
+            'date': '2015-01-01',
+            'journal_id': bank_journal.id,
+            'partner_id': self.partner_a.id,
+            'payment_method_line_id': self.inbound_payment_method_line.id,
+        })
+
+        payment_2 = self.env['account.payment'].create({
+            'amount': 250.0,
+            'payment_type': 'outbound',
+            'partner_type': 'supplier',
+            'date': '2015-01-02',
+            'journal_id': bank_journal.id,
+            'partner_id': self.partner_a.id,
+            'payment_method_line_id': self.outbound_payment_method_line.id,
+        })
+
+        payment_3 = self.env['account.payment'].create({
+            'amount': 350.0,
+            'payment_type': 'outbound',
+            'partner_type': 'customer',
+            'date': '2015-01-03',
+            'journal_id': bank_journal.id,
+            'partner_id': self.partner_a.id,
+            'payment_method_line_id': self.inbound_payment_method_line.id,
+        })
+
+        payment_4 = self.env['account.payment'].create({
+            'amount': 450.0,
+            'payment_type': 'inbound',
+            'partner_type': 'supplier',
+            'date': '2015-01-04',
+            'journal_id': bank_journal.id,
+            'partner_id': self.partner_a.id,
+            'payment_method_line_id': self.outbound_payment_method_line.id,
+        })
+
+        (payment_1 + payment_2 + payment_3 + payment_4).action_post()
+
+        # ==== Reconciliation ====
+
+        st_line = statement_2.line_ids.filtered(lambda line: line.payment_ref == 'line_1')
+        payment_line = payment_1.move_id.line_ids.filtered(lambda line: line.account_id == payment_1.payment_method_line_id.payment_account_id)
+        wizard = self.env['bank.rec.widget'].with_context(default_st_line_id=st_line.id).new({})
+        wizard._action_add_new_amls(payment_line, allow_partial=False)
+        wizard._action_validate()
+
+        st_line = statement_2.line_ids.filtered(lambda line: line.payment_ref == 'line_3')
+        payment_line = payment_2.move_id.line_ids.filtered(lambda line: line.account_id == payment_2.payment_method_line_id.payment_account_id)
+        wizard = self.env['bank.rec.widget'].with_context(default_st_line_id=st_line.id).new({})
+        wizard._action_add_new_amls(payment_line, allow_partial=False)
+        wizard._action_validate()
+
+        # ==== Report ====
+
+        report = self.env.ref('odex30_account_reports.bank_reconciliation_report').with_context(
+            active_id=bank_journal.id,
+            active_model=bank_journal._name
+        )
+
+        options = self._generate_options(report, '2016-01-02', '2016-01-02')
+        options['unfold_all'] = True
+        lines = report._get_lines(options)
+
+        self.assertLinesValues(
+            lines,
+            #   Name                                            Date            Amount
+            [0,                                                   1,                3],
+            [
+                ('Balance of \'101405 Bank\'',                   '',           -200.0),
+                ('Last statement balance',                       '',           -200.0),
+                ('Including Unreconciled Receipts',              '',            200.0),
+                ('BNKKK/2015/00002',                   '01/02/2015',            200.0),
+                ('Including Unreconciled Payments',              '',           -400.0),
+                ('BNKKK/2015/00004',                   '01/04/2015',           -400.0),
+                ('Transactions without statement',               '',              0.0),
+                ('Including Unreconciled Receipts',              '',              0.0),
+                ('Including Unreconciled Payments',              '',              0.0),
+                ('Misc. operations',                             '',              0.0),
+                ('Outstanding Receipts/Payments',                '',            100.0),
+                ('(+) Outstanding Receipts',                     '',            450.0),
+                ('PBNKKK/2015/00004',                  '01/04/2015',            450.0),
+                ('(-) Outstanding Payments',                     '',           -350.0),
+                ('PBNKKK/2015/00003',                  '01/03/2015',           -350.0),
+            ],
+            options,
+            currency_map={3: {'currency': bank_journal.currency_id}},
+            ignore_folded=False,
+        )
+
+    def test_reconciliation_report_multi_currencies(self):
+        """ Tests the management of multi-currencies in the reconciliation report. """
+        self.env.user.groups_id |= self.env.ref('base.group_multi_currency')
+        self.env.user.groups_id |= self.env.ref('base.group_no_one')
+
+        company_currency = self.company_data['currency']  # USD
+        journal_currency = self.other_currency  # EUR
+        choco_currency = self.other_currency_2  # GBP
+
+        # ==== Journal with a foreign currency ====
+
+        bank_journal = self.env['account.journal'].create({
+            'name': 'Bank',
+            'code': 'BNKKK',
+            'type': 'bank',
+            'company_id': self.company_data['company'].id,
+            'currency_id': journal_currency.id
+        })
+
+        # ==== Statement ====
+
+        bank_statement = self.env['account.bank.statement'].create({
+            'name': 'statement',
+            'line_ids': [
+
+                # Transaction in the company currency.
+                (0, 0, {
+                    'payment_ref': 'line_1',
+                    'date': '2016-01-01',
+                    'amount': 100.0,
+                    'journal_id': bank_journal.id,
+                    'amount_currency': 50.01,
+                    'foreign_currency_id': company_currency.id,
+                }),
+
+                # Transaction in a third currency.
+                (0, 0, {
+                    'payment_ref': 'line_3',
+                    'date': '2016-01-01',
+                    'amount': 100.0,
+                    'journal_id': bank_journal.id,
+                    'amount_currency': 999.99,
+                    'foreign_currency_id': choco_currency.id,
+                }),
+
+            ],
+        })
+
+        # Partially reconcile the suspense amount associated with each bank statement line
+        suspense_account = bank_journal.suspense_account_id
+        other_account = bank_journal.company_id.default_cash_difference_income_account_id
+
+        # the first is in company currency
+        bank_move_1 = bank_statement.line_ids[0].move_id
+        bank_move_1_suspense_line = bank_move_1.line_ids.filtered(lambda l: l.account_id == suspense_account)
+        bank_move_1.button_draft()
+        bank_move_1.write({'line_ids': [
+            Command.create({'account_id': other_account.id, 'credit': 10.00}),
+            Command.update(bank_move_1_suspense_line.id, {'credit': 40.01}),
+        ]})
+        bank_move_1.action_post()
+
+        # the second is in neither company nor journal currency
+        bank_move_2 = bank_statement.line_ids[1].move_id
+        bank_move_2_suspense_line = bank_move_2.line_ids.filtered(lambda l: l.account_id == suspense_account)
+        bank_move_2.button_draft()
+        bank_move_2.write({'line_ids': [
+            Command.create({
+                'account_id': other_account.id,
+                'currency_id': bank_move_2_suspense_line.currency_id.id,
+                'credit': 3.33,
+                'amount_currency': -99.99
+            }),
+            Command.update(bank_move_2_suspense_line.id, {
+                'credit': 30.0,
+                'amount_currency': -900.0
+            }),
+        ]})
+        bank_move_2.action_post()
+
+        # ==== Payments ====
+        self.inbound_payment_method_line.journal_id = bank_journal.id
+        # Payment in the company's currency.
+        payment_1 = self.env['account.payment'].create({
+            'amount': 1000.0,
+            'payment_type': 'inbound',
+            'partner_type': 'customer',
+            'date': '2016-01-01',
+            'journal_id': bank_journal.id,
+            'partner_id': self.partner_a.id,
+            'currency_id': company_currency.id,
+            'payment_method_line_id': self.inbound_payment_method_line.id,
+        })
+
+        # Payment in the same foreign currency as the journal.
+        payment_2 = self.env['account.payment'].create({
+            'amount': 2000.0,
+            'payment_type': 'inbound',
+            'partner_type': 'customer',
+            'date': '2016-01-01',
+            'journal_id': bank_journal.id,
+            'partner_id': self.partner_a.id,
+            'currency_id': journal_currency.id,
+            'payment_method_line_id': self.inbound_payment_method_line.id,
+        })
+
+        # Payment in a third foreign currency.
+        payment_3 = self.env['account.payment'].create({
+            'amount': 3000.0,
+            'payment_type': 'inbound',
+            'partner_type': 'customer',
+            'date': '2016-01-01',
+            'journal_id': bank_journal.id,
+            'partner_id': self.partner_a.id,
+            'currency_id': choco_currency.id,
+            'payment_method_line_id': self.inbound_payment_method_line.id,
+        })
+        (payment_1 + payment_2 + payment_3).action_post()
+
+        # ==== Misc Entry ====
+
+        move = self.env['account.move'].create({
+            'journal_id': self.company_data['default_journal_misc'].id,
+            'date': '2016-01-01',
+            'line_ids': [
+                Command.create({
+                    'name': 'Line1',
+                    'debit': 100,
+                    'credit': 0,
+                    'amount_currency': 200,
+                    'account_id': bank_journal.default_account_id.id,
+                    'currency_id': journal_currency.id
+                }),
+                Command.create({
+                    'name': 'Line2',
+                    'debit': 0,
+                    'credit': 100,
+                    'account_id': other_account.id,
+                }),
+            ]
+        })
+        move.action_post()
+
+        # ==== Report ====
+
+        report = self.env.ref('odex30_account_reports.bank_reconciliation_report').with_context(
+            active_id=bank_journal.id,
+            active_model=bank_journal._name
+        )
+
+        with self.debug_mode():
+            options = self._generate_options(report, '2016-01-02', '2016-01-02')
+            options['unfold_all'] = True
+            lines = report._get_lines(options)
+
+            self.assertLinesValues(
+                lines,
+                #   Name                                                Date   Am. Cur.                  Cur.       Amount
+                [0,                                                       1,       3,                      4,           5],
+                [
+                    ('Balance of \'101405 Bank\'',                       '',      '',                     '',       400.0),
+                    ('Last statement balance',                           '',      '',                     '',       200.0),
+                    ('Including Unreconciled Receipts',                  '',      '',                     '',       170.005),
+                    ('BNKKK/2016/00002',                       '01/01/2016',  900.00,    choco_currency.name,        90.001),
+                    ('BNKKK/2016/00001',                       '01/01/2016',   40.01,  company_currency.name,        80.004),
+                    ('Including Unreconciled Payments',                  '',      '',                     '',         0.0),
+                    ('Transactions without statement',                   '',      '',                     '',         0.0),
+                    ('Including Unreconciled Receipts',                  '',      '',                     '',         0.0),
+                    ('Including Unreconciled Payments',                  '',      '',                     '',         0.0),
+                    ('Misc. operations',                                 '',      '',                     '',       200.0),
+                    ('Outstanding Receipts/Payments',                    '',      '',                     '',      5900.0),
+                    ('(+) Outstanding Receipts',                         '',      '',                     '',      5900.0),
+                    ('PBNKKK/2016/00003',                      '01/01/2016',  3000.0,    choco_currency.name,       900.0),
+                    ('PBNKKK/2016/00002',                      '01/01/2016',      '',                     '',      2000.0),
+                    ('PBNKKK/2016/00001',                      '01/01/2016',  1000.0,  company_currency.name,      3000.0),
+                    ('(-) Outstanding Payments',                         '',      '',                     '',         0.0),
+                ],
+                options,
+                currency_map={
+                    3: {'currency_code_index': 4},
+                    5: {'currency': journal_currency},
+                },
+                ignore_folded=False,
+            )
+
+    def test_reconciliation_change_date(self):
+        """
+            Tests the impact of positive/negative payments/statements on the reconciliation report in a single-currency
+            environment.
+        """
+        bank_journal = self.company_data['default_journal_bank']
+
+        statement = self.env['account.bank.statement'].create({
+            'name': 'statement_1',
+            'date': '2019-01-10',
+            'balance_start': 0.0,
+            'balance_end_real': 130.0,
+            'line_ids': [
+                (0, 0, {'payment_ref': 'line_1', 'amount': 10.0, 'date': '2019-01-01', 'journal_id': bank_journal.id}),
+                (0, 0, {'payment_ref': 'line_2', 'amount': 20.0, 'date': '2019-01-02', 'journal_id': bank_journal.id}),
+                (0, 0, {'payment_ref': 'line_3', 'amount': 30.0, 'date': '2019-01-03', 'journal_id': bank_journal.id}),
+                (0, 0, {'payment_ref': 'line_4', 'amount': -40.0, 'date': '2019-01-04', 'journal_id': bank_journal.id}),
+                (0, 0, {'payment_ref': 'line_5', 'amount': 50.0, 'date': '2019-01-05', 'journal_id': bank_journal.id}),
+                (0, 0, {'payment_ref': 'line_6', 'amount': 60.0, 'date': '2019-01-06', 'journal_id': bank_journal.id}),
+            ],
+        })
+
+        # This will allow to test if the balance of the bank account is changed
+        statement['balance_end_real'] = 140.0
+
+        payment = self.env['account.payment'].create({
+            'amount': 1000.0,
+            'payment_type': 'inbound',
+            'partner_type': 'customer',
+            'date': '2019-01-03',
+            'journal_id': bank_journal.id,
+            'partner_id': self.partner_a.id,
+        })
+        payment.action_post()
+
+        report = self.env.ref('odex30_account_reports.bank_reconciliation_report').with_context(
+            active_id=bank_journal.id,
+            active_model='account.journal'
+        )
+
+        options = self._generate_options(report, fields.Date.from_string('2019-01-01'), fields.Date.from_string('2019-01-01'))
+        options['all_entries'] = True
+        options['unfold_all'] = True
+
+        # The last statement is taken into account cause it has a line corresponding to the date of the report.
+        lines = report._get_lines(options)
+        self.assertLinesValues(
+            lines,
+            #   Name                                                             Date            Amount
+            [0,                                                                    1,               3],
+            [
+                ('Balance of \'101401 Bank\'',                                    '',           140.0),
+                ('Last statement balance',                                        '',           140.0),
+                ('Including Unreconciled Receipts',                               '',            10.0),
+                ('BNK1/2019/00001',                                     '01/01/2019',            10.0),
+                ('Including Unreconciled Payments',                               '',             0.0),
+                ('Transactions without statement',                                '',             0.0),
+                ('Including Unreconciled Receipts',                               '',             0.0),
+                ('Including Unreconciled Payments',                               '',             0.0),
+                ('Misc. operations',                                              '',             0.0),
+                ('Outstanding Receipts/Payments',                                 '',             0.0),
+                ('(+) Outstanding Receipts',                                      '',             0.0),
+                ('(-) Outstanding Payments',                                      '',             0.0),
+            ],
+            options,
+            currency_map={3: {'currency': bank_journal.currency_id}},
+            ignore_folded=False,
+        )
+
+        options = self._generate_options(report, fields.Date.from_string('2019-01-01'), fields.Date.from_string('2019-01-04'))
+        options['all_entries'] = True
+        options['unfold_all'] = True
+        lines = report._get_lines(options)
+        self.assertLinesValues(
+            lines,
+            #   Name                                                             Date            Amount
+            [0,                                                                    1,               3],
+            [
+                ('Balance of \'101401 Bank\'',                                    '',           140.0),
+                ('Last statement balance',                                        '',           140.0),
+                ('Including Unreconciled Receipts',                               '',            60.0),
+                ('BNK1/2019/00003',                                     '01/03/2019',            30.0),
+                ('BNK1/2019/00002',                                     '01/02/2019',            20.0),
+                ('BNK1/2019/00001',                                     '01/01/2019',            10.0),
+                ('Including Unreconciled Payments',                               '',           -40.0),
+                ('BNK1/2019/00004',                                     '01/04/2019',           -40.0),
+                ('Transactions without statement',                                '',             0.0),
+                ('Including Unreconciled Receipts',                               '',             0.0),
+                ('Including Unreconciled Payments',                               '',             0.0),
+                ('Misc. operations',                                              '',             0.0),
+                ('Outstanding Receipts/Payments',                                 '',          1000.0),
+                ('(+) Outstanding Receipts',                                      '',          1000.0),
+                ('PBNK1/2019/00001',                                    '01/03/2019',          1000.0),
+                ('(-) Outstanding Payments',                                      '',             0.0),
+            ],
+            options,
+            currency_map={3: {'currency': bank_journal.currency_id}},
+            ignore_folded=False,
+        )
+
+    def test_reconciliation_report_non_statement_payment(self):
+        """
+            Test that moves not linked to a bank statement/payment but linked for example to expenses are all showing in the
+            report
+        """
+        bank_journal = self.env['account.journal'].create({
+            'name': 'Bank',
+            'code': 'BNKKK',
+            'type': 'bank',
+            'company_id': self.company_data['company'].id,
+        })
+        bank_journal.inbound_payment_method_line_ids.payment_account_id = self.inbound_payment_method_line.payment_account_id
+
+        # ==== Misc ====
+        self.env['account.move'].create({
+            'journal_id': bank_journal.id,
+            'date': '2014-12-31',
+            'line_ids': [
+                (0, 0, {
+                    'name': 'Source',
+                    'debit': 800,
+                    'credit': 0,
+                    'account_id': self.company_data['default_account_expense'].id,
+                }),
+                (0, 0, {
+                    'name': 'Destination',
+                    'debit': 0,
+                    'credit': 800,
+                    'account_id': self.inbound_payment_method_line.payment_account_id.id,
+                }),
+            ]
+        }).action_post()
+
+        self.env['account.move'].create({
+            'journal_id': bank_journal.id,
+            'date': '2015-12-31',
+            'line_ids': [
+                (0, 0, {
+                    'name': 'Source',
+                    'debit': 500,
+                    'credit': 0,
+                    'account_id': self.company_data['default_account_expense'].id,
+                }),
+                (0, 0, {
+                    'name': 'Destination',
+                    'debit': 0,
+                    'credit': 500,
+                    'account_id': self.inbound_payment_method_line.payment_account_id.id,
+                }),
+            ]
+        }).action_post()
+
+        # ==== Report ====
+
+        report = self.env.ref('odex30_account_reports.bank_reconciliation_report').with_context(
+            active_id=bank_journal.id,
+            active_model='account.journal'
+        )
+
+        options = self._generate_options(report, '2016-01-02', '2016-01-02')
+        options['unfold_all'] = True
+        lines = report._get_lines(options)
+
+        self.assertLinesValues(
+            lines,
+            #   Name                                                  Date         Amount
+            [0,                                                         1,             3],
+            [
+                ('Balance of \'101405 Bank\'',                         '',           0.0),
+                ('Last statement balance',                             '',           0.0),
+                ('Including Unreconciled Receipts',                    '',           0.0),
+                ('Including Unreconciled Payments',                    '',           0.0),
+                ('Transactions without statement',                     '',           0.0),
+                ('Including Unreconciled Receipts',                    '',           0.0),
+                ('Including Unreconciled Payments',                    '',           0.0),
+                ('Misc. operations',                                   '',           0.0),
+                ('Outstanding Receipts/Payments',                      '',       -1300.0),
+                ('(+) Outstanding Receipts',                           '',           0.0),
+                ('(-) Outstanding Payments',                           '',       -1300.0),
+                ('BNKKK/2015/00001',                         '12/31/2015',       -500.00),
+                ('BNKKK/2014/00001',                         '12/31/2014',       -800.00),
+            ],
+            options,
+            currency_map={3: {'currency': bank_journal.currency_id}},
+            ignore_folded=False,
+        )
+
+    def test_reconciliation_report_misc_entry(self):
+        """ This test will check if the report correctly display the misc entry """
+        bank_journal = self.env['account.journal'].create({
+            'name': 'Bank',
+            'code': 'BNKKK',
+            'type': 'bank',
+            'company_id': self.company_data['company'].id,
+        })
+
+        # ==== Misc ====
+        self.env['account.move'].create({
+            'journal_id': bank_journal.id,
+            'date': '2016-01-02',
+            'line_ids': [
+                (0, 0, {
+                    'name': 'Source',
+                    'debit': 800,
+                    'credit': 0,
+                    'account_id': bank_journal.default_account_id.id,
+                }),
+                (0, 0, {
+                    'name': 'Destination',
+                    'debit': 0,
+                    'credit': 800,
+                    'account_id': self.company_data['default_account_expense'].id,
+                }),
+            ]
+        }).action_post()
+
+        report = self.env.ref('odex30_account_reports.bank_reconciliation_report').with_context(
+            active_id=bank_journal.id,
+            active_model='account.journal'
+        )
+
+        options = self._generate_options(report, '2016-01-02', '2016-01-02')
+        options['unfold_all'] = True
+        lines = report._get_lines(options)
+
+        self.assertLinesValues(
+            lines,
+            #   Name                                                  Date         Amount
+            [0,                                                         1,             3],
+            [
+                ('Balance of \'101405 Bank\'',                         '',         800.0),
+                ('Last statement balance',                             '',           0.0),
+                ('Including Unreconciled Receipts',                    '',           0.0),
+                ('Including Unreconciled Payments',                    '',           0.0),
+                ('Transactions without statement',                     '',           0.0),
+                ('Including Unreconciled Receipts',                    '',           0.0),
+                ('Including Unreconciled Payments',                    '',           0.0),
+                ('Misc. operations',                                   '',         800.0),
+                ('Outstanding Receipts/Payments',                      '',           0.0),
+                ('(+) Outstanding Receipts',                           '',           0.0),
+                ('(-) Outstanding Payments',                           '',           0.0),
+            ],
+            options,
+            currency_map={3: {'currency': bank_journal.currency_id}},
+            ignore_folded=False,
+        )
+
+        # With the domain, since the date of the misc is not in the same year, the misc is not present
+        options = self._generate_options(report, '2014-01-02', '2014-01-02')
+        options['unfold_all'] = True
+        lines = report._get_lines(options)
+
+        self.assertLinesValues(
+            lines,
+            #   Name                                                  Date         Amount
+            [0,                                                         1,             3],
+            [
+                ('Balance of \'101405 Bank\'',                         '',           0.0),
+                ('Last statement balance',                             '',           0.0),
+                ('Including Unreconciled Receipts',                    '',           0.0),
+                ('Including Unreconciled Payments',                    '',           0.0),
+                ('Transactions without statement',                     '',           0.0),
+                ('Including Unreconciled Receipts',                    '',           0.0),
+                ('Including Unreconciled Payments',                    '',           0.0),
+                ('Misc. operations',                                   '',           0.0),
+                ('Outstanding Receipts/Payments',                      '',           0.0),
+                ('(+) Outstanding Receipts',                           '',           0.0),
+                ('(-) Outstanding Payments',                           '',           0.0),
+            ],
+            options,
+            currency_map={3: {'currency': bank_journal.currency_id}},
+            ignore_folded=False,
+        )
+
+    def test_reconciliation_report_delete_statement(self):
+        """ This test will do a basic flow where we create a statement and then we delete it to see how the report react"""
+
+        bank_journal = self.company_data['default_journal_bank']
+
+        statement = self.env['account.bank.statement'].create({
+            'name': 'statement_1',
+            'date': '2019-01-10',
+            'balance_start': 0.0,
+            'balance_end_real': 130.0,
+            'line_ids': [
+                (0, 0, {'payment_ref': 'line_1', 'amount': 10.0, 'date': '2019-01-01', 'journal_id': bank_journal.id}),
+                (0, 0, {'payment_ref': 'line_2', 'amount': 20.0, 'date': '2019-01-02', 'journal_id': bank_journal.id}),
+                (0, 0, {'payment_ref': 'line_3', 'amount': 30.0, 'date': '2019-01-03', 'journal_id': bank_journal.id}),
+                (0, 0, {'payment_ref': 'line_4', 'amount': -40.0, 'date': '2019-01-04', 'journal_id': bank_journal.id}),
+                (0, 0, {'payment_ref': 'line_5', 'amount': 50.0, 'date': '2019-01-05', 'journal_id': bank_journal.id}),
+                (0, 0, {'payment_ref': 'line_6', 'amount': 60.0, 'date': '2019-01-06', 'journal_id': bank_journal.id}),
+            ],
+        })
+
+        report = self.env.ref('odex30_account_reports.bank_reconciliation_report').with_context(
+            active_id=bank_journal.id,
+            active_model='account.journal'
+        )
+
+        options = self._generate_options(report, fields.Date.from_string('2019-01-01'), fields.Date.from_string('2019-01-12'))
+        options['all_entries'] = True
+        options['unfold_all'] = True
+
+        lines = report._get_lines(options)
+        self.assertLinesValues(
+            lines,
+            #   Name                                                             Date            Amount
+            [0,                                                                     1,              3],
+            [
+                ('Balance of \'101401 Bank\'',                                     '',          130.0),
+                ('Last statement balance',                                         '',          130.0),
+                ('Including Unreconciled Receipts',                                '',          170.0),
+                ('BNK1/2019/00006',                                      '01/06/2019',           60.0),
+                ('BNK1/2019/00005',                                      '01/05/2019',           50.0),
+                ('BNK1/2019/00003',                                      '01/03/2019',           30.0),
+                ('BNK1/2019/00002',                                      '01/02/2019',           20.0),
+                ('BNK1/2019/00001',                                      '01/01/2019',           10.0),
+                ('Including Unreconciled Payments',                                '',          -40.0),
+                ('BNK1/2019/00004',                                      '01/04/2019',          -40.0),
+                ('Transactions without statement',                                 '',            0.0),
+                ('Including Unreconciled Receipts',                                '',            0.0),
+                ('Including Unreconciled Payments',                                '',            0.0),
+                ('Misc. operations',                                               '',            0.0),
+                ('Outstanding Receipts/Payments',                                  '',            0.0),
+                ('(+) Outstanding Receipts',                                       '',            0.0),
+                ('(-) Outstanding Payments',                                       '',            0.0),
+            ],
+            options,
+            currency_map={3: {'currency': bank_journal.currency_id}},
+            ignore_folded=False,
+        )
+
+        statement.unlink()
+
+        options = self._generate_options(report, fields.Date.from_string('2019-01-01'), fields.Date.from_string('2019-01-12'))
+        options['all_entries'] = True
+        options['unfold_all'] = True
+
+        lines = report._get_lines(options)
+        self.assertLinesValues(
+            lines,
+            #   Name                                                             Date            Amount
+            [0,                                                                    1,                3],
+            [
+                ('Balance of \'101401 Bank\'',                                    '',            130.0),
+                ('Last statement balance',                                        '',              0.0),
+                ('Including Unreconciled Receipts',                               '',              0.0),
+                ('Including Unreconciled Payments',                               '',              0.0),
+                ('Transactions without statement',                                '',            130.0),
+                ('Including Unreconciled Receipts',                               '',            170.0),
+                ('BNK1/2019/00006',                                     '01/06/2019',             60.0),
+                ('BNK1/2019/00005',                                     '01/05/2019',             50.0),
+                ('BNK1/2019/00003',                                     '01/03/2019',             30.0),
+                ('BNK1/2019/00002',                                     '01/02/2019',             20.0),
+                ('BNK1/2019/00001',                                     '01/01/2019',             10.0),
+                ('Including Unreconciled Payments',                               '',            -40.0),
+                ('BNK1/2019/00004',                                     '01/04/2019',            -40.0),
+                ('Misc. operations',                                              '',              0.0),
+                ('Outstanding Receipts/Payments',                                 '',              0.0),
+                ('(+) Outstanding Receipts',                                      '',              0.0),
+                ('(-) Outstanding Payments',                                      '',              0.0),
+            ],
+            options,
+            currency_map={3: {'currency': bank_journal.currency_id}},
+            ignore_folded=False,
+        )
+
+    def test_reconciliation_report_transaction_without_statement(self):
+        """
+            This test will ensure that the section transaction without statement section contains the reconcile entries.
+            So the section should not always be the sum of his children.
+        """
+        bank_journal = self.company_data['default_journal_bank']
+
+        bank_statement_lines = self.env['account.bank.statement.line'].create([
+            {
+                'payment_ref': 'Initial balance',
+                'journal_id': bank_journal.id,
+                'partner_id': self.partner_a.id,
+                'amount': 1000.0,
+                'date': '2019-01-01',
+            },
+            {
+                'payment_ref': 'To be reconciled',
+                'journal_id': bank_journal.id,
+                'partner_id': self.partner_a.id,
+                'amount': 100.0,
+                'date': '2019-01-01',
+            }
+        ])
+
+        report = self.env.ref('odex30_account_reports.bank_reconciliation_report').with_context(
+            active_id=bank_journal.id,
+            active_model='account.journal'
+        )
+        options = self._generate_options(report, '2019-01-01', '2019-01-12')
+        options['all_entries'] = True
+        options['unfold_all'] = True
+
+        lines = report._get_lines(options)
+        self.assertLinesValues(
+            lines,
+            #   Name                                                             Date            Amount
+            [0, 1, 3],
+            [
+                ('Balance of \'101401 Bank\'',                                      '',         1100.0),
+                ('Last statement balance',                                          '',            0.0),
+                ('Including Unreconciled Receipts',                                 '',            0.0),
+                ('Including Unreconciled Payments',                                 '',            0.0),
+                ('Transactions without statement',                                  '',         1100.0),
+                ('Including Unreconciled Receipts',                                 '',         1100.0),
+                ('BNK1/2019/00002',                                       '01/01/2019',          100.0),
+                ('BNK1/2019/00001',                                       '01/01/2019',         1000.0),
+                ('Including Unreconciled Payments',                                 '',            0.0),
+                ('Misc. operations',                                                '',            0.0),
+                ('Outstanding Receipts/Payments',                                   '',            0.0),
+                ('(+) Outstanding Receipts',                                        '',            0.0),
+                ('(-) Outstanding Payments',                                        '',            0.0),
+            ],
+            options,
+            currency_map={3: {'currency': bank_journal.currency_id}},
+            ignore_folded=False,
+        )
+
+        payment = self.env['account.payment'].create({
+            'amount': 100.0,
+            'payment_type': 'inbound',
+            'date': '2019-01-01',
+            'journal_id': bank_journal.id,
+            'partner_id': self.partner_a.id,
+        })
+        payment.action_post()
+
+        payment_line = payment.move_id.line_ids.filtered(lambda line: line.account_id == payment.payment_method_line_id.payment_account_id)
+        wizard = self.env['bank.rec.widget'].with_context(default_st_line_id=bank_statement_lines[1].id).new({})
+        wizard._action_add_new_amls(payment_line, allow_partial=False)
+        wizard._action_validate()
+
+        options = self._generate_options(report, '2019-01-01', '2019-01-12')
+        options['all_entries'] = True
+        options['unfold_all'] = True
+
+        lines = report._get_lines(options)
+        self.assertLinesValues(
+            lines,
+            #   Name                                                             Date            Amount
+            [0,                                                                    1,               3],
+            [
+                ('Balance of \'101401 Bank\'',                                    '',          1100.0),
+                ('Last statement balance',                                        '',             0.0),
+                ('Including Unreconciled Receipts',                               '',             0.0),
+                ('Including Unreconciled Payments',                               '',             0.0),
+                ('Transactions without statement',                                '',          1100.0),
+                ('Including Unreconciled Receipts',                               '',          1000.0),
+                ('BNK1/2019/00001',                                     '01/01/2019',          1000.0),
+                ('Including Unreconciled Payments',                               '',             0.0),
+                ('Misc. operations',                                              '',             0.0),
+                ('Outstanding Receipts/Payments',                                 '',             0.0),
+                ('(+) Outstanding Receipts',                                      '',             0.0),
+                ('(-) Outstanding Payments',                                      '',             0.0),
+            ],
+            options,
+            currency_map={3: {'currency': bank_journal.currency_id}},
+            ignore_folded=False,
+        )
+
+    def test_reconciliation_report_exchange_entry(self):
+        """ This test will check that misc entries reported in the exchange journal
+            do not figure in the report
+        """
+
+        bank_journal = self.company_data['default_journal_bank']
+        exchange_journal = self.env.company.currency_exchange_journal_id
+
+        move_a = self.env['account.move'].create({
+                'journal_id': exchange_journal.id,
+                'move_type': 'entry',
+                'date': '2019-01-01',
+                'line_ids': [
+                    Command.create({
+                        'name': 'line_a_1',
+                        'account_id': bank_journal.default_account_id.id,
+                        'debit': 1000.0,
+                        'credit': 0.0,
+                    }),
+                    Command.create({
+                        'name': 'line_a_2',
+                        'account_id': self.company_data['default_account_expense'].id,
+                        'debit': 0.0,
+                        'credit': 1000.0,
+                    }),
+                ]
+        })
+        move_a.action_post()
+        report = self.env.ref('odex30_account_reports.bank_reconciliation_report').with_context(
+            active_id=bank_journal.id,
+            active_model='account.journal'
+        )
+
+        options = self._generate_options(report, fields.Date.from_string('2019-01-01'), fields.Date.from_string('2019-01-12'))
+
+        lines = report._get_lines(options)
+        self.assertLinesValues(
+            lines,
+            #   Name                                                             Date            Amount
+            [0,                                                                     1,              3],
+            [
+                ('Balance of \'101401 Bank\'',                                     '',            0.0),
+                ('Last statement balance',                                         '',            0.0),
+                ('Including Unreconciled Receipts',                                '',            0.0),
+                ('Including Unreconciled Payments',                                '',            0.0),
+                ('Transactions without statement',                                 '',            0.0),
+                ('Including Unreconciled Receipts',                                '',            0.0),
+                ('Including Unreconciled Payments',                                '',            0.0),
+                ('Misc. operations',                                               '',            0.0),
+                ('Outstanding Receipts/Payments',                                  '',            0.0),
+                ('(+) Outstanding Receipts',                                       '',            0.0),
+                ('(-) Outstanding Payments',                                       '',            0.0),
+            ],
+            options,
+            currency_map={3: {'currency': bank_journal.currency_id}},
+            ignore_folded=False,
+        )
diff --git a/dev_odex30_accounting/odex30_account_reports/tests/test_report_engines.py b/dev_odex30_accounting/odex30_account_reports/tests/test_report_engines.py
new file mode 100644
index 0000000..534b5bf
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_reports/tests/test_report_engines.py
@@ -0,0 +1,1963 @@
+from .common import TestAccountReportsCommon
+
+from odoo import fields, Command
+from odoo.tests import tagged
+from odoo.tools import frozendict
+
+from unittest.mock import patch
+
+
+@tagged('post_install', '-at_install')
+class TestReportEngines(TestAccountReportsCommon):
+
+    @classmethod
+    def setUpClass(cls):
+        super().setUpClass()
+        cls.company_data['company'].totals_below_sections = False
+
+        cls.garbage_account = cls.env['account.account'].create({
+            'code': "turlututu",
+            'name': "turlututu",
+            'account_type': "asset_current",
+        })
+
+        cls.fake_country = cls.env['res.country'].create({
+            'name': "L'Île de la Mouche",
+            'code': 'YY',
+        })
+
+    # -------------------------------------------------------------------------
+    # HELPERS
+    # -------------------------------------------------------------------------
+
+    def _prepare_test_account_move_line(self, balance, account_code=None, tax_tags=None, date='2020-01-01', **kwargs):
+        if tax_tags:
+            tags = self.env['account.account.tag'].search([
+                ('applicability', '=', 'taxes'),
+                ('country_id', '=', self.fake_country.id),
+                ('name', 'in', tax_tags),
+            ])
+        else:
+            tags = self.env['account.account.tag']
+
+        return {
+            'account_move_line_values': {
+                'name': "turlututu",
+                'account_id': self.garbage_account.id,
+                **kwargs,
+                'debit': balance if balance > 0.0 else 0.0,
+                'credit': -balance if balance < 0.0 else 0.0,
+                'tax_tag_ids': [Command.set(tags.ids)],
+            },
+            'account_move_values': {'date': date},
+            'account_code': account_code,
+        }
+
+    def _create_test_account_moves(self, test_account_move_line_values_list):
+        # Create the missing account on-the-fly.
+        accounts_to_create_by_code = set()
+        for test_account_move_line_values in test_account_move_line_values_list:
+            if test_account_move_line_values.get('account_code'):
+                accounts_to_create_by_code.add(test_account_move_line_values['account_code'])
+
+        if accounts_to_create_by_code:
+            accounts = self.env['account.account'].create([
+                {
+                    'code': account_code,
+                    'name': account_code,
+                    'account_type': "asset_current",
+                }
+                for account_code in accounts_to_create_by_code
+            ])
+            account_by_code = {x.code: x for x in accounts}
+
+            for test_account_move_line_values in test_account_move_line_values_list:
+                account = account_by_code.get(test_account_move_line_values.get('account_code'))
+                if account:
+                    test_account_move_line_values['account_move_line_values']['account_id'] = account.id
+
+        # Create the journal entries.
+        to_create = {}
+        for test_account_move_line_values in test_account_move_line_values_list:
+            account_move_key = frozendict(test_account_move_line_values['account_move_values'])
+            account_move_line_values = test_account_move_line_values['account_move_line_values']
+            account_move_to_create = to_create.setdefault(account_move_key, {
+                'account_move_values': {'line_ids': []},
+                'balance': 0.0,
+            })
+            account_move_to_create['account_move_values']['line_ids'].append(Command.create(account_move_line_values))
+            account_move_to_create['balance'] += account_move_line_values['debit'] - account_move_line_values['credit']
+
+        account_move_create_list = []
+        for account_move_dict, account_move_to_create in to_create.items():
+            open_balance = account_move_to_create['balance']
+            account_move_values = account_move_to_create['account_move_values']
+            if not self.env.company.currency_id.is_zero(open_balance):
+                account_move_values['line_ids'].append(Command.create({
+                    'name': 'open balance',
+                    'account_id': self.garbage_account.id,
+                    'debit': -open_balance if open_balance < 0.0 else 0.0,
+                    'credit': open_balance if open_balance > 0.0 else 0.0,
+                }))
+            account_move_create_list.append({
+                **account_move_dict,
+                **account_move_values,
+            })
+
+        moves = self.env['account.move'].create(account_move_create_list)
+        moves.action_post()
+        return moves
+
+    def _prepare_test_external_values(self, value, date, figure_type=False):
+        field_name = 'text_value' if figure_type == 'string' else 'value'
+        return {
+            'name': date,
+            field_name: value,
+            'date': date,
+        }
+
+    def _prepare_test_expression(self, formula, label='balance', **kwargs):
+        return {
+            'expression_values': {
+                'label': label,
+                'formula': formula,
+                **kwargs,
+            },
+        }
+
+    def _prepare_test_expression_tax_tags(self, formula, **kwargs):
+        return self._prepare_test_expression(engine='tax_tags', formula=formula, **kwargs)
+
+    def _prepare_test_expression_domain(self, formula, subformula, **kwargs):
+        return self._prepare_test_expression(engine='domain', formula=formula, subformula=subformula, **kwargs)
+
+    def _prepare_test_expression_account_codes(self, formula, **kwargs):
+        return self._prepare_test_expression(engine='account_codes', formula=formula, **kwargs)
+
+    def _prepare_test_expression_external(self, formula, external_value_generators, **kwargs):
+        return {
+            **self._prepare_test_expression(engine='external', formula=formula, **kwargs),
+            'external_value_generators': external_value_generators,
+        }
+
+    def _prepare_test_expression_custom(self, formula, **kwargs):
+        return self._prepare_test_expression(engine='custom', formula=formula, **kwargs)
+
+    def _prepare_test_expression_aggregation(self, formula, subformula=None, column='balance', date_scope=None):
+        expression_values = {
+            'label': column,
+            'engine': 'aggregation',
+            'formula': formula,
+            'subformula': subformula,
+        }
+
+        if date_scope:
+            expression_values['date_scope'] = date_scope
+
+        return {
+            'expression_values': expression_values,
+        }
+
+    def _prepare_test_report_line(self, *expression_generators, **kwargs):
+        return {
+            'report_line_values': {
+                **kwargs,
+                'expression_ids': [
+                    Command.create({
+                        'date_scope': 'strict_range',
+                        **expression_values['expression_values'],
+                    })
+                    for expression_values in expression_generators
+                ],
+            },
+            'expression_generators': expression_generators,
+        }
+
+    def _create_report(self, test_report_line_values_list, columns=None, **kwargs):
+        if not columns:
+            columns = ['balance']
+
+        # Create a new report
+        report = self.env['account.report'].create({
+            'name': "_run_report",
+            'filter_date_range': True,
+            'filter_unfold_all': True,
+            **kwargs,
+            'column_ids': [
+                Command.create({
+                    'name': column,
+                    'expression_label': column,
+                    'sequence': i,
+                })
+                for i, column in enumerate(columns)
+            ],
+            'line_ids': [
+                Command.create({
+                    'name': f"test_line_{i}",
+                    **test_report_line_values['report_line_values'],
+                    'sequence': i,
+                })
+                for i, test_report_line_values in enumerate(test_report_line_values_list, start=1)
+            ],
+        })
+
+        # Create the external values
+        external_values_create_list = []
+        for report_line, test_report_line_values in zip(report.line_ids, test_report_line_values_list):
+            for expression, expression_values in zip(report_line.expression_ids, test_report_line_values['expression_generators']):
+                for external_values in expression_values.get('external_value_generators', []):
+                    external_values_create_list.append({
+                        **external_values,
+                        'target_report_expression_id': expression.id,
+                    })
+        self.env['account.report.external.value'].create(external_values_create_list)
+
+        return report
+
+    # -------------------------------------------------------------------------
+    # TESTS
+    # -------------------------------------------------------------------------
+
+    def test_engine_tax_tags(self):
+        self.env.company.account_fiscal_country_id = self.fake_country
+
+        # Create the report.
+        test_line_1 = self._prepare_test_report_line(
+            self._prepare_test_expression_tax_tags('11'),
+            groupby='account_id,move_type',
+        )
+        test_line_2 = self._prepare_test_report_line(
+            self._prepare_test_expression_tax_tags('222T'),
+            groupby='parent_state,account_id',
+        )
+        test_line_3 = self._prepare_test_report_line(
+            self._prepare_test_expression_tax_tags('3333'),
+            groupby='account_id',
+        )
+        report = self._create_report(
+            [test_line_1, test_line_2, test_line_3],
+            country_id=self.fake_country.id,
+        )
+
+        # Create the journal entries.
+        move = self._create_test_account_moves([
+            self._prepare_test_account_move_line(2000.0, account_code='101001', tax_tags=['+11', '-222T']),
+            self._prepare_test_account_move_line(1000.0, account_code='101001', tax_tags=['+11', '-222T']),
+            self._prepare_test_account_move_line(3600.0, account_code='101001', tax_tags=['+222T']),
+            self._prepare_test_account_move_line(-600.0, account_code='101001', tax_tags=['+222T', '-3333']),
+            self._prepare_test_account_move_line(-900.0, account_code='101002', tax_tags=['-11']),
+            self._prepare_test_account_move_line(1500.0, account_code='101002', tax_tags=['+11']),
+        ])
+
+        options = self._generate_options(report, '2020-01-01', '2020-01-01', default_options={'unfold_all': True})
+        report_lines = report._get_lines(options)
+        self.assertLinesValues(
+            # pylint: disable=bad-whitespace
+            report_lines,
+            [   0,                          1],
+            [
+                ('test_line_1',        5400.0),
+                ('101001 101001',      3000.0),
+                ('Journal Entry',      3000.0),
+                ('101002 101002',      2400.0),
+                ('Journal Entry',      2400.0),
+                ('test_line_2',           0.0),
+                ('Posted',                0.0),
+                ('101001 101001',         0.0),
+                ('test_line_3',         600.0),
+                ('101001 101001',       600.0),
+            ],
+            options,
+        )
+
+        # Check redirection.
+        expected_redirection_values_list = [
+            move.line_ids[:2] + move.line_ids[4:6],
+            move.line_ids[:4],
+            move.line_ids[3],
+        ]
+        for report_line, expected_amls in zip(report.line_ids, expected_redirection_values_list):
+            report_line_dict = [x for x in report_lines if x['name'] == report_line.name][0]
+            with self.subTest(report_line=report_line.name):
+                action_dict = report.action_audit_cell(options, self._get_audit_params_from_report_line(options, report_line, report_line_dict))
+                self.assertEqual(move.line_ids.filtered_domain(action_dict['domain']), expected_amls)
+
+    def test_engine_domain(self):
+        domain = [('account_id.code', '=like', '1%'), ('balance', '<', 0.0)]
+
+        # Create the report.
+        test_line_1 = self._prepare_test_report_line(
+            self._prepare_test_expression_domain(domain, 'sum'),
+            groupby='account_id,move_type',
+        )
+        test_line_2 = self._prepare_test_report_line(
+            self._prepare_test_expression_domain(domain, '-sum'),
+            groupby='parent_state,account_id',
+        )
+        test_line_3 = self._prepare_test_report_line(
+            self._prepare_test_expression_domain(domain, 'sum_if_neg'),
+            groupby='account_id',
+        )
+        test_line_4 = self._prepare_test_report_line(
+            self._prepare_test_expression_domain(domain, '-sum_if_neg'),
+            groupby='account_id',
+        )
+        test_line_5 = self._prepare_test_report_line(
+            self._prepare_test_expression_domain(domain, 'sum_if_pos'),
+            groupby='account_id',
+        )
+        test_line_6 = self._prepare_test_report_line(
+            self._prepare_test_expression_domain(domain, '-sum_if_pos'),
+            groupby='account_id',
+        )
+        test_line_7 = self._prepare_test_report_line(
+            self._prepare_test_expression_domain(domain, 'count_rows'),
+            groupby='account_id',
+        )
+        report = self._create_report([test_line_1, test_line_2, test_line_3, test_line_4, test_line_5, test_line_6, test_line_7])
+
+        # Create the journal entries.
+        move = self._create_test_account_moves([
+            self._prepare_test_account_move_line(2000.0, account_code='101001'),
+            self._prepare_test_account_move_line(-300.0, account_code='101002'),
+            self._prepare_test_account_move_line(-600.0, account_code='101003'),
+            self._prepare_test_account_move_line(-900.0, account_code='101004'),
+        ])
+
+        # Check the values.
+        options = self._generate_options(report, '2020-01-01', '2020-01-01', default_options={'unfold_all': True})
+        report_lines = report._get_lines(options)
+        self.assertLinesValues(
+            # pylint: disable=bad-whitespace
+            report_lines,
+            [   0,                          1],
+            [
+                ('test_line_1',       -1800.0),
+                ('101002 101002',      -300.0),
+                ('Journal Entry',      -300.0),
+                ('101003 101003',      -600.0),
+                ('Journal Entry',      -600.0),
+                ('101004 101004',      -900.0),
+                ('Journal Entry',      -900.0),
+                ('test_line_2',        1800.0),
+                ('Posted',             1800.0),
+                ('101002 101002',       300.0),
+                ('101003 101003',       600.0),
+                ('101004 101004',       900.0),
+                ('test_line_3',       -1800.0),
+                ('101002 101002',      -300.0),
+                ('101003 101003',      -600.0),
+                ('101004 101004',      -900.0),
+                ('test_line_4',        1800.0),
+                ('101002 101002',       300.0),
+                ('101003 101003',       600.0),
+                ('101004 101004',       900.0),
+                ('test_line_5',           0.0),
+                ('test_line_6',           0.0),
+                ('test_line_7',             3),
+                ('101002 101002',           1),
+                ('101003 101003',           1),
+                ('101004 101004',           1),
+            ],
+            options,
+        )
+
+        # Check redirection.
+        expected_amls = move.line_ids.search(domain)
+        for report_line in report.line_ids:
+            report_line_dict = [x for x in report_lines if x['name'] == report_line.name][0]
+            with self.subTest(report_line=report_line.name):
+                action_dict = report.action_audit_cell(options, self._get_audit_params_from_report_line(options, report_line, report_line_dict))
+                self.assertEqual(move.line_ids.filtered_domain(action_dict['domain']), expected_amls)
+
+    def test_engine_account_codes(self):
+        # Create test account tags
+        account_tags = self.env['account.account.tag']._load_records([
+            {
+                'xml_id': 'odex30_account_reports.account_codes_engine_test_tag1',
+                'noupdate': True,
+                'values': {
+                    'name': "account_codes test tag 1",
+                    'applicability': 'accounts',
+                },
+            },
+
+            {
+                'xml_id': 'odex30_account_reports.account_codes_engine_test_tag2',
+                'noupdate': True,
+                'values': {
+                    'name': "account_codes test tag 2",
+                    'applicability': 'accounts',
+                },
+            },
+        ])
+
+        # Create the report.
+        test_line_1 = self._prepare_test_report_line(
+            self._prepare_test_expression_account_codes('1'),
+            groupby='account_id',
+        )
+        test_line_2 = self._prepare_test_report_line(
+            self._prepare_test_expression_account_codes('1C'),
+            groupby='parent_state,account_id',
+        )
+        test_line_3 = self._prepare_test_report_line(
+            self._prepare_test_expression_account_codes('1D'),
+            groupby='account_id',
+        )
+        test_line_4 = self._prepare_test_report_line(
+            self._prepare_test_expression_account_codes(r'-101\(101003)'),
+            groupby='account_id',
+        )
+        test_line_5 = self._prepare_test_report_line(
+            self._prepare_test_expression_account_codes(r'-101\(101003)C'),
+            groupby='account_id',
+        )
+        test_line_6 = self._prepare_test_report_line(
+            self._prepare_test_expression_account_codes(r'-101\(101002,101003)'),
+            groupby='account_id,move_type',
+        )
+        test_line_7 = self._prepare_test_report_line(
+            self._prepare_test_expression_account_codes('10.'),
+            groupby='account_id',
+        )
+        test_line_8 = self._prepare_test_report_line(
+            self._prepare_test_expression_account_codes('10.20'),
+            groupby='account_id',
+        )
+        test_line_9 = self._prepare_test_report_line(
+            self._prepare_test_expression_account_codes('10.20 - 101 + 101002'),
+            groupby='account_id',
+        )
+        test_line_10 = self._prepare_test_report_line(
+            self._prepare_test_expression_account_codes(r'10.20 - 101\(101002)'),
+            groupby='account_id',
+        )
+        test_line_11 = self._prepare_test_report_line(
+            self._prepare_test_expression_account_codes(r'345D\()D'),
+            groupby='account_id',
+        )
+        test_line_12 = self._prepare_test_report_line(
+            self._prepare_test_expression_account_codes(r'345D\()C'),
+            groupby='account_id',
+        )
+        test_line_13 = self._prepare_test_report_line(
+            self._prepare_test_expression_account_codes(rf'tag(odex30_account_reports.account_codes_engine_test_tag1) + tag({account_tags[1].id})'),
+            groupby='account_id',
+        )
+        test_line_14 = self._prepare_test_report_line(
+            self._prepare_test_expression_account_codes(r'tag(odex30_account_reports.account_codes_engine_test_tag1)D'),
+            groupby='account_id',
+        )
+        test_line_15 = self._prepare_test_report_line(
+            self._prepare_test_expression_account_codes(r'tag(odex30_account_reports.account_codes_engine_test_tag1)C'),
+            groupby='account_id',
+        )
+        test_line_16 = self._prepare_test_report_line(
+            self._prepare_test_expression_account_codes(rf'tag(odex30_account_reports.account_codes_engine_test_tag1)\(101)D + 101003 + tag({account_tags[1].id})\(101)C'),
+            groupby='account_id',
+        )
+
+        report = self._create_report([
+            test_line_1, test_line_2, test_line_3, test_line_4, test_line_5, test_line_6, test_line_7, test_line_8,
+            test_line_9, test_line_10, test_line_11, test_line_12, test_line_13, test_line_14, test_line_15, test_line_16
+        ])
+
+        # Create the journal entries.
+        move = self._create_test_account_moves([
+            self._prepare_test_account_move_line(1000.0, account_code='100001'),
+            self._prepare_test_account_move_line(2000.0, account_code='101001'),
+            self._prepare_test_account_move_line(-300.0, account_code='101002'),
+            self._prepare_test_account_move_line(-600.0, account_code='101003'),
+            self._prepare_test_account_move_line(10000.0, account_code='10.20.0'),
+            self._prepare_test_account_move_line(10.0, account_code='345D'),
+        ])
+
+        # Setup tags on accounts
+        self.env['account.account'].search([('code', 'in', ('100001', '101001'))]).tag_ids = account_tags[0]
+        self.env['account.account'].search([('code', 'in', ('10.20.0', '101002'))]).tag_ids = account_tags[1]
+
+        # Check the values.
+        options = self._generate_options(report, '2020-01-01', '2020-01-01', default_options={'unfold_all': True})
+        report_lines = report._get_lines(options)
+
+        self.assertLinesValues(
+            # pylint: disable=bad-whitespace
+            report_lines,
+            [   0,                          1],
+            [
+                ('test_line_1',       12100.0),
+                ('10.20.0 10.20.0',   10000.0),
+                ('100001 100001',      1000.0),
+                ('101001 101001',      2000.0),
+                ('101002 101002',      -300.0),
+                ('101003 101003',      -600.0),
+                ('test_line_2',        -900.0),
+                ('Posted',             -900.0),
+                ('101002 101002',      -300.0),
+                ('101003 101003',      -600.0),
+                ('test_line_3',       13000.0),
+                ('10.20.0 10.20.0',   10000.0),
+                ('100001 100001',      1000.0),
+                ('101001 101001',      2000.0),
+                ('test_line_4',       -1700.0),
+                ('101001 101001',     -2000.0),
+                ('101002 101002',       300.0),
+                ('test_line_5',         300.0),
+                ('101002 101002',       300.0),
+                ('test_line_6',       -2000.0),
+                ('101001 101001',     -2000.0),
+                ('Journal Entry',     -2000.0),
+                ('test_line_7',       10000.0),
+                ('10.20.0 10.20.0',   10000.0),
+                ('test_line_8',       10000.0),
+                ('10.20.0 10.20.0',   10000.0),
+                ('test_line_9',        8600.0),
+                ('10.20.0 10.20.0',   10000.0),
+                ('101001 101001',     -2000.0),
+                ('101002 101002',         0.0),
+                ('101003 101003',       600.0),
+                ('test_line_10',       8600.0),
+                ('10.20.0 10.20.0',   10000.0),
+                ('101001 101001',     -2000.0),
+                ('101003 101003',       600.0),
+                ('test_line_11',         10.0),
+                ('345D 345D',            10.0),
+                ('test_line_12',          0.0),
+                ('test_line_13',      12700.0),
+                ('10.20.0 10.20.0',   10000.0),
+                ('100001 100001',      1000.0),
+                ('101001 101001',      2000.0),
+                ('101002 101002',      -300.0),
+                ('test_line_14',       3000.0),
+                ('100001 100001',      1000.0),
+                ('101001 101001',      2000.0),
+                ('test_line_15',          0.0),
+                ('test_line_16',        400.0),
+                ('100001 100001',      1000.0),
+                ('101003 101003',      -600.0),
+            ],
+            options,
+        )
+
+        # Check redirection.
+        expected_redirection_values_list = [
+            move.line_ids[:5],
+            move.line_ids[:5],
+            move.line_ids[:5],
+            move.line_ids[1:3],
+            move.line_ids[1:3],
+            move.line_ids[1],
+            move.line_ids[4],
+            move.line_ids[4],
+            move.line_ids[1:5],
+            move.line_ids[1] + move.line_ids[3:5],
+            move.line_ids[5],
+            move.line_ids[5],
+        ]
+        for report_line, expected_amls in zip(report.line_ids, expected_redirection_values_list):
+            report_line_dict = [x for x in report_lines if x['name'] == report_line.name][0]
+            with self.subTest(report_line=report_line.name):
+                action_dict = report.action_audit_cell(options, self._get_audit_params_from_report_line(options, report_line, report_line_dict))
+                self.assertEqual(move.line_ids.filtered_domain(action_dict['domain']), expected_amls)
+
+    def test_engine_external(self):
+        # Create the report.
+        test_line_1 = self._prepare_test_report_line(
+            self._prepare_test_expression_external('sum', [
+                self._prepare_test_external_values(100.0, '2020-01-02'),
+                self._prepare_test_external_values(200.0, '2020-01-03'),
+                self._prepare_test_external_values(300.0, '2020-01-03'),
+                self._prepare_test_external_values(299.999999999, '2020-01-05'),
+            ])
+        )
+        test_line_2 = self._prepare_test_report_line(
+            self._prepare_test_expression_external('most_recent', [
+                self._prepare_test_external_values(100.0, '2020-01-02'),
+                self._prepare_test_external_values(200.0, '2020-01-03'),
+                self._prepare_test_external_values(300.0, '2020-01-03'),
+                self._prepare_test_external_values(299.999999999, '2020-01-05'),
+            ])
+        )
+        report = self._create_report([test_line_1, test_line_2])
+
+        # Check the values at multiple dates.
+        options = self._generate_options(report, '2020-01-01', '2020-01-01')
+        self.assertLinesValues(
+            # pylint: disable=bad-whitespace
+            report._get_lines(options),
+            [   0,                          1],
+            [
+                ('test_line_1',           0.0),
+                ('test_line_2',           0.0),
+            ],
+            options,
+        )
+
+        options = self._generate_options(report, '2020-01-02', '2020-01-02')
+        self.assertLinesValues(
+            # pylint: disable=bad-whitespace
+            report._get_lines(options),
+            [   0,                          1],
+            [
+                ('test_line_1',         100.0),
+                ('test_line_2',         100.0),
+            ],
+            options,
+        )
+
+        options = self._generate_options(report, '2020-01-03', '2020-01-03')
+        report_lines = report._get_lines(options)
+        self.assertLinesValues(
+            # pylint: disable=bad-whitespace
+            report_lines,
+            [   0,                          1],
+            [
+                ('test_line_1',         500.0),
+                ('test_line_2',         500.0),
+            ],
+            options,
+        )
+
+        # Check redirection.
+        for report_line, report_line_dict in zip(report.line_ids, report_lines):
+            with self.subTest(report_line=report_line.name):
+                action_dict = report.action_audit_cell(options, self._get_audit_params_from_report_line(options, report_line, report_line_dict))
+                self.assertRecordValues(
+                    self.env['account.report.external.value'].search(action_dict['domain']),
+                    [
+                        {'date': fields.Date.from_string('2020-01-03')},
+                        {'date': fields.Date.from_string('2020-01-03')},
+                    ],
+                )
+
+        options = self._generate_options(report, '2020-01-04', '2020-01-04')
+        self.assertLinesValues(
+            # pylint: disable=bad-whitespace
+            report._get_lines(options),
+            [   0,                          1],
+            [
+                ('test_line_1',           0.0),
+                ('test_line_2',           0.0),
+            ],
+            options,
+        )
+
+        options = self._generate_options(report, '2020-01-02', '2020-01-04')
+        self.assertLinesValues(
+            # pylint: disable=bad-whitespace
+            report._get_lines(options),
+            [   0,                          1],
+            [
+                ('test_line_1',          600.0),
+                ('test_line_2',          500.0),
+            ],
+            options,
+        )
+
+        # Check redirection.
+        expected_redirection_values_list = [
+            [
+                {'date': fields.Date.from_string('2020-01-02')},
+                {'date': fields.Date.from_string('2020-01-03')},
+                {'date': fields.Date.from_string('2020-01-03')},
+            ],
+            [
+                {'date': fields.Date.from_string('2020-01-03')},
+                {'date': fields.Date.from_string('2020-01-03')},
+            ],
+        ]
+        for report_line, report_line_dict, expected_values in zip(report.line_ids, report_lines, expected_redirection_values_list):
+            with self.subTest(report_line=report_line.name):
+                action_dict = report.action_audit_cell(options, self._get_audit_params_from_report_line(options, report_line, report_line_dict))
+                self.assertRecordValues(
+                    self.env['account.report.external.value'].search(action_dict['domain']),
+                    expected_values,
+                )
+
+        options = self._generate_options(report, '2020-01-03', '2020-01-05')
+        self.assertLinesValues(
+            # pylint: disable=bad-whitespace
+            report._get_lines(options),
+            [   0,                          1],
+            [
+                ('test_line_1',          800.0),
+                ('test_line_2',          300.0),
+            ],
+            options,
+        )
+
+    def test_engine_external_editable_percentage(self):
+        # Create the report.
+        test_rounding_4 = self._prepare_test_report_line(
+            self._prepare_test_expression_external(
+                'most_recent', [
+                    self._prepare_test_external_values(10.1254, '2020-01-01'),
+                    self._prepare_test_external_values(5, '2020-01-02'),
+                ], figure_type='percentage', subformula='editable;rounding=4',
+            ),
+            code='TEST_PERCENTAGE'
+        )
+        test_rounding_2 = self._prepare_test_report_line(
+            self._prepare_test_expression_external(
+                'most_recent', [
+                    self._prepare_test_external_values(10.12, '2020-01-01'),
+                    self._prepare_test_external_values(5, '2020-01-02'),
+                ], figure_type='percentage', subformula='editable;rounding=2',
+            )
+        )
+        test_percentage_aggregate = self._prepare_test_report_line(
+            self._prepare_test_expression_aggregation('10000 * TEST_PERCENTAGE.balance'),
+        )
+        test_float = self._prepare_test_report_line(
+            self._prepare_test_expression_external(
+                'most_recent', [
+                    self._prepare_test_external_values(10.12, '2020-01-01'),
+                    self._prepare_test_external_values(5, '2020-01-02'),
+                ], figure_type='float', subformula='editable;rounding=2',
+            )
+        )
+
+        report = self._create_report([test_rounding_4, test_rounding_2, test_percentage_aggregate, test_float])
+        # Check the values at multiple dates.
+        options = self._generate_options(report, '2020-01-01', '2020-01-01')
+        self.assertLinesValues(
+            # pylint: disable=bad-whitespace
+            report._get_lines(options),
+            [0,                          1],
+            [
+                ('test_line_1', '10.1254%'),
+                ('test_line_2',   '10.12%'),
+                ('test_line_3',     101254),
+                ('test_line_4',    '10.12'),
+            ],
+            options,
+        )
+
+        options = self._generate_options(report, '2020-01-02', '2020-01-02')
+        self.assertLinesValues(
+            # pylint: disable=bad-whitespace
+            report._get_lines(options),
+            [0,                         1],
+            [
+                ('test_line_1', '5.0000%'),
+                ('test_line_2',   '5.00%'),
+                ('test_line_3',     50000),
+                ('test_line_4',    '5.00'),
+            ],
+            options,
+        )
+
+    def test_engine_custom(self):
+        # Create the report.
+        test_line_1 = self._prepare_test_report_line(
+            self._prepare_test_expression_custom('_custom_engine_test', subformula='sum'),
+            groupby='account_id',
+        )
+        report = self._create_report([test_line_1])
+
+        # Create the journal entries.
+        self._create_test_account_moves([
+            self._prepare_test_account_move_line(2000.0, account_code='101001'),
+            self._prepare_test_account_move_line(-300.0, account_code='101002'),
+        ])
+
+        # Check the values.
+
+        def _custom_engine_test(expressions, options, date_scope, current_groupby, next_groupby, offset=0, limit=None, warnings=None):
+            domain = [('account_id.code', '=', '101002')]
+            domain_key = str(domain)
+            formulas_dict = {domain_key: expressions}
+            domain_result = report._compute_formula_batch_with_engine_domain(
+                options, date_scope, formulas_dict, current_groupby, next_groupby,
+                offset=offset, limit=limit,
+            )
+            return list(domain_result.values())[0]
+
+        orig_get_custom_report_function = report._get_custom_report_function
+
+        def get_custom_report_function(_report, function_name, prefix):
+            if function_name == '_custom_engine_test':
+                return _custom_engine_test
+            return orig_get_custom_report_function(function_name, prefix)
+
+        with patch.object(type(report), '_get_custom_report_function', get_custom_report_function):
+            options = self._generate_options(report, '2020-01-01', '2020-01-01')
+            self.assertLinesValues(
+                # pylint: disable=bad-whitespace
+                report._get_lines(options),
+                [   0,                          1],
+                [
+                    ('test_line_1',        -300.0),
+                    ('101002 101002',      -300.0),
+                ],
+                options,
+            )
+
+    def test_engine_aggregation(self):
+        self.env.company.account_fiscal_country_id = self.fake_country
+
+        # Test division by zero.
+        test1 = self._prepare_test_report_line(
+            self._prepare_test_expression_tax_tags('11', label='tax_tags'),
+            self._prepare_test_expression_domain([('account_id.code', '=', '101002')], 'sum', label='domain'),
+            self._prepare_test_expression_external('sum', [self._prepare_test_external_values(100.0, '2020-01-01')], label='external'),
+            self._prepare_test_expression_aggregation('test1.tax_tags + test1.domain', column='aggregation'),
+            self._prepare_test_expression_aggregation('test1.tax_tags / 0', subformula='ignore_zero_division'),
+            self._prepare_test_expression_external('sum', [self._prepare_test_external_values(100.47, '2020-01-01')], label='external_decimal'),
+            name='test1', code='test1',
+        )
+
+        # Test if_(above|below|between) operators.
+        test2_1 = self._prepare_test_report_line(
+            self._prepare_test_expression_aggregation('test1.tax_tags', subformula='if_above(USD(0))'),
+            name='test2_1', code='test2_1',
+        )
+        test2_2 = self._prepare_test_report_line(
+            self._prepare_test_expression_aggregation('test1.tax_tags', subformula='if_above(USD(1999.9999999))'),
+            name='test2_2', code='test2_2',
+        )
+        test2_3 = self._prepare_test_report_line(
+            self._prepare_test_expression_aggregation('test1.tax_tags', subformula='if_above(USD(2500.0))'),
+            name='test2_3', code='test2_3',
+        )
+        test2_4 = self._prepare_test_report_line(
+            self._prepare_test_expression_aggregation('test1.tax_tags', subformula='if_above(CAD(3600.0))'),
+            name='test2_4', code='test2_4',
+        )
+        test3_1 = self._prepare_test_report_line(
+            self._prepare_test_expression_aggregation('test1.domain', subformula='if_below(USD(0))'),
+            name='test3_1', code='test3_1',
+        )
+        test3_2 = self._prepare_test_report_line(
+            self._prepare_test_expression_aggregation('test1.domain', subformula='if_below(USD(-300.00001))'),
+            name='test3_2', code='test3_2',
+        )
+        test3_3 = self._prepare_test_report_line(
+            self._prepare_test_expression_aggregation('test1.domain', subformula='if_below(USD(- 350))'),
+            name='test3_3', code='test3_3',
+        )
+        test4_1 = self._prepare_test_report_line(
+            self._prepare_test_expression_aggregation('test1.tax_tags + test1.domain', subformula='if_between(USD(0), USD(2000))'),
+            name='test4_1', code='test4_1',
+        )
+        test4_2 = self._prepare_test_report_line(
+            self._prepare_test_expression_aggregation('test1.tax_tags + test1.domain', subformula='if_between(CAD(0), CAD(3000))'),
+            name='test4_2', code='test4_2',
+        )
+
+        # Test line code recognition.
+        test5 = self._prepare_test_report_line(
+            self._prepare_test_expression_account_codes('101003', label='account_codes'),
+            self._prepare_test_expression_aggregation('test1.tax_tags + 9999.account_codes'),
+            name='9999', code='9999',
+        )
+
+        # Test mathematical operators.
+        test6 = self._prepare_test_report_line(
+            self._prepare_test_expression_aggregation(
+                '(test1.tax_tags + (2 * test1.domain) + 100.0) / (9999.account_codes)'
+            ),
+            name='test6', code='test6',
+        )
+
+        # Test other date scope
+        test7 = self._prepare_test_report_line(
+            self._prepare_test_expression_domain(
+                [('account_id.code', '=', '101002')],
+                'sum',
+                label='domain',
+                date_scope='to_beginning_of_period',
+            ),
+            self._prepare_test_expression_aggregation('test7.domain'),
+            name='test7', code='test7',
+        )
+
+        # Test exponential notation
+        test9 = self._prepare_test_report_line(
+            self._prepare_test_expression_aggregation(
+                '(test1.tax_tags + (2 * test1.domain) + 100.0 + 1.752e-17) / (9999.account_codes)'
+            ),
+            name='test9', code='test9',
+        )
+
+        # Test 'round' subformula
+        test10_1 = self._prepare_test_report_line(
+            self._prepare_test_expression_aggregation('test1.external_decimal', subformula='round(0)'),
+            name='test10_1', code='test10_1',
+        )
+        test10_2 = self._prepare_test_report_line(
+            self._prepare_test_expression_aggregation('test1.external_decimal', subformula='round(1)'),
+            name='test10_2', code='test10_2',
+        )
+        test10_3 = self._prepare_test_report_line(
+            self._prepare_test_expression_aggregation('test1.external_decimal', subformula='round(3)'),
+            name='test10_3', code='test10_3',
+        )
+
+        # Test if_other_expr_above / if_other_expr_below
+        test11_1 = self._prepare_test_report_line(
+            self._prepare_test_expression_aggregation('test1.external', subformula='if_other_expr_above(test1.tax_tags, USD(3000.0))'),
+            name='test11_1', code='test11_1',
+        )
+        test11_2 = self._prepare_test_report_line(
+            self._prepare_test_expression_aggregation('test1.external', subformula='if_other_expr_below(test1.tax_tags, USD(3000.0))'),
+            name='test11_2', code='test11_2',
+        )
+        test11_3 = self._prepare_test_report_line(
+            self._prepare_test_expression_aggregation('test1.external', subformula='if_other_expr_above(test1.tax_tags, USD(1000.0))'),
+            name='test11_3', code='test11_3',
+        )
+        test11_4 = self._prepare_test_report_line(
+            self._prepare_test_expression_aggregation('test1.external', subformula='if_other_expr_below(test1.tax_tags, USD(1000.0))'),
+            name='test11_4', code='test11_4',
+        )
+        # Test with an aggregation in the condition
+        test11_5 = self._prepare_test_report_line(
+            self._prepare_test_expression_aggregation('test1.external', subformula='if_other_expr_above(test1.aggregation, USD(1000.0))'),
+            name='test11_5', code='test11_5',
+        )
+        test11_6 = self._prepare_test_report_line(
+            self._prepare_test_expression_aggregation('test1.external', subformula='if_other_expr_below(test1.aggregation, USD(1000.0))'),
+            name='test11_6', code='test11_6',
+        )
+
+        # Test sum_children formula (parent_id relationship is populated below)
+        test_12_1 = self._prepare_test_report_line(
+            self._prepare_test_expression_aggregation('sum_children'),
+            name='test12_1', code='test12_1',
+        )
+        test_12_2 = self._prepare_test_report_line(
+            self._prepare_test_expression_aggregation('test1.tax_tags'),
+            name='test12_2', code='test12_2',
+        )
+        test_12_3 = self._prepare_test_report_line(
+            self._prepare_test_expression_aggregation('test1.domain'),
+            name='test12_3', code='test12_3',
+        )
+        test_12_4 = self._prepare_test_report_line(
+            self._prepare_test_expression_aggregation('sum_children'),
+            name='test12_4', code='test12_4',
+        )
+        test_12_5 = self._prepare_test_report_line(
+            self._prepare_test_expression_domain([('account_id.code', '=', '101003')], 'sum'),
+            name='test12_5', # No code on purpose to check a different case of sum_children
+        )
+
+        report = self._create_report(
+            [
+                test1, test2_1, test2_2, test2_3, test2_4, test3_1, test3_2, test3_3, test4_1, test4_2,
+                test5, test6, test7, test9, test10_1, test10_2, test10_3, test11_1, test11_2, test11_3, test11_4,
+                test11_5, test11_6, test_12_1, test_12_2, test_12_3, test_12_4, test_12_5,
+            ],
+            country_id=self.fake_country.id,
+        )
+
+        # Set parent link properly for sum_children test, now that all lines are created:
+        line_12_1 = self.env['account.report.line'].search([('code', '=', 'test12_1')])
+        self.env['account.report.line'].search([('code', 'in', ('test12_2', 'test12_3', 'test12_4'))]).parent_id = line_12_1
+        line_12_4 = self.env['account.report.line'].search([('code', '=', 'test12_4')])
+        self.env['account.report.line'].search([('name', '=', 'test12_5')]).parent_id = line_12_4
+
+        # Create the journal entries.
+        moves = self._create_test_account_moves([
+            self._prepare_test_account_move_line(100000.0, account_code='101002', date='2019-01-01'),
+            self._prepare_test_account_move_line(2000.0, account_code='101001', tax_tags=['+11']),
+            self._prepare_test_account_move_line(-300.0, account_code='101002'),
+            self._prepare_test_account_move_line(1500.0, account_code='101003'),
+        ])
+
+        # Check the values.
+        options = self._generate_options(report, '2020-01-01', '2020-01-01')
+        report_lines = report._get_lines(options)
+        self.assertLinesValues(
+            # pylint: disable=bad-whitespace
+            report_lines,
+            [   0,                          1],
+            [
+                ('test1',                 0.0),
+                ('test2_1',            2000.0),
+                ('test2_2',               0.0),
+                ('test2_3',               0.0),
+                ('test2_4',            2000.0),
+                ('test3_1',            -300.0),
+                ('test3_2',               0.0),
+                ('test3_3',               0.0),
+                ('test4_1',            1700.0),
+                ('test4_2',               0.0),
+                ('9999',               3500.0),
+                ('test6',                 1.0),
+                ('test7',            100000.0),
+                ('test9',                 1.0),
+                ('test10_1',            100.0),
+                ('test10_2',            100.5),
+                ('test10_3',            100.47),
+                ('test11_1',              0.0),
+                ('test11_2',            100.0),
+                ('test11_3',            100.0),
+                ('test11_4',              0.0),
+                ('test11_5',            100.0),
+                ('test11_6',              0.0),
+                ('test12_1',           3200.0),
+                ('test12_2',           2000.0),
+                ('test12_3',           -300.0),
+                ('test12_4',           1500.0),
+                ('test12_5',           1500.0),
+            ],
+            options,
+        )
+
+        # Check redirection.
+        expected_amls_to_test = [
+            ('9999', moves[1].line_ids[0] + moves[1].line_ids[2]),
+            ('test7', moves[0].line_ids[0]),
+            ('test12_1', moves[1].line_ids[:3]),
+        ]
+        for report_line_name, expected_amls in expected_amls_to_test:
+            report_line = report.line_ids.filtered(lambda x: x.name == report_line_name)
+            report_line_dict = [x for x in report_lines if x['name'] == report_line.name][0]
+            with self.subTest(report_line=report_line.name):
+                action_dict = report.action_audit_cell(options, self._get_audit_params_from_report_line(options, report_line, report_line_dict))
+                self.assertEqual(moves.line_ids.filtered_domain(action_dict['domain']), expected_amls)
+
+    def test_engine_aggregation_cross_report(self):
+        moves = self._create_test_account_moves([
+            self._prepare_test_account_move_line(1.0, account_code='100000', date='2020-01-01'),
+            self._prepare_test_account_move_line(2.0, account_code='100000', date='2021-01-01'),
+            self._prepare_test_account_move_line(3.0, account_code='200000', date='2020-01-01'),
+            self._prepare_test_account_move_line(4.0, account_code='200000', date='2021-01-01'),
+            self._prepare_test_account_move_line(5.0, account_code='300000', date='2021-01-01'),
+        ])
+
+        # Other report
+        other_report_line_1 = self._prepare_test_report_line(
+            self._prepare_test_expression_account_codes('1'),
+            name='other_report_line_1', code='other_report_line_1',
+        )
+
+        other_report_line_2 = self._prepare_test_report_line(
+            self._prepare_test_expression_account_codes('2'),
+            name='other_report_line_2', code='other_report_line_2',
+        )
+
+        other_report_line_3 = self._prepare_test_report_line(
+            self._prepare_test_expression_aggregation('other_report_line_1.balance + other_report_line_2.balance'),
+            name='other_report_line_3', code='other_report_line_3',
+        )
+
+        other_report_line_4 = self._prepare_test_report_line(
+            self._prepare_test_expression_account_codes('3'),
+            name='other_report_line_4', code='other_report_line_4',
+        )
+
+        other_report = self._create_report([other_report_line_1, other_report_line_2, other_report_line_3, other_report_line_4])
+        other_report_options = self._generate_options(other_report, '2021-01-01', '2021-01-01')
+
+        # Main report
+        main_report_line_1 = self._prepare_test_report_line(
+            self._prepare_test_expression_aggregation('other_report_line_2.balance', subformula='cross_report', date_scope='strict_range'),
+            name='main_report_line_1', code='main_report_line_1',
+        )
+
+        main_report_line_2 = self._prepare_test_report_line(
+            self._prepare_test_expression_aggregation('other_report_line_2.balance', subformula='cross_report', date_scope='from_beginning'),
+            name='main_report_line_2', code='main_report_line_2',
+        )
+
+        main_report_line_3 = self._prepare_test_report_line(
+            self._prepare_test_expression_aggregation('other_report_line_3.balance', subformula='cross_report', date_scope='strict_range'),
+            name='main_report_line_3', code='main_report_line_3',
+        )
+
+        main_report_line_4 = self._prepare_test_report_line(
+            self._prepare_test_expression_aggregation('other_report_line_3.balance', subformula='cross_report', date_scope='from_beginning'),
+            name='main_report_line_4', code='main_report_line_4',
+        )
+
+        main_report_line_5 = self._prepare_test_report_line(
+            self._prepare_test_expression_aggregation(
+                'main_report_line_1.balance + main_report_line_2.balance + main_report_line_3.balance + main_report_line_4.balance',
+            ),
+            name='main_report_line_5', code='main_report_line_5',
+        )
+
+        main_report_line_6 = self._prepare_test_report_line(
+            self._prepare_test_expression_aggregation(
+                'main_report_line_1.balance + main_report_line_2.balance + main_report_line_3.balance + main_report_line_4.balance',
+            ),
+            name='main_report_line_6', code='main_report_line_6',
+        )
+
+        main_report = self._create_report([main_report_line_1, main_report_line_2, main_report_line_3, main_report_line_4, main_report_line_5, main_report_line_6])
+        main_report_options = self._generate_options(main_report, '2021-01-01', '2021-01-01')
+
+        # First check other_report
+        self.assertLinesValues(
+            # pylint: disable=bad-whitespace
+            other_report._get_lines(other_report_options),
+            [   0,                                      1],
+            [
+                ('other_report_line_1',               2.0),
+                ('other_report_line_2',               4.0),
+                ('other_report_line_3',               6.0),
+                ('other_report_line_4',               5.0),
+            ],
+            other_report_options,
+        )
+
+        # Check main_report
+        main_report_options = self._generate_options(main_report, '2021-01-01', '2021-01-01')
+        main_report_lines = main_report._get_lines(main_report_options)
+        self.assertLinesValues(
+            # pylint: disable=bad-whitespace
+            main_report_lines,
+            [   0,                                      1],
+            [
+                ('main_report_line_1',                4.0),
+                ('main_report_line_2',                7.0),
+                ('main_report_line_3',                6.0),
+                ('main_report_line_4',               10.0),
+                ('main_report_line_5',               27.0),
+                ('main_report_line_6',               27.0),
+            ],
+            main_report_options,
+        )
+
+        # Check redirection.
+        expected_amls_to_test = [
+            ('main_report_line_1', moves[1].line_ids[1]),
+            ('main_report_line_2', moves[1].line_ids[1] + moves[0].line_ids[1]),
+        ]
+
+        for report_line_name, expected_amls in expected_amls_to_test:
+            report_line = main_report.line_ids.filtered(lambda x: x.name == report_line_name)
+            report_line_dict = [x for x in main_report_lines if x['name'] == report_line.name][0]
+            with self.subTest(report_line=report_line.name):
+                action_dict = main_report.action_audit_cell(main_report_options, self._get_audit_params_from_report_line(main_report_options, report_line, report_line_dict))
+                self.assertEqual(moves.line_ids.filtered_domain(action_dict['domain']), expected_amls)
+
+    def test_engine_aggregation_expansion(self):
+        report = self._create_report([
+            self._prepare_test_report_line(
+                self._prepare_test_expression_tax_tags('42'),
+                code='TAG_1',
+            ),
+            self._prepare_test_report_line(
+                self._prepare_test_expression_tax_tags('221292'),
+                code='TAG_2',
+            ),
+            self._prepare_test_report_line(
+                self._prepare_test_expression_tax_tags('777'),
+                code='TAG_3',
+            ),
+            self._prepare_test_report_line(
+                self._prepare_test_expression_aggregation('TAG_1.balance + TAG_2.balance'),
+                code='SIMPLE_AGG',
+            ),
+            self._prepare_test_report_line(
+                self._prepare_test_expression_aggregation('SIMPLE_AGG.balance + TAG_3.balance'),
+                code='COMPLEX_AGG',
+            ),
+            self._prepare_test_report_line(
+                self._prepare_test_expression_aggregation('TAG_1.balance + TAG_2.balance', subformula='if_other_expr_above(TAG_3.balance, EUR(13))'),
+                code='BOUNDED_AGG',
+            ),
+            self._prepare_test_report_line(
+                self._prepare_test_expression_tax_tags('3333'),
+            ),
+        ])
+
+        other_report = self._create_report([
+            self._prepare_test_report_line(
+                self._prepare_test_expression_aggregation('SIMPLE_AGG.balance + BOUNDED_AGG.balance', subformula='cross_report'),
+                code='CROSS_REPORT_AGG',
+            ),
+        ])
+
+        expr_map = {expression.report_line_id.code: expression for expression in (report + other_report).line_ids.expression_ids}
+
+        self.assertEqual(
+            expr_map['SIMPLE_AGG']._expand_aggregations(),
+            expr_map['SIMPLE_AGG'] + expr_map['TAG_1'] + expr_map['TAG_2'],
+        )
+
+        self.assertEqual(
+            expr_map['COMPLEX_AGG']._expand_aggregations(),
+            expr_map['COMPLEX_AGG'] + expr_map['SIMPLE_AGG'] + expr_map['TAG_1'] + expr_map['TAG_2'] + expr_map['TAG_3'],
+        )
+
+        self.assertEqual(
+            expr_map['BOUNDED_AGG']._expand_aggregations(),
+            expr_map['BOUNDED_AGG'] + expr_map['TAG_1'] + expr_map['TAG_2'] + expr_map['TAG_3'],
+        )
+
+        self.assertEqual(
+            expr_map['CROSS_REPORT_AGG']._expand_aggregations(),
+            expr_map['CROSS_REPORT_AGG'] + expr_map['SIMPLE_AGG'] + expr_map['BOUNDED_AGG'] + expr_map['TAG_1'] + expr_map['TAG_2'] + expr_map['TAG_3'],
+        )
+
+    def test_load_more(self):
+        partner_a, partner_b, partner_c = self.env['res.partner'].create([
+            {'name': 'Partner A'},
+            {'name': 'Partner B'},
+            {'name': 'Partner C'},
+        ])
+
+        self._create_test_account_moves([
+            self._prepare_test_account_move_line(1000.0, partner_id=partner_a.id, date='2020-01-01'),
+            self._prepare_test_account_move_line(2000.0, partner_id=partner_b.id, date='2020-01-01'),
+            self._prepare_test_account_move_line(3000.0, partner_id=partner_c.id, date='2020-01-01'),
+        ])
+
+        report = self._create_report(
+            test_report_line_values_list=[self._prepare_test_report_line(
+                self._prepare_test_expression_domain([('partner_id', '!=', False)], 'sum'),
+                groupby='partner_id',
+            )],
+            load_more_limit=2,
+        )
+
+        options = self._generate_options(report, '2020-01-01', '2020-01-31')
+        lines = report._get_lines(options)
+
+        self.assertLinesValues(
+            # pylint: disable=bad-whitespace
+            lines,
+            [   0,                                1],
+            [
+                ('test_line_1',          '6,000.00'),
+                ('Partner A',            '1,000.00'),
+                ('Partner B',            '2,000.00'),
+                ('Load more...',                 ''),
+            ],
+            options,
+        )
+
+        load_more_line = lines[-1]
+        load_more_res = report.get_expanded_lines(
+            options,
+            load_more_line['id'],
+            load_more_line['groupby'],
+            load_more_line['expand_function'],
+            load_more_line['progress'],
+            load_more_line['offset'],
+            None,
+        )
+
+        self.assertLinesValues(
+            # pylint: disable=bad-whitespace
+            load_more_res,
+            [   0,                                1],
+            [
+                ('Partner C',            '3,000.00'),
+            ],
+            options,
+        )
+
+    def test_engine_external_boolean(self):
+        # Create the report.
+        test_line = self._prepare_test_report_line(
+            self._prepare_test_expression_external('most_recent', [
+                self._prepare_test_external_values('1', '2020-01-02'),
+                self._prepare_test_external_values('0', '2020-01-03'),
+                self._prepare_test_external_values('1', '2020-01-03'),
+                self._prepare_test_external_values('0', '2020-01-05'),
+            ], figure_type='boolean')
+        )
+
+        report = self._create_report([test_line])
+        # Check the values at multiple dates.
+        options = self._generate_options(report, '2020-01-01', '2020-01-01')
+        self.assertLinesValues(
+            # pylint: disable=bad-whitespace
+            report._get_lines(options),
+            [   0,                          1],
+            [
+                ('test_line_1',          'No'),
+            ],
+            options,
+        )
+
+        options = self._generate_options(report, '2020-01-02', '2020-01-02')
+        self.assertLinesValues(
+            # pylint: disable=bad-whitespace
+            report._get_lines(options),
+            [   0,                          1],
+            [
+                ('test_line_1',         'Yes'),
+            ],
+            options,
+        )
+
+        options = self._generate_options(report, '2020-01-03', '2020-01-03')
+        self.assertLinesValues(
+            # pylint: disable=bad-whitespace
+            report._get_lines(options),
+            [   0,                          1],
+            [
+                ('test_line_1',         'Yes'),
+            ],
+            options,
+        )
+
+        options = self._generate_options(report, '2020-01-05', '2020-01-05')
+        self.assertLinesValues(
+            # pylint: disable=bad-whitespace
+            report._get_lines(options),
+            [   0,                          1],
+            [
+                ('test_line_1',          'No'),
+            ],
+            options,
+        )
+
+        options = self._generate_options(report, '2020-01-02', '2020-01-05')
+        self.assertLinesValues(
+            # pylint: disable=bad-whitespace
+            report._get_lines(options),
+            [   0,                          1],
+            [
+                ('test_line_1',          'No'),
+            ],
+            options,
+        )
+
+    def test_engine_external_string(self):
+        # Create the report.
+        test_line = self._prepare_test_report_line(
+            self._prepare_test_expression_external('most_recent', [
+                self._prepare_test_external_values('TARDIS', '2020-01-02', figure_type='string'),
+                self._prepare_test_external_values('Kris Kelvin', '2020-01-03', figure_type='string'),
+                self._prepare_test_external_values('Trisolaris', '2020-01-03', figure_type='string'),
+                self._prepare_test_external_values("5-ounce bird carrying a 1-pound coconut", '2020-01-05', figure_type='string'),
+            ], figure_type='string')
+        )
+
+        report = self._create_report([test_line])
+        # Check the values at multiple dates.
+        options = self._generate_options(report, '2020-01-01', '2020-01-01')
+        self.assertLinesValues(
+            # pylint: disable=bad-whitespace
+            report._get_lines(options),
+            [   0,                                    1],
+            [
+                ('test_line_1',                      ''),
+            ],
+            options,
+        )
+
+        options = self._generate_options(report, '2020-01-02', '2020-01-02')
+        self.assertLinesValues(
+            # pylint: disable=bad-whitespace
+            report._get_lines(options),
+            [   0,                                    1],
+            [
+                ('test_line_1',                'TARDIS'),
+            ],
+            options,
+        )
+
+        options = self._generate_options(report, '2020-01-03', '2020-01-03')
+        self.assertLinesValues(
+            # pylint: disable=bad-whitespace
+            report._get_lines(options),
+            [   0,                                    1],
+            [
+                ('test_line_1',            'Trisolaris'),
+            ],
+            options,
+        )
+
+        options = self._generate_options(report, '2020-01-05', '2020-01-05')
+        self.assertLinesValues(
+            # pylint: disable=bad-whitespace
+            report._get_lines(options),
+            [   0,                                    1],
+            [
+                ('test_line_1', "5-ounce bird carrying a 1-pound coconut"),
+            ],
+            options,
+        )
+
+        options = self._generate_options(report, '2020-01-02', '2020-01-05')
+        self.assertLinesValues(
+            # pylint: disable=bad-whitespace
+            report._get_lines(options),
+            [   0,                                    1],
+            [
+                ('test_line_1', "5-ounce bird carrying a 1-pound coconut"),
+            ],
+            options,
+        )
+
+    def test_engine_external_default_value_tax_closing_fiscalyear_lock_date(self):
+        def lock_via_fiscalyear_lock_date(non_tax_report, tax_report, report_options_map):
+            lock_date_wizard = self.env['account.change.lock.date'].create({
+                'fiscalyear_lock_date': fields.Date.from_string('2020-01-02'),
+            })
+            lock_date_wizard.change_lock_date()
+
+        self._run_external_engine_default_test_case(False, True, lock_via_fiscalyear_lock_date)
+
+    def test_engine_external_default_value_tax_closing_tax_lock_date(self):
+        def lock_via_tax_lock_date(non_tax_report, tax_report, report_options_map):
+            lock_date_wizard = self.env['account.change.lock.date'].create({
+                'tax_lock_date': fields.Date.from_string('2020-01-02'),
+            })
+            lock_date_wizard.change_lock_date()
+
+        self._run_external_engine_default_test_case(True, False, lock_via_tax_lock_date)
+
+    def test_engine_external_default_value_tax_closing(self):
+        def lock_via_tax_closing(non_tax_report, tax_report, report_options_map):
+            tax_closing_action = self.env['account.tax.report.handler'].with_context({'override_tax_closing_warning': True}).action_periodic_vat_entries(report_options_map[tax_report])
+            closing_move_id = tax_closing_action['res_id']
+            with self.enter_test_mode():
+                self.env['account.move'].browse(closing_move_id).action_post()
+
+        self._run_external_engine_default_test_case(True, False, lock_via_tax_closing)
+
+    def _run_external_engine_default_test_case(self, impact_tax_report, impact_non_tax_report, lock_operation_function):
+        """ Common helper to run the tests of _default expressions
+        """
+        test_line_1 = self._prepare_test_report_line(
+            self._prepare_test_expression_account_codes('10'),
+            groupby='account_id',
+        )
+        test_line_2 = self._prepare_test_report_line(
+            self._prepare_test_expression_external('sum', {}),
+            self._prepare_test_expression_account_codes('10', label='_default_balance'),
+        )
+
+        non_tax_report = self._create_report([test_line_1, test_line_2], name="non_tax_report")
+        tax_report = self._create_report([test_line_1, test_line_2], root_report_id=self.env.ref('account.generic_tax_report').id, name="tax_report")
+
+        # Create the journal entries.
+        self._create_test_account_moves([
+            self._prepare_test_account_move_line(1000.0, account_code='100001'),
+            self._prepare_test_account_move_line(-300.0, account_code='101002'),
+            self._prepare_test_account_move_line(-600.0, account_code='314159'),
+        ])
+
+        report_options_map = {
+            report: self._generate_options(
+                report,
+                '2020-01-01', '2020-01-31',
+                default_options={
+                    'unfold_all': True,
+                }
+            )
+            for report in [non_tax_report, tax_report]
+        }
+
+        # Check the values before locking
+        for report in [non_tax_report, tax_report]:
+            with self.subTest(report=report.name):
+                options = report_options_map[report]
+                self.assertLinesValues(
+                    # pylint: disable=bad-whitespace
+                    report._get_lines(options),
+                    [0,                             1],
+                    [
+                        ('test_line_1',         700.0),
+                        ('100001 100001',      1000.0),
+                        ('101002 101002',      -300.0),
+                        ('test_line_2',           0.0),
+                    ],
+                    options,
+                )
+
+        # Run the lock operation
+        lock_operation_function(non_tax_report, tax_report, report_options_map)
+
+        # Check the values after locking
+        for report, impacted in [(non_tax_report, impact_non_tax_report), (tax_report, impact_tax_report)]:
+            with self.subTest(report=report.name):
+                options = report_options_map[report]
+                if impacted:
+                    self.assertLinesValues(
+                        # pylint: disable=bad-whitespace
+                        report._get_lines(options),
+                        [0,                             1],
+                        [
+                            ('test_line_1',         700.0),
+                            ('100001 100001',      1000.0),
+                            ('101002 101002',      -300.0),
+                            ('test_line_2',         700.0),
+                        ],
+                        options,
+                    )
+                else:
+                    self.assertLinesValues(
+                        # pylint: disable=bad-whitespace
+                        report._get_lines(options),
+                        [0,                             1],
+                        [
+                            ('test_line_1',         700.0),
+                            ('100001 100001',      1000.0),
+                            ('101002 101002',      -300.0),
+                            ('test_line_2',           0.0),
+                        ],
+                        options,
+                    )
+
+    def test_engine_aggregation_cross_bound(self):
+        report_1 = self._create_report([
+            self._prepare_test_report_line(
+                self._prepare_test_expression_aggregation('line_2_1.balance', subformula='cross_report'),
+                name='Line 1-1',
+                code='line_1_1',
+            ),
+        ])
+
+        self._create_report([
+            self._prepare_test_report_line(
+                self._prepare_test_expression_aggregation('14.0', subformula='if_other_expr_above(line_2_1.dudu, EUR(0))'),
+                self._prepare_test_expression_account_codes('101', label='dudu'),
+                name='Line 2-1',
+                code='line_2_1',
+            ),
+        ])
+
+        options = self._generate_options(report_1, '2020-01-01', '2020-01-01')
+
+        self.assertLinesValues(
+            # pylint: disable=bad-whitespace
+            report_1._get_lines(options),
+            [   0,                          1],
+            [
+                ('Line 1-1',              0.0),
+            ],
+            options
+        )
+
+        self._create_test_account_moves([
+            self._prepare_test_account_move_line(10, account_code='101001'),
+            self._prepare_test_account_move_line(-10, account_code='100001'),
+        ])
+
+        self.assertLinesValues(
+            # pylint: disable=bad-whitespace
+            report_1._get_lines(options),
+            [   0,                          1],
+            [
+                ('Line 1-1',             14.0),
+            ],
+            options
+        )
+
+    def test_change_expression_engine_to_tax_tags(self):
+        """
+        Ensure that tax tags are created when switching the expression engine to tax tags if formula is unchanged.
+        """
+        formula = 'dudu'
+        test_line_1 = self._prepare_test_report_line(
+            self._prepare_test_expression_external(formula, [self._prepare_test_external_values(100.0, '2020-01-01')], label='external'),
+        )
+        report = self._create_report([test_line_1], country_id=self.fake_country.id)
+        tags = self.env['account.account.tag']._get_tax_tags(formula, self.fake_country.id)
+        self.assertEqual(len(tags), 0)
+        report.line_ids[0].expression_ids[0].engine = 'tax_tags'
+        tags = self.env['account.account.tag']._get_tax_tags(formula, self.fake_country.id)
+        self.assertEqual(tags.mapped('name'), ['-' + formula, '+' + formula])
+
+    def test_integer_rounding(self):
+        line_1 = self._prepare_test_report_line(
+            self._prepare_test_expression_domain([('account_id.code', '=', '101001')], 'sum'),
+            code='test_1',
+        )
+        line_2 = self._prepare_test_report_line(
+            self._prepare_test_expression_tax_tags('42'),
+            code='test_2',
+        )
+        line_3 = self._prepare_test_report_line(
+            self._prepare_test_expression_account_codes('1'),
+            code='test_3',
+        )
+        line_4 = self._prepare_test_report_line(
+            self._prepare_test_expression_external('sum', [
+                self._prepare_test_external_values(3.5, '2023-01-01'),
+            ]),
+            code='test_4',
+        )
+        line_5 = self._prepare_test_report_line(
+            self._prepare_test_expression_aggregation('test_1.balance + test_2.balance + test_3.balance + test_4.balance'),
+            code='test_5',
+        )
+        line_6 = self._prepare_test_report_line(
+            self._prepare_test_expression_aggregation('test_5.balance / 10'),
+        )
+
+        report = self._create_report([line_1, line_2, line_3, line_4, line_5, line_6], country_id=self.fake_country.id,)
+
+        self._create_test_account_moves([
+            self._prepare_test_account_move_line(5.4, account_code='101001', tax_tags=['+42'], date='2023-01-01'),
+        ])
+
+        # Test with a first rounding
+        report.integer_rounding = 'HALF-UP'
+        half_up_options = self._generate_options(report, '2023-01-01', '2023-01-01')
+        self.assertLinesValues(
+            # pylint: disable=bad-whitespace
+            report._get_lines(half_up_options),
+            [   0,                              1],
+            [
+                ('test_line_1',               5.0),
+                ('test_line_2',               5.0),
+                ('test_line_3',               5.0),
+                ('test_line_4',               4.0),
+                ('test_line_5',              19.0),
+                ('test_line_6',               2.0),
+            ],
+            half_up_options,
+        )
+
+        # Test with another rounding method
+        report.integer_rounding = 'UP'
+        up_options = self._generate_options(report, '2023-01-01', '2023-01-01')
+        self.assertLinesValues(
+            # pylint: disable=bad-whitespace
+            report._get_lines(up_options),
+            [   0,                              1],
+            [
+                ('test_line_1',               6.0),
+                ('test_line_2',               6.0),
+                ('test_line_3',               6.0),
+                ('test_line_4',               4.0),
+                ('test_line_5',              22.0),
+                ('test_line_6',               3.0),
+            ],
+            up_options
+        )
+
+        # In file export mode, the rounding should always be applied, even if it was previously disabled
+        print_mode_options = self._generate_options(report, '2023-01-01', '2023-01-01', default_options={'integer_rounding_enabled': False, 'export_mode': 'file'})
+        self.assertLinesValues(
+            # pylint: disable=bad-whitespace
+            report._get_lines(print_mode_options),
+            [   0,                              1],
+            [
+                ('test_line_1',               6.0),
+                ('test_line_2',               6.0),
+                ('test_line_3',               6.0),
+                ('test_line_4',               4.0),
+                ('test_line_5',              22.0),
+                ('test_line_6',               3.0),
+            ],
+            print_mode_options,
+        )
+
+        # Rounding available, but disabled
+        no_rounding_options = self._generate_options(report, '2023-01-01', '2023-01-01', default_options={'integer_rounding_enabled': False})
+        self.assertLinesValues(
+            # pylint: disable=bad-whitespace
+            report._get_lines(no_rounding_options),
+            [   0,                               1],
+            [
+                ('test_line_1',               5.40),
+                ('test_line_2',               5.40),
+                ('test_line_3',               5.40),
+                ('test_line_4',               3.50),
+                ('test_line_5',              19.70),
+                ('test_line_6',               1.97),
+            ],
+            no_rounding_options,
+        )
+
+    def test_print_hide_0_lines(self):
+        # Create the report.
+        test_line_1 = self._prepare_test_report_line(
+            self._prepare_test_expression_tax_tags('11'),
+            groupby='account_id',
+        )
+        test_line_2 = self._prepare_test_report_line(
+            self._prepare_test_expression_tax_tags('222T'),
+            groupby='account_id',
+        )
+        report = self._create_report([test_line_1, test_line_2], country_id=self.fake_country.id)
+
+        # Create the journal entries.
+        self._create_test_account_moves([
+            self._prepare_test_account_move_line(3000.0, account_code='101001', tax_tags=['+11', '-222T']),
+            self._prepare_test_account_move_line(3600.0, account_code='101001', tax_tags=['+222T']),
+            self._prepare_test_account_move_line(-600.0, account_code='101001', tax_tags=['+222T', '-11']),
+        ])
+
+        # To ensure that the lines are shown when hide_0_lines isn't toggled and vice versa, we test both scenarios.
+        options_not_hide = self._generate_options(
+            report,
+            '2020-01-01', '2020-01-01',
+            default_options={'unfold_all': True, 'export_mode': 'print'}
+        )
+        self.assertLinesValues(
+            # pylint: disable=bad-whitespace
+            report._get_lines(options_not_hide),
+            [   0,                        1],
+            [
+                ('test_line_1',      3600.0),
+                ('101001 101001',    3600.0),
+                ('test_line_2',         0.0),
+                ('101001 101001',       0.0),
+            ],
+            options_not_hide,
+        )
+
+        options_hide = self._generate_options(
+            report,
+            '2020-01-01', '2020-01-01',
+            default_options={'unfold_all': True, 'export_mode': 'print', 'hide_0_lines': True}
+        )
+        self.assertLinesValues(
+            # pylint: disable=bad-whitespace
+            report._get_lines(options_hide),
+            [   0,                        1],
+            [
+                ('test_line_1',      3600.0),
+                ('101001 101001',    3600.0),
+            ],
+            options_hide,
+        )
+
+    def test_column_blank_if_zero(self):
+        """account.report.column's `blank_if_zero` option should only impacts number figure types"""
+        test_line = self._prepare_test_report_line(
+            self._prepare_test_expression_external('most_recent', [], label='monetary', figure_type='monetary'),
+
+            self._prepare_test_expression_external('most_recent', [], label='percentage', figure_type='percentage'),
+
+            self._prepare_test_expression_external('most_recent', [], label='integer', figure_type='integer'),
+
+            self._prepare_test_expression_external('most_recent', [], label='float', figure_type='float'),
+
+            self._prepare_test_expression_external('most_recent', [
+                self._prepare_test_external_values(False, '2024-01-01', figure_type='boolean'),
+            ], label='boolean', figure_type='boolean'),
+
+            self._prepare_test_expression_external('most_recent', [
+                self._prepare_test_external_values('dudu', '2024-01-01', figure_type='string'),
+            ], label='string', figure_type='string'),
+        )
+
+        report = self._create_report([test_line], columns=['monetary', 'percentage', 'integer', 'float', 'boolean', 'string'])
+        report.column_ids.blank_if_zero = True
+
+        options = self._generate_options(report, '2024-01-01', '2024-01-01')
+        self.assertLinesValues(
+            # pylint: disable=bad-whitespace
+            report._get_lines(options),
+            [   0,                          1,  2,   3,  4,      5,       6],
+            [
+                ('test_line_1',            '', '',  '', '',   'No',  'dudu'),
+            ],
+            options,
+        )
+
+    def test_column_groups_audit(self):
+        account = self.company_data['default_account_assets']
+        move = self.env['account.move'].create({
+            'move_type': 'entry',
+            'date': '2024-01-01',
+            'line_ids': [
+                (0, 0, {'debit': 10.0,      'credit': 0.0,      'account_id': account.id,   'partner_id': self.partner_a.id}),
+                (0, 0, {'debit': 20.0,      'credit': 0.0,      'account_id': account.id,   'partner_id': self.partner_b.id}),
+                (0, 0, {'debit':  0.0,     'credit': 30.0,      'account_id': account.id}),
+            ],
+        })
+        move.action_post()
+
+        report = self._create_report([
+            self._prepare_test_report_line(
+                self._prepare_test_expression_domain([('account_id', '=', account.id)], 'sum'),
+                code='report_line',
+            ),
+        ], country_id=self.fake_country.id)
+
+        horizontal_group = self.env['account.report.horizontal.group'].create({
+            'name': 'Horizontal Group',
+            'report_ids': report.ids,
+            'rule_ids': [
+                Command.create({
+                    'field_name': 'partner_id',
+                    'domain': f"[('id', 'in', {(self.partner_a + self.partner_b).ids})]",
+                }),
+            ],
+        })
+
+        main_options = self._generate_options(report, '2024-01-01', '2024-01-01', default_options={'selected_horizontal_group_id': horizontal_group.id})
+        lines = report._get_lines(main_options)
+        for (col_group_key, col_group_options), expected_partner in zip(report._split_options_per_column_group(main_options).items(), [self.partner_a, self.partner_b]):
+            audit_params = self._get_audit_params_from_report_line(col_group_options, report.line_ids, lines[0], column_group_key=col_group_key)
+            action_dict = report.action_audit_cell(col_group_options, audit_params)
+
+            expected_amls = move.line_ids.filtered(lambda x: x.partner_id == expected_partner)
+            audit_result_amls = move.line_ids.filtered_domain(action_dict['domain'])
+            self.assertEqual(audit_result_amls, expected_amls, f"Wrong audit result for partner {expected_partner.name}: {audit_result_amls}")
+
+    def test_account_codes_load_more_limit_groupby(self):
+        """ The account_codes engine performs an additional groupby in its SQL query. This tests makes sure this does not break the behavior
+        of the load_more_limit when grouping.
+        """
+        partner_a, partner_b, partner_c = self.env['res.partner'].create([
+            {'name': 'Partner A'},
+            {'name': 'Partner B'},
+            {'name': 'Partner C'},
+        ])
+
+        report = self._create_report(
+            [
+                self._prepare_test_report_line(
+                    self._prepare_test_expression_account_codes('1'),
+                    groupby='partner_id',
+                ),
+            ],
+            load_more_limit=2,
+        )
+
+        move = self._create_test_account_moves([
+            self._prepare_test_account_move_line(10, account_code='11', partner_id=partner_a.id),
+            self._prepare_test_account_move_line(20, account_code='11', partner_id=partner_a.id),
+            self._prepare_test_account_move_line(25, account_code='12', partner_id=partner_a.id),
+            self._prepare_test_account_move_line(30, account_code='11'),
+            self._prepare_test_account_move_line(40, account_code='11'),
+            self._prepare_test_account_move_line(50, account_code='12', partner_id=partner_b.id),
+            self._prepare_test_account_move_line(60, account_code='13', partner_id=partner_c.id),
+            self._prepare_test_account_move_line(-210, account_code='2'),
+        ])
+
+        options = self._generate_options(report, '2020-01-01', '2020-01-01', default_options={'unfold_all': True})
+
+        self.assertLinesValues(
+            # pylint: disable=bad-whitespace
+            report._get_lines(options),
+            [   0,                               1],
+            [
+                ('test_line_1',              235.0),
+                ('Partner A',                 55.0),
+                ('Partner B',                 50.0),
+                ('Load more...',                ''),
+            ],
+            options,
+        )
+
+    def test_account_name_added_in_account_code_grouping(self):
+        company_a = self.env['res.company'].sudo().create({
+            'name': "Company A",
+        })
+        company_b = self.env['res.company'].sudo().create({
+            'name': "Company B",
+        })
+        context = {
+            **self.env.context,
+            'allowed_company_ids': [company_a.id, company_b.id],
+        }
+        journal_vals = {
+            'name': "Misc",
+            'type': 'general',
+            'code': "MSC",
+        }
+        AccountJournal = self.env['account.journal'].with_context(context)
+        AccountJournal.create(journal_vals | {'company_id': company_a.id})
+        AccountJournal.with_company(company_b).create(journal_vals | {'company_id': company_b.id})
+
+        AccountAccount = self.env['account.account'].with_context(context)
+        account_a = AccountAccount.create({
+            'name': "Account A",
+            'code': "100000",
+            'company_ids': company_a.ids,
+        })
+        counterpart_account_a = AccountAccount.create({
+            'name': "Some account",
+            'code': "200000",
+            'company_ids': company_a.ids,
+        })
+        account_b1 = AccountAccount.create({
+            'name': "Mapping to Account A code",
+            'code': "300000",
+            'company_ids': company_b.ids,
+        })
+        account_b2 = AccountAccount.create({
+            'name': "Mapping to a code that doesn't exist in company A",
+            'code': "400000",
+            'company_ids': company_b.ids,
+        })
+        account_b3 = AccountAccount.create({
+            'name': "No mapping in company A",
+            'code': "500000",
+            'company_ids': company_b.ids,
+        })
+
+        account_b1.code = account_a.code
+        account_b2.code = "600000"
+
+        date = '2025-01-01'
+
+        AccountMove = self.env['account.move'].with_context(context)
+        AccountMove.create({
+            'move_type': 'entry',
+            'date': date,
+            'line_ids': [
+                Command.create({
+                    'account_id': account_a.id,
+                    'balance': 20,
+                }),
+                Command.create({
+                    'account_id': counterpart_account_a.id,
+                    'balance': -20,
+                }),
+            ],
+            'company_id': company_a.id,
+        }).action_post()
+        AccountMove.create({
+            'move_type': 'entry',
+            'date': date,
+            'line_ids': [
+                Command.create({
+                    'account_id': account_b1.id,
+                    'balance': 30,
+                }),
+                Command.create({
+                    'account_id': account_b2.id,
+                    'balance': 70,
+                }),
+                Command.create({
+                    'account_id': account_b3.id,
+                    'balance': -100,
+                }),
+            ],
+            'company_id': company_b.id,
+        }).action_post()
+
+        report = self.env['account.report'].with_context(context).create({
+            'name': "Simple Report",
+            'filter_multi_company': 'selector',
+            'column_ids': [Command.create({
+                'name': "Balance",
+                'expression_label': 'balance',
+            })],
+            'line_ids': [Command.create({
+                'name': "The line",
+                'groupby': 'account_code',
+                'expression_ids': [Command.create({
+                    'label': 'balance',
+                    'engine': 'domain',
+                    'formula': [],
+                    'subformula': 'sum',
+                })],
+            })],
+        })
+        options = self._generate_options(report, date, date)
+        lines = report._get_lines(options)
+
+        self.assertLinesValues(
+            # pylint: disable=bad-whitespace
+            lines,
+            [   0,                                                                       1],
+            [
+                (report.line_ids.name,                                                   0),
+                (f'{account_a.code} {account_a.name}',                                  50),
+                (f'{counterpart_account_a.code} {counterpart_account_a.name}',         -20),
+                (account_b2.code,                                                       70),
+                ('Undefined',                                                         -100),
+            ],
+            options,
+        )
diff --git a/dev_odex30_accounting/odex30_account_reports/tests/test_report_sections.py b/dev_odex30_accounting/odex30_account_reports/tests/test_report_sections.py
new file mode 100644
index 0000000..74b6064
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_reports/tests/test_report_sections.py
@@ -0,0 +1,148 @@
+# -*- coding: utf-8 -*-
+# pylint: disable=C0326
+
+from freezegun import freeze_time
+from unittest.mock import patch
+
+from odoo.addons.account.tests.common import AccountTestInvoicingHttpCommon
+
+from odoo import Command
+from odoo.tests import tagged
+
+
+@tagged('post_install', '-at_install')
+class TestReportSections(AccountTestInvoicingHttpCommon):
+
+    @classmethod
+    def setUpClass(cls):
+        super().setUpClass()
+
+        cls.section_1 = cls.env['account.report'].create({
+            'name': "Section 1",
+            'filter_journals': True,
+            'column_ids': [
+                Command.create({
+                    'name': "Column 1",
+                    'expression_label': 'col1',
+                }),
+            ],
+            'line_ids': [
+                Command.create({
+                    'name': 'Section 1 line',
+                    'expression_ids': [
+                        Command.create({
+                            'label': 'col1',
+                            'engine': 'tax_tags',
+                            'formula': 'tag1_1',
+                        }),
+                    ],
+                }),
+            ],
+        })
+
+        cls.section_2 = cls.env['account.report'].create({
+            'name': "Section 2",
+            'filter_period_comparison': True,
+            'column_ids': [
+                Command.create({
+                    'name': "Column 1",
+                    'expression_label': 'col1',
+                }),
+
+                Command.create({
+                    'name': "Column 2",
+                    'expression_label': 'col2',
+                }),
+            ],
+            'line_ids': [
+                Command.create({
+                    'name': 'Section 2 line',
+                    'expression_ids': [
+                        Command.create({
+                            'label': 'col1',
+                            'engine': 'tax_tags',
+                            'formula': 'tag2_1',
+                        }),
+
+                        Command.create({
+                            'label': 'col2',
+                            'engine': 'tax_tags',
+                            'formula': 'tag2_2',
+                        })
+                    ],
+                }),
+            ],
+        })
+
+        cls.composite_report = cls.env['account.report'].create({
+            'name': "Test Sections",
+            'section_report_ids': [Command.set((cls.section_1 + cls.section_2).ids)],
+        })
+
+    def test_sections_options_report_selection_variant(self):
+        generic_tax_report = self.env.ref('account.generic_tax_report')
+        self.composite_report.root_report_id = generic_tax_report
+
+        # Open root report
+        options = generic_tax_report.get_options({})
+        self.assertEqual(options['variants_source_id'], generic_tax_report.id, "The root report should be the variants source.")
+        self.assertEqual(options['sections_source_id'], generic_tax_report.id, "No variant is selected; the root report should be chosen.")
+        self.assertEqual(options['selected_variant_id'], generic_tax_report.id, "No variant is selected; the root report should be chosen.")
+        self.assertEqual(options['report_id'], generic_tax_report.id, "No variant is selected; the root report should be chosen.")
+
+        # Select the variant
+        options = generic_tax_report.get_options({**options, 'selected_variant_id': self.composite_report.id})
+        self.assertEqual(options['variants_source_id'], generic_tax_report.id, "The root report should be the variants source.")
+        self.assertEqual(options['sections_source_id'], self.composite_report.id, "The selected variant should be the sections source.")
+        self.assertEqual(options['selected_section_id'], self.section_1.id, "Selecting the composite variant should select its first section.")
+        self.assertEqual(options['report_id'], self.section_1.id, "Selecting the composite variant should open its first section.")
+
+        # Select the section
+        options = generic_tax_report.get_options({**options, 'selected_section_id': self.section_2.id})
+        self.assertEqual(options['variants_source_id'], generic_tax_report.id, "The root report should be the variants source.")
+        self.assertEqual(options['sections_source_id'], self.composite_report.id, "The selected variant should be the sections source.")
+        self.assertEqual(options['selected_section_id'], self.section_2.id, "Section 2 should be selected.")
+        self.assertEqual(options['report_id'], self.section_2.id, "Selecting the second section from the first one should open it.")
+
+    def test_sections_options_report_selection_root(self):
+        # Open the report
+        options = self.composite_report.get_options({})
+        self.assertEqual(options['variants_source_id'], self.composite_report.id, "The root report should be the variants source.")
+        self.assertEqual(options['sections_source_id'], self.composite_report.id, "The root report should be the sections source.")
+        self.assertEqual(options['selected_section_id'], self.section_1.id, "Opening the composite report should select its first section.")
+        self.assertEqual(options['report_id'], self.section_1.id, "Opening the composite report should open its first section.")
+
+        # Select the section
+        options = self.composite_report.get_options({**options, 'selected_section_id': self.section_2.id})
+        self.assertEqual(options['variants_source_id'], self.composite_report.id, "The root report should be the variants source.")
+        self.assertEqual(options['sections_source_id'], self.composite_report.id, "The root report should be the sections source.")
+        self.assertEqual(options['selected_section_id'], self.section_2.id, "Section 2 should be selected.")
+        self.assertEqual(options['report_id'], self.section_2.id, "Selecting the second section from the first one should open it.")
+
+    def test_sections_tour(self):
+        def patched_init_options_custom(report, options, previous_options):
+            # Emulates a custom handler modifying the export buttons
+            if report == self.composite_report:
+                options['buttons'][0]['name'] = 'composite_report_custom_button'
+
+        # Setup the reports
+        generic_tax_report = self.env.ref('account.generic_tax_report')
+        self.composite_report.root_report_id = generic_tax_report
+        self.section_1.root_report_id = generic_tax_report # First section is a variant of the root report, to increase test coverage
+        # Rewriting the root report recomputes filter_journal ; re-enable it
+        self.section_1.filter_journals = True
+
+        with patch.object(type(self.env['account.report']), '_init_options_custom', patched_init_options_custom):
+            self.start_tour("/odoo", 'account_reports_sections', login=self.env.user.login)
+
+    def test_exported_xlsx_unique_names(self):
+        composite_report = self.env['account.report'].create({
+            'name': "Composite",
+        })
+        for i in range(1, 13):
+            self.env['account.report'].create({
+                'name': "Comprehensive Monthly Analysis Report Q%d" % i,
+                'section_main_report_ids': [Command.set([composite_report.id])],
+            })
+
+        composite_report.export_to_xlsx(composite_report.get_options({}))
diff --git a/dev_odex30_accounting/odex30_account_reports/tests/test_tax_report.py b/dev_odex30_accounting/odex30_account_reports/tests/test_tax_report.py
new file mode 100644
index 0000000..909a36d
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_reports/tests/test_tax_report.py
@@ -0,0 +1,3174 @@
+# -*- coding: utf-8 -*-
+# pylint: disable=bad-whitespace
+from datetime import date
+from unittest.mock import patch
+from freezegun import freeze_time
+
+from .common import TestAccountReportsCommon
+from odoo import fields, Command
+from odoo.tests import Form, tagged
+from odoo.exceptions import UserError
+
+
+@tagged('post_install', '-at_install')
+class TestTaxReport(TestAccountReportsCommon):
+
+    @classmethod
+    def setUpClass(cls):
+        super().setUpClass()
+
+        # Create country data
+
+        cls.fiscal_country = cls.env['res.country'].create({
+            'name': "Discworld",
+            'code': 'DW',
+        })
+
+        cls.country_state_1 = cls.env['res.country.state'].create({
+            'name': "Ankh Morpork",
+            'code': "AM",
+            'country_id': cls.fiscal_country.id,
+        })
+
+        cls.country_state_2 = cls.env['res.country.state'].create({
+            'name': "Counterweight Continent",
+            'code': "CC",
+            'country_id': cls.fiscal_country.id,
+        })
+
+        cls.foreign_country = cls.env['res.country'].create({
+            'name': "The Principality of Zeon",
+            'code': 'PZ',
+        })
+
+        # Setup fiscal data
+        cls.company_data['company'].write({
+            'state_id': cls. country_state_1.id, # Not necessary at the moment; put there for consistency and robustness with possible future changes
+            'account_tax_periodicity': 'trimester',
+        })
+        cls.change_company_country(cls.company_data['company'], cls.fiscal_country)
+
+        # Prepare tax groups
+        cls.tax_group_1 = cls._instantiate_basic_test_tax_group()
+        cls.tax_group_2 = cls._instantiate_basic_test_tax_group()
+        cls.tax_group_3 = cls._instantiate_basic_test_tax_group(country=cls.foreign_country)
+
+        # Prepare tax accounts
+        cls.tax_account_1 = cls.env['account.account'].create({
+            'name': 'Tax Account',
+            'code': '250000',
+            'account_type': 'liability_current',
+        })
+
+        cls.tax_account_2 = cls.env['account.account'].create({
+            'name': 'Tax Account',
+            'code': '250001',
+            'account_type': 'liability_current',
+        })
+
+        # ==== Sale taxes: group of two taxes having type_tax_use = 'sale' ====
+        cls.sale_tax_percentage_incl_1 = cls.env['account.tax'].create({
+            'name': 'sale_tax_percentage_incl_1',
+            'amount': 20.0,
+            'amount_type': 'percent',
+            'type_tax_use': 'sale',
+            'price_include_override': 'tax_included',
+            'tax_group_id': cls.tax_group_1.id,
+        })
+
+        cls.sale_tax_percentage_excl = cls.env['account.tax'].create({
+            'name': 'sale_tax_percentage_excl',
+            'amount': 10.0,
+            'amount_type': 'percent',
+            'type_tax_use': 'sale',
+            'tax_group_id': cls.tax_group_1.id,
+        })
+
+        cls.sale_tax_group = cls.env['account.tax'].create({
+            'name': 'sale_tax_group',
+            'amount_type': 'group',
+            'type_tax_use': 'sale',
+            'children_tax_ids': [Command.set((cls.sale_tax_percentage_incl_1 + cls.sale_tax_percentage_excl).ids)],
+        })
+
+        cls.move_sale = cls.env['account.move'].create({
+            'move_type': 'entry',
+            'date': '2016-01-01',
+            'journal_id': cls.company_data['default_journal_sale'].id,
+            'line_ids': [
+                Command.create({
+                    'debit': 1320.0,
+                    'credit': 0.0,
+                    'account_id': cls.company_data['default_account_receivable'].id,
+                }),
+                Command.create({
+                    'debit': 0.0,
+                    'credit': 120.0,
+                    'account_id': cls.tax_account_1.id,
+                    'tax_repartition_line_id': cls.sale_tax_percentage_excl.invoice_repartition_line_ids.filtered(lambda x: x.repartition_type == 'tax').id,
+                }),
+                Command.create({
+                    'debit': 0.0,
+                    'credit': 200.0,
+                    'account_id': cls.tax_account_1.id,
+                    'tax_repartition_line_id': cls.sale_tax_percentage_incl_1.invoice_repartition_line_ids.filtered(lambda x: x.repartition_type == 'tax').id,
+                    'tax_ids': [Command.set(cls.sale_tax_percentage_excl.ids)]
+                }),
+                Command.create({
+                    'debit': 0.0,
+                    'credit': 1000.0,
+                    'account_id': cls.company_data['default_account_revenue'].id,
+                    'tax_ids': [Command.set(cls.sale_tax_group.ids)]
+                }),
+            ],
+        })
+        cls.move_sale.action_post()
+
+        # ==== Purchase taxes: group of taxes having type_tax_use = 'none' ====
+
+        cls.none_tax_percentage_incl_2 = cls.env['account.tax'].create({
+            'name': 'none_tax_percentage_incl_2',
+            'amount': 20.0,
+            'amount_type': 'percent',
+            'type_tax_use': 'none',
+            'price_include_override': 'tax_included',
+            'tax_group_id': cls.tax_group_2.id,
+        })
+
+        cls.none_tax_percentage_excl = cls.env['account.tax'].create({
+            'name': 'none_tax_percentage_excl',
+            'amount': 30.0,
+            'amount_type': 'percent',
+            'type_tax_use': 'none',
+            'tax_group_id': cls.tax_group_2.id,
+        })
+
+        cls.purchase_tax_group = cls.env['account.tax'].create({
+            'name': 'purchase_tax_group',
+            'amount_type': 'group',
+            'type_tax_use': 'purchase',
+            'children_tax_ids': [Command.set((cls.none_tax_percentage_incl_2 + cls.none_tax_percentage_excl).ids)],
+        })
+
+        cls.move_purchase = cls.env['account.move'].create({
+            'move_type': 'entry',
+            'date': '2016-01-01',
+            'journal_id': cls.company_data['default_journal_purchase'].id,
+            'line_ids': [
+                Command.create({
+                    'debit': 0.0,
+                    'credit': 3120.0,
+                    'account_id': cls.company_data['default_account_payable'].id,
+                }),
+                Command.create({
+                    'debit': 720.0,
+                    'credit': 0.0,
+                    'account_id': cls.tax_account_1.id,
+                    'tax_repartition_line_id': cls.none_tax_percentage_excl.invoice_repartition_line_ids.filtered(lambda x: x.repartition_type == 'tax').id,
+                }),
+                Command.create({
+                    'debit': 400.0,
+                    'credit': 0.0,
+                    'account_id': cls.tax_account_1.id,
+                    'tax_repartition_line_id': cls.none_tax_percentage_incl_2.invoice_repartition_line_ids.filtered(lambda x: x.repartition_type == 'tax').id,
+                    'tax_ids': [Command.set(cls.none_tax_percentage_excl.ids)]
+                }),
+                Command.create({
+                    'debit': 2000.0,
+                    'credit': 0.0,
+                    'account_id': cls.company_data['default_account_expense'].id,
+                    'tax_ids': [Command.set(cls.purchase_tax_group.ids)]
+                }),
+            ],
+        })
+        cls.move_purchase.action_post()
+
+        #Instantiate test data for fiscal_position option of the tax report (both for checking the report and VAT closing)
+
+        # Create a foreign partner
+        cls.test_fpos_foreign_partner = cls.env['res.partner'].create({
+            'name': "Mare Cel",
+            'country_id': cls.fiscal_country.id,
+            'state_id': cls.country_state_2.id,
+        })
+
+        # Create a tax report and some taxes for it
+        cls.basic_tax_report = cls.env['account.report'].create({
+            'name': "The Unseen Tax Report",
+            'country_id': cls.fiscal_country.id,
+            'root_report_id': cls.env.ref("account.generic_tax_report").id,
+            'column_ids': [Command.create({'name': 'balance', 'sequence': 1, 'expression_label': 'balance',})],
+        })
+
+        cls.test_fpos_tax_sale = cls._add_basic_tax_for_report(
+            cls.basic_tax_report, 50, 'sale', cls.tax_group_1,
+            [(30, cls.tax_account_1, False), (70, cls.tax_account_1, True), (-100, cls.tax_account_2, True)]
+        )
+
+        cls.test_fpos_tax_purchase = cls._add_basic_tax_for_report(
+            cls.basic_tax_report, 50, 'purchase', cls.tax_group_2,
+            [(40, cls.tax_account_1, False), (60, cls.tax_account_1, True), (-100, cls.tax_account_2, True)]
+        )
+
+        # Create a fiscal_position to automatically map the default tax for partner "Mare Cel" to our test tax
+        cls.foreign_vat_fpos = cls.env['account.fiscal.position'].create({
+            'name': "Test fpos",
+            'auto_apply': True,
+            'country_id': cls.fiscal_country.id,
+            'state_ids': cls.country_state_2.ids,
+            'foreign_vat': '12345',
+        })
+
+        # Create some domestic invoices (not all in the same closing period)
+        cls.init_invoice('out_invoice', partner=cls.partner_a, invoice_date='2020-12-22', post=True, amounts=[28000], taxes=cls.test_fpos_tax_sale)
+        cls.init_invoice('out_invoice', partner=cls.partner_a, invoice_date='2021-01-22', post=True, amounts=[200], taxes=cls.test_fpos_tax_sale)
+        cls.init_invoice('out_refund', partner=cls.partner_a, invoice_date='2021-01-12', post=True, amounts=[20], taxes=cls.test_fpos_tax_sale)
+        cls.init_invoice('in_invoice', partner=cls.partner_a, invoice_date='2021-03-12', post=True, amounts=[400], taxes=cls.test_fpos_tax_purchase)
+        cls.init_invoice('in_refund', partner=cls.partner_a, invoice_date='2021-03-20', post=True, amounts=[60], taxes=cls.test_fpos_tax_purchase)
+        cls.init_invoice('in_invoice', partner=cls.partner_a, invoice_date='2021-04-07', post=True, amounts=[42000], taxes=cls.test_fpos_tax_purchase)
+
+        # Create some foreign invoices (not all in the same closing period)
+        cls.init_invoice('out_invoice', partner=cls.test_fpos_foreign_partner, invoice_date='2020-12-13', post=True, amounts=[26000], taxes=cls.test_fpos_tax_sale)
+        cls.init_invoice('out_invoice', partner=cls.test_fpos_foreign_partner, invoice_date='2021-01-16', post=True, amounts=[800], taxes=cls.test_fpos_tax_sale)
+        cls.init_invoice('out_refund', partner=cls.test_fpos_foreign_partner, invoice_date='2021-01-30', post=True, amounts=[200], taxes=cls.test_fpos_tax_sale)
+        cls.init_invoice('in_invoice', partner=cls.test_fpos_foreign_partner, invoice_date='2021-02-01', post=True, amounts=[1000], taxes=cls.test_fpos_tax_purchase)
+        cls.init_invoice('in_refund', partner=cls.test_fpos_foreign_partner, invoice_date='2021-03-02', post=True, amounts=[600], taxes=cls.test_fpos_tax_purchase)
+        cls.init_invoice('in_refund', partner=cls.test_fpos_foreign_partner, invoice_date='2021-05-02', post=True, amounts=[10000], taxes=cls.test_fpos_tax_purchase)
+
+    @classmethod
+    def _instantiate_basic_test_tax_group(cls, company=None, country=None):
+        company = company or cls.env.company
+        vals = {
+            'name': 'Test tax group',
+            'company_id': company.id,
+            'tax_receivable_account_id': cls.company_data['default_tax_account_receivable'].sudo().copy({'company_ids': company.ids}).id,
+            'tax_payable_account_id': cls.company_data['default_tax_account_payable'].sudo().copy({'company_ids': company.ids}).id,
+        }
+        if country:
+            vals['country_id'] = country.id
+        return cls.env['account.tax.group'].sudo().create(vals)
+
+    @classmethod
+    def _add_basic_tax_for_report(cls, tax_report, percentage, type_tax_use, tax_group, tax_repartition, company=None):
+        """ Creates a basic test tax, as well as tax report lines and tags, connecting them all together.
+
+        A tax report line will be created within tax report for each of the elements in tax_repartition,
+        for both invoice and refund, so that the resulting repartition lines each reference their corresponding
+        report line. Negative tags will be assign for refund lines; postive tags for invoice ones.
+
+        :param tax_report: The report to create lines for.
+        :param percentage: The created tax has amoun_type='percent'. This parameter contains its amount.
+        :param type_tax_use: type_tax_use of the tax to create
+        :param tax_repartition: List of tuples in the form [(factor_percent, account, use_in_tax_closing)], one tuple
+                                for each tax repartition line to create (base lines will be automatically created).
+        """
+        tax = cls.env['account.tax'].create({
+            'name': f"{type_tax_use} - {percentage} - {tax_report.name}",
+            'amount': percentage,
+            'amount_type': 'percent',
+            'type_tax_use': type_tax_use,
+            'tax_group_id': tax_group.id,
+            'country_id': tax_report.country_id.id,
+            'company_id': company.id if company else cls.env.company.id,
+        })
+
+        to_write = {}
+        for move_type_suffix in ('invoice', 'refund'):
+            sign = "-" if move_type_suffix == 'refund' else "+"
+            report_line_sequence = tax_report.line_ids[-1].sequence + 1 if tax_report.line_ids else 0
+
+
+            # Create a report line for the base
+            base_report_line_name = f"{tax.id}-{move_type_suffix}-base"
+            base_report_line = cls._create_tax_report_line(base_report_line_name, tax_report, tag_name=base_report_line_name, sequence=report_line_sequence)
+            report_line_sequence += 1
+
+            base_tag = base_report_line.expression_ids._get_matching_tags(sign)
+
+            repartition_vals = [
+                Command.clear(),
+                Command.create({'repartition_type': 'base', 'tag_ids': base_tag.ids}),
+            ]
+
+            for (factor_percent, account, use_in_tax_closing) in tax_repartition:
+                # Create a report line for the repartition line
+                tax_report_line_name = f"{tax.id}-{move_type_suffix}-{factor_percent}"
+                tax_report_line = cls._create_tax_report_line(tax_report_line_name, tax_report, tag_name=tax_report_line_name, sequence=report_line_sequence)
+                report_line_sequence += 1
+
+                tax_tag = tax_report_line.expression_ids._get_matching_tags(sign)
+
+                repartition_vals.append(Command.create({
+                    'account_id': account.id if account else None,
+                    'factor_percent': factor_percent,
+                    'use_in_tax_closing': use_in_tax_closing,
+                    'tag_ids': tax_tag.ids,
+                }))
+
+            to_write[f"{move_type_suffix}_repartition_line_ids"] = repartition_vals
+
+        tax.write(to_write)
+
+        return tax
+
+    def _assert_vat_closing(self, report, options, closing_vals_by_fpos):
+        """ Checks the result of the VAT closing
+
+        :param options: the tax report options to make the closing for
+        :param closing_vals_by_fpos: A list of dict(fiscal_position: [dict(line_vals)], where fiscal_position is (possibly empty)
+                                     account.fiscal.position record, and line_vals, the expected values for each closing move lines.
+                                     In case the option 'companies' contains more than 1 company, a tuple (company, fiscal_position)
+                                     replaces the fiscal_position key
+        """
+        with patch.object(type(self.env['account.move']), '_get_vat_report_attachments', autospec=True, side_effect=lambda *args, **kwargs: []):
+            vat_closing_moves = self.env['account.generic.tax.report.handler']._generate_tax_closing_entries(report, options)
+
+            if len(options['companies']) > 1:
+                closing_moves_by_fpos = {(move.company_id, move.fiscal_position_id): move for move in vat_closing_moves}
+            else:
+                closing_moves_by_fpos = {move.fiscal_position_id: move for move in vat_closing_moves}
+
+            for key, closing_vals in closing_vals_by_fpos.items():
+                vat_closing_move = closing_moves_by_fpos[key]
+                self.assertRecordValues(vat_closing_move.line_ids, closing_vals)
+            self.assertEqual(len(closing_vals_by_fpos), len(vat_closing_moves), "Exactly one move should have been generated per fiscal position; nothing else.")
+
+    def test_vat_closing_single_fpos(self):
+        """ Tests the VAT closing when a foreign VAT fiscal position is selected on the tax report
+        """
+        options = self._generate_options(
+            self.basic_tax_report, fields.Date.from_string('2021-01-15'), fields.Date.from_string('2021-02-01'),
+            {'fiscal_position': self.foreign_vat_fpos.id}
+        )
+
+        self._assert_vat_closing(self.basic_tax_report, options, {
+            self.foreign_vat_fpos: [
+                # sales: 800 * 0.5 * 0.7 - 200 * 0.5 * 0.7
+                {'debit': 210,      'credit': 0.0,      'account_id': self.tax_account_1.id},
+                # sales: 800 * 0.5 * -1 - 200 * 0.5 * -1
+                {'debit': 0,        'credit': 300,      'account_id': self.tax_account_2.id},
+                # purchases: 1000 * 0.5 * 0.6 - 600 * 0.5 * 0.6
+                {'debit': 0,        'credit': 120,      'account_id': self.tax_account_1.id},
+                # purchases: 1000 * 0.5 * -1 - 600 * 0.5 * -1
+                {'debit': 200,      'credit': 0,        'account_id': self.tax_account_2.id},
+                # For sales operations
+                {'debit': 90,       'credit': 0,        'account_id': self.tax_group_1.tax_receivable_account_id.id},
+                # For purchase operations
+                {'debit': 0,        'credit': 80,       'account_id': self.tax_group_2.tax_payable_account_id.id},
+            ]
+        })
+
+    def test_vat_closing_moves_with_lock_date(self):
+        """
+        Check that we are still able to create a tax closing event if the lock date is set as the closing move
+        is not dependent of the lock date.
+        This also ensures that if we try to close again this period with a move already posted we get the same
+        """
+        self.env.company.tax_lock_date = fields.Date.from_string('2021-12-31')
+
+        options = self._generate_options(
+            self.basic_tax_report, '2021-01-15', '2021-02-01',
+            {'fiscal_position': 'domestic'}
+        )
+
+        action = self.env['account.tax.report.handler'].with_context({'override_tax_closing_warning': True}).action_periodic_vat_entries(options)
+        move = self.env['account.move'].browse(action['res_id'])
+        with patch.object(self.registry['account.move'], '_get_vat_report_attachments', autospec=True, side_effect=lambda *args, **kwargs: []):
+            move.action_post()
+
+        action = self.env['account.tax.report.handler'].with_context({'override_tax_closing_warning': True}).action_periodic_vat_entries(options)
+        same_move = self.env['account.move'].browse(action['res_id'])
+        self.assertEqual(move.id, same_move.id)
+
+    def test_vat_closing_domestic(self):
+        """ Tests the VAT closing when a foreign VAT fiscal position is selected on the tax report
+        """
+        options = self._generate_options(
+            self.basic_tax_report, fields.Date.from_string('2021-01-15'), fields.Date.from_string('2021-02-01'),
+            {'fiscal_position': 'domestic'}
+        )
+
+        self._assert_vat_closing(self.basic_tax_report, options, {
+            self.env['account.fiscal.position']: [
+                # sales: 200 * 0.5 * 0.7 - 20 * 0.5 * 0.7
+                {'debit': 63,       'credit': 0.0,      'account_id': self.tax_account_1.id},
+                # sales: 200 * 0.5 * -1 - 20 * 0.5 * -1
+                {'debit': 0,        'credit': 90,       'account_id': self.tax_account_2.id},
+                # purchases: 400 * 0.5 * 0.6 - 60 * 0.5 * 0.6
+                {'debit': 0,        'credit': 102,      'account_id': self.tax_account_1.id},
+                # purchases: 400 * 0.5 * - 60 * 0.5
+                {'debit': 170,      'credit': 0,        'account_id': self.tax_account_2.id},
+                # For sales operations
+                {'debit': 27,       'credit': 0,        'account_id': self.tax_group_1.tax_receivable_account_id.id},
+                # For purchase operations
+                {'debit': 0,        'credit': 68,       'account_id': self.tax_group_2.tax_payable_account_id.id},
+            ]
+        })
+
+    def test_vat_closing_everything(self):
+        """ Tests the VAT closing when the option to show all foreign VAT fiscal positions is activated.
+        One closing move should then be generated per fiscal position.
+        """
+        options = self._generate_options(
+            self.basic_tax_report, fields.Date.from_string('2021-01-15'), fields.Date.from_string('2021-02-01'),
+            {'fiscal_position': 'all'}
+        )
+
+        self._assert_vat_closing(self.basic_tax_report, options, {
+            # From test_vat_closing_domestic
+            self.env['account.fiscal.position']: [
+                # sales: 200 * 0.5 * 0.7 - 20 * 0.5 * 0.7
+                {'debit': 63,       'credit': 0.0,      'account_id': self.tax_account_1.id},
+                # sales: 200 * 0.5 * -1 - 20 * 0.5 * -1
+                {'debit': 0,        'credit': 90,       'account_id': self.tax_account_2.id},
+                # purchases: 400 * 0.5 * 0.6 - 60 * 0.5 * 0.6
+                {'debit': 0,        'credit': 102,      'account_id': self.tax_account_1.id},
+                # purchases: 400 * 0.5 * -1 - 60 * 0.5 * -1
+                {'debit': 170,      'credit': 0,        'account_id': self.tax_account_2.id},
+                # For sales operations
+                {'debit': 27,       'credit': 0,        'account_id': self.tax_group_1.tax_receivable_account_id.id},
+                # For purchase operations
+                {'debit': 0,        'credit': 68,       'account_id': self.tax_group_2.tax_payable_account_id.id},
+            ],
+
+            # From test_vat_closing_single_fpos
+            self.foreign_vat_fpos: [
+                # sales: 800 * 0.5 * 0.7 - 200 * 0.5 * 0.7
+                {'debit': 210,      'credit': 0.0,      'account_id': self.tax_account_1.id},
+                # sales: 800 * 0.5 * -1 - 200 * 0.5 * -1
+                {'debit': 0,        'credit': 300,      'account_id': self.tax_account_2.id},
+                # purchases: 1000 * 0.5 * 0.6 - 600 * 0.5 * 0.6
+                {'debit': 0,        'credit': 120,      'account_id': self.tax_account_1.id},
+                # purchases: 1000 * 0.5 * -1 - 600 * 0.5 * -1
+                {'debit': 200,      'credit': 0,        'account_id': self.tax_account_2.id},
+                # For sales operations
+                {'debit': 90,       'credit': 0,        'account_id': self.tax_group_1.tax_receivable_account_id.id},
+                # For purchase operations
+                {'debit': 0,        'credit': 80,       'account_id': self.tax_group_2.tax_payable_account_id.id},
+            ],
+        })
+
+    def test_vat_closing_generic(self):
+        """ VAT closing for the generic report should create one closing move per fiscal position + a domestic one.
+        One closing move should then be generated per fiscal position.
+        """
+        for generic_report_xml_id in ('account.generic_tax_report', 'account.generic_tax_report_account_tax', 'account.generic_tax_report_tax_account'):
+            generic_report = self.env.ref(generic_report_xml_id)
+            options = self._generate_options(generic_report, fields.Date.from_string('2021-01-15'), fields.Date.from_string('2021-02-01'))
+
+            self._assert_vat_closing(generic_report, options, {
+                # From test_vat_closing_domestic
+                self.env['account.fiscal.position']: [
+                    # sales: 200 * 0.5 * 0.7 - 20 * 0.5 * 0.7
+                    {'debit': 63,       'credit': 0.0,      'account_id': self.tax_account_1.id},
+                    # sales: 200 * 0.5 * -1 - 20 * 0.5 * -1
+                    {'debit': 0,        'credit': 90,       'account_id': self.tax_account_2.id},
+                    # purchases: 400 * 0.5 * 0.6 - 60 * 0.5 * 0.6
+                    {'debit': 0,        'credit': 102,      'account_id': self.tax_account_1.id},
+                    # purchases: 400 * 0.5 * -1 - 60 * 0.5 * -1
+                    {'debit': 170,      'credit': 0,        'account_id': self.tax_account_2.id},
+                    # For sales operations
+                    {'debit': 27,       'credit': 0,        'account_id': self.tax_group_1.tax_receivable_account_id.id},
+                    # For purchase operations
+                    {'debit': 0,        'credit': 68,       'account_id': self.tax_group_2.tax_payable_account_id.id},
+                ],
+
+                # From test_vat_closing_single_fpos
+                self.foreign_vat_fpos: [
+                    # sales: 800 * 0.5 * 0.7 - 200 * 0.5 * 0.7
+                    {'debit': 210,      'credit': 0.0,      'account_id': self.tax_account_1.id},
+                    # sales: 800 * 0.5 * -1 - 200 * 0.5 * -1
+                    {'debit': 0,        'credit': 300,      'account_id': self.tax_account_2.id},
+                    # purchases: 1000 * 0.5 * 0.6 - 600 * 0.5 * 0.6
+                    {'debit': 0,        'credit': 120,      'account_id': self.tax_account_1.id},
+                    # purchases: 1000 * 0.5 * -1 - 600 * 0.5 * -1
+                    {'debit': 200,      'credit': 0,        'account_id': self.tax_account_2.id},
+                    # For sales operations
+                    {'debit': 90,       'credit': 0,        'account_id': self.tax_group_1.tax_receivable_account_id.id},
+                    # For purchase operations
+                    {'debit': 0,        'credit': 80,       'account_id': self.tax_group_2.tax_payable_account_id.id},
+                ],
+            })
+
+    def test_vat_closing_button_availability(self):
+        def assertTaxClosingAvailable(is_enabled, active_companies, export_main_company=None):
+            options = tax_report.with_context(allowed_company_ids=active_companies.ids).get_options({})
+            closing_button_dict = next(filter(lambda x: x['action'] == 'action_periodic_vat_entries', options['buttons']))
+            self.assertEqual(closing_button_dict.get('error_action'), None if is_enabled else 'show_error_branch_allowed')
+            if is_enabled:
+                self.assertEqual(tax_report._get_sender_company_for_export(options), export_main_company)
+
+        tax_report = self.env.ref('account.generic_tax_report')
+
+        main_company = self.company_data['company']
+        main_company.vat = '123'
+        branch_1 = self.env['res.company'].create({'name': "Branch 1", 'parent_id': main_company.id})
+        branch_1_1 = self.env['res.company'].create({'name': "Branch 1 sub-branch 1", 'parent_id': branch_1.id})
+        branch_2 = self.env['res.company'].create({'name': "Branch 2", 'parent_id': main_company.id, 'vat': '456'})
+        branch_2_1 = self.env['res.company'].create({'name': "Branch 2 sub-branch 1", 'parent_id': branch_2.id})
+
+        assertTaxClosingAvailable(False, main_company)
+        assertTaxClosingAvailable(True, main_company + branch_1 + branch_1_1 + branch_2 + branch_2_1, export_main_company=main_company)
+        assertTaxClosingAvailable(True, branch_2 + branch_2_1 + main_company + branch_1 + branch_1_1, export_main_company=branch_2)
+        assertTaxClosingAvailable(True, main_company + branch_1 + branch_1_1, export_main_company=main_company)
+        assertTaxClosingAvailable(False, main_company + branch_1)
+        assertTaxClosingAvailable(False, branch_1 + branch_1_1)
+        assertTaxClosingAvailable(True, branch_1 + main_company + branch_1_1, export_main_company=main_company)
+        assertTaxClosingAvailable(True, branch_2 + main_company + branch_2_1, export_main_company=branch_2)
+        assertTaxClosingAvailable(False, branch_2_1)
+
+    def test_tax_report_fpos_domestic(self):
+        """ Test tax report's content for 'domestic' foreign VAT fiscal position option.
+        """
+        options = self._generate_options(
+            self.basic_tax_report, fields.Date.from_string('2021-01-01'), fields.Date.from_string('2021-03-31'),
+            {'fiscal_position': 'domestic'}
+        )
+        self.assertLinesValues(
+            self.basic_tax_report._get_lines(options),
+            #   Name                                                          Balance
+            [0,                                                               1],
+            [
+                # out_invoice
+                (f'{self.test_fpos_tax_sale.id}-invoice-base',             200),
+                (f'{self.test_fpos_tax_sale.id}-invoice-30',                30),
+                (f'{self.test_fpos_tax_sale.id}-invoice-70',                70),
+                (f'{self.test_fpos_tax_sale.id}-invoice--100',            -100),
+
+                # out_refund
+                (f'{self.test_fpos_tax_sale.id}-refund-base',              -20),
+                (f'{self.test_fpos_tax_sale.id}-refund-30',                 -3),
+                (f'{self.test_fpos_tax_sale.id}-refund-70',                 -7),
+                (f'{self.test_fpos_tax_sale.id}-refund--100',               10),
+
+                # in_invoice
+                (f'{self.test_fpos_tax_purchase.id}-invoice-base',         400),
+                (f'{self.test_fpos_tax_purchase.id}-invoice-40',            80),
+                (f'{self.test_fpos_tax_purchase.id}-invoice-60',           120),
+                (f'{self.test_fpos_tax_purchase.id}-invoice--100',        -200),
+
+                # in_refund
+                (f'{self.test_fpos_tax_purchase.id}-refund-base',          -60),
+                (f'{self.test_fpos_tax_purchase.id}-refund-40',            -12),
+                (f'{self.test_fpos_tax_purchase.id}-refund-60',            -18),
+                (f'{self.test_fpos_tax_purchase.id}-refund--100',           30),
+            ],
+            options,
+        )
+
+    def test_tax_report_fpos_foreign(self):
+        """ Test tax report's content with a foreign VAT fiscal position.
+        """
+        options = self._generate_options(
+            self.basic_tax_report, fields.Date.from_string('2021-01-01'), fields.Date.from_string('2021-03-31'),
+            {'fiscal_position': self.foreign_vat_fpos.id}
+        )
+        self.assertLinesValues(
+            self.basic_tax_report._get_lines(options),
+            #   Name                                                          Balance
+            [0,                                                               1],
+            [
+                # out_invoice
+                (f'{self.test_fpos_tax_sale.id}-invoice-base',              800),
+                (f'{self.test_fpos_tax_sale.id}-invoice-30',                120),
+                (f'{self.test_fpos_tax_sale.id}-invoice-70',                280),
+                (f'{self.test_fpos_tax_sale.id}-invoice--100',             -400),
+
+                # out_refund
+                (f'{self.test_fpos_tax_sale.id}-refund-base',              -200),
+                (f'{self.test_fpos_tax_sale.id}-refund-30',                 -30),
+                (f'{self.test_fpos_tax_sale.id}-refund-70',                 -70),
+                (f'{self.test_fpos_tax_sale.id}-refund--100',               100),
+
+                # in_invoice
+                (f'{self.test_fpos_tax_purchase.id}-invoice-base',         1000),
+                (f'{self.test_fpos_tax_purchase.id}-invoice-40',            200),
+                (f'{self.test_fpos_tax_purchase.id}-invoice-60',            300),
+                (f'{self.test_fpos_tax_purchase.id}-invoice--100',         -500),
+
+                # in_refund
+                (f'{self.test_fpos_tax_purchase.id}-refund-base',          -600),
+                (f'{self.test_fpos_tax_purchase.id}-refund-40',            -120),
+                (f'{self.test_fpos_tax_purchase.id}-refund-60',            -180),
+                (f'{self.test_fpos_tax_purchase.id}-refund--100',           300),
+            ],
+            options,
+        )
+
+    def test_tax_report_fpos_everything(self):
+        """ Test tax report's content for 'all' foreign VAT fiscal position option.
+        """
+        options = self._generate_options(
+            self.basic_tax_report, fields.Date.from_string('2021-01-01'), fields.Date.from_string('2021-03-31'),
+            {'fiscal_position': 'all'}
+        )
+        self.assertLinesValues(
+            self.basic_tax_report._get_lines(options),
+            #   Name                                                          Balance
+            [0,                                                               1],
+            [
+                # out_invoice
+                (f'{self.test_fpos_tax_sale.id}-invoice-base',            1000),
+                (f'{self.test_fpos_tax_sale.id}-invoice-30',               150),
+                (f'{self.test_fpos_tax_sale.id}-invoice-70',               350),
+                (f'{self.test_fpos_tax_sale.id}-invoice--100',            -500),
+
+                # out_refund
+                (f'{self.test_fpos_tax_sale.id}-refund-base',             -220),
+                (f'{self.test_fpos_tax_sale.id}-refund-30',                -33),
+                (f'{self.test_fpos_tax_sale.id}-refund-70',                -77),
+                (f'{self.test_fpos_tax_sale.id}-refund--100',              110),
+
+                # in_invoice
+                (f'{self.test_fpos_tax_purchase.id}-invoice-base',        1400),
+                (f'{self.test_fpos_tax_purchase.id}-invoice-40',           280),
+                (f'{self.test_fpos_tax_purchase.id}-invoice-60',           420),
+                (f'{self.test_fpos_tax_purchase.id}-invoice--100',        -700),
+
+                # in_refund
+                (f'{self.test_fpos_tax_purchase.id}-refund-base',         -660),
+                (f'{self.test_fpos_tax_purchase.id}-refund-40',           -132),
+                (f'{self.test_fpos_tax_purchase.id}-refund-60',           -198),
+                (f'{self.test_fpos_tax_purchase.id}-refund--100',          330),
+            ],
+            options,
+        )
+
+    def test_tax_report_single_fpos(self):
+        """ When opening the tax report from a foreign country for which there exists only one
+        foreing VAT fiscal position, this fiscal position should be selected by default in the
+        report's options.
+        """
+        new_tax_report = self.env['account.report'].create({
+            'name': "",
+            'country_id': self.foreign_country.id,
+            'root_report_id': self.env.ref("account.generic_tax_report").id,
+            'column_ids': [Command.create({'name': 'balance', 'sequence': 1, 'expression_label': 'balance'})]
+        })
+        foreign_vat_fpos = self.env['account.fiscal.position'].create({
+            'name': "Test fpos",
+            'country_id': self.foreign_country.id,
+            'foreign_vat': '422211',
+        })
+        options = self._generate_options(new_tax_report, fields.Date.from_string('2021-01-01'), fields.Date.from_string('2021-03-31'))
+        self.assertEqual(options['fiscal_position'], foreign_vat_fpos.id, "When only one VAT fiscal position is available for a non-domestic country, it should be chosen by default")
+
+    def test_tax_report_grid(self):
+        company = self.company_data['company']
+
+        # We generate a tax report with the following layout
+        #/Base
+        #   - Base 42%
+        #   - Base 11%
+        #/Tax
+        #   - Tax 42%
+        #       - 10.5%
+        #       - 31.5%
+        #   - Tax 11%
+        #/Tax difference (42% - 11%)
+
+        tax_report = self.env['account.report'].create({
+            'name': 'Test',
+            'country_id': company.account_fiscal_country_id.id,
+            'root_report_id': self.env.ref("account.generic_tax_report").id,
+            'column_ids': [Command.create({'name': 'balance', 'sequence': 1, 'expression_label': 'balance'})]
+        })
+
+        # We create the lines in a different order from the one they have in report,
+        # so that we ensure sequence is taken into account properly when rendering the report
+        tax_section = self._create_tax_report_line('Tax', tax_report, sequence=4, formula="tax_42.balance + tax_11.balance + tax_neg_100.balance")
+        base_section = self._create_tax_report_line('Base', tax_report, sequence=1, formula="base_11.balance + base_42.balance")
+        base_42_line = self._create_tax_report_line('Base 42%', tax_report, sequence=2, parent_line=base_section, code='base_42', tag_name='base_42')
+        base_11_line = self._create_tax_report_line('Base 11%', tax_report, sequence=3, parent_line=base_section, code='base_11', tag_name='base_11')
+        tax_42_section = self._create_tax_report_line('Tax 42%', tax_report, sequence=5, parent_line=tax_section, code='tax_42', formula='tax_31_5.balance + tax_10_5.balance')
+        tax_31_5_line = self._create_tax_report_line('Tax 31.5%', tax_report, sequence=7, parent_line=tax_42_section, code='tax_31_5', tag_name='tax_31_5')
+        tax_10_5_line = self._create_tax_report_line('Tax 10.5%', tax_report, sequence=6, parent_line=tax_42_section, code='tax_10_5', tag_name='tax_10_5')
+        tax_11_line = self._create_tax_report_line('Tax 11%', tax_report, sequence=8, parent_line=tax_section, code='tax_11', tag_name='tax_11')
+        tax_neg_100_line = self._create_tax_report_line('Tax -100%', tax_report, sequence=9, parent_line=tax_section, code='tax_neg_100', tag_name='tax_neg_100')
+        self._create_tax_report_line('Tax difference (42%-11%)', tax_report, sequence=10, formula='tax_42.balance - tax_11.balance')
+
+        # Create two taxes linked to report lines
+        tax_11 = self.env['account.tax'].create({
+            'name': 'Impôt sur les revenus',
+            'amount': 11,
+            'amount_type': 'percent',
+            'type_tax_use': 'sale',
+            'invoice_repartition_line_ids': [
+                Command.create({
+                    'repartition_type': 'base',
+                    'tag_ids': self._get_tag_ids("+", base_11_line.expression_ids),
+                }),
+                Command.create({
+                    'repartition_type': 'tax',
+                    'tag_ids': self._get_tag_ids("+", tax_11_line.expression_ids),
+                }),
+            ],
+            'refund_repartition_line_ids': [
+                Command.create({
+                    'repartition_type': 'base',
+                    'tag_ids': self._get_tag_ids("-", base_11_line.expression_ids),
+                }),
+                Command.create({
+                    'repartition_type': 'tax',
+                    'tag_ids': self._get_tag_ids("-", tax_11_line.expression_ids),
+                }),
+            ],
+        })
+
+        tax_42 = self.env['account.tax'].create({
+            'name': 'Impôt sur les revenants',
+            'amount': 42,
+            'amount_type': 'percent',
+            'type_tax_use': 'sale',
+            'invoice_repartition_line_ids': [
+                Command.create({
+                    'repartition_type': 'base',
+                    'tag_ids': self._get_tag_ids("+", base_42_line.expression_ids),
+                }),
+
+                Command.create({
+                    'factor_percent': 25,
+                    'repartition_type': 'tax',
+                    'tag_ids': self._get_tag_ids("+", tax_10_5_line.expression_ids),
+                }),
+
+                Command.create({
+                    'factor_percent': 75,
+                    'repartition_type': 'tax',
+                    'tag_ids': self._get_tag_ids("+", tax_31_5_line.expression_ids),
+                }),
+
+                Command.create({
+                    'factor_percent': -100,
+                    'repartition_type': 'tax',
+                    'tag_ids': self._get_tag_ids("-", tax_neg_100_line.expression_ids),
+                }),
+            ],
+            'refund_repartition_line_ids': [
+                Command.create({
+                    'repartition_type': 'base',
+                    'tag_ids': self._get_tag_ids("-", base_42_line.expression_ids),
+                }),
+
+                Command.create({
+                    'factor_percent': 25,
+                    'repartition_type': 'tax',
+                    'tag_ids': self._get_tag_ids("-", tax_10_5_line.expression_ids),
+                }),
+
+                Command.create({
+                    'factor_percent': 75,
+                    'repartition_type': 'tax',
+                    'tag_ids': self._get_tag_ids("-", tax_31_5_line.expression_ids),
+                }),
+
+                Command.create({
+                    'factor_percent': -100,
+                    'repartition_type': 'tax',
+                    'tag_ids': self._get_tag_ids("+", tax_neg_100_line.expression_ids),
+                }),
+            ],
+        })
+
+        # Create an invoice using the tax we just made
+        invoice = self.env['account.move'].create({
+            'move_type': 'out_invoice',
+            'partner_id': self.partner_a.id,
+            'invoice_line_ids': [Command.create({
+                'name': 'Turlututu',
+                'price_unit': 100.0,
+                'quantity': 1,
+                'account_id': self.company_data['default_account_revenue'].id,
+                'tax_ids': [Command.set((tax_11 + tax_42).ids)],
+            })],
+        })
+        invoice.action_post()
+
+        # Generate the report and check the results
+        report = tax_report
+        options = self._generate_options(report, invoice.date, invoice.date)
+
+        # Invalidate the cache to ensure the lines will be fetched in the right order.
+        self.env.invalidate_all()
+
+        lines = report._get_lines(options)
+        self.assertLinesValues(
+            lines,
+            #   Name                                        Balance
+            [   0,                                             1  ],
+            [
+                ('Base',                                    200),
+                ('Base 42%',                                100),
+                ('Base 11%',                                100),
+                ('Total Base',                              200),
+
+                ('Tax',                                      95),
+                ('Tax 42%',                                  42),
+                ('Tax 10.5%',                                10.5),
+                ('Tax 31.5%',                                31.5),
+                ('Total Tax 42%',                            42),
+
+                ('Tax 11%',                                  11),
+                ('Tax -100%',                                42),
+                ('Total Tax',                                95),
+
+                ('Tax difference (42%-11%)',                 31),
+            ],
+            options,
+        )
+
+        # We refund the invoice
+        refund_wizard = self.env['account.move.reversal'].with_context(active_model="account.move", active_ids=invoice.ids).create({
+            'reason': 'Test refund tax repartition',
+            'journal_id': invoice.journal_id.id,
+            'date': invoice.date,
+        })
+        refund_wizard.modify_moves()
+
+        # We check the taxes on refund have impacted the report properly (everything should be 0)
+        self.assertLinesValues(
+            report._get_lines(options),
+            #   Name                                         Balance
+            [   0,                                               1],
+            [
+                ('Base',                                       0.0),
+                ('Base 42%',                                   0.0),
+                ('Base 11%',                                   0.0),
+                ('Total Base',                                 0.0),
+
+                ('Tax',                                        0.0),
+                ('Tax 42%',                                    0.0),
+                ('Tax 10.5%',                                  0.0),
+                ('Tax 31.5%',                                  0.0),
+                ('Total Tax 42%',                              0.0),
+
+                ('Tax 11%',                                    0.0),
+                ('Tax -100%',                                  0.0),
+                ('Total Tax',                                  0.0),
+
+                ('Tax difference (42%-11%)',                   0.0),
+            ],
+            options,
+        )
+
+    def _create_caba_taxes_for_report_lines(self, report_lines_dict, company):
+        """ Creates cash basis taxes with a specific test repartition and maps them to
+        the provided tax_report lines.
+
+        :param report_lines_dict:  A dictionnary mapping tax_type_use values to
+                                   tax report lines records
+        :param company:            The company to create the test tags for
+
+        :return:                   The created account.tax objects
+        """
+        return self.env['account.tax'].create([
+            {
+                'name': 'Impôt sur tout ce qui bouge',
+                'amount': '20',
+                'amount_type': 'percent',
+                'type_tax_use': tax_type,
+                'tax_exigibility': 'on_payment',
+                'invoice_repartition_line_ids': [
+                    Command.create({
+                        'repartition_type': 'base',
+                        'tag_ids': self._get_tag_ids("+", report_line.expression_ids),
+                    }),
+                    Command.create({
+                        'factor_percent': 25,
+                        'repartition_type': 'tax',
+                        'tag_ids': self._get_tag_ids("+", report_line.expression_ids),
+                    }),
+                    Command.create({
+                        'factor_percent': 75,
+                        'repartition_type': 'tax',
+                        'tag_ids': self._get_tag_ids("+", report_line.expression_ids),
+                    }),
+                ],
+                'refund_repartition_line_ids': [
+                    Command.create({
+                        'repartition_type': 'base',
+                        'tag_ids': self._get_tag_ids("-", report_line.expression_ids),
+                    }),
+                    Command.create({
+                        'factor_percent': 25,
+                        'repartition_type': 'tax',
+                        'tag_ids': self._get_tag_ids("-", report_line.expression_ids),
+                    }),
+                    Command.create({
+                        'factor_percent': 75,
+                        'repartition_type': 'tax',
+                    }),
+                ],
+            }
+            for tax_type, report_line in report_lines_dict.items()
+        ])
+
+    def _create_taxes_for_report_lines(self, report_lines_dict, company):
+        return self.env['account.tax'].create([
+            {
+                'name': 'Impôt sur tout ce qui bouge',
+                'amount': '20',
+                'amount_type': 'percent',
+                'type_tax_use': tax_type,
+                'invoice_repartition_line_ids': [
+                    Command.create({
+                        'repartition_type': 'base',
+                        'tag_ids': self._get_tag_ids("+", report_line[0].expression_ids),
+                    }),
+                    Command.create({
+                        'repartition_type': 'tax',
+                        'tag_ids': self._get_tag_ids("+", report_line[1].expression_ids),
+                    }),
+                ],
+                'refund_repartition_line_ids': [
+                    Command.create({
+                        'repartition_type': 'base',
+                        'tag_ids': self._get_tag_ids("+", report_line[0].expression_ids),
+                    }),
+                    Command.create({
+                        'repartition_type': 'tax',
+                        'tag_ids': self._get_tag_ids("+", report_line[1].expression_ids),
+                    }),
+                ],
+            }
+            for tax_type, report_line in report_lines_dict.items()
+        ])
+
+
+    def _run_caba_generic_test(self, expected_columns, expected_lines, on_invoice_created=None, on_all_invoices_created=None, invoice_generator=None):
+        """ Generic test function called by several cash basis tests.
+
+        This function creates a new sale and purchase tax, each associated with
+        a new tax report line using _create_caba_taxes_for_report_lines.
+        It then creates an invoice AND a refund for each of these tax, and finally
+        compare the tax report to the expected values, passed in parameters.
+
+        Since _create_caba_taxes_for_report_lines creates asymmetric taxes (their 75%
+        repartition line does not impact the report line at refund), we can be sure this
+        function helper gives a complete coverage, and does not shadow any result due, for
+        example, to some undesired swapping between debit and credit.
+
+        :param expected_columns:          The columns we want the final tax report to contain
+
+        :param expected_lines:            The lines we want the final tax report to contain
+
+        :param on_invoice_created:        A function to be called when a single invoice has
+                                          just been created, taking the invoice as a parameter
+                                          (This can be used to reconcile the invoice with something, for example)
+
+        :param on_all_invoices_created:   A function to be called when all the invoices corresponding
+                                          to a tax type have been created, taking the
+                                          recordset of all these invoices as a parameter
+                                          (Use it to reconcile invoice and credit note together, for example)
+
+        :param invoice_generator:         A function used to generate an invoice. A default
+                                          one is called if none is provided, creating
+                                          an invoice with a single line amounting to 100,
+                                          with the provided tax set on it.
+        """
+        def default_invoice_generator(inv_type, partner, account, date, tax):
+            return self.env['account.move'].create({
+                'move_type': inv_type,
+                'partner_id': partner.id,
+                'invoice_date': date,
+                'invoice_line_ids': [Command.create({
+                    'name': 'test',
+                    'quantity': 1,
+                    'account_id': account.id,
+                    'price_unit': 100,
+                    'tax_ids': [Command.set(tax.ids)],
+                })],
+            })
+
+        today = fields.Date.today()
+
+        company = self.company_data['company']
+        company.tax_exigibility = True
+        partner = self.env['res.partner'].create({'name': 'Char Aznable'})
+
+        # Create a tax report
+        tax_report = self.env['account.report'].create({
+            'name': 'Test',
+            'country_id': self.fiscal_country.id,
+            'root_report_id': self.env.ref("account.generic_tax_report").id,
+            'column_ids': [Command.create({'name': 'balance', 'sequence': 1, 'expression_label': 'balance'})]
+        })
+
+        # We create some report lines
+        report_lines_dict = {
+            'sale': self._create_tax_report_line('Sale', tax_report, sequence=1, tag_name='sale'),
+            'purchase': self._create_tax_report_line('Purchase', tax_report, sequence=2, tag_name='purchase'),
+        }
+
+        # We create a sale and a purchase tax, linked to our report lines' tags
+        taxes = self._create_caba_taxes_for_report_lines(report_lines_dict, company)
+
+
+        # Create invoice and refund using the tax we just made
+        invoice_types = {
+            'sale': ('out_invoice', 'out_refund'),
+            'purchase': ('in_invoice', 'in_refund')
+        }
+
+        account_types = {
+            'sale': 'income',
+            'purchase': 'expense',
+        }
+        for tax in taxes:
+            invoices = self.env['account.move']
+            account = self.env['account.account'].search([('company_ids', '=', company.id), ('account_type', '=', account_types[tax.type_tax_use])], limit=1)
+            for inv_type in invoice_types[tax.type_tax_use]:
+                invoice = (invoice_generator or default_invoice_generator)(inv_type, partner, account, today, tax)
+                invoice.action_post()
+                invoices += invoice
+
+                if on_invoice_created:
+                    on_invoice_created(invoice)
+
+            if on_all_invoices_created:
+                on_all_invoices_created(invoices)
+
+        # Generate the report and check the results
+        # We check the taxes on invoice have impacted the report properly
+        options = self._generate_options(tax_report, date_from=today, date_to=today)
+        inv_report_lines = tax_report._get_lines(options)
+        self.assertLinesValues(inv_report_lines, expected_columns, expected_lines, options)
+
+    def _register_full_payment_for_invoice(self, invoice):
+        """ Fully pay the invoice, so that the cash basis entries are created
+        """
+        self.env['account.payment.register'].with_context(active_ids=invoice.ids, active_model='account.move').create({
+            'payment_date': invoice.date,
+        })._create_payments()
+
+    @freeze_time('2023-10-05 02:00:00')
+    def test_tax_report_grid_cash_basis(self):
+        """ Cash basis moves create for taxes based on payments are handled differently
+        by the report; we want to ensure their sign is managed properly.
+        """
+        # 100 (base, invoice) - 100 (base, refund) + 20 (tax, invoice) - 5 (25% tax, refund) = 15
+        self._run_caba_generic_test(
+            #   Name                      Balance
+            [   0,                            1],
+            [
+                ('Sale',                     15),
+                ('Purchase',                 15),
+            ],
+            on_invoice_created=self._register_full_payment_for_invoice
+        )
+
+    @freeze_time('2023-10-05 02:00:00')
+    def test_tax_report_grid_cash_basis_refund(self):
+        """ Cash basis moves create for taxes based on payments are handled differently
+        by the report; we want to ensure their sign is managed properly. This
+        test runs the case where an invoice is reconciled with a refund (created
+        separetely, so not cancelling it).
+        """
+        def reconcile_opposite_types(invoices):
+            """ Reconciles the created invoices with their matching refund.
+            """
+            invoices.mapped('line_ids').filtered(lambda x: x.account_type in ('asset_receivable', 'liability_payable')).reconcile()
+
+        # 100 (base, invoice) - 100 (base, refund) + 20 (tax, invoice) - 5 (25% tax, refund) = 15
+        self._run_caba_generic_test(
+            #   Name                      Balance
+            [   0,                        1],
+            [
+                ('Sale',                     15),
+                ('Purchase',                 15),
+            ],
+            on_all_invoices_created=reconcile_opposite_types
+        )
+
+    @freeze_time('2023-10-05 02:00:00')
+    def test_tax_report_grid_cash_basis_misc_pmt(self):
+        """ Cash basis moves create for taxes based on payments are handled differently
+        by the report; we want to ensure their sign is managed properly. This
+        test runs the case where the invoice is paid with a misc operation instead
+        of a payment.
+        """
+        def reconcile_with_misc_pmt(invoice):
+            """ Create a misc operation equivalent to a full payment and reconciles
+            the invoice with it.
+            """
+            # Pay the invoice with a misc operation simulating a payment, so that the cash basis entries are created
+            invoice_reconcilable_line = invoice.line_ids.filtered(lambda x: x.account_type in ('liability_payable', 'asset_receivable'))
+            account = (invoice.line_ids - invoice_reconcilable_line).account_id
+            pmt_move = self.env['account.move'].create({
+                'move_type': 'entry',
+                'date': invoice.date,
+                'line_ids': [Command.create({
+                                'account_id': invoice_reconcilable_line.account_id.id,
+                                'debit': invoice_reconcilable_line.credit,
+                                'credit': invoice_reconcilable_line.debit,
+                            }),
+                            Command.create({
+                                'account_id': account.id,
+                                'credit': invoice_reconcilable_line.credit,
+                                'debit': invoice_reconcilable_line.debit,
+                            })],
+            })
+            pmt_move.action_post()
+            payment_reconcilable_line = pmt_move.line_ids.filtered(lambda x: x.account_type in ('liability_payable', 'asset_receivable'))
+            (invoice_reconcilable_line + payment_reconcilable_line).reconcile()
+
+        # 100 (base, invoice) - 100 (base, refund) + 20 (tax, invoice) - 5 (25% tax, refund) = 15
+        self._run_caba_generic_test(
+            #   Name                      Balance
+            [   0,                            1],
+            [
+                ('Sale',                     15),
+                ('Purchase',                 15),
+            ],
+            on_invoice_created=reconcile_with_misc_pmt
+        )
+
+    @freeze_time('2023-10-05 02:00:00')
+    def test_caba_no_payment(self):
+        """ The cash basis taxes of an unpaid invoice should
+        never impact the report.
+        """
+        self._run_caba_generic_test(
+            #   Name                      Balance
+            [   0,                            1],
+            [
+                ('Sale',                    0.0),
+                ('Purchase',                0.0),
+            ]
+        )
+
+    @freeze_time('2023-10-05 02:00:00')
+    def test_caba_half_payment(self):
+        """ Paying half the amount of the invoice should report half the
+        base and tax amounts.
+        """
+        def register_half_payment_for_invoice(invoice):
+            """ Fully pay the invoice, so that the cash basis entries are created
+            """
+            payment_method_id = self.inbound_payment_method_line if invoice.is_inbound() else self.outbound_payment_method_line
+            self.env['account.payment.register'].with_context(active_ids=invoice.ids, active_model='account.move').create({
+                'amount': invoice.amount_residual / 2,
+                'payment_date': invoice.date,
+                'payment_method_line_id': payment_method_id.id,
+            })._create_payments()
+
+        # 50 (base, invoice) - 50 (base, refund) + 10 (tax, invoice) - 2.5 (25% tax, refund) = 7.5
+        self._run_caba_generic_test(
+            #   Name                     Balance
+            [   0,                            1],
+            [
+                ('Sale',                    7.5),
+                ('Purchase',                7.5),
+            ],
+            on_invoice_created=register_half_payment_for_invoice
+        )
+
+    def test_caba_mixed_generic_report(self):
+        """ Tests mixing taxes with different tax exigibilities displays correct amounts
+        in the generic tax report.
+        """
+        self.env.company.tax_exigibility = True
+        # Create taxes
+        regular_tax = self.env['account.tax'].create({
+            'name': 'Regular',
+            'amount': 42,
+            'amount_type': 'percent',
+            'type_tax_use': 'sale',
+            # We use default repartition: 1 base line, 1 100% tax line
+        })
+
+        caba_tax = self.env['account.tax'].create({
+            'name': 'Cash Basis',
+            'amount': 10,
+            'amount_type': 'percent',
+            'type_tax_use': 'sale',
+            'tax_exigibility': 'on_payment',
+            # We use default repartition: 1 base line, 1 100% tax line
+        })
+
+        # Create an invoice using them, and post it
+        invoice = self.init_invoice(
+            'out_invoice',
+            invoice_date='2021-07-01',
+            post=True,
+            amounts=[100],
+            taxes=regular_tax + caba_tax,
+            company=self.company_data['company'],
+        )
+
+        # Check the report only contains non-caba things
+        report = self.env.ref("account.generic_tax_report")
+        options = self._generate_options(report, invoice.date, invoice.date)
+        self.assertLinesValues(
+            report._get_lines(options),
+            #   Name                         Net               Tax
+            [   0,                             1,                2],
+            [
+                ("Sales",                     '',               42),
+                ("Regular (42.0%)",          100,               42),
+                ("Total Sales",               '',               42),
+            ],
+            options,
+        )
+
+        # Pay half of the invoice
+        self.env['account.payment.register'].with_context(active_ids=invoice.ids, active_model='account.move').create({
+            'amount': 76,
+            'payment_date': invoice.date,
+            'payment_method_line_id': self.outbound_payment_method_line.id,
+        })._create_payments()
+
+        # Check the report again: half the cash basis should be there
+        self.assertLinesValues(
+            report._get_lines(options),
+            #   Name                          Net               Tax
+            [   0,                              1,               2],
+            [
+                ("Sales",                      '',              47),
+                ("Regular (42.0%)",           100,              42),
+                ("Cash Basis (10.0%)",         50,               5),
+                ("Total Sales",                '',              47),
+            ],
+            options,
+        )
+
+        # Pay the rest
+        self.env['account.payment.register'].with_context(active_ids=invoice.ids, active_model='account.move').create({
+            'amount': 76,
+            'payment_date': invoice.date,
+            'payment_method_line_id': self.outbound_payment_method_line.id,
+        })._create_payments()
+
+        # Check everything is in the report
+        self.assertLinesValues(
+            report._get_lines(options),
+            #   Name                          Net              Tax
+            [   0,                              1,               2],
+            [
+                ("Sales",                      '',              52),
+                ("Regular (42.0%)",           100,              42),
+                ("Cash Basis (10.0%)",        100,              10),
+                ("Total Sales",                '',              52),
+            ],
+            options,
+        )
+
+    def test_tax_report_mixed_exigibility_affect_base_generic_invoice(self):
+        """ Tests mixing caba and non-caba taxes with one of them affecting the base
+        of the other worcs properly on invoices for generic report.
+        """
+        self.env.company.tax_exigibility = True
+        # Create taxes
+        regular_tax = self.env['account.tax'].create({
+            'name': 'Regular',
+            'amount': 42,
+            'amount_type': 'percent',
+            'type_tax_use': 'sale',
+            'include_base_amount': True,
+            'sequence': 0,
+            # We use default repartition: 1 base line, 1 100% tax line
+        })
+
+        caba_tax = self.env['account.tax'].create({
+            'name': 'Cash Basis',
+            'amount': 10,
+            'amount_type': 'percent',
+            'type_tax_use': 'sale',
+            'tax_exigibility': 'on_payment',
+            'include_base_amount': True,
+            'sequence': 1,
+            # We use default repartition: 1 base line, 1 100% tax line
+        })
+
+        report = self.env.ref("account.generic_tax_report")
+        # Case 1: on_invoice tax affecting on_payment tax's base
+        self._run_check_suite_mixed_exigibility_affect_base(
+            regular_tax + caba_tax,
+            '2021-07-01',
+            report,
+            # Name,                          Net,               Tax
+            [   0,                             1,                2],
+            # Before payment
+            [
+                ("Sales",                     '',            42),
+                ("Regular (42.0%)",          100,            42),
+                ("Total Sales",               '',            42),
+            ],
+            # After paying 30%
+            [
+                ("Sales",                     '',            46.26),
+                ("Regular (42.0%)",          100,            42),
+                ("Cash Basis (10.0%)",        42.6,           4.26),
+                ("Total Sales",               '',            46.26),
+            ],
+            # After full payment
+            [
+                ("Sales",                     '',             56.2),
+                ("Regular (42.0%)",          100,             42),
+                ("Cash Basis (10.0%)",       142,             14.2),
+                ("Total Sales",               '',             56.2),
+            ]
+        )
+
+        # Change sequence
+        caba_tax.sequence = 0
+        regular_tax.sequence = 1
+
+        # Case 2: on_payment tax affecting on_invoice tax's base
+        self._run_check_suite_mixed_exigibility_affect_base(
+            regular_tax + caba_tax,
+            '2021-07-02',
+            report,
+            #   Name                         Net                Tax
+            [   0,                             1,                2],
+            # Before payment
+            [
+                ("Sales",                     '',             46.2),
+                ("Regular (42.0%)",          110,             46.2),
+                ("Total Sales",               '',             46.2),
+            ],
+            # After paying 30%
+            [
+                ("Sales",                     '',             49.2),
+                ("Cash Basis (10.0%)",        30,              3),
+                ("Regular (42.0%)",          110,             46.2),
+                ("Total Sales",               '',             49.2),
+            ],
+            # After full payment
+            [
+                ("Sales",                     '',             56.2),
+                ("Cash Basis (10.0%)",       100,             10),
+                ("Regular (42.0%)",          110,             46.2),
+                ("Total Sales",               '',             56.2),
+            ]
+        )
+
+    def test_tax_report_mixed_exigibility_affect_base_tags(self):
+        """ Tests mixing caba and non-caba taxes with one of them affecting the base
+        of the other worcs properly on invoices for tax report.
+        """
+        self.env.company.tax_exigibility = True
+        # Create taxes
+        tax_report = self.env['account.report'].create({
+            'name': "Sokovia Accords",
+            'country_id': self.fiscal_country.id,
+            'root_report_id': self.env.ref("account.generic_tax_report").id,
+            'column_ids': [Command.create({'name': 'balance', 'sequence': 1, 'expression_label': 'balance'})],
+        })
+
+        regular_tax = self._add_basic_tax_for_report(tax_report, 42, 'sale', self.tax_group_1, [(100, None, True)])
+        caba_tax = self._add_basic_tax_for_report(tax_report, 10, 'sale', self.tax_group_1, [(100, None, True)])
+
+        regular_tax.write({
+            'include_base_amount': True,
+            'sequence': 0,
+        })
+        caba_tax.write({
+            'include_base_amount': True,
+            'tax_exigibility': 'on_payment',
+            'sequence': 1,
+        })
+
+        # Case 1: on_invoice tax affecting on_payment tax's base
+        self._run_check_suite_mixed_exigibility_affect_base(
+            regular_tax + caba_tax,
+            '2021-07-01',
+            tax_report,
+            #   Name                                       Balance
+            [   0,                                               1],
+            # Before payment
+            [
+                (f'{regular_tax.id}-invoice-base',          100),
+                (f'{regular_tax.id}-invoice-100',            42),
+                (f'{regular_tax.id}-refund-base',             0.0),
+                (f'{regular_tax.id}-refund-100',              0.0),
+
+                (f'{caba_tax.id}-invoice-base',               0.0),
+                (f'{caba_tax.id}-invoice-100',                0.0),
+                (f'{caba_tax.id}-refund-base',                0.0),
+                (f'{caba_tax.id}-refund-100',                 0.0),
+            ],
+            # After paying 30%
+            [
+                (f'{regular_tax.id}-invoice-base',          100),
+                (f'{regular_tax.id}-invoice-100',            42),
+                (f'{regular_tax.id}-refund-base',             0.0),
+                (f'{regular_tax.id}-refund-100',              0.0),
+
+                (f'{caba_tax.id}-invoice-base',              42.6),
+                (f'{caba_tax.id}-invoice-100',                4.26),
+                (f'{caba_tax.id}-refund-base',                0.0),
+                (f'{caba_tax.id}-refund-100',                 0.0),
+            ],
+            # After full payment
+            [
+                (f'{regular_tax.id}-invoice-base',          100),
+                (f'{regular_tax.id}-invoice-100',            42),
+                (f'{regular_tax.id}-refund-base',             0.0),
+                (f'{regular_tax.id}-refund-100',              0.0),
+
+                (f'{caba_tax.id}-invoice-base',             142),
+                (f'{caba_tax.id}-invoice-100',               14.2),
+                (f'{caba_tax.id}-refund-base',                0.0),
+                (f'{caba_tax.id}-refund-100',                 0.0),
+            ],
+        )
+
+        # Change sequence
+        caba_tax.sequence = 0
+        regular_tax.sequence = 1
+
+        # Case 2: on_payment tax affecting on_invoice tax's base
+        self._run_check_suite_mixed_exigibility_affect_base(
+            regular_tax + caba_tax,
+            '2021-07-02',
+            tax_report,
+            #   Name                                       Balance
+            [   0,                                               1],
+            # Before payment
+            [
+                (f'{regular_tax.id}-invoice-base',           110),
+                (f'{regular_tax.id}-invoice-100',             46.2),
+                (f'{regular_tax.id}-refund-base',              0.0),
+                (f'{regular_tax.id}-refund-100',               0.0),
+
+                (f'{caba_tax.id}-invoice-base',                0.0),
+                (f'{caba_tax.id}-invoice-100',                 0.0),
+                (f'{caba_tax.id}-refund-base',                 0.0),
+                (f'{caba_tax.id}-refund-100',                  0.0),
+            ],
+            # After paying 30%
+            [
+                (f'{regular_tax.id}-invoice-base',           110),
+                (f'{regular_tax.id}-invoice-100',             46.2),
+                (f'{regular_tax.id}-refund-base',              0.0),
+                (f'{regular_tax.id}-refund-100',               0.0),
+
+                (f'{caba_tax.id}-invoice-base',               30),
+                (f'{caba_tax.id}-invoice-100',                 3),
+                (f'{caba_tax.id}-refund-base',                 0.0),
+                (f'{caba_tax.id}-refund-100',                  0.0),
+            ],
+            # After full payment
+            [
+                (f'{regular_tax.id}-invoice-base',          110),
+                (f'{regular_tax.id}-invoice-100',            46.2),
+                (f'{regular_tax.id}-refund-base',             0.0),
+                (f'{regular_tax.id}-refund-100',              0.0),
+
+                (f'{caba_tax.id}-invoice-base',             100),
+                (f'{caba_tax.id}-invoice-100',               10),
+                (f'{caba_tax.id}-refund-base',                0.0),
+                (f'{caba_tax.id}-refund-100',                 0.0),
+            ],
+        )
+
+    def _run_check_suite_mixed_exigibility_affect_base(self, taxes, invoice_date, report, report_columns, vals_not_paid, vals_30_percent_paid, vals_fully_paid):
+        # Create an invoice using them
+        invoice = self.init_invoice(
+            'out_invoice',
+            invoice_date=invoice_date,
+            post=True,
+            amounts=[100],
+            taxes=taxes,
+            company=self.company_data['company'],
+        )
+
+        # Check the report
+        report_options = self._generate_options(report, invoice.date, invoice.date)
+        self.assertLinesValues(report._get_lines(report_options), report_columns, vals_not_paid, report_options)
+
+        # Pay 30% of the invoice
+        self.env['account.payment.register'].with_context(active_ids=invoice.ids, active_model='account.move').create({
+            'amount': invoice.amount_residual * 0.3,
+            'payment_date': invoice.date,
+            'payment_method_line_id': self.outbound_payment_method_line.id,
+        })._create_payments()
+
+        # Check the report again: 30% of the caba amounts should be there
+        self.assertLinesValues(report._get_lines(report_options), report_columns, vals_30_percent_paid, report_options)
+
+        # Pay the rest: total caba amounts should be there
+        self.env['account.payment.register'].with_context(active_ids=invoice.ids, active_model='account.move').create({
+            'payment_date': invoice.date,
+            'payment_method_line_id': self.outbound_payment_method_line.id,
+        })._create_payments()
+
+        # Check the report
+        self.assertLinesValues(report._get_lines(report_options), report_columns, vals_fully_paid, report_options)
+
+    def test_caba_always_exigible(self):
+        """ Misc operations without payable nor receivable lines must always be exigible,
+        whatever the tax_exigibility configured on their taxes.
+        """
+        tax_report = self.env['account.report'].create({
+            'name': "Laplace's Box",
+            'country_id': self.fiscal_country.id,
+            'root_report_id': self.env.ref("account.generic_tax_report").id,
+            'column_ids': [Command.create({'name': 'balance', 'sequence': 1, 'expression_label': 'balance'})],
+        })
+
+        regular_tax = self._add_basic_tax_for_report(tax_report, 42, 'sale', self.tax_group_1, [(100, None, True)])
+        caba_tax = self._add_basic_tax_for_report(tax_report, 10, 'sale', self.tax_group_1, [(100, None, True)])
+
+        regular_tax.write({
+            'include_base_amount': True,
+            'sequence': 0,
+        })
+        caba_tax.write({
+            'tax_exigibility': 'on_payment',
+            'sequence': 1,
+        })
+
+        # Create a misc operation using various combinations of our taxes
+        move = self.env['account.move'].create({
+            'date': '2021-08-01',
+            'journal_id': self.company_data['default_journal_misc'].id,
+            'line_ids': [
+                Command.create({
+                    'name': "Test with %s" % ', '.join(taxes.mapped('name')),
+                    'account_id': self.company_data['default_account_revenue'].id,
+                    'credit': 100,
+                    'tax_ids': [Command.set(taxes.ids)],
+                })
+                for taxes in (caba_tax, regular_tax, caba_tax + regular_tax)
+            ] + [
+                Command.create({
+                    'name': "Balancing line",
+                    'account_id': self.company_data['default_account_assets'].id,
+                    'debit': 408.2,
+                    'tax_ids': [],
+                })
+            ]
+        })
+
+        move.action_post()
+
+        self.assertTrue(move.always_tax_exigible, "A move without payable/receivable line should always be exigible, whatever its taxes.")
+
+        # Check tax report by grid
+        report_options = self._generate_options(tax_report, move.date, move.date)
+        self.assertLinesValues(
+            tax_report._get_lines(report_options),
+            #   Name                                        Balance
+            [   0,                                               1],
+            [
+                (f'{regular_tax.id}-invoice-base',           200),
+                (f'{regular_tax.id}-invoice-100',             84),
+                (f'{regular_tax.id}-refund-base',              0.0),
+                (f'{regular_tax.id}-refund-100',               0.0),
+
+                (f'{caba_tax.id}-invoice-base',              242),
+                (f'{caba_tax.id}-invoice-100',                24.2),
+                (f'{caba_tax.id}-refund-base',                 0.0),
+                (f'{caba_tax.id}-refund-100',                  0.0),
+            ],
+            report_options,
+        )
+
+
+        # Check generic tax report
+        tax_report = self.env.ref("account.generic_tax_report")
+        report_options = self._generate_options(tax_report, move.date, move.date)
+        self.assertLinesValues(
+            tax_report._get_lines(report_options),
+            #   Name                               Net           Tax
+            [   0,                                   1,           2],
+            [
+                ("Sales",                           '',       108.2),
+                (f"{regular_tax.name} (42.0%)",    200,        84),
+                (f"{caba_tax.name} (10.0%)",       242,        24.2),
+                ("Total Sales",                     '',       108.2),
+            ],
+            report_options,
+        )
+
+    @freeze_time('2023-10-05 02:00:00')
+    def test_tax_report_grid_caba_negative_inv_line(self):
+        """ Tests cash basis taxes work properly in case a line of the invoice
+        has been made with a negative quantities and taxes (causing debit and
+        credit to be inverted on the base line).
+        """
+        def neg_line_invoice_generator(inv_type, partner, account, date, tax):
+            """ Invoices created here have a line at 100 with a negative quantity of -1.
+            They also required a second line (here 200), so that the invoice doesn't
+            have a negative total, but we don't put any tax on it.
+            """
+            return self.env['account.move'].create({
+                'move_type': inv_type,
+                'partner_id': partner.id,
+                'invoice_date': date,
+                'invoice_line_ids': [
+                    Command.create({
+                        'name': 'test',
+                        'quantity': -1,
+                        'account_id': account.id,
+                        'price_unit': 100,
+                        'tax_ids': [Command.set(tax.ids)],
+                    }),
+
+                    # Second line, so that the invoice doesn't have a negative total
+                    Command.create({
+                        'name': 'test',
+                        'quantity': 1,
+                        'account_id': account.id,
+                        'price_unit': 200,
+                        'tax_ids': [],
+                    }),
+                ],
+            })
+
+        # -100 (base, invoice) + 100 (base, refund) - 20 (tax, invoice) + 5 (25% tax, refund) = -15
+        self._run_caba_generic_test(
+            #   Name                      Balance
+            [   0,                        1],
+            [
+                ('Sale',                     -15),
+                ('Purchase',                 -15),
+            ],
+            on_invoice_created=self._register_full_payment_for_invoice,
+            invoice_generator=neg_line_invoice_generator,
+        )
+
+    def test_fiscal_position_switch_all_option_flow(self):
+        """ 'all' fiscal position option sometimes must be reset or enforced in order to keep
+        the report consistent. We check those cases here.
+        """
+        foreign_tax_report = self.env['account.report'].create({
+            'name': "",
+            'country_id': self.foreign_country.id,
+            'root_report_id': self.env.ref("account.generic_tax_report").id,
+            'column_ids': [Command.create({'name': 'balance', 'sequence': 1, 'expression_label': 'balance'})],
+        })
+        foreign_vat_fpos = self.env['account.fiscal.position'].create({
+            'name': "Test fpos",
+            'country_id': self.foreign_country.id,
+            'foreign_vat': '422211',
+        })
+
+        # Case 1: 'all' allowed if multiple fpos
+        to_check = self.basic_tax_report.get_options({'fiscal_position': 'all', 'selected_variant_id': self.basic_tax_report.id})
+        self.assertEqual(to_check['fiscal_position'], 'all', "Opening the report with 'all' fiscal_position option should work if there are fiscal positions for different states in that country")
+
+        # Case 2: 'all' not allowed if domestic and no fpos
+        self.foreign_vat_fpos.foreign_vat = None # No unlink because setupClass created some moves with it
+        to_check = self.basic_tax_report.get_options({'fiscal_position': 'all', 'selected_variant_id': self.basic_tax_report.id})
+        self.assertEqual(to_check['fiscal_position'], 'domestic', "Opening the domestic report with 'all' should change to 'domestic' if there's no state-specific fiscal position in the country")
+
+        # Case 3: 'all' not allowed on foreign report with 1 fpos
+        to_check = foreign_tax_report.get_options({'fiscal_position': 'all', 'selected_variant_id': foreign_tax_report.id})
+        self.assertEqual(to_check['fiscal_position'], foreign_vat_fpos.id, "Opening a foreign report with only one single fiscal position with 'all' option should change if to only select this fiscal position")
+
+        # Case 4: always 'all' on generic report
+        generic_tax_report = self.env.ref("account.generic_tax_report")
+        to_check = generic_tax_report.get_options({'fiscal_position': foreign_vat_fpos.id, 'selected_variant_id': generic_tax_report.id})
+        self.assertEqual(to_check['fiscal_position'], 'all', "The generic report should always use 'all' fiscal position option.")
+
+    def test_tax_report_multi_inv_line_no_rep_account(self):
+        """ Tests the behavior of the tax report when using a tax without any
+        repartition account (hence doing its tax lines on the base account),
+        and using the tax on two lines (to make sure grouping is handled
+        properly by the report).
+        We do that for both regular and cash basis taxes.
+        """
+        # Create taxes
+        regular_tax = self.env['account.tax'].create({
+            'name': 'Regular',
+            'amount': 42,
+            'amount_type': 'percent',
+            'type_tax_use': 'sale',
+            # We use default repartition: 1 base line, 1 100% tax line
+        })
+
+        caba_tax = self.env['account.tax'].create({
+            'name': 'Cash Basis',
+            'amount': 42,
+            'amount_type': 'percent',
+            'type_tax_use': 'sale',
+            'tax_exigibility': 'on_payment',
+            # We use default repartition: 1 base line, 1 100% tax line
+        })
+        self.env.company.tax_exigibility = True
+
+        # Make one invoice of 2 lines for each of our taxes
+        invoice_date = fields.Date.from_string('2021-04-01')
+        other_account_revenue = self.company_data['default_account_revenue'].copy()
+
+        regular_invoice = self.env['account.move'].create({
+            'move_type': 'out_invoice',
+            'partner_id': self.partner_a.id,
+            'invoice_date': invoice_date,
+            'invoice_line_ids': [
+                Command.create({
+                    'name': 'line 1',
+                    'account_id': self.company_data['default_account_revenue'].id,
+                    'price_unit': 100,
+                    'tax_ids': [Command.set(regular_tax.ids)],
+                }),
+
+                Command.create({
+                    'name': 'line 2',
+                    'account_id': other_account_revenue.id,
+                    'price_unit': 100,
+                    'tax_ids': [Command.set(regular_tax.ids)],
+                })
+            ],
+        })
+
+        caba_invoice = self.env['account.move'].create({
+            'move_type': 'out_invoice',
+            'partner_id': self.partner_a.id,
+            'invoice_date': invoice_date,
+            'invoice_line_ids': [
+                Command.create({
+                    'name': 'line 1',
+                    'account_id': self.company_data['default_account_revenue'].id,
+                    'price_unit': 100,
+                    'tax_ids': [Command.set(caba_tax.ids)],
+                }),
+
+                Command.create({
+                    'name': 'line 2',
+                    'account_id': other_account_revenue.id,
+                    'price_unit': 100,
+                    'tax_ids': [Command.set(caba_tax.ids)],
+                })
+            ],
+        })
+
+        # Post the invoices
+        regular_invoice.action_post()
+        caba_invoice.action_post()
+
+        # Pay cash basis invoice
+        self.env['account.payment.register'].with_context(active_ids=caba_invoice.ids, active_model='account.move').create({
+            'payment_date': invoice_date,
+        })._create_payments()
+
+        # Check the generic report
+        report = self.env.ref("account.generic_tax_report")
+        options = self._generate_options(report, invoice_date, invoice_date)
+        self.assertLinesValues(
+            report._get_lines(options),
+            #   Name                         Net               Tax
+            [   0,                             1,                2],
+            [
+                ("Sales",                     '',              168),
+                ("Regular (42.0%)",          200,               84),
+                ("Cash Basis (42.0%)",       200,               84),
+                ("Total Sales",               '',              168),
+            ],
+            options,
+        )
+
+    def test_tax_unit(self):
+        tax_unit_report = self.env['account.report'].create({
+            'name': "And now for something completely different",
+            'country_id': self.fiscal_country.id,
+            'root_report_id': self.env.ref("account.generic_tax_report").id,
+            'column_ids': [Command.create({'name': 'balance', 'sequence': 1, 'expression_label': 'balance'})],
+        })
+
+        company_1 = self.company_data['company']
+        company_2 = self.company_data_2['company']
+        company_3 = self.setup_other_company(name="Company 3")['company']
+        unit_companies = company_1 + company_2
+        all_companies = unit_companies + company_3
+
+        company_2.currency_id = company_1.currency_id
+
+        tax_unit = self.env['account.tax.unit'].create({
+            'name': "One unit to rule them all",
+            'country_id': self.fiscal_country.id,
+            'vat': "DW1234567890",
+            'company_ids': [Command.set(unit_companies.ids)],
+            'main_company_id': company_1.id,
+        })
+        tax_group_2 = self._instantiate_basic_test_tax_group(company_2)
+        self._instantiate_basic_test_tax_group(company_3)
+
+        created_taxes = {}
+        tax_accounts = {}
+        invoice_date = fields.Date.from_string('2018-01-01')
+        for index, company in enumerate(all_companies):
+            # Make sure the fiscal country is what we want
+            self.change_company_country(company, self.fiscal_country)
+
+            # Create a tax for this report
+            tax_account = self.env['account.account'].create({
+                'name': 'Tax unit test tax account',
+                'code': 'test.tax.unit',
+                'account_type': 'asset_current',
+                'company_ids': [Command.link(company.id)],
+            })
+            tax_group = self.env['account.tax.group'].search([('company_id', '=', company.id), ('name', '=', 'Test tax group')], limit=1)
+
+            test_tax = self._add_basic_tax_for_report(tax_unit_report, 42, 'sale', tax_group, [(100, tax_account, True)], company=company)
+            created_taxes[company] = test_tax
+            tax_accounts[company] = tax_account
+
+            # Create an invoice with this tax
+            self.init_invoice(
+                'out_invoice',
+                partner=self.partner_a,
+                invoice_date=invoice_date,
+                post=True,
+                amounts=[100 * (index + 1)],
+                taxes=test_tax, company=company
+            )
+
+        # Check report content, with various scenarios of active companies
+        for active_companies in (company_1, company_2, company_3, unit_companies, all_companies, company_2 + company_3):
+
+            # In the regular flow, selected companies are changed from the selector, in the UI.
+            # The tax unit option of the report changes the value of the selector, so it'll
+            # always stay consistent with allowed_company_ids.
+            options = self._generate_options(
+                tax_unit_report.with_context(allowed_company_ids=active_companies.ids),
+                invoice_date,
+                invoice_date,
+                {'fiscal_position': 'domestic'}
+            )
+
+            target_unit = tax_unit if company_3 != active_companies[0] else None
+            self.assertTrue(
+                (not target_unit and not options['available_tax_units']) \
+                or (options['available_tax_units'] and any(available_unit['id'] == target_unit.id for available_unit in options['available_tax_units'])),
+                "The tax unit should always be available when self.env.company is part of it."
+            )
+
+            self.assertEqual(
+                options['tax_unit'] != 'company_only',
+                active_companies == unit_companies,
+                "The tax unit option should only be enabled when all the companies of the unit are selected, and nothing else."
+            )
+
+            self.assertLinesValues(
+                tax_unit_report.with_context(allowed_company_ids=active_companies.ids)._get_lines(options),
+                #   Name                                                          Balance
+                [   0,                                                            1],
+                [
+                    # Company 1
+                    (f'{created_taxes[company_1].id}-invoice-base',           100 if company_1 in active_companies else 0.0),
+                    (f'{created_taxes[company_1].id}-invoice-100',             42 if company_1 in active_companies else 0.0),
+                    (f'{created_taxes[company_1].id}-refund-base',             0.0),
+                    (f'{created_taxes[company_1].id}-refund-100',              0.0),
+
+                    # Company 2
+                    (f'{created_taxes[company_2].id}-invoice-base',           200 if active_companies == unit_companies or active_companies[0] == company_2 else 0.0),
+                    (f'{created_taxes[company_2].id}-invoice-100',             84 if active_companies == unit_companies or active_companies[0] == company_2 else 0.0),
+                    (f'{created_taxes[company_2].id}-refund-base',             0.0),
+                    (f'{created_taxes[company_2].id}-refund-100',              0.0),
+
+                    # Company 3 (not part of the unit, so always 0 in our cases)
+                    (f'{created_taxes[company_3].id}-invoice-base',           300 if company_3 == active_companies[0] else 0.0),
+                    (f'{created_taxes[company_3].id}-invoice-100',            126 if company_3 == active_companies[0] else 0.0),
+                    (f'{created_taxes[company_3].id}-refund-base',             0.0),
+                    (f'{created_taxes[company_3].id}-refund-100',              0.0),
+                ],
+                options,
+            )
+
+        # Check closing for the vat unit
+        options = self._generate_options(
+            tax_unit_report.with_context(allowed_company_ids=unit_companies.ids),
+            invoice_date,
+            invoice_date,
+            {'tax_report': tax_unit_report.id, 'fiscal_position': 'all'}
+        )
+
+        self._assert_vat_closing(tax_unit_report, options, {
+            (company_1, self.env['account.fiscal.position']): [
+                {'debit': 42,       'credit':  0,       'account_id': tax_accounts[company_1].id},
+                {'debit':  0,       'credit': 42,       'account_id': self.tax_group_1.tax_payable_account_id.id},
+            ],
+
+            (company_1, self.foreign_vat_fpos): [
+                # Don't check accounts here; they are gotten by searching on taxes, basically we don't care about them as it's 0-balanced.
+                {'debit':  0,       'credit':  0,},
+                {'debit':  0,       'credit':  0,},
+            ],
+
+            (company_2, self.env['account.fiscal.position']): [
+                {'debit': 84,       'credit':  0,       'account_id': tax_accounts[company_2].id},
+                {'debit':  0,       'credit': 84,       'account_id': tax_group_2.tax_payable_account_id.id},
+            ],
+        })
+
+    def test_tax_unit_create_horizontal_group(self):
+        """ This test will try to create two tax units to see if the creation of horizontal group works as expected """
+        company_1 = self.company_data['company']
+        company_2 = self.company_data_2['company']
+        company_2.currency_id = company_1.currency_id
+        unit_companies_1 = company_1 + company_2
+
+        company_3 = self.setup_other_company(name="Company 3")['company']
+        company_4 = self.setup_other_company(name="Company 4")['company']
+        unit_companies_2 = company_3 + company_4
+
+        self.env['account.tax.unit'].create([
+            {
+                'name': "First Tax Unit",
+                'country_id': self.fiscal_country.id,
+                'vat': "DW1234567890",
+                'company_ids': [Command.set(unit_companies_1.ids)],
+                'main_company_id': company_1.id,
+            },
+            {
+                'name': "Second Tax Unit",
+                'country_id': self.fiscal_country.id,
+                'vat': "DW1234567890",
+                'company_ids': [Command.set(unit_companies_2.ids)],
+                'main_company_id': company_3.id,
+            },
+        ])
+
+        # Check if the two last horizontal_group are the one created from the tax unit
+        horizontal_groups = self.env['account.report.horizontal.group'].search([])[-2:]
+        self.assertEqual(['First Tax Unit', 'Second Tax Unit'], horizontal_groups.mapped('name'))
+
+        # Check if the generic_tax_report has the two groups
+        generic_tax_report = self.env.ref('account.generic_tax_report')
+        self.assertTrue(all(horizontal_group_id in generic_tax_report.horizontal_group_ids.ids for horizontal_group_id in horizontal_groups.ids))
+
+    def test_tax_unit_auto_fiscal_position(self):
+        # setup companies
+        company_1 = self.company_data['company']
+        company_2 = self.company_data_2['company']
+        company_2.currency_id = company_1.currency_id
+        company_3 = self.setup_other_company(name="Company 3")['company']
+        company_4 = self.setup_other_company(name="Company 4")['company']
+        unit_companies = company_1 + company_2 + company_3
+        all_companies = unit_companies + company_4
+
+        # create a tax unit containing 3 companies
+        tax_unit = self.env['account.tax.unit'].create({
+            'name': "One unit to rule them all",
+            'country_id': self.fiscal_country.id,
+            'vat': "DW1234567890",
+            'company_ids': [Command.set(unit_companies.ids)],
+            'main_company_id': company_1.id,
+        })
+        self.assertFalse(tax_unit.fpos_synced)
+        tax_unit.action_sync_unit_fiscal_positions()
+        for current_company in unit_companies:
+            # verify that partners for other companies in the unit have a fiscal position that removes taxes
+            created_fp = tax_unit._get_tax_unit_fiscal_positions(companies=current_company)
+            self.assertTrue(created_fp)
+            self.assertEqual(
+                (unit_companies - current_company).partner_id.with_company(current_company).property_account_position_id,
+                created_fp
+            )
+            self.assertTrue(created_fp.tax_ids.tax_src_id)
+            self.assertFalse(created_fp.tax_ids.tax_dest_id)
+            self.assertFalse(current_company.partner_id.with_company(current_company).property_account_position_id)
+        tax_unit._compute_fiscal_position_completion()
+        self.assertTrue(tax_unit.fpos_synced)
+
+        # remove company 3 from the unit and verify that the fiscal positions are removed from the relevant companies
+        tax_unit.write({
+            'company_ids': [Command.unlink(company_3.id)]
+        })
+        self.assertFalse(tax_unit.fpos_synced)
+        tax_unit.action_sync_unit_fiscal_positions()
+        self.assertFalse(company_3.partner_id.with_company(company_1).property_account_position_id)
+        self.assertFalse(company_1.partner_id.with_company(company_3).property_account_position_id)
+        company_1_fp = tax_unit._get_tax_unit_fiscal_positions(companies=company_1)
+        self.assertEqual(company_2.partner_id.with_company(company_1).property_account_position_id, company_1_fp)
+        self.assertTrue(tax_unit.fpos_synced)
+
+        # add company 3, remove company 2
+        tax_unit.write({
+            'company_ids': [Command.link(company_3.id), Command.unlink(company_2.id)]
+        })
+        self.assertFalse(tax_unit.fpos_synced)
+        tax_unit.action_sync_unit_fiscal_positions()
+        company_1_fp = tax_unit._get_tax_unit_fiscal_positions(companies=company_1)
+        self.assertEqual(company_3.partner_id.with_company(company_1).property_account_position_id, company_1_fp)
+        self.assertFalse(company_2.partner_id.with_company(company_1).property_account_position_id)
+        self.assertTrue(company_1.partner_id.with_company(company_3).property_account_position_id)
+
+        # remove the fiscal position from the partner of company 1
+        company_1.partner_id.with_company(company_3).property_account_position_id = False
+        self.assertFalse(tax_unit.fpos_synced)
+        tax_unit.action_sync_unit_fiscal_positions()
+        self.assertTrue(tax_unit.fpos_synced)
+
+        #replace all companies
+        tax_unit.write({
+            'company_ids': [Command.set([company_2.id, company_4.id])],
+            'main_company_id': company_2.id,
+        })
+        self.assertFalse(tax_unit.fpos_synced)
+        tax_unit.action_sync_unit_fiscal_positions()
+        self.assertTrue(tax_unit.fpos_synced)
+
+        # no fiscal positions should exist after deleting the unit
+        tax_unit.unlink()
+        for company in all_companies:
+            self.assertFalse(all_companies.partner_id.with_company(company).property_account_position_id)
+
+    def test_vat_unit_with_foreign_vat_fpos(self):
+        # Company 1 has the test country as domestic country, and a foreign VAT fpos in a different province
+        company_1 = self.company_data['company']
+
+        # Company 2 belongs to a different country, and has a foreign VAT fpos to the test country, with just one
+        # move adding 1000 in the first line of the report.
+        company_2 = self.company_data_2['company']
+        company_2.currency_id = company_1.currency_id
+
+        foreign_vat_fpos = self.env['account.fiscal.position'].create({
+            'name': 'fpos',
+            'foreign_vat': 'tagada tsoin tsoin',
+            'country_id': self.fiscal_country.id,
+            'company_id': company_2.id,
+        })
+
+        report_line = self.env['account.report.line'].search([
+            ('report_id', '=', self.basic_tax_report.id),
+            ('name', '=', f'{self.test_fpos_tax_sale.id}-invoice-base'),
+        ])
+
+        plus_tag = report_line.expression_ids._get_matching_tags("+")
+
+        comp2_move = self.env['account.move'].create({
+            'journal_id': self.company_data_2['default_journal_misc'].id,
+            'date': '2021-02-02',
+            'fiscal_position_id': foreign_vat_fpos.id,
+            'line_ids': [
+                Command.create({
+                    'account_id': self.company_data_2['default_account_assets'].id,
+                    'credit': 1000,
+                }),
+
+                Command.create({
+                    'account_id': self.company_data_2['default_account_expense'].id,
+                    'debit': 1000,
+                    'tax_tag_ids': [Command.set(plus_tag.ids)],
+                }),
+            ]
+        })
+
+        comp2_move.action_post()
+
+        # Both companies belong to a tax unit in test country
+        tax_unit = self.env['account.tax.unit'].create({
+            'name': "Taxvengers, assemble!",
+            'country_id': self.fiscal_country.id,
+            'vat': "dudu",
+            'company_ids': [Command.set((company_1 + company_2).ids)],
+            'main_company_id': company_1.id,
+        })
+
+        # Opening the tax report for test country, we should see the same as in test_tax_report_fpos_everything + the 1000 of company 2, whatever the main company
+
+        # Varying the order of the two companies (and hence changing the "main" active one) should make no difference.
+        for unit_companies in ((company_1 + company_2), (company_2 + company_1)):
+            options = self._generate_options(
+                self.basic_tax_report.with_context(allowed_company_ids=unit_companies.ids),
+                fields.Date.from_string('2021-01-01'),
+                fields.Date.from_string('2021-03-31'),
+                {'fiscal_position': 'all'}
+            )
+
+            self.assertEqual(options['tax_unit'], tax_unit.id, "The tax unit should have been auto-detected.")
+
+            self.assertLinesValues(
+                self.basic_tax_report._get_lines(options),
+                #   Name                                                          Balance
+                [   0,                                                            1],
+                [
+                    # out_invoice + 1000 from company_2 on the first line
+                    (f'{self.test_fpos_tax_sale.id}-invoice-base',          2000),
+                    (f'{self.test_fpos_tax_sale.id}-invoice-30',             150),
+                    (f'{self.test_fpos_tax_sale.id}-invoice-70',             350),
+                    (f'{self.test_fpos_tax_sale.id}-invoice--100',          -500),
+
+                    #out_refund
+                    (f'{self.test_fpos_tax_sale.id}-refund-base',           -220),
+                    (f'{self.test_fpos_tax_sale.id}-refund-30',              -33),
+                    (f'{self.test_fpos_tax_sale.id}-refund-70',              -77),
+                    (f'{self.test_fpos_tax_sale.id}-refund--100',            110),
+
+                    #in_invoice
+                    (f'{self.test_fpos_tax_purchase.id}-invoice-base',      1400),
+                    (f'{self.test_fpos_tax_purchase.id}-invoice-40',         280),
+                    (f'{self.test_fpos_tax_purchase.id}-invoice-60',         420),
+                    (f'{self.test_fpos_tax_purchase.id}-invoice--100',      -700),
+
+                    #in_refund
+                    (f'{self.test_fpos_tax_purchase.id}-refund-base',       -660),
+                    (f'{self.test_fpos_tax_purchase.id}-refund-40',         -132),
+                    (f'{self.test_fpos_tax_purchase.id}-refund-60',         -198),
+                    (f'{self.test_fpos_tax_purchase.id}-refund--100',        330),
+                ],
+                options,
+            )
+
+    @freeze_time('2023-10-05 02:00:00')
+    def test_tax_report_with_entries_with_sale_and_purchase_taxes(self):
+        """ Ensure signs are managed properly for entry moves.
+        This test runs the case where invoice/bill like entries are created and reverted.
+        """
+        today = fields.Date.today()
+        company = self.env.user.company_id
+        tax_report = self.env['account.report'].create({
+            'name': 'Test',
+            'country_id': self.fiscal_country.id,
+            'root_report_id': self.env.ref("account.generic_tax_report").id,
+            'column_ids': [Command.create({'name': 'balance', 'sequence': 1, 'expression_label': 'balance'})],
+        })
+
+        # We create some report lines
+        report_lines_dict = {
+            'sale': [
+                self._create_tax_report_line('Sale base', tax_report, sequence=1, tag_name='sale_b'),
+                self._create_tax_report_line('Sale tax', tax_report, sequence=1, tag_name='sale_t'),
+            ],
+            'purchase': [
+                self._create_tax_report_line('Purchase base', tax_report, sequence=2, tag_name='purchase_b'),
+                self._create_tax_report_line('Purchase tax', tax_report, sequence=2, tag_name='purchase_t'),
+            ],
+        }
+
+        # We create a sale and a purchase tax, linked to our report line tags
+        taxes = self._create_taxes_for_report_lines(report_lines_dict, company)
+
+        account_types = {
+            'sale': 'income',
+            'purchase': 'expense',
+        }
+        for tax in taxes:
+            account = self.env['account.account'].search([('company_ids', '=', company.id), ('account_type', '=', account_types[tax.type_tax_use])], limit=1)
+            # create one entry and it's reverse
+            move_form = Form(self.env['account.move'].with_context(default_move_type='entry'))
+            with move_form.line_ids.new() as line:
+                line.account_id = account
+                if tax.type_tax_use == 'sale':
+                    line.credit = 1000
+                else:
+                    line.debit = 1000
+                line.tax_ids.clear()
+                line.tax_ids.add(tax)
+
+            # Create a third account.move.line for balance.
+            with move_form.line_ids.new() as line:
+                line.account_id = account
+                if tax.type_tax_use == 'sale':
+                    line.debit = 1200
+                else:
+                    line.credit = 1200
+            move = move_form.save()
+            move.action_post()
+            refund_wizard = self.env['account.move.reversal'].with_context(active_model="account.move", active_ids=move.ids).create({
+                'reason': 'reasons',
+                'journal_id': self.company_data['default_journal_misc'].id,
+            })
+            refund_wizard.modify_moves()
+
+            self.assertEqual(
+                move.line_ids.tax_repartition_line_id,
+                move.reversal_move_ids.line_ids.tax_repartition_line_id,
+                "The same repartition line should be used when reverting a misc operation, to ensure they sum up to 0 in all cases."
+            )
+
+        options = self._generate_options(tax_report, today, today)
+
+        # We check the taxes on entries have impacted the report properly
+        inv_report_lines = tax_report._get_lines(options)
+
+        self.assertLinesValues(
+            inv_report_lines,
+            #   Name                         Balance
+            [   0,                           1],
+            [
+                ('Sale base',              0.0),
+                ('Sale tax',               0.0),
+                ('Purchase base',          0.0),
+                ('Purchase tax',           0.0),
+            ],
+            options,
+        )
+
+    @freeze_time('2023-10-05 02:00:00')
+    def test_invoice_like_entry_reverse_caba_report(self):
+        """ Cancelling the reconciliation of an invoice using cash basis taxes should reverse the cash basis move
+        in such a way that the original cash basis move lines' impact falls down to 0.
+        """
+        self.env.company.tax_exigibility = True
+
+        tax_report = self.env['account.report'].create({
+            'name': 'CABA test',
+            'country_id': self.fiscal_country.id,
+            'root_report_id': self.env.ref("account.generic_tax_report").id,
+            'column_ids': [Command.create({'name': 'balance', 'sequence': 1, 'expression_label': 'balance'})],
+        })
+        report_line_invoice_base = self._create_tax_report_line('Invoice base', tax_report, sequence=1, tag_name='caba_invoice_base')
+        report_line_invoice_tax = self._create_tax_report_line('Invoice tax', tax_report, sequence=2, tag_name='caba_invoice_tax')
+        report_line_refund_base = self._create_tax_report_line('Refund base', tax_report, sequence=3, tag_name='caba_refund_base')
+        report_line_refund_tax = self._create_tax_report_line('Refund tax', tax_report, sequence=4, tag_name='caba_refund_tax')
+
+        tax = self.env['account.tax'].create({
+            'name': 'The Tax Who Says Ni',
+            'type_tax_use': 'sale',
+            'amount': 42,
+            'tax_exigibility': 'on_payment',
+            'invoice_repartition_line_ids': [
+                Command.create({
+                    'repartition_type': 'base',
+                    'tag_ids': [Command.set(report_line_invoice_base.expression_ids._get_matching_tags("+").ids)],
+                }),
+                Command.create({
+                    'repartition_type': 'tax',
+                    'tag_ids': [Command.set(report_line_invoice_tax.expression_ids._get_matching_tags("+").ids)],
+                }),
+            ],
+            'refund_repartition_line_ids': [
+                Command.create({
+                    'repartition_type': 'base',
+                    'tag_ids': [Command.set(report_line_refund_base.expression_ids._get_matching_tags("+").ids)],
+                }),
+                Command.create({
+                    'repartition_type': 'tax',
+                    'tag_ids': [Command.set(report_line_refund_tax.expression_ids._get_matching_tags("+").ids)],
+                }),
+            ],
+        })
+
+        move_form = Form(self.env['account.move'] \
+                    .with_company(self.company_data['company']) \
+                    .with_context(default_move_type='entry'))
+        move_form.date = fields.Date.today()
+        with move_form.line_ids.new() as base_line_form:
+            base_line_form.name = "Base line"
+            base_line_form.account_id = self.company_data['default_account_revenue']
+            base_line_form.credit = 100
+            base_line_form.tax_ids.clear()
+            base_line_form.tax_ids.add(tax)
+
+        with move_form.line_ids.new() as receivable_line_form:
+            receivable_line_form.name = "Receivable line"
+            receivable_line_form.account_id = self.company_data['default_account_receivable']
+            receivable_line_form.debit = 142
+        move = move_form.save()
+        move.action_post()
+        # make payment
+        payment = self.env['account.payment'].create({
+            'payment_type': 'inbound',
+            'payment_method_id': self.env.ref('account.account_payment_method_manual_in').id,
+            'partner_type': 'customer',
+            'partner_id': self.partner_a.id,
+            'amount': 142,
+            'date': move.date,
+            'journal_id': self.company_data['default_journal_bank'].id,
+        })
+        payment.action_post()
+
+        report_options = self._generate_options(tax_report, move.date, move.date)
+        self.assertLinesValues(
+            tax_report._get_lines(report_options),
+            #   Name                                       Balance
+            [   0,                                               1],
+            [
+                ('Invoice base',                               0.0),
+                ('Invoice tax',                                0.0),
+                ('Refund base',                                0.0),
+                ('Refund tax',                                 0.0),
+            ],
+            report_options,
+        )
+
+        # Reconcile the move with a payment
+        (payment.move_id + move).line_ids.filtered(lambda x: x.account_id == self.company_data['default_account_receivable']).reconcile()
+        self.assertLinesValues(
+            tax_report._get_lines(report_options),
+            #   Name                                       Balance
+            [   0,                                               1],
+            [
+                ('Invoice base',                               100),
+                ('Invoice tax',                                 42),
+                ('Refund base',                                0.0),
+                ('Refund tax',                                 0.0),
+            ],
+            report_options,
+        )
+
+        # Unreconcile the moves
+        move.line_ids.remove_move_reconcile()
+        self.assertLinesValues(
+            tax_report._get_lines(report_options),
+            #   Name                                       Balance
+            [   0,                                               1],
+            [
+                ('Invoice base',                               0.0),
+                ('Invoice tax',                                0.0),
+                ('Refund base',                                0.0),
+                ('Refund tax',                                 0.0),
+            ],
+            report_options,
+        )
+
+    def test_tax_report_get_past_closing_entry(self):
+        options = self._generate_options(self.basic_tax_report, '2021-01-01', '2021-12-31')
+
+        with patch.object(type(self.env['account.move']), '_get_vat_report_attachments', autospec=True, side_effect=lambda *args, **kwargs: []):
+            # Generate the tax closing entry and close the period without posting it, so that we can assert on the exception
+            vat_closing_move = self.env['account.generic.tax.report.handler']._generate_tax_closing_entries(self.basic_tax_report, options)
+            vat_closing_move.action_post()
+
+        # Calling the action_periodic_vat_entries method should return the existing tax closing entry.
+        vat_closing_action = self.env['account.generic.tax.report.handler'].with_context({'override_tax_closing_warning': True}).action_periodic_vat_entries(options)
+        self.assertEqual(vat_closing_move.id, vat_closing_action['res_id'])
+
+    def setup_multi_vat_context(self):
+        """Setup 2 tax reports, taxes and partner to represent a multiVat context in which both taxes affect both tax report"""
+
+        def get_positive_tag(report_line):
+            return report_line.expression_ids._get_matching_tags().filtered(lambda x: not x.tax_negate)
+
+        self.env['account.fiscal.position'].create({
+            'name': "FP With foreign VAT number",
+            'country_id': self.foreign_country.id,
+            'foreign_vat': '422211',
+            'auto_apply': True,
+        })
+
+        local_tax_report, foreign_tax_report = self.env['account.report'].create([
+            {
+                'name': "The Local Tax Report",
+                'country_id': self.company_data['company'].account_fiscal_country_id.id,
+                'root_report_id': self.env.ref('account.generic_tax_report').id,
+                'column_ids': [Command.create({'name': 'balance', 'sequence': 1, 'expression_label': 'balance'})],
+            },
+            {
+                'name': "The Foreign Tax Report",
+                'country_id': self.foreign_country.id,
+                'root_report_id': self.env.ref('account.generic_tax_report').id,
+                'column_ids': [Command.create({'name': 'balance', 'sequence': 1, 'expression_label': 'balance', })],
+            },
+        ])
+        local_tax_report_base_line = self._create_tax_report_line("base_local", local_tax_report, sequence=1, code="base_local", tag_name="base_local")
+        local_tax_report_tax_line = self._create_tax_report_line("tax_local", local_tax_report, sequence=2, code="tax_local", tag_name="tax_local")
+        foreign_tax_report_base_line = self._create_tax_report_line("base_foreign", foreign_tax_report, sequence=1, code="base_foreign", tag_name="base_foreign")
+        foreign_tax_report_tax_line = self._create_tax_report_line("tax_foreign", foreign_tax_report, sequence=2, code="tax_foreign", tag_name="tax_foreign")
+
+        local_tax_affecting_foreign_tax_report = self.env['account.tax'].create({'name': "The local tax affecting the foreign report", 'amount': 20})
+        foreign_tax_affecting_local_tax_report = self.env['account.tax'].create({
+            'name': "The foreign tax affecting the local tax report",
+            'amount': 20,
+            'country_id': self.foreign_country.id,
+        })
+        for tax in (local_tax_affecting_foreign_tax_report, foreign_tax_affecting_local_tax_report):
+            base_line, tax_line = tax.invoice_repartition_line_ids
+            base_line.tag_ids = get_positive_tag(local_tax_report_base_line) + get_positive_tag(foreign_tax_report_base_line)
+            tax_line.tag_ids = get_positive_tag(local_tax_report_tax_line) + get_positive_tag(foreign_tax_report_tax_line)
+
+        local_partner = self.partner_a
+        foreign_partner = self.partner_a.copy()
+        foreign_partner.country_id = self.foreign_country
+
+        return {
+            'tax_report': (local_tax_report, foreign_tax_report,),
+            'taxes': (local_tax_affecting_foreign_tax_report, foreign_tax_affecting_local_tax_report,),
+            'partners': (local_partner, foreign_partner),
+        }
+
+    def test_local_tax_can_affect_foreign_tax_report(self):
+        setup_data = self.setup_multi_vat_context()
+        local_tax_report, foreign_tax_report = setup_data['tax_report']
+        local_tax_affecting_foreign_tax_report, _ = setup_data['taxes']
+        local_partner, _ = setup_data['partners']
+
+        invoice = self.init_invoice('out_invoice', partner=local_partner, invoice_date='2022-12-01', post=True, amounts=[100], taxes=local_tax_affecting_foreign_tax_report)
+        options = self._generate_options(local_tax_report, invoice.date, invoice.date)
+        self.assertLinesValues(
+            local_tax_report._get_lines(options),
+            #   Name                                        Balance
+            [   0,                                                1],
+            [
+                ("base_local",                                100.0),
+                ("tax_local",                                  20.0),
+            ],
+            options,
+        )
+
+        options = self._generate_options(foreign_tax_report, invoice.date, invoice.date)
+        self.assertLinesValues(
+            foreign_tax_report._get_lines(options),
+            #   Name                                          Balance
+            [   0,                                                1],
+            [
+                ("base_foreign",                              100.0),
+                ("tax_foreign",                                20.0),
+            ],
+            options,
+        )
+
+    def test_foreign_tax_can_affect_local_tax_report(self):
+        setup_data = self.setup_multi_vat_context()
+        local_tax_report, foreign_tax_report = setup_data['tax_report']
+        _, foreign_tax_affecting_local_tax_report = setup_data['taxes']
+        _, foreign_partner = setup_data['partners']
+
+        invoice = self.init_invoice('out_invoice', partner=foreign_partner, invoice_date='2022-12-01', post=True, amounts=[100], taxes=foreign_tax_affecting_local_tax_report)
+        options = self._generate_options(local_tax_report, invoice.date, invoice.date)
+        self.assertLinesValues(
+            local_tax_report._get_lines(options),
+            #   Name                                        Balance
+            [   0,                                                1],
+            [
+                ("base_local",                                100.0),
+                ("tax_local",                                  20.0),
+            ],
+            options,
+        )
+
+        options = self._generate_options(foreign_tax_report, invoice.date, invoice.date)
+        self.assertLinesValues(
+            foreign_tax_report._get_lines(options),
+            #   Name                                          Balance
+            [   0,                                                1],
+            [
+                ("base_foreign",                              100.0),
+                ("tax_foreign",                                20.0),
+            ],
+            options,
+        )
+    def test_engine_external_many_fiscal_positions(self):
+        # Create a tax report that contains default manual expressions
+        self.basic_tax_report_2 = self.env['account.report'].create({
+            'name': "The Other Tax Report",
+            'country_id': self.fiscal_country.id,
+            'root_report_id': self.env.ref("account.generic_tax_report").id,
+            'column_ids': [Command.create({'name': 'balance', 'sequence': 1, 'expression_label': 'balance'})],
+            'line_ids': [
+                Command.create({
+                    'name': "test_line_1",
+                    'code': "test_line_1",
+                    'sequence': 1,
+                    'expression_ids': [
+                        Command.create({
+                            'date_scope': 'strict_range',
+                            'engine': 'external',
+                            'formula': 'sum',
+                            'label': 'balance',
+                        }),
+                        Command.create({
+                            'date_scope': 'strict_range',
+                            'engine': 'account_codes',
+                            'formula': '101',
+                            'label': '_default_balance',
+                        })
+                    ]
+                }),
+                Command.create({
+                    'name': "test_line_2",
+                    'code': "test_line_2",
+                    'sequence': 2,
+                    'expression_ids': [
+                        Command.create({
+                            'date_scope': 'strict_range',
+                            'engine': 'account_codes',
+                            'formula': '101',
+                            'label': 'balance',
+                        })
+                    ],
+                })
+            ]
+        })
+
+        company_2 = self.company_data_2['company']
+        company_2.country_id = self.fiscal_country
+        company_2.currency_id = self.company_data['company'].currency_id
+
+        # create two foreign fiscal positions (FPs), so we could create moves for each of them
+        foreign_vat_fpos = self.env['account.fiscal.position'].create([
+            {
+                'name': 'fpos 1',
+                'foreign_vat': 'A Swallow from Africa',
+                'country_id': self.fiscal_country.id,
+                'company_id': company_2.id,
+                'state_ids': self.country_state_1,
+            },
+            {
+                'name': 'fpos 2',
+                'foreign_vat': 'A Swallow from Europe',
+                'country_id': self.fiscal_country.id,
+                'company_id': company_2.id,
+                'state_ids': self.country_state_2,
+            },
+        ])
+
+        test_account_1 = self.env['account.account'].create({
+            'code': "101007",
+            'name': "test account",
+            'account_type': "asset_current",
+            'company_ids': [Command.link(company_2.id)],
+        })
+
+        test_account_2 = self.env['account.account'].create({
+            'code': "test",
+            'name': "test",
+            'account_type': "asset_current",
+            'company_ids': [Command.link(company_2.id)],
+        })
+
+        move_vals = [{
+            'date': fields.Date.from_string('2020-01-01'),
+            'fiscal_position_id': fp.id,
+            'company_id': company_2.id,
+            'line_ids': [
+                Command.create({
+                    'name': 'line 1',
+                    'account_id': test_account_1.id,
+                    'debit': 1000 * (i + 1),
+                    'credit': 0.0,
+                }),
+                Command.create({
+                    'name': 'line 2',
+                    'account_id': test_account_2.id,
+                    'debit': 0.0,
+                    'credit': 1000 * (i + 1),
+                }),
+            ]
+        } for i, fp in enumerate(foreign_vat_fpos)]
+
+        # create a move that includes an account starting with '101'
+        # to make sure its amount does not appear in the tax report for company_2
+        other_company_move_vals = {
+            'date': fields.Date.from_string('2020-01-01'),
+            'company_id': self.company_data['company'].id,
+            'line_ids': [
+                Command.create({
+                    'name': 'line 1',
+                    'account_id': self.company_data['default_account_revenue'].id,
+                    'debit': 1200,
+                    'credit': 0.0,
+                }),
+                Command.create({
+                    'name': 'line 2',
+                    'account_id': self.company_data['default_account_assets'].id,
+                    'debit': 0.0,
+                    'credit': 1200,
+                }),
+            ]
+        }
+
+        moves = self.env['account.move'].create(move_vals)
+        moves.action_post()
+        other_company_move = self.env['account.move'].create(other_company_move_vals)
+        other_company_move.action_post()
+
+        # we need to create different options per FP
+        fiscal_positions = ['all'] + foreign_vat_fpos.ids
+        report_options = {}
+        for fp in fiscal_positions:
+            fp_options = self._generate_options(
+                self.basic_tax_report_2.with_context(allowed_company_ids=[company_2.id]),
+                '2020-01-01', '2020-01-04',
+                default_options={
+                    'fiscal_position': fp,
+                }
+            )
+            report_options[fp] = fp_options
+
+        # when we filter by all FPs, the result on the second line
+        # should be the sum of the moves
+        # the first line contains a default expression and remains empty
+        # until we set a lock date
+        total_amount = sum([1000 * (i + 1) for i in range(len(foreign_vat_fpos.ids))])
+        report_lines = self.basic_tax_report_2\
+            .with_company(company_2)._get_lines(report_options['all'])
+        self.assertLinesValues(
+            # pylint: disable=bad-whitespace
+            report_lines,
+            [0,                             1],
+            [
+                ('test_line_1',           0.0),
+                ('test_line_2',  total_amount),
+            ],
+            report_options['all'],
+        )
+
+        # subsequently, line 2 should only contain the amount for the selected FP
+        for i, fp in enumerate(foreign_vat_fpos.ids):
+            report_lines = self.basic_tax_report_2\
+                .with_company(company_2)._get_lines(report_options[fp])
+            self.assertLinesValues(
+                # pylint: disable=bad-whitespace
+                report_lines,
+                [0,                               1],
+                [
+                    ('test_line_1',            0.0),
+                    ('test_line_2', 1000 * (i + 1)),
+                ],
+                report_options[fp],
+            )
+
+        # the default values shouldn't be created if the general lock date is set
+        lock_date_wizard = self.env['account.change.lock.date']\
+            .with_company(company_2).create({
+            'fiscalyear_lock_date': fields.Date.from_string('2020-01-04'),
+        })
+        lock_date_wizard.change_lock_date()
+
+        report_lines = self.basic_tax_report_2\
+            .with_company(company_2)._get_lines(report_options['all'])
+        self.assertLinesValues(
+            # pylint: disable=bad-whitespace
+            report_lines,
+            [0,                             1],
+            [
+                ('test_line_1',           0.0),
+                ('test_line_2',  total_amount),
+            ],
+            report_options['all'],
+        )
+
+        # We need to reset the fiscalyear_lock_date or it will raise an exception
+        company_2.fiscalyear_lock_date = False
+
+        # if we change the tax_lock_date, the default values should be created
+        lock_date_wizard = self.env['account.change.lock.date']\
+            .with_company(company_2).create({
+            'tax_lock_date': fields.Date.from_string('2020-01-04'),
+        })
+        lock_date_wizard.change_lock_date()
+
+        report_lines = self.basic_tax_report_2\
+            .with_company(company_2)._get_lines(report_options['all'])
+        self.assertLinesValues(
+            # pylint: disable=bad-whitespace
+            report_lines,
+            [0,                             1],
+            [
+                ('test_line_1',  total_amount),
+                ('test_line_2',  total_amount),
+            ],
+            report_options['all'],
+        )
+
+        for i, fp in enumerate(foreign_vat_fpos.ids):
+            report_lines = self.basic_tax_report_2\
+                .with_company(company_2)._get_lines(report_options[fp])
+            self.assertLinesValues(
+                # pylint: disable=bad-whitespace
+                report_lines,
+                [0,                               1],
+                [
+                    ('test_line_1', 1000 * (i + 1)),
+                    ('test_line_2', 1000 * (i + 1)),
+                ],
+                report_options[fp],
+            )
+
+    def test_tax_report_w_rounding_line(self):
+        """Check that the tax report is correct when a rounding line is added to an invoice."""
+        self.env['res.config.settings'].create({
+            'company_id': self.company_data['company'].id,
+            'group_cash_rounding': True
+        })
+
+        rounding = self.env['account.cash.rounding'].create({
+            'name': 'Test rounding',
+            'rounding': 0.05,
+            'strategy': 'biggest_tax',
+            'rounding_method': 'HALF-UP',
+        })
+
+        tax = self.sale_tax_percentage_incl_1.copy({
+            'name': 'The Tax Who Says Ni',
+            'amount': 21,
+        })
+
+        invoice = self.env['account.move'].create({
+            'move_type': 'out_invoice',
+            'partner_id': self.partner_a.id,
+            'invoice_line_ids': [
+                Command.create({
+                    'name': 'The Holy Grail',
+                    'quantity': 1,
+                    'price_unit': 1.26,
+                    'tax_ids': [Command.set(self.sale_tax_percentage_incl_1.ids)],
+                }),
+                Command.create({
+                    'name': 'What is your favourite colour?',
+                    'quantity': 1,
+                    'price_unit': 2.32,
+                    'tax_ids': [Command.set(tax.ids)],
+                })
+            ],
+            'invoice_cash_rounding_id': rounding.id,
+        })
+
+        invoice.action_post()
+
+        self.assertRecordValues(invoice.line_ids, [
+            {
+                'name': 'The Holy Grail',
+                'debit': 0.00,
+                'credit': 1.05,
+            },
+            {
+                'name': 'What is your favourite colour?',
+                'debit': 0.00,
+                'credit': 1.92,
+            },
+            {
+                'name': self.sale_tax_percentage_incl_1.name,
+                'debit': 0.00,
+                'credit': 0.21,
+            },
+            {
+                'name': tax.name,
+                'debit': 0.00,
+                'credit': 0.40,
+            },
+            {
+                'name': f'{tax.name} (rounding)',
+                'debit': 0.00,
+                'credit': 0.02,
+            },
+            {
+                'name': invoice.name,
+                'debit': 3.60,
+                'credit': 0.00,
+            }
+        ])
+
+        report = self.env.ref('account.generic_tax_report')
+        options = self._generate_options(report, invoice.date, invoice.date)
+
+        self.assertLinesValues(
+            report._get_lines(options),
+            #   Name                                                                                         Base      Tax
+            [   0,                                                                                           1,        2],
+            [
+                ('Sales',                                                                                   "",     0.63),
+                (f'{self.sale_tax_percentage_incl_1.name} ({self.sale_tax_percentage_incl_1.amount}%)',   1.05,     0.21),
+                (f'{tax.name} ({tax.amount}%)',                                                           1.92,     0.42),
+                ('Total Sales',                                                                            "",      0.63),
+            ],
+            options
+        )
+
+        report = self.env.ref("account.generic_tax_report_account_tax")
+        options['report_id'] = report.id
+
+        self.assertLinesValues(
+            report._get_lines(options),
+            #   Name                                                                                         Base      Tax
+            [   0,                                                                                           1,        2],
+            [
+                ('Sales',                                                                                   "",     0.63),
+                (self.company_data['default_account_revenue'].display_name,                                 "",     0.63),
+                (f'{self.sale_tax_percentage_incl_1.name} ({self.sale_tax_percentage_incl_1.amount}%)',   1.05,     0.21),
+                (f'{tax.name} ({tax.amount}%)',                                                           1.92,     0.42),
+                (f'Total {self.company_data["default_account_revenue"].display_name}',                      "",     0.63),
+                ('Total Sales',                                                                             "",     0.63),
+            ],
+            options
+        )
+
+        report = self.env.ref("account.generic_tax_report_tax_account")
+        options['report_id'] = report.id
+
+        self.assertLinesValues(
+            report._get_lines(options),
+            #   Name                                                                                               Base      Tax
+            [   0,                                                                                                 1,        2],
+            [
+                ('Sales',                                                                                         "",     0.63),
+                (f'{self.sale_tax_percentage_incl_1.name} ({self.sale_tax_percentage_incl_1.amount}%)',           "",     0.21),
+                (self.company_data['default_account_revenue'].display_name,                                     1.05,     0.21),
+                (f'Total {self.sale_tax_percentage_incl_1.name} ({self.sale_tax_percentage_incl_1.amount}%)',     "",     0.21),
+                (f'{tax.name} ({tax.amount}%)',                                                                   "",     0.42),
+                (self.company_data['default_account_revenue'].display_name,                                     1.92,     0.42),
+                (f'Total {tax.name} ({tax.amount}%)',                                                             "",     0.42),
+                ('Total Sales',                                                                                   "",     0.63),
+            ],
+            options
+        )
+
+    def test_tax_report_closing_entry_reset_to_draft(self):
+        """
+        Test the reset to draft functionality to ensure no duplicate closing entry is created.
+
+        This test checks that when a tax report closing entry is posted and then reset to draft,
+        creating a subsequent closing entry will not result in a duplicate. Instead, the same
+        initial closing entry will be reused.
+        """
+        options = self._generate_options(self.basic_tax_report, '2021-03-01', '2021-03-31')
+        vat_closing_action = self.env['account.generic.tax.report.handler'].with_context({'override_tax_closing_warning': True}).action_periodic_vat_entries(options)
+        initial_closing_entry = self.env['account.move'].browse(vat_closing_action['res_id'])
+        with self.enter_test_mode():
+            initial_closing_entry.action_post()
+        initial_closing_entry.button_draft()
+        vat_closing_action = self.env['account.generic.tax.report.handler'].with_context({'override_tax_closing_warning': True}).action_periodic_vat_entries(options)
+        subsequent_closing_entry  = self.env['account.move'].browse(vat_closing_action['res_id'])
+        self.assertEqual(initial_closing_entry, subsequent_closing_entry)
+
+    def test_tax_report_closing_entry_draft_with_new_entries(self):
+        """
+        Test whether the tax closing entry gets untouched when reset to draft and the VAT closing button is clicked again.
+        """
+        options = self._generate_options(self.basic_tax_report, '2023-01-01', '2023-03-31')
+        self.init_invoice('out_invoice', partner=self.partner_a, invoice_date='2023-03-22', post=True, amounts=[200], taxes=self.tax_sale_a)
+        initial_vat_closing_action = self.env['account.generic.tax.report.handler'].with_context({'override_tax_closing_warning': True}).action_periodic_vat_entries(options)
+        initial_closing_entry = self.env['account.move'].browse(initial_vat_closing_action['res_id'])
+        initial_values = []
+        for aml in initial_closing_entry.line_ids:
+            self.assertEqual(aml.balance, 30 if aml.balance > 0 else -30)
+            initial_values.append({'account_id': aml.account_id.id, 'balance': aml.balance})
+        self.init_invoice('out_invoice', partner=self.partner_a, invoice_date='2023-03-22', post=True, amounts=[1000], taxes=self.tax_sale_a)
+        subsequent_vat_closing_action = self.env['account.generic.tax.report.handler'].with_context({'override_tax_closing_warning': True}).action_periodic_vat_entries(options)
+        subsequent_closing_entry  = self.env['account.move'].browse(subsequent_vat_closing_action['res_id'])
+        self.assertRecordValues(subsequent_closing_entry.line_ids, [
+            {'account_id': initial_values[0]['account_id'], 'balance': initial_values[0]['balance']},
+            {'account_id': initial_values[1]['account_id'], 'balance': initial_values[1]['balance']},
+        ])
+
+    def test_tax_report_multi_company_post_closing(self):
+        # Branches
+        root_company = self.setup_other_company(name="Root Company")['company']
+        branch_1 = self.env['res.company'].create({'name': "Branch 1", 'parent_id': root_company.id})
+        branch_1_1 = self.env['res.company'].create({'name': "Branch 1.1", 'parent_id': branch_1.id})
+        branch_2 = self.env['res.company'].create({'name': "Branch 2", 'parent_id': root_company.id})
+        branch_companies = root_company + branch_1 + branch_1_1 + branch_2
+        branch_companies.account_tax_periodicity_journal_id = root_company.account_tax_periodicity_journal_id.id
+
+        # Tax unit
+        unit_part_1 = self.setup_other_company(name="Unit part 1")['company']
+        unit_part_2 = self.setup_other_company(name="Unit part 2")['company']
+
+        tax_unit = self.env['account.tax.unit'].create({
+            'name': "One unit to rule them all",
+            'country_id': unit_part_1.account_fiscal_country_id.id,
+            'vat': "123",
+            'company_ids': (unit_part_1 + unit_part_2).ids,
+            'main_company_id': unit_part_1.id,
+        })
+
+        tax_report = self.env['account.report'].create({
+            'name': "My Onw Particular Tax Report",
+            'country_id': unit_part_1.account_fiscal_country_id.id,
+            'root_report_id': self.env.ref("account.generic_tax_report").id,
+            'column_ids': [Command.create({'name': 'balance', 'sequence': 1, 'expression_label': 'balance',})],
+        })
+
+        for test_type, main_company, active_companies in [('branches', root_company, branch_companies), ('tax units', tax_unit.main_company_id, tax_unit.company_ids)]:
+            with self.subTest(f"Post multicompany closing - {test_type}"):
+                tax_report_with_companies = tax_report.with_context(allowed_company_ids=active_companies.ids)
+                options = self._generate_options(tax_report_with_companies, '2023-01-01', '2023-01-01')
+                closing_moves = self.env['account.generic.tax.report.handler'].with_context(allowed_company_ids=active_companies.ids)._generate_tax_closing_entries(tax_report_with_companies, options)
+
+                self.assertEqual(len(closing_moves), len(active_companies), "One closing move should have been created per company")
+                self.assertTrue(all(move.state == 'draft' for move in closing_moves), "All generated closing moves should be in draft")
+                main_closing_move = closing_moves.filtered(lambda x: x.company_id == main_company)
+                self.assertEqual(len(main_closing_move), 1)
+
+                with self.enter_test_mode():
+                    action = main_closing_move.action_post()
+                    self.assertTrue(action['params']['depending_action'])
+                    # When posting the main closing move a component will open to propose you to post the depending moves.
+                    # So while the depending moves are not posted the main closing will not be posted.
+                    self.assertTrue(main_closing_move.state == 'draft')
+                    (closing_moves - main_closing_move).action_post()
+                    self.assertTrue(all(move.state == 'posted' for move in (closing_moves - main_closing_move)))
+                    main_closing_move.action_post()
+                    self.assertTrue(main_closing_move.state == 'posted')
+    def test_tax_report_prevent_draft_if_subsequent_posted(self):
+        """
+        Test the reset to draft functionality to ensure it is not possible to reset to draft a closing entry
+        if subsequent closing entries are already posted.
+        """
+        options = self._generate_options(self.basic_tax_report, '2023-01-01', '2023-03-31')
+        vat_closing_action = self.env['account.generic.tax.report.handler'].with_context({'override_tax_closing_warning': True}).action_periodic_vat_entries(options)
+        Q1_closing_entry = self.env['account.move'].browse(vat_closing_action['res_id'])
+        with self.enter_test_mode():
+            Q1_closing_entry.action_post()
+
+        options = self._generate_options(self.basic_tax_report, '2023-04-01', '2023-06-30')
+        vat_closing_action = self.env['account.generic.tax.report.handler'].with_context({'override_tax_closing_warning': True}).action_periodic_vat_entries(options)
+        Q2_closing_entry = self.env['account.move'].browse(vat_closing_action['res_id'])
+
+        # We need to force recompute the entry as it is already generated from posting the Q1 entry.
+        Q2_closing_entry = self.env['account.generic.tax.report.handler']._generate_tax_closing_entries(self.basic_tax_report, options, closing_moves=Q2_closing_entry)
+        with self.enter_test_mode():
+            Q2_closing_entry.action_post()
+
+        with self.assertRaises(UserError):
+            Q1_closing_entry.button_draft()
+
+    def assert_period(self, input_date, expected_start, expected_end):
+        period_start, period_end = self.env.company._get_tax_closing_period_boundaries(input_date, self.basic_tax_report)
+        self.assertEqual(period_start, expected_start, f"Period start date ({fields.Date.to_string(period_start)}) doesn't match the expected period start date: ({fields.Date.to_string(expected_start)})")
+        self.assertEqual(period_end, expected_end, f"Period end date ({fields.Date.to_string(period_end)}) doesn't match the expected period end date: ({fields.Date.to_string(expected_end)})")
+
+    @freeze_time('2024-09-01')
+    def test_tax_report_start_date(self):
+        # Periodicity only with default start_date
+        self.env.company.account_tax_periodicity = 'monthly'
+        self.assert_period(date(2024, 1, 1), expected_start=date(2024, 1, 1), expected_end=date(2024, 1, 31))
+        self.assert_period(date(2024, 9, 30), expected_start=date(2024, 9, 1), expected_end=date(2024, 9, 30))
+        self.assert_period(date(2024, 10, 1), expected_start=date(2024, 10, 1), expected_end=date(2024, 10, 31))
+
+        self.env.company.account_tax_periodicity = 'trimester'
+        self.assert_period(date(2024, 1, 1), expected_start=date(2024, 1, 1), expected_end=date(2024, 3, 31))
+        self.assert_period(date(2024, 5, 1), expected_start=date(2024, 4, 1), expected_end=date(2024, 6, 30))
+        self.assert_period(date(2024, 9, 30), expected_start=date(2024, 7, 1), expected_end=date(2024, 9, 30))
+        self.assert_period(date(2024, 10, 1), expected_start=date(2024, 10, 1), expected_end=date(2024, 12, 31))
+
+        self.env.company.account_tax_periodicity = 'year'
+        self.assert_period(date(2024, 1, 1), expected_start=date(2024, 1, 1), expected_end=date(2024, 12, 31))
+        self.assert_period(date(2023, 12, 31), expected_start=date(2023, 1, 1), expected_end=date(2023, 12, 31))
+
+        # Basic start dates
+        self.env.company.account_tax_periodicity = 'trimester'
+        self.basic_tax_report.tax_closing_start_date = '2024-01-01'
+        self.assert_period(date(2024, 1, 1), expected_start=date(2024, 1, 1), expected_end=date(2024, 3, 31))
+        self.assert_period(date(2024, 4, 1), expected_start=date(2024, 4, 1), expected_end=date(2024, 6, 30))
+        self.assert_period(date(2024, 5, 1), expected_start=date(2024, 4, 1), expected_end=date(2024, 6, 30))
+        self.assert_period(date(2024, 9, 30), expected_start=date(2024, 7, 1), expected_end=date(2024, 9, 30))
+        self.assert_period(date(2024, 10, 1), expected_start=date(2024, 10, 1), expected_end=date(2024, 12, 31))
+
+        self.basic_tax_report.tax_closing_start_date = '2024-02-01'
+        self.assert_period(date(2024, 1, 1), expected_start=date(2023, 11, 1), expected_end=date(2024, 1, 31))
+        self.assert_period(date(2024, 1, 31), expected_start=date(2023, 11, 1), expected_end=date(2024, 1, 31))
+        self.assert_period(date(2024, 2, 1), expected_start=date(2024, 2, 1), expected_end=date(2024, 4, 30))
+        self.assert_period(date(2024, 6, 1), expected_start=date(2024, 5, 1), expected_end=date(2024, 7, 31))
+        self.assert_period(date(2024, 10, 31), expected_start=date(2024, 8, 1), expected_end=date(2024, 10, 31))
+        self.assert_period(date(2024, 11, 1), expected_start=date(2024, 11, 1), expected_end=date(2025, 1, 31))
+
+        self.env.company.account_tax_periodicity = 'monthly'
+        self.assert_period(date(2024, 2, 1), expected_start=date(2024, 2, 1), expected_end=date(2024, 2, 29))
+        self.assert_period(date(2024, 1, 31), expected_start=date(2024, 1, 1), expected_end=date(2024, 1, 31))
+        self.assert_period(date(2024, 1, 1), expected_start=date(2024, 1, 1), expected_end=date(2024, 1, 31))
+        self.assert_period(date(2024, 4, 1), expected_start=date(2024, 4, 1), expected_end=date(2024, 4, 30))
+        self.assert_period(date(2024, 12, 31), expected_start=date(2024, 12, 1), expected_end=date(2024, 12, 31))
+        self.assert_period(date(2024, 12, 1), expected_start=date(2024, 12, 1), expected_end=date(2024, 12, 31))
+
+        # Complexe start dates
+        self.env.company.account_tax_periodicity = 'trimester'
+
+        self.basic_tax_report.tax_closing_start_date = '2024-02-06'
+        self.assert_period(date(2024, 2, 5), expected_start=date(2023, 11, 6), expected_end=date(2024, 2, 5))
+        self.assert_period(date(2024, 2, 1), expected_start=date(2023, 11, 6), expected_end=date(2024, 2, 5))
+        self.assert_period(date(2023, 11, 7), expected_start=date(2023, 11, 6), expected_end=date(2024, 2, 5))
+
+        self.assert_period(date(2024, 2, 6), expected_start=date(2024, 2, 6), expected_end=date(2024, 5, 5))
+        self.assert_period(date(2024, 5, 5), expected_start=date(2024, 2, 6), expected_end=date(2024, 5, 5))
+        self.assert_period(date(2024, 4, 5), expected_start=date(2024, 2, 6), expected_end=date(2024, 5, 5))
+
+        self.assert_period(date(2024, 5, 6), expected_start=date(2024, 5, 6), expected_end=date(2024, 8, 5))
+        self.assert_period(date(2024, 11, 5), expected_start=date(2024, 8, 6), expected_end=date(2024, 11, 5))
+        self.assert_period(date(2024, 11, 6), expected_start=date(2024, 11, 6), expected_end=date(2025, 2, 5))
+
+        self.basic_tax_report.tax_closing_start_date = '2024-06-06'
+        self.assert_period(date(2024, 3, 5), expected_start=date(2023, 12, 6), expected_end=date(2024, 3, 5))
+        self.assert_period(date(2024, 6, 5), expected_start=date(2024, 3, 6), expected_end=date(2024, 6, 5))
+        self.assert_period(date(2024, 9, 5), expected_start=date(2024, 6, 6), expected_end=date(2024, 9, 5))
+        self.assert_period(date(2024, 12, 5), expected_start=date(2024, 9, 6), expected_end=date(2024, 12, 5))
+
+        self.env.company.account_tax_periodicity = 'monthly'
+        self.assert_period(date(2024, 3, 5), expected_start=date(2024, 2, 6), expected_end=date(2024, 3, 5))
+        self.assert_period(date(2024, 3, 6), expected_start=date(2024, 3, 6), expected_end=date(2024, 4, 5))
+        self.assert_period(date(2024, 12, 5), expected_start=date(2024, 11, 6), expected_end=date(2024, 12, 5))
+        self.assert_period(date(2024, 12, 6), expected_start=date(2024, 12, 6), expected_end=date(2025, 1, 5))
+        self.assert_period(date(2025, 1, 5), expected_start=date(2024, 12, 6), expected_end=date(2025, 1, 5))
+
+    def test_multiple_same_tax_lines_with_multiple_analytics(self):
+        """ One Invoice line with analytic_distribution and another with another analytic_distribution, both with the same tax"""
+        analytic_plan = self.env['account.analytic.plan'].create({'name': 'Plan with Tax details'})
+        analytic_account_1 = self.env['account.analytic.account'].create({
+            'name': 'Analytic account with Tax details',
+            'plan_id': analytic_plan.id,
+            'company_id': False,
+        })
+        analytic_account_2 = self.env['account.analytic.account'].create({
+            'name': ' testAnalytic account',
+            'plan_id': analytic_plan.id,
+            'company_id': False,
+        })
+        tax_10 = self.env['account.tax'].create({
+            'name': "tax_10",
+            'amount_type': 'percent',
+            'amount': 10.0,
+        })
+        invoice = self.env['account.move'].create({
+            'move_type': 'out_invoice',
+            'partner_id': self.partner_a.id,
+            'invoice_date': '2019-01-01',
+            'invoice_line_ids': [
+                Command.create({
+                    'name': 'line1',
+                    'account_id': self.company_data['default_account_revenue'].id,
+                    'price_unit': 200.0,
+                    'tax_ids': [Command.set(tax_10.ids)],
+                    'analytic_distribution': {
+                        analytic_account_1.id: 100,
+                    },
+                }),
+                Command.create({
+                    'name': 'line2',
+                    'account_id': self.company_data['default_account_revenue'].id,
+                    'price_unit': 100.0,
+                    'tax_ids': [Command.set(tax_10.ids)],
+                    'analytic_distribution': {
+                        analytic_account_2.id: 100,
+                    },
+                }),
+            ]
+        })
+        invoice.action_post()
+        invoice2 = self.env['account.move'].create({
+            'move_type': 'out_invoice',
+            'partner_id': self.partner_a.id,
+            'invoice_date': '2019-01-01',
+            'invoice_line_ids': [
+                Command.create({
+                    'name': 'line1',
+                    'account_id': self.company_data['default_account_revenue'].id,
+                    'price_unit': 10.0,
+                    'tax_ids': [Command.set(tax_10.ids)],
+                    'analytic_distribution': {
+                        analytic_account_2.id: 100,
+                    },
+                }),
+            ]
+        })
+        invoice2.action_post()
+
+        self.assertRecordValues(invoice.line_ids, [
+            {'name': 'line1', 'debit': 0.00, 'credit': 200.0},
+            {'name': 'line2', 'debit': 0.00, 'credit': 100.0},
+            {'name': tax_10.name, 'debit': 0.00, 'credit': 20.0},
+            {'name': tax_10.name, 'debit': 0.00, 'credit': 10.0},
+            {'name': invoice.name, 'debit': 330.0, 'credit': 0.00}
+        ])
+
+        self.assertRecordValues(invoice2.line_ids, [
+            {'name': 'line1', 'debit': 0.00, 'credit': 10.0},
+            {'name': tax_10.name, 'debit': 0.00, 'credit': 1.0},
+            {'name': invoice2.name, 'debit': 11.0, 'credit': 0.00}
+        ])
+
+        report = self.env.ref('account.generic_tax_report_account_tax')
+        options = self._generate_options(report, invoice.date, invoice.date)
+
+        self.assertLinesValues(
+            report._get_lines(options),
+            #   Name                                                                          Base      Tax
+            [   0,                                                                             1,        2],
+            [
+                ('Sales',                                                                     "",     31.0),
+                (self.company_data['default_account_revenue'].display_name,                   "",     31.0),
+                (f'{tax_10.name} ({tax_10.amount}%)',                                      310.0,     31.0),
+                (f'Total {self.company_data["default_account_revenue"].display_name}',        "",     31.0),
+                ('Total Sales',                                                               "",     31.0),
+            ],
+            options
+        )
+
+        report = self.env.ref("account.generic_tax_report_tax_account")
+        options['report_id'] = report.id
+
+        self.assertLinesValues(
+            report._get_lines(options),
+            #   Name                                                                           Base      Tax
+            [   0,                                                                              1,        2],
+            [
+                ('Sales',                                                                      "",     31.0),
+                (f'{tax_10.name} ({tax_10.amount}%)',                                          "",     31.0),
+                (self.company_data['default_account_revenue'].display_name,                 310.0,     31.0),
+                (f'Total {tax_10.name} ({tax_10.amount}%)',                                    "",     31.0),
+                ('Total Sales',                                                                "",     31.0),
+            ],
+            options
+        )
+
+    def test_only_one_closing_entry_with_generic_reports(self):
+        """ Test that when multiple generic tax reports are used, only one closing entry is created and used by all reports.
+            This is to prevent multiple identical closing entries to be created when multiple tax reports are used.
+        """
+        generic_tax_report = self.env.ref("account.generic_tax_report")
+        options = self._generate_options(generic_tax_report, '2021-03-01', '2021-03-31')
+        vat_closing_action = generic_tax_report.with_context({'override_tax_closing_warning': True}).dispatch_report_action(options, 'action_periodic_vat_entries')
+        generic_tax_report_closing_moves = self.env['account.move'].browse(vat_closing_action['domain'][0][2])
+
+        generic_tax_report_account_tax = self.env.ref('account.generic_tax_report_account_tax')
+        options = self._generate_options(generic_tax_report_account_tax, '2021-03-01', '2021-03-31')
+        vat_closing_action = generic_tax_report_account_tax.with_context({'override_tax_closing_warning': True}).dispatch_report_action(options, 'action_periodic_vat_entries')
+        generic_tax_report_account_tax_closing_moves = self.env['account.move'].browse(vat_closing_action['domain'][0][2])
+
+        generic_tax_report_tax_account = self.env.ref('account.generic_tax_report_tax_account')
+        options = self._generate_options(generic_tax_report_tax_account, '2021-03-01', '2021-03-31')
+        vat_closing_action = generic_tax_report_tax_account.with_context({'override_tax_closing_warning': True}).dispatch_report_action(options, 'action_periodic_vat_entries')
+        generic_tax_report_tax_account_closing_moves = self.env['account.move'].browse(vat_closing_action['domain'][0][2])
+
+        # We have 2 fiscal positions here, the domestic (no fiscal position) and foreign_vat_fpos.
+        self.assertEqual(len(generic_tax_report_closing_moves), 2, "There should be one closing entry per fiscal position.")
+        self.assertTrue(generic_tax_report_closing_moves.filtered(lambda m: not m.fiscal_position_id), "There should be a closing entry for the domestic fiscal position (no fiscal position).")
+        self.assertTrue(generic_tax_report_closing_moves.filtered(lambda m: m.fiscal_position_id == self.foreign_vat_fpos), "There should be a closing entry for the foreign VAT fiscal position.")
+        self.assertEqual(generic_tax_report_closing_moves, generic_tax_report_account_tax_closing_moves, "The closing entries used for both reports should be the same.")
+        self.assertEqual(generic_tax_report_closing_moves, generic_tax_report_tax_account_closing_moves, "The closing entries used for both reports should be the same.")
+        self.assertEqual(generic_tax_report_closing_moves.mapped('tax_closing_report_id'), self.basic_tax_report, "The closing entries should be linked to the basic tax report.")
+
+    def test_only_one_closing_entry_per_fpos(self):
+        """ Test that when different fiscal positions with foreign VAT numbers are used, only one closing entry per fiscal position is created and used by all reports.
+            This is to prevent multiple identical closing entries to be created when multiple fiscal positions are used.
+            We also test that the closing entry used for a report is the one corresponding to the fiscal position of the report's country.
+        """
+        generic_tax_report = self.env.ref("account.generic_tax_report")
+        other_country = self.env['res.country'].create({'name': 'Other Country', 'code': 'OT'})
+        other_country_vat_fpos = self.env['account.fiscal.position'].create({
+            'name': "Foreign VAT",
+            'country_id': other_country.id,
+            'foreign_vat': 'ZZ0000000',
+        })
+
+        basic_other_country_tax_report = self.env['account.report'].create({
+            'name': "The Unseen Tax Report",
+            'country_id': other_country.id,
+            'root_report_id': generic_tax_report.id,
+            'column_ids': [Command.create({'name': 'balance', 'sequence': 1, 'expression_label': 'balance'})],
+        })
+
+        # Another report to test that when multiple variants are available for the same country, we use the generic tax report.
+        self.env['account.report'].create({
+            'name': "The Other Unseen Tax Report",
+            'country_id': other_country.id,
+            'root_report_id': generic_tax_report.id,
+            'column_ids': [Command.create({'name': 'balance', 'sequence': 1, 'expression_label': 'balance'})],
+        })
+
+        other_country_partner = self.env['res.partner'].create({
+            'name': "Another Country Partner",
+            'country_id': other_country.id,
+        })
+
+        self.init_invoice('out_invoice', partner=other_country_partner, invoice_date='2021-03-15', post=True, amounts=[23000], taxes=self.test_fpos_tax_sale)
+        self.init_invoice('in_invoice', partner=other_country_partner, invoice_date='2021-03-20', post=True, amounts=[300], taxes=self.test_fpos_tax_purchase)
+        self.init_invoice('out_invoice', partner=other_country_partner, invoice_date='2021-03-25', post=True, amounts=[700], taxes=self.test_fpos_tax_sale)
+        self.init_invoice('in_invoice', partner=other_country_partner, invoice_date='2021-03-28', post=True, amounts=[1300], taxes=self.test_fpos_tax_purchase)
+
+        options = self._generate_options(generic_tax_report, '2021-03-01', '2021-03-31')
+        vat_closing_action = generic_tax_report.with_context({'override_tax_closing_warning': True}).dispatch_report_action(options, 'action_periodic_vat_entries')
+        generic_closing_moves = self.env['account.move'].browse(vat_closing_action['domain'][0][2])
+
+        generic_closing_move_domestic = generic_closing_moves.filtered(lambda m: not m.fiscal_position_id)
+        generic_closing_move_foreign = generic_closing_moves.filtered(lambda m: m.fiscal_position_id == other_country_vat_fpos)
+
+        options = self._generate_options(self.basic_tax_report, '2021-03-01', '2021-03-31')
+        vat_closing_action = self.basic_tax_report.with_context({'override_tax_closing_warning': True}).dispatch_report_action(options, 'action_periodic_vat_entries')
+        domestic_closing_move = self.env['account.move'].browse(vat_closing_action['res_id'])
+
+        options = self._generate_options(basic_other_country_tax_report, '2021-03-01', '2021-03-31')
+        vat_closing_action = basic_other_country_tax_report.with_context({'override_tax_closing_warning': True}).dispatch_report_action(options, 'action_periodic_vat_entries')
+        other_country_closing_move = self.env['account.move'].browse(vat_closing_action['res_id'])
+
+        self.assertNotEqual(generic_closing_move_domestic, generic_closing_move_foreign, "Domestic and foreign closing entries should be different.")
+        self.assertEqual(generic_closing_move_domestic, domestic_closing_move, "The domestic closing entry should be the one used for the basic tax report.")
+        self.assertEqual(generic_closing_move_foreign, other_country_closing_move, "The foreign closing entry should be the one used for the other country tax report.")
+        self.assertEqual(generic_closing_move_domestic.tax_closing_report_id, self.basic_tax_report, "The domestic closing entry should be linked to the domestic tax report.")
+        self.assertEqual(generic_closing_move_foreign.tax_closing_report_id, generic_tax_report, "The foreign closing entry should be linked to the generic tax report.")
diff --git a/dev_odex30_accounting/odex30_account_reports/tests/test_tax_report_carryover.py b/dev_odex30_accounting/odex30_account_reports/tests/test_tax_report_carryover.py
new file mode 100644
index 0000000..50b6f8b
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_reports/tests/test_tax_report_carryover.py
@@ -0,0 +1,334 @@
+# -*- coding: utf-8 -*-
+# pylint: disable=C0326
+import json
+from unittest.mock import patch
+
+from .common import TestAccountReportsCommon
+from odoo import fields, Command
+from odoo.tests import tagged
+
+@tagged('post_install', '-at_install')
+class TestTaxReportCarryover(TestAccountReportsCommon):
+    @classmethod
+    def setUpClass(cls):
+        super().setUpClass()
+
+        cls.company_1 = cls.company_data['company']
+        cls.company_2 = cls.company_data_2['company']
+
+        cls.company_2.currency_id = cls.company_1.currency_id
+        cls.company_1.account_tax_periodicity = cls.company_2.account_tax_periodicity = 'year'
+
+        cls.report = cls.env['account.report'].create({
+            'name': 'Test report',
+            'country_id': cls.company_1.account_fiscal_country_id.id,
+            'root_report_id': cls.env.ref("account.generic_tax_report").id,
+            'column_ids': [Command.create({'name': 'Balance', 'sequence': 1, 'expression_label': 'balance'})],
+        })
+
+        cls.report_line = cls.env['account.report.line'].create({
+            'name': 'Test carryover',
+            'code': 'test_carryover',
+            'report_id': cls.report.id,
+            'sequence': 1,
+            'expression_ids': [
+                Command.create({
+                    'label': 'tag',
+                    'engine': 'domain',
+                    'formula': [('account_id.account_type', '=', 'expense')],
+                    'subformula': 'sum',
+                }),
+                Command.create({
+                    'label': '_applied_carryover_balance',
+                    'engine': 'external',
+                    'formula': 'most_recent',
+                    'date_scope': 'previous_tax_period',
+                }),
+                Command.create({
+                    'label': 'balance_unbound',
+                    'engine': 'aggregation',
+                    'formula': 'test_carryover.tag + test_carryover._applied_carryover_balance',
+                }),
+                Command.create({
+                    'label': '_carryover_balance',
+                    'engine': 'aggregation',
+                    'formula': 'test_carryover.balance_unbound',
+                    'subformula': 'if_below(EUR(0))',
+                }),
+                Command.create({
+                    'label': 'balance',
+                    'engine': 'aggregation',
+                    'formula': 'test_carryover.balance_unbound',
+                    'subformula': 'if_above(EUR(0))',
+                }),
+            ],
+        })
+
+    def test_tax_report_carry_over(self):
+        options = self._generate_options(self.report, '2021-01-01', '2021-12-31')
+
+        move = self.env['account.move'].create({
+            'move_type': 'entry',
+            'date': '2021-03-01',
+            'line_ids': [
+                Command.create({
+                    'debit': 0.0,
+                    'credit': 1000.0,
+                    'name': '2021_03_01',
+                    'account_id': self.company_data['default_account_expense'].id
+                }),
+                Command.create({
+                    'debit': 1000.0,
+                    'credit': 0.0,
+                    'name': '2021_03_01',
+                    'account_id': self.company_data['default_account_payable'].id
+                }),
+            ],
+        })
+        move.action_post()
+
+        self.env.flush_all()
+
+        with patch.object(type(self.env['account.move']), '_get_vat_report_attachments', autospec=True, side_effect=lambda *args, **kwargs: []):
+            vat_closing_move = self.env['account.generic.tax.report.handler']._generate_tax_closing_entries(self.report, options)
+            vat_closing_move.action_post()
+
+        # There should be an external value of -1000.0
+        external_value = self.env['account.report.external.value'].search([('company_id', '=', self.company_1.id)])
+
+        self.assertEqual(external_value.target_report_expression_label, '_applied_carryover_balance')
+        self.assertEqual(external_value.date, fields.Date.from_string('2021-12-31'))
+        self.assertEqual(external_value.value, -1000.0)
+
+        # There should be no value in the report since there is a carryover
+        lines = self.report._get_lines(options)
+        self.assertLinesValues(
+            lines,
+            #   Name                                    Balance
+            [   0,                                      1],
+            [
+                ('Test carryover',                     0.0),
+            ],
+            options,
+        )
+
+        # There should be a carryover pop-up of value -1000.0
+        info_popup_data = json.loads(lines[0]['columns'][0]['info_popup_data'])
+        self.assertEqual(info_popup_data['carryover'], '-1,000.00')
+
+        # The carry over should be applied on the next period
+        options = self._generate_options(self.report, '2022-01-01', '2022-12-31')
+
+        lines = self.report._get_lines(options)
+
+        self.assertLinesValues(
+            lines,
+            #   Name                                    Balance
+            [   0,                                      1],
+            [
+                ('Test carryover',                     0.0),
+            ],
+            options,
+        )
+
+        info_popup_data = json.loads(lines[0]['columns'][0]['info_popup_data'])
+        self.assertEqual(info_popup_data['carryover'], '-1,000.00')
+        self.assertEqual(info_popup_data['applied_carryover'], '-1,000.00')
+
+    def test_tax_report_carry_over_tax_unit(self):
+        self.env['account.tax.unit'].create({
+            'name': 'Test tax unit',
+            'country_id': self.company_1.account_fiscal_country_id.id,
+            'vat': 'DW1234567890',
+            'company_ids': [Command.set([self.company_1.id, self.company_2.id])],
+            'main_company_id': self.company_1.id,
+        })
+
+        move_company_1 = self.env['account.move'].with_company(self.company_1).create({
+            'move_type': 'entry',
+            'date': '2021-03-01',
+            'line_ids': [
+                Command.create({
+                    'debit': 0.0,
+                    'credit': 1000.0,
+                    'name': '2021_03_01',
+                    'account_id': self.company_data['default_account_expense'].id
+                }),
+                Command.create({
+                    'debit': 1000.0,
+                    'credit': 0.0,
+                    'name': '2021_03_01',
+                    'account_id': self.company_data['default_account_payable'].id
+                }),
+            ],
+        })
+        move_company_1.action_post()
+
+        move_company_2 = self.env['account.move'].with_company(self.company_2).create({
+            'move_type': 'entry',
+            'date': '2021-03-01',
+            'line_ids': [
+                Command.create({
+                    'debit': 2000.0,
+                    'credit': 0.0,
+                    'name': '2021_03_01',
+                    'account_id': self.company_data_2['default_account_expense'].id
+                }),
+                Command.create({
+                    'debit': 0.0,
+                    'credit': 2000.0,
+                    'name': '2021_03_01',
+                    'account_id': self.company_data_2['default_account_payable'].id
+                }),
+            ],
+        })
+        move_company_2.action_post()
+
+        self.env.flush_all()
+
+        with patch.object(type(self.env['account.move']), '_get_vat_report_attachments', autospec=True, side_effect=lambda *args, **kwargs: []):
+            # There should be no external value for company 1 at this point
+            external_value_company_1 = self.env['account.report.external.value'].search_count([('company_id', '=', self.company_1.id)])
+            self.assertEqual(external_value_company_1, 0)
+
+            # Closes both companies
+            options = self._generate_options(self.report, '2021-01-01', '2021-12-31')
+            vat_closing_moves = self.env['account.generic.tax.report.handler']._generate_tax_closing_entries(self.report, options)
+            main_closing_move = vat_closing_moves.filtered(lambda x: x.company_id == self.company_1)
+            (vat_closing_moves - main_closing_move).action_post()
+            main_closing_move.action_post()
+            self.assertTrue(all(move.state == 'posted' for move in vat_closing_moves))
+
+        self.assertEqual(len(vat_closing_moves), 2, "There should be one closing per company in the tax unit")
+        self.assertTrue(all(closing.state == 'posted' for closing in vat_closing_moves), "Posting the main company's closing should post every other closing of this unit")
+
+        # There should be two external value for company_1: -1000.0 and 1000.0
+        external_value_company_1 = self.env['account.report.external.value'].search([('company_id', '=', self.company_1.id)])
+        external_value_company_1 = sorted(external_value_company_1, key=lambda x: x.value) # To make sure they are always in the same order
+
+        self.assertEqual(external_value_company_1[0].target_report_expression_label, '_applied_carryover_balance')
+        self.assertEqual(external_value_company_1[0].date, fields.Date.from_string('2021-12-31'))
+        self.assertEqual(external_value_company_1[0].value, -1000.0)
+
+        self.assertEqual(external_value_company_1[1].target_report_expression_label, '_applied_carryover_balance')
+        self.assertEqual(external_value_company_1[1].date, fields.Date.from_string('2021-12-31'))
+        self.assertEqual(external_value_company_1[1].value, 1000.0)
+
+        # There should be no external value for company_2
+        external_value_company_2 = self.env['account.report.external.value'].search_count([('company_id', '=', self.company_2.id)])
+        self.assertEqual(external_value_company_2, 0)
+
+        # TAX UNIT REPORT (current period)
+        # ==============================================================================================================
+        # There should be a value of 1000.0 in the report since the sum of the balance of both companies is positive,
+        # there is no carryover
+        options = self._generate_options(self.report, '2021-01-01', '2021-12-31')
+
+        lines_tax_unit = self.report._get_lines(options)
+        self.assertLinesValues(
+            lines_tax_unit,
+            #   Name                                    Balance
+            [   0,                                      1],
+            [
+                ('Test carryover',                      1000.0),
+            ],
+            options,
+        )
+
+        # There should be no carryover pop-up
+        self.assertTrue('info_popup_data' not in lines_tax_unit[0]['columns'][0].keys())
+
+        # COMPANY 1 REPORT (current period)
+        # ==============================================================================================================
+        # There should be no value in the report since there is a carryover
+        report_company_1 = self.report.with_context(allowed_company_ids=self.company_1.ids)
+        options = self._generate_options(report_company_1, '2021-01-01', '2021-12-31')
+
+        lines_company_1 = report_company_1._get_lines(options)
+        self.assertLinesValues(
+            lines_company_1,
+            #   Name                                    Balance
+            [   0,                                      1],
+            [
+                ('Test carryover',                     0.0),
+            ],
+            options,
+        )
+
+        # There should be a carryover pop-up
+        info_popup_data = json.loads(lines_company_1[0]['columns'][0]['info_popup_data'])
+        self.assertEqual(info_popup_data['carryover'], '-1,000.00')
+
+        # COMPANY 2 REPORT (current period)
+        # ==============================================================================================================
+        # There should be a value of 2000.0 in the report since there is no carryover
+        report_company_2 = self.report.with_context(allowed_company_ids=self.company_2.ids)
+        options = self._generate_options(report_company_2, '2021-01-01', '2021-12-31')
+
+        lines_company_2 = report_company_2._get_lines(options)
+        self.assertLinesValues(
+            lines_company_2,
+            #   Name                                    Balance
+            [   0,                                      1],
+            [
+                ('Test carryover',                      2000.0),
+            ],
+            options,
+        )
+
+        # There should be no carryover pop-up
+        self.assertTrue('info_popup_data' not in lines_company_2[0]['columns'][0].keys())
+
+        # TAX UNIT REPORT (next period)
+        # ==============================================================================================================
+        options = self._generate_options(self.report, '2022-01-01', '2022-12-31')
+
+        lines_tax_unit = self.report._get_lines(options)
+        self.assertLinesValues(
+            lines_tax_unit,
+            #   Name                                    Balance
+            [   0,                                      1],
+            [
+                ('Test carryover',                     0.0),
+            ],
+            options,
+        )
+
+        # There should be no carryover pop-up
+        self.assertTrue('info_popup_data' not in lines_tax_unit[0]['columns'][0].keys())
+
+        # COMPANY 1 REPORT (next period)
+        # ==============================================================================================================
+        report_company_1 = self.report.with_context(allowed_company_ids=self.company_1.ids)
+        options = self._generate_options(report_company_1, '2022-01-01', '2022-12-31')
+
+        lines_company_1 = report_company_1._get_lines(options)
+        self.assertLinesValues(
+            lines_company_1,
+            #   Name                                    Balance
+            [   0,                                      1],
+            [
+                ('Test carryover',                     0.0),
+            ],
+            options,
+        )
+
+        self.assertTrue('info_popup_data' not in lines_company_1[0]['columns'][0].keys())
+
+        # COMPANY 2 REPORT (next period)
+        # ==============================================================================================================
+        report_company_2 = self.report.with_context(allowed_company_ids=self.company_2.ids)
+        options = self._generate_options(report_company_2, '2022-01-01', '2022-12-31')
+
+        lines_company_2 = report_company_2._get_lines(options)
+        self.assertLinesValues(lines_company_2,
+            #   Name                                    Balance
+            [   0,                                      1],
+            [
+                ('Test carryover',                     0.0),
+            ],
+            options,
+        )
+
+        # There should be no carryover pop-up
+        self.assertTrue('info_popup_data' not in lines_company_2[0]['columns'][0].keys())
diff --git a/dev_odex30_accounting/odex30_account_reports/tests/test_tax_report_default_part.py b/dev_odex30_accounting/odex30_account_reports/tests/test_tax_report_default_part.py
new file mode 100644
index 0000000..7f3a077
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_reports/tests/test_tax_report_default_part.py
@@ -0,0 +1,1138 @@
+# -*- coding: utf-8 -*-
+# pylint: disable=C0326
+from freezegun import freeze_time
+
+from .common import TestAccountReportsCommon
+from odoo import fields, Command
+from odoo.tests import tagged, Form
+
+
+@tagged('post_install', '-at_install')
+class TestTaxReportDefaultPart(TestAccountReportsCommon):
+
+    @classmethod
+    def setUpClass(cls):
+        super().setUpClass()
+
+        cls.revenue_1 = cls.company_data['default_account_revenue']
+        cls.revenue_2 = cls.copy_account(cls.revenue_1)
+
+        cls.report_generic = cls.env.ref('account.generic_tax_report')
+        cls.report_grouped_account_tax = cls.env.ref('account.generic_tax_report_account_tax')
+        cls.report_grouped_tax_account = cls.env.ref('account.generic_tax_report_tax_account')
+
+    def checkAmlsRedirection(self, report, options, tax_lines_with_caret_options, expected_amls_based_on_tax_dict):
+        # Check the caret options of the tax lines redirect to the correct amls
+        for tax_line in tax_lines_with_caret_options:
+            expected_amls = expected_amls_based_on_tax_dict.get(tax_line['name'])
+            action = self.env[report.custom_handler_model_name].caret_option_audit_tax(options, {'line_id': tax_line['id']})
+            domain = action['domain']
+            actual_amls = self.env['account.move.line'].search(domain)
+            self.assertEqual(set(actual_amls), set(expected_amls))
+
+    def test_tax_affect_base(self):
+        tax_20_affect_base = self.env['account.tax'].create({
+            'name': "tax_20_affect_base",
+            'amount_type': 'percent',
+            'amount': 20.0,
+            'include_base_amount': True,
+            'type_tax_use': 'sale',
+        })
+        tax_10 = self.env['account.tax'].create({
+            'name': "tax_10",
+            'amount_type': 'percent',
+            'amount': 10.0,
+            'type_tax_use': 'sale',
+        })
+
+        invoice = self.env['account.move'].create({
+            'move_type': 'out_invoice',
+            'partner_id': self.partner_a.id,
+            'invoice_date': '2019-01-01',
+            'date': '2019-01-01',
+            'invoice_line_ids': [
+                Command.create({
+                    'name': 'base line',
+                    'account_id': self.revenue_1.id,
+                    'price_unit': 1000.0,
+                    'tax_ids': [Command.set((tax_20_affect_base + tax_10).ids)],
+                }),
+                Command.create({
+                    'name': 'base line',
+                    'account_id': self.revenue_2.id,
+                    'price_unit': 1000.0,
+                    'tax_ids': [Command.set((tax_20_affect_base + tax_10).ids)],
+                }),
+            ],
+        })
+        invoice.action_post()
+
+        date_from_str = '2019-01-01'
+        date_to_str = '2019-01-31'
+        options = self._generate_options(self.report_generic, date_from_str, date_to_str)
+        self.assertLinesValues(
+            self.report_generic._get_lines(options),
+            #   Name                                    NET         TAX
+            [   0,                                      1,          2],
+            [
+                ('Sales',                               '',         640.0),
+                ('tax_20_affect_base (20.0%)',          2000.0,     400.0),
+                ('tax_10 (10.0%)',                      2400.0,     240.0),
+                ('Total Sales',                         '',         640.0),
+            ],
+            options,
+        )
+
+        options = self._generate_options(self.report_grouped_account_tax, date_from_str, date_to_str)
+        self.assertLinesValues(
+            self.report_grouped_account_tax._get_lines(options),
+            #   Name                                    NET         TAX
+            [   0,                                      1,          2],
+            [
+                ('Sales',                               '',         640.0),
+                ('400000 Product Sales',                '',         320.0),
+                ('tax_20_affect_base (20.0%)',          1000.0,     200.0),
+                ('tax_10 (10.0%)',                      1200.0,     120.0),
+                ('Total 400000 Product Sales',          '',         320.0),
+                ('400000.2 Product Sales',            '',         320.0),
+                ('tax_20_affect_base (20.0%)',          1000.0,     200.0),
+                ('tax_10 (10.0%)',                      1200.0,     120.0),
+                ('Total 400000.2 Product Sales',      '',         320.0),
+                ('Total Sales',                         '',         640.0),
+            ],
+            options,
+        )
+
+        options = self._generate_options(self.report_grouped_tax_account, date_from_str, date_to_str)
+        report_lines = self.report_grouped_tax_account._get_lines(options)
+        self.assertLinesValues(
+            report_lines,
+            #   Name                                    NET         TAX
+            [   0,                                      1,          2],
+            [
+                ('Sales',                               '',         640.0),
+                ('tax_20_affect_base (20.0%)',          '',         400.0),
+                ('400000 Product Sales',                1000.0,     200.0),
+                ('400000.2 Product Sales',            1000.0,     200.0),
+                ('Total tax_20_affect_base (20.0%)',    '',         400.0),
+                ('tax_10 (10.0%)',                      '',         240.0),
+                ('400000 Product Sales',                1200.0,     120.0),
+                ('400000.2 Product Sales',            1200.0,     120.0),
+                ('Total tax_10 (10.0%)',                '',         240.0),
+                ('Total Sales',                         '',         640.0),
+            ],
+            options,
+        )
+
+        tax_lines_with_caret_options = [report_line for report_line in report_lines if report_line.get('caret_options') == 'generic_tax_report']
+        expected_amls_tax_10 = invoice.line_ids.filtered(lambda x: x.tax_line_id == tax_10 or tax_10 in x.tax_ids)
+        expected_amls_tax_20 = invoice.line_ids.filtered(lambda x: x.tax_line_id == tax_20_affect_base or tax_20_affect_base in x.tax_ids)
+        expected_amls_based_on_tax_dict = {
+            'tax_10 (10.0%)': expected_amls_tax_10,
+            'tax_20_affect_base (20.0%)': expected_amls_tax_20,
+        }
+        self.checkAmlsRedirection(self.report_grouped_tax_account, options, tax_lines_with_caret_options, expected_amls_based_on_tax_dict)
+
+    def test_tax_group_shared_tax(self):
+        tax_10 = self.env['account.tax'].create({
+            'name': "tax_10",
+            'amount_type': 'percent',
+            'amount': 10.0,
+            'type_tax_use': 'none',
+        })
+        tax_20 = self.env['account.tax'].create({
+            'name': "tax_20",
+            'amount_type': 'percent',
+            'amount': 20.0,
+            'type_tax_use': 'none',
+        })
+        tax_30 = self.env['account.tax'].create({
+            'name': "tax_30",
+            'amount_type': 'percent',
+            'amount': 30.0,
+            'type_tax_use': 'none',
+        })
+        tax_group_10_20 = self.env['account.tax'].create({
+            'name': "tax_group_10_20",
+            'amount_type': 'group',
+            'children_tax_ids': [Command.set((tax_10 + tax_20).ids)],
+            'type_tax_use': 'sale',
+        })
+        tax_group_10_30 = self.env['account.tax'].create({
+            'name': "tax_group_10_30",
+            'amount_type': 'group',
+            'children_tax_ids': [Command.set((tax_10 + tax_30).ids)],
+            'type_tax_use': 'sale',
+        })
+
+        invoice = self.env['account.move'].create({
+            'move_type': 'out_invoice',
+            'partner_id': self.partner_a.id,
+            'invoice_date': '2019-01-01',
+            'date': '2019-01-01',
+            'invoice_line_ids': [
+                Command.create({
+                    'name': 'base line',
+                    'account_id': self.revenue_1.id,
+                    'price_unit': 1000.0,
+                    'tax_ids': [Command.set(tax_group_10_20.ids)],
+                }),
+                Command.create({
+                    'name': 'base line',
+                    'account_id': self.revenue_1.id,
+                    'price_unit': 2000.0,
+                    'tax_ids': [Command.set(tax_group_10_30.ids)],
+                }),
+            ],
+        })
+        invoice.action_post()
+
+        date_from_str = '2019-01-01'
+        date_to_str = '2019-01-31'
+        options = self._generate_options(self.report_generic, date_from_str, date_to_str)
+        self.assertLinesValues(
+            self.report_generic._get_lines(options),
+            #   Name                                    NET         TAX
+            [   0,                                      1,          2],
+            [
+                ('Sales',                               '',         1100.0),
+                ('tax_group_10_20',                     1000.0,     300.0),
+                ('tax_group_10_30',                     2000.0,     800.0),
+                ('Total Sales',                         '',         1100.0),
+            ],
+            options,
+        )
+
+        options = self._generate_options(self.report_grouped_account_tax, date_from_str, date_to_str)
+        self.assertLinesValues(
+            self.report_grouped_account_tax._get_lines(options),
+            #   Name                                    NET         TAX
+            [   0,                                      1,          2],
+            [
+                ('Sales',                               '',         1100.0),
+                ('400000 Product Sales',                '',         1100.0),
+                ('tax_group_10_20',                     1000.0,     300.0),
+                ('tax_group_10_30',                     2000.0,     800.0),
+                ('Total 400000 Product Sales',          '',         1100.0),
+                ('Total Sales',                         '',         1100.0),
+            ],
+            options,
+        )
+
+        options = self._generate_options(self.report_grouped_tax_account, date_from_str, date_to_str)
+        report_lines = self.report_grouped_tax_account._get_lines(options)
+        self.assertLinesValues(
+            report_lines,
+            #   Name                                    NET         TAX
+            [   0,                                      1,          2],
+            [
+                ('Sales',                               '',         1100.0),
+                ('tax_group_10_20',                     '',         300.0),
+                ('400000 Product Sales',                1000.0,     300.0),
+                ('Total tax_group_10_20',               '',         300.0),
+                ('tax_group_10_30',                     '',         800.0),
+                ('400000 Product Sales',                2000.0,     800.0),
+                ('Total tax_group_10_30',               '',         800.0),
+                ('Total Sales',                         '',         1100.0),
+            ],
+            options,
+        )
+
+        tax_lines_with_caret_options = [report_line for report_line in report_lines if report_line.get('caret_options') == 'generic_tax_report']
+        expected_amls_tax_group_10_20 = invoice.line_ids.filtered(lambda x: x.group_tax_id == tax_group_10_20 or tax_group_10_20 in x.tax_ids)
+        expected_amls_tax_group_10_30 = invoice.line_ids.filtered(lambda x: x.group_tax_id == tax_group_10_30 or tax_group_10_30 in x.tax_ids)
+        expected_amls_based_on_tax_dict = {
+            'tax_group_10_20': expected_amls_tax_group_10_20,
+            'tax_group_10_30': expected_amls_tax_group_10_30,
+        }
+        self.checkAmlsRedirection(self.report_grouped_tax_account, options, tax_lines_with_caret_options, expected_amls_based_on_tax_dict)
+
+        # Same with tax_10 as a sale tax.
+        tax_10.type_tax_use = 'sale'
+
+        options = self._generate_options(self.report_generic, date_from_str, date_to_str)
+        self.assertLinesValues(
+            self.report_generic._get_lines(options),
+            #   Name                                    NET         TAX
+            [   0,                                      1,          2],
+            [
+                ('Sales',                               '',         1100.0),
+                ("tax_10 (10.0%)" ,                     3000.0,     300.0),
+                ("tax_20 (20.0%)" ,                     1000.0,     200.0),
+                ("tax_30 (30.0%)" ,                     2000.0,     600),
+                ('Total Sales',                         '',         1100.0),
+            ],
+            options,
+        )
+
+        # Same with tax_20 as a sale tax.
+        tax_10.type_tax_use = 'none'
+        tax_20.type_tax_use = 'sale'
+
+        self.assertLinesValues(
+            self.report_generic._get_lines(options),
+            #   Name                                    NET         TAX
+            [   0,                                      1,          2],
+            [
+                ('Sales',                               '',         1100.0),
+                ("tax_10 (10.0%)" ,                     1000.0,     100.0),
+                ("tax_20 (20.0%)" ,                     1000.0,     200.0),
+                ('tax_group_10_30',                     2000.0,     800.0),
+                ('Total Sales',                         '',         1100.0),
+            ],
+            options,
+        )
+
+    def test_tax_group_of_taxes_affected_by_other(self):
+        tax_10_affect_base = self.env['account.tax'].create({
+            'name': "tax_10_affect_base",
+            'amount_type': 'percent',
+            'amount': 10.0,
+            'include_base_amount': True,
+        })
+        tax_20_affect_base = self.env['account.tax'].create({
+            'name': "tax_20_affect_base",
+            'amount_type': 'percent',
+            'amount': 20.0,
+            'include_base_amount': True,
+            'type_tax_use': 'none',
+        })
+        tax_10 = self.env['account.tax'].create({
+            'name': "tax_10",
+            'amount_type': 'percent',
+            'amount': 10.0,
+            'type_tax_use': 'none',
+        })
+        tax_group = self.env['account.tax'].create({
+            'name': "tax_group",
+            'amount_type': 'group',
+            'children_tax_ids': [Command.set((tax_20_affect_base + tax_10).ids)],
+            'type_tax_use': 'sale',
+        })
+
+        invoice = self.env['account.move'].create({
+            'move_type': 'out_invoice',
+            'partner_id': self.partner_a.id,
+            'invoice_date': '2019-01-01',
+            'date': '2019-01-01',
+            'invoice_line_ids': [
+                Command.create({
+                    'name': 'base line',
+                    'account_id': self.revenue_1.id,
+                    'price_unit': 1000.0,
+                    'tax_ids': [Command.set((tax_10_affect_base + tax_group).ids)],
+                }),
+            ],
+        })
+        invoice.action_post()
+
+        date_from_str = '2019-01-01'
+        date_to_str = '2019-01-31'
+        options = self._generate_options(self.report_generic, date_from_str, date_to_str)
+        self.assertLinesValues(
+            self.report_generic._get_lines(options),
+            #   Name                                    NET         TAX
+            [   0,                                      1,          2],
+            [
+                ('Sales',                               '',         452.0),
+                ('tax_10_affect_base (10.0%)',          1000.0,     100.0),
+                ('tax_group',                           1100.0,     352.0),
+                ('Total Sales',                         '',         452.0),
+            ],
+            options,
+        )
+
+        options = self._generate_options(self.report_grouped_account_tax, date_from_str, date_to_str)
+        self.assertLinesValues(
+            self.report_grouped_account_tax._get_lines(options),
+            #   Name                                    NET         TAX
+            [   0,                                      1,          2],
+            [
+                ('Sales',                               '',         452.0),
+                ('400000 Product Sales',                '',         452.0),
+                ('tax_10_affect_base (10.0%)',          1000.0,     100.0),
+                ('tax_group',                           1100.0,     352.0),
+                ('Total 400000 Product Sales',          '',         452.0),
+                ('Total Sales',                         '',         452.0),
+            ],
+            options,
+        )
+
+        options = self._generate_options(self.report_grouped_tax_account, date_from_str, date_to_str)
+        report_lines = self.report_grouped_tax_account._get_lines(options)
+        self.assertLinesValues(
+            report_lines,
+            #   Name                                    NET         TAX
+            [   0,                                      1,          2],
+            [
+                ('Sales',                               '',         452.0),
+                ('tax_10_affect_base (10.0%)',          '',         100.0),
+                ('400000 Product Sales',                1000.0,     100.0),
+                ('Total tax_10_affect_base (10.0%)',    '',         100.0),
+                ('tax_group',                           '',         352.0),
+                ('400000 Product Sales',                1100.0,     352.0),
+                ('Total tax_group',                     '',         352.0),
+                ('Total Sales',                         '',         452.0),
+            ],
+            options,
+        )
+
+        tax_lines_with_caret_options = [report_line for report_line in report_lines if report_line.get('caret_options') == 'generic_tax_report']
+        expected_amls_tax_10_affect_base = invoice.line_ids.filtered(lambda x: x.tax_line_id == tax_10_affect_base or tax_10_affect_base in x.tax_ids)
+        expected_amls_tax_group = invoice.line_ids.filtered(lambda x: x.tax_line_id or x.tax_ids)
+        expected_amls_based_on_tax_dict = {
+            'tax_10_affect_base (10.0%)': expected_amls_tax_10_affect_base,
+            'tax_group': expected_amls_tax_group,
+        }
+        self.checkAmlsRedirection(self.report_grouped_tax_account, options, tax_lines_with_caret_options, expected_amls_based_on_tax_dict)
+
+    def test_mixed_all_type_tax_use_same_line(self):
+        tax_10 = self.env['account.tax'].create({
+            'name': "tax_10",
+            'amount_type': 'percent',
+            'amount': 10.0,
+            'type_tax_use': 'sale',
+        })
+        tax_20 = self.env['account.tax'].create({
+            'name': "tax_20",
+            'amount_type': 'percent',
+            'amount': 20.0,
+            'type_tax_use': 'purchase',
+        })
+        tax_30 = self.env['account.tax'].create({
+            'name': "tax_30",
+            'amount_type': 'percent',
+            'amount': 30.0,
+            'type_tax_use': 'none',
+        })
+
+        move_form = Form(self.env['account.move'].with_context(default_move_type='entry'))
+        move_form.date = fields.Date.from_string('2019-01-01')
+        with move_form.line_ids.new() as line_form:
+            line_form.name = 'debit line'
+            line_form.account_id = self.revenue_1
+            line_form.debit = 1000.0
+            line_form.tax_ids.clear()
+            line_form.tax_ids.add(tax_10)
+            line_form.tax_ids.add(tax_20)
+            line_form.tax_ids.add(tax_30)
+        with move_form.line_ids.new() as line_form:
+            line_form.name = 'credit line'
+            line_form.account_id = self.revenue_2
+            line_form.credit = 1600
+        move = move_form.save()
+        move.action_post()
+
+        date_from_str = '2019-01-01'
+        date_to_str = '2019-01-31'
+        options = self._generate_options(self.report_generic, date_from_str, date_to_str)
+        self.assertLinesValues(
+            self.report_generic._get_lines(options),
+            #   Name                                    NET         TAX
+            [   0,                                      1,          2],
+            [
+                ('Sales',                               '',         -100.0),
+                ('tax_10 (10.0%)',                      -1000.0,    -100.0),
+                ('Total Sales',                         '',         -100.0),
+                ('Purchases',                           '',         200.0),
+                ('tax_20 (20.0%)',                      1000.0,     200.0),
+                ('Total Purchases',                     '',         200.0),
+            ],
+            options,
+        )
+
+        options = self._generate_options(self.report_grouped_account_tax, date_from_str, date_to_str)
+        self.assertLinesValues(
+            self.report_grouped_account_tax._get_lines(options),
+            #   Name                                    NET         TAX
+            [   0,                                      1,          2],
+            [
+                ('Sales',                               '',         -100.0),
+                ('400000 Product Sales',                '',         -100.0),
+                ('tax_10 (10.0%)',                      -1000.0,    -100.0),
+                ('Total 400000 Product Sales',          '',         -100.0),
+                ('Total Sales',                         '',         -100.0),
+                ('Purchases',                           '',         200.0),
+                ('400000 Product Sales',                '',         200.0),
+                ('tax_20 (20.0%)',                      1000.0,     200.0),
+                ('Total 400000 Product Sales',          '',         200.0),
+                ('Total Purchases',                     '',         200.0),
+            ],
+            options,
+        )
+
+        options = self._generate_options(self.report_grouped_tax_account, date_from_str, date_to_str)
+        report_lines = self.report_grouped_tax_account._get_lines(options)
+        self.assertLinesValues(
+            report_lines,
+            #   Name                                    NET         TAX
+            [   0,                                      1,          2],
+            [
+                ('Sales',                               '',         -100.0),
+                ('tax_10 (10.0%)',                      '',         -100.0),
+                ('400000 Product Sales',                -1000.0,    -100.0),
+                ('Total tax_10 (10.0%)',                '',         -100.0),
+                ('Total Sales',                         '',         -100.0),
+                ('Purchases',                           '',         200.0),
+                ('tax_20 (20.0%)',                      '',         200.0),
+                ('400000 Product Sales',                1000.0,     200.0),
+                ('Total tax_20 (20.0%)',                '',         200.0),
+                ('Total Purchases',                     '',         200.0),
+            ],
+            options,
+        )
+
+        tax_lines_with_caret_options = [report_line for report_line in report_lines if report_line.get('caret_options') == 'generic_tax_report']
+        expected_amls_tax_10 = move.line_ids.filtered(lambda x: x.tax_line_id == tax_10 or x.tax_ids)
+        expected_amls_tax_20 = move.line_ids.filtered(lambda x: x.tax_line_id == tax_20 or x.tax_ids)
+        expected_amls_based_on_tax_dict = {
+            'tax_10 (10.0%)': expected_amls_tax_10,
+            'tax_20 (20.0%)': expected_amls_tax_20,
+        }
+        self.checkAmlsRedirection(self.report_grouped_tax_account, options, tax_lines_with_caret_options, expected_amls_based_on_tax_dict)
+
+    def test_mixed_all_type_tax_on_different_line(self):
+        tax_10 = self.env['account.tax'].create({
+            'name': "tax_10",
+            'amount_type': 'percent',
+            'amount': 10.0,
+            'type_tax_use': 'sale',
+        })
+        tax_20 = self.env['account.tax'].create({
+            'name': "tax_20",
+            'amount_type': 'percent',
+            'amount': 20.0,
+            'type_tax_use': 'purchase',
+        })
+        tax_30 = self.env['account.tax'].create({
+            'name': "tax_30",
+            'amount_type': 'percent',
+            'amount': 30.0,
+            'type_tax_use': 'none',
+        })
+
+        move_form = Form(self.env['account.move'].with_context(default_move_type='entry'))
+        move_form.date = fields.Date.from_string('2019-01-01')
+        for dummy in range(2):
+            for tax in tax_10 + tax_20 + tax_30:
+                with move_form.line_ids.new() as line_form:
+                    line_form.name = 'debit line'
+                    line_form.account_id = self.revenue_1
+                    line_form.debit = 500.0
+                    line_form.tax_ids.clear()
+                    line_form.tax_ids.add(tax)
+        with move_form.line_ids.new() as line_form:
+            line_form.name = 'credit line'
+            line_form.account_id = self.revenue_2
+            line_form.credit = 3600
+        move = move_form.save()
+        move.action_post()
+
+        date_from_str = '2019-01-01'
+        date_to_str = '2019-01-31'
+        options = self._generate_options(self.report_generic, date_from_str, date_to_str)
+        self.assertLinesValues(
+            self.report_generic._get_lines(options),
+            #   Name                                    NET         TAX
+            [   0,                                      1,          2],
+            [
+                ('Sales',                               '',         -100.0),
+                ('tax_10 (10.0%)',                      -1000.0,    -100.0),
+                ('Total Sales',                         '',         -100.0),
+                ('Purchases',                           '',         200.0),
+                ('tax_20 (20.0%)',                      1000.0,     200.0),
+                ('Total Purchases',                     '',         200.0),
+            ],
+            options,
+        )
+
+        options = self._generate_options(self.report_grouped_account_tax, date_from_str, date_to_str)
+        self.assertLinesValues(
+            self.report_grouped_account_tax._get_lines(options),
+            #   Name                                    NET         TAX
+            [   0,                                      1,          2],
+            [
+                ('Sales',                               '',         -100.0),
+                ('400000 Product Sales',                '',         -100.0),
+                ('tax_10 (10.0%)',                      -1000.0,    -100.0),
+                ('Total 400000 Product Sales',          '',         -100.0),
+                ('Total Sales',                         '',         -100.0),
+                ('Purchases',                           '',         200.0),
+                ('400000 Product Sales',                '',         200.0),
+                ('tax_20 (20.0%)',                      1000.0,     200.0),
+                ('Total 400000 Product Sales',          '',         200.0),
+                ('Total Purchases',                     '',         200.0),
+            ],
+            options,
+        )
+
+        options = self._generate_options(self.report_grouped_tax_account, date_from_str, date_to_str)
+        report_lines = self.report_grouped_tax_account._get_lines(options)
+        self.assertLinesValues(
+            report_lines,
+            #   Name                                    NET         TAX
+            [   0,                                      1,          2],
+            [
+                ('Sales',                               '',         -100.0),
+                ('tax_10 (10.0%)',                      '',         -100.0),
+                ('400000 Product Sales',                -1000.0,    -100.0),
+                ('Total tax_10 (10.0%)',                '',         -100.0),
+                ('Total Sales',                         '',         -100.0),
+                ('Purchases',                           '',         200.0),
+                ('tax_20 (20.0%)',                      '',         200.0),
+                ('400000 Product Sales',                1000.0,     200.0),
+                ('Total tax_20 (20.0%)',                '',         200.0),
+                ('Total Purchases',                     '',         200.0),
+            ],
+            options,
+        )
+
+        tax_lines_with_caret_options = [report_line for report_line in report_lines if report_line.get('caret_options') == 'generic_tax_report']
+        expected_amls_tax_10 = move.line_ids.filtered(lambda x: x.tax_line_id == tax_10 or tax_10 in x.tax_ids)
+        expected_amls_tax_20 = move.line_ids.filtered(lambda x: x.tax_line_id == tax_20 or tax_20 in x.tax_ids)
+        expected_amls_based_on_tax_dict = {
+            'tax_10 (10.0%)': expected_amls_tax_10,
+            'tax_20 (20.0%)': expected_amls_tax_20,
+        }
+        self.checkAmlsRedirection(self.report_grouped_tax_account, options, tax_lines_with_caret_options, expected_amls_based_on_tax_dict)
+
+    def test_tax_report_custom_edition_tax_line(self):
+        ''' When on a journal entry, a tax line is edited manually by the user, it could lead to a broken mapping
+        between the original tax details and the edited tax line. In that case, some extra tax details are generated
+        on the tax line in order to reflect this edition. This test is there to ensure the tax report is well handling
+        such behavior.
+        '''
+        tax_10 = self.env['account.tax'].create({
+            'name': "tax_10",
+            'amount_type': 'percent',
+            'amount': 10.0,
+            'type_tax_use': 'sale',
+        })
+        tax_20 = self.env['account.tax'].create({
+            'name': "tax_20",
+            'amount_type': 'percent',
+            'amount': 20.0,
+            'type_tax_use': 'sale',
+        })
+
+        invoice = self.env['account.move'].create({
+            'move_type': 'out_invoice',
+            'partner_id': self.partner_a.id,
+            'invoice_date': '2019-01-01',
+            'date': '2019-01-01',
+            'invoice_line_ids': [
+                Command.create({
+                    'name': 'base line',
+                    'account_id': self.revenue_1.id,
+                    'price_unit': 1000.0,
+                    'tax_ids': [Command.set((tax_10 + tax_20).ids)],
+                }),
+            ],
+        })
+        tax_10_line = invoice.line_ids.filtered(lambda x: x.tax_repartition_line_id.tax_id == tax_10)
+        tax_20_line = invoice.line_ids.filtered(lambda x: x.tax_repartition_line_id.tax_id == tax_20)
+        receivable_line = invoice.line_ids.filtered(lambda x: x.account_id.account_type == 'asset_receivable')
+        invoice.write({'line_ids': [
+            Command.update(tax_10_line.id, {'account_id': self.revenue_2.id}),
+            Command.update(tax_20_line.id, {'account_id': self.revenue_2.id, 'credit': 201.0}),
+            Command.update(receivable_line.id, {'debit': 1301.0}),
+        ]})
+        invoice.action_post()
+
+        date_from_str = '2019-01-01'
+        date_to_str = '2019-01-31'
+        options = self._generate_options(self.report_generic, date_from_str, date_to_str)
+        self.assertLinesValues(
+            self.report_generic._get_lines(options),
+            #   Name                                    NET         TAX
+            [   0,                                      1,          2],
+            [
+                ('Sales',                               '',         301.0),
+                ('tax_10 (10.0%)',                      1000.0,     100.0),
+                ('tax_20 (20.0%)',                      1000.0,     201.0),
+                ('Total Sales',                         '',         301.0),
+            ],
+            options,
+        )
+
+        options = self._generate_options(self.report_grouped_account_tax, date_from_str, date_to_str)
+        self.assertLinesValues(
+            self.report_grouped_account_tax._get_lines(options),
+            #   Name                                    NET         TAX
+            [   0,                                      1,          2],
+            [
+                ('Sales',                               '',         301.0),
+                ('400000 Product Sales',                '',         301.0),
+                ('tax_10 (10.0%)',                      1000.0,     100.0),
+                ('tax_20 (20.0%)',                      1000.0,     201.0),
+                ('Total 400000 Product Sales',          '',         301.0),
+                ('Total Sales',                         '',         301.0),
+            ],
+            options,
+        )
+
+        options = self._generate_options(self.report_grouped_tax_account, date_from_str, date_to_str)
+        report_lines = self.report_grouped_tax_account._get_lines(options)
+        self.assertLinesValues(
+            report_lines,
+            #   Name                                    NET         TAX
+            [   0,                                      1,          2],
+            [
+                ('Sales',                               '',         301.0),
+                ('tax_10 (10.0%)',                      '',         100.0),
+                ('400000 Product Sales',                1000.0,     100.0),
+                ('Total tax_10 (10.0%)',                '',         100.0),
+                ('tax_20 (20.0%)',                      '',         201.0),
+                ('400000 Product Sales',                1000.0,     201.0),
+                ('Total tax_20 (20.0%)',                '',         201.0),
+                ('Total Sales',                         '',         301.0),
+            ],
+            options,
+        )
+
+        tax_lines_with_caret_options = [report_line for report_line in report_lines if report_line.get('caret_options') == 'generic_tax_report']
+        expected_amls_tax_10 = invoice.line_ids.filtered(lambda x: x.tax_line_id == tax_10 or tax_10 in x.tax_ids)
+        expected_amls_tax_20 = invoice.line_ids.filtered(lambda x: x.tax_line_id == tax_20 or tax_20 in x.tax_ids)
+        expected_amls_based_on_tax_dict = {
+            'tax_10 (10.0%)': expected_amls_tax_10,
+            'tax_20 (20.0%)': expected_amls_tax_20,
+        }
+        self.checkAmlsRedirection(self.report_grouped_tax_account, options, tax_lines_with_caret_options, expected_amls_based_on_tax_dict)
+
+    def test_tax_report_comparisons(self):
+        tax_10 = self.env['account.tax'].create({
+            'name': "tax_10",
+            'amount_type': 'percent',
+            'amount': 10.0,
+        })
+        tax_20 = self.env['account.tax'].create({
+            'name': "tax_20",
+            'amount_type': 'percent',
+            'amount': 20.0,
+        })
+        tax_30 = self.env['account.tax'].create({
+            'name': "tax_30",
+            'amount_type': 'percent',
+            'amount': 30.0,
+        })
+
+        invoices = self.env['account.move'].create([{
+            'move_type': 'out_invoice',
+            'partner_id': self.partner_a.id,
+            'invoice_date': inv_date,
+            'date': inv_date,
+            'invoice_line_ids': [
+                Command.create({
+                    'name': 'base line',
+                    'account_id': account.id,
+                    'price_unit': 1000.0,
+                    'tax_ids': [Command.set(taxes.ids)],
+                }),
+            ],
+        } for inv_date, taxes, account in (
+            ('2019-03-01', tax_10, self.revenue_1),
+            ('2019-02-01', tax_20 + tax_30, self.revenue_2),
+            ('2019-01-01', tax_30, self.revenue_1),
+        )])
+        invoices.action_post()
+
+        date_from_str = '2019-03-01'
+        date_to_str = '2019-03-31'
+        options = self._generate_options(self.report_generic, date_from_str, date_to_str)
+        options = self._update_comparison_filter(options, self.report_generic, 'previous_period', 2)
+        self.assertLinesValues(
+            self.report_generic._get_lines(options),
+            #   Name                                    NET         TAX         NET         TAX         NET         TAX
+            [   0,                                      1,          2,          3,          4,          5,          6],
+            [
+                ('Sales',                                   '',     100.0,          '',     500.0,          '',     300.0),
+                ('tax_10 (10.0%)',                      1000.0,     100.0,         0.0,       0.0,         0.0,       0.0),
+                ('tax_20 (20.0%)',                         0.0,       0.0,      1000.0,     200.0,         0.0,       0.0),
+                ('tax_30 (30.0%)',                         0.0,       0.0,      1000.0,     300.0,      1000.0,     300.0),
+                ('Total Sales',                             '',     100.0,          '',     500.0,           '',    300.0),
+            ],
+            options,
+        )
+
+        options = self._generate_options(self.report_grouped_account_tax, date_from_str, date_to_str)
+        options = self._update_comparison_filter(options, self.report_grouped_account_tax, 'previous_period', 2)
+        self.assertLinesValues(
+            self.report_grouped_account_tax._get_lines(options),
+            #   Name                                    NET         TAX         NET         TAX         NET         TAX
+            [   0,                                      1,          2,          3,          4,          5,          6],
+            [
+                ('Sales',                                   '',     100.0,          '',     500.0,          '',     300.0),
+                ('400000 Product Sales',                    '',     100.0,          '',       0.0,          '',     300.0),
+                ('tax_10 (10.0%)',                      1000.0,     100.0,         0.0,       0.0,         0.0,       0.0),
+                ('tax_30 (30.0%)',                         0.0,       0.0,         0.0,       0.0,      1000.0,     300.0),
+                ('Total 400000 Product Sales',              '',     100.0,          '',       0.0,          '',     300.0),
+                ('400000.2 Product Sales',                  '',       0.0,          '',     500.0,          '',       0.0),
+                ('tax_20 (20.0%)',                         0.0,       0.0,      1000.0,     200.0,         0.0,       0.0),
+                ('tax_30 (30.0%)',                         0.0,       0.0,      1000.0,     300.0,         0.0,       0.0),
+                ('Total 400000.2 Product Sales',            '',       0.0,          '',     500.0,          '',       0.0),
+                ('Total Sales',                             '',     100.0,          '',     500.0,          '',     300.0),
+            ],
+            options,
+        )
+
+        options = self._generate_options(self.report_grouped_tax_account, date_from_str, date_to_str)
+        options = self._update_comparison_filter(options, self.report_grouped_tax_account, 'previous_period', 2)
+        self.assertLinesValues(
+            self.report_grouped_tax_account._get_lines(options),
+            #   Name                                    NET         TAX         NET         TAX         NET         TAX
+            [   0,                                      1,          2,          3,          4,          5,          6],
+            [
+                ('Sales',                                   '',     100.0,          '',     500.0,          '',     300.0),
+                ('tax_10 (10.0%)',                          '',     100.0,          '',       0.0,          '',       0.0),
+                ('400000 Product Sales',                1000.0,     100.0,         0.0,       0.0,         0.0,       0.0),
+                ('Total tax_10 (10.0%)',                    '',     100.0,          '',       0.0,          '',       0.0),
+                ('tax_20 (20.0%)',                          '',       0.0,          '',     200.0,          '',       0.0),
+                ('400000.2 Product Sales',                 0.0,       0.0,      1000.0,     200.0,         0.0,       0.0),
+                ('Total tax_20 (20.0%)',                    '',       0.0,          '',     200.0,          '',       0.0),
+                ('tax_30 (30.0%)',                          '',       0.0,          '',     300.0,          '',     300.0),
+                ('400000 Product Sales',                   0.0,       0.0,         0.0,       0.0,      1000.0,     300.0),
+                ('400000.2 Product Sales',                 0.0,       0.0,      1000.0,     300.0,         0.0,       0.0),
+                ('Total tax_30 (30.0%)',                    '',       0.0,          '',     300.0,          '',     300.0),
+                ('Total Sales',                             '',     100.0,          '',     500.0,          '',     300.0),
+            ],
+            options,
+        )
+
+    def test_affect_base_with_repetitions(self):
+        affecting_tax = self.env['account.tax'].create({
+            'name': 'Affecting',
+            'amount': 42,
+            'amount_type': 'percent',
+            'type_tax_use': 'sale',
+            'include_base_amount': True,
+            'sequence': 0,
+            # We use default repartition: 1 base line, 1 100% tax line
+        })
+
+        affected_tax = self.env['account.tax'].create({
+            'name': 'Affected',
+            'amount': 10,
+            'amount_type': 'percent',
+            'type_tax_use': 'sale',
+            'sequence': 1
+            # We use default repartition: 1 base line, 1 100% tax line
+        })
+
+        # Create an invoice combining our taxes (1 line with each alone, and 1 line with both)
+        move = self.env['account.move'].create({
+            'move_type': 'out_invoice',
+            'partner_id': self.partner_a.id,
+            'invoice_date': '2021-08-01',
+            'invoice_line_ids': [
+                Command.create({
+                    'name': "affecting",
+                    'account_id': self.company_data['default_account_revenue'].id,
+                    'quantity': 1.0,
+                    'price_unit': 100.0,
+                    'tax_ids': affecting_tax.ids,
+                }),
+
+                Command.create({
+                    'name': "affected",
+                    'account_id': self.company_data['default_account_revenue'].id,
+                    'quantity': 1.0,
+                    'price_unit': 100.0,
+                    'tax_ids': affected_tax.ids,
+                }),
+
+                Command.create({
+                    'name': "affecting + affected",
+                    'account_id': self.company_data['default_account_revenue'].id,
+                    'quantity': 1.0,
+                    'price_unit': 100.0,
+                    'tax_ids': (affecting_tax + affected_tax).ids,
+                }),
+            ]
+        })
+
+        move.action_post()
+
+        # Check generic tax report
+        options = self._generate_options(self.report_generic, move.date, move.date)
+        self.assertLinesValues(
+            self.report_generic._get_lines(options),
+            #   Name                                   Net              Tax
+            [   0,                                       1,               2],
+            [
+                ("Sales",                               '',             108.2),
+                ("%s (42.0%%)" % affecting_tax.name,   200,              84),
+                ("%s (10.0%%)" % affected_tax.name,    242,              24.2),
+                ("Total Sales",                         '',             108.2),
+            ],
+            options,
+        )
+
+    def test_tax_multiple_repartition_lines(self):
+        tax = self.env['account.tax'].create({
+            'name': "tax",
+            'amount_type': 'percent',
+            'amount': 10.0,
+            'invoice_repartition_line_ids': [
+                Command.create({'repartition_type': 'base'}),
+
+                Command.create({
+                    'factor_percent': 40,
+                    'repartition_type': 'tax',
+                }),
+                Command.create({
+                    'factor_percent': 60,
+                    'repartition_type': 'tax',
+                }),
+            ],
+            'refund_repartition_line_ids': [
+                Command.create({'repartition_type': 'base'}),
+
+                Command.create({
+                    'factor_percent': 40,
+                    'repartition_type': 'tax',
+                }),
+                Command.create({
+                    'factor_percent': 60,
+                    'repartition_type': 'tax',
+                }),
+            ],
+        })
+
+        invoice = self.env['account.move'].create({
+            'move_type': 'out_invoice',
+            'partner_id': self.partner_a.id,
+            'invoice_date': '2019-01-01',
+            'date': '2019-01-01',
+            'invoice_line_ids': [
+                Command.create({
+                    'name': 'base line',
+                    'account_id': self.revenue_1.id,
+                    'price_unit': 1000.0,
+                    'tax_ids': [Command.set(tax.ids)],
+                }),
+            ],
+        })
+        invoice.action_post()
+
+        date_from_str = '2019-01-01'
+        date_to_str = '2019-01-31'
+        options = self._generate_options(self.report_generic, date_from_str, date_to_str)
+        self.assertLinesValues(
+            self.report_generic._get_lines(options),
+            #   Name                                    NET         TAX
+            [   0,                                      1,          2],
+            [
+                ('Sales',                               '',         100.0),
+                ('tax (10.0%)',                         1000.0,     100.0),
+                ('Total Sales',                         '',         100.0),
+            ],
+            options,
+        )
+
+        options = self._generate_options(self.report_grouped_account_tax, date_from_str, date_to_str)
+        self.assertLinesValues(
+            self.report_grouped_account_tax._get_lines(options),
+            #   Name                                    NET         TAX
+            [   0,                                      1,          2],
+            [
+                ('Sales',                               '',         100.0),
+                ('400000 Product Sales',                '',         100.0),
+                ('tax (10.0%)',                         1000.0,     100.0),
+                ('Total 400000 Product Sales',          '',         100.0),
+                ('Total Sales',                         '',         100.0),
+            ],
+            options,
+        )
+
+        options = self._generate_options(self.report_grouped_tax_account, date_from_str, date_to_str)
+        report_lines = self.report_grouped_tax_account._get_lines(options)
+        self.assertLinesValues(
+            report_lines,
+            #   Name                                    NET         TAX
+            [   0,                                      1,          2],
+            [
+                ('Sales',                               '',         100.0),
+                ('tax (10.0%)',                         '',         100.0),
+                ('400000 Product Sales',                1000.0,     100.0),
+                ('Total tax (10.0%)',                   '',         100.0),
+                ('Total Sales',                         '',         100.0),
+            ],
+            options,
+        )
+
+        tax_lines_with_caret_options = [report_line for report_line in report_lines if report_line.get('caret_options') == 'generic_tax_report']
+        expected_amls = invoice.line_ids.filtered(lambda x: x.tax_line_id or x.tax_ids)
+        expected_amls_based_on_tax_dict = {
+            'tax (10.0%)': expected_amls,
+        }
+        self.checkAmlsRedirection(self.report_grouped_tax_account, options, tax_lines_with_caret_options, expected_amls_based_on_tax_dict)
+
+    @freeze_time('2019-01-01')
+    def test_tax_invoice_completely_refund(self):
+        tax = self.env['account.tax'].create({
+            'name': "tax",
+            'amount_type': 'percent',
+            'amount': 10.0,
+            'type_tax_use': 'sale',
+        })
+
+        invoice = self.env['account.move'].create({
+            'move_type': 'out_invoice',
+            'partner_id': self.partner_a.id,
+            'invoice_date': '2019-01-01',
+            'date': '2019-01-01',
+            'invoice_line_ids': [
+                Command.create({
+                    'name': 'base line',
+                    'account_id': self.revenue_1.id,
+                    'price_unit': 1000.0,
+                    'tax_ids': [Command.set(tax.ids)],
+                }),
+            ],
+        })
+        invoice.action_post()
+
+        self.env['account.move.reversal']\
+            .with_context(active_model="account.move", active_ids=invoice.ids)\
+            .create({
+                'reason': "test_tax_invoice_completely_refund",
+                'journal_id': invoice.journal_id.id,
+            })\
+            .modify_moves()
+
+        date_from_str = '2019-01-01'
+        date_to_str = '2019-01-31'
+        options = self._generate_options(self.report_generic, date_from_str, date_to_str)
+        self.assertLinesValues(
+            self.report_generic._get_lines(options),
+            #   Name                                    NET         TAX
+            [   0,                                      1,          2],
+            [
+                ('Sales',                               '',        0.0),
+                ('tax (10.0%)',                        0.0,        0.0),
+                ('Total Sales',                         '',        0.0),
+            ],
+            options,
+        )
+
+        options = self._generate_options(self.report_grouped_account_tax, date_from_str, date_to_str)
+        self.assertLinesValues(
+            self.report_grouped_account_tax._get_lines(options),
+            #   Name                                    NET         TAX
+            [   0,                                      1,          2],
+            [
+                ('Sales',                               '',        0.0),
+                ('400000 Product Sales',                '',        0.0),
+                ('tax (10.0%)',                        0.0,        0.0),
+                ('Total 400000 Product Sales',          '',        0.0),
+                ('Total Sales',                         '',        0.0),
+            ],
+            options,
+        )
+
+        options = self._generate_options(self.report_grouped_tax_account, date_from_str, date_to_str)
+        report_lines = self.report_grouped_tax_account._get_lines(options)
+        self.assertLinesValues(
+            report_lines,
+            #   Name                                    NET         TAX
+            [   0,                                      1,          2],
+            [
+                ('Sales',                               '',        0.0),
+                ('tax (10.0%)',                         '',        0.0),
+                ('400000 Product Sales',               0.0,        0.0),
+                ('Total tax (10.0%)',                   '',        0.0),
+                ('Total Sales',                         '',        0.0),
+            ],
+            options,
+        )
+
+        tax_lines_with_caret_options = [report_line for report_line in report_lines if report_line.get('caret_options') == 'generic_tax_report']
+        expected_amls = invoice.line_ids.filtered(lambda x: x.tax_line_id or x.tax_ids) + invoice.reversal_move_ids.line_ids.filtered(lambda x: x.tax_line_id or x.tax_ids)
+        expected_amls_based_on_tax_dict = {
+            'tax (10.0%)': expected_amls,
+        }
+        self.checkAmlsRedirection(self.report_grouped_tax_account, options, tax_lines_with_caret_options, expected_amls_based_on_tax_dict)
+
+    def test_tax_report_entry_move_2_opposite_invoice_lines(self):
+        tax = self.env['account.tax'].create({
+            'name': "tax",
+            'amount_type': 'percent',
+            'amount': 10.0,
+            'type_tax_use': 'sale',
+        })
+
+        # Form is used here for the dynamic tax line to get created automatically
+        move_form = Form(self.env['account.move']\
+                         .with_context(default_move_type='entry'))
+        # {'invisible': [('move_type', 'not in', ['out_invoice', 'out_refund', 'in_invoice', 'in_refund', 'out_receipt', 'in_receipt'])]
+        move_form.date = '2022-02-01'
+
+        for name, account_id, debit, credit, tax_to_apply in (
+                ("invoice line in entry", self.company_data['default_account_revenue'], 0.0, 20.0, tax),
+                ("refund line in entry", self.company_data['default_account_revenue'], 10.0, 0.0, tax),
+                ("Receivable line in entry", self.company_data['default_account_receivable'], 11.0, 0.0, None),
+        ):
+            with move_form.line_ids.new() as line_form:
+                line_form.name = name
+                line_form.account_id = account_id
+                line_form.debit = debit
+                line_form.credit = credit
+                if tax_to_apply:
+                    line_form.tax_ids.clear()
+                    line_form.tax_ids.add(tax_to_apply)
+
+        move = move_form.save()
+        move.action_post()
+
+        date_from_str = '2022-02-01'
+        date_to_str = '2022-02-01'
+        options = self._generate_options(self.report_generic, date_from_str, date_to_str)
+        self.assertLinesValues(
+            self.report_generic._get_lines(options),
+            #   Name                                    NET           TAX
+            [   0,                                      1,             2],
+            [
+                ('Sales',                               '',          1.0),
+                ('tax (10.0%)',                       10.0,          1.0),
+                ('Total Sales',                         '',          1.0),
+            ],
+            options,
+        )
+
+        options = self._generate_options(self.report_grouped_account_tax, date_from_str, date_to_str)
+        self.assertLinesValues(
+            self.report_grouped_account_tax._get_lines(options),
+            #   Name                                    NET           TAX
+            [   0,                                      1,             2],
+            [
+                ('Sales',                               '',          1.0),
+                ('400000 Product Sales',                '',          1.0),
+                ('tax (10.0%)',                       10.0,          1.0),
+                ('Total 400000 Product Sales',          '',          1.0),
+                ('Total Sales',                         '',          1.0),
+            ],
+            options,
+        )
+
+        options = self._generate_options(self.report_grouped_tax_account, date_from_str, date_to_str)
+        report_lines = self.report_grouped_tax_account._get_lines(options)
+        self.assertLinesValues(
+            report_lines,
+            #   Name                                    NET            TAX
+            [   0,                                      1,              2],
+            [
+                ('Sales',                               '',           1.0),
+                ('tax (10.0%)',                         '',           1.0),
+                ('400000 Product Sales',              10.0,           1.0),
+                ('Total tax (10.0%)',                   '',           1.0),
+                ('Total Sales',                         '',           1.0),
+            ],
+            options,
+        )
+
+        tax_lines_with_caret_options = [report_line for report_line in report_lines if report_line.get('caret_options') == 'generic_tax_report']
+        expected_amls = move.line_ids.filtered(lambda x: x.tax_line_id or x.tax_ids)
+        expected_amls_based_on_tax_dict = {
+            'tax (10.0%)': expected_amls,
+        }
+        self.checkAmlsRedirection(self.report_grouped_tax_account, options, tax_lines_with_caret_options, expected_amls_based_on_tax_dict)
diff --git a/dev_odex30_accounting/odex30_account_reports/tests/test_tour_account_reports.py b/dev_odex30_accounting/odex30_account_reports/tests/test_tour_account_reports.py
new file mode 100644
index 0000000..0c214cc
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_reports/tests/test_tour_account_reports.py
@@ -0,0 +1,40 @@
+# -*- coding: utf-8 -*-
+from odoo import Command, fields
+from odoo.tests import tagged
+from odoo.addons.account.tests.common import AccountTestInvoicingHttpCommon
+
+
+@tagged('post_install', '-at_install')
+class TestTourAccountReports(AccountTestInvoicingHttpCommon):
+
+    @classmethod
+    def setUpClass(cls):
+        super().setUpClass()
+
+        today = fields.Date.today()
+        previous_year = fields.Date.from_string('%s-%s-01' % (today.year - 1, today.month))
+
+        cls.out_invoice_current_year = cls.env['account.move'].create({
+            'move_type': 'out_invoice',
+            'partner_id': cls.partner_a.id,
+            'invoice_date': today,
+            'date': today,
+            'invoice_line_ids': [
+                Command.create({'name': 'line1', 'price_unit': 100.0}),
+            ],
+        })
+        cls.out_invoice_current_year.action_post()
+
+        cls.out_invoice_previous_year = cls.env['account.move'].create({
+            'move_type': 'out_invoice',
+            'partner_id': cls.partner_a.id,
+            'invoice_date': previous_year,
+            'date': previous_year,
+            'invoice_line_ids': [
+                Command.create({'name': 'line1', 'price_unit': 500.0}),
+            ],
+        })
+        cls.out_invoice_previous_year.action_post()
+
+    def test_tour_account_reports(self):
+        self.start_tour("/odoo", 'account_reports_widgets', login=self.env.user.login)
diff --git a/dev_odex30_accounting/odex30_account_reports/tests/test_tour_analytic_filters.py b/dev_odex30_accounting/odex30_account_reports/tests/test_tour_analytic_filters.py
new file mode 100644
index 0000000..0215e52
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_reports/tests/test_tour_analytic_filters.py
@@ -0,0 +1,27 @@
+# -*- coding: utf-8 -*-
+from odoo.tests import tagged
+from odoo.addons.account.tests.common import AccountTestInvoicingHttpCommon
+
+
+@tagged('post_install', '-at_install')
+class TestTourAccountAnalyticFilters(AccountTestInvoicingHttpCommon):
+
+    @classmethod
+    def setUpClass(cls):
+        super().setUpClass()
+
+        cls.env.user.groups_id += cls.env.ref(
+            'analytic.group_analytic_accounting')
+        cls.report = cls.env.ref('odex30_account_reports.profit_and_loss')
+        cls.report.write({'filter_analytic': True})
+        cls.analytic_plan = cls.env['account.analytic.plan'].create({
+            'name': 'Plan',
+        })
+
+        cls.env['account.analytic.account'].create({
+            'name': 'Time Off',
+            'plan_id': cls.analytic_plan.id
+        })
+
+    def test_tour_account_report_analytic_filters(self):
+        self.start_tour("/odoo", 'account_reports_analytic_filters', login=self.env.user.login)
diff --git a/dev_odex30_accounting/odex30_account_reports/tests/test_trial_balance_report.py b/dev_odex30_accounting/odex30_account_reports/tests/test_trial_balance_report.py
new file mode 100644
index 0000000..838ada9
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_reports/tests/test_trial_balance_report.py
@@ -0,0 +1,628 @@
+# -*- coding: utf-8 -*-
+# pylint: disable=C0326
+from .common import TestAccountReportsCommon
+
+from odoo import fields, Command
+from odoo.tests import tagged
+
+
+@tagged('post_install', '-at_install')
+class TestTrialBalanceReport(TestAccountReportsCommon):
+    @classmethod
+    def setUpClass(cls):
+        super().setUpClass()
+
+        # Give codes in company_1 to the accounts in company_2.
+        context = {'allowed_company_ids': [cls.company_data['company'].id, cls.company_data_2['company'].id]}
+        cls.company_data_2['default_account_payable'].with_context(context).code = '211010'
+        cls.company_data_2['default_account_revenue'].with_context(context).code = '400010'
+        cls.company_data_2['default_account_expense'].with_context(context).code = '600010'
+        cls.env['account.account'].search([
+            ('company_ids', '=', cls.company_data_2['company'].id),
+            ('account_type', '=', 'equity_unaffected')
+        ]).with_context(context).code = '999989'
+
+        # Entries in 2016 for company_1 to test the initial balance.
+        cls.move_2016_1 = cls.env['account.move'].create({
+            'move_type': 'entry',
+            'date': fields.Date.from_string('2016-01-01'),
+            'journal_id': cls.company_data['default_journal_misc'].id,
+            'line_ids': [
+                (0, 0, {'debit': 100.0,     'credit': 0.0,      'name': '2016_1_1',     'account_id': cls.company_data['default_account_payable'].id}),
+                (0, 0, {'debit': 200.0,     'credit': 0.0,      'name': '2016_1_2',     'account_id': cls.company_data['default_account_expense'].id}),
+                (0, 0, {'debit': 0.0,       'credit': 300.0,    'name': '2016_1_3',     'account_id': cls.company_data['default_account_revenue'].id}),
+            ],
+        })
+        cls.move_2016_1.action_post()
+
+        # Entries in 2016 for company_2 to test the initial balance in multi-companies/multi-currencies.
+        cls.move_2016_2 = cls.env['account.move'].create({
+            'move_type': 'entry',
+            'date': fields.Date.from_string('2016-06-01'),
+            'journal_id': cls.company_data_2['default_journal_misc'].id,
+            'line_ids': [
+                (0, 0, {'debit': 100.0,     'credit': 0.0,      'name': '2016_2_1',     'account_id': cls.company_data_2['default_account_payable'].id}),
+                (0, 0, {'debit': 0.0,       'credit': 100.0,    'name': '2016_2_2',     'account_id': cls.company_data_2['default_account_revenue'].id}),
+            ],
+        })
+        cls.move_2016_2.action_post()
+
+        # Entry in 2017 for company_1 to test the report at current date.
+        cls.move_2017_1 = cls.env['account.move'].create({
+            'move_type': 'entry',
+            'date': fields.Date.from_string('2017-01-01'),
+            'journal_id': cls.company_data['default_journal_sale'].id,
+            'line_ids': [
+                (0, 0, {'debit': 1000.0,    'credit': 0.0,      'name': '2017_1_1',     'account_id': cls.company_data['default_account_receivable'].id}),
+                (0, 0, {'debit': 2000.0,    'credit': 0.0,      'name': '2017_1_2',     'account_id': cls.company_data['default_account_revenue'].id}),
+                (0, 0, {'debit': 3000.0,    'credit': 0.0,      'name': '2017_1_3',     'account_id': cls.company_data['default_account_revenue'].id}),
+                (0, 0, {'debit': 4000.0,    'credit': 0.0,      'name': '2017_1_4',     'account_id': cls.company_data['default_account_revenue'].id}),
+                (0, 0, {'debit': 5000.0,    'credit': 0.0,      'name': '2017_1_5',     'account_id': cls.company_data['default_account_revenue'].id}),
+                (0, 0, {'debit': 6000.0,    'credit': 0.0,      'name': '2017_1_6',     'account_id': cls.company_data['default_account_revenue'].id}),
+                (0, 0, {'debit': 0.0,       'credit': 6000.0,   'name': '2017_1_7',     'account_id': cls.company_data['default_account_expense'].id}),
+                (0, 0, {'debit': 0.0,       'credit': 7000.0,   'name': '2017_1_8',     'account_id': cls.company_data['default_account_expense'].id}),
+                (0, 0, {'debit': 0.0,       'credit': 8000.0,   'name': '2017_1_9',     'account_id': cls.company_data['default_account_expense'].id}),
+            ],
+        })
+        cls.move_2017_1.action_post()
+
+        # Entry in 2017 for company_2 to test the current period in multi-companies/multi-currencies.
+        cls.move_2017_2 = cls.env['account.move'].create({
+            'move_type': 'entry',
+            'date': fields.Date.from_string('2017-06-01'),
+            'journal_id': cls.company_data_2['default_journal_bank'].id,
+            'line_ids': [
+                (0, 0, {'debit': 400.0,     'credit': 0.0,      'name': '2017_2_1',     'account_id': cls.company_data_2['default_account_expense'].id}),
+                (0, 0, {'debit': 0.0,       'credit': 400.0,    'name': '2017_2_2',     'account_id': cls.company_data_2['default_account_revenue'].id}),
+            ],
+        })
+        cls.move_2017_2.action_post()
+
+        # Archive 'default_journal_bank' to ensure archived entries are not filtered out.
+        cls.company_data_2['default_journal_bank'].active = False
+
+        # Deactive all currencies to ensure group_multi_currency is disabled.
+        cls.env['res.currency'].search([('name', '!=', 'USD')]).with_context(force_deactivate=True).active = False
+
+        cls.report = cls.env.ref('odex30_account_reports.trial_balance_report')
+
+    # -------------------------------------------------------------------------
+    # TESTS: Trial Balance
+    # -------------------------------------------------------------------------
+    def test_trial_balance_unaffected_earnings_current_fiscal_year(self):
+        def invoice_move(date):
+            return self.env['account.move'].create({
+                'move_type': 'entry',
+                'date': fields.Date.from_string(date),
+                'journal_id': self.company_data['default_journal_misc'].id,
+                'line_ids': [
+                    (0, 0, {'debit': 1000.0, 'credit': 0.0,    'name': 'payable', 'account_id': self.company_data['default_account_payable'].id}),
+                    (0, 0, {'debit': 2000.0, 'credit': 0.0,    'name': 'expense', 'account_id': self.company_data['default_account_expense'].id}),
+                    (0, 0, {'debit': 0.0,    'credit': 3000.0, 'name': 'revenue', 'account_id': self.company_data['default_account_revenue'].id}),
+                ],
+            })
+
+        move_2009_12 = invoice_move('2009-12-31')
+        move_2009_12.action_post()
+
+        move_2010_01 = invoice_move('2010-01-31')
+        move_2010_01.action_post()
+
+        move_2010_02 = self.env['account.move'].create({
+            'move_type': 'entry',
+            'date': fields.Date.from_string('2010-02-01'),
+            'journal_id': self.company_data['default_journal_misc'].id,
+            'line_ids': [
+                (0, 0, {'debit': 100.0, 'credit': 0.0,    'name': 'payable', 'account_id': self.company_data['default_account_payable'].id}),
+                (0, 0, {'debit': 200.0, 'credit': 0.0,    'name': 'expense', 'account_id': self.company_data['default_account_expense'].id}),
+                (0, 0, {'debit': 0.0,    'credit': 300.0, 'name': 'revenue', 'account_id': self.company_data['default_account_revenue'].id}),
+            ],
+        })
+        move_2010_02.action_post()
+
+        move_2010_03 = invoice_move('2010-03-01')
+        move_2010_03.action_post()
+
+        options = self._generate_options(self.report, fields.Date.from_string('2010-02-01'), fields.Date.from_string('2010-02-28'))
+
+        self.assertLinesValues(
+            self.report._get_lines(options),
+            #                                           [  Initial Balance   ]          [       Balance      ]          [       Total        ]
+            #   Name                                    Debit           Credit          Debit           Credit          Debit           Credit
+            [   0,                                      1,              2,              3,              4,              5,              6],
+            [
+                ('211000 Account Payable',              2000.0,         0.0,            100.0,          0.0,            2100.0,         0.0),
+                ('400000 Product Sales',                0.0,            3000.0,         0.0,            300.0,          0.0,            3300.0),
+                ('600000 Expenses',                     2000.0,         0.0,            200.0,          0.0,            2200.0,         0.0),
+                ('999999 Undistributed Profits/Losses', 0.0,            1000.0,         0.0,            0.0,            0.0,            1000.0),
+                ('Total',                               4000.0,         4000.0,         300.0,          300.0,          4300.0,         4300.0),
+            ],
+            options,
+        )
+
+    def test_trial_balance_unaffected_earnings_previous_fiscal_year(self):
+        def invoice_move(date):
+            return self.env['account.move'].create({
+                'move_type': 'entry',
+                'date': fields.Date.from_string(date),
+                'journal_id': self.company_data['default_journal_misc'].id,
+                'line_ids': [
+                    (0, 0, {'debit': 1000.0, 'credit': 0.0,    'name': 'payable', 'account_id': self.company_data['default_account_payable'].id}),
+                    (0, 0, {'debit': 2000.0, 'credit': 0.0,    'name': 'expense', 'account_id': self.company_data['default_account_expense'].id}),
+                    (0, 0, {'debit': 0.0,    'credit': 3000.0, 'name': 'revenue', 'account_id': self.company_data['default_account_revenue'].id}),
+                ],
+            })
+
+        move_2009_12 = invoice_move('2009-12-31')
+        move_2009_12.action_post()
+
+        move_2010_01 = invoice_move('2010-01-31')
+        move_2010_01.action_post()
+
+        move_2010_02 = self.env['account.move'].create({
+            'move_type': 'entry',
+            'date': fields.Date.from_string('2010-02-01'),
+            'journal_id': self.company_data['default_journal_misc'].id,
+            'line_ids': [
+                (0, 0, {'debit': 100.0, 'credit': 0.0,    'name': 'payable', 'account_id': self.company_data['default_account_payable'].id}),
+                (0, 0, {'debit': 200.0, 'credit': 0.0,    'name': 'expense', 'account_id': self.company_data['default_account_expense'].id}),
+                (0, 0, {'debit': 0.0,    'credit': 300.0, 'name': 'revenue', 'account_id': self.company_data['default_account_revenue'].id}),
+            ],
+        })
+        move_2010_02.action_post()
+
+        move_2010_03 = invoice_move('2010-03-01')
+        move_2010_03.action_post()
+
+        options = self._generate_options(self.report, fields.Date.from_string('2010-01-01'), fields.Date.from_string('2010-02-28'))
+
+        self.assertLinesValues(
+            self.report._get_lines(options),
+            #                                           [  Initial Balance   ]          [       Balance      ]          [       Total        ]
+            #   Name                                    Debit           Credit          Debit           Credit          Debit           Credit
+            [   0,                                      1,              2,              3,              4,              5,              6],
+            [
+                ('211000 Account Payable',              1000.0,         0.0,            1100.0,         0.0,            2100.0,         0.0),
+                ('400000 Product Sales',                0.0,            0.0,            0.0,            3300.0,         0.0,            3300.0),
+                ('600000 Expenses',                     0.0,            0.0,            2200.0,         0.0,            2200.0,         0.0),
+                ('999999 Undistributed Profits/Losses', 0.0,            1000.0,         0.0,            0.0,            0.0,            1000.0),
+                ('Total',                               1000.0,         1000.0,         3300.0,         3300.0,         4300.0,         4300.0),
+            ],
+            options,
+        )
+
+    def test_trial_balance_whole_report(self):
+        options = self._generate_options(self.report, fields.Date.from_string('2017-01-01'), fields.Date.from_string('2017-12-31'))
+
+        self.assertLinesValues(
+            self.report._get_lines(options),
+            #                                           [  Initial Balance   ]          [       Balance      ]          [       Total        ]
+            #   Name                                    Debit           Credit          Debit           Credit          Debit           Credit
+            [   0,                                      1,              2,              3,              4,              5,              6],
+            [
+                ('121000 Account Receivable',           0.0,            0.0,            1000.0,         0.0,            1000.0,         0.0),
+                ('211000 Account Payable',              100.0,          0.0,            0.0,            0.0,            100.0,          0.0),
+                ('211010 Account Payable',              50.0,          0.0,            0.0,            0.0,             50.0,           0.0),
+                ('400000 Product Sales',                0.0,            0.0,            20000.0,        0.0,            20000.0,        0.0),
+                ('400010 Product Sales',                0.0,            0.0,            0.0,            200.0,          0.0,            200.0),
+                ('600000 Expenses',                     0.0,            0.0,            0.0,            21000.0,        0.0,            21000.0),
+                ('600010 Expenses',                     0.0,            0.0,            200.0,          0.0,            200.0,          0.0),
+                ('999989 Undistributed Profits/Losses', 0.0,            50.0,           0.0,            0.0,            0.0,            50.0),
+                ('999999 Undistributed Profits/Losses', 0.0,            100.0,          0.0,            0.0,            0.0,            100.0),
+                ('Total',                               150.0,          150.0,          21200.0,        21200.0,        21350.00,       21350.0),
+            ],
+            options,
+        )
+
+    def test_trial_balance_filter_journals(self):
+        self.env.companies = self.env.company
+
+        options = self._generate_options(self.report, fields.Date.from_string('2017-01-01'), fields.Date.from_string('2017-12-31'))
+        options = self._update_multi_selector_filter(options, 'journals', self.company_data['default_journal_sale'].ids)
+
+        self.assertLinesValues(
+            self.report._get_lines(options),
+            #                                           [  Initial Balance   ]          [       Balance      ]          [       Total        ]
+            #   Name                                    Debit           Credit          Debit           Credit          Debit           Credit
+            [   0,                                      1,              2,              3,              4,              5,              6],
+            [
+                ('121000 Account Receivable',          0.0,            0.0,             1000.0,         0.0,            1000.0,         0.0),
+                ('400000 Product Sales',               0.0,            0.0,             20000.0,        0.0,            20000.0,        0.0),
+                ('600000 Expenses',                    0.0,            0.0,             0.0,            21000.0,        0.0,             21000.0),
+                ('Total',                              0.0,            0.0,             21000.0,        21000.0,        21000.0,         21000.0),
+            ],
+            options,
+        )
+
+    def test_trial_balance_comparisons(self):
+        options = self._generate_options(self.report, '2017-01-01', '2017-12-31')
+        options = self._update_comparison_filter(options, self.report, 'previous_period', 1, fields.Date.from_string('2017-01-01'), fields.Date.from_string('2017-12-31'))
+        expected_header_values = [
+            {
+                'name': '2016',
+                'forced_options': {'date': {'string': '2016', 'period_type': 'fiscalyear', 'mode': 'range', 'date_from': '2016-01-01', 'date_to': '2016-12-31', 'currency_table_period_key': '_trial_balance_middle_periods'}}
+            },
+            {
+                'name': '2017',
+                'forced_options': {'date': {'string': '2017', 'period_type': 'fiscalyear', 'mode': 'range', 'date_from': '2017-01-01', 'date_to': '2017-12-31', 'filter': 'custom', 'currency_table_period_key': '_trial_balance_middle_periods'}}
+            },
+        ]
+
+        for i, val in enumerate(expected_header_values, start=1):
+            self.assertDictEqual(options['column_headers'][0][i], val)
+
+        # Rate for 2016 and 2017 is (1/3 (from 2016) * 366 + 1/2 (from 2017) * 365) / 731 => 0.416552668
+        self.assertLinesValues(
+            self.report._get_lines(options),
+            #                                           [  Initial Balance   ]          [        2016        ]          [        2017        ]          [       Total        ]
+            #   Name                                    Debit           Credit          Debit           Credit          Debit           Credit          Debit           Credit
+            [   0,                                      1,              2,              3,              4,              5,              6,              7,              8],
+            [
+                ('121000 Account Receivable',          0.0,            0.0,             0.0,            0.0,            1000.0,         0.0,            1000.0,         0.0),
+                ('211000 Account Payable',             0.0,            0.0,             100.0,          0.0,            0.0,            0.0,            100.0,          0.0),
+                ('211010 Account Payable',             0.0,            0.0,             50.0,           0.0,            0.0,            0.0,            50.0,           0.0),
+                ('400000 Product Sales',               0.0,            0.0,             0.0,            300.0,          20000.0,        0.0,            20000.0,        0.0),
+                ('400010 Product Sales',               0.0,            0.0,             0.0,            41.66,          0.0,            166.62,         0.0,            166.62),
+                ('600000 Expenses',                    0.0,            0.0,             200.0,          0.0,            0.0,            21000.0,        0.0,            21000.0),
+                ('600010 Expenses',                    0.0,            0.0,             0.0,            0.0,            166.62,         0.0,            166.62,         0.0),
+                ('999989 Undistributed Profits/Losses', 0.0,           0.0,             0.0,            0.0,            0.0,            0.0,            0.0,            41.66),
+                ('999999 Undistributed Profits/Losses', 0.0,           0.0,             0.0,            0.0,            0.0,            0.0,            0.0,            100.0),
+                ('Total',                              0.0,            0.0,             350.00,         341.66,         21166.62,       21166.62,       21316.62,       21308.28),
+            ],
+            options,
+        )
+
+        options['comparison']['period_order'] = 'descending'
+        options = self.report.get_options(options)
+
+        for i, val in enumerate(expected_header_values[::-1], start=1):
+            self.assertDictEqual(options['column_headers'][0][i], val)
+
+        self.assertLinesValues(
+            self.report._get_lines(options),
+            #                                           [  Initial Balance   ]          [        2017        ]          [        2016        ]          [       Total        ]
+            #   Name                                    Debit           Credit          Debit           Credit          Debit           Credit          Debit           Credit
+            [   0,                                      1,              2,              3,              4,              5,              6,              7,              8],
+            [
+                ('121000 Account Receivable',          0.0,            0.0,             1000.0,         0.0,            0.0,            0.0,            1000.0,         0.0),
+                ('211000 Account Payable',             0.0,            0.0,             0.0,            0.0,            100.0,          0.0,            100.0,          0.0),
+                ('211010 Account Payable',             0.0,            0.0,             0.0,            0.0,            50.00,          0.0,            50.00,           0.0),
+                ('400000 Product Sales',               0.0,            0.0,             20000.0,        0.0,            0.0,            300.0,          20000.0,        0.0),
+                ('400010 Product Sales',               0.0,            0.0,             0.0,            166.62,         0.0,            41.66,          0.0,            166.62),
+                ('600000 Expenses',                    0.0,            0.0,             0.0,            21000.0,        200.0,          0.0,            0.0,            21000.0),
+                ('600010 Expenses',                    0.0,            0.0,             166.62,         0.0,            0.0,            0.0,            166.62,         0.0),
+                ('999989 Undistributed Profits/Losses', 0.0,           0.0,             0.0,            0.0,            0.0,            0.0,            0.0,            41.66),
+                ('999999 Undistributed Profits/Losses', 0.0,           0.0,             0.0,            0.0,            0.0,            0.0,            0.0,            100.0),
+                ('Total',                              0.0,            0.0,             21166.62,       21166.62,       350.00,         341.66,         21316.62,       21308.28),
+            ],
+            options,
+        )
+
+    def test_trial_with_disabled_comparison_filter(self):
+        self.report.filter_period_comparison = False
+        options = self._generate_options(self.report, fields.Date.from_string('2017-01-01'), fields.Date.from_string('2017-12-31'))
+
+        self.assertLinesValues(
+            self.report._get_lines(options),
+            #                                           [  Initial Balance   ]          [       Balance      ]          [       Total        ]
+            #   Name                                    Debit           Credit          Debit           Credit          Debit           Credit
+            [   0,                                      1,              2,              3,              4,              5,              6],
+            [
+                ('121000 Account Receivable',           0.0,             0.0,             1000.0,          0.0,             1000.0,          0.0),
+                ('211000 Account Payable',              100.0,           0.0,             0.0,             0.0,             100.0,           0.0),
+                ('211010 Account Payable',              50.00,           0.0,             0.0,             0.0,             50.00,           0.0),
+                ('400000 Product Sales',                0.0,             0.0,             20000.0,         0.0,             20000.0,         0.0),
+                ('400010 Product Sales',                0.0,             0.0,             0.0,             200.0,           0.0,             200.0),
+                ('600000 Expenses',                     0.0,             0.0,             0.0,             21000.0,         0.0,             21000.0),
+                ('600010 Expenses',                     0.0,             0.0,             200.0,           0.0,             200.0,           0.0),
+                ('999989 Undistributed Profits/Losses', 0.0,             50.0,            0.0,             0.0,             0.0,             50.0),
+                ('999999 Undistributed Profits/Losses', 0.0,             100.0,           0.0,             0.0,             0.0,             100.0),
+                ('Total',                               150.00,          150.0,           21200.0,         21200.0,         21350.00,        21350.0),
+            ],
+            options,
+        )
+
+    def test_trial_balance_account_group_with_hole(self):
+        """
+        Let's say you have the following account groups: 10, 101, 1012
+        If you have entries for group 10 and 1012 but none for 101,
+        the trial balance report should work correctly
+
+        - 10  --> has entries
+          - 101 --> NO ENTRIES
+            - 1012 --> has entries
+
+        """
+
+        test_journal = self.env['account.journal'].create({
+            'name': 'test journal',
+            'code': 'TJ',
+            'type': 'general',
+        })
+
+        self.env['account.group'].create([
+            {'name': 'Group_10', 'code_prefix_start': '10', 'code_prefix_end': '10'},
+            {'name': 'Group_101', 'code_prefix_start': '101', 'code_prefix_end': '101'},
+            {'name': 'Group_1012', 'code_prefix_start': '1012', 'code_prefix_end': '1012'},
+        ])
+
+        # Create the accounts.
+        account_a, account_a1 = self.env['account.account'].create([
+            {'code': '100000', 'name': 'Account A', 'account_type': 'asset_current'},
+            {'code': '101200', 'name': 'Account A1', 'account_type': 'asset_current'},
+        ])
+
+        move = self.env['account.move'].create({
+            'move_type': 'entry',
+            'date': fields.Date.from_string('2017-06-01'),
+            'journal_id': test_journal.id,
+            'line_ids': [
+                Command.create({'debit': 100.0,     'credit': 0.0,      'name': 'account_a_1',     'account_id': account_a.id}),
+                Command.create({'debit': 0.0,       'credit': 100.0,    'name': 'account_a_2',     'account_id': account_a.id}),
+                Command.create({'debit': 200.0,     'credit': 0.0,      'name': 'account_a1_1',    'account_id': account_a1.id}),
+                Command.create({'debit': 0.0,       'credit': 200.0,    'name': 'account_a1_2',    'account_id': account_a1.id}),
+            ],
+        })
+        move.action_post()
+
+        options = self._generate_options(self.report, fields.Date.from_string('2017-06-01'), fields.Date.from_string('2017-06-01'))
+        options = self._update_multi_selector_filter(options, 'journals', test_journal.ids)
+        options['unfold_all'] = True
+
+        self.assertLinesValues(
+            self.report._get_lines(options),
+            [   0,                                     1,              2,               3,              4,              5,              6],
+            [
+                ['10 Group_10',                        0.0,            0.0,             300.0,          300.0,          0.0,            0.0],
+                ['100000 Account A',                   0.0,            0.0,             100.0,          100.0,          0.0,            0.0],
+                ['101 Group_101',                      0.0,            0.0,             200.0,          200.0,          0.0,            0.0],
+                ['1012 Group_1012',                    0.0,            0.0,             200.0,          200.0,          0.0,            0.0],
+                ['101200 Account A1',                  0.0,            0.0,             200.0,          200.0,          0.0,            0.0],
+                ['Total',                              0.0,            0.0,             300.0,          300.0,          0.0,            0.0]
+            ],
+            options,
+        )
+
+    def test_action_general_ledger(self):
+        """
+            This test will check that the action caret_option_open_general_ledger works as expected which means that
+            a default_filter_accounts is set and that in case of hierarchy, the group is unfolded
+        """
+        self.env['account.group'].create([
+            {'name': 'Group_6', 'code_prefix_start': '6', 'code_prefix_end': '6'},
+        ])
+        options = self._generate_options(self.report, '2017-06-01', '2017-06-01', default_options={'hierarchy': True, 'unfold_all': True})
+        lines = self.report._get_lines(options)
+        self.assertLinesValues(
+            lines,
+            #                                               [  Initial Balance   ]          [       Balance      ]          [       Total        ]
+            #   Name                                        Debit           Credit          Debit           Credit          Debit           Credit
+            [0,                                                1,               2,             3,               4,             5,               6],
+            [
+                ('6 Group_6',                                0.0,         21000.0,         200.0,             0.0,         200.0,         21000.0),
+                ('600000 Expenses',                          0.0,         21000.0,           0.0,             0.0,           0.0,         21000.0),
+                ('600010 Expenses',                          0.0,             0.0,         200.0,             0.0,         200.0,             0.0),
+                ('(No Group)',                           21150.0,           150.0,           0.0,           200.0,       21150.0,           350.0),
+                ('121000 Account Receivable',             1000.0,             0.0,           0.0,             0.0,        1000.0,             0.0),
+                ('211000 Account Payable',                 100.0,             0.0,           0.0,             0.0,         100.0,             0.0),
+                ('211010 Account Payable',                  50.0,             0.0,           0.0,             0.0,          50.0,             0.0),
+                ('400000 Product Sales',                 20000.0,             0.0,           0.0,             0.0,       20000.0,             0.0),
+                ('400010 Product Sales',                     0.0,             0.0,           0.0,           200.0,           0.0,           200.0),
+                ('999989 Undistributed Profits/Losses',      0.0,            50.0,           0.0,             0.0,           0.0,            50.0),
+                ('999999 Undistributed Profits/Losses',      0.0,           100.0,           0.0,             0.0,           0.0,           100.0),
+                ('Total',                                21150.0,         21150.0,         200.0,           200.0,       21350.0,         21350.0),
+            ],
+            options,
+        )
+        general_ledger = self.env.ref('odex30_account_reports.general_ledger_report')
+        params = {'line_id': lines[1]['id']}
+        res = self.report.caret_option_open_general_ledger(options, params)
+        self.assertEqual(res['context']['default_filter_accounts'], '600000')
+        general_ledger_lines = general_ledger._get_lines(res['params']['options'])
+        unfolded_lines = [line for line in general_ledger_lines if line.get("unfolded")]
+        # Since the line 600000 Expenses has no child, unfolded is set to False. That's why we have only one element in the list
+        self.assertEqual(len(unfolded_lines), 1)
+
+    def test_blank_if_zero(self):
+        """
+            This test will check that the option blank if zero works as expected which means that
+            a '0.0' value will be blanked, but not in the total line.
+        """
+        self.report.column_ids.write({'blank_if_zero': True})
+        options = self._generate_options(self.report, fields.Date.from_string('2017-01-01'), fields.Date.from_string('2017-12-31'))
+        options = self._update_multi_selector_filter(options, 'journals', self.company_data['default_journal_sale'].ids)
+
+        self.assertLinesValues(
+            self.report._get_lines(options),
+            #                                           [  Initial Balance   ]          [       Balance      ]          [       Total        ]
+            #   Name                                    Debit           Credit          Debit           Credit          Debit           Credit
+            [   0,                                      1,              2,              3,              4,              5,              6],
+            [
+                ('121000 Account Receivable',          '',             '',         1000.0,             '',         1000.0,             ''),
+                ('400000 Product Sales',               '',             '',        20000.0,             '',        20000.0,             ''),
+                ('600000 Expenses',                    '',             '',             '',        21000.0,             '',        21000.0),
+                ('Total',                              0.0,            0.0,       21000.0,        21000.0,        21000.0,        21000.0),
+            ],
+            options,
+        )
+
+    def test_trial_balance_analytic_groupby(self):
+        """
+        Test the analytic accounts groupby
+        """
+        self.env.user.groups_id += self.env.ref('analytic.group_analytic_accounting')
+        self.report.filter_analytic = True
+        self.report.filter_analytic_groupby = True
+
+        analytic_plan = self.env['account.analytic.plan'].create({
+            'name': 'Plan XYZ',
+        })
+        analytic_account = self.env['account.analytic.account'].create({
+            'name': 'Account XYZ',
+            'plan_id': analytic_plan.id
+        })
+        move_2019 = self.env['account.move'].create({
+            'move_type': 'entry',
+            'date': fields.Date.from_string('2019-01-01'),
+            'journal_id': self.company_data['default_journal_misc'].id,
+            'line_ids': [
+                Command.create({
+                    'debit': 50.0,
+                    'credit': 0.0,
+                    'name': 'XYZ debit (2019)',
+                    'account_id': self.company_data['default_account_payable'].id,
+                    'analytic_distribution': {analytic_account.id: 100},
+                }),
+                Command.create({
+                    'debit': 0.0,
+                    'credit': 50.0,
+                    'name': 'XYZ credit (2019)',
+                    'account_id': self.company_data['default_account_revenue'].id,
+                    'analytic_distribution': {analytic_account.id: 100},
+                }),
+            ],
+        })
+        move_2019.action_post()
+        move_2020 = self.env['account.move'].create({
+            'move_type': 'entry',
+            'date': fields.Date.from_string('2020-01-01'),
+            'journal_id': self.company_data['default_journal_misc'].id,
+            'line_ids': [
+                Command.create({
+                    'debit': 100.0,
+                    'credit': 0.0,
+                    'name': 'XYZ debit (2020)',
+                    'account_id': self.company_data['default_account_payable'].id,
+                    'analytic_distribution': {analytic_account.id: 100},
+                }),
+                Command.create({
+                    'debit': 0.0,
+                    'credit': 100.0,
+                    'name': 'XYZ credit (2020)',
+                    'account_id': self.company_data['default_account_revenue'].id,
+                    'analytic_distribution': {analytic_account.id: 100},
+                }),
+            ],
+        })
+        move_2020.action_post()
+
+        # add a group by analytic account
+        options = self._generate_options(
+            self.report,
+            '2020-01-01',
+            '2020-01-31',
+            default_options={
+                'analytic_accounts': [analytic_account.id],
+                'analytic_accounts_groupby': [analytic_account.id],
+            }
+        )
+        lines = self.report._get_lines(options)
+        self.assertLinesValues(
+            lines,
+            #                                          [         Initial Balance        ]    [            Jan 2020            ]    [           End Balance          ]
+            #                                          [ Account XYZ ]    [    Total    ]    [ Account XYZ ]    [    Total    ]    [ Account XYZ ]    [    Total    ]
+            #   Name                                   Debit    Credit    Debit    Credit    Debit    Credit    Debit    Credit    Debit    Credit    Debit    Credit
+            [0,                                            1,       2,        3,       4,        5,       6,        7,       8,        9,      10,       11,      12],
+            [
+                ('211000 Account Payable',              50.0,     0.0,     50.0,     0.0,    100.0,     0.0,    100.0,     0.0,    150.0,     0.0,    150.0,     0.0),
+                ('400000 Product Sales',                 0.0,     0.0,      0.0,     0.0,      0.0,   100.0,      0.0,   100.0,      0.0,   100.0,      0.0,   100.0),
+                ('999999 Undistributed Profits/Losses',  0.0,    50.0,      0.0,    50.0,      0.0,     0.0,      0.0,     0.0,      0.0,    50.0,      0.0,    50.0),
+                ('Total',                               50.0,    50.0,     50.0,    50.0,    100.0,   100.0,    100.0,   100.0,    150.0,   150.0,    150.0,   150.0),
+            ],
+            options,
+        )
+
+        # add a group by analytic plan
+        options = self._generate_options(
+            self.report,
+            '2020-01-01',
+            '2020-01-31',
+            default_options={
+                'analytic_accounts': [analytic_account.id],
+                'analytic_plans_groupby': [analytic_plan.id],
+            }
+        )
+        lines = self.report._get_lines(options)
+        self.assertLinesValues(
+            lines,
+            #                                          [         Initial Balance        ]    [            Jan 2020            ]    [           End Balance          ]
+            #                                          [   Plan XYZ  ]    [    Total    ]    [   Plan XYZ  ]    [    Total    ]    [   Plan XYZ  ]    [    Total    ]
+            #   Name                                   Debit    Credit    Debit    Credit    Debit    Credit    Debit    Credit    Debit    Credit    Debit    Credit
+            [0,                                            1,       2,        3,       4,        5,       6,        7,       8,        9,      10,       11,      12],
+            [
+                ('211000 Account Payable',              50.0,     0.0,     50.0,     0.0,    100.0,     0.0,    100.0,     0.0,    150.0,     0.0,    150.0,     0.0),
+                ('400000 Product Sales',                 0.0,     0.0,      0.0,     0.0,      0.0,   100.0,      0.0,   100.0,      0.0,   100.0,      0.0,   100.0),
+                ('999999 Undistributed Profits/Losses',  0.0,    50.0,      0.0,    50.0,      0.0,     0.0,      0.0,     0.0,      0.0,    50.0,      0.0,    50.0),
+                ('Total',                               50.0,    50.0,     50.0,    50.0,    100.0,   100.0,    100.0,   100.0,    150.0,   150.0,    150.0,   150.0),
+            ],
+            options,
+        )
+
+    def test_export_xlsx_with_inf_account_code(self):
+        account_with_inf_code = self.env['account.account'].create(
+            [{'code': '1E1000', 'name': '', 'account_type': 'asset_receivable'}])
+        move = self.env['account.move'].create({
+            'date': '2025-08-02',
+            'line_ids': [Command.create({'account_id': account_with_inf_code.id, 'name': ''})],
+        })
+        move.action_post()
+        options = self._generate_options(
+            self.report,
+            fields.Date.from_string('2025-08-01'),
+            fields.Date.from_string('2025-08-31')
+        )
+        self.report.export_to_xlsx(options)
+
+    def test_trial_balance_export_pdf_filter_hierarchy(self):
+        """
+        Test if the filter is also applied to the name of the group
+        """
+        self.env.lang = self.env['res.lang'].search([('code', '=', 'en_US')]).code
+        self.env['account.group'].create([
+            {'name': 'Group_10', 'code_prefix_start': '10', 'code_prefix_end': '10'},
+            {'name': 'Group_101', 'code_prefix_start': '101', 'code_prefix_end': '101'},
+            {'name': 'Group_1012', 'code_prefix_start': '1012', 'code_prefix_end': '1012'},
+            {'name': 'Group_102', 'code_prefix_start': '102', 'code_prefix_end': '102'},
+        ])
+
+        # Create the accounts.
+        account_a, account_a1, account_a2 = self.env['account.account'].create([
+            {'code': '100000', 'name': 'Account A', 'account_type': 'asset_current'},
+            {'code': '101200', 'name': 'Account A1', 'account_type': 'asset_current'},
+            {'code': '102200', 'name': 'Account A2', 'account_type': 'asset_current'},
+        ])
+
+        move = self.env['account.move'].create({
+            'move_type': 'entry',
+            'date': fields.Date.from_string('2017-06-01'),
+            'journal_id': self.company_data['default_journal_misc'].id,
+            'line_ids': [
+                Command.create({'debit': 100.0,     'credit': 0.0,      'name': 'account_a_1',     'account_id': account_a.id}),
+                Command.create({'debit': 0.0,       'credit': 100.0,    'name': 'account_a_2',     'account_id': account_a.id}),
+                Command.create({'debit': 200.0,     'credit': 0.0,      'name': 'account_a1_1',    'account_id': account_a1.id}),
+                Command.create({'debit': 0.0,       'credit': 200.0,    'name': 'account_a1_2',    'account_id': account_a1.id}),
+                Command.create({'debit': 333.0,     'credit': 0.0,      'name': 'account_a2_1',    'account_id': account_a2.id}),
+                Command.create({'debit': 0.0,       'credit': 333.0,    'name': 'account_a2_2',    'account_id': account_a2.id}),
+            ],
+        })
+        move.action_post()
+
+        default_options = {
+            'hierarchy': True,
+            'unfold_all': True,
+            'export_mode': 'print',
+            'filter_search_bar': 'Group_101',
+        }
+        options = self._generate_options(self.report, '2017-06-01', '2017-06-01', default_options=default_options)
+        self.assertLinesValues(
+            self.report._get_lines(options),
+            [   0,                                     1,              2,               3,              4,              5,              6],
+            [
+                ['10 Group_10',                        0.0,            0.0,             200.0,          200.0,          0.0,            0.0],
+                ['101 Group_101',                      0.0,            0.0,             200.0,          200.0,          0.0,            0.0],
+                ['1012 Group_1012',                    0.0,            0.0,             200.0,          200.0,          0.0,            0.0],
+                ['101200 Account A1',                  0.0,            0.0,             200.0,          200.0,          0.0,            0.0],
+                ['Total',                              0.0,            0.0,             200.0,          200.0,          0.0,            0.0],
+            ],
+            options,
+        )
diff --git a/dev_odex30_accounting/odex30_account_reports/views/account_account_views.xml b/dev_odex30_accounting/odex30_account_reports/views/account_account_views.xml
new file mode 100644
index 0000000..5bb98a2
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_reports/views/account_account_views.xml
@@ -0,0 +1,13 @@
+<?xml version='1.0' encoding='utf-8'?>
+<odoo>
+    <record id="view_account_form" model="ir.ui.view">
+        <field name="name">account.account.reports.form</field>
+        <field name="model">account.account</field>
+        <field name="inherit_id" ref="account.view_account_form"/>
+        <field name="arch" type="xml">
+            <field name="currency_id" position="before">
+                <field name="non_trade" invisible="account_type not in ('liability_payable', 'asset_receivable')"/>
+            </field>
+        </field>
+    </record>
+</odoo>
diff --git a/dev_odex30_accounting/odex30_account_reports/views/account_activity.xml b/dev_odex30_accounting/odex30_account_reports/views/account_activity.xml
new file mode 100644
index 0000000..68b45cf
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_reports/views/account_activity.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0"?>
+<odoo>
+    <record id="view_move_form_vat_return" model="ir.ui.view">
+        <field name="name">account.move.form.vat.return</field>
+        <field name="model">account.move</field>
+        <field name="inherit_id" ref="account.view_move_form"/>
+        <field name="arch" type="xml">
+            <xpath expr="//header" position="after">
+                <field name="tax_closing_report_id" invisible="1"/>
+
+                <div class="alert alert-info text-center" invisible="not tax_closing_report_id or state != 'draft'" role="alert">
+                    Proposition of tax closing journal entry.
+                    <button class="btn btn-link p-0 align-baseline" string="-> Refresh" name="refresh_tax_entry" type="object" groups="account.group_account_invoice"/>
+                </div>
+                <field name="tax_closing_alert" invisible="1"/>
+                <div class="alert alert-info text-center" invisible="not tax_closing_alert" role="alert">
+                    This tax closing entry is posted, but the tax lock date is earlier than the covered period's last day. You might need to reset it to draft and refresh its content, in case other entries using taxes have been posted in the meantime.
+                </div>
+            </xpath>
+
+            <xpath expr="//div[hasclass('oe_button_box')]/button" position="before">
+                <button
+                    name="action_open_tax_report"
+                    class="oe_stat_button"
+                    icon="fa-book"
+                    type="object"
+                    string="Tax Report"
+                    invisible="not tax_closing_report_id"/>
+            </xpath>
+
+            <xpath expr="//field[@name='line_ids']//list//field[@name='tax_ids']" position="attributes">
+                <attribute name="column_invisible">parent.tax_closing_report_id</attribute>
+            </xpath>
+            <xpath expr="//field[@name='line_ids']//list//field[@name='tax_tag_ids']" position="attributes">
+                <attribute name="column_invisible">parent.tax_closing_report_id</attribute>
+            </xpath>
+            <xpath expr="//field[@name='line_ids']//form//field[@name='tax_ids']" position="attributes">
+                <attribute name="invisible">parent.tax_closing_report_id</attribute>
+            </xpath>
+        </field>
+    </record>
+</odoo>
diff --git a/dev_odex30_accounting/odex30_account_reports/views/account_journal_dashboard_view.xml b/dev_odex30_accounting/odex30_account_reports/views/account_journal_dashboard_view.xml
new file mode 100644
index 0000000..a06a017
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_reports/views/account_journal_dashboard_view.xml
@@ -0,0 +1,48 @@
+<odoo>
+    <record model="ir.ui.view" id="account_reports_journal_dashboard_kanban_view">
+        <field name="name">account.journal.dashboard.kanban.reports</field>
+        <field name="model">account.journal</field>
+        <field name="inherit_id" ref="account.account_journal_dashboard_kanban_view" />
+        <field name="arch" type="xml">
+
+            <xpath expr="//div[@name='kanban_manage_reports']" position="inside">
+                <div t-if="journal_type == 'sale'">
+                    <a type="action" name="%(action_account_report_ar)d">Aged Receivables</a>
+                </div>
+                <div t-if="journal_type == 'purchase'">
+                    <a type="action" name="%(action_account_report_ap)d">Aged Payables</a>
+                </div>
+            </xpath>
+
+            <!-- Replace the displayed amount by an action opening the General Ledger report -->
+            <xpath expr="//div[@id='dashboard_bank_cash_balance']" position="replace">
+                <div id="dashboard_bank_cash_balance" class="col overflow-hidden text-start">
+                    <a type="object" name="action_open_bank_balance_in_gl" title="Last Statement balance + Transactions since statement">Balance</a>
+                </div>
+            </xpath>
+
+            <xpath expr="//div[@id='bank_and_cash_container']" position="inside">
+                <div class="col-4 o_kanban_card_manage_section o_kanban_manage_reconciliation">
+                    <h5 id="card_action_view_menus" class="o_kanban_card_manage_title">
+                        <span role="separator">Reconciliation</span>
+                    </h5>
+                    <div>
+                        <a type="action" name="%(action_account_report_bank_reconciliation)d">Reconciliation Report</a>
+                    </div>
+                </div>
+            </xpath>
+
+            <!-- Add subtitle & onboarding to account_tax_periodicity_journals -->
+            <xpath expr="//t[@name='empty_journal_helper']" position="inside">
+                <span class="text-muted" t-if="journal_type == 'general' and dashboard['is_account_tax_periodicity_journal']">Never miss a tax deadline.</span>
+            </xpath>
+
+            <xpath expr="//div[@id='dashboard_general_right']" position="after">
+                <widget t-if="!record.has_posted_entries.raw_value and dashboard['onboarding'] and dashboard['is_account_tax_periodicity_journal']"
+                        name="account_onboarding"
+                        groups="account.group_account_manager"/>
+            </xpath>
+
+        </field>
+    </record>
+</odoo>
diff --git a/dev_odex30_accounting/odex30_account_reports/views/account_move_views.xml b/dev_odex30_accounting/odex30_account_reports/views/account_move_views.xml
new file mode 100644
index 0000000..cd089b7
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_reports/views/account_move_views.xml
@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <record id="view_archived_tag_move_tree" model="ir.ui.view">
+        <field name="name">account.archived.tax.tag.list</field>
+        <field name="model">account.move.line</field>
+        <field name="inherit_id" ref="account.view_move_line_tree"/>
+        <field name="mode">primary</field>
+        <field name="arch" type="xml">
+            <xpath expr="//field[@name='tax_ids']" position="attributes">
+                <attribute name="optional">show</attribute>
+            </xpath>
+            <xpath expr="//field[@name='tax_tag_ids']" position="attributes">
+                <attribute name="optional">show</attribute>
+            </xpath>
+            <xpath expr="//field[@name='matching_number']" position="attributes">
+                <attribute name="optional">hide</attribute>
+            </xpath>
+        </field>
+    </record>
+
+    <record id="view_journal_report_audit_move_line_tree" model="ir.ui.view">
+        <field name="name">account.journal.report.audit.move.line.list</field>
+        <field name="model">account.move.line</field>
+        <field name="inherit_id" ref="account.view_move_line_tree"/>
+        <field name="mode">primary</field>
+        <field name="arch" type="xml">
+            <list name="move_line_tree" position="attributes">
+                <attribute name="js_class">account_move_line_journal_report_list</attribute>
+            </list>
+            <button name="edit" position="replace">
+                <button name="open_partner" type="object" string="View" title="View Partner"/>
+            </button>
+            <groupby name="partner_id" position="after">
+                <groupby name="move_id">
+                    <button name="button_set_checked" type="object" string="Set as Checked" invisible="checked or state == 'draft'"/>
+                </groupby>
+            </groupby>
+            <field name="invoice_date" position="attributes">
+                <attribute name="optional">show</attribute>
+            </field>
+            <field name="account_id" position="attributes">
+                <attribute name="optional">show</attribute>
+            </field>
+            <field name="tax_ids" position="attributes">
+                <attribute name="optional">show</attribute>
+            </field>
+            <field name="date" position="attributes">
+                <attribute name="optional">hide</attribute>
+            </field>
+            <field name="matching_number" position="attributes">
+                <attribute name="optional">hide</attribute>
+            </field>
+            <field name="partner_id" position="attributes">
+                <attribute name="optional">hide</attribute>
+            </field>
+
+        </field>
+    </record>
+
+    <record id="view_journal_report_audit_bank_move_line_tree" model="ir.ui.view">
+        <field name="name">account.journal.report.audit.bank.move.line.tree</field>
+        <field name="model">account.move.line</field>
+        <field name="inherit_id" ref="odex30_account_reports.view_journal_report_audit_move_line_tree"/>
+        <field name="mode">primary</field>
+        <field name="arch" type="xml">
+            <field name="invoice_date" position="attributes">
+                <attribute name="optional">hide</attribute>
+            </field>
+            <field name="date" position="attributes">
+                <attribute name="optional">show</attribute>
+            </field>
+            <field name="matching_number" position="attributes">
+                <attribute name="optional">show</attribute>
+            </field>
+            <field name="partner_id" position="attributes">
+                <attribute name="optional">show</attribute>
+            </field>
+        </field>
+    </record>
+
+    <record id="view_journal_report_audit_move_line_search" model="ir.ui.view">
+        <field name="name">account.journal.report.audit.move.line.search</field>
+        <field name="model">account.move.line</field>
+        <field name="inherit_id" ref="account.view_account_move_line_filter" />
+        <field name="arch" type="xml">
+            <field name="journal_id" position="after">
+                <field name="exclude_bank_lines"/>
+            </field>
+             <filter name="group_by_move" position="attributes">
+                <attribute name="context">{'group_by': 'move_id'}</attribute>
+            </filter>
+            <filter name="sales" position="before">
+                <filter string="Invoice lines" name="invoices_lines" domain="[('display_type','=','product')]" invisible="1"/>
+                <filter string="Exclude Bank lines" name="search_default_exclude_bank_lines" domain="[('exclude_bank_lines','=', True)]" invisible="1"/>
+            </filter>
+        </field>
+    </record>
+
+</odoo>
diff --git a/dev_odex30_accounting/odex30_account_reports/views/account_report_view.xml b/dev_odex30_accounting/odex30_account_reports/views/account_report_view.xml
new file mode 100644
index 0000000..31652e5
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_reports/views/account_report_view.xml
@@ -0,0 +1,399 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <data>
+
+        <record id="account_report_tree" model="ir.ui.view">
+            <field name="name">account.report.list</field>
+            <field name="model">account.report</field>
+            <field name="arch" type="xml">
+                <list>
+                    <field name="sequence" widget="handle"/>
+                    <field name="name"/>
+                    <field name="country_id"/>
+                    <field name="root_report_id"/>
+                </list>
+            </field>
+        </record>
+
+        <record id="account_report_tree_configure_start_dates" model="ir.ui.view">
+            <field name="name">account.report.tree.configure.start.dates</field>
+            <field name="model">account.report</field>
+            <field name="arch" type="xml">
+                <list edit="True" create="False" editable="bottom">
+                    <field name="sequence" widget="handle"/>
+                    <field name="display_name" readonly="1"/>
+                    <field name="tax_closing_start_date" width="180px"/>
+                </list>
+            </field>
+        </record>
+
+        <record id="account_report_add_sections_tree" model="ir.ui.view">
+            <field name="name">account.report.add.sections.list</field>
+            <field name="model">account.report</field>
+            <field name="arch" type="xml">
+                <list editable="bottom" create="1" delete="1" decoration-muted="not active" open_form_view="True">
+                    <field name="sequence" widget="handle"/>
+                    <field name="name" readonly="1"/>
+                    <field name="country_id" readonly="1"/>
+                    <field name="active" widget="boolean_toggle"/>
+                </list>
+            </field>
+        </record>
+
+        <record id="view_account_report_search" model="ir.ui.view">
+            <field name="name">account.report.search</field>
+            <field name="model">account.report</field>
+            <field name="priority">100</field>
+            <field name="arch" type="xml">
+                <search string="Accounting Reports">
+                    <field name="name"/>
+                    <field name="root_report_id"/>
+                    <filter string="Inactive" name="inactive" domain="[('active', '=', False)]"/>
+                    <group expand="0" string="Group By">
+                        <filter string="Country" name="country_id" domain="[]" context="{'group_by':'country_id'}"/>
+                        <filter string="Root Report" name="root_report_id" domain="[]" context="{'group_by':'root_report_id'}"/>
+                    </group>
+                </search>
+            </field>
+        </record>
+
+        <record id="view_account_coa" model="ir.ui.view">
+            <field name="name">account.view.coa</field>
+            <field name="model">account.account</field>
+            <field name="arch" type="xml">
+                <list editable="top" create="1" delete="1" open_form_view="True">
+                    <field name="code"/>
+                    <field name="name"/>
+                    <field name="company_ids" column_invisible="True"/>
+                    <field name="account_type"/>
+                    <field name="current_balance"/>
+                    <field name="tax_ids" optional="hide" widget="many2many_tags"/>
+                    <field name="tag_ids" optional="hide" widget="many2many_tags"/>
+                    <field name="allowed_journal_ids" optional="hide" widget="many2many_tags"/>
+                </list>
+            </field>
+        </record>
+
+        <record id="account_report_form" model="ir.ui.view">
+            <field name="name">account.report.form</field>
+            <field name="model">account.report</field>
+            <field name="arch" type="xml">
+                <form>
+                    <header>
+                        <field name="is_account_coverage_report_available" invisible="1"/>
+                        <button class="btn btn-secondary float-end" invisible="not is_account_coverage_report_available"
+                                name="action_download_xlsx_accounts_coverage_report" type="object" string="Accounts Coverage Report"/>
+                    </header>
+
+                    <field name="custom_handler_model_id" invisible="1"/>
+                    <div class="alert alert-info text-center" invisible="not custom_handler_model_id" role="alert">
+                        This report uses report-specific code.
+                        You can customize it manually, but any change in the parameters used for its computation could lead to errors.
+                    </div>
+
+                    <sheet>
+                        <div class="oe_title">
+                            <h1>
+                                <field name="name" placeholder="Report Name"/>
+                            </h1>
+                        </div>
+
+                        <group>
+                            <group>
+                                <field name="root_report_id" domain="[('root_report_id', '=', None)]"/>
+                                <field name="availability_condition" required="1" invisible="not root_report_id"/>
+                                <field name="use_sections" invisible="line_ids"/>
+                            </group>
+                            <group>
+                                <field name="active" widget="boolean_toggle"/>
+                                <field name="country_id" invisible="availability_condition != 'country'" required="availability_condition == 'country'"/>
+                                <field name="chart_template" invisible="availability_condition != 'coa'" required="availability_condition == 'coa'"/>
+                            </group>
+                        </group>
+
+                        <notebook>
+                            <page string="Lines" name="page_lines" invisible="use_sections">
+                                <field class="w-100" name="line_ids" no_label="1" widget="account_report_lines_list_x2many">
+                                    <list limit="2000">
+                                        <field name="id" column_invisible="1"/>
+                                        <field name="sequence" column_invisible="1"/>
+                                        <field name="parent_id" column_invisible="1"/>
+                                        <field name="hierarchy_level" column_invisible="1"/>
+
+                                        <field name="name"/>
+                                        <field name="code" optional="hide"/>
+                                        <field name="print_on_new_page" optional="hide"/>
+                                        <field name="hide_if_zero" optional="hide"/>
+                                        <field name="user_groupby" optional="hide"/>
+                                        <field name="foldable" optional="hide"/>
+                                    </list>
+                                </field>
+                            </page>
+
+                            <page string="Sections" name="page_sections" invisible="not use_sections">
+                                <field
+                                    name="section_report_ids"
+                                    no_label="1"
+                                    options="{'no_create': True, 'no_quick_create': True}"
+                                    domain="[('section_report_ids', '=', False)]"
+                                    context="{'list_view_ref': 'account_reports.account_report_add_sections_tree', 'active_test': False}"
+                                />
+                            </page>
+
+                            <page string="Columns" name="page_columns" invisible="use_sections">
+                                <field name="column_ids">
+                                    <list editable="bottom">
+                                        <field name="sequence" widget="handle"/>
+                                        <field name="name"/>
+                                        <field name="expression_label"/>
+                                        <field  name="figure_type"/>
+                                        <field name="sortable"/>
+                                        <field name="blank_if_zero"/>
+                                    </list>
+                                </field>
+                            </page>
+
+                            <page string="Options" name="page_options" invisible="use_sections">
+                                <group>
+                                    <group >
+                                        <field name="load_more_limit"/>
+                                        <field name="prefix_groups_threshold"/>
+                                        <field name="filter_hierarchy" required="1"/>
+                                        <field name="filter_multi_company" groups="base.group_multi_company" required="1"/>
+                                    </group>
+                                    <group>
+                                        <field name="default_opening_date_filter" required="True"/>
+                                        <field name="horizontal_group_ids" widget="many2many_tags" options="{'no_quick_create': True}"/>
+                                        <field name="filter_analytic" groups="analytic.group_analytic_accounting"/>
+                                        <field name="filter_analytic_groupby" groups="analytic.group_analytic_accounting"/>
+                                    </group>
+                                    <group string="Advanced" class="oe_edit_only">
+                                        <field name="filter_date_range"/>
+                                        <field name="filter_unfold_all"/>
+                                        <field name="filter_growth_comparison"/>
+                                        <field name="filter_period_comparison"/>
+                                        <field name="integer_rounding" placeholder="None"/>
+                                        <field name="currency_translation" required="1" groups="base.group_multi_currency"/>
+                                    </group>
+                                    <group string="Filters" class="oe_edit_only">
+                                        <field name="filter_account_type"/>
+                                        <field name="filter_journals"/>
+                                        <field name="filter_partner"/>
+                                        <field name="filter_show_draft"/>
+                                        <field name="filter_unreconciled"/>
+                                        <field name="filter_aml_ir_filters"/>
+                                        <field name="filter_hide_0_lines" help="This option hides lines with a value of 0"/>
+                                    </group>
+                                </group>
+                            </page>
+                        </notebook>
+                    </sheet>
+                </form>
+            </field>
+        </record>
+
+        <record id="account_report_line_form" model="ir.ui.view">
+            <field name="name">account.report.line.form</field>
+            <field name="model">account.report.line</field>
+            <field name="arch" type="xml">
+                <form>
+                    <sheet>
+                        <div class="oe_title">
+                            <h1>
+                                <field name="name" placeholder="Report Line"/>
+                            </h1>
+                        </div>
+
+                        <group>
+                            <group>
+                                <field name="groupby" invisible="1"/>
+                                <field name="display_custom_groupby_warning" invisible="1"/>
+                                <field name="action_id"/>
+                                <field name="hierarchy_level"/>
+                                <field string="Group By" name="user_groupby"/>
+                                <div colspan="2" class="alert alert-warning" role="alert" invisible="not display_custom_groupby_warning">
+                                    This line uses a custom user-defined 'Group By' value.
+                                    <button class="oe_link" type="object" name="action_reset_custom_groupby">Reset to Standard</button>
+                                </div>
+                            </group>
+                            <group>
+                                <field name="code"/>
+                                <field name="foldable"/>
+                                <field name="print_on_new_page"/>
+                                <field name="hide_if_zero"/>
+                            </group>
+                        </group>
+
+                        <field name="expression_ids">
+                            <list>
+                                <field name="label"/>
+                                <field name="engine"/>
+                                <field name="formula"/>
+                                <field name="subformula"/>
+                                <field name="date_scope" optional="hide"/>
+                            </list>
+                        </field>
+                    </sheet>
+                </form>
+            </field>
+        </record>
+
+        <record id="account_report_expression_form" model="ir.ui.view">
+            <field name="name">account.report.expression.form</field>
+            <field name="model">account.report.expression</field>
+            <field name="arch" type="xml">
+                <form>
+                    <sheet>
+                        <div class="oe_title">
+                            <h1>
+                                <field name="label" placeholder="Expression"/>
+                            </h1>
+                        </div>
+
+                        <notebook>
+                            <page string="Definition" name="page_definition">
+                                <group>
+                                    <field name="engine"/>
+                                    <field name="formula"/>
+                                    <field name="subformula" required="engine == 'domain'"/>
+                                </group>
+                            </page>
+                            <page string="Options" name="page_options">
+                                <group>
+                                    <group>
+                                        <field name="date_scope"/>
+                                        <field name="figure_type"/>
+                                        <field name="carryover_target"/>
+                                    </group>
+                                    <group>
+                                        <field name="blank_if_zero"/>
+                                        <field name="green_on_positive"/>
+                                    </group>
+                                </group>
+                            </page>
+                        </notebook>
+                    </sheet>
+                </form>
+            </field>
+        </record>
+
+        <record id="account_report_horizontal_group_form" model="ir.ui.view">
+            <field name="name">account.report.horizontal.group.form</field>
+            <field name="model">account.report.horizontal.group</field>
+            <field name="arch" type="xml">
+                <form>
+                    <sheet>
+                        <div class="oe_title">
+                            <h1>
+                                <field name="name" placeholder="Group Name"/>
+                            </h1>
+                        </div>
+
+                        <group>
+                            <group>
+                                <field name="report_ids" widget="many2many_tags"/>
+                            </group>
+                        </group>
+                        <field name="rule_ids">
+                            <form>
+                                <group>
+                                    <field name="field_name"/>
+                                    <field name="res_model_name" invisible="1"/>
+                                    <field name="domain" widget="domain" options="{'model': 'res_model_name'}"/>
+                                </group>
+                            </form>
+                            <list>
+                                <field name="field_name"/>
+                                <field name="domain"/>
+                            </list>
+                        </field>
+                    </sheet>
+                </form>
+            </field>
+        </record>
+
+        <record id="account_report_horizontal_group_tree" model="ir.ui.view">
+            <field name="name">account.report.horizontal.group.list</field>
+            <field name="model">account.report.horizontal.group</field>
+            <field name="arch" type="xml">
+                <list>
+                    <field name="name"/>
+                    <field name="report_ids" widget="many2many_tags"/>
+                </list>
+            </field>
+        </record>
+
+        <record id="account_report_external_value_tree" model="ir.ui.view">
+            <field name="name">account.report.external.value.list</field>
+            <field name="model">account.report.external.value</field>
+            <field name="arch" type="xml">
+                <list create="0">
+                    <field name="report_country_id" column_invisible="True"/>
+                    <field name="name"/>
+                    <field name="date"/>
+                    <field name="value"/>
+                    <field name="text_value"/>
+                    <field name="target_report_expression_id" optional="hide"/>
+                    <field name="target_report_line_id" optional="hide"/>
+                    <field name="target_report_expression_label" optional="hide"/>
+                    <field name="foreign_vat_fiscal_position_id" optional="hide"/>
+                    <field name="company_id" optional="hide" groups="base.group_multi_company"/>
+                </list>
+            </field>
+        </record>
+
+        <record id="account_report_budget_tree" model="ir.ui.view">
+            <field name="name">account.report.budget.list</field>
+            <field name="model">account.report.budget</field>
+            <field name="arch" type="xml">
+                <list>
+                    <field name="sequence" widget="handle"/>
+                    <field name="name"/>
+                    <field name="company_id"/>
+                </list>
+            </field>
+        </record>
+
+        <record id="account_report_budget_form" model="ir.ui.view">
+            <field name="name">account.report.budget.form</field>
+            <field name="model">account.report.budget</field>
+            <field name="arch" type="xml">
+                <form>
+                    <sheet>
+                        <div class="oe_title">
+                            <h1>
+                                <field name="name" placeholder="Budget Name"/>
+                            </h1>
+                        </div>
+
+                        <notebook>
+                            <page string="Budget Items" name="budget_items">
+                                <field name="item_ids" nolabel="1">
+                                    <list editable="bottom">
+                                        <field name="account_id" width="40%"/>
+                                        <field name="date" string="Months" options="{'min_precision': 'months'}" width="30%"/>
+                                        <field name="amount" width="30%"/>
+                                    </list>
+                                </field>
+                            </page>
+                        </notebook>
+                    </sheet>
+                </form>
+            </field>
+        </record>
+
+        <record id="action_create_composite_report_list" model="ir.actions.server">
+            <field name="name">Create Composite Report</field>
+            <field name="model_id" ref="model_account_report"/>
+            <field name="binding_model_id" ref="model_account_report"/>
+            <field name="binding_view_types">list</field>
+            <field name="groups_id" eval="[Command.link(ref('account.group_account_user'))]"/>
+            <field name="state">code</field>
+            <field name="code">
+if records:
+    action = records.action_create_composite_report()
+            </field>
+        </record>
+
+    </data>
+</odoo>
diff --git a/dev_odex30_accounting/odex30_account_reports/views/account_tax_views.xml b/dev_odex30_accounting/odex30_account_reports/views/account_tax_views.xml
new file mode 100644
index 0000000..76079df
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_reports/views/account_tax_views.xml
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<odoo>
+
+    <record id="view_tax_unit_form" model="ir.ui.view">
+        <field name="name">account.tax.unit.form</field>
+        <field name="model">account.tax.unit</field>
+        <field name="arch" type="xml">
+            <form string="Tax Unit">
+                <div class="alert alert-info" role="alert"
+                     invisible="fpos_synced">
+                    Fiscal Positions should apply to all companies of the tax unit. You may want to <button class="oe_link p-0 align-baseline" type="object" name="action_sync_unit_fiscal_positions">synchronize fiscal positions</button>.
+                </div>
+                <sheet>
+                    <field name="fpos_synced" invisible="1"/>
+                    <div class="oe_title">
+                        <h1>
+                            <field name="name" placeholder="Name"/>
+                        </h1>
+                    </div>
+
+                    <group>
+                        <group>
+                            <field name="country_id" options="{'no_create': True, 'no_open': True}"/>
+                            <field name="company_ids" widget="many2many_tags" domain="[('chart_template', '!=', False), ('account_tax_unit_ids', '=', False)]" options="{'no_create': True}"/>
+                            <field name="main_company_id" domain="[('id', 'in', company_ids)]" options="{'no_create': True, 'no_open': True}"/>
+                        </group>
+                        <group>
+                            <field name="vat"/>
+                        </group>
+                    </group>
+                    <group>
+
+                    </group>
+                </sheet>
+            </form>
+        </field>
+    </record>
+
+    <record id="view_tax_unit_tree" model="ir.ui.view">
+        <field name="name">account.tax.unit.list</field>
+        <field name="model">account.tax.unit</field>
+        <field name="arch" type="xml">
+            <list>
+                <field name="name"/>
+                <field name="country_id"/>
+            </list>
+        </field>
+    </record>
+
+    <record id="action_view_tax_units" model="ir.actions.act_window">
+        <field name="name">Tax Units</field>
+        <field name="res_model">account.tax.unit</field>
+        <field name="view_mode">list,form</field>
+        <field name="view_id" ref="view_tax_unit_tree"/>
+    </record>
+
+    <menuitem
+        id="menu_view_tax_units"
+        action="action_view_tax_units"
+        parent="account.account_account_menu"
+        sequence="8"
+        groups="base.group_no_one"/>
+
+</odoo>
diff --git a/dev_odex30_accounting/odex30_account_reports/views/mail_activity_views.xml b/dev_odex30_accounting/odex30_account_reports/views/mail_activity_views.xml
new file mode 100644
index 0000000..c087408
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_reports/views/mail_activity_views.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0"?>
+<odoo>
+    <record id="account_activity_view_form_popup" model="ir.ui.view">
+        <field name="name">mail.activity.form.inherit.account.tax</field>
+        <field name="model">mail.activity</field>
+        <field name="inherit_id" ref="mail.mail_activity_view_form_popup"/>
+        <field name="arch" type="xml">
+            <xpath expr="//button[@name='action_done']" position="attributes">
+                  <attribute name="invisible">activity_category == 'tax_report' or chaining_type == 'trigger'</attribute>
+            </xpath>
+        </field>
+    </record>
+</odoo>
diff --git a/dev_odex30_accounting/odex30_account_reports/views/report_template.xml b/dev_odex30_accounting/odex30_account_reports/views/report_template.xml
new file mode 100644
index 0000000..8013377
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_reports/views/report_template.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+    <template id="internal_layout" inherit_id="web.internal_layout" primary="True">
+        <xpath expr="//div[hasclass('header')]//div[hasclass('row')]" position="attributes">
+            <attribute name="class" add="o_footer_font_size" separator=" "/>
+        </xpath>
+
+        <!-- Suport for long company name -->
+        <xpath expr="//div[hasclass('col-3')]" position="attributes">
+                <attribute name="class">col-4</attribute>
+        </xpath>
+        <xpath expr="//div[hasclass('col-2') and hasclass('offset-2') and hasclass('text-center')]" position="attributes">
+            <attribute name="class">col-4 text-center</attribute>
+        </xpath>
+        <xpath expr="//div[hasclass('col-2') and hasclass('offset-3') and hasclass('text-end')]" position="attributes">
+            <attribute name="class">col-2 offset-2 text-end</attribute>
+        </xpath>
+    </template>
+
+</odoo>
diff --git a/dev_odex30_accounting/odex30_account_reports/views/res_company_views.xml b/dev_odex30_accounting/odex30_account_reports/views/res_company_views.xml
new file mode 100644
index 0000000..b56677b
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_reports/views/res_company_views.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+    <record id="view_company_form" model="ir.ui.view">
+        <field name="name">account_reports.res.company.form</field>
+        <field name="model">res.company</field>
+        <field name="inherit_id" ref="base.view_company_form"/>
+        <field name="arch" type="xml">
+            <xpath expr="//field[@name='parent_id']" position="after">
+                <field name="account_display_representative_field" invisible="1"/>
+                <field name="account_representative_id" invisible="not account_display_representative_field"/>
+            </xpath>
+        </field>
+    </record>
+
+</odoo>
diff --git a/dev_odex30_accounting/odex30_account_reports/views/res_config_settings_views.xml b/dev_odex30_accounting/odex30_account_reports/views/res_config_settings_views.xml
new file mode 100644
index 0000000..0448c50
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_reports/views/res_config_settings_views.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+    <record id="res_config_settings_view_form" model="ir.ui.view">
+        <field name="name">res.config.settings.view.form.inherit.account.reports</field>
+        <field name="model">res.config.settings</field>
+        <field name="inherit_id" ref="account.res_config_settings_view_form"/>
+        <field name="arch" type="xml">
+            <setting id="dynamic_report" position="attributes">
+                <attribute name="invisible">not module_account_reports</attribute>
+            </setting>
+
+            <setting id="default_taxes" position="after">
+                <setting id="account_tax_periodicity" string="Tax Return Periodicity" company_dependent="1" help="How often tax returns have to be made"
+                    documentation="/applications/finance/accounting/reporting/declarations/tax_returns.html">
+                    <div class="content-group">
+                        <div class="row mt16">
+                            <label string="Periodicity" for="account_tax_periodicity" class="col-lg-3 o_light_label"/>
+                            <field name="account_tax_periodicity"/>
+                        </div>
+                        <div class="row">
+                            <label string="Reminder" for="account_tax_periodicity_reminder_day" class="col-lg-3 o_light_label"/>
+                            <div class="col-lg-auto content-group">
+                                <field name="account_tax_periodicity_reminder_day" class="text-center oe_inline" /> days after period
+                            </div>
+                        </div>
+                        <div class="row">
+                            <label string="Journal" for="account_tax_periodicity_journal_id" class="col-lg-3 o_light_label"/>
+                            <field name="account_tax_periodicity_journal_id" required="has_chart_of_accounts"/>
+                        </div>
+                        <div class="mt8">
+                            <button name="open_tax_group_list" icon="oi-arrow-right" type="object" string="Configure your tax accounts" class="btn-link"/>
+                        </div>
+                        <div class="mt8" invisible="not account_reports_show_per_company_setting">
+                            <button name="open_company_dependent_report_settings" icon="oi-arrow-right" type="object" string="Configure start dates" class="btn-link"/>
+                        </div>
+                    </div>
+                </setting>
+            </setting>
+
+            <block id="analytic" position="after">
+                <block title="Reporting" id="account_reports_settings" groups="account.group_account_user" invisible="not module_account_reports">
+                    <setting title="This allows you to choose the position of totals in your financial reports." company_dependent="1" help="When ticked, totals and subtotals appear below the sections of the report">
+                        <field name="totals_below_sections"/>
+                    </setting>
+                    <setting>
+                        <button name="%(account.action_check_hash_integrity)d" type="action" string="Download the Data Inalterability Check Report" class="oe_link" id="action_hash_integrity"/>
+                    </setting>
+                </block>
+            </block>
+
+        </field>
+    </record>
+
+</odoo>
diff --git a/dev_odex30_accounting/odex30_account_reports/views/res_partner_views.xml b/dev_odex30_accounting/odex30_account_reports/views/res_partner_views.xml
new file mode 100644
index 0000000..dc3f553
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_reports/views/res_partner_views.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <record id="action_account_reports_customer_statements" model="ir.actions.server">
+        <field name="name">Open Customer Statements</field>
+        <field name="groups_id" eval="[Command.link(ref('account.group_account_invoice'))]"/>
+        <field name="model_id" ref="model_res_partner"/>
+        <field name="binding_model_id" ref="model_res_partner"/>
+        <field name="binding_view_types">list</field>
+        <field name="state">code</field>
+        <field name="code">
+            if records:
+                action = records.open_customer_statement()
+        </field>
+    </record>
+
+    <record id="duplicated_vat_partner_tree_view" model="ir.ui.view">
+        <field name="name">duplicated.vat.res.partner.list</field>
+        <field name="model">res.partner</field>
+        <field eval="18" name="priority"/>
+        <field name="arch" type="xml">
+            <list string="Contacts" sample="1" multi_edit="1" expand="1" >
+                <field name="complete_name" string="Name"/>
+                <field name="is_company"/>
+                <field name="parent_id"/>
+                <button name="set_commercial_partner_main"
+                    type="object"
+                    string="Set as main"
+                    class="btn-primary"
+                    invisible="not context.get('duplicated_partners_vat') or parent_id"
+                />
+                <field name="email"/>
+                <field name="phone" class="o_force_ltr" optional="show"/>
+                <field name="mobile" optional="hide"/>
+                <field name="user_id" optional="show" widget="many2one_avatar_user" domain="[('share', '=', False)]"/>
+                <field name="user_ids"/>
+                <field name="total_invoiced"/>
+                <field name="street" optional="hide"/>
+                <field name="city" optional="show"/>
+                <field name="state_id" optional="hide" readonly="1"/>
+                <field name="country_id" optional="show" readonly="1"/>
+                <field name="category_id" optional="hide" widget="many2many_tags" options="{'color_field': 'color'}"/>
+                <field name="company_id" groups="base.group_multi_company" readonly="1"/>
+            </list>
+        </field>
+    </record>
+</odoo>
diff --git a/dev_odex30_accounting/odex30_account_reports/wizard/__init__.py b/dev_odex30_accounting/odex30_account_reports/wizard/__init__.py
new file mode 100644
index 0000000..dbb234d
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_reports/wizard/__init__.py
@@ -0,0 +1,7 @@
+
+from . import account_change_lock_date
+from . import account_report_send
+from . import account_report_file_download_error_wizard
+from . import fiscal_year
+from . import multicurrency_revaluation
+from . import report_export_wizard
diff --git a/dev_odex30_accounting/odex30_account_reports/wizard/__pycache__/__init__.cpython-311.pyc b/dev_odex30_accounting/odex30_account_reports/wizard/__pycache__/__init__.cpython-311.pyc
new file mode 100644
index 0000000..e3a15c6
Binary files /dev/null and b/dev_odex30_accounting/odex30_account_reports/wizard/__pycache__/__init__.cpython-311.pyc differ
diff --git a/dev_odex30_accounting/odex30_account_reports/wizard/__pycache__/account_change_lock_date.cpython-311.pyc b/dev_odex30_accounting/odex30_account_reports/wizard/__pycache__/account_change_lock_date.cpython-311.pyc
new file mode 100644
index 0000000..955eb70
Binary files /dev/null and b/dev_odex30_accounting/odex30_account_reports/wizard/__pycache__/account_change_lock_date.cpython-311.pyc differ
diff --git a/dev_odex30_accounting/odex30_account_reports/wizard/__pycache__/account_report_file_download_error_wizard.cpython-311.pyc b/dev_odex30_accounting/odex30_account_reports/wizard/__pycache__/account_report_file_download_error_wizard.cpython-311.pyc
new file mode 100644
index 0000000..b842125
Binary files /dev/null and b/dev_odex30_accounting/odex30_account_reports/wizard/__pycache__/account_report_file_download_error_wizard.cpython-311.pyc differ
diff --git a/dev_odex30_accounting/odex30_account_reports/wizard/__pycache__/account_report_send.cpython-311.pyc b/dev_odex30_accounting/odex30_account_reports/wizard/__pycache__/account_report_send.cpython-311.pyc
new file mode 100644
index 0000000..6342457
Binary files /dev/null and b/dev_odex30_accounting/odex30_account_reports/wizard/__pycache__/account_report_send.cpython-311.pyc differ
diff --git a/dev_odex30_accounting/odex30_account_reports/wizard/__pycache__/fiscal_year.cpython-311.pyc b/dev_odex30_accounting/odex30_account_reports/wizard/__pycache__/fiscal_year.cpython-311.pyc
new file mode 100644
index 0000000..4a5726b
Binary files /dev/null and b/dev_odex30_accounting/odex30_account_reports/wizard/__pycache__/fiscal_year.cpython-311.pyc differ
diff --git a/dev_odex30_accounting/odex30_account_reports/wizard/__pycache__/multicurrency_revaluation.cpython-311.pyc b/dev_odex30_accounting/odex30_account_reports/wizard/__pycache__/multicurrency_revaluation.cpython-311.pyc
new file mode 100644
index 0000000..ca92f7b
Binary files /dev/null and b/dev_odex30_accounting/odex30_account_reports/wizard/__pycache__/multicurrency_revaluation.cpython-311.pyc differ
diff --git a/dev_odex30_accounting/odex30_account_reports/wizard/__pycache__/report_export_wizard.cpython-311.pyc b/dev_odex30_accounting/odex30_account_reports/wizard/__pycache__/report_export_wizard.cpython-311.pyc
new file mode 100644
index 0000000..c525211
Binary files /dev/null and b/dev_odex30_accounting/odex30_account_reports/wizard/__pycache__/report_export_wizard.cpython-311.pyc differ
diff --git a/dev_odex30_accounting/odex30_account_reports/wizard/account_change_lock_date.py b/dev_odex30_accounting/odex30_account_reports/wizard/account_change_lock_date.py
new file mode 100644
index 0000000..f81aafb
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_reports/wizard/account_change_lock_date.py
@@ -0,0 +1,22 @@
+# -*- coding: utf-8 -*-
+
+from odoo import models
+
+
+class AccountChangeLockDate(models.TransientModel):
+    """
+    This wizard is used to change the lock date
+    """
+    _inherit = 'account.change.lock.date'
+
+    def _create_default_report_external_values(self, lock_date_field):
+        """
+        Calls the _generate_default_external_values in account_report
+        to create default external values for either all reports except the tax reports,
+        or only the tax reports, depending on the lock date type:
+            - max(fiscalyear_lock_date, hard_lock_date) is used to create default values in all reports except the tax reports for that date
+            - tax_lock_date is used to create default values only in tax reports for that date
+        """
+        # extends account.accountant
+        date_from, date_to = self._get_current_period_dates(lock_date_field)
+        self.env['account.report']._generate_default_external_values(date_from, date_to, lock_date_field == 'tax_lock_date')
diff --git a/dev_odex30_accounting/odex30_account_reports/wizard/account_report_file_download_error_wizard.py b/dev_odex30_accounting/odex30_account_reports/wizard/account_report_file_download_error_wizard.py
new file mode 100644
index 0000000..d7e2cc9
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_reports/wizard/account_report_file_download_error_wizard.py
@@ -0,0 +1,20 @@
+
+from odoo import fields, models
+
+
+class AccountReportFileDownloadErrorWizard(models.TransientModel):
+    _name = 'account.report.file.download.error.wizard'
+    _description = "Manage the file generation errors from report exports."
+
+    actionable_errors = fields.Json()
+    file_name = fields.Char()
+    file_content = fields.Binary()
+
+    def button_download(self):
+        self.ensure_one()
+        if self.file_name:
+            return {
+                'type': 'ir.actions.act_url',
+                'url': f'/web/content/account.report.file.download.error.wizard/{self.id}/file_content/{self.file_name}?download=1',
+                'close': True,
+            }
diff --git a/dev_odex30_accounting/odex30_account_reports/wizard/account_report_file_download_error_wizard.xml b/dev_odex30_accounting/odex30_account_reports/wizard/account_report_file_download_error_wizard.xml
new file mode 100644
index 0000000..03b0014
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_reports/wizard/account_report_file_download_error_wizard.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <data>
+        <record id="view_account_report_file_download_error_wizard_form" model="ir.ui.view">
+            <field name="name">account.report.file.download.error.wizard.form</field>
+            <field name="model">account.report.file.download.error.wizard</field>
+            <field name="arch" type="xml">
+                <form string="File Download Errors">
+                    <field name="file_content" invisible="1"/>
+                    <div>
+                        <span>One or more error(s) occurred during file generation:</span>
+                    </div>
+                    <div>
+                        <field name="actionable_errors" class="o_field_html w-100" widget="actionable_errors"/>
+                        <p invisible="file_content"><i>Errors marked with <i class="fa fa-warning"/> are critical and prevent the file generation.</i></p>
+                    </div>
+                    <footer>
+                        <button string="Download Anyway"
+                                class="btn btn-primary"
+                                invisible="file_content"
+                                disabled=""/>
+                        <button string="Download Anyway"
+                                name="button_download"
+                                type="object"
+                                class="btn btn-primary"
+                                close="1"
+                                data-hotkey="d"
+                                invisible="not file_content"/>
+                        <button string="Close"
+                                class="btn btn-secondary"
+                                special="cancel"
+                                data-hotkey="z"/>
+                    </footer>
+                </form>
+            </field>
+        </record>
+    </data>
+</odoo>
diff --git a/dev_odex30_accounting/odex30_account_reports/wizard/account_report_send.py b/dev_odex30_accounting/odex30_account_reports/wizard/account_report_send.py
new file mode 100644
index 0000000..a752176
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_reports/wizard/account_report_send.py
@@ -0,0 +1,315 @@
+from odoo import _, api, fields, models
+from odoo.exceptions import UserError
+from odoo.tools.misc import get_lang
+
+
+class AccountReportSend(models.TransientModel):
+    _name = 'account.report.send'
+    _description = "Account Report Send"
+
+    partner_ids = fields.Many2many(
+        comodel_name='res.partner',
+        compute='_compute_partner_ids',
+    )
+    mode = fields.Selection(
+        selection=[
+            ('single', "Single Recipient"),
+            ('multi', "Multiple Recipients"),
+        ],
+        compute='_compute_mode',
+        readonly=False,
+        store=True,
+    )
+
+    # == PRINT ==
+    enable_download = fields.Boolean()
+    checkbox_download = fields.Boolean(string="Download")
+
+    # == MAIL ==
+    enable_send_mail = fields.Boolean(default=True)
+    checkbox_send_mail = fields.Boolean(string="Email", default=True)
+
+    display_mail_composer = fields.Boolean(compute='_compute_send_mail_extra_fields')
+    warnings = fields.Json(compute='_compute_warnings')
+    send_mail_readonly = fields.Boolean(compute='_compute_send_mail_extra_fields')
+    mail_template_id = fields.Many2one(
+        comodel_name='mail.template',
+        string="Email template",
+        domain="[('model', '=', 'res.partner')]",
+    )
+
+    account_report_id = fields.Many2one(
+        comodel_name='account.report',
+        string="Report",
+    )
+    report_options = fields.Json()
+
+    mail_lang = fields.Char(
+        string="Lang",
+        compute='_compute_mail_lang',
+    )
+    mail_partner_ids = fields.Many2many(
+        comodel_name='res.partner',
+        string="Recipients",
+        compute='_compute_mail_partner_ids',
+        store=True,
+        readonly=False,
+    )
+    mail_subject = fields.Char(
+        string="Subject",
+        compute='_compute_mail_subject_body',
+        store=True,
+        readonly=False,
+    )
+    mail_body = fields.Html(
+        string="Contents",
+        sanitize_style=True,
+        compute='_compute_mail_subject_body',
+        store=True,
+        readonly=False,
+    )
+    mail_attachments_widget = fields.Json(
+        compute='_compute_mail_attachments_widget',
+        store=True,
+        readonly=False,
+    )
+
+    @api.model
+    def default_get(self, fields_list):
+        # EXTENDS 'base'
+        results = super().default_get(fields_list)
+
+        context_options = self._context.get('default_report_options', {})
+        if 'account_report_id' in fields_list and 'account_report_id' not in results:
+            report_id = context_options.get('report_id', False)
+            results['account_report_id'] = report_id
+            results['report_options'] = context_options
+
+        return results
+
+    @api.model
+    def _get_mail_field_value(self, partner, mail_template, mail_lang, field, **kwargs):
+        if not mail_template:
+            return
+        return mail_template\
+            .with_context(lang=mail_lang)\
+            ._render_field(field, partner.ids, **kwargs)[partner._origin.id]
+
+    def _get_default_mail_attachments_widget(self, partner, mail_template):
+        return self._get_placeholder_mail_attachments_data(partner) \
+            + self._get_mail_template_attachments_data(mail_template)
+
+    def _get_wizard_values(self):
+        self.ensure_one()
+        options = self.report_options
+        if not options.get('partner_ids', []):
+            options['partner_ids'] = self.partner_ids.ids
+        return {
+            'mail_template_id': self.mail_template_id.id,
+            'checkbox_download': self.checkbox_download,
+            'checkbox_send_mail': self.checkbox_send_mail,
+            'report_options': options,
+        }
+
+    def _get_placeholder_mail_attachments_data(self, partner):
+        """ Returns all the placeholder data.
+        Should be extended to add placeholder based on the checkboxes.
+        :param: partner:       The partner for which this report is generated.
+        :returns: A list of dictionary for each placeholder.
+        * id:               str: The (fake) id of the attachment, this is needed in rendering in t-key.
+        * name:             str: The name of the attachment.
+        * mimetype:         str: The mimetype of the attachment.
+        * placeholder       bool: Should be true to prevent download / deletion.
+        """
+        self.ensure_one()
+        filename = f"{partner.name} - {self.account_report_id.get_default_report_filename(self.report_options, 'pdf')}"
+        return [{
+            'id': f'placeholder_{filename}',
+            'name': filename,
+            'mimetype': 'application/pdf',
+            'placeholder': True,
+        }]
+
+    @api.model
+    def _get_mail_template_attachments_data(self, mail_template):
+        """ Returns all the placeholder data and mail template data
+        """
+        return [
+            {
+                'id': attachment.id,
+                'name': attachment.name,
+                'mimetype': attachment.mimetype,
+                'placeholder': False,
+                'mail_template_id': mail_template.id,
+            }
+            for attachment in mail_template.attachment_ids
+        ]
+
+    # -------------------------------------------------------------------------
+    # COMPUTE METHODS
+    # -------------------------------------------------------------------------
+
+    @api.depends('partner_ids')
+    def _compute_mode(self):
+        for wizard in self:
+            wizard.mode = 'single' if len(wizard.partner_ids) == 1 else 'multi'
+
+    @api.depends('checkbox_send_mail')
+    def _compute_send_mail_extra_fields(self):
+        for wizard in self:
+            wizard.display_mail_composer = wizard.mode == 'single'
+            partners_without_mail_data = wizard.mail_partner_ids.filtered(lambda x: not x.email)
+            wizard.send_mail_readonly = partners_without_mail_data == wizard.mail_partner_ids
+
+    @api.depends('mail_partner_ids', 'checkbox_send_mail', 'send_mail_readonly')
+    def _compute_warnings(self):
+        for wizard in self:
+            warnings = {}
+
+            partners_without_mail = wizard.mail_partner_ids.filtered(lambda x: not x.email)
+            if wizard.send_mail_readonly or (wizard.checkbox_send_mail and partners_without_mail):
+                warnings['account_missing_email'] = {
+                    'message': _("Partner(s) should have an email address."),
+                    'action_text': _("View Partner(s)"),
+                    'action': partners_without_mail._get_records_action(name=_("Check Partner(s) Email(s)"))
+                }
+
+            wizard.warnings = warnings
+
+    @api.depends('partner_ids')
+    def _compute_mail_lang(self):
+        for wizard in self:
+            if wizard.mode == 'single':
+                wizard.mail_lang = wizard.partner_ids.lang
+            else:
+                wizard.mail_lang = get_lang(self.env).code
+
+    @api.depends('account_report_id', 'report_options')
+    def _compute_partner_ids(self):
+        for wizard in self:
+            wizard.partner_ids = wizard.account_report_id._get_report_send_recipients(wizard.report_options)
+
+    @api.depends('account_report_id', 'report_options', 'mail_template_id')
+    def _compute_mail_partner_ids(self):
+        for wizard in self:
+            wizard.mail_partner_ids = wizard.partner_ids
+
+    @api.depends('mail_template_id', 'mail_lang', 'mode')
+    def _compute_mail_subject_body(self):
+        for wizard in self:
+            if wizard.mode == 'single' and wizard.mail_template_id:
+                wizard.mail_subject = self._get_mail_field_value(wizard.mail_partner_ids, wizard.mail_template_id, wizard.mail_lang, 'subject')
+                wizard.mail_body = self._get_mail_field_value(wizard.mail_partner_ids, wizard.mail_template_id, wizard.mail_lang, 'body_html', options={'post_process': True})
+            else:
+                wizard.mail_subject = wizard.mail_body = None
+
+    @api.depends('mail_template_id', 'mode')
+    def _compute_mail_attachments_widget(self):
+        for wizard in self:
+            if wizard.mode == 'single':
+                wizard.mail_attachments_widget = wizard._get_default_mail_attachments_widget(wizard.mail_partner_ids, wizard.mail_template_id)
+            else:
+                wizard.mail_attachments_widget = []
+
+    @api.model
+    def _action_download(self, attachments):
+        """ Download the PDF attachment, or a zip of attachments if there are more than one. """
+        return {
+            'type': 'ir.actions.act_url',
+            'url': f'/odex30_account_reports/download_attachments/{",".join(map(str, attachments.ids))}',
+            'close': True,
+        }
+
+    def _process_send_and_print(self, report, options, recipient_partner_ids=None, wizard=None):
+        """ Generate a report for one partner based on the options (send_and_print_values stored on the report).
+        :param options: dict of report options (should contain one partner id in options['partner_ids'])
+        :param recipient_partner_ids: list of partner ids that will receive the mail message.
+        :param wizard: account.report.send wizard if exists. Indicates if sending by cron.
+        """
+        wizard_vals = report.send_and_print_values if not wizard else wizard._get_wizard_values()
+        to_email = wizard_vals['checkbox_send_mail']
+        to_download = wizard_vals['checkbox_download']
+
+        mail_template_id = self.env['mail.template'].browse(wizard_vals['mail_template_id'])
+        if wizard:
+            attachments_ids = [att['id'] for att in wizard.mail_attachments_widget or [] if not att['placeholder']]
+        else:
+            attachments_ids = mail_template_id.attachment_ids.ids
+
+        options['unfold_all'] = True
+
+        partner_ids = options.get('partner_ids', [])
+        partners = self.env['res.partner'].browse(partner_ids)
+        if not recipient_partner_ids:
+            recipient_partner_ids = partners.filtered('email').ids
+
+        email_from = mail_template_id._render_field('email_from', partner_ids)
+        downloadable_attachments = self.env['ir.attachment']
+
+        for partner in partners:
+            options['partner_ids'] = partner.ids
+            report_attachment = partner._get_partner_account_report_attachment(report, options)
+
+            if to_email and recipient_partner_ids:
+                if wizard and wizard.mode == 'single':
+                    subject = self.mail_subject
+                    body = self.mail_body
+                else:
+                    subject = self._get_mail_field_value(partner, mail_template_id, partner.lang, 'subject')
+                    body = self._get_mail_field_value(partner, mail_template_id, partner.lang, 'body_html', options={'post_process': True})
+
+                partner.message_post(
+                    body=body,
+                    subject=subject,
+                    email_from=email_from[partner.id],
+                    partner_ids=recipient_partner_ids,
+                    attachment_ids=attachments_ids + report_attachment.ids,
+                    email_add_signature=False,
+                )
+
+            if to_download:
+                downloadable_attachments += report_attachment
+
+        if downloadable_attachments:
+            return self._action_download(downloadable_attachments)
+
+    def action_send_and_print(self, force_synchronous=False):
+        """ Create the documents and send them to the end customers.
+        If we are sending multiple statements and not downloading them we will process the moves asynchronously.
+        :param force_synchronous:   Flag indicating if the method should be done synchronously.
+        """
+        self.ensure_one()
+
+        if self.mode == 'multi' and self.checkbox_send_mail and not self.mail_template_id:
+            raise UserError(_('Please select a mail template to send multiple statements.'))
+
+        force_synchronous = force_synchronous or self.checkbox_download
+        process_later = self.mode == 'multi' and not force_synchronous
+        if process_later:
+            # Set sending information on report
+            if self.account_report_id.send_and_print_values:
+                raise UserError(_('There are currently reports waiting to be sent, please try again later.'))
+
+            self.account_report_id.send_and_print_values = self._get_wizard_values()
+
+            self.env.ref('odex30_account_reports.ir_cron_account_report_send')._trigger()
+            return {
+                'type': 'ir.actions.client',
+                'tag': 'display_notification',
+                'params': {
+                    'type': 'info',
+                    'title': _('Sending statements'),
+                    'message': _('Statements are being sent in the background.'),
+                    'next': {'type': 'ir.actions.act_window_close'},
+                },
+            }
+        options = {
+            **self.report_options,
+            'partner_ids': self.partner_ids.ids,
+        }
+        return self._process_send_and_print(
+            report=self.account_report_id,
+            options=options,
+            recipient_partner_ids=self.mail_partner_ids.ids,
+            wizard=self,
+        )
diff --git a/dev_odex30_accounting/odex30_account_reports/wizard/account_report_send.xml b/dev_odex30_accounting/odex30_account_reports/wizard/account_report_send.xml
new file mode 100644
index 0000000..5dcdc0c
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_reports/wizard/account_report_send.xml
@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+    <record id="account_report_send_form" model="ir.ui.view">
+        <field name="name">account.report.send.form</field>
+        <field name="model">account.report.send</field>
+        <field name="groups_id" eval="[Command.link(ref('base.group_user'))]"/>
+        <field name="arch" type="xml">
+            <form>
+                <!-- Invisible fields -->
+                <field name="mode" invisible="1"/>
+                <field name="enable_download" invisible="1"/>
+                <field name="enable_send_mail" invisible="1"/>
+                <field name="send_mail_readonly" invisible="1"/>
+                <field name="display_mail_composer" invisible="1"/>
+                <field name="mail_lang" invisible="1"/>
+                <field name="account_report_id" invisible="1"/>
+                <field name="report_options" invisible="1"/>
+
+                <div class="m-0" name="warnings" invisible="not warnings">
+                    <field name="warnings" class="o_field_html" widget="actionable_errors"/>
+                </div>
+
+                <!-- Options -->
+                <div name="options" class="row">
+                    <div name="standard_options" class="col-3">
+                        <div name="option_send_mail"
+                            invisible="not enable_send_mail">
+                            <i class="fa fa-question-circle ml4"
+                                role="img"
+                                aria-label="Warning"
+                                title="The email address is unknown on the partner"
+                                invisible="not send_mail_readonly"/>
+                        </div>
+                    </div>
+                    <div name="advanced_options" class="col-3"/>
+                </div>
+
+                <!-- Mail -->
+                <div invisible="not checkbox_send_mail">
+                    <group invisible="not display_mail_composer">
+                        <label for="mail_partner_ids" string="Recipients"/>
+                        <div>
+                            <field name="mail_partner_ids"
+                                   widget="many2many_tags_email"
+                                   placeholder="Add contacts to notify..."
+                                   options="{'no_quick_create': True}"
+                                   context="{'show_email': True, 'form_view_ref': 'base.view_partner_simple_form'}"/>
+                        </div>
+                        <field name="mail_subject"
+                               placeholder="Subject..."
+                               required="checkbox_send_mail and mode == 'single'"/>
+                    </group>
+                    <field name="mail_body"
+                           class="oe-bordered-editor"
+                           widget="html_mail"
+                           invisible="not display_mail_composer"/>
+                    <group>
+                        <group invisible="not display_mail_composer">
+                            <field name="mail_attachments_widget"
+                                   widget="mail_attachments"
+                                   string="Attach a file"
+                                   nolabel="1"
+                                   colspan="2"/>
+                        </group>
+                        <group>
+                            <field name="mail_template_id"
+                                   required="mode == 'multi'"
+                                   options="{'no_create': True, 'no_edit': True}"
+                                   context="{'default_model': 'res.partner'}"/>
+                        </group>
+                    </group>
+                </div>
+
+                <footer>
+                    <button string="Print &amp; Send"
+                            invisible="not checkbox_send_mail and not checkbox_download"
+                            data-hotkey="q"
+                            name="action_send_and_print"
+                            type="object"
+                            class="print btn-primary o_mail_send">
+                    </button>
+                    <button string="Cancel"
+                            data-hotkey="x"
+                            special="cancel"
+                            class="btn-secondary"/>
+                </footer>
+            </form>
+        </field>
+    </record>
+
+</odoo>
diff --git a/dev_odex30_accounting/odex30_account_reports/wizard/fiscal_year.py b/dev_odex30_accounting/odex30_account_reports/wizard/fiscal_year.py
new file mode 100644
index 0000000..9b185f7
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_reports/wizard/fiscal_year.py
@@ -0,0 +1,14 @@
+# -*- coding: utf-8 -*-
+
+from datetime import date
+
+from odoo import _, api, fields, models
+
+
+class FinancialYearOpeningWizard(models.TransientModel):
+    _inherit = 'account.financial.year.op'
+    _description = 'Opening Balance of Financial Year'
+
+    account_tax_periodicity = fields.Selection(related='company_id.account_tax_periodicity', string='Periodicity in month', readonly=False, required=True)
+    account_tax_periodicity_reminder_day = fields.Integer(related='company_id.account_tax_periodicity_reminder_day', string='Reminder', readonly=False, required=True)
+    account_tax_periodicity_journal_id = fields.Many2one(related='company_id.account_tax_periodicity_journal_id', string='Journal', readonly=False)
diff --git a/dev_odex30_accounting/odex30_account_reports/wizard/fiscal_year.xml b/dev_odex30_accounting/odex30_account_reports/wizard/fiscal_year.xml
new file mode 100644
index 0000000..166729d
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_reports/wizard/fiscal_year.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+
+    <record id="setup_financial_year_opening_form" model="ir.ui.view">
+        <field name="name">account.financial.year.op.setup.wizard.form</field>
+        <field name="model">account.financial.year.op</field>
+        <field name="inherit_id" ref="account.setup_financial_year_opening_form"/>
+        <field name="arch" type="xml">
+            <xpath expr="//sheet/group" position="inside">
+                <field name="account_tax_periodicity" string="VAT Periodicity"/>
+                <label for="account_tax_periodicity_reminder_day" groups="base.group_no_one"/>
+                <div groups="base.group_no_one">
+                    <field name="account_tax_periodicity_reminder_day" class="text-center" string="Reminder" no_label="1" style="width: 40px !important;"/> days after period
+                </div>
+                <field name="account_tax_periodicity_journal_id" string="Journal" groups="base.group_no_one"/>
+            </xpath>
+        </field>
+    </record>
+
+</odoo>
diff --git a/dev_odex30_accounting/odex30_account_reports/wizard/mail_activity_schedule_views.xml b/dev_odex30_accounting/odex30_account_reports/wizard/mail_activity_schedule_views.xml
new file mode 100644
index 0000000..a8d0981
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_reports/wizard/mail_activity_schedule_views.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <record id="mail_activity_schedule_view_form" model="ir.ui.view">
+        <field name="name">mail.activity.schedule.inherit.account.tax</field>
+        <field name="model">mail.activity.schedule</field>
+        <field name="inherit_id" ref="mail.mail_activity_schedule_view_form"/>
+        <field name="arch" type="xml">
+            <xpath expr="//button[@name='action_schedule_activities_done']" position="attributes">
+                <attribute name="invisible">has_error or activity_category == 'tax_report' or chaining_type == 'trigger'</attribute>
+            </xpath>
+        </field>
+    </record>
+</odoo>
diff --git a/dev_odex30_accounting/odex30_account_reports/wizard/multicurrency_revaluation.py b/dev_odex30_accounting/odex30_account_reports/wizard/multicurrency_revaluation.py
new file mode 100644
index 0000000..e0a7e6d
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_reports/wizard/multicurrency_revaluation.py
@@ -0,0 +1,192 @@
+# -*- coding: utf-8 -*-
+
+import json
+from dateutil.relativedelta import relativedelta
+
+from odoo import models, api, fields, _, Command
+from odoo.tools import format_date
+from odoo.exceptions import UserError
+
+
+class MulticurrencyRevaluationWizard(models.TransientModel):
+    _name = 'account.multicurrency.revaluation.wizard'
+    _description = 'Multicurrency Revaluation Wizard'
+
+    company_id = fields.Many2one('res.company', default=lambda self: self.env.company)
+    journal_id = fields.Many2one(
+        comodel_name='account.journal',
+        compute='_compute_accounting_values',
+        inverse='_inverse_revaluation_journal',
+        compute_sudo=True,
+        domain=[('type', '=', 'general')],
+        required=True,
+        readonly=False,
+    )
+    date = fields.Date(default=lambda self: self._context['multicurrency_revaluation_report_options']['date']['date_to'], required=True)
+    reversal_date = fields.Date(required=True)
+    expense_provision_account_id = fields.Many2one(
+        comodel_name='account.account',
+        compute='_compute_accounting_values',
+        inverse='_inverse_expense_provision_account',
+        compute_sudo=True,
+        string="Expense Account",
+        required=True,
+        readonly=False,
+    )
+    income_provision_account_id = fields.Many2one(
+        comodel_name='account.account',
+        compute='_compute_accounting_values',
+        inverse='_inverse_income_provision_account',
+        compute_sudo=True,
+        string="Income Account",
+        required=True,
+        readonly=False,
+    )
+    preview_data = fields.Text(compute='_compute_preview_data')
+    show_warning_move_id = fields.Many2one('account.move', compute='_compute_show_warning')
+
+    @api.model
+    def default_get(self, default_fields):
+        rec = super(MulticurrencyRevaluationWizard, self).default_get(default_fields)
+        if 'reversal_date' in default_fields:
+            report_options = self._context['multicurrency_revaluation_report_options']
+            rec['reversal_date'] = fields.Date.to_date(report_options['date']['date_to']) + relativedelta(days=1)
+        if not self._context.get('revaluation_no_loop') and not self.with_context(revaluation_no_loop=True)._get_move_vals()['line_ids']:
+            raise UserError(_("No adjustment needed"))
+        return rec
+
+    @api.depends('expense_provision_account_id', 'income_provision_account_id', 'reversal_date')
+    def _compute_show_warning(self):
+        for record in self:
+            last_move = self.env['account.move.line'].search([
+                ('account_id', 'in', (record.expense_provision_account_id + record.income_provision_account_id).ids),
+                ('date', '<', record.reversal_date),
+            ], order='date desc', limit=1).move_id
+            record.show_warning_move_id = False if last_move.reversed_entry_id else last_move
+
+    @api.depends('expense_provision_account_id', 'income_provision_account_id', 'date', 'journal_id')
+    def _compute_preview_data(self):
+        preview_columns = [
+            {'field': 'account_id', 'label': _("Account")},
+            {'field': 'name', 'label': _("Label")},
+            {'field': 'debit', 'label': _("Debit"), 'class': 'text-end text-nowrap'},
+            {'field': 'credit', 'label': _("Credit"), 'class': 'text-end text-nowrap'},
+        ]
+        for record in self:
+            preview_vals = [self.env['account.move']._move_dict_to_preview_vals(
+                self._get_move_vals(),
+                record.company_id.currency_id)
+            ]
+            record.preview_data = json.dumps({
+                'groups_vals': preview_vals,
+                'options': {
+                    'columns': preview_columns,
+                },
+            })
+
+    @api.depends('company_id')
+    def _compute_accounting_values(self):
+        for record in self:
+            record.journal_id = record.company_id.account_revaluation_journal_id
+            record.expense_provision_account_id = record.company_id.account_revaluation_expense_provision_account_id
+            record.income_provision_account_id = record.company_id.account_revaluation_income_provision_account_id
+
+    def _inverse_revaluation_journal(self):
+        for record in self:
+            record.company_id.sudo().account_revaluation_journal_id = record.journal_id
+
+    def _inverse_expense_provision_account(self):
+        for record in self:
+            record.company_id.sudo().account_revaluation_expense_provision_account_id = record.expense_provision_account_id
+
+    def _inverse_income_provision_account(self):
+        for record in self:
+            record.company_id.sudo().account_revaluation_income_provision_account_id = record.income_provision_account_id
+
+    @api.model
+    def _get_move_vals(self):
+        def _get_model_id(parsed_line, selected_model):
+            for dummy, parsed_res_model, parsed_res_id in parsed_line:
+                if parsed_res_model == selected_model:
+                    return parsed_res_id
+
+        def _get_adjustment_balance(line):
+            for column in line.get('columns'):
+                if column.get('expression_label') == 'adjustment':
+                    return column.get('no_format')
+
+        report = self.env.ref('odex30_account_reports.multicurrency_revaluation_report')
+        included_line_id = report.line_ids.filtered(lambda l: l.code == 'multicurrency_included').id
+        generic_included_line_id = report._get_generic_line_id('account.report.line', included_line_id)
+        options = {**self._context['multicurrency_revaluation_report_options'], 'unfold_all': True}
+        report_lines = report._get_lines(options)
+        move_lines = []
+
+        for report_line in report._get_unfolded_lines(report_lines, generic_included_line_id):
+            parsed_line_id = report._parse_line_id(report_line.get('id'))
+            balance = _get_adjustment_balance(report_line)
+            # parsed_line_id[-1][-2] corresponds to res_model of the current line
+            if (
+                parsed_line_id[-1][-2] == 'account.account'
+                and not self.env.company.currency_id.is_zero(balance)
+            ):
+                account_id = _get_model_id(parsed_line_id, 'account.account')
+                currency_id = _get_model_id(parsed_line_id, 'res.currency')
+                move_lines.append(Command.create({
+                    'name': _(
+                        "Provision for %(for_cur)s (1 %(comp_cur)s = %(rate)s %(for_cur)s)",
+                        for_cur=self.env['res.currency'].browse(currency_id).display_name,
+                        comp_cur=self.env.company.currency_id.display_name,
+                        rate=options['currency_rates'][str(currency_id)]['rate']
+                    ),
+                    'debit': balance if balance > 0 else 0,
+                    'credit': -balance if balance < 0 else 0,
+                    'amount_currency': 0,
+                    'currency_id': currency_id,
+                    'account_id': account_id,
+                }))
+                if balance < 0:
+                    move_line_name = _("Expense Provision for %s", self.env['res.currency'].browse(currency_id).display_name)
+                else:
+                    move_line_name = _("Income Provision for %s", self.env['res.currency'].browse(currency_id).display_name)
+                move_lines.append(Command.create({
+                    'name': move_line_name,
+                    'debit': -balance if balance < 0 else 0,
+                    'credit': balance if balance > 0 else 0,
+                    'amount_currency': 0,
+                    'currency_id': currency_id,
+                    'account_id': self.expense_provision_account_id.id if balance < 0 else self.income_provision_account_id.id,
+                }))
+
+        return {
+            'ref': _("Foreign currencies adjustment entry as of %s", format_date(self.env, self.date)),
+            'journal_id': self.journal_id.id,
+            'date': self.date,
+            'line_ids': move_lines,
+        }
+
+    def create_entries(self):
+        self.ensure_one()
+        move_vals = self._get_move_vals()
+        if move_vals['line_ids']:
+            move = self.env['account.move'].with_context(skip_invoice_sync=True).create(move_vals)
+            move.action_post()
+            reverse_move = move._reverse_moves(default_values_list=[{
+                'ref': _("Reversal of: %s", move.ref),
+            }])
+            reverse_move.date = self.reversal_date
+            reverse_move.action_post()
+
+            form = self.env.ref('account.view_move_form', False)
+            ctx = self.env.context.copy()
+            ctx.pop('id', '')
+            return {
+                'type': 'ir.actions.act_window',
+                'res_model': "account.move",
+                'res_id': move.id,
+                'view_mode': "form",
+                'view_id': form.id,
+                'views': [(form.id, 'form')],
+                'context': ctx,
+            }
+        raise UserError(_("No provision needed was found."))
diff --git a/dev_odex30_accounting/odex30_account_reports/wizard/multicurrency_revaluation.xml b/dev_odex30_accounting/odex30_account_reports/wizard/multicurrency_revaluation.xml
new file mode 100644
index 0000000..2f6f134
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_reports/wizard/multicurrency_revaluation.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <data>
+        <record id="view_account_multicurrency_revaluation_wizard" model="ir.ui.view">
+            <field name="name">account.multicurrency.revaluation.wizard.view</field>
+            <field name="model">account.multicurrency.revaluation.wizard</field>
+            <field name="arch" type="xml">
+                <form string="Make Adjustment Entry">
+                    <field name="company_id" invisible="1"/>
+                    <div invisible="not show_warning_move_id" class="alert alert-warning" role="alert">Proceed with caution as there might be an existing adjustment for this period (<field name="show_warning_move_id"/>)</div>
+                    <group>
+                        <group>
+                            <field name="journal_id"/>
+                            <field name="expense_provision_account_id"/>
+                            <field name="income_provision_account_id"/>
+                        </group>
+                        <group>
+                            <field name="date"/>
+                            <field name="reversal_date"/>
+                        </group>
+                    </group>
+                    <field name="preview_data" widget="grouped_view_widget"/>
+                    <footer>
+                        <button string='Create Entry' name="create_entries" type="object" class="btn-primary" data-hotkey="q"/>
+                        <button string="Cancel" class="btn-secondary" special="cancel" data-hotkey="x"/>
+                    </footer>
+               </form>
+            </field>
+        </record>
+    </data>
+</odoo>
diff --git a/dev_odex30_accounting/odex30_account_reports/wizard/report_export_wizard.py b/dev_odex30_accounting/odex30_account_reports/wizard/report_export_wizard.py
new file mode 100644
index 0000000..b26a1b6
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_reports/wizard/report_export_wizard.py
@@ -0,0 +1,131 @@
+# -*- coding: utf-8 -*-
+
+from odoo import api, models, fields, _
+from odoo.exceptions import UserError
+from odoo.service.model import get_public_method
+
+import json
+import base64
+import types
+from urllib.parse import urlparse, parse_qs
+
+
+class ReportExportWizard(models.TransientModel):
+    """ Wizard allowing to export an accounting report in several different formats
+    at once, saving them as attachments.
+    """
+    _name = 'account_reports.export.wizard'
+    _description = "Export wizard for accounting's reports"
+
+    export_format_ids = fields.Many2many(string="Export to", comodel_name='account_reports.export.wizard.format', relation="dms_acc_rep_export_wizard_format_rel")
+    report_id = fields.Many2one(string="Parent Report Id", comodel_name='account.report', required=True)
+    doc_name = fields.Char(string="Documents Name", help="Name to give to the generated documents.")
+
+    @api.model_create_multi
+    def create(self, vals_list):
+        wizards = super().create(vals_list)
+        for wizard in wizards:
+            wizard.doc_name = wizard.report_id.name
+
+            # We create one export format object per available export type of the report,
+            # with the right generation function associated to it.
+            # This is done so to allow selecting them as Many2many tags in the wizard.
+            for button_dict in self._context.get('account_report_generation_options', {}).get('buttons', []):
+                if button_dict.get('file_export_type'):
+                    self.env['account_reports.export.wizard.format'].create({
+                        'name': button_dict['file_export_type'],
+                        'fun_to_call': button_dict['action'],
+                        'fun_param': button_dict.get('action_param'),
+                        'export_wizard_id': wizard.id,
+                    })
+        return wizards
+
+    def export_report(self):
+        self.ensure_one()
+        created_attachments = self.env['ir.attachment']
+        for vals in self._get_attachments_to_save():
+            created_attachments |= self.env['ir.attachment'].create(vals)
+        return {
+            'type': 'ir.actions.act_window',
+            'name': _('Generated Documents'),
+            'view_mode': 'kanban,form',
+            'res_model': 'ir.attachment',
+            'domain': [('id', 'in', created_attachments.ids)],
+        }
+
+    def _get_attachments_to_save(self):
+        self.ensure_one()
+        to_create_attachments = []
+        report_options = self.env.context['account_report_generation_options']
+        for format in self.export_format_ids:
+            # format.fun_to_call is a button function, so it has to be public
+            fun_name = format.fun_to_call
+            report_function_params = [format.fun_param] if format.fun_param else []
+            if self.report_id.custom_handler_model_id and hasattr(self.env[self.report_id.custom_handler_model_name], fun_name):
+                report = self.env[self.report_id.custom_handler_model_name]
+            else:
+                report = self.report_id
+            report_function = get_public_method(report, fun_name)
+            report_action = report_function(report, report_options, *report_function_params)
+
+            to_create_attachments.append(format.apply_export(report_action))
+
+        return to_create_attachments
+
+
+class ReportExportWizardOption(models.TransientModel):
+    _name = 'account_reports.export.wizard.format'
+    _description = "Export format for accounting's reports"
+
+    name = fields.Char(string="Name", required=True)
+    fun_to_call = fields.Char(string="Function to Call", required=True)
+    fun_param = fields.Char(string="Function Parameter")
+    export_wizard_id = fields.Many2one(string="Parent Wizard", comodel_name='account_reports.export.wizard', required=True, ondelete='cascade')
+
+    def apply_export(self, report_action):
+        self.ensure_one()
+
+        if report_action['type'] == 'ir_actions_account_report_download':
+            report_options = json.loads(report_action['data']['options'])
+
+            # file_generator functions are always public for ir_actions_account_report_download
+            file_generator = report_action['data']['file_generator']
+            report = self.export_wizard_id.report_id
+            if report.custom_handler_model_id and hasattr(self.env[report.custom_handler_model_name], file_generator):
+                report = self.env[report.custom_handler_model_name]
+
+            generation_function = get_public_method(report, file_generator)
+            export_result = generation_function(report, report_options)
+
+            # We use the options from the action, as the action may have added or modified
+            # stuff into them (see l10n_es_reports, with BOE wizard)
+            file_content = base64.encodebytes(export_result['file_content']) if isinstance(export_result['file_content'], bytes) else export_result['file_content']
+            # We need to unpack the content in case of a generator
+            if isinstance(file_content, types.GeneratorType):
+                file_content = base64.encodebytes(b''.join(file_content))
+            file_name = f"{self.export_wizard_id.doc_name or self.export_wizard_id.report_id.name}.{export_result['file_type']}"
+            mimetype = self.export_wizard_id.report_id.get_export_mime_type(export_result['file_type'])
+
+        elif report_action['type'] == 'ir.actions.act_url':
+            query_params = parse_qs(urlparse(report_action['url']).query)
+            model = query_params['model'][0]
+            model_id = int(query_params['id'][0])
+            wizard = self.env[model].browse(model_id)
+            file_name = wizard[query_params['filename_field'][0]]
+            file_content = wizard[query_params['field'][0]]
+            mimetype = self.env['account.report'].get_export_mime_type(file_name.split('.')[-1])
+
+        else:
+            raise UserError(_("One of the formats chosen can not be exported in the DMS"))
+
+        return self.get_attachment_vals(file_name, file_content, mimetype, report_options)
+
+    def get_attachment_vals(self, file_name, file_content, mimetype, log_options_dict):
+        self.ensure_one()
+        return {
+            'name': file_name,
+            'company_id': self.env.company.id,
+            'datas': file_content,
+            'mimetype': mimetype,
+            'description': json.dumps(log_options_dict)
+        }
diff --git a/dev_odex30_accounting/odex30_account_reports/wizard/report_export_wizard.xml b/dev_odex30_accounting/odex30_account_reports/wizard/report_export_wizard.xml
new file mode 100644
index 0000000..6adf40e
--- /dev/null
+++ b/dev_odex30_accounting/odex30_account_reports/wizard/report_export_wizard.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <data>
+
+        <record id="view_report_export_wizard" model="ir.ui.view">
+            <field name="name">account_reports.export.wizard.form</field>
+            <field name="model">account_reports.export.wizard</field>
+            <field name="arch" type="xml">
+                <form string="Export">
+                    <group>
+                        <field name="export_format_ids" widget="many2many_tags" options="{'no_create': True}" domain="[('export_wizard_id', '=', id)]" required="1"/>
+                    </group>
+                    <group>
+                        <group>
+                            <field name="doc_name" required="1"/>
+                        </group>
+                    </group>
+                    <footer>
+                        <button string="Export" class="btn-primary" type="object" name="export_report" data-hotkey="q"/>
+                        <button string="Cancel" class="btn-secondary" special="cancel" data-hotkey="x"/>
+                    </footer>
+                </form>
+            </field>
+        </record>
+
+    </data>
+</odoo>
\ No newline at end of file
diff --git a/dev_odex30_accounting/odex30_analytic/__init__.py b/dev_odex30_accounting/odex30_analytic/__init__.py
new file mode 100644
index 0000000..5305644
--- /dev/null
+++ b/dev_odex30_accounting/odex30_analytic/__init__.py
@@ -0,0 +1,3 @@
+# -*- coding: utf-8 -*-
+
+from . import models
\ No newline at end of file
diff --git a/dev_odex30_accounting/odex30_analytic/__manifest__.py b/dev_odex30_accounting/odex30_analytic/__manifest__.py
new file mode 100644
index 0000000..fee3dd6
--- /dev/null
+++ b/dev_odex30_accounting/odex30_analytic/__manifest__.py
@@ -0,0 +1,32 @@
+# -*- coding: utf-8 -*-
+
+{
+    'name': "Analytic Accounting Enterprise",
+    'version': '0.1',
+    'category': 'Odex25-Accounting/Odex25-Accounting',
+    'author': "Expert Co. Ltd.",
+    'website': "http://www.exp-sa.com",
+    'depends': ['odex30_web_grid', 'analytic', 'account'],
+    'description': """
+Module for defining analytic accounting object.
+===============================================
+
+In Odoo, analytic accounts are linked to general accounts but are treated
+totally independently. So, you can enter various different analytic operations
+that have no counterpart in the general financial accounts.
+    """,
+    'data': [
+        'views/account_analytic_view.xml'
+    ],
+    'installable': True,
+    'auto_install': True,
+    'license': 'OEEL-1',
+    'assets': {
+        'web.assets_backend_lazy': [
+            'odex30_analytic/static/src/**/*',
+        ],
+        'web.qunit_suite_tests': [
+            'odex30_analytic/static/tests/**/*',
+        ],
+    },
+}
diff --git a/dev_odex30_accounting/odex30_analytic/__pycache__/__init__.cpython-311.pyc b/dev_odex30_accounting/odex30_analytic/__pycache__/__init__.cpython-311.pyc
new file mode 100644
index 0000000..6f712d8
Binary files /dev/null and b/dev_odex30_accounting/odex30_analytic/__pycache__/__init__.cpython-311.pyc differ
diff --git a/dev_odex30_accounting/odex30_analytic/i18n/analytic_enterprise.pot b/dev_odex30_accounting/odex30_analytic/i18n/analytic_enterprise.pot
new file mode 100644
index 0000000..9fa03a6
--- /dev/null
+++ b/dev_odex30_accounting/odex30_analytic/i18n/analytic_enterprise.pot
@@ -0,0 +1,36 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# 	* odex30_analytic
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 18.0+e\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2024-09-25 09:26+0000\n"
+"PO-Revision-Date: 2024-09-25 09:26+0000\n"
+"Last-Translator: \n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: odex30_analytic
+#: model_terms:ir.ui.view,arch_db:odex30_analytic.account_analytic_line_report_view_grid
+msgid "Analytic Entries"
+msgstr ""
+
+#. module: odex30_analytic
+#: model:ir.model,name:odex30_analytic.model_account_analytic_line
+msgid "Analytic Line"
+msgstr ""
+
+#. module: odex30_analytic
+#: model_terms:ir.ui.view,arch_db:odex30_analytic.account_analytic_line_report_view_grid
+msgid "Month"
+msgstr ""
+
+#. module: odex30_analytic
+#: model_terms:ir.ui.view,arch_db:odex30_analytic.account_analytic_line_report_view_grid
+msgid "Year"
+msgstr ""
diff --git a/dev_odex30_accounting/odex30_analytic/i18n/ar.po b/dev_odex30_accounting/odex30_analytic/i18n/ar.po
new file mode 100644
index 0000000..be48ccf
--- /dev/null
+++ b/dev_odex30_accounting/odex30_analytic/i18n/ar.po
@@ -0,0 +1,40 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# 	* odex30_analytic
+# 
+# Translators:
+# Wil Odoo, 2024
+# 
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 18.0+e\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2024-09-25 09:26+0000\n"
+"PO-Revision-Date: 2024-09-25 09:44+0000\n"
+"Last-Translator: Wil Odoo, 2024\n"
+"Language-Team: Arabic (https://app.transifex.com/odoo/teams/41243/ar/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Language: ar\n"
+"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
+
+#. module: odex30_analytic
+#: model_terms:ir.ui.view,arch_db:odex30_analytic.account_analytic_line_report_view_grid
+msgid "Analytic Entries"
+msgstr "القيود التحليلية"
+
+#. module: odex30_analytic
+#: model:ir.model,name:odex30_analytic.model_account_analytic_line
+msgid "Analytic Line"
+msgstr "البند التحليلي"
+
+#. module: odex30_analytic
+#: model_terms:ir.ui.view,arch_db:odex30_analytic.account_analytic_line_report_view_grid
+msgid "Month"
+msgstr "الشهر"
+
+#. module: odex30_analytic
+#: model_terms:ir.ui.view,arch_db:odex30_analytic.account_analytic_line_report_view_grid
+msgid "Year"
+msgstr "السنة"
diff --git a/dev_odex30_accounting/odex30_analytic/models/__init__.py b/dev_odex30_accounting/odex30_analytic/models/__init__.py
new file mode 100644
index 0000000..1ad0afc
--- /dev/null
+++ b/dev_odex30_accounting/odex30_analytic/models/__init__.py
@@ -0,0 +1,4 @@
+# -*- coding: utf-8 -*-
+
+
+from . import models
\ No newline at end of file
diff --git a/dev_odex30_accounting/odex30_analytic/models/__pycache__/__init__.cpython-311.pyc b/dev_odex30_accounting/odex30_analytic/models/__pycache__/__init__.cpython-311.pyc
new file mode 100644
index 0000000..8d357c9
Binary files /dev/null and b/dev_odex30_accounting/odex30_analytic/models/__pycache__/__init__.cpython-311.pyc differ
diff --git a/dev_odex30_accounting/odex30_analytic/models/__pycache__/models.cpython-311.pyc b/dev_odex30_accounting/odex30_analytic/models/__pycache__/models.cpython-311.pyc
new file mode 100644
index 0000000..d3f41df
Binary files /dev/null and b/dev_odex30_accounting/odex30_analytic/models/__pycache__/models.cpython-311.pyc differ
diff --git a/dev_odex30_accounting/odex30_analytic/models/models.py b/dev_odex30_accounting/odex30_analytic/models/models.py
new file mode 100644
index 0000000..3bcf945
--- /dev/null
+++ b/dev_odex30_accounting/odex30_analytic/models/models.py
@@ -0,0 +1,11 @@
+# -*- coding: utf-8 -*-
+
+from odoo import api, fields, models
+
+class AccountAnalyticLine(models.Model):
+    _inherit = 'account.analytic.line'
+
+    @api.model
+    def grid_compute_year_range(self, anchor):
+        result = self.env.company.compute_fiscalyear_dates(fields.Date.to_date(anchor))
+        return {'date_from': result['date_from'], 'date_to': result['date_to']}
diff --git a/dev_odex30_accounting/odex30_analytic/static/src/analytic_line_grid/analytic_line_grid_model.js b/dev_odex30_accounting/odex30_analytic/static/src/analytic_line_grid/analytic_line_grid_model.js
new file mode 100644
index 0000000..7fef4cc
--- /dev/null
+++ b/dev_odex30_accounting/odex30_analytic/static/src/analytic_line_grid/analytic_line_grid_model.js
@@ -0,0 +1,44 @@
+/** @odoo-module */
+
+import { serializeDate, deserializeDate } from "@web/core/l10n/dates";
+import { GridNavigationInfo, GridModel, GridDataPoint } from "@odex30_web_grid/views/grid_model";
+
+export class AnalyticLineGridDataPoint extends GridDataPoint {
+    async _initialiseData() {
+        if (this.navigationInfo.range.span === "year") {
+            await this.navigationInfo.fetchPeriod();
+        }
+        await super._initialiseData();
+    }
+}
+
+export class AnalyticLineGridNavigationInfo extends GridNavigationInfo {
+    get periodStart() {
+        if (this.range.span !== "year" || !this._periodStart) {
+            return super.periodStart;
+        }
+        return this._periodStart;
+    }
+
+    get periodEnd() {
+        if (this.range.span !== "year" || !this._periodEnd) {
+            return super.periodEnd;
+        }
+        return this._periodEnd;
+    }
+
+    async fetchPeriod() {
+        const { date_from, date_to } = await this.model.orm.call(
+            this.model.resModel,
+            "grid_compute_year_range",
+            [serializeDate(this.anchor)]
+        );
+        this._periodStart = deserializeDate(date_from);
+        this._periodEnd = deserializeDate(date_to);
+    }
+}
+
+export class AnalyticLineGridModel extends GridModel {
+    static DataPoint = AnalyticLineGridDataPoint;
+    static NavigationInfo = AnalyticLineGridNavigationInfo;
+}
diff --git a/dev_odex30_accounting/odex30_analytic/static/src/analytic_line_grid/analytic_line_grid_view.js b/dev_odex30_accounting/odex30_analytic/static/src/analytic_line_grid/analytic_line_grid_view.js
new file mode 100644
index 0000000..a4869ef
--- /dev/null
+++ b/dev_odex30_accounting/odex30_analytic/static/src/analytic_line_grid/analytic_line_grid_view.js
@@ -0,0 +1,14 @@
+/** @odoo-module */
+
+import { registry } from "@web/core/registry";
+
+import { gridView } from "@odex30_web_grid/views/grid_view";
+
+import { AnalyticLineGridModel } from "./analytic_line_grid_model";
+
+export const analyticLineGridView = {
+    ...gridView,
+    Model: AnalyticLineGridModel,
+}
+
+registry.category("views").add("analytic_line_grid", analyticLineGridView)
diff --git a/dev_odex30_accounting/odex30_analytic/static/tests/analytic_line_grid_view_tests.js b/dev_odex30_accounting/odex30_analytic/static/tests/analytic_line_grid_view_tests.js
new file mode 100644
index 0000000..f488363
--- /dev/null
+++ b/dev_odex30_accounting/odex30_analytic/static/tests/analytic_line_grid_view_tests.js
@@ -0,0 +1,117 @@
+/** @odoo-module */
+
+import { makeView, setupViewRegistries } from "@web/../tests/views/helpers";
+import { getFixture, patchDate } from "@web/../tests/helpers/utils";
+
+let serverData, target;
+
+QUnit.module("Views", (hooks) => {
+    hooks.beforeEach(() => {
+        serverData = {
+            models: {
+                "account.analytic.line": {
+                    fields: {
+                        account_id: {
+                            string: "Analytic Account",
+                            type: "many2one",
+                            relation: "account.analytic",
+                        },
+                        date: { string: "Date", type: "date" },
+                        unit_amount: {
+                            string: "Unit Amount",
+                            type: "float",
+                            aggregator: "sum",
+                        },
+                    },
+                    records: [
+                        {
+                            id: 1,
+                            account_id: 31,
+                            date: "2017-01-24",
+                            unit_amount: 2.5,
+                        },
+                        {
+                            id: 2,
+                            account_id: 31,
+                            date: "2017-01-25",
+                            unit_amount: 2,
+                        },
+                        {
+                            id: 3,
+                            account_id: 31,
+                            date: "2017-01-25",
+                            unit_amount: 5.5,
+                        },
+                        {
+                            id: 4,
+                            account_id: 31,
+                            date: "2017-01-30",
+                            unit_amount: 10,
+                        },
+                        {
+                            id: 5,
+                            account_id: 142,
+                            date: "2017-01-31",
+                            unit_amount: -3.5,
+                        },
+                    ],
+                },
+                "account.analytic": {
+                    fields: {
+                        name: { string: "Analytic Account Name", type: "char" },
+                    },
+                    records: [
+                        { id: 31, display_name: "P1" },
+                        { id: 142, display_name: "Webocalypse Now" },
+                    ],
+                },
+            },
+            views: {
+                "account.analytic.line,false,grid": `
+                    <grid js_class="analytic_line_grid">
+                        <field name="account_id" type="row"/>
+                        <field name="date" type="col">
+                            <range name="year" string="Year" span="year" step="month"/>
+                            <range name="month" string="Month" span="month" step="day"/>
+                        </field>
+                        <field name="unit_amount" type="measure" widget="float_time"/>
+                    </grid>`,
+            },
+        };
+        setupViewRegistries();
+        target = getFixture();
+        patchDate(2017, 0, 30, 0, 0, 0);
+    });
+
+    QUnit.module("AnalyticLineGrid");
+
+    QUnit.test("display right period on grid view in year range", async function (assert) {
+        await makeView({
+            type: "grid",
+            resModel: "account.analytic.line",
+            serverData,
+            viewId: false,
+            async mockRPC(route, args) {
+                if (args.method === "grid_unavailability") {
+                    return {};
+                } else if (args.method === "grid_compute_year_range") {
+                    return {
+                        date_from: "2016-05-01",
+                        date_to: "2017-04-30",
+                    };
+                }
+            },
+        });
+
+        const columns = target.querySelectorAll(
+            ".o_grid_column_title:not(.o_grid_row_total,.o_grid_navigation_wrap)"
+        );
+        assert.strictEqual(
+            columns.length,
+            12,
+            "12 columns should be rendered to display 12 months"
+        );
+        assert.strictEqual(columns[0].textContent, "May\n2016");
+        assert.strictEqual(columns[columns.length - 1].textContent, "April\n2017");
+    });
+});
diff --git a/dev_odex30_accounting/odex30_analytic/views/account_analytic_view.xml b/dev_odex30_accounting/odex30_analytic/views/account_analytic_view.xml
new file mode 100644
index 0000000..879f547
--- /dev/null
+++ b/dev_odex30_accounting/odex30_analytic/views/account_analytic_view.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+	<data>
+        <record id="account_analytic_line_report_view_grid" model="ir.ui.view">
+            <field name="name">account.analytic.line.report.grid</field>
+            <field name="model">account.analytic.line</field>
+            <field name="arch" type="xml">
+                <grid string="Analytic Entries" edit="false" js_class="analytic_line_grid">
+                    <field name="account_id" type="row" section="1"/>
+                    <field name="date" type="col">
+                        <range name="year" string="Year" span="year" step="month"/>
+                        <range name="month" string="Month" span="month" step="day"/>
+                    </field>
+                    <field name="amount" type="measure" widget="float"/>
+                </grid>
+            </field>
+        </record>
+        <record id="analytic.account_analytic_line_action_entries" model="ir.actions.act_window">
+            <field name="view_mode">list,kanban,form,graph,pivot,grid</field>
+
+
+            <field name="view_ids" eval="[(5,0,0),
+                   (0, 0, {'view_mode': 'list', 'view_id': ref('analytic.view_account_analytic_line_tree')}),
+                   (0, 0, {'view_mode': 'kanban', 'view_id': ref('analytic.view_account_analytic_line_kanban')}),
+                   (0, 0, {'view_mode': 'form', 'view_id': ref('analytic.view_account_analytic_line_form')}),
+                   (0, 0, {'view_mode': 'graph', 'view_id': ref('analytic.view_account_analytic_line_graph')}),
+                   (0, 0, {'view_mode': 'pivot', 'view_id': ref('analytic.view_account_analytic_line_pivot')}),
+                   (0, 0, {'view_mode': 'grid', 'view_id': ref('odex30_analytic.account_analytic_line_report_view_grid')})]"/>
+        </record>
+        <record id="account.action_analytic_reporting" model="ir.actions.act_window">
+            <field name="view_mode">pivot,list,kanban,form,graph,grid</field>
+            <field name="view_ids" eval="[(5,0,0),
+                   (0, 0, {'view_mode': 'pivot', 'view_id': ref('analytic.view_account_analytic_line_pivot')}),
+                   (0, 0, {'view_mode': 'list', 'view_id': ref('analytic.view_account_analytic_line_tree')}),
+                   (0, 0, {'view_mode': 'kanban', 'view_id': ref('analytic.view_account_analytic_line_kanban')}),
+                   (0, 0, {'view_mode': 'form', 'view_id': ref('analytic.view_account_analytic_line_form')}),
+                   (0, 0, {'view_mode': 'graph', 'view_id': ref('analytic.view_account_analytic_line_graph')}),
+                   (0, 0, {'view_mode': 'grid', 'view_id': ref('odex30_analytic.account_analytic_line_report_view_grid')})]"/>
+        </record>
+	</data>
+</odoo>